feat(notice): remove comment_pinned notice

as article author can only pin their own comments now resolve #3950
thematters · Jun 21, 2024 · 0cac123 · 0cac123
1 parent 05671f4
commit 0cac123
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 40 deletions.
diff --git a/src/common/enums/notification.ts b/src/common/enums/notification.ts
@@ -15,7 +15,6 @@ export enum DB_NOTICE_TYPE {
   article_new_collected = 'article_new_collected',
 
   // comment
-  comment_pinned = 'comment_pinned',
   comment_mentioned_you = 'comment_mentioned_you',
   article_new_comment = 'article_new_comment',
   circle_new_broadcast = 'circle_new_broadcast',

diff --git a/src/connectors/__test__/notificationService.test.ts b/src/connectors/__test__/notificationService.test.ts
@@ -47,7 +47,6 @@ describe('user notify setting', () => {
     article_new_collected: false,
 
     // comment
-    comment_pinned: false,
     comment_mentioned_you: true,
     article_new_comment: true,
     circle_new_broadcast: true,

diff --git a/src/connectors/notificationService/index.ts b/src/connectors/notificationService/index.ts
@@ -63,7 +63,6 @@ export class NotificationService {
       case DB_NOTICE_TYPE.article_new_subscriber:
       case DB_NOTICE_TYPE.article_mentioned_you:
       case DB_NOTICE_TYPE.comment_mentioned_you:
-      case DB_NOTICE_TYPE.comment_pinned:
       case DB_NOTICE_TYPE.article_new_comment:
       case DB_NOTICE_TYPE.comment_new_reply:
       case DB_NOTICE_TYPE.payment_received_donation:

diff --git a/src/connectors/notificationService/notice.ts b/src/connectors/notificationService/notice.ts
@@ -385,30 +385,6 @@ export class Notice extends BaseService<NoticeDB> {
     return actors
   }
 
-  /**
-   * Find notices by given ids.
-   */
-  private findByIds = async (ids: readonly string[]): Promise<NoticeItem[]> => {
-    const notices = await this.findDetail({
-      whereIn: ['notice.id', ids as string[]],
-    })
-
-    return Promise.all(
-      notices.map(async (n: NoticeDetail) => {
-        const entities = (await this.findEntities(n.id)) as NoticeEntitiesMap
-        const actors = await this.findActors(n.id)
-
-        return {
-          ...n,
-          createdAt: n.updatedAt,
-          type: n.noticeType,
-          actors,
-          entities,
-        }
-      })
-    )
-  }
-
   /*********************************
    *                               *
    *           By User             *
@@ -480,7 +456,6 @@ export class Notice extends BaseService<NoticeDB> {
       article_new_collected: setting.articleNewCollected,
 
       // comment
-      comment_pinned: setting.articleCommentPinned,
       comment_mentioned_you: setting.mention,
       article_new_comment: setting.articleNewComment,
       circle_new_broadcast: setting.inCircleNewBroadcast,

diff --git a/src/mutations/comment/togglePinComment.ts b/src/mutations/comment/togglePinComment.ts
@@ -3,7 +3,6 @@ import type { GQLMutationResolvers, Article, Circle } from 'definitions'
 import {
   CACHE_KEYWORD,
   COMMENT_TYPE,
-  DB_NOTICE_TYPE,
   NODE_TYPES,
 } from 'common/enums'
 import {
@@ -19,7 +18,7 @@ const resolver: Exclude<
 > = async (
   _,
   { input: { id, enabled } },
-  { viewer, dataSources: { atomService, commentService, notificationService } }
+  { viewer, dataSources: { atomService, commentService } }
 ) => {
   if (!viewer.id) {
     throw new AuthenticationError('visitor has no permission')
@@ -97,13 +96,6 @@ const resolver: Exclude<
       },
     })
 
-    // trigger notifications
-    notificationService.trigger({
-      event: DB_NOTICE_TYPE.comment_pinned,
-      actorId: viewer.id,
-      recipientId: comment.authorId,
-      entities: [{ type: 'target', entityTable: 'comment', entity: comment }],
-    })
   } else {
     pinnedComment = await atomService.update({
       table: 'comment',

diff --git a/src/queries/notice/index.ts b/src/queries/notice/index.ts
@@ -157,8 +157,6 @@ const notice: {
   CommentNotice: {
     type: ({ type }) => {
       switch (type) {
-        case DB_NOTICE_TYPE.comment_pinned:
-          return 'CommentPinned'
         case DB_NOTICE_TYPE.comment_mentioned_you:
           return 'CommentMentionedYou'
         case DB_NOTICE_TYPE.article_new_comment:
@@ -173,7 +171,6 @@ const notice: {
         throw new ServerError('entities is empty')
       }
       switch (type) {
-        case DB_NOTICE_TYPE.comment_pinned:
         case DB_NOTICE_TYPE.comment_mentioned_you:
         case DB_NOTICE_TYPE.circle_new_broadcast: // deprecated
           return entities.target