Merge pull request #69 from tanhongit/main

update validate event and bot setting

Author: tanhongit

common/helpers.php

@@ -106,3 +106,15 @@ function enable_all_events(): bool
         return (new SettingHelper())->enableAllEvents();
     }
 }
+
+if (!function_exists('setting_config')) {
+    /**
+     * Return setting config
+     *
+     * @return array
+     */
+    function setting_config(): array
+    {
+        return (new SettingHelper())->getSettingConfig();
+    }
+}

resources/tools/help.php resources/tools/menu.phpresources/tools/help.php renamed to resources/tools/menu.php

@@ -4,6 +4,7 @@
 /id - To get your Chat ID.
 /token - To get this bot token.
 /usage - How to use me.
-/help - To show this Message.
+/settings - Settings github notify.
+/menu - To get this menu.
 
 Select a command:

resources/tools/settings.php

@@ -0,0 +1 @@
+<b>Settings for github notify.</b>

resources/tools/start.php

@@ -8,4 +8,5 @@
 
 Hey <b><?= $first_name ?></b>,
 
-I can send you notifications from your GitHub Repository instantly to your Telegram. use /help for more information about me.
+I can send you notifications from your GitHub Repository instantly to your Telegram.
+Use /menu for more information about me.

setWebhook.php

@@ -36,7 +36,6 @@ public function __construct()
      */
     public function __invoke(): void
     {
-        $this->telegramService->checkCallback();
         $chatMessageId = $this->telegramService->messageData['message']['chat']['id'] ?? '';
 
         if (!empty($chatMessageId)) {
@@ -47,7 +46,10 @@ public function __invoke(): void
         // Send a GitHub event result to all chat ids in env
         if (!is_null($this->request->server->get('HTTP_X_GITHUB_EVENT'))) {
             $this->sendNotification();
+            return;
         }
+
+        $this->telegramService->checkCallback();
     }
 
     /**
@@ -62,7 +64,7 @@ public function handleEventInTelegram(string $chatMessageId): void
             return;
         }
 
-        // Notify access denied to other chat ids
+        // Notify access denied to other/invalid chat ids
         if (!in_array($chatMessageId, $this->chatIds)) {
             $this->notificationService->accessDenied($this->telegramService);
         }

src/Http/Actions/SendNotifyAction.php

@@ -0,0 +1,38 @@
+<?php
+
+namespace TelegramGithubNotify\App\Http\Actions;
+
+class WebhookAction
+{
+    protected string $token;
+
+    public function __construct()
+    {
+        $this->token = config('telegram-bot.token');
+    }
+
+    /**
+     * Set webhook for telegram bot
+     *
+     * @return false|string
+     */
+    public function set(): false|string
+    {
+        $appUrl = config('app.url');
+        $url = "https://api.telegram.org/bot{$this->token}/setWebhook?url={$appUrl}";
+
+        return file_get_contents($url);
+    }
+
+    /**
+     * Delete webhook for telegram bot
+     *
+     * @return false|string
+     */
+    public function delete(): false|string
+    {
+        $url = "https://api.telegram.org/bot{$this->token}/deleteWebhook";
+
+        return file_get_contents($url);
+    }
+}

src/Http/Actions/SetWebhookAction.php

@@ -2,6 +2,7 @@
 
 namespace TelegramGithubNotify\App\Services;
 
+use Exception;
 use Telegram;
 
 class AppService
@@ -29,17 +30,24 @@ public function sendMessage(string $message = '', array $options = [], string $s
             'parse_mode' => 'HTML'
         );
 
-        if ($sendType === 'Message') {
-            $content['text'] = $message;
-        } elseif ($sendType === 'Photo' && !empty($options)) {
-            $content['photo'] = $options['photo'];
-            $content['caption'] = $message;
+        try {
+            if ($sendType === 'Message') {
+                $content['text'] = $message;
+            } elseif ($sendType === 'Photo' && !empty($options)) {
+                $content['photo'] = $options['photo'];
+                $content['caption'] = $message;
+            }
+
+            if (!empty($options) && isset($options['reply_markup'])) {
+                $content['reply_markup'] = $this->telegram->buildInlineKeyBoard(
+                    $options['reply_markup']
+                );
+            }
+
+            $this->telegram->{'send' . $sendType}($content);
+        } catch (Exception $e) {
+            $content['text'] = $e->getMessage();
+            $this->telegram->sendMessage($content);
         }
-
-        if (!empty($options) && isset($options['reply_markup'])) {
-            $content['reply_markup'] = $this->telegram->buildInlineKeyBoard($options['reply_markup']);
-        }
-
-        $this->telegram->{'send' . $sendType}($content);
     }
 }

src/Http/Actions/WebhookAction.php

@@ -15,6 +15,10 @@ class EventSettingService
      */
     public function validateAccessEvent(Request $request, $payload): bool
     {
+        if (enable_all_events()) {
+            return true;
+        }
+
         $eventConfig = event_config();
 
         if (empty($eventConfig)) {