diff --git a/app/Http/Livewire/Notifications/DiscordSettings.php b/app/Http/Livewire/Notifications/DiscordSettings.php index c96d58ab9..be1c9ba38 100644 --- a/app/Http/Livewire/Notifications/DiscordSettings.php +++ b/app/Http/Livewire/Notifications/DiscordSettings.php @@ -14,7 +14,7 @@ class DiscordSettings extends Component 'model.discord.webhook_url' => 'required|url', 'model.discord_notifications.test' => 'nullable|boolean', 'model.discord_notifications.deployments' => 'nullable|boolean', - 'model.discord_notifications.stopped' => 'nullable|boolean', + 'model.discord_notifications.status_changes' => 'nullable|boolean', ]; protected $validationAttributes = [ 'model.discord.webhook_url' => 'Discord Webhook', diff --git a/app/Http/Livewire/Notifications/EmailSettings.php b/app/Http/Livewire/Notifications/EmailSettings.php index 102c63b12..47f5dcb14 100644 --- a/app/Http/Livewire/Notifications/EmailSettings.php +++ b/app/Http/Livewire/Notifications/EmailSettings.php @@ -25,7 +25,7 @@ class EmailSettings extends Component 'model.smtp.test_recipients' => 'nullable', 'model.smtp_notifications.test' => 'nullable|boolean', 'model.smtp_notifications.deployments' => 'nullable|boolean', - 'model.smtp_notifications.stopped' => 'nullable|boolean', + 'model.smtp_notifications.status_changes' => 'nullable|boolean', ]; protected $validationAttributes = [ 'model.smtp.from_address' => 'From Address', diff --git a/app/Notifications/Notifications/Application/ApplicationStoppedNotification.php b/app/Notifications/Notifications/Application/ApplicationStoppedNotification.php index 87acd494f..083da55ba 100644 --- a/app/Notifications/Notifications/Application/ApplicationStoppedNotification.php +++ b/app/Notifications/Notifications/Application/ApplicationStoppedNotification.php @@ -40,8 +40,8 @@ class ApplicationStoppedNotification extends Notification implements ShouldQueue $channels = []; $isEmailEnabled = data_get($notifiable, 'smtp.enabled'); $isDiscordEnabled = data_get($notifiable, 'discord.enabled'); - $isSubscribedToEmailEvent = data_get($notifiable, 'smtp_notifications.stopped'); - $isSubscribedToDiscordEvent = data_get($notifiable, 'discord_notifications.stopped'); + $isSubscribedToEmailEvent = data_get($notifiable, 'smtp_notifications.status_changes'); + $isSubscribedToDiscordEvent = data_get($notifiable, 'discord_notifications.status_changes'); if ($isEmailEnabled && $isSubscribedToEmailEvent) { $channels[] = EmailChannel::class; diff --git a/resources/views/livewire/notifications/discord-settings.blade.php b/resources/views/livewire/notifications/discord-settings.blade.php index 3c070f88e..3aeb14ef8 100644 --- a/resources/views/livewire/notifications/discord-settings.blade.php +++ b/resources/views/livewire/notifications/discord-settings.blade.php @@ -29,7 +29,8 @@