clean and format code v2

Author: tanhongit

.env.example

@@ -2,12 +2,13 @@ APP_NAME='Telegram Github Notify Bot'
 
 # Set your app url here
 APP_URL=https://152.132.127.172:3000
+APP_HOST=localhost
+APP_PORT=3000
 
 TELEGRAM_BOT_TOKEN=###########:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 TELEGRAM_BOT_CHAT_ID=##########
-TELEGRAM_BOT_GR_CHAT_IDS=
 
-TIMEZONE=Asia/Ho_Chi_Minh
+# Set your telegram group chat ids here ( please use comma to separate )
+TELEGRAM_GROUP_CHAT_IDS="-############,-############"
 
-APP_HOST=localhost
-APP_PORT=3000
+TIMEZONE=Asia/Ho_Chi_Minh

config/tg-notifier.php

@@ -10,7 +10,7 @@
     'telegram-bot' => [
         'token' => $_ENV['TELEGRAM_BOT_TOKEN'] ?? '',
         'chat_id' => $_ENV['TELEGRAM_BOT_CHAT_ID'] ?? '',
-        'gr_chat_ids' => explode(',', $_ENV['TELEGRAM_BOT_GR_CHAT_IDS'] ?? ''),
+        'gr_chat_ids' => explode(',', $_ENV['TELEGRAM_GROUP_CHAT_IDS'] ?? ''),
 
         'set_webhook_url' => $_ENV['SET_WEBHOOK_URL'] ?? $_ENV['APP_URL'] . '/setWebhook',
     ],

src/Http/Actions/SendNotifyAction.php

@@ -24,7 +24,6 @@ public function __construct()
         $this->notificationService = new NotificationService();
 
         $this->chatIds = config('telegram-bot.gr_chat_ids');
-        $this->chatIds[] = $this->telegramService->chatId;
     }
 
     /**
@@ -35,8 +34,8 @@ public function __construct()
      */
     public function handle(): void
     {
-        $this->checkCallback();
-        $chatMessageId = $this->telegramService->messageData['message']['chat']['id'] ?? null;
+        $this->telegramService->checkCallback();
+        $chatMessageId = $this->telegramService->messageData['message']['chat']['id'] ?? '';
 
         // Send a result to only the bot owner
         if (!empty($chatMessageId) && $chatMessageId == $this->telegramService->chatId) {
@@ -56,21 +55,4 @@ public function handle(): void
         // Notify access denied to other chat ids
         $this->notificationService->accessDenied($this->telegramService);
     }
-
-    /**
-     * Check callback from a telegram
-     *
-     * @return bool
-     */
-    public function checkCallback(): bool
-    {
-        if (!is_null($this->telegramService->telegram->Callback_ChatID())) {
-            $callback = $this->telegramService->telegram->Callback_Data();
-            $this->telegramService->sendCallbackResponse($callback);
-
-            return true;
-        }
-
-        return false;
-    }
 }

src/Services/TelegramService.php

@@ -161,4 +161,21 @@ public function sendCallbackResponse(string $callback = null): void
             $this->telegram->answerCallbackQuery($content);
         }
     }
+
+    /**
+     * Check callback from a telegram
+     *
+     * @return bool
+     */
+    public function checkCallback(): bool
+    {
+        if (!is_null($this->telegram->Callback_ChatID())) {
+            $callback = $this->telegram->Callback_Data();
+            $this->sendCallbackResponse($callback);
+
+            return true;
+        }
+
+        return false;
+    }
 }