Merge pull request #52 from noplanman/fix_output

Fix and improve getUpdates output

Author: noplanman

CHANGELOG.md

@@ -14,6 +14,7 @@ Exclamation symbols (:exclamation:) note something of importance e.g. breaking c
 ### Removed
 - Botan.io has been removed (see php-telegram-bot/core#924). (#50)
 ### Fixed
+- Fix and improve getUpdates output.
 ### Security
 - Security disclosure managed by [Tidelift]. (#49)
 

src/BotManager.php

@@ -12,6 +12,7 @@
 
 use Exception;
 use Longman\IPTools\Ip;
+use Longman\TelegramBot\Entities\CallbackQuery;
 use Longman\TelegramBot\Entities\ChosenInlineResult;
 use Longman\TelegramBot\Entities\InlineQuery;
 use Longman\TelegramBot\Entities\Message;
@@ -510,22 +511,27 @@ protected function defaultGetUpdatesCallback($get_updates_response): string
         );
 
         foreach ($results as $result) {
-            $chat_id = 0;
-            $text    = '<n/a>';
-
             $update_content = $result->getUpdateContent();
+
+            $chat_id = 'n/a';
+            $text    = $result->getUpdateType();
+
             if ($update_content instanceof Message) {
+                /** @var Message $update_content */
                 $chat_id = $update_content->getChat()->getId();
-                $text    = sprintf('<%s>', $update_content->getType());
-            } elseif ($update_content instanceof InlineQuery
-                || $update_content instanceof ChosenInlineResult
-            ) {
+                $text    .= ";{$update_content->getType()}";
+            } elseif ($update_content instanceof InlineQuery || $update_content instanceof ChosenInlineResult) {
+                /** @var InlineQuery|ChosenInlineResult $update_content */
                 $chat_id = $update_content->getFrom()->getId();
-                $text    = sprintf('<query> %s', $update_content->getQuery());
+                $text    .= ";{$update_content->getQuery()}";
+            } elseif ($update_content instanceof CallbackQuery) {
+                /** @var CallbackQuery $update_content */
+                $chat_id = $update_content->getMessage()->getChat()->getId();
+                $text    .= ";{$update_content->getData()}";
             }
 
             $output .= sprintf(
-                '%d: %s' . PHP_EOL,
+                '%d: <%s>' . PHP_EOL,
                 $chat_id,
                 preg_replace('/\s+/', ' ', trim($text))
             );