Add Ookla URL to the notification (#1615)

* first commit * added eof line --------- Co-authored-by: Alex Justesen <[email protected]>
alexjustesen · Jul 18, 2024 · ff1e214 · ff1e214
1 parent ac8c709
commit ff1e214
Show file tree

Hide file tree

Showing 31 changed files with 39 additions and 1 deletion.
diff --git a/app/Listeners/Discord/SendSpeedtestCompletedNotification.php b/app/Listeners/Discord/SendSpeedtestCompletedNotification.php
@@ -43,6 +43,7 @@ public function handle(SpeedtestCompleted $event): void
                 'download' => Number::toBitRate(bits: $event->result->download_bits, precision: 2),
                 'upload' => Number::toBitRate(bits: $event->result->upload_bits, precision: 2),
                 'packetLoss' => $event->result->packet_loss,
+                'speedtest_url' => $event->result->result_url,
                 'url' => url('/admin/results'),
             ])->render(),
         ];

diff --git a/app/Listeners/Discord/SendSpeedtestThresholdNotification.php b/app/Listeners/Discord/SendSpeedtestThresholdNotification.php
@@ -69,6 +69,7 @@ public function handle(SpeedtestCompleted $event): void
                 'serverId' => $event->result->server_id,
                 'isp' => $event->result->isp,
                 'metrics' => $failed,
+                'speedtest_url' => $event->result->result_url,
                 'url' => url('/admin/results'),
             ])->render(),
         ];

diff --git a/app/Listeners/Gotify/SendSpeedtestCompletedNotification.php b/app/Listeners/Gotify/SendSpeedtestCompletedNotification.php
@@ -43,6 +43,7 @@ public function handle(SpeedtestCompleted $event): void
                 'download' => Number::toBitRate(bits: $event->result->download_bits, precision: 2),
                 'upload' => Number::toBitRate(bits: $event->result->upload_bits, precision: 2),
                 'packetLoss' => $event->result->packet_loss,
+                'speedtest_url' => $event->result->result_url,
                 'url' => url('/admin/results'),
             ])->render(),
         ];

diff --git a/app/Listeners/Gotify/SendSpeedtestThresholdNotification.php b/app/Listeners/Gotify/SendSpeedtestThresholdNotification.php
@@ -69,6 +69,7 @@ public function handle(SpeedtestCompleted $event): void
                 'serverId' => $event->result->server_id,
                 'isp' => $event->result->isp,
                 'metrics' => $failed,
+                'speedtest_url' => $event->result->result_url,
                 'url' => url('/admin/results'),
             ])->render(),
         ];

diff --git a/app/Listeners/HealthCheck/SendSpeedtestCompletedNotification.php b/app/Listeners/HealthCheck/SendSpeedtestCompletedNotification.php
@@ -41,6 +41,7 @@ public function handle(SpeedtestCompleted $event): void
                     'download' => $event->result->downloadBits,
                     'upload' => $event->result->uploadBits,
                     'packetLoss' => $event->result->packet_loss,
+                    'speedtest_url' => $event->result->result_url,
                     'url' => url('/admin/results'),
                 ])
                 ->doNotSign()

diff --git a/app/Listeners/HealthCheck/SendSpeedtestThresholdNotification.php b/app/Listeners/HealthCheck/SendSpeedtestThresholdNotification.php
@@ -68,6 +68,7 @@ public function handle(SpeedtestCompleted $event): void
                     'site_name' => config('app.name'),
                     'isp' => $event->result->isp,
                     'metrics' => $failed,
+                    'speedtest_url' => $event->result->result_url,
                     'url' => url('/admin/results'),
                 ])
                 ->doNotSign()

diff --git a/app/Listeners/Ntfy/SendSpeedtestCompletedNotification.php b/app/Listeners/Ntfy/SendSpeedtestCompletedNotification.php
@@ -43,6 +43,7 @@ public function handle(SpeedtestCompleted $event): void
                  'download' => Number::toBitRate(bits: $event->result->download_bits, precision: 2),
                  'upload' => Number::toBitRate(bits: $event->result->upload_bits, precision: 2),
                  'packetLoss' => $event->result->packet_loss,
