From b3fc28824911201a4a6ba00f5aea7439d1addd66 Mon Sep 17 00:00:00 2001
From: kakkokari-gtyih <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Fri, 18 Oct 2024 17:57:23 +0900
Subject: [PATCH] =?UTF-8?q?=E3=83=AA=E3=83=A2=E3=83=BC=E3=83=88=E3=83=A6?=
 =?UTF-8?q?=E3=83=BC=E3=82=B6=E3=83=BC=E3=81=AB=E5=AF=BE=E3=81=97=E3=81=A6?=
 =?UTF-8?q?=E3=81=AF=E3=81=93=E3=81=AE=E5=88=B6=E9=99=90=E3=82=92=E3=81=8B?=
 =?UTF-8?q?=E3=81=91=E3=81=AA=E3=81=84=E3=82=88=E3=81=86=E3=81=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/backend/src/core/UserBlockingService.ts     | 1 +
 packages/backend/src/core/UserFollowingService.ts    | 1 +
 packages/backend/src/core/UserMutingService.ts       | 1 +
 packages/backend/src/core/UserRenoteMutingService.ts | 1 +
 4 files changed, 4 insertions(+)

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<void> {
 		// フォロー解除できないユーザーの場合
 		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<void> {
 		// フォロー解除できない（＝ミュートもできない）ユーザーの場合
 		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<void> {
 		// フォロー解除できない（＝リノートミュートもできない）ユーザーの場合
 		if (
+			user.host == null &&
 			this.serverSettings.forciblyFollowedUsers.includes(target.id) &&
 			!await this.roleService.isModerator(user)
 		) {