Skip to content

Commit 4ff86a9

Browse files
authored
Add App url and Packet loss to the notifications (alexjustesen#1390)
1 parent 4bdd5f1 commit 4ff86a9

12 files changed

+25
-7
lines changed

app/Listeners/Discord/SendSpeedtestCompletedNotification.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ public function handle(SpeedtestCompleted $event): void
4141
'ping' => round($event->result->ping).' ms',
4242
'download' => Number::toBitRate(bits: $event->result->download_bits, precision: 2),
4343
'upload' => Number::toBitRate(bits: $event->result->upload_bits, precision: 2),
44+
'packetLoss' => $event->result->packet_loss,
45+
'url' => url('/admin/results'),
4446
])->render(),
4547
];
4648

app/Listeners/Discord/SendSpeedtestThresholdNotification.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ public function handle(SpeedtestCompleted $event): void
6868
'serverName' => $event->result->server_name,
6969
'serverId' => $event->result->server_id,
7070
'metrics' => $failed,
71+
'url' => url('/admin/results'),
7172
])->render(),
7273
];
7374

app/Listeners/Telegram/SendSpeedtestCompletedNotification.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ public function handle(SpeedtestCompleted $event): void
4141
'ping' => round($event->result->ping).' ms',
4242
'download' => Number::toBitRate(bits: $event->result->download_bits, precision: 2),
4343
'upload' => Number::toBitRate(bits: $event->result->upload_bits, precision: 2),
44+
'packetLoss' => $event->result->packet_loss,
45+
'url' => url('/admin/results'),
4446
])->render();
4547

4648
foreach ($notificationSettings->telegram_recipients as $recipient) {

app/Listeners/Telegram/SendSpeedtestThresholdNotification.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ public function handle(SpeedtestCompleted $event): void
6868
'serverName' => $event->result->server_name,
6969
'serverId' => $event->result->server_id,
7070
'metrics' => $failed,
71+
'url' => url('/admin/results'),
7172
])->render();
7273

7374
foreach ($notificationSettings->telegram_recipients as $recipient) {

app/Listeners/Webhook/SendSpeedtestCompletedNotification.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ public function handle(SpeedtestCompleted $event): void
3939
'ping' => $event->result->ping,
4040
'download' => $event->result->downloadBits,
4141
'upload' => $event->result->uploadBits,
42+
'packetLoss' => $event->result->packet_loss,
43+
'url' => url('/admin/results'),
4244
])
4345
->doNotSign()
4446
->dispatch();

app/Listeners/Webhook/SendSpeedtestThresholdNotification.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ public function handle(SpeedtestCompleted $event): void
6767
'result_id' => $event->result->id,
6868
'site_name' => config('app.name'),
6969
'metrics' => $failed,
70+
'url' => url('/admin/results'),
7071
])
7172
->doNotSign()
7273
->dispatch();

app/Mail/SpeedtestCompletedMail.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ public function content(): Content
5151
'ping' => round($this->result->ping, 2).' ms',
5252
'download' => Number::toBitRate(bits: $this->result->download_bits, precision: 2),
5353
'upload' => Number::toBitRate(bits: $this->result->upload_bits, precision: 2),
54+
'packetLoss' => $event->result->packet_loss,
5455
'url' => url('/admin/results'),
5556
],
5657
);

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,5 @@
77
- **Ping:** {{ $ping }}
88
- **Download:** {{ $download }}
99
- **Upload:** {{ $upload }}
10+
- **Packet Loss:** {{ $packetLoss }} **%**
11+
- **URL:** {{ $url }}

resources/views/discord/speedtest-threshold.blade.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@
55
@foreach ($metrics as $item)
66
- **{{ $item['name'] }}** {{ $item['threshold'] }}: {{ $item['value'] }}
77
@endforeach
8+
- **URL:** {{ $url }}

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

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,15 @@
44
A new speedtest was completed using **{{ $service }}**.
55

66
<x-mail::table>
7-
| **Metric** | **Value** |
8-
|:------------|------------------:|
9-
| Server name | {{ $serverName }} |
10-
| Server ID | {{ $serverId }} |
11-
| Ping | {{ $ping }} |
12-
| Download | {{ $download }} |
13-
| Upload | {{ $upload }} |
7+
| **Metric** | **Value** |
8+
|:------------|---------------------------:|
9+
| Server name | {{ $serverName }} |
10+
| Server ID | {{ $serverId }} |
11+
| Ping | {{ $ping }} |
12+
| Download | {{ $download }} |
13+
| Upload | {{ $upload }} |
14+
| Packet Loss | {{ $packetLoss }} **%** |
15+
1416
</x-mail::table>
1517

1618
<x-mail::button :url="$url">

0 commit comments

Comments
 (0)