dave/coolify
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

feat: always sent notifications

Browse Source
This commit is contained in:
peaklabs-dev
2024-12-09 17:00:07 +01:00
parent b6500142c4
commit a849bfdc3e
3 changed files with 7 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/Notifications/Internal/GeneralNotification.php
View File

@@ -2,9 +2,6 @@
namespace App\Notifications\Internal; namespace App\Notifications\Internal;
use App\Notifications\Channels\DiscordChannel;
use App\Notifications\Channels\TelegramChannel;
use App\Notifications\Channels\SlackChannel;
use App\Notifications\Dto\DiscordMessage; use App\Notifications\Dto\DiscordMessage;
use App\Notifications\Dto\SlackMessage; use App\Notifications\Dto\SlackMessage;
use Illuminate\Bus\Queueable; use Illuminate\Bus\Queueable;
@@ -24,22 +21,7 @@ class GeneralNotification extends Notification implements ShouldQueue
public function via(object $notifiable): array public function via(object $notifiable): array
{ {
$channels = []; return $notifiable->getEnabledChannels('general');
$isDiscordEnabled = data_get($notifiable, 'discord_enabled');
$isTelegramEnabled = data_get($notifiable, 'telegram_enabled');
$isSlackEnabled = data_get($notifiable, 'slack_enabled');
if ($isDiscordEnabled) {
$channels[] = DiscordChannel::class;
}
if ($isTelegramEnabled) {
$channels[] = TelegramChannel::class;
}
if ($isSlackEnabled) {
$channels[] = SlackChannel::class;
}
return $channels;
} }
public function toDiscord(): DiscordMessage public function toDiscord(): DiscordMessage

31
app/Notifications/Server/ForceDisabled.php
View File

@@ -3,13 +3,9 @@
namespace App\Notifications\Server; namespace App\Notifications\Server;
use App\Models\Server; use App\Models\Server;
use App\Notifications\Channels\DiscordChannel;
use App\Notifications\Channels\EmailChannel;
use App\Notifications\Channels\TelegramChannel;
use App\Notifications\Channels\SlackChannel;
use App\Notifications\Dto\SlackMessage;
use App\Notifications\CustomEmailNotification; use App\Notifications\CustomEmailNotification;
use App\Notifications\Dto\DiscordMessage; use App\Notifications\Dto\DiscordMessage;
use App\Notifications\Dto\SlackMessage;
use Illuminate\Notifications\Messages\MailMessage; use Illuminate\Notifications\Messages\MailMessage;
class ForceDisabled extends CustomEmailNotification class ForceDisabled extends CustomEmailNotification
@@ -21,25 +17,7 @@ class ForceDisabled extends CustomEmailNotification
public function via(object $notifiable): array public function via(object $notifiable): array
{ {
$channels = []; return $notifiable->getEnabledChannels('server_force_disabled');
$isEmailEnabled = isEmailEnabled($notifiable);
$isDiscordEnabled = data_get($notifiable, 'discord_enabled');
$isTelegramEnabled = data_get($notifiable, 'telegram_enabled');
$isSlackEnabled = data_get($notifiable, 'slack_enabled');
if ($isDiscordEnabled) {
$channels[] = DiscordChannel::class;
}
if ($isEmailEnabled) {
$channels[] = EmailChannel::class;
}
if ($isTelegramEnabled) {
$channels[] = TelegramChannel::class;
}
if ($isSlackEnabled) {
$channels[] = SlackChannel::class;
}
return $channels;
} }
public function toMail(): MailMessage public function toMail(): MailMessage
@@ -73,13 +51,12 @@ class ForceDisabled extends CustomEmailNotification
]; ];
} }
public function toSlack(): SlackMessage public function toSlack(): SlackMessage
{ {
$title = "Server disabled"; $title = 'Server disabled';
$description = "Server ({$this->server->name}) disabled because it is not paid!\n"; $description = "Server ({$this->server->name}) disabled because it is not paid!\n";
$description .= "All automations and integrations are stopped.\n\n"; $description .= "All automations and integrations are stopped.\n\n";
$description .= "Please update your subscription to enable the server again: https://app.coolify.io/subscriptions"; $description .= 'Please update your subscription to enable the server again: https://app.coolify.io/subscriptions';
return new SlackMessage( return new SlackMessage(
title: $title, title: $title,

28
app/Notifications/Server/ForceEnabled.php
View File

@@ -3,13 +3,9 @@
namespace App\Notifications\Server; namespace App\Notifications\Server;
use App\Models\Server; use App\Models\Server;
use App\Notifications\Channels\DiscordChannel;
use App\Notifications\Channels\EmailChannel;
use App\Notifications\Channels\TelegramChannel;
use App\Notifications\Channels\SlackChannel;
use App\Notifications\Dto\SlackMessage;
use App\Notifications\CustomEmailNotification; use App\Notifications\CustomEmailNotification;
use App\Notifications\Dto\DiscordMessage; use App\Notifications\Dto\DiscordMessage;
use App\Notifications\Dto\SlackMessage;
use Illuminate\Notifications\Messages\MailMessage; use Illuminate\Notifications\Messages\MailMessage;
class ForceEnabled extends CustomEmailNotification class ForceEnabled extends CustomEmailNotification
@@ -21,25 +17,7 @@ class ForceEnabled extends CustomEmailNotification
public function via(object $notifiable): array public function via(object $notifiable): array
{ {
$channels = []; return $notifiable->getEnabledChannels('server_force_enabled');
$isEmailEnabled = isEmailEnabled($notifiable);
$isDiscordEnabled = data_get($notifiable, 'discord_enabled');
$isTelegramEnabled = data_get($notifiable, 'telegram_enabled');
$isSlackEnabled = data_get($notifiable, 'slack_enabled');
if ($isDiscordEnabled) {
$channels[] = DiscordChannel::class;
}
if ($isEmailEnabled) {
$channels[] = EmailChannel::class;
}
if ($isTelegramEnabled) {
$channels[] = TelegramChannel::class;
}
if ($isSlackEnabled) {
$channels[] = SlackChannel::class;
}
return $channels;
} }
public function toMail(): MailMessage public function toMail(): MailMessage
@@ -69,7 +47,6 @@ class ForceEnabled extends CustomEmailNotification
]; ];
} }
public function toSlack(): SlackMessage public function toSlack(): SlackMessage
{ {
return new SlackMessage( return new SlackMessage(
@@ -78,5 +55,4 @@ class ForceEnabled extends CustomEmailNotification
color: SlackMessage::successColor() color: SlackMessage::successColor()
); );
} }
} }