From 21f3834729207f8fbf2505423330883f2e0d6a27 Mon Sep 17 00:00:00 2001 From: Hazelnoot Date: Sat, 9 Aug 2025 13:40:56 -0400 Subject: [PATCH] exclude user / instance mandatoryCW when bypassSilence is set --- packages/frontend/src/utility/check-word-mute.ts | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/frontend/src/utility/check-word-mute.ts b/packages/frontend/src/utility/check-word-mute.ts index 450b5bc9f7..70d2491dc5 100644 --- a/packages/frontend/src/utility/check-word-mute.ts +++ b/packages/frontend/src/utility/check-word-mute.ts @@ -120,10 +120,13 @@ function getMutes(note: Misskey.entities.Note, withHardMute: boolean, overrides: : (isMe ? null : note.mandatoryCW); const userMandatoryCW = override.userMandatoryCW !== undefined ? override.userMandatoryCW - : (isMe ? null : note.user.mandatoryCW); + : !note.user.bypassSilence + ? note.user.mandatoryCW + : null; + const instanceMandatoryCW = override.instanceMandatoryCW !== undefined ? override.instanceMandatoryCW - : (!isMe && note.user.instance) + : (!note.user.bypassSilence && note.user.instance) ? note.user.instance.mandatoryCW : null;