Fix in start commnad

kozi · Oct 24, 2016 · 11cbe66 · 11cbe66
1 parent 840f781
commit 11cbe66
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/contao/languages/de/default.php b/contao/languages/de/default.php
@@ -33,6 +33,10 @@
 $GLOBALS['TL_LANG']['simpletipp']['point_details']           = 'Richtig: %s, Differenz: %s, Tendenz: %s';
 
 
+// TODO Telegram messages
+$GLOBALS['TL_LANG']['simpletipp']['telegram'] = [];
+
+
 
 
 
diff --git a/src/Simpletipp/Modules/SimpletippTelegram.php b/src/Simpletipp/Modules/SimpletippTelegram.php
@@ -61,18 +61,19 @@ protected function compile()
         $text       = ($message !== null) ? strtolower($message->getText()) : null; 
         $chat_id    = ($message !== null) ? $message->getChat()->getId() : null;
         $chatMember = ($chat_id !== null) ? MemberModel::findOneBy('telegram_chat_id', $chat_id) : null;
-        
+
         if (is_string($text) && strpos($text, "/start") === 0) {
             // Handle start command
-            $command = new StartCommand($telegram, $this, $message);
-            $command->handle();
+            $command = new StartCommand($telegram, $this, $message, $chatMember);
+            $command->handleCommand();
             exit;
         }
         elseif ($chatMember === null) {
             $telegram->sendMessage(['text' => 'Chat not registered.', 'chat_id' => $chat_id]);
             exit;
         }
 
+        // Handle all other commands
         switch ($text) {
             case "/hilfe":
             case "hilfe":

diff --git a/src/Simpletipp/Telegram/StartCommand.php b/src/Simpletipp/Telegram/StartCommand.php
@@ -25,6 +25,7 @@ protected function handle() {
         if($this->chatMember !== null) {
             $tmpl = 'Chat already registered for %s (%s).';
             $this->sendText(sprintf($tmpl, $this->chatMember->firstname.' '.$this->chatMember->lastname, $this->chatMember->username));
+            $this->sendText(HelpCommand::helpMessage());
             return true;
         }
 

diff --git a/src/Simpletipp/Telegram/TelegramCommand.php b/src/Simpletipp/Telegram/TelegramCommand.php
@@ -42,7 +42,7 @@ public function __construct($telegram, $module, $message, $chatMember = null)
 
         $fnPrefix = "TELEGRAM-".preg_replace('/[^a-zA-Z0-9-_.]/', '', $telegram->getAccessToken());
 
-        if ($this->chatMember->id !== null) {
+        if ($this->chatMember !== null && $this->chatMember->id !== null) {
             $this->filenameTippStack = TL_ROOT."/system/tmp/".$fnPrefix.$this->chatMember->id.".spc";
         }
         if ($message !== null) {