fix: change code activity stream cli set webhook

Author: LuongTienThinh

composer.json

@@ -51,13 +51,7 @@
   },
   "scripts": {
     "analyse": "vendor/bin/phpstan analyse",
-    "format": "vendor/bin/php-cs-fixer fix --allow-risky=yes",
-    "post-install-cmd": [
-      "bash vendor/cslant/telegram-git-notifier/install.sh"
-    ],
-    "post-update-cmd": [
-      "bash vendor/cslant/telegram-git-notifier/install.sh"
-    ]
+    "format": "vendor/bin/php-cs-fixer fix --allow-risky=yes"
   },
   "support": {
     "issues": "https://github.com/cslant/laravel-telegram-git-notifier/issues"

src/Commands/SetWebhook.php

@@ -5,7 +5,6 @@
 use CSlant\LaravelTelegramGitNotifier\Services\WebhookService;
 use CSlant\TelegramGitNotifier\Exceptions\WebhookException;
 use Illuminate\Console\Command;
-use Illuminate\Support\Facades\Log;
 
 class SetWebhook extends Command
 {
@@ -39,7 +38,7 @@ public function __construct(WebhookService $webhookService)
     public function handle(): void
     {
         try {
-            $log = $this->webhookService->handle();
+            $log = $this->webhookService->setWebhook();
 
             $this->info($log);
         } catch (WebhookException $e) {

src/Http/Actions/WebhookAction.php

@@ -2,18 +2,16 @@
 
 namespace CSlant\LaravelTelegramGitNotifier\Http\Actions;
 
+use CSlant\LaravelTelegramGitNotifier\Services\WebhookService;
 use CSlant\TelegramGitNotifier\Exceptions\WebhookException;
-use CSlant\TelegramGitNotifier\Webhook;
 
 class WebhookAction
 {
-    protected Webhook $webhook;
+    protected WebhookService $webhookService;
 
-    public function __construct()
+    public function __construct(WebhookService $webhookService)
     {
-        $this->webhook = new Webhook();
-        $this->webhook->setToken(config('telegram-git-notifier.bot.token'));
-        $this->webhook->setUrl(config('telegram-git-notifier.app.url'));
+        $this->webhookService = $webhookService;
     }
 
     /**
@@ -25,7 +23,7 @@ public function __construct()
      */
     public function set(): string
     {
-        return $this->webhook->setWebhook();
+        return $this->webhookService->setWebhook();
     }
 
     /**
@@ -37,7 +35,7 @@ public function set(): string
      */
     public function delete(): string
     {
-        return $this->webhook->deleteWebHook();
+        return $this->webhookService->deleteWebHook();
     }
 
     /**
@@ -49,7 +47,7 @@ public function delete(): string
      */
     public function getUpdates(): string
     {
-        return $this->webhook->getUpdates();
+        return $this->webhookService->getUpdates();
     }
 
     /**
@@ -61,6 +59,6 @@ public function getUpdates(): string
      */
     public function getWebHookInfo(): string
     {
-        return $this->webhook->getWebHookInfo();
+        return $this->webhookService->getWebHookInfo();
     }
 }

src/Services/WebhookService.php

@@ -2,23 +2,62 @@
 
 namespace CSlant\LaravelTelegramGitNotifier\Services;
 
-use CSlant\LaravelTelegramGitNotifier\Http\Actions\WebhookAction;
 use CSlant\TelegramGitNotifier\Exceptions\WebhookException;
+use CSlant\TelegramGitNotifier\Webhook;
 
 class WebhookService
 {
-    protected WebhookAction $webhookAction;
+    protected Webhook $webhook;
 
-    public function __construct(WebhookAction $webhookAction) {
-        $this->webhookAction = $webhookAction;
+    public function __construct(Webhook $webhook)
+    {
+        $this->webhook = $webhook;
+        $this->webhook->setToken(config('telegram-git-notifier.bot.token'));
+        $this->webhook->setUrl(config('telegram-git-notifier.app.url'));
+    }
+
+    /**
+     * Set webhook for telegram bot.
+     *
+     * @return string
+     * @throws WebhookException
+     */
+    public function setWebhook(): string
+    {
+        return $this->webhook->setWebhook();
+    }
+
+    /**
+     * Delete webhook for telegram bot.
+     *
+     * @return string
+     * @throws WebhookException
+     */
+    public function deleteWebHook(): string
+    {
+        return $this->webhook->deleteWebHook();
     }
 
+    /**
+     * Get webhook update.
+     *
+     * @return string
+     * @throws WebhookException
+     */
+    public function getUpdates(): string
+    {
+        return $this->webhook->getUpdates();
+    }
 
     /**
+     * Get webhook info.
+     *
+     * @return string
+     *
      * @throws WebhookException
      */
-    public function handle(): string
+    public function getWebHookInfo(): string
     {
-        return $this->webhookAction->set();
+        return $this->webhook->getWebHookInfo();
     }
 }