diff --git a/app/Listeners/ProcessCompletedSpeedtest.php b/app/Listeners/ProcessCompletedSpeedtest.php index 87b7b779..c1399c07 100644 --- a/app/Listeners/ProcessCompletedSpeedtest.php +++ b/app/Listeners/ProcessCompletedSpeedtest.php @@ -72,7 +72,7 @@ class ProcessCompletedSpeedtest 'ping' => round($result->ping).' ms', 'download' => Number::toBitRate(bits: $result->download_bits, precision: 2), 'upload' => Number::toBitRate(bits: $result->upload_bits, precision: 2), - 'packetLoss' => $result->packet_loss, + 'packetLoss' => $result->packet_loss ? round($result->packet_loss, precision: 2) : '', 'speedtest_url' => $result->result_url, 'url' => url('/admin/results'), ])->render(); diff --git a/app/Mail/CompletedSpeedtestMail.php b/app/Mail/CompletedSpeedtestMail.php index 109d9536..cfd7cecf 100644 --- a/app/Mail/CompletedSpeedtestMail.php +++ b/app/Mail/CompletedSpeedtestMail.php @@ -51,7 +51,7 @@ class CompletedSpeedtestMail extends Mailable implements ShouldQueue 'ping' => round($this->result->ping, 2).' ms', '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', + 'packetLoss' => $result->packet_loss ? round($result->packet_loss, precision: 2) : '', 'speedtest_url' => $this->result->result_url, 'url' => url('/admin/results'), ], diff --git a/resources/views/apprise/speedtest-completed.blade.php b/resources/views/apprise/speedtest-completed.blade.php index 2efca549..13a29162 100644 --- a/resources/views/apprise/speedtest-completed.blade.php +++ b/resources/views/apprise/speedtest-completed.blade.php @@ -6,7 +6,9 @@ A new speedtest on **{{ config('app.name') }}** was completed using **{{ $servic - **Ping:** {{ $ping }} - **Download:** {{ $download }} - **Upload:** {{ $upload }} +@filled($packetLoss) - **Packet Loss:** {{ $packetLoss }}% +@endfilled ### Links - [View Ookla Results]({{ $speedtest_url }}) diff --git a/resources/views/mail/speedtest/completed.blade.php b/resources/views/mail/speedtest/completed.blade.php index ac40c0e0..cb0413e4 100644 --- a/resources/views/mail/speedtest/completed.blade.php +++ b/resources/views/mail/speedtest/completed.blade.php @@ -12,7 +12,9 @@ A new speedtest was completed using **{{ $service }}**. | Ping | {{ $ping }} | | Download | {{ $download }} | | Upload | {{ $upload }} | +@filled($packetLoss) | Packet Loss | {{ $packetLoss }} **%** | +@endfilled