Merge pull request php-telegram-bot#202 from jacklul/quickupdate

Quick updates

Author: jacklul

src/Botan.php

@@ -34,6 +34,11 @@ class Botan
      */
     protected static $token = '';
 
+    /**
+     * @var string The actual command that is going to be reported
+     */
+    public static $command = '';
+
     /**
      * Initilize botan
      */
@@ -47,40 +52,57 @@ public static function initializeBotan($token)
     }
 
     /**
-     * Track function
+     * Lock function to make sure only the first command is reported
+     * ( in case commands are calling other commands $telegram->executedCommand() )
      *
-     * @todo Advanced integration: https://github.com/botanio/sdk#advanced-integration
+     * @param  string $command
+     */
+    public static function lock($command = '')
+    {
+        if (empty(self::$command)) {
+            self::$command = $command;
+        }
+    }
+
+    /**
+     * Track function
      *
      * @param  string $input
      * @param  string $command
+     *
      * @return bool|string
+     * @throws TelegramException
      */
     public static function track($input, $command = '')
     {
-        if (empty(self::$token)) {
+        if (empty(self::$token) || $command != self::$command) {
             return false;
         }
 
         if (empty($input)) {
             throw new TelegramException('Input is empty!');
         }
 
+        self::$command = '';
+
         $obj = json_decode($input, true);
         if (isset($obj['message'])) {
             $data = $obj['message'];
-
-            if ((isset($obj['message']['entities']) && $obj['message']['entities'][0]['type'] == 'bot_command' && $obj['message']['entities'][0]['offset'] == 0) || substr($obj['message']['text'], 0, 1) == '/') {
-                if (strtolower($command) == 'generic') {
-                    $command = 'Generic';
-                } elseif (strtolower($command) == 'genericmessage') {
-                    $command = 'Generic Message';
-                } else {
-                    $command = '/' . strtolower($command);
+            $event_name = 'Message';
+
+            if (isset($obj['message']['entities']) && is_array($obj['message']['entities'])) {
+                foreach ($obj['message']['entities'] as $entity) {
+                    if ($entity['type'] == 'bot_command' && $entity['offset'] == 0) {
+                        if (strtolower($command) == 'generic') {
+                            $command = 'Generic';
+                        } else {
+                            $command = '/' . strtolower($command);
+                        }
+
+                        $event_name = 'Command (' . $command . ')';
+                        break;
+                    }
                 }
-
-                $event_name = 'Command ('.$command.')';
-            } else {
-                $event_name = 'Message';
             }
         } elseif (isset($obj['inline_query'])) {
             $data = $obj['inline_query'];
@@ -129,7 +151,9 @@ public static function track($input, $command = '')
      *
      * @param  $url
      * @param  $user_id
+     *
      * @return string
+     * @throws TelegramException
      */
     public static function shortenUrl($url, $user_id)
     {

src/Commands/SystemCommands/InlinequeryCommand.php

@@ -40,9 +40,9 @@ public function execute()
         $data = ['inline_query_id' => $inline_query->getId()];
 
         $articles = [
-            ['id' => '001', 'title' => 'https://core.telegram.org/bots/api#answerinlinequery', 'message_text' => 'you enter: ' . $query , 'input_message_content' => new InputTextMessageContent([ 'message_text' => $query ]) ],
-            ['id' => '002', 'title' => 'https://core.telegram.org/bots/api#answerinlinequery', 'message_text' => 'you enter: ' . $query , 'input_message_content' => new InputTextMessageContent([ 'message_text' => $query ]) ],
-            ['id' => '003', 'title' => 'https://core.telegram.org/bots/api#answerinlinequery', 'message_text' => 'you enter: ' . $query , 'input_message_content' => new InputTextMessageContent([ 'message_text' => $query ]) ],
+            ['id' => '001', 'title' => 'https://core.telegram.org/bots/api#answerinlinequery', 'message_text' => 'you enter: ' . $query , 'input_message_content' => new InputTextMessageContent([ 'message_text' => ' ' . $query ])],
+            ['id' => '002', 'title' => 'https://core.telegram.org/bots/api#answerinlinequery', 'message_text' => 'you enter: ' . $query , 'input_message_content' => new InputTextMessageContent([ 'message_text' => ' ' . $query ])],
+            ['id' => '003', 'title' => 'https://core.telegram.org/bots/api#answerinlinequery', 'message_text' => 'you enter: ' . $query , 'input_message_content' => new InputTextMessageContent([ 'message_text' => ' ' . $query ])],
         ];
 
         $array_article = [];