Merge pull request #4 from Thiritin/optional-telegram

Optional telegram
Thiritin · Aug 21, 2024 · 2f3b0c5 · 2f3b0c5
2 parents 3c1c9b0 + 6ef2897
commit 2f3b0c5
Show file tree

Hide file tree

Showing 9 changed files with 55 additions and 14 deletions.
diff --git a/app/Listeners/EmergencyNotificationsListener.php b/app/Listeners/EmergencyNotificationsListener.php
@@ -14,7 +14,10 @@ public function __construct()
 
     public function handle(EmergencyEvent $event): void
     {
-        \Illuminate\Support\Facades\Notification::route('telegram', config('services.telegram-bot-api.chat_id'))
-            ->notify(new EmergencyNotification($event->user, $event->type, $event->screens));
+        if (config('services.telegram-bot-api.chat_id'))
+        {
+            \Illuminate\Support\Facades\Notification::route('telegram', config('services.telegram-bot-api.chat_id'))
+                ->notify(new EmergencyNotification($event->user, $event->type, $event->screens));
+        }
     }
 }
diff --git a/app/Listeners/Screens/NotifyAdminScreenAvailable.php b/app/Listeners/Screens/NotifyAdminScreenAvailable.php
@@ -17,7 +17,10 @@ public function __construct()
 
     public function handle(FirstPingEvent $event): void
     {
-        \Illuminate\Support\Facades\Notification::route('telegram', config('services.telegram-bot-api.chat_id'))
-            ->notify(new ScreenFirstTimeNotification($event->screen));
+        if (config('services.telegram-bot-api.chat_id'))
+        {
+            \Illuminate\Support\Facades\Notification::route('telegram', config('services.telegram-bot-api.chat_id'))
+                ->notify(new ScreenFirstTimeNotification($event->screen));
+        }
     }
 }
diff --git a/app/Listeners/Screens/NotifyAdminScreenOffline.php b/app/Listeners/Screens/NotifyAdminScreenOffline.php
@@ -34,7 +34,11 @@ public function handle(OfflineEvent $event): void
         if($event->screen->provisioned === false) {
             return;
         }
-        \Illuminate\Support\Facades\Notification::route('telegram', config('services.telegram-bot-api.chat_id'))
-            ->notify(new ScreenOfflineNotification($event->screen));
+
+        if (config('services.telegram-bot-api.chat_id'))
+        {
+            \Illuminate\Support\Facades\Notification::route('telegram', config('services.telegram-bot-api.chat_id'))
+                ->notify(new ScreenOfflineNotification($event->screen));
+        }
     }
 }
diff --git a/app/Listeners/Screens/NotifyAdminScreenOnline.php b/app/Listeners/Screens/NotifyAdminScreenOnline.php
@@ -33,10 +33,14 @@ public function __construct()
      */
     public function handle(OnlineEvent $event): void
     {
-        if($event->screen->provisioned === false) {
+        if ($event->screen->provisioned === false) {
             return;
         }
-        \Illuminate\Support\Facades\Notification::route('telegram', config('services.telegram-bot-api.chat_id'))
-            ->notify(new ScreenOnlineNotification($event->screen));
+
+        if (config('services.telegram-bot-api.chat_id'))
+        {
+            \Illuminate\Support\Facades\Notification::route('telegram', config('services.telegram-bot-api.chat_id'))
+                ->notify(new ScreenOnlineNotification($event->screen));
+        }
     }
 }
diff --git a/app/Notifications/EmergencyNotification.php b/app/Notifications/EmergencyNotification.php
@@ -23,7 +23,14 @@ public function __construct(
 
     public function via(): array
     {
-        return ['telegram','admin'];
+        $notifications = ['admin'];
+
+        if (config('services.telegram-bot-api.chat_id'))
+        {
+            $notifications[] = 'telegram';
+        }
+
+        return $notifications;
     }
 
     /**

diff --git a/app/Notifications/ScreenFirstTimeNotification.php b/app/Notifications/ScreenFirstTimeNotification.php
@@ -17,7 +17,14 @@ public function __construct(readonly private Screen $screen)
 
     public function via(): array
     {
-        return ['telegram','admin'];
+        $notifications = ['admin'];
+
+        if (config('services.telegram-bot-api.chat_id'))
+        {
+            $notifications[] = 'telegram';
+        }
+
+        return $notifications;
     }
 
     /**

diff --git a/app/Notifications/ScreenOfflineNotification.php b/app/Notifications/ScreenOfflineNotification.php
@@ -17,7 +17,14 @@ public function __construct(readonly public Screen $screen)
 
     public function via(): array
     {
-        return ['telegram','admin'];
+        $notifications = ['admin'];
+
+        if (config('services.telegram-bot-api.chat_id'))
+        {
+            $notifications[] = 'telegram';
+        }
+
+        return $notifications;
     }
 
     /**

diff --git a/app/Notifications/ScreenOnlineNotification.php b/app/Notifications/ScreenOnlineNotification.php
@@ -17,7 +17,14 @@ public function __construct(readonly private Screen $screen)
 
     public function via(): array
     {
-        return ['telegram','admin'];
+        $notifications = ['admin'];
+
+        if (config('services.telegram-bot-api.chat_id'))
+        {
+            $notifications[] = 'telegram';
+        }
+
+        return $notifications;
     }
 
     /**

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,4 +1,3 @@
-version: '3'
 services:
     laravel.test:
         build: