diff --git a/packages/backend/src/core/UserBlockingService.ts b/packages/backend/src/core/UserBlockingService.ts index 4ef1a60335..e18183f628 100644 --- a/packages/backend/src/core/UserBlockingService.ts +++ b/packages/backend/src/core/UserBlockingService.ts @@ -68,6 +68,7 @@ export class UserBlockingService implements OnModuleInit { public async block(blocker: MiUser, blockee: MiUser, silent = false) { // フォロー解除できない(=ブロックもできない)ユーザーの場合 if ( + blocker.host == null && this.serverSettings.forciblyFollowedUsers.includes(blockee.id) && !await this.roleService.isModerator(blocker) ) { diff --git a/packages/backend/src/core/UserFollowingService.ts b/packages/backend/src/core/UserFollowingService.ts index d2afade4dd..bdf215e8c5 100644 --- a/packages/backend/src/core/UserFollowingService.ts +++ b/packages/backend/src/core/UserFollowingService.ts @@ -376,6 +376,7 @@ export class UserFollowingService implements OnModuleInit { ): Promise { // フォロー解除できないユーザーの場合 if ( + follower.host == null && this.meta.forciblyFollowedUsers.includes(followee.id) && !await this.roleService.isModerator(follower) ) { diff --git a/packages/backend/src/core/UserMutingService.ts b/packages/backend/src/core/UserMutingService.ts index f4ad9e02bb..256d9b4025 100644 --- a/packages/backend/src/core/UserMutingService.ts +++ b/packages/backend/src/core/UserMutingService.ts @@ -34,6 +34,7 @@ export class UserMutingService { public async mute(user: MiUser, target: MiUser, expiresAt: Date | null = null): Promise { // フォロー解除できない(=ミュートもできない)ユーザーの場合 if ( + user.host == null && this.serverSettings.forciblyFollowedUsers.includes(target.id) && !await this.roleService.isModerator(user) ) { diff --git a/packages/backend/src/core/UserRenoteMutingService.ts b/packages/backend/src/core/UserRenoteMutingService.ts index ccba91879e..155c844664 100644 --- a/packages/backend/src/core/UserRenoteMutingService.ts +++ b/packages/backend/src/core/UserRenoteMutingService.ts @@ -36,6 +36,7 @@ export class UserRenoteMutingService { public async mute(user: MiUser, target: MiUser, expiresAt: Date | null = null): Promise { // フォロー解除できない(=リノートミュートもできない)ユーザーの場合 if ( + user.host == null && this.serverSettings.forciblyFollowedUsers.includes(target.id) && !await this.roleService.isModerator(user) ) {