Finished discord threshold notifications

Author: jonezy35

app/Listeners/Threshold/AbsoluteListener.php

@@ -63,6 +63,10 @@ public function handle(ResultCreated $event): void
             $this->telegramChannel($event);
         }
 
+        // Discord notification channel
+        if ($this->notificationSettings->discord_enabled == true && $this->notificationSettings->discord_on_threshold_failure == true) {
+            $this->discordChannel($event);
+        }
         // Webhook notification channel
         if ($this->notificationSettings->webhook_enabled == true && $this->notificationSettings->webhook_on_threshold_failure == true) {
             $this->webhookChannel($event);
@@ -223,24 +227,24 @@ protected function telegramChannel(ResultCreated $event): void
      * Handle Discord notifications.
      */
 
-    protected function sendDiscordNotification(ResultCreated $event): void
+    protected function discordChannel(ResultCreated $event): void
     {
     if ($this->notificationSettings->discord_enabled) {
         $failedThresholds = []; // Initialize an array to keep track of failed thresholds
 
         // Check Download threshold
         if ($this->thresholdSettings->absolute_download > 0 && absoluteDownloadThresholdFailed($this->thresholdSettings->absolute_download, $event->result->downloadBits)) {
-            $failedThresholds[] = 'Download';
+            $failedThresholds['Download'] = ($event->result->downloadBits / 1000000) . " Mbits";
         }
 
         // Check Upload threshold
         if ($this->thresholdSettings->absolute_upload > 0 && absoluteUploadThresholdFailed($this->thresholdSettings->absolute_upload, $event->result->uploadBits)) {
-            $failedThresholds[] = 'Upload';
+            $failedThresholds['Upload'] = ($event->result->uploadBits / 1000000) . " Mbits";
         }
 
         // Check Ping threshold
         if ($this->thresholdSettings->absolute_ping > 0 && absolutePingThresholdFailed($this->thresholdSettings->absolute_ping, $event->result->ping)) {
-            $failedThresholds[] = 'Ping';
+            $failedThresholds['Ping'] = $event->result->ping . " ms";
         }
 
         // Proceed with sending notifications only if there are any failed thresholds
@@ -249,15 +253,14 @@ protected function sendDiscordNotification(ResultCreated $event): void
                 foreach ($this->notificationSettings->discord_webhooks as $webhook) {
                     // Construct the payload with the failed thresholds information
                     $contentLines = [
-                        'There are new speedtest results for your network.',
                         "Result ID: " . $event->result->id,
                         "Site Name: " . $this->generalSettings->site_name
                     ];
-                    foreach ($failedThresholds as $metric) {
-                        $contentLines[] = "{$metric} threshold failed.";
+                    foreach ($failedThresholds as $metric => $result) {
+                        $contentLines[] = "{$metric} threshold failed with result: {$result}.";
                     }
                     $payload = [
-                        'content' => 'Testing Threshold Run',
+                        'content' => implode("\n", $contentLines),
                     ];
 
                     // Send the request using Laravel's HTTP client