+                 'speedtest_url' => $event->result->result_url,
                  'url' => url('/admin/results'),
              ])->render();
 

diff --git a/app/Listeners/Ntfy/SendSpeedtestThresholdNotification.php b/app/Listeners/Ntfy/SendSpeedtestThresholdNotification.php
@@ -69,6 +69,7 @@ public function handle(SpeedtestCompleted $event): void
                 'serverId' => $event->result->server_id,
                 'isp' => $event->result->isp,
                 'metrics' => $failed,
+                'speedtest_url' => $event->result->result_url,
                 'url' => url('/admin/results'),
             ])->render();
 

diff --git a/app/Listeners/Pushover/SendSpeedtestCompletedNotification.php b/app/Listeners/Pushover/SendSpeedtestCompletedNotification.php
@@ -43,6 +43,7 @@ public function handle(SpeedtestCompleted $event): void
                 'download' => Number::toBitRate(bits: $event->result->download_bits, precision: 2),
                 'upload' => Number::toBitRate(bits: $event->result->upload_bits, precision: 2),
                 'packetLoss' => $event->result->packet_loss,
+                'speedtest_url' => $event->result->result_url,
                 'url' => url('/admin/results'),
             ])->render(),
         ];

diff --git a/app/Listeners/Pushover/SendSpeedtestThresholdNotification.php b/app/Listeners/Pushover/SendSpeedtestThresholdNotification.php
@@ -69,6 +69,7 @@ public function handle(SpeedtestCompleted $event): void
                 'serverId' => $event->result->server_id,
                 'isp' => $event->result->isp,
                 'metrics' => $failed,
+                'speedtest_url' => $event->result->result_url,
                 'url' => url('/admin/results'),
             ])->render(),
         ];

diff --git a/app/Listeners/Slack/SendSpeedtestCompletedNotification.php b/app/Listeners/Slack/SendSpeedtestCompletedNotification.php
@@ -43,6 +43,7 @@ public function handle(SpeedtestCompleted $event): void
                 'download' => Number::toBitRate(bits: $event->result->download_bits, precision: 2),
                 'upload' => Number::toBitRate(bits: $event->result->upload_bits, precision: 2),
                 'packetLoss' => $event->result->packet_loss,
+                'speedtest_url' => $event->result->result_url,
                 'url' => url('/admin/results'),
             ])->render(),
         ];

diff --git a/app/Listeners/Slack/SendSpeedtestThresholdNotification.php b/app/Listeners/Slack/SendSpeedtestThresholdNotification.php
@@ -69,6 +69,7 @@ public function handle(SpeedtestCompleted $event): void
                 'serverId' => $event->result->server_id,
                 'isp' => $event->result->isp,
                 'metrics' => $failed,
+                'speedtest_url' => $event->result->result_url,
                 'url' => url('/admin/results'),
             ])->render(),
         ];

diff --git a/app/Listeners/Telegram/SendSpeedtestCompletedNotification.php b/app/Listeners/Telegram/SendSpeedtestCompletedNotification.php
@@ -43,6 +43,7 @@ public function handle(SpeedtestCompleted $event): void
             'download' => Number::toBitRate(bits: $event->result->download_bits, precision: 2),
             'upload' => Number::toBitRate(bits: $event->result->upload_bits, precision: 2),
             'packetLoss' => is_numeric($event->result->packet_loss) ? round($event->result->packet_loss, 2) : 'n/a',
+            'speedtest_url' => $event->result->result_url,
             'url' => url('/admin/results'),
         ])->render();
 

diff --git a/app/Listeners/Telegram/SendSpeedtestThresholdNotification.php b/app/Listeners/Telegram/SendSpeedtestThresholdNotification.php
@@ -69,6 +69,7 @@ public function handle(SpeedtestCompleted $event): void
             'serverId' => $event->result->server_id,
             'isp' => $event->result->isp,
             'metrics' => $failed,
