fix: blocked users no longer show in followers (#2594)

dailydotdev · Jan 14, 2025 · 7042f8c · 7042f8c
1 parent 3595236
commit 7042f8c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 29 deletions.
diff --git a/__tests__/contentPreference.ts b/__tests__/contentPreference.ts
@@ -245,7 +245,7 @@ describe('query userFollowers', () => {
         feedId: '4-ufq',
         referenceId: '1-ufq',
         referenceUserId: '1-ufq',
-        status: ContentPreferenceStatus.Follow,
+        status: ContentPreferenceStatus.Blocked,
         createdAt: new Date(now.getTime() - 4000),
       },
     ]);
@@ -282,15 +282,6 @@ describe('query userFollowers', () => {
               },
             },
           },
-          {
-            node: {
-              referenceId: '1-ufq',
-              status: 'follow',
-              user: {
-                id: '4-ufq',
-              },
-            },
-          },
         ],
       },
     });
@@ -386,7 +377,7 @@ describe('query userFollowing', () => {
         feedId: '1-ufwq',
         referenceId: '4-ufwq',
         referenceUserId: '4-ufwq',
-        status: ContentPreferenceStatus.Follow,
+        status: ContentPreferenceStatus.Blocked,
         createdAt: new Date(now.getTime() - 4000),
       },
     ]);
@@ -424,15 +415,6 @@ describe('query userFollowing', () => {
               },
             },
           },
-          {
-            node: {
-              referenceId: '4-ufwq',
-              status: 'follow',
-              user: {
-                id: '1-ufwq',
-              },
-            },
-          },
         ],
       },
     });
@@ -469,15 +451,6 @@ describe('query userFollowing', () => {
               },
             },
           },
-          {
-            node: {
-              referenceId: '4-ufwq',
-              status: 'follow',
-              user: {
-                id: '1-ufwq',
-              },
-            },
-          },
         ],
       },
     });

diff --git a/src/schema/contentPreference.ts b/src/schema/contentPreference.ts
@@ -296,6 +296,9 @@ export const resolvers: IResolvers<unknown, BaseContext> = traceResolvers<
             .andWhere(`${builder.alias}."type" = :type`, {
               type: args.entity,
             })
+            .andWhere(`${builder.alias}."status" != :status`, {
+              status: ContentPreferenceStatus.Blocked,
+            })
             .limit(page.limit)
             .offset(page.offset)
             .addOrderBy(`${builder.alias}."createdAt"`, 'DESC');