From 8dad086e1c4b1b7778f6215952d28180732894ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=B4=87=E5=B3=B0=20=E6=9C=94=E8=8F=AF?= <sakuhana@tsuitachi.net> Date: Sun, 24 Nov 2024 12:20:05 +0900 Subject: [PATCH] fix --- packages/backend/src/core/UserBlockingService.ts | 6 +++--- packages/backend/test/e2e/users.ts | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/backend/src/core/UserBlockingService.ts b/packages/backend/src/core/UserBlockingService.ts index 7611c7584c59..ad0def5b4b0d 100644 --- a/packages/backend/src/core/UserBlockingService.ts +++ b/packages/backend/src/core/UserBlockingService.ts @@ -190,8 +190,8 @@ export class UserBlockingService implements OnModuleInit { // Since we already have the blocker and blockee, we do not need to fetch // them in the query above and can just manually insert them here. // But we don't need to do this because we are not using them in this function. - // blocking.blocker = blocker; - // blocking.blockee = blockee; + blocking.blocker = blocker; + blocking.blockee = blockee; await this.blockingsRepository.delete(blocking.id); @@ -214,7 +214,7 @@ export class UserBlockingService implements OnModuleInit { public async checkBlocked(blockerId: MiUser['id'], blockeeId: MiUser['id']): Promise<boolean> { return (await this.cacheService.userBlockingCache.fetch(blockerId)).has(blockeeId); } - + @bindThis public async reactionBlock(blocker: MiUser, blockee: MiUser, silent = false) { const blocking = await this.blockingsRepository.findOneBy({ diff --git a/packages/backend/test/e2e/users.ts b/packages/backend/test/e2e/users.ts index 822ca14ae6c3..d0f3d553b77d 100644 --- a/packages/backend/test/e2e/users.ts +++ b/packages/backend/test/e2e/users.ts @@ -98,6 +98,8 @@ describe('ユーザー', () => { hasPendingFollowRequestToYou: user.hasPendingFollowRequestToYou ?? false, isBlocking: user.isBlocking ?? false, isBlocked: user.isBlocked ?? false, + isReactionBlocking: user.isReactionBlocking ?? false, + isReactionBlocked: user.isReactionBlocked ?? false, isMuted: user.isMuted ?? false, isRenoteMuted: user.isRenoteMuted ?? false, notify: user.notify ?? 'none',