Enhance Update Class to Support Command Extraction from "callback_query"

composer.json

@@ -1,5 +1,5 @@
 {
-    "name": "irazasyed/telegram-bot-sdk",
+    "name": "miladkhodaverdi23/telegram-bot-sdk",
     "description": "The Unofficial Telegram Bot API PHP SDK",
     "license": "BSD-3-Clause",
     "type": "library",

src/Commands/Command.php

@@ -3,6 +3,7 @@
 namespace Telegram\Bot\Commands;
 
 use Illuminate\Support\Collection;
+use Mockery\Exception;
 use Telegram\Bot\Answers\Answerable;
 use Telegram\Bot\Api;
 use Telegram\Bot\Objects\MessageEntity;
@@ -165,6 +166,7 @@
             return [];
         }
 
+
         // Generate the regex needed to search for this pattern
         [$pattern, $arguments] = $this->makeRegexPattern();
 
@@ -206,7 +208,7 @@
         $commandOffsets = $this->allCommandOffsets();
 
         if ($commandOffsets->isEmpty()) {
-            return $this->getUpdate()->getMessage()->text ?? '';
+            return $this->getUpdate()->getText() ?? '';
         }
 
         //Extract the current offset for this command and, if it exists, the offset of the NEXT bot_command entity
@@ -228,7 +230,7 @@
     private function cutTextBetween(Collection $splice): string
     {
         return mb_substr(
-            $this->getUpdate()->getMessage()->text ?? '',
+            $this->getUpdate()->getText() ?? '',
             $splice->first(),
             $splice->last() - $splice->first()
         );
@@ -237,7 +239,7 @@
     private function cutTextFrom(Collection $splice): string
     {
         return mb_substr(
-            $this->getUpdate()->getMessage()->text ?? '',
+            $this->getUpdate()->getText() ?? '',
             $splice->first()
         );
     }

src/Commands/CommandBus.php

@@ -127,11 +127,9 @@
         }
 
         // remove leading slash
-        $command = substr(
-            $text,
+        $command = substr($text,
             $offset + 1,
-            $length - 1
-        );
+            $length - 1);
 
         // When in group - Ex: /command@MyBot. Just get the command name.
         return Str::of($command)->explode('@')->first();
