Stop banned or suspended users from notification creation on posts an…

…d entries (#1007)
MbinOrg · Aug 8, 2024 · 8949499 · 8949499
1 parent 4c7182f
commit 8949499
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 0 deletions.
diff --git a/src/Entity/User.php b/src/Entity/User.php
@@ -828,11 +828,21 @@ public function softDelete(): void
         $this->visibility = self::VISIBILITY_SOFT_DELETED;
     }
 
+    public function isSoftDeleted(): bool
+    {
+        return self::VISIBILITY_SOFT_DELETED === $this->visibility;
+    }
+
     public function trash(): void
     {
         $this->visibility = self::VISIBILITY_TRASHED;
     }
 
+    public function isTrashed(): bool
+    {
+        return self::VISIBILITY_TRASHED === $this->visibility;
+    }
+
     public function restore(): void
     {
         $this->visibility = VisibilityInterface::VISIBILITY_VISIBLE;

diff --git a/src/Service/Notification/EntryCommentNotificationManager.php b/src/Service/Notification/EntryCommentNotificationManager.php
@@ -56,6 +56,10 @@ public function __construct(
     // @todo check if author is on the block list
     public function sendCreated(ContentInterface $subject): void
     {
+        if ($subject->user->isBanned || $subject->user->isDeleted || $subject->user->isTrashed() || $subject->user->isSoftDeleted()) {
+            return;
+        }
+
         /**
          * @var EntryComment $subject
          */

diff --git a/src/Service/Notification/EntryNotificationManager.php b/src/Service/Notification/EntryNotificationManager.php
@@ -54,6 +54,10 @@ public function __construct(
     // @todo check if author is on the block list
     public function sendCreated(ContentInterface $subject): void
     {
+        if ($subject->user->isBanned || $subject->user->isDeleted || $subject->user->isTrashed() || $subject->user->isSoftDeleted()) {
+            return;
+        }
+
         /*
          * @var Entry $subject
          */

diff --git a/src/Service/Notification/PostCommentNotificationManager.php b/src/Service/Notification/PostCommentNotificationManager.php
@@ -56,6 +56,10 @@ public function __construct(
     // @todo check if author is on the block list
     public function sendCreated(ContentInterface $subject): void
     {
+        if ($subject->user->isBanned || $subject->user->isDeleted || $subject->user->isTrashed() || $subject->user->isSoftDeleted()) {
+            return;
+        }
+
         /**
          * @var PostComment $subject
          */

diff --git a/src/Service/Notification/PostNotificationManager.php b/src/Service/Notification/PostNotificationManager.php
@@ -53,6 +53,10 @@ public function __construct(
     // @todo check if author is on the block list
     public function sendCreated(ContentInterface $subject): void
     {
+        if ($subject->user->isBanned || $subject->user->isDeleted || $subject->user->isTrashed() || $subject->user->isSoftDeleted()) {
+            return;
+        }
+
         /*
          * @var Post $subject
          */