From 7728e749f1770563ca2f477b00d06333ce8d2611 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Sat, 9 Aug 2025 13:37:11 -0400
Subject: [PATCH] return bypassSilence to the frontend and remove
 isSilencedForMe

---
 packages/backend/src/core/entities/UserEntityService.ts | 3 +--
 packages/backend/src/models/json-schema/user.ts         | 6 +-----
 packages/frontend/src/utility/check-word-mute.ts        | 4 ++--
 packages/misskey-js/src/autogen/types.ts                | 3 +--
 4 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/packages/backend/src/core/entities/UserEntityService.ts b/packages/backend/src/core/entities/UserEntityService.ts
index a7d8138779..b944e952ea 100644
--- a/packages/backend/src/core/entities/UserEntityService.ts
+++ b/packages/backend/src/core/entities/UserEntityService.ts
@@ -573,7 +573,7 @@ export class UserEntityService implements OnModuleInit {
 			rejectQuotes: user.rejectQuotes,
 			attributionDomains: user.attributionDomains,
 			isSilenced: user.isSilenced,
-			isSilencedForMe: !bypassSilence && user.isSilenced,
+			bypassSilence: bypassSilence,
 			speakAsCat: user.speakAsCat ?? false,
 			approved: user.approved,
 			requireSigninToViewContents: user.requireSigninToViewContents === false ? undefined : true,
@@ -587,7 +587,6 @@ export class UserEntityService implements OnModuleInit {
 				faviconUrl: instance.faviconUrl,
 				themeColor: instance.themeColor,
 				isSilenced: instance.isSilenced,
-				isSilencedForMe: !bypassSilence && instance.isSilenced,
 				mandatoryCW: instance.mandatoryCW,
 			} : undefined) : undefined,
 			followersCount: followersCount ?? 0,
diff --git a/packages/backend/src/models/json-schema/user.ts b/packages/backend/src/models/json-schema/user.ts
index 5b0ecf181c..65ef387fb7 100644
--- a/packages/backend/src/models/json-schema/user.ts
+++ b/packages/backend/src/models/json-schema/user.ts
@@ -184,7 +184,7 @@ export const packedUserLiteSchema = {
 			type: 'boolean',
 			nullable: false, optional: false,
 		},
-		isSilencedForMe: {
+		bypassSilence: {
 			type: 'boolean',
 			nullable: false, optional: false,
 		},
@@ -232,10 +232,6 @@ export const packedUserLiteSchema = {
 					type: 'boolean',
 					nullable: false, optional: false,
 				},
-				isSilencedForMe: {
-					type: 'boolean',
-					nullable: false, optional: false,
-				},
 				mandatoryCW: {
 					type: 'string',
 					nullable: true, optional: false,
diff --git a/packages/frontend/src/utility/check-word-mute.ts b/packages/frontend/src/utility/check-word-mute.ts
index f39b83a140..450b5bc9f7 100644
--- a/packages/frontend/src/utility/check-word-mute.ts
+++ b/packages/frontend/src/utility/check-word-mute.ts
@@ -111,8 +111,8 @@ function getMutes(note: Misskey.entities.Note, withHardMute: boolean, overrides:
 	const hardMuted = override.hardMuted ?? (!isMe && withHardMute && isHardMuted(note));
 	const softMutedWords = override.softMutedWords ?? (isMe ? [] : isSoftMuted(note));
 	const sensitiveMuted = override.sensitiveMuted ?? isSensitiveMuted(note);
-	const userSilenced = override.userSilenced ?? note.user.isSilencedForMe;
-	const instanceSilenced = override.instanceSilenced ?? note.user.instance?.isSilencedForMe ?? false;
+	const userSilenced = override.userSilenced ?? (note.user.isSilenced && !note.user.bypassSilence);
+	const instanceSilenced = override.instanceSilenced ?? (note.user.instance?.isSilenced && !note.user.bypassSilence) ?? false;
 	const threadMuted = override.threadMuted ?? (!isMe && note.isMutingThread);
 	const noteMuted = override.noteMuted ?? (!isMe && note.isMutingNote);
 	const noteMandatoryCW = override.noteMandatoryCW !== undefined
diff --git a/packages/misskey-js/src/autogen/types.ts b/packages/misskey-js/src/autogen/types.ts
index fd9aff3e34..71c30d66e5 100644
--- a/packages/misskey-js/src/autogen/types.ts
+++ b/packages/misskey-js/src/autogen/types.ts
@@ -4307,7 +4307,7 @@ export type components = {
       isCat?: boolean;
       speakAsCat?: boolean;
       isSilenced: boolean;
-      isSilencedForMe: boolean;
+      bypassSilence: boolean;
       requireSigninToViewContents?: boolean;
       makeNotesFollowersOnlyBefore?: number | null;
       makeNotesHiddenBefore?: number | null;
@@ -4319,7 +4319,6 @@ export type components = {
         faviconUrl: string | null;
         themeColor: string | null;
         isSilenced: boolean;
-        isSilencedForMe: boolean;
         mandatoryCW: string | null;
       };
       followersCount: number;