From 093a6387a267d311a1f89a22a2c062d17bad6016 Mon Sep 17 00:00:00 2001 From: Sander Dorigo Date: Tue, 1 Apr 2025 06:59:55 +0200 Subject: [PATCH] Mute notifications for demo site. --- app/Notifications/Admin/UnknownUserLoginAttempt.php | 8 +++++++- app/Notifications/Security/UserFailedLoginAttempt.php | 8 +++++++- app/Notifications/Test/OwnerTestNotificationEmail.php | 5 +++++ app/Notifications/Test/UserTestNotificationEmail.php | 5 +++++ app/Notifications/User/NewAccessToken.php | 8 +++++++- 5 files changed, 31 insertions(+), 3 deletions(-) diff --git a/app/Notifications/Admin/UnknownUserLoginAttempt.php b/app/Notifications/Admin/UnknownUserLoginAttempt.php index b19dd53ad6..9a98547f16 100644 --- a/app/Notifications/Admin/UnknownUserLoginAttempt.php +++ b/app/Notifications/Admin/UnknownUserLoginAttempt.php @@ -27,6 +27,7 @@ namespace FireflyIII\Notifications\Admin; use FireflyIII\Notifications\Notifiables\OwnerNotifiable; use FireflyIII\Notifications\ReturnsAvailableChannels; use FireflyIII\Notifications\ReturnsSettings; +use FireflyIII\Support\Facades\FireflyConfig; use FireflyIII\Support\Facades\Steam; use Illuminate\Bus\Queueable; use Illuminate\Notifications\Messages\MailMessage; @@ -111,6 +112,11 @@ class UnknownUserLoginAttempt extends Notification */ public function via(OwnerNotifiable $notifiable): array { - return ReturnsAvailableChannels::returnChannels('owner'); + $channels = ReturnsAvailableChannels::returnChannels('owner'); + $isDemoSite = FireflyConfig::get('is_demo_site'); + if(true === $isDemoSite) { + return array_diff($channels, ['mail']); + } + return $channels; } } diff --git a/app/Notifications/Security/UserFailedLoginAttempt.php b/app/Notifications/Security/UserFailedLoginAttempt.php index 69bb04110c..197c0c0424 100644 --- a/app/Notifications/Security/UserFailedLoginAttempt.php +++ b/app/Notifications/Security/UserFailedLoginAttempt.php @@ -26,6 +26,7 @@ namespace FireflyIII\Notifications\Security; use FireflyIII\Notifications\ReturnsAvailableChannels; use FireflyIII\Notifications\ReturnsSettings; +use FireflyIII\Support\Facades\FireflyConfig; use FireflyIII\Support\Facades\Steam; use FireflyIII\User; use Illuminate\Bus\Queueable; @@ -103,6 +104,11 @@ class UserFailedLoginAttempt extends Notification */ public function via(User $notifiable): array { - return ReturnsAvailableChannels::returnChannels('user', $notifiable); + $channels = ReturnsAvailableChannels::returnChannels('user', $notifiable); + $isDemoSite = FireflyConfig::get('is_demo_site'); + if(true === $isDemoSite) { + return array_diff($channels, ['mail']); + } + return $channels; } } diff --git a/app/Notifications/Test/OwnerTestNotificationEmail.php b/app/Notifications/Test/OwnerTestNotificationEmail.php index 57df79296d..3ba7b6c01f 100644 --- a/app/Notifications/Test/OwnerTestNotificationEmail.php +++ b/app/Notifications/Test/OwnerTestNotificationEmail.php @@ -25,6 +25,7 @@ declare(strict_types=1); namespace FireflyIII\Notifications\Test; use FireflyIII\Notifications\Notifiables\OwnerNotifiable; +use FireflyIII\Support\Facades\FireflyConfig; use Illuminate\Bus\Queueable; use Illuminate\Notifications\Messages\MailMessage; use Illuminate\Notifications\Notification; @@ -63,6 +64,10 @@ class OwnerTestNotificationEmail extends Notification */ public function via(OwnerNotifiable $notifiable): array { + $isDemoSite = FireflyConfig::get('is_demo_site'); + if(true === $isDemoSite) { + return []; + } return ['mail']; } } diff --git a/app/Notifications/Test/UserTestNotificationEmail.php b/app/Notifications/Test/UserTestNotificationEmail.php index 07f5b42e73..9338a97ae4 100644 --- a/app/Notifications/Test/UserTestNotificationEmail.php +++ b/app/Notifications/Test/UserTestNotificationEmail.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Notifications\Test; +use FireflyIII\Support\Facades\FireflyConfig; use FireflyIII\User; use Illuminate\Bus\Queueable; use Illuminate\Notifications\Messages\MailMessage; @@ -60,6 +61,10 @@ class UserTestNotificationEmail extends Notification */ public function via(User $notifiable): array { + $isDemoSite = FireflyConfig::get('is_demo_site'); + if(true === $isDemoSite) { + return []; + } return ['mail']; } } diff --git a/app/Notifications/User/NewAccessToken.php b/app/Notifications/User/NewAccessToken.php index 1634638caa..43feee4faa 100644 --- a/app/Notifications/User/NewAccessToken.php +++ b/app/Notifications/User/NewAccessToken.php @@ -26,6 +26,7 @@ namespace FireflyIII\Notifications\User; use FireflyIII\Notifications\ReturnsAvailableChannels; use FireflyIII\Notifications\ReturnsSettings; +use FireflyIII\Support\Facades\FireflyConfig; use FireflyIII\Support\Facades\Steam; use FireflyIII\User; use Illuminate\Bus\Queueable; @@ -101,6 +102,11 @@ class NewAccessToken extends Notification */ public function via(User $notifiable): array { - return ReturnsAvailableChannels::returnChannels('user', $notifiable); + $channels = ReturnsAvailableChannels::returnChannels('user', $notifiable); + $isDemoSite = FireflyConfig::get('is_demo_site'); + if(true === $isDemoSite) { + return array_diff($channels, ['mail']); + } + return $channels; } }