+            'speedtest_url' => $event->result->result_url,
             'url' => url('/admin/results'),
         ])->render();
 

diff --git a/app/Listeners/Webhook/SendSpeedtestCompletedNotification.php b/app/Listeners/Webhook/SendSpeedtestCompletedNotification.php
@@ -41,6 +41,7 @@ public function handle(SpeedtestCompleted $event): void
                     'download' => $event->result->downloadBits,
                     'upload' => $event->result->uploadBits,
                     'packetLoss' => $event->result->packet_loss,
+                    'speedtest_url' => $event->result->result_url,
                     'url' => url('/admin/results'),
                 ])
                 ->doNotSign()

diff --git a/app/Listeners/Webhook/SendSpeedtestThresholdNotification.php b/app/Listeners/Webhook/SendSpeedtestThresholdNotification.php
@@ -68,6 +68,7 @@ public function handle(SpeedtestCompleted $event): void
                     'site_name' => config('app.name'),
                     'isp' => $event->result->isp,
                     'metrics' => $failed,
+                    'speedtest_url' => $event->result->result_url,
                     'url' => url('/admin/results'),
                 ])
                 ->doNotSign()

diff --git a/app/Mail/SpeedtestCompletedMail.php b/app/Mail/SpeedtestCompletedMail.php
@@ -52,6 +52,7 @@ public function content(): Content
                 'download' => Number::toBitRate(bits: $this->result->download_bits, precision: 2),
                 'upload' => Number::toBitRate(bits: $this->result->upload_bits, precision: 2),
                 'packetLoss' => is_numeric($this->result->packet_loss) ? $this->result->packet_loss : 'n/a',
+                'speedtest_url' => $this->result->result_url,
                 'url' => url('/admin/results'),
             ],
         );

diff --git a/app/Mail/SpeedtestThresholdMail.php b/app/Mail/SpeedtestThresholdMail.php
@@ -48,6 +48,7 @@ public function content(): Content
                 'serverName' => $this->result->server_name,
                 'serverId' => $this->result->server_id,
                 'isp' => $this->result->isp,
+                'speedtest_url' => $this->result->result_url,
                 'url' => url('/admin/results'),
                 'metrics' => $this->metrics,
             ],

diff --git a/resources/views/discord/speedtest-completed.blade.php b/resources/views/discord/speedtest-completed.blade.php
@@ -9,4 +9,5 @@
 - **Download:** {{ $download }}
 - **Upload:** {{ $upload }}
 - **Packet Loss:** {{ $packetLoss }} **%**
+- **Ookla Speedtest:** {{ $speedtest_url }}
 - **URL:** {{ $url }}
diff --git a/resources/views/discord/speedtest-threshold.blade.php b/resources/views/discord/speedtest-threshold.blade.php
@@ -5,4 +5,5 @@
 @foreach ($metrics as $item)
 - **{{ $item['name'] }}** {{ $item['threshold'] }}: {{ $item['value'] }}
 @endforeach
+- **Ookla Speedtest:** {{ $speedtest_url }}
 - **URL:** {{ $url }}
diff --git a/resources/views/emails/speedtest-completed.blade.php b/resources/views/emails/speedtest-completed.blade.php
@@ -12,14 +12,19 @@
 | Ping        | {{ $ping }}                |
 | Download    | {{ $download }}            |
 | Upload      | {{ $upload }}              |
-| Packet Loss | {{ $packetLoss }}**%**    |
+| Packet Loss | {{ $packetLoss }} **%**    |
+
 
 </x-mail::table>
 
 <x-mail::button :url="$url">
 View Results
 </x-mail::button>
 
+<x-mail::button :Ookla Speedtest="$speedtest_url">
+View Results on Ookla
+</x-mail::button>
+
 Thanks,<br>
 {{ config('app.name') }}
 </x-mail::message>
diff --git a/resources/views/emails/speedtest-threshold.blade.php b/resources/views/emails/speedtest-threshold.blade.php
@@ -15,6 +15,10 @@
 View Results
 </x-mail::button>
 
