update handle send notification & env variables

Author: tanhongit

.env.example

@@ -8,7 +8,8 @@ APP_PORT=3000
 TELEGRAM_BOT_TOKEN=###########:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 TELEGRAM_BOT_CHAT_ID=##########
 
-# Set your telegram group chat ids here ( please use comma to separate )
-TELEGRAM_GROUP_CHAT_IDS="-############,-############"
+# Set telegram chat ids you want to receive notifications here.
+# You can add the owner bot id, group id, ... ( And please use comma to separate )
+TELEGRAM_NOTIFY_CHAT_IDS="-############,-############"
 
 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_GROUP_CHAT_IDS'] ?? ''),
+        'notify_chat_ids' => explode(',', $_ENV['TELEGRAM_NOTIFY_CHAT_IDS'] ?? ''),
 
         'set_webhook_url' => $_ENV['SET_WEBHOOK_URL'] ?? $_ENV['APP_URL'] . '/setWebhook',
     ],

index.php

@@ -1,6 +1,5 @@
 <?php
 
-use GuzzleHttp\Exception\GuzzleException;
 use TelegramGithubNotify\App\Http\Actions\SendNotifyAction;
 use Dotenv\Dotenv;
 
@@ -11,9 +10,5 @@
 
 date_default_timezone_set(config('app.timezone'));
 
-try {
-    $sendNotifyAction = new SendNotifyAction();
-    $sendNotifyAction->handle();
-} catch (GuzzleException $e) {
-    echo $e->getMessage();
-}
+$sendNotifyAction = new SendNotifyAction();
+$sendNotifyAction();

src/Http/Actions/SendNotifyAction.php

@@ -23,16 +23,15 @@ public function __construct()
         $this->telegramService = new TelegramService();
         $this->notificationService = new NotificationService();
 
-        $this->chatIds = config('telegram-bot.gr_chat_ids');
+        $this->chatIds = config('telegram-bot.notify_chat_ids');
     }
 
     /**
-     * Send notify to telegram
+     * Handle send notify to telegram action
      *
      * @return void
-     * @throws GuzzleException
      */
-    public function handle(): void
+    public function __invoke(): void
     {
         $this->telegramService->checkCallback();
         $chatMessageId = $this->telegramService->messageData['message']['chat']['id'] ?? '';
@@ -44,15 +43,14 @@ public function handle(): void
         }
 
         // Send a result to all chat ids in config
-        if (!in_array($chatMessageId, $this->chatIds)) {
+        try {
             $this->notificationService->setPayload($this->request);
             foreach ($this->chatIds as $chatId) {
                 $this->notificationService->sendNotify($chatId);
             }
-            return;
+        } catch (GuzzleException $e) {
+            error_log($e->getMessage());
+            $this->notificationService->accessDenied($this->telegramService); // Notify access denied to other chat ids
         }
-
-        // Notify access denied to other chat ids
-        $this->notificationService->accessDenied($this->telegramService);
     }
 }