fix: prevent duplicate notifications being sent (#80)

FriendsOfFlarum · Jan 24, 2025 · c04dd09 · c04dd09
1 parent 43a8800
commit c04dd09
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 0 deletions.
diff --git a/src/Jobs/SendNotificationWhenDiscussionIsReTagged.php b/src/Jobs/SendNotificationWhenDiscussionIsReTagged.php
@@ -62,6 +62,7 @@ public function handle(NotificationSyncer $notifications)
             ->whereIn('tag_user.tag_id', $tagIds->all())
             ->whereIn('tag_user.subscription', ['follow', 'lurk'])
             ->get()
+            ->unique()
             ->reject(function ($user) use ($firstPost, $tags) {
                 return $tags->map->stateFor($user)->map->subscription->contains('ignore')
                         || !$this->discussion->newQuery()->whereVisibleTo($user)->find($this->discussion->id)

diff --git a/src/Jobs/SendNotificationWhenDiscussionIsStarted.php b/src/Jobs/SendNotificationWhenDiscussionIsStarted.php
@@ -55,6 +55,7 @@ public function handle(NotificationSyncer $notifications)
             ->whereIn('tag_user.tag_id', $tagIds->all())
             ->whereIn('tag_user.subscription', ['follow', 'lurk'])
             ->get()
+            ->unique()
             ->reject(function ($user) use ($firstPost, $tags) {
                 return $tags->map->stateFor($user)->map->subscription->contains('ignore')
                         || !$this->discussion->newQuery()->whereVisibleTo($user)->find($this->discussion->id)

diff --git a/src/Jobs/SendNotificationWhenReplyIsPosted.php b/src/Jobs/SendNotificationWhenReplyIsPosted.php
@@ -64,6 +64,7 @@ public function handle(NotificationSyncer $notifications)
             ->where('tag_user.subscription', 'lurk')
             ->where('discussion_user.last_read_post_number', '>=', $this->lastPostNumber - 1)
             ->get()
+            ->unique()
             ->reject(function (User $user) use ($tags) {
                 return $tags->map->stateFor($user)->map->subscription->contains('ignore')
                     || !$this->post->isVisibleTo($user);