+<x-mail::button :Ookla Speedtest="$speedtest_url">
+View Results on Ookla
+</x-mail::button>
+
 Thanks,<br>
 {{ config('app.name') }}
 </x-mail::message>
diff --git a/resources/views/gotify/speedtest-completed.blade.php b/resources/views/gotify/speedtest-completed.blade.php
@@ -9,4 +9,5 @@
 - Download: {{ $download }}
 - Upload: {{ $upload }}
 - Packet Loss: {{ $packetLoss }} %
+- **Ookla Speedtest:** {{ $speedtest_url }}
 - URL: {{ $url }}
diff --git a/resources/views/gotify/speedtest-threshold.blade.php b/resources/views/gotify/speedtest-threshold.blade.php
@@ -5,4 +5,5 @@
 @foreach ($metrics as $item)
 - {{ $item['name'] }} {{ $item['threshold'] }}: {{ $item['value'] }}
 @endforeach
+- **Ookla Speedtest:** {{ $speedtest_url }}
 - URL: {{ $url }}
diff --git a/resources/views/ntfy/speedtest-completed.blade.php b/resources/views/ntfy/speedtest-completed.blade.php
@@ -9,4 +9,5 @@
 Download: {{ $download }}
 Upload: {{ $upload }}
 Packet Loss: {{ $packetLoss }} %
+Ookla Speedtest: {{ $speedtest_url }}
 URL: {{ $url }}
diff --git a/resources/views/ntfy/speedtest-threshold.blade.php b/resources/views/ntfy/speedtest-threshold.blade.php
@@ -5,4 +5,5 @@
 @foreach ($metrics as $item)
 - {{ $item['name'] }} {{ $item['threshold'] }}: {{ $item['value'] }}
 @endforeach
+- Ookla Speedtest: {{ $speedtest_url }}
 - URL: {{ $url }}
diff --git a/resources/views/pushover/speedtest-completed.blade.php b/resources/views/pushover/speedtest-completed.blade.php
@@ -9,4 +9,5 @@
 - Download: {{ $download }}
 - Upload: {{ $upload }}
 - Packet Loss: {{ $packetLoss }} %
+- Ookla Speedtest: {{ $speedtest_url }}
 - URL: {{ $url }}
diff --git a/resources/views/pushover/speedtest-threshold.blade.php b/resources/views/pushover/speedtest-threshold.blade.php
@@ -5,4 +5,5 @@
 @foreach ($metrics as $item)
 - {{ $item['name'] }} {{ $item['threshold'] }}: {{ $item['value'] }}
 @endforeach
+- Ookla Speedtest: {{ $speedtest_url }}
 - URL: {{ $url }}
diff --git a/resources/views/slack/speedtest-completed.blade.php b/resources/views/slack/speedtest-completed.blade.php
@@ -9,4 +9,5 @@
 - *Download:* {{ $download }}
 - *Upload:* {{ $upload }}
 - *Packet Loss:* {{ $packetLoss }} *%*
+- **Ookla Speedtest:** {{ $speedtest_url }}
 - *URL:* {{ $url }}
diff --git a/resources/views/telegram/speedtest-completed.blade.php b/resources/views/telegram/speedtest-completed.blade.php
@@ -9,4 +9,5 @@
 - *Download:* {{ $download }}
 - *Upload:* {{ $upload }}
 - **Packet Loss:** {{ $packetLoss }}**%**
+- **Ookla Speedtest:** {{ $speedtest_url }}
 - **URL:** {{ $url }}
diff --git a/resources/views/telegram/speedtest-threshold.blade.php b/resources/views/telegram/speedtest-threshold.blade.php
@@ -5,4 +5,5 @@
 @foreach ($metrics as $item)
 - **{{ $item['name'] }}** {{ $item['threshold'] }}: {{ $item['value'] }}
 @endforeach
+- **Ookla Speedtest:** {{ $speedtest_url }}
 - **URL:** {{ $url }}