Improvements in chat_id finding process

luzrain · Feb 29, 2024 · 79ad7b5 · 79ad7b5
1 parent 7b9a2d3
commit 79ad7b5
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 18 deletions.
diff --git a/src/TelegramCommand.php b/src/TelegramCommand.php
@@ -10,12 +10,7 @@
 
 abstract class TelegramCommand
 {
-    private int|null $chatId = null;
-
-    public function setChatId(int|null $chatId): void
-    {
-        $this->chatId = $chatId;
-    }
+    public int|null $chatId = null;
 
     protected function reply(
         string $text,

diff --git a/src/UpdateHandler.php b/src/UpdateHandler.php
@@ -55,22 +55,23 @@ private function runController(string $controller, object $update, array $params
         [$service, $method] = \explode('::', $controller, 2);
         $controllerService = $this->serviceLocator->get($service);
 
-        $chatId = null;
+        if ($controllerService instanceof TelegramCommand) {
+            $controllerService->chatId = $this->findChatId($update);
+        }
+
+        return $controllerService->$method($update, ...$params);
+    }
+
+    private function findChatId(object $update): int|null
+    {
         if ($update instanceof Update) {
             foreach ($update as $updateItem) {
-                if (isset($updateItem->chat->id)) {
-                    $chatId = $updateItem->chat->id;
-                    break;
+                if (null !== $chatId = $updateItem->chat->id ?? $updateItem->message->chat->id ?? null) {
+                    return $chatId;
                 }
             }
-        } elseif (isset($update->chat->id)) {
-            $chatId = $update->chat->id;
         }
 
-        if ($controllerService instanceof TelegramCommand) {
-            $controllerService->setChatId($chatId);
-        }
-
-        return $controllerService->$method($update, ...$params);
+        return $update->chat->id ?? $update->message->chat->id ?? null;
     }
 }
diff --git a/tests/Controller/CallbackCommandController.php b/tests/Controller/CallbackCommandController.php
@@ -4,6 +4,7 @@
 
 namespace Luzrain\TelegramBotBundle\Test\Controller;
 
+use Luzrain\TelegramBotApi\EventCallbackReturn;
 use Luzrain\TelegramBotApi\Method;
 use Luzrain\TelegramBotBundle\Attribute\OnCallback;
 use Luzrain\TelegramBotBundle\TelegramCommand;
@@ -12,7 +13,7 @@
 final class CallbackCommandController extends TelegramCommand
 {
     #[OnCallback('test_callback_1')]
-    public function callback1(): Method
+    public function callback1(): Method|EventCallbackReturn
     {
         ControllerTestHelper::$isCallback1 = true;
         return $this->reply('Callback1 answer');