@@ -142,13 +140,23 @@
      */
     protected function handler(Update $update): Update
     {
+        if ($update->detectType() == "callback_query") {
+            preg_match('/\A(\/callback:::\w*)\s*(.*)/', $update->getText(), $command);
+            [$text, $command] = $command;
+            $entity = [
+                'offset' => 0,
+                'length' => strlen($command)
+            ];
+            $this->process($entity, $update);
+            return $update;
+        }
+
         $message = $update->getMessage();
 
         if ($message->has('entities')) {
-            $this->parseCommandsIn($message)->each(fn ($entity) => $this->process(
-                $entity instanceof MessageEntity ? $entity->all() : $entity,
-                $update
-            ));
+            $this->parseCommandsIn($message)->each(fn($entity) => $this->process($entity instanceof
+                                                                                 MessageEntity ? $entity->all() : $entity,
+                $update));
         }
 
         return $update;
@@ -159,22 +167,21 @@
      */
     private function parseCommandsIn(Collection $message): Collection
     {
-        return Collection::wrap($message->get('entities'))
-            ->filter(static fn (MessageEntity $entity): bool => $entity->type === 'bot_command');
+        return Collection::wrap($message->get('entities'))->filter(static fn(MessageEntity $entity): bool => $entity->type ===
+                                                                                                             'bot_command');
     }
 
+
     /**
      * Execute a bot command from the update text.
      *
      * @param  array<string, mixed>  $entity  {@see MessageEntity} object attributes.
      */
     private function process(array $entity, Update $update): void
     {
-        $command = $this->parseCommand(
-            $update->getMessage()->text,
+        $command = $this->parseCommand($update->getText(),
             $entity['offset'],
-            $entity['length']
-        );
+            $entity['length']);
 
         $this->execute($command, $update, $entity);
     }
@@ -187,10 +194,10 @@
      */
     protected function execute(string $name, Update $update, array $entity): mixed
     {
-        $command = $this->commands[$name]
-            ?? $this->commandAliases[$name]
-            ?? $this->commands['help']
-            ?? collect($this->commands)->first(fn ($command): bool => $command instanceof $name);
+        $command = $this->commands[$name] ?? $this->commandAliases[$name] ?? $this->commands['help'] ??
+                                                                             collect($this->commands)->first(fn($command): bool => $command
+                                                                                                                                   instanceof
+                                                                                                                                   $name);
 
         return $command?->make($this->telegram, $update, $entity) ?? false;
     }
@@ -202,14 +209,10 @@
      */
     private function resolveCommand(CommandInterface|string $command): CommandInterface
     {
-        if (! is_a($command, CommandInterface::class, true)) {
-            throw new TelegramSDKException(
-                sprintf(
-                    'Command class "%s" should be an instance of "%s"',
-                    is_object($command) ? $command::class : $command,
-                    CommandInterface::class
-                )
-            );
+        if (!is_a($command, CommandInterface::class, true)) {
+            throw new TelegramSDKException(sprintf('Command class "%s" should be an instance of "%s"',
+                is_object($command) ? $command::class : $command,
+                CommandInterface::class));
         }
 
         $commandInstance = $this->buildDependencyInjectedClass($command);
@@ -227,23 +230,15 @@
     private function checkForConflicts(CommandInterface $command, string $alias): void
     {
         if (isset($this->commands[$alias])) {
-            throw new TelegramSDKException(
-                sprintf(
-                    '[Error] Alias [%s] conflicts with command name of "%s" try with another name or remove this alias from the list.',
-                    $alias,
-                    $command::class
-                )
-            );
+            throw new TelegramSDKException(sprintf('[Error] Alias [%s] conflicts with command name of "%s" try with another name or remove this alias from the list.',
+                $alias,
+                $command::class));
         }
 
         if (isset($this->commandAliases[$alias])) {
-            throw new TelegramSDKException(
-                sprintf(
-                    '[Error] Alias [%s] conflicts with another command\'s alias list: "%s", try with another name or remove this alias from the list.',
-                    $alias,
-                    $command::class
-                )
-            );
+            throw new TelegramSDKException(sprintf('[Error] Alias [%s] conflicts with another command\'s alias list: "%s", try with another name or remove this alias from the list.',
+                $alias,
+                $command::class));
         }
     }
 }

src/Laravel/Facades/Telegram.php

@@ -136,11 +136,6 @@
  * @method static \Telegram\Bot\Objects\WebhookInfo getWebhookInfo()
  * @method static \Telegram\Bot\Objects\Update getWebhookUpdate(bool $shouldDispatchEvents = true, ?\Psr\Http\Message\RequestInterface $request = null)
  * @method static bool removeWebhook()
- * @method static \Telegram\Bot\Objects\ForumTopic createForumTopic(array $params)
- * @method static bool editForumTopic(array $params)
- * @method static bool closeForumTopic(array $params)
- * @method static bool reopenForumTopic(array $params)
- * @method static bool deleteForumTopic(array $params)
  *
  * @see \Telegram\Bot\Commands\CommandBus
  *

src/Methods/Message.php

@@ -2,7 +2,6 @@
 
 namespace Telegram\Bot\Methods;
 
-use Illuminate\Support\Arr;
 use Telegram\Bot\Actions;
 use Telegram\Bot\Exceptions\TelegramSDKException;
 use Telegram\Bot\Objects\Message as MessageObject;

src/Objects/Update.php

@@ -180,4 +180,16 @@
     {
         return (bool) $this->getMessage()->get('entities', collect())->contains('type', 'bot_command');
     }
+
+    public function getText()
+    {
+        return match ($this->detectType()) {
+            'message' => $this->message->text,
+            'edited_message' => $this->editedMessage->text,
+            'channel_post' => $this->channelPost->text,
+            'edited_channel_post' => $this->editedChannelPost->text,
+            'callback_query' => "/callback:::".$this->callbackQuery->data,
+            default => "",
+        };
+    }
 }