From 7cf2ae2f4e2b87ca6f54315638e4495aecfd944b Mon Sep 17 00:00:00 2001
From: Alex Justesen <1144087+alexjustesen@users.noreply.github.com>
Date: Sun, 7 Sep 2025 17:19:19 -0400
Subject: [PATCH 1/2] Refactor webhook payload to match docs

---
 .../Webhook/SendSpeedtestCompletedNotification.php  | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/Listeners/Webhook/SendSpeedtestCompletedNotification.php b/app/Listeners/Webhook/SendSpeedtestCompletedNotification.php
index 85d42d2b9..1f40b214b 100644
--- a/app/Listeners/Webhook/SendSpeedtestCompletedNotification.php
+++ b/app/Listeners/Webhook/SendSpeedtestCompletedNotification.php
@@ -4,6 +4,7 @@
 
 use App\Events\SpeedtestCompleted;
 use App\Settings\NotificationSettings;
+use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Log;
 use Spatie\WebhookServer\WebhookCall;
 
@@ -36,12 +37,14 @@ public function handle(SpeedtestCompleted $event): void
                 ->payload([
                     'result_id' => $event->result->id,
                     'site_name' => config('app.name'),
-                    'isp' => $event->result->isp,
+                    'server_name' => Arr::get($event->result->data, 'server.name'),
+                    'server_id' => Arr::get($event->result->data, 'server.id'),
+                    'isp' => Arr::get($event->result->data, 'isp'),
                     'ping' => $event->result->ping,
-                    'download' => $event->result->downloadBits,
-                    'upload' => $event->result->uploadBits,
-                    'packetLoss' => $event->result->packet_loss,
-                    'speedtest_url' => $event->result->result_url,
+                    'download' => $event->result->download,
+                    'upload' => $event->result->upload,
+                    'packet_loss' => Arr::get($event->result->data, 'packetLoss'),
+                    'speedtest_url' => Arr::get($event->result->data, 'result.url'),
                     'url' => url('/admin/results'),
                 ])
                 ->doNotSign()

From 6d4cd8eb02f1f5c1d6135700acdb5bf9743aeb0f Mon Sep 17 00:00:00 2001
From: Alex Justesen <1144087+alexjustesen@users.noreply.github.com>
Date: Sun, 7 Sep 2025 17:21:50 -0400
Subject: [PATCH 2/2] put back pits fields

---
 app/Listeners/Webhook/SendSpeedtestCompletedNotification.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Listeners/Webhook/SendSpeedtestCompletedNotification.php b/app/Listeners/Webhook/SendSpeedtestCompletedNotification.php
index 1f40b214b..bee0668d6 100644
--- a/app/Listeners/Webhook/SendSpeedtestCompletedNotification.php
+++ b/app/Listeners/Webhook/SendSpeedtestCompletedNotification.php
@@ -41,8 +41,8 @@ public function handle(SpeedtestCompleted $event): void
                     'server_id' => Arr::get($event->result->data, 'server.id'),
                     'isp' => Arr::get($event->result->data, 'isp'),
                     'ping' => $event->result->ping,
-                    'download' => $event->result->download,
-                    'upload' => $event->result->upload,
+                    'download' => $event->result->downloadBits,
+                    'upload' => $event->result->uploadBits,
                     'packet_loss' => Arr::get($event->result->data, 'packetLoss'),
                     'speedtest_url' => Arr::get($event->result->data, 'result.url'),
                     'url' => url('/admin/results'),