[Feature] more details in telegram notifications (alexjustesen#494)

Author: alexjustesen

app/Listeners/SpeedtestCompletedListener.php

@@ -4,13 +4,16 @@
 
 use App\Events\ResultCreated;
 use App\Mail\SpeedtestCompletedMail;
+use App\Settings\GeneralSettings;
 use App\Settings\NotificationSettings;
 use App\Telegram\TelegramNotification;
 use Filament\Notifications\Notification;
 use Illuminate\Support\Facades\Mail;
 
 class SpeedtestCompletedListener
 {
+    public $generalSettings;
+
     public $notificationSettings;
 
     /**
@@ -20,6 +23,8 @@ class SpeedtestCompletedListener
      */
     public function __construct()
     {
+        $this->generalSettings = new (GeneralSettings::class);
+
         $this->notificationSettings = new (NotificationSettings::class);
     }
 
@@ -59,6 +64,7 @@ public function handle(ResultCreated $event)
 
                     $message = view('telegram.speedtest-completed', [
                         'id' => $event->result->id,
+                        'site_name' => $this->generalSettings->site_name,
                         'ping' => $ping_value,
                         'download' => $download_value,
                         'upload' => $upload_value,

app/Listeners/Threshold/AbsoluteListener.php

@@ -4,6 +4,7 @@
 
 use App\Events\ResultCreated;
 use App\Mail\Threshold\AbsoluteMail;
+use App\Settings\GeneralSettings;
 use App\Settings\NotificationSettings;
 use App\Settings\ThresholdSettings;
 use App\Telegram\TelegramNotification;
@@ -14,6 +15,8 @@
 
 class AbsoluteListener implements ShouldQueue
 {
+    public $generalSettings;
+
     public $notificationSettings;
 
     public $thresholdSettings;
@@ -25,6 +28,8 @@ class AbsoluteListener implements ShouldQueue
      */
     public function __construct()
     {
+        $this->generalSettings = new (GeneralSettings::class);
+
         $this->notificationSettings = new (NotificationSettings::class);
 
         $this->thresholdSettings = new (ThresholdSettings::class);
@@ -205,6 +210,7 @@ protected function telegramChannel(ResultCreated $event)
                 $message = view('telegram.threshold.absolute', [
                     'id' => $event->result->id,
                     'url' => url('/admin/results'),
+                    'site_name' => $this->generalSettings->site_name,
                     'metrics' => $failedThresholds,
                 ])->render();
 

resources/views/telegram/speedtest-completed.blade.php

@@ -1,4 +1,7 @@
-Speedtest #{{ $id }}
+{{ $site_name }} - Result *#{{ $id }}*
+
+*Speedtest Completed*
+-----
 Ping: *{{ $ping }}*
 Download: *{{ $download }}*
 Upload: *{{ $upload }}*

resources/views/telegram/threshold/absolute.blade.php

@@ -1,5 +1,7 @@
-Speedtest Result *#{{ $id }}*
-*Absolute Threshold Failed*
+{{ $site_name }} - Result *#{{ $id }}*
+
+*Absolute Threshold(s) Failed*
+-----
 @foreach ($metrics as $item)
-Threshold *{{ $item['name'] }}* {{ $item['threshold'] }}: *{{ $item['value'] }}* 
+Threshold *{{ $item['name'] }}* {{ $item['threshold'] }}: *{{ $item['value'] }}*
 @endforeach