An open-source, self-hostable PaaS alternative to Vercel, Heroku & Netlify that lets you easily deploy static sites, databases, full-stack applications and 360+ one-click services on your own servers.
PHP coolifydatabasesdeploymentdockerdocker-composeinertiajslaravelmariadbmysqlnextjsnodejsphppostgresredisself-hostedself-hostingserverstatic-sitesveltesvelte5
feat(notifications): deduplicate repeated email alerts
Andras Bacsai8c1405e1689c
diff --git a/app/Notifications/ApiTokenExpiringNotification.php b/app/Notifications/ApiTokenExpiringNotification.phpindex 451dd312a1..c00ac2d124 100644--- a/app/Notifications/ApiTokenExpiringNotification.php+++ b/app/Notifications/ApiTokenExpiringNotification.php@@ -29,6 +29,16 @@ class ApiTokenExpiringNotification extends CustomEmailNotificationreturn $notifiable->getEnabledChannels('api_token_expiring');}+ public function deduplicationKey(object $notifiable, string $channel): ?string+ {+ return "api-token-expiring:{$this->token->id}";+ }++ public function deduplicateFor(): int+ {+ return 172800;+ }+public function toMail(): MailMessage{$mail = new MailMessage;diff --git a/app/Notifications/Application/DeploymentFailed.php b/app/Notifications/Application/DeploymentFailed.phpindex 8fff7f03bb..0ed705eddf 100644--- a/app/Notifications/Application/DeploymentFailed.php+++ b/app/Notifications/Application/DeploymentFailed.php@@ -52,6 +52,16 @@ class DeploymentFailed extends CustomEmailNotificationreturn $notifiable->getEnabledChannels('deployment_failure');}+ public function deduplicationKey(object $notifiable, string $channel): ?string+ {+ return "deployment-failed:{$this->deployment_uuid}";+ }++ public function deduplicateFor(): int+ {+ return 86400;+ }+public function toMail(): MailMessage{$mail = new MailMessage;diff --git a/app/Notifications/Application/DeploymentSuccess.php b/app/Notifications/Application/DeploymentSuccess.phpindex 415df5831d..56b692cda7 100644--- a/app/Notifications/Application/DeploymentSuccess.php+++ b/app/Notifications/Application/DeploymentSuccess.php@@ -52,6 +52,16 @@ class DeploymentSuccess extends CustomEmailNotificationreturn $notifiable->getEnabledChannels('deployment_success');}+ public function deduplicationKey(object $notifiable, string $channel): ?string+ {+ return "deployment-success:{$this->deployment_uuid}";+ }++ public function deduplicateFor(): int+ {+ return 86400;+ }+public function toMail(): MailMessage{$mail = new MailMessage;diff --git a/app/Notifications/Application/RestartLimitReached.php b/app/Notifications/Application/RestartLimitReached.phpindex 635dfdbdce..507bba28d0 100644--- a/app/Notifications/Application/RestartLimitReached.php+++ b/app/Notifications/Application/RestartLimitReached.php@@ -49,6 +49,16 @@ class RestartLimitReached extends CustomEmailNotificationreturn $notifiable->getEnabledChannels('status_change');}+ public function deduplicationKey(object $notifiable, string $channel): ?string+ {+ return "restart-limit-reached:application:{$this->resource->uuid}:count:{$this->restart_count}";+ }++ public function deduplicateFor(): int+ {+ return 86400;+ }+public function toMail(): MailMessage{$mail = new MailMessage;diff --git a/app/Notifications/Application/StatusChanged.php b/app/Notifications/Application/StatusChanged.phpindex ef61b7e6a5..87986435d4 100644--- a/app/Notifications/Application/StatusChanged.php+++ b/app/Notifications/Application/StatusChanged.php@@ -42,6 +42,16 @@ class StatusChanged extends CustomEmailNotificationreturn $notifiable->getEnabledChannels('status_change');}+ public function deduplicationKey(object $notifiable, string $channel): ?string+ {+ return "application-status-changed:application:{$this->resource->uuid}:stopped";+ }++ public function deduplicateFor(): int+ {+ return 3600;+ }+public function toMail(): MailMessage{$mail = new MailMessage;@@ -50,6 +60,7 @@ class StatusChanged extends CustomEmailNotification$mail->view('emails.application-status-changes', ['name' => $this->resource_name,'fqdn' => $fqdn,+ 'application_url' => $this->resource_url,'resource_url' => $this->resource_url,]);diff --git a/app/Notifications/Channels/EmailChannel.php b/app/Notifications/Channels/EmailChannel.phpindex abd1155502..45c6cb2d61 100644--- a/app/Notifications/Channels/EmailChannel.php+++ b/app/Notifications/Channels/EmailChannel.php@@ -4,13 +4,20 @@ namespace App\Notifications\Channels;use App\Exceptions\NonReportableException;use App\Models\Team;+use App\Services\NotificationDeduplicator;use Exception;use Illuminate\Notifications\Notification;use Resend;+use Resend\Exceptions\ErrorException;+use Resend\Exceptions\TransporterException;+use Symfony\Component\Mailer\Mailer;+use Symfony\Component\Mailer\Transport\Smtp\EsmtpTransport;+use Symfony\Component\Mime\Address;+use Symfony\Component\Mime\Email;class EmailChannel{- public function __construct() {}+ public function __construct(private NotificationDeduplicator $deduplicator) {}public function send(SendsEmail $notifiable, Notification $notification): void{@@ -67,6 +74,11 @@ class EmailChannel}$mailMessage = $notification->toMail($notifiable);+ $renderedMail = (string) $mailMessage->render();++ if (! $this->deduplicator->shouldSend($notifiable, $notification, self::class, $recipients, $mailMessage->subject, $renderedMail)) {+ return;+ }if ($isResendEnabled) {$resend = Resend::client($settings->resend_api_key);@@ -75,17 +87,17 @@ class EmailChannel'from' => $from,'to' => $recipients,'subject' => $mailMessage->subject,- 'html' => (string) $mailMessage->render(),+ 'html' => $renderedMail,]);} elseif ($isSmtpEnabled) {- $encryption = match (strtolower($settings->smtp_encryption)) {+ $encryption = match (strtolower($settings->smtp_encryption ?? '')) {'starttls' => null,'tls' => 'tls','none' => null,default => null,};- $transport = new \Symfony\Component\Mailer\Transport\Smtp\EsmtpTransport(+ $transport = new EsmtpTransport($settings->smtp_host,$settings->smtp_port,$encryption@@ -93,20 +105,20 @@ class EmailChannel$transport->setUsername($settings->smtp_username ?? '');$transport->setPassword($settings->smtp_password ?? '');- $mailer = new \Symfony\Component\Mailer\Mailer($transport);+ $mailer = new Mailer($transport);$fromEmail = $settings->smtp_from_address ?? 'noreply@localhost';$fromName = $settings->smtp_from_name ?? 'System';- $from = new \Symfony\Component\Mime\Address($fromEmail, $fromName);- $email = (new \Symfony\Component\Mime\Email)+ $from = new Address($fromEmail, $fromName);+ $email = (new Email)->from($from)->to(...$recipients)->subject($mailMessage->subject)- ->html((string) $mailMessage->render());+ ->html($renderedMail);$mailer->send($email);}- } catch (\Resend\Exceptions\ErrorException $e) {+ } catch (ErrorException $e) {// Map HTTP status codes to user-friendly messages$userMessage = match ($e->getErrorCode()) {403 => 'Invalid Resend API key. Please verify your API key in the Resend dashboard and update it in settings.',@@ -131,13 +143,13 @@ class EmailChannel// Don't report expected errors (invalid keys, validation) to Sentryif (in_array($e->getErrorCode(), [403, 401, 400])) {- throw NonReportableException::fromException(new \Exception($userMessage, $e->getCode(), $e));+ throw NonReportableException::fromException(new Exception($userMessage, $e->getCode(), $e));}- throw new \Exception($userMessage, $e->getCode(), $e);- } catch (\Resend\Exceptions\TransporterException $e) {+ throw new Exception($userMessage, $e->getCode(), $e);+ } catch (TransporterException $e) {send_internal_notification("Resend Transport Error: {$e->getMessage()}");- throw new \Exception('Unable to connect to Resend API. Please check your internet connection and try again.');+ throw new Exception('Unable to connect to Resend API. Please check your internet connection and try again.');} catch (\Throwable $e) {// Check if this is a Resend domain verification error on cloud instancesif (isCloud() && str_contains($e->getMessage(), 'domain is not verified')) {diff --git a/app/Notifications/Channels/TransactionalEmailChannel.php b/app/Notifications/Channels/TransactionalEmailChannel.phpindex 8ab74a60b1..803db57f3f 100644--- a/app/Notifications/Channels/TransactionalEmailChannel.php+++ b/app/Notifications/Channels/TransactionalEmailChannel.php@@ -3,6 +3,7 @@namespace App\Notifications\Channels;use App\Models\User;+use App\Services\NotificationDeduplicator;use Exception;use Illuminate\Mail\Message;use Illuminate\Notifications\Notification;@@ -10,6 +11,8 @@ use Illuminate\Support\Facades\Mail;class TransactionalEmailChannel{+ public function __construct(private NotificationDeduplicator $deduplicator) {}+public function send(User $notifiable, Notification $notification): void{$settings = instanceSettings();@@ -27,13 +30,19 @@ class TransactionalEmailChannel}$this->bootConfigs();$mailMessage = $notification->toMail($notifiable);+ $renderedMail = (string) $mailMessage->render();++ if (! $this->deduplicator->shouldSend($notifiable, $notification, self::class, [$email], $mailMessage->subject, $renderedMail)) {+ return;+ }+Mail::send([],[],fn (Message $message) => $message->to($email)->subject($mailMessage->subject)- ->html((string) $mailMessage->render())+ ->html($renderedMail));}diff --git a/app/Notifications/Container/ContainerRestarted.php b/app/Notifications/Container/ContainerRestarted.phpindex 2d7eb58b50..d51c77cb31 100644--- a/app/Notifications/Container/ContainerRestarted.php+++ b/app/Notifications/Container/ContainerRestarted.php@@ -21,6 +21,16 @@ class ContainerRestarted extends CustomEmailNotificationreturn $notifiable->getEnabledChannels('status_change');}+ public function deduplicationKey(object $notifiable, string $channel): ?string+ {+ return "container-restarted:server:{$this->server->uuid}:container:{$this->name}";+ }++ public function deduplicateFor(): int+ {+ return 3600;+ }+public function toMail(): MailMessage{$mail = new MailMessage;diff --git a/app/Notifications/Container/ContainerStopped.php b/app/Notifications/Container/ContainerStopped.phpindex f518cd2fdd..7daba04caa 100644--- a/app/Notifications/Container/ContainerStopped.php+++ b/app/Notifications/Container/ContainerStopped.php@@ -21,6 +21,16 @@ class ContainerStopped extends CustomEmailNotificationreturn $notifiable->getEnabledChannels('status_change');}+ public function deduplicationKey(object $notifiable, string $channel): ?string+ {+ return "container-stopped:server:{$this->server->uuid}:container:{$this->name}";+ }++ public function deduplicateFor(): int+ {+ return 3600;+ }+public function toMail(): MailMessage{$mail = new MailMessage;diff --git a/app/Notifications/CustomEmailNotification.php b/app/Notifications/CustomEmailNotification.phpindex c3c89b30f4..e3f62e22a5 100644--- a/app/Notifications/CustomEmailNotification.php+++ b/app/Notifications/CustomEmailNotification.php@@ -15,4 +15,19 @@ class CustomEmailNotification extends Notification implements ShouldQueuepublic $tries = 5;public $maxExceptions = 5;++ public function shouldDeduplicate(): bool+ {+ return true;+ }++ public function deduplicateFor(): int+ {+ return 900;+ }++ public function deduplicationKey(object $notifiable, string $channel): ?string+ {+ return null;+ }}diff --git a/app/Notifications/Database/BackupFailed.php b/app/Notifications/Database/BackupFailed.phpindex c2b21b1d51..8d9c99603a 100644--- a/app/Notifications/Database/BackupFailed.php+++ b/app/Notifications/Database/BackupFailed.php@@ -11,6 +11,8 @@ use Illuminate\Notifications\Messages\MailMessage;class BackupFailed extends CustomEmailNotification{+ public int|string|null $backupId = null;+public string $name;public string $frequency;@@ -18,6 +20,7 @@ class BackupFailed extends CustomEmailNotificationpublic function __construct(ScheduledDatabaseBackup $backup, public $database, public $output, public $database_name){$this->onQueue('high');+ $this->backupId = data_get($backup, 'uuid') ?? data_get($backup, 'id');$this->name = $database->name;$this->frequency = $backup->frequency;}@@ -27,6 +30,16 @@ class BackupFailed extends CustomEmailNotificationreturn $notifiable->getEnabledChannels('backup_failure');}+ public function deduplicationKey(object $notifiable, string $channel): ?string+ {+ return "backup-failed:backup:{$this->backupId}:database:{$this->database->uuid}:output:".hash('sha256', (string) $this->output);+ }++ public function deduplicateFor(): int+ {+ return 21600;+ }+public function toMail(): MailMessage{$mail = new MailMessage;diff --git a/app/Notifications/Database/BackupSuccess.php b/app/Notifications/Database/BackupSuccess.phpindex 3d2d8ece3b..166a484969 100644--- a/app/Notifications/Database/BackupSuccess.php+++ b/app/Notifications/Database/BackupSuccess.php@@ -11,6 +11,8 @@ use Illuminate\Notifications\Messages\MailMessage;class BackupSuccess extends CustomEmailNotification{+ public int|string|null $backupId = null;+public string $name;public string $frequency;@@ -18,6 +20,7 @@ class BackupSuccess extends CustomEmailNotificationpublic function __construct(ScheduledDatabaseBackup $backup, public $database, public $database_name){$this->onQueue('high');+ $this->backupId = data_get($backup, 'uuid') ?? data_get($backup, 'id');$this->name = $database->name;$this->frequency = $backup->frequency;@@ -28,6 +31,16 @@ class BackupSuccess extends CustomEmailNotificationreturn $notifiable->getEnabledChannels('backup_success');}+ public function deduplicationKey(object $notifiable, string $channel): ?string+ {+ return "backup-success:backup:{$this->backupId}:database:{$this->database->uuid}:name:{$this->database_name}:frequency:{$this->frequency}";+ }++ public function deduplicateFor(): int+ {+ return 86400;+ }+public function toMail(): MailMessage{$mail = new MailMessage;diff --git a/app/Notifications/Database/BackupSuccessWithS3Warning.php b/app/Notifications/Database/BackupSuccessWithS3Warning.phpindex ee24ef17de..0da6194482 100644--- a/app/Notifications/Database/BackupSuccessWithS3Warning.php+++ b/app/Notifications/Database/BackupSuccessWithS3Warning.php@@ -11,6 +11,8 @@ use Illuminate\Notifications\Messages\MailMessage;class BackupSuccessWithS3Warning extends CustomEmailNotification{+ public int|string|null $backupId = null;+public string $name;public string $frequency;@@ -20,6 +22,7 @@ class BackupSuccessWithS3Warning extends CustomEmailNotificationpublic function __construct(ScheduledDatabaseBackup $backup, public $database, public $database_name, public $s3_error){$this->onQueue('high');+ $this->backupId = data_get($backup, 'uuid') ?? data_get($backup, 'id');$this->name = $database->name;$this->frequency = $backup->frequency;@@ -34,6 +37,16 @@ class BackupSuccessWithS3Warning extends CustomEmailNotificationreturn $notifiable->getEnabledChannels('backup_failure');}+ public function deduplicationKey(object $notifiable, string $channel): ?string+ {+ return "backup-s3-warning:backup:{$this->backupId}:database:{$this->database->uuid}:error:".hash('sha256', (string) $this->s3_error);+ }++ public function deduplicateFor(): int+ {+ return 21600;+ }+public function toMail(): MailMessage{$mail = new MailMessage;diff --git a/app/Notifications/ScheduledTask/TaskFailed.php b/app/Notifications/ScheduledTask/TaskFailed.phpindex bd060112ae..5078ca8e9d 100644--- a/app/Notifications/ScheduledTask/TaskFailed.php+++ b/app/Notifications/ScheduledTask/TaskFailed.php@@ -28,6 +28,16 @@ class TaskFailed extends CustomEmailNotificationreturn $notifiable->getEnabledChannels('scheduled_task_failure');}+ public function deduplicationKey(object $notifiable, string $channel): ?string+ {+ return "scheduled-task-failed:task:{$this->task->uuid}:output:".hash('sha256', $this->output);+ }++ public function deduplicateFor(): int+ {+ return 3600;+ }+public function toMail(): MailMessage{$mail = new MailMessage;diff --git a/app/Notifications/ScheduledTask/TaskSuccess.php b/app/Notifications/ScheduledTask/TaskSuccess.phpindex 58c959bd8d..0231ecf3df 100644--- a/app/Notifications/ScheduledTask/TaskSuccess.php+++ b/app/Notifications/ScheduledTask/TaskSuccess.php@@ -28,6 +28,16 @@ class TaskSuccess extends CustomEmailNotificationreturn $notifiable->getEnabledChannels('scheduled_task_success');}+ public function deduplicationKey(object $notifiable, string $channel): ?string+ {+ return "scheduled-task-success:task:{$this->task->uuid}:output:".hash('sha256', $this->output);+ }++ public function deduplicateFor(): int+ {+ return 3600;+ }+public function toMail(): MailMessage{$mail = new MailMessage;diff --git a/app/Notifications/Server/DockerCleanupFailed.php b/app/Notifications/Server/DockerCleanupFailed.phpindex 9cbdeb4888..ac0eea17db 100644--- a/app/Notifications/Server/DockerCleanupFailed.php+++ b/app/Notifications/Server/DockerCleanupFailed.php@@ -21,6 +21,16 @@ class DockerCleanupFailed extends CustomEmailNotificationreturn $notifiable->getEnabledChannels('docker_cleanup_failure');}+ public function deduplicationKey(object $notifiable, string $channel): ?string+ {+ return "docker-cleanup-failed:server:{$this->server->uuid}:message:".hash('sha256', $this->message);+ }++ public function deduplicateFor(): int+ {+ return 21600;+ }+public function toMail(): MailMessage{$mail = new MailMessage;diff --git a/app/Notifications/Server/DockerCleanupSuccess.php b/app/Notifications/Server/DockerCleanupSuccess.phpindex d28f25c6c8..7e5ec0bcf0 100644--- a/app/Notifications/Server/DockerCleanupSuccess.php+++ b/app/Notifications/Server/DockerCleanupSuccess.php@@ -21,6 +21,16 @@ class DockerCleanupSuccess extends CustomEmailNotificationreturn $notifiable->getEnabledChannels('docker_cleanup_success');}+ public function deduplicationKey(object $notifiable, string $channel): ?string+ {+ return "docker-cleanup-success:server:{$this->server->uuid}:message:".hash('sha256', $this->message);+ }++ public function deduplicateFor(): int+ {+ return 21600;+ }+public function toMail(): MailMessage{$mail = new MailMessage;diff --git a/app/Notifications/Server/ForceDisabled.php b/app/Notifications/Server/ForceDisabled.phpindex 4b56f5860b..8d18170266 100644--- a/app/Notifications/Server/ForceDisabled.php+++ b/app/Notifications/Server/ForceDisabled.php@@ -21,6 +21,16 @@ class ForceDisabled extends CustomEmailNotificationreturn $notifiable->getEnabledChannels('server_force_disabled');}+ public function deduplicationKey(object $notifiable, string $channel): ?string+ {+ return "server-force-disabled:{$this->server->uuid}";+ }++ public function deduplicateFor(): int+ {+ return 86400;+ }+public function toMail(): MailMessage{$mail = new MailMessage;diff --git a/app/Notifications/Server/ForceEnabled.php b/app/Notifications/Server/ForceEnabled.phpindex 36dad3c60f..3db96f9953 100644--- a/app/Notifications/Server/ForceEnabled.php+++ b/app/Notifications/Server/ForceEnabled.php@@ -21,6 +21,16 @@ class ForceEnabled extends CustomEmailNotificationreturn $notifiable->getEnabledChannels('server_force_enabled');}+ public function deduplicationKey(object $notifiable, string $channel): ?string+ {+ return "server-force-enabled:{$this->server->uuid}";+ }++ public function deduplicateFor(): int+ {+ return 86400;+ }+public function toMail(): MailMessage{$mail = new MailMessage;diff --git a/app/Notifications/Server/HetznerDeletionFailed.php b/app/Notifications/Server/HetznerDeletionFailed.phpindex bb452b054b..866d2eb070 100644--- a/app/Notifications/Server/HetznerDeletionFailed.php+++ b/app/Notifications/Server/HetznerDeletionFailed.php@@ -21,6 +21,16 @@ class HetznerDeletionFailed extends CustomEmailNotificationreturn $notifiable->getEnabledChannels('hetzner_deletion_failed');}+ public function deduplicationKey(object $notifiable, string $channel): ?string+ {+ return "hetzner-deletion-failed:{$this->hetznerServerId}:error:".hash('sha256', $this->errorMessage);+ }++ public function deduplicateFor(): int+ {+ return 86400;+ }+public function toMail(): MailMessage{$mail = new MailMessage;diff --git a/app/Notifications/Server/HighDiskUsage.php b/app/Notifications/Server/HighDiskUsage.phpindex 149d1bbc86..4007ca8058 100644--- a/app/Notifications/Server/HighDiskUsage.php+++ b/app/Notifications/Server/HighDiskUsage.php@@ -21,6 +21,16 @@ class HighDiskUsage extends CustomEmailNotificationreturn $notifiable->getEnabledChannels('server_disk_usage');}+ public function deduplicationKey(object $notifiable, string $channel): ?string+ {+ return "high-disk-usage:server:{$this->server->uuid}:threshold:{$this->server_disk_usage_notification_threshold}";+ }++ public function deduplicateFor(): int+ {+ return 21600;+ }+public function toMail(): MailMessage{$mail = new MailMessage;diff --git a/app/Notifications/Server/Reachable.php b/app/Notifications/Server/Reachable.phpindex e64b0af2ac..b297b7d3df 100644--- a/app/Notifications/Server/Reachable.php+++ b/app/Notifications/Server/Reachable.php@@ -30,6 +30,16 @@ class Reachable extends CustomEmailNotificationreturn $notifiable->getEnabledChannels('server_reachable');}+ public function deduplicationKey(object $notifiable, string $channel): ?string+ {+ return "server-reachable:{$this->server->uuid}";+ }++ public function deduplicateFor(): int+ {+ return 1800;+ }+public function toMail(): MailMessage{$mail = new MailMessage;diff --git a/app/Notifications/Server/ServerPatchCheck.php b/app/Notifications/Server/ServerPatchCheck.phpindex ba6cd49829..d0d5f4875f 100644--- a/app/Notifications/Server/ServerPatchCheck.php+++ b/app/Notifications/Server/ServerPatchCheck.php@@ -24,6 +24,16 @@ class ServerPatchCheck extends CustomEmailNotificationreturn $notifiable->getEnabledChannels('server_patch');}+ public function deduplicationKey(object $notifiable, string $channel): ?string+ {+ return "server-patch-check:server:{$this->server->uuid}:state:".hash('sha256', json_encode($this->patchData));+ }++ public function deduplicateFor(): int+ {+ return 86400;+ }+public function toMail($notifiable = null): MailMessage{$mail = new MailMessage;diff --git a/app/Notifications/Server/TraefikVersionOutdated.php b/app/Notifications/Server/TraefikVersionOutdated.phpindex c94cc1732d..d6e5ae8aa3 100644--- a/app/Notifications/Server/TraefikVersionOutdated.php+++ b/app/Notifications/Server/TraefikVersionOutdated.php@@ -38,6 +38,18 @@ class TraefikVersionOutdated extends CustomEmailNotificationreturn $this->formatVersion($info['latest'] ?? 'unknown');}+ public function deduplicationKey(object $notifiable, string $channel): ?string+ {+ $serverUuids = $this->servers->pluck('uuid')->sort()->values()->join('|');++ return 'traefik-version-outdated:servers:'.hash('sha256', $serverUuids);+ }++ public function deduplicateFor(): int+ {+ return 86400;+ }+public function toMail($notifiable = null): MailMessage{$mail = new MailMessage;diff --git a/app/Notifications/Server/Unreachable.php b/app/Notifications/Server/Unreachable.phpindex 99742f3b73..cd6fd63b62 100644--- a/app/Notifications/Server/Unreachable.php+++ b/app/Notifications/Server/Unreachable.php@@ -30,6 +30,16 @@ class Unreachable extends CustomEmailNotificationreturn $notifiable->getEnabledChannels('server_unreachable');}+ public function deduplicationKey(object $notifiable, string $channel): ?string+ {+ return "server-unreachable:{$this->server->uuid}";+ }++ public function deduplicateFor(): int+ {+ return 3600;+ }+public function toMail(): ?MailMessage{$mail = new MailMessage;diff --git a/app/Notifications/SslExpirationNotification.php b/app/Notifications/SslExpirationNotification.phpindex 78e1e8be9c..72ce136bd3 100644--- a/app/Notifications/SslExpirationNotification.php+++ b/app/Notifications/SslExpirationNotification.php@@ -59,6 +59,22 @@ class SslExpirationNotification extends CustomEmailNotificationreturn $notifiable->getEnabledChannels('ssl_certificate_renewal');}+ public function deduplicationKey(object $notifiable, string $channel): ?string+ {+ $resourceKeys = $this->resources+ ->map(fn ($resource) => data_get($resource, 'uuid') ?? data_get($resource, 'name'))+ ->sort()+ ->values()+ ->join('|');++ return 'ssl-certificate-renewed:resources:'.hash('sha256', $resourceKeys);+ }++ public function deduplicateFor(): int+ {+ return 86400;+ }+public function toMail(): MailMessage{$mail = new MailMessage;diff --git a/app/Notifications/Test.php b/app/Notifications/Test.phpindex bbed22777c..ea3dfe9c15 100644--- a/app/Notifications/Test.php+++ b/app/Notifications/Test.php@@ -30,6 +30,11 @@ class Test extends Notification implements ShouldQueue$this->onQueue('high');}+ public function shouldDeduplicate(): bool+ {+ return false;+ }+public function via(object $notifiable): array{if ($this->channel) {diff --git a/app/Notifications/TransactionalEmails/EmailChangeVerification.php b/app/Notifications/TransactionalEmails/EmailChangeVerification.phpindex ea84623666..bb5e7f8701 100644--- a/app/Notifications/TransactionalEmails/EmailChangeVerification.php+++ b/app/Notifications/TransactionalEmails/EmailChangeVerification.php@@ -25,6 +25,16 @@ class EmailChangeVerification extends CustomEmailNotification$this->onQueue('high');}+ public function deduplicationKey(object $notifiable, string $channel): ?string+ {+ return "email-change-verification:user:{$this->user->id}:email:{$this->newEmail}:code:{$this->verificationCode}";+ }++ public function deduplicateFor(): int+ {+ return (int) max(1, now()->diffInSeconds($this->expiresAt, false));+ }+public function toMail(): MailMessage{// Use the configured expiry minutes valuediff --git a/app/Notifications/TransactionalEmails/InvitationLink.php b/app/Notifications/TransactionalEmails/InvitationLink.phpindex 9bfb547987..f3b1e6d671 100644--- a/app/Notifications/TransactionalEmails/InvitationLink.php+++ b/app/Notifications/TransactionalEmails/InvitationLink.php@@ -21,6 +21,16 @@ class InvitationLink extends CustomEmailNotification$this->onQueue('high');}+ public function deduplicationKey(object $notifiable, string $channel): ?string+ {+ return "invitation-link:user:{$this->user->id}:email:{$this->user->email}";+ }++ public function deduplicateFor(): int+ {+ return 3600;+ }+public function toMail(): MailMessage{$invitation = TeamInvitation::whereEmail($this->user->email)->first();diff --git a/app/Notifications/TransactionalEmails/Test.php b/app/Notifications/TransactionalEmails/Test.phpindex 2f7d70bbf0..dc8c0dac70 100644--- a/app/Notifications/TransactionalEmails/Test.php+++ b/app/Notifications/TransactionalEmails/Test.php@@ -15,6 +15,11 @@ class Test extends CustomEmailNotification$this->onQueue('high');}+ public function shouldDeduplicate(): bool+ {+ return false;+ }+public function via(): array{return [EmailChannel::class];diff --git a/app/Services/NotificationDeduplicator.php b/app/Services/NotificationDeduplicator.phpnew file mode 100644index 0000000000..d018dd0a5d--- /dev/null+++ b/app/Services/NotificationDeduplicator.php@@ -0,0 +1,95 @@+<?php++namespace App\Services;++use Illuminate\Notifications\Notification;+use Illuminate\Support\Facades\Cache;++class NotificationDeduplicator+{+ public const DEFAULT_TTL = 900;++ /**+ * @param array<int, string> $recipients+ */+ public function shouldSend(object $notifiable, Notification $notification, string $channel, array $recipients, ?string $subject = null, ?string $body = null): bool+ {+ if (method_exists($notification, 'shouldDeduplicate') && ! $notification->shouldDeduplicate()) {+ return true;+ }++ $ttl = method_exists($notification, 'deduplicateFor')+ ? $notification->deduplicateFor()+ : self::DEFAULT_TTL;++ if ($ttl <= 0) {+ return true;+ }++ return Cache::add(+ $this->cacheKey($notifiable, $notification, $channel, $recipients, $subject, $body),+ true,+ $ttl,+ );+ }++ /**+ * @param array<int, string> $recipients+ */+ private function cacheKey(object $notifiable, Notification $notification, string $channel, array $recipients, ?string $subject, ?string $body): string+ {+ $semanticKey = method_exists($notification, 'deduplicationKey')+ ? $notification->deduplicationKey($notifiable, $channel)+ : null;++ $payload = $semanticKey+ ? $this->semanticFingerprint($notifiable, $notification, $channel, $recipients, $semanticKey)+ : $this->defaultFingerprint($notifiable, $notification, $channel, $recipients, $subject, $body);++ return 'notification-dedupe:'.hash('sha256', $payload);+ }++ /**+ * @param array<int, string> $recipients+ */+ private function semanticFingerprint(object $notifiable, Notification $notification, string $channel, array $recipients, string $semanticKey): string+ {+ return json_encode([+ 'notification' => $notification::class,+ 'notifiable' => $notifiable::class,+ 'notifiable_id' => data_get($notifiable, 'id'),+ 'channel' => $channel,+ 'recipients' => $this->normalizeRecipients($recipients),+ 'semantic_key' => $semanticKey,+ ], JSON_THROW_ON_ERROR);+ }++ /**+ * @param array<int, string> $recipients+ */+ private function defaultFingerprint(object $notifiable, Notification $notification, string $channel, array $recipients, ?string $subject, ?string $body): string+ {+ return json_encode([+ 'notification' => $notification::class,+ 'notifiable' => $notifiable::class,+ 'notifiable_id' => data_get($notifiable, 'id'),+ 'channel' => $channel,+ 'recipients' => $this->normalizeRecipients($recipients),+ 'subject' => $subject,+ 'body_hash' => hash('sha256', (string) $body),+ ], JSON_THROW_ON_ERROR);+ }++ /**+ * @param array<int, string> $recipients+ * @return array<int, string>+ */+ private function normalizeRecipients(array $recipients): array+ {+ return collect($recipients)+ ->map(fn (string $recipient) => mb_strtolower(trim($recipient)))+ ->sort()+ ->values()+ ->all();+ }+}diff --git a/tests/Feature/ApplicationStoppedAfterRestartLimitTest.php b/tests/Feature/ApplicationStoppedAfterRestartLimitTest.phpindex 6b82d55689..482a3e16ef 100644--- a/tests/Feature/ApplicationStoppedAfterRestartLimitTest.php+++ b/tests/Feature/ApplicationStoppedAfterRestartLimitTest.php@@ -48,6 +48,24 @@ it('does not show the restart limit warning for a normal manual stop', functionexpect($html)->not->toContain('Stopped after reaching restart limit');});+it('uses a semantic dedupe key for restart limit notifications', function () {+ $application = applicationWithRestartState();+ $application->forceFill([+ 'name' => 'crashy-app',+ 'uuid' => 'application-uuid',+ ]);+ $application->setRelation('environment', (object) [+ 'uuid' => 'environment-uuid',+ 'name' => 'production',+ 'project' => (object) ['uuid' => 'project-uuid'],+ ]);++ $notification = new RestartLimitReached($application);++ expect($notification->deduplicationKey((object) ['id' => 1], 'mail'))->toBe('restart-limit-reached:application:application-uuid:count:2')+ ->and($notification->deduplicateFor())->toBe(86400);+});+it('keeps restart tracking configurable when stopping an application', function () {$method = new ReflectionMethod(StopApplication::class, 'handle');$resetRestartCount = collect($method->getParameters())->firstWhere('name', 'resetRestartCount');diff --git a/tests/Feature/NotificationDeduplicationTest.php b/tests/Feature/NotificationDeduplicationTest.phpnew file mode 100644index 0000000000..39fc70433f--- /dev/null+++ b/tests/Feature/NotificationDeduplicationTest.php@@ -0,0 +1,75 @@+<?php++use App\Notifications\CustomEmailNotification;+use App\Services\NotificationDeduplicator;+use Illuminate\Notifications\Messages\MailMessage;+use Illuminate\Support\Facades\Cache;++class DedupeTestNotification extends CustomEmailNotification+{+ public function __construct(+ public ?string $semanticKey = null,+ public bool $deduplicate = true,+ public int $ttl = 900,+ ) {}++ public function toMail(): MailMessage+ {+ return (new MailMessage)->subject('Test');+ }++ public function shouldDeduplicate(): bool+ {+ return $this->deduplicate;+ }++ public function deduplicateFor(): int+ {+ return $this->ttl;+ }++ public function deduplicationKey(object $notifiable, string $channel): ?string+ {+ return $this->semanticKey;+ }+}++beforeEach(function () {+ Cache::flush();+ $this->deduplicator = app(NotificationDeduplicator::class);+ $this->notifiable = new class+ {+ public int $id = 123;+ };+});++it('allows only the first identical notification fingerprint during the ttl', function () {+ $notification = new DedupeTestNotification;++ expect($this->deduplicator->shouldSend($this->notifiable, $notification, 'mail', ['[email protected]'], 'Subject', '<p>Body</p>'))->toBeTrue()+ ->and($this->deduplicator->shouldSend($this->notifiable, $notification, 'mail', ['[email protected]'], 'Subject', '<p>Body</p>'))->toBeFalse();+});++it('allows different recipients and content through the default fingerprint', function () {+ $notification = new DedupeTestNotification;++ expect($this->deduplicator->shouldSend($this->notifiable, $notification, 'mail', ['[email protected]'], 'Subject', '<p>Body</p>'))->toBeTrue()+ ->and($this->deduplicator->shouldSend($this->notifiable, $notification, 'mail', ['[email protected]'], 'Subject', '<p>Body</p>'))->toBeTrue()+ ->and($this->deduplicator->shouldSend($this->notifiable, $notification, 'mail', ['[email protected]'], 'Other subject', '<p>Body</p>'))->toBeTrue()+ ->and($this->deduplicator->shouldSend($this->notifiable, $notification, 'mail', ['[email protected]'], 'Subject', '<p>Other body</p>'))->toBeTrue();+});++it('uses semantic keys instead of rendered content when provided', function () {+ $notification = new DedupeTestNotification(semanticKey: 'event:123');++ expect($this->deduplicator->shouldSend($this->notifiable, $notification, 'mail', ['[email protected]'], 'Subject', '<p>Body</p>'))->toBeTrue()+ ->and($this->deduplicator->shouldSend($this->notifiable, $notification, 'mail', ['[email protected]'], 'Other subject', '<p>Other body</p>'))->toBeFalse()+ ->and($this->deduplicator->shouldSend($this->notifiable, $notification, 'mail', ['[email protected]'], 'Other subject', '<p>Other body</p>'))->toBeTrue();+});++it('allows notifications to opt out of deduplication', function () {+ $notification = new DedupeTestNotification(deduplicate: false);++ expect($this->deduplicator->shouldSend($this->notifiable, $notification, 'mail', ['[email protected]'], 'Subject', '<p>Body</p>'))->toBeTrue()+ ->and($this->deduplicator->shouldSend($this->notifiable, $notification, 'mail', ['[email protected]'], 'Subject', '<p>Body</p>'))->toBeTrue();+});