Fix #2

Author: kimbtech

VERSION

@@ -1,4 +1,4 @@
 latest
-0.1.0
+0.1.1
 0.1
 0

bot/Commands/Message/GenericmessageCommand.php

@@ -52,7 +52,7 @@ public function execute(): ServerResponse
 			return $this->replyToUser('Please use the commands /ttt and /task!');
 		}
 		else{
-			$text = $this->getMessage()->getText(true);
+			$text = \TTTBot\Utilities::trimAndConvertInput($this->getMessage()->getText(true));
 
 			switch($handler) {
 				case "categoryAdd":

bot/Commands/StartCommand.php

@@ -44,7 +44,7 @@ public function execute(): ServerResponse
 			return $this->replyToUser('You have started the bot already. Use /ttt or /task!');
 		}
 		else {
-			$token = $this->getMessage()->getText(true);
+			$token = \TTTBot\Utilities::trimAndConvertInput($this->getMessage()->getText(true));
 			if( empty($token) ){
 				return $this->replyToUser(
 					'This bot requires you to register for the usage. Please get a token from your admin or host your own version!' . PHP_EOL .

bot/Commands/TaskCommand.php

@@ -51,7 +51,7 @@ public function execute(): ServerResponse
 		 * Handle new Tasks
 		 */
 
-		$text = $this->getMessage()->getText(true);
+		$text = \TTTBot\Utilities::trimAndConvertInput($this->getMessage()->getText(true));
 
 		$th = new \TTTBot\AddTaskHelper($session);
 		$th->taskCommand($text);

bot/Commands/TttCommand.php

@@ -50,7 +50,7 @@ public function execute(): ServerResponse
 		 * Handle normal TTT Commands
 		 */
 		// get command
-		$command = $this->getMessage()->getText(true);
+		$command = \TTTBot\Utilities::trimAndConvertInput($this->getMessage()->getText(true));
 		$command = explode(' ', $command);
 
 		// disallowed

bot/classes/AddTaskHelper.php

@@ -35,20 +35,22 @@ public function taskCommand(string $params) : void {
 		if(!empty($params)){
 			$params = \explode(' ', $params);
 			if(\count($params) === 3){
-				$this->runTTT($params[2], $params[0], $params[1]);
+				$this->runTTT(trim($params[2]), trim($params[0]), trim($params[1]));
 			}
 			else if(\count($params) === 1 &&
 				$this->session->getData('lastCategory') !== false &&
 				$this->session->getData('lastTask') !== false
 			){
 				$time = str_replace('+', '', $params[0]);
-				$this->runTTT($time, $this->session->getData('lastCategory'), $this->session->getData('lastTask'));
+				$this->runTTT(trim($time), $this->session->getData('lastCategory'), $this->session->getData('lastTask'));
 			}
 			else{
+				$this->runTTT("", "", "");
 				$this->answer = "Use `/task Category Task 20m` or `/task +20m` or just `/task` for Step-by-Step query"; 
 			}
 		}
 		else{
+			$this->runTTT("", "", "");
 			$this->answer = "Recoding new Task Step-by-Step, one may also use `/task Category Task 20m` or `/task +20m`." . PHP_EOL;
 			$this->answer .= TTTLoader::runTTTCommand(['c', 'c', 'list']);
 			$this->answer .= "Please choose a category:";
@@ -62,7 +64,7 @@ public function messageCommand(string $text) : void {
 		switch($this->session->getTemp('taskStep')){
 			case "category":
 				$this->answer = "Please give the name of the task now:";
-					$this->session->setData('lastCategory', $text);
+				$this->session->setData('lastCategory', $text);
 				$this->session->setTemp('taskStep', 'task');
 				break;
 			case "task":

bot/classes/Utilities.php

@@ -64,6 +64,14 @@ public static function randomCode( $len, $chars ){
 		}
 		return $r;
 	}
+
+	public static function trimAndConvertInput(string $s) : string {
+		return \str_replace(
+				['ä','ü','ö','ß','Ä','Ü','Ö'],
+				['ae','ue','oe','ss','Ae','Ue','Oe'],
+				trim($s)
+			);
+	}
 }
 
 ?>