From cb5dc13bf1260594c80b913bc44de449f6bdd9e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Nov=C3=A1k?= <jakub@jnovak.dev>
Date: Tue, 1 Oct 2024 21:42:13 +0200
Subject: [PATCH] updated DiscordMessages for Internal&ScheduledTask
 notifications

---
 app/Notifications/Dto/DiscordMessage.php           |  5 +++++
 app/Notifications/Internal/GeneralNotification.php |  9 +++++++--
 app/Notifications/ScheduledTask/TaskFailed.php     | 13 +++++++++++--
 3 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/app/Notifications/Dto/DiscordMessage.php b/app/Notifications/Dto/DiscordMessage.php
index 39c4be718..0d0028f56 100644
--- a/app/Notifications/Dto/DiscordMessage.php
+++ b/app/Notifications/Dto/DiscordMessage.php
@@ -28,6 +28,11 @@ class DiscordMessage
         return hexdec('ff705f');
     }
 
+    public static function infoColor(): int
+    {
+        return hexdec('4f545c');
+    }
+
     public function addField(string $name, string $value): self
     {
         $this->fields[] = [
diff --git a/app/Notifications/Internal/GeneralNotification.php b/app/Notifications/Internal/GeneralNotification.php
index 1d4d648c8..48e7d8340 100644
--- a/app/Notifications/Internal/GeneralNotification.php
+++ b/app/Notifications/Internal/GeneralNotification.php
@@ -4,6 +4,7 @@ namespace App\Notifications\Internal;
 
 use App\Notifications\Channels\DiscordChannel;
 use App\Notifications\Channels\TelegramChannel;
+use App\Notifications\Dto\DiscordMessage;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Notifications\Notification;
@@ -32,9 +33,13 @@ class GeneralNotification extends Notification implements ShouldQueue
         return $channels;
     }
 
-    public function toDiscord(): string
+    public function toDiscord(): DiscordMessage
     {
-        return $this->message;
+        return new DiscordMessage(
+            title: 'Coolify: General Notification',
+            description: $this->message,
+            color: DiscordMessage::infoColor(),
+        );
     }
 
     public function toTelegram(): array
diff --git a/app/Notifications/ScheduledTask/TaskFailed.php b/app/Notifications/ScheduledTask/TaskFailed.php
index 479cc1aa1..aac665fb6 100644
--- a/app/Notifications/ScheduledTask/TaskFailed.php
+++ b/app/Notifications/ScheduledTask/TaskFailed.php
@@ -3,6 +3,7 @@
 namespace App\Notifications\ScheduledTask;
 
 use App\Models\ScheduledTask;
+use App\Notifications\Dto\DiscordMessage;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Notifications\Messages\MailMessage;
@@ -46,9 +47,17 @@ class TaskFailed extends Notification implements ShouldQueue
         return $mail;
     }
 
-    public function toDiscord(): string
+    public function toDiscord(): DiscordMessage
     {
-        return "Coolify: Scheduled task ({$this->task->name}, [link]({$this->url})) failed with output: {$this->output}";
+        $message = new DiscordMessage(
+            title: "Coolify: Scheduled task ({$this->task->name}) failed.",
+            description: "Output: {$this->output}",
+            color: DiscordMessage::errorColor(),
+        );
+
+        $message->addField('Link', '[Open task in Coolify]('.$this->url.')');
+
+        return $message;
     }
 
     public function toTelegram(): array