From 633d3b3c71f2641a9c6f34a126424e86a1e98341 Mon Sep 17 00:00:00 2001 From: Sven van Ginkel Date: Tue, 9 Dec 2025 01:46:41 +0100 Subject: [PATCH 1/2] chore: Switch Apprise to markdown (#2531) --- app/Listeners/ProcessCompletedSpeedtest.php | 2 +- app/Listeners/ProcessUnhealthySpeedtest.php | 2 +- .../Apprise/SpeedtestNotification.php | 4 +++- .../Apprise/TestNotification.php | 8 +++++-- .../apprise/speedtest-completed.blade.php | 22 ++++++++++--------- .../apprise/speedtest-threshold.blade.php | 15 ++++++++----- 6 files changed, 33 insertions(+), 20 deletions(-) diff --git a/app/Listeners/ProcessCompletedSpeedtest.php b/app/Listeners/ProcessCompletedSpeedtest.php index 66b927f1a..1b72f3053 100644 --- a/app/Listeners/ProcessCompletedSpeedtest.php +++ b/app/Listeners/ProcessCompletedSpeedtest.php @@ -88,7 +88,7 @@ private function notifyAppriseChannels(Result $result): void } Notification::route('apprise_urls', $channelUrl) - ->notify(new SpeedtestNotification($title, $body, 'info')); + ->notify(new SpeedtestNotification($title, $body, 'info', 'markdown')); } } diff --git a/app/Listeners/ProcessUnhealthySpeedtest.php b/app/Listeners/ProcessUnhealthySpeedtest.php index 68b9b6a9b..4f51e4267 100644 --- a/app/Listeners/ProcessUnhealthySpeedtest.php +++ b/app/Listeners/ProcessUnhealthySpeedtest.php @@ -110,7 +110,7 @@ private function notifyAppriseChannels(Result $result): void } Notification::route('apprise_urls', $channelUrl) - ->notify(new SpeedtestNotification($title, $body, 'warning')); + ->notify(new SpeedtestNotification($title, $body, 'warning', 'markdown')); } } diff --git a/app/Notifications/Apprise/SpeedtestNotification.php b/app/Notifications/Apprise/SpeedtestNotification.php index 3c2ffb3cd..710466e57 100644 --- a/app/Notifications/Apprise/SpeedtestNotification.php +++ b/app/Notifications/Apprise/SpeedtestNotification.php @@ -14,6 +14,7 @@ public function __construct( public string $title, public string $body, public string $type = 'info', + public string $format = 'markdown', ) {} /** @@ -35,6 +36,7 @@ public function toApprise(object $notifiable): AppriseMessage ->urls($notifiable->routes['apprise_urls']) ->title($this->title) ->body($this->body) - ->type($this->type); + ->type($this->type) + ->format($this->format); } } diff --git a/app/Notifications/Apprise/TestNotification.php b/app/Notifications/Apprise/TestNotification.php index f07810fcc..8ba9011cc 100644 --- a/app/Notifications/Apprise/TestNotification.php +++ b/app/Notifications/Apprise/TestNotification.php @@ -25,10 +25,14 @@ public function via(object $notifiable): array */ public function toApprise(object $notifiable): AppriseMessage { + $body = '👋 This is a test notification from **'.config('app.name')."**.\n\n"; + $body .= "If you're seeing this, your Apprise notification channel is configured correctly!\n\n"; + return AppriseMessage::create() ->urls($notifiable->routes['apprise_urls']) ->title('Test Notification') - ->body('👋 Testing the Apprise notification channel.') - ->type('info'); + ->body($body) + ->type('info') + ->format('markdown'); } } diff --git a/resources/views/apprise/speedtest-completed.blade.php b/resources/views/apprise/speedtest-completed.blade.php index 6363ee642..2efca5492 100644 --- a/resources/views/apprise/speedtest-completed.blade.php +++ b/resources/views/apprise/speedtest-completed.blade.php @@ -1,11 +1,13 @@ -A new speedtest on {{ config('app.name') }} was completed using {{ $service }}. +A new speedtest on **{{ config('app.name') }}** was completed using **{{ $service }}**. -Server name: {{ $serverName }} -Server ID: {{ $serverId }} -ISP: {{ $isp }} -Ping: {{ $ping }} -Download: {{ $download }} -Upload: {{ $upload }} -Packet Loss: {{ $packetLoss }} % -Ookla Speedtest: {{ $speedtest_url }} -URL: {{ $url }} +### Results +- **Server:** {{ $serverName }} (ID: {{ $serverId }}) +- **ISP:** {{ $isp }} +- **Ping:** {{ $ping }} +- **Download:** {{ $download }} +- **Upload:** {{ $upload }} +- **Packet Loss:** {{ $packetLoss }}% + +### Links +- [View Ookla Results]({{ $speedtest_url }}) +- [View Dashboard]({{ $url }}) diff --git a/resources/views/apprise/speedtest-threshold.blade.php b/resources/views/apprise/speedtest-threshold.blade.php index 6d0bb4926..14a719d0e 100644 --- a/resources/views/apprise/speedtest-threshold.blade.php +++ b/resources/views/apprise/speedtest-threshold.blade.php @@ -1,7 +1,12 @@ -A new speedtest on **{{ config('app.name') }}** was completed using **{{ $service }}** on **{{ $isp }}** but a threshold was breached. - +A new speedtest on **{{ config('app.name') }}** was completed using **{{ $service }}** on **{{ $isp }}** but a threshold was breached +### Failed Metrics @foreach ($metrics as $item) -- **{{ $item['name'] }}** {{ $item['threshold'] }}: {{ $item['value'] }} +- **{{ $item['name'] }}** + - **Threshold:** {{ $item['threshold'] }} | **Actual:** {{ $item['value'] }} @endforeach -- **Ookla Speedtest:** {{ $speedtest_url }} -- **URL:** {{ $url }} +### Server Information +- **Server:** {{ $serverName }} (ID: {{ $serverId }}) +- **ISP:** {{ $isp }} +### Links +- [View Ookla Results]({{ $speedtest_url }}) +- [View Dashboard]({{ $url }}) From 8e869a085db55c3bc78972972b373bddce7861a1 Mon Sep 17 00:00:00 2001 From: Alex Justesen Date: Mon, 8 Dec 2025 20:26:10 -0500 Subject: [PATCH 2/2] Release v1.12.3 (#2532) Co-authored-by: Alex Justesen <1144087+alexjustesen@users.noreply.github.com> --- config/speedtest.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/speedtest.php b/config/speedtest.php index 413914928..dfaf9ac76 100644 --- a/config/speedtest.php +++ b/config/speedtest.php @@ -6,9 +6,9 @@ /** * General settings. */ - 'build_date' => Carbon::parse('2025-12-06'), + 'build_date' => Carbon::parse('2025-12-08'), - 'build_version' => 'v1.12.2', + 'build_version' => 'v1.12.3', 'content_width' => env('CONTENT_WIDTH', '7xl'),