Merge pull request #4154 from thematters/fix/moment-notice

fix(notice): avoid sending two notices to target author
thematters · Aug 27, 2024 · c87d453 · c87d453
2 parents eb0e1ce + b0333b4
commit c87d453
Showing 1 changed file with 13 additions and 10 deletions.
diff --git a/src/mutations/comment/putComment.ts b/src/mutations/comment/putComment.ts
@@ -527,16 +527,19 @@ const resolver: GQLMutationResolvers['putComment'] = async (
   }
 
   if (isMoment) {
-    notificationService.trigger({
-      event: NOTICE_TYPE.moment_new_comment,
-      actorId: viewer.id,
-      recipientId: targetAuthor,
-      entities: [
-        { type: 'target', entityTable: 'moment', entity: moment },
-        { type: 'comment', entityTable: 'comment', entity: newComment },
-      ],
-      tag: `put-comment:${newComment.id}`,
-    })
+    const isMentioned = !!data.mentionedUserIds?.includes(targetAuthor)
+    if (!isMentioned) {
+      notificationService.trigger({
+        event: NOTICE_TYPE.moment_new_comment,
+        actorId: viewer.id,
+        recipientId: targetAuthor,
+        entities: [
+          { type: 'target', entityTable: 'moment', entity: moment },
+          { type: 'comment', entityTable: 'comment', entity: newComment },
+        ],
+        tag: `put-comment:${newComment.id}`,
+      })
+    }
   }
 
   // article & circle & moment: notify mentioned users