fix: check block list base on username

Author: winverse

src/cache.ts

@@ -4,7 +4,7 @@ interface CacheService {
   connect: () => void;
   remove: (...keys: string[]) => Promise<number>;
   disconnect: () => void;
-  readBlackList: () => Promise<string[]>;
+  readBlockList: () => Promise<string[]>;
 }
 
 class Cache implements CacheService {
@@ -34,13 +34,13 @@ class Cache implements CacheService {
     return Promise.resolve();
   }
 
-  public async readBlackList(): Promise<string[]> {
+  public async readBlockList(): Promise<string[]> {
     if (!this.client) {
       this.connect();
     }
 
     try {
-      const keyname = this.setName.blackList;
+      const keyname = this.setName.blockList;
       const list = await this.client?.smembers(keyname);
       return list ?? [];
     } catch (error) {
@@ -67,7 +67,7 @@ class Cache implements CacheService {
 
   private get setName(): Record<SetName, string> {
     return {
-      blackList: 'set:blackList',
+      blockList: 'set:blockList',
     };
   }
 }
@@ -87,4 +87,4 @@ type GenerateCacheKey = {
 
 type QueueName = 'feed';
 
-type SetName = 'blackList';
+type SetName = 'blockList';

src/graphql/post.ts

@@ -822,7 +822,7 @@ export const resolvers: IResolvers<any, ApolloContext> = {
           console.log(e);
         }
       }
-      const isBlockList = await checkBlockList(ctx.user_id);
+      const isBlockList = await checkBlockList(ctx.user_id, user?.username);
       if (isBlockList) {
         post.is_private = true;
       }
@@ -1116,7 +1116,7 @@ export const resolvers: IResolvers<any, ApolloContext> = {
       }
       post.url_slug = processedUrlSlug;
 
-      const isBlockList = await checkBlockList(ctx.user_id);
+      const isBlockList = await checkBlockList(ctx.user_id, user?.username);
       if (isBlockList) {
         post.is_private = true;
       }

src/lib/checkBlockList.ts

@@ -1,9 +1,8 @@
 import cache from '../cache';
 
-export async function checkBlockList(userId: string) {
+export async function checkBlockList(userId: string, username: string = '') {
   const blockListFromEnv = (process.env.BLOCK_LIST ?? '').split(',');
-  const blockListFromCache = await cache.readBlackList();
-  const blockList = [...blockListFromEnv, ...blockListFromCache];
-
-  return blockList.includes(userId);
+  const blockListFromCache = await cache.readBlockList();
+  const isBlocked = blockListFromEnv.includes(userId) || blockListFromCache.includes(username);
+  return isBlocked;
 }