From 22caed4fa197e106b22e3324d720437ef3863f58 Mon Sep 17 00:00:00 2001
From: Twyco <twyco@icloud.com>
Date: Sat, 25 Apr 2026 20:28:00 +0200
Subject: [PATCH] request fix

---
 .../Requests/StoreProjectNotificationActionRequest.php     | 6 +++++-
 .../Requests/UpdateProjectNotificationActionRequest.php    | 7 +++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/app/Http/Requests/StoreProjectNotificationActionRequest.php b/app/Http/Requests/StoreProjectNotificationActionRequest.php
index 2ca4a03..7c050dd 100644
--- a/app/Http/Requests/StoreProjectNotificationActionRequest.php
+++ b/app/Http/Requests/StoreProjectNotificationActionRequest.php
@@ -26,6 +26,10 @@ class StoreProjectNotificationActionRequest extends FormRequest
      */
     public function rules(): array
     {
+        $messageTemplateRules = $this->input('channel') === NotificationChannel::Discord->value
+            ? ['required', 'string', 'max:2000']
+            : ['nullable', 'string', 'max:2000'];
+
         return [
             'name' => ['required', 'string', 'max:255'],
             'event_type' => ['required', 'string', Rule::in(NotificationEventType::values())],
@@ -35,7 +39,7 @@ class StoreProjectNotificationActionRequest extends FormRequest
             'channel_configuration.allowed_mentions.*' => ['nullable', 'string', Rule::in(DiscordAllowedMentionType::values())],
             'enabled' => ['required', 'boolean'],
             'delivery_url' => ['required', 'string', 'max:2048', 'url'],
-            'message_template' => [Rule::requiredIf($this->input('channel') === NotificationChannel::Discord->value), 'string', 'max:2000'],
+            'message_template' => $messageTemplateRules,
         ];
     }
 }
diff --git a/app/Http/Requests/UpdateProjectNotificationActionRequest.php b/app/Http/Requests/UpdateProjectNotificationActionRequest.php
index 6011acc..36fd39b 100644
--- a/app/Http/Requests/UpdateProjectNotificationActionRequest.php
+++ b/app/Http/Requests/UpdateProjectNotificationActionRequest.php
@@ -11,7 +11,6 @@ use Illuminate\Validation\Rule;
 
 class UpdateProjectNotificationActionRequest extends FormRequest
 {
-
     /**
      * Determine if the user is authorized to make this request.
      */
@@ -27,6 +26,10 @@ class UpdateProjectNotificationActionRequest extends FormRequest
      */
     public function rules(): array
     {
+        $messageTemplateRules = $this->input('channel') === NotificationChannel::Discord->value
+            ? ['required', 'string', 'max:2000']
+            : ['nullable', 'string', 'max:2000'];
+
         return [
             'name' => ['required', 'string', 'max:255'],
             'event_type' => ['required', 'string', Rule::in(NotificationEventType::values())],
@@ -36,7 +39,7 @@ class UpdateProjectNotificationActionRequest extends FormRequest
             'channel_configuration.allowed_mentions.*' => ['nullable', 'string', Rule::in(DiscordAllowedMentionType::values())],
             'enabled' => ['required', 'boolean'],
             'delivery_url' => ['nullable', 'string', 'max:2048', 'url'],
-            'message_template' => [Rule::requiredIf($this->input('channel') === NotificationChannel::Discord->value), 'string', 'max:2000'],
+            'message_template' => $messageTemplateRules,
         ];
     }
 }