From 09a228051379723b4d3b9a97a7c6ab7a8054d7c4 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Fri, 27 Jun 2025 18:51:32 -0400
Subject: [PATCH 001/110] fix missing import for MkOmit in home.vue

---
 packages/frontend/src/pages/user/home.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/frontend/src/pages/user/home.vue b/packages/frontend/src/pages/user/home.vue
index 930baca05e..156eab004f 100644
--- a/packages/frontend/src/pages/user/home.vue
+++ b/packages/frontend/src/pages/user/home.vue
@@ -222,6 +222,7 @@ import { getStaticImageUrl } from '@/utility/media-proxy.js';
 import MkSparkle from '@/components/MkSparkle.vue';
 import { prefer } from '@/preferences.js';
 import DynamicNote from '@/components/DynamicNote.vue';
+import MkOmit from '@/components/MkOmit.vue';
 
 function calcAge(birthdate: string): number {
 	const date = new Date(birthdate);

From 54ad6438af52b2a0094a8cf478d7bc3cc2442d7c Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Fri, 27 Jun 2025 18:52:08 -0400
Subject: [PATCH 002/110] refactor note mutes and render mandatoryCW as a mute

---
 locales/index.d.ts                            |   4 +
 packages/frontend/src/components/MkNote.vue   |  47 +---
 .../src/components/MkNoteDetailed.vue         |  40 +--
 .../frontend/src/components/MkNoteSimple.vue  |   8 +-
 .../frontend/src/components/MkNoteSub.vue     |  29 +--
 .../src/components/SkFollowingFeedEntry.vue   |  27 +-
 .../frontend/src/components/SkMutedNote.vue   | 119 ++++++---
 packages/frontend/src/components/SkNote.vue   |  45 +---
 .../src/components/SkNoteDetailed.vue         |  39 +--
 .../frontend/src/components/SkNoteSimple.vue  |   8 +-
 .../frontend/src/components/SkNoteSub.vue     |  26 +-
 .../frontend/src/utility/check-word-mute.ts   | 240 +++++++++++-------
 sharkey-locales/en-US.yml                     |   1 +
 13 files changed, 304 insertions(+), 329 deletions(-)

diff --git a/locales/index.d.ts b/locales/index.d.ts
index 7f20c6803f..bb953a4a5e 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -12084,6 +12084,10 @@ export interface Locale extends ILocale {
      * {name} said something in a muted thread
      */
     "userSaysSomethingInMutedThread": ParameterizedString<"name">;
+    /**
+     * {name} is flagged: "{cw}"
+     */
+    "userIsFlaggedAs": ParameterizedString<"name" | "cw">;
     /**
      * Mark all media from user as NSFW
      */
diff --git a/packages/frontend/src/components/MkNote.vue b/packages/frontend/src/components/MkNote.vue
index cd36bc2b89..fd752eb3f8 100644
--- a/packages/frontend/src/components/MkNote.vue
+++ b/packages/frontend/src/components/MkNote.vue
@@ -4,11 +4,12 @@ SPDX-License-Identifier: AGPL-3.0-only
 -->
 
 <template>
-<div
-	v-if="!hardMuted && muted === false && !threadMuted && !noteMuted"
+<SkMutedNote
 	v-show="!isDeleted"
-	ref="rootEl"
+	ref="rootComp"
 	v-hotkey="keymap"
+	:note="appearNote"
+	:withHardMute="withHardMute"
 	:class="[$style.root, { [$style.showActionsOnlyHover]: prefer.s.showNoteActionsOnlyHover, [$style.skipRender]: prefer.s.skipNoteRender }]"
 	:tabindex="isDeleted ? '-1' : '0'"
 >
@@ -57,10 +58,10 @@ SPDX-License-Identifier: AGPL-3.0-only
 			<MkInstanceTicker v-if="showTicker" :host="appearNote.user.host" :instance="appearNote.user.instance"/>
 			<div style="container-type: inline-size;">
 				<bdi>
-				<p v-if="mergedCW != null" :class="$style.cw">
+				<p v-if="appearNote.cw != null" :class="$style.cw">
 					<Mfm
-						v-if="mergedCW != ''"
-						:text="mergedCW"
+						v-if="appearNote.cw != ''"
+						:text="appearNote.cw"
 						:author="appearNote.user"
 						:nyaize="'respect'"
 						:enableEmojiMenu="true"
@@ -69,7 +70,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 					/>
 					<MkCwButton v-model="showContent" :text="appearNote.text" :renote="appearNote.renote" :files="appearNote.files" :poll="appearNote.poll" style="margin: 4px 0;" @click.stop/>
 				</p>
-				<div v-show="mergedCW == null || showContent" :class="[{ [$style.contentCollapsed]: collapsed }]">
+				<div v-show="appearNote.cw == null || showContent" :class="[{ [$style.contentCollapsed]: collapsed }]">
 					<div :class="$style.text">
 						<span v-if="appearNote.isHidden" style="opacity: 0.5">({{ i18n.ts.private }})</span>
 						<div>
@@ -167,16 +168,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 			</footer>
 		</div>
 	</article>
-</div>
-<div v-else-if="!hardMuted" :class="$style.muted" @click.stop="muted = false">
-	<SkMutedNote :muted="muted" :threadMuted="threadMuted" :noteMuted="noteMuted" :note="appearNote"></SkMutedNote>
-</div>
-<div v-else>
-	<!--
-		MkDateSeparatedList uses TransitionGroup which requires single element in the child elements
-		so MkNote create empty div instead of no elements
-	-->
-</div>
+</SkMutedNote>
 </template>
 
 <script lang="ts" setup>
@@ -186,7 +178,6 @@ import * as Misskey from 'misskey-js';
 import { isLink } from '@@/js/is-link.js';
 import { shouldCollapsed } from '@@/js/collapsed.js';
 import * as config from '@@/js/config.js';
-import { computeMergedCw } from '@@/js/compute-merged-cw.js';
 import type { Ref } from 'vue';
 import type { MenuItem } from '@/types/menu.js';
 import type { OpenOnRemoteOptions } from '@/utility/please-login.js';
@@ -205,7 +196,6 @@ import MkUrlPreview from '@/components/MkUrlPreview.vue';
 import MkInstanceTicker from '@/components/MkInstanceTicker.vue';
 import MkButton from '@/components/MkButton.vue';
 import { pleaseLogin } from '@/utility/please-login.js';
-import { checkMutes } from '@/utility/check-word-mute.js';
 import { notePage } from '@/filters/note.js';
 import { userPage } from '@/filters/user.js';
 import number from '@/filters/number.js';
@@ -217,7 +207,7 @@ import { extractUrlFromMfm } from '@/utility/extract-url-from-mfm.js';
 import { checkAnimationFromMfm } from '@/utility/check-animated-mfm.js';
 import { $i } from '@/i.js';
 import { i18n } from '@/i18n.js';
-import { getAbuseNoteMenu, getCopyNoteLinkMenu, getNoteClipMenu, getNoteMenu, getRenoteMenu, translateNote } from '@/utility/get-note-menu.js';
+import { getAbuseNoteMenu, getCopyNoteLinkMenu, getNoteClipMenu, getNoteMenu, translateNote } from '@/utility/get-note-menu.js';
 import { getNoteVersionsMenu } from '@/utility/get-note-versions-menu.js';
 import { useNoteCapture } from '@/use/use-note-capture.js';
 import { deepClone } from '@/utility/clone.js';
@@ -272,7 +262,8 @@ function noteclick(id: string) {
 
 const isRenote = Misskey.note.isPureRenote(note.value);
 
-const rootEl = useTemplateRef('rootEl');
+const rootComp = useTemplateRef('rootComp');
+const rootEl = computed(() => rootComp.value?.rootEl ?? null);
 const menuButton = useTemplateRef('menuButton');
 const renoteButton = useTemplateRef('renoteButton');
 const renoteTime = useTemplateRef('renoteTime');
@@ -291,7 +282,6 @@ const selfNoteIds = computed(() => getSelfNoteIds(props.note));
 const isLong = shouldCollapsed(appearNote.value, urls.value);
 const collapsed = ref(prefer.s.expandLongNote && appearNote.value.cw == null && isLong ? false : appearNote.value.cw == null && isLong);
 const isDeleted = ref(false);
-const { muted, hardMuted, threadMuted, noteMuted } = checkMutes(appearNote, computed(() => props.withHardMute));
 const translation = ref<Misskey.entities.NotesTranslateResponse | false | null>(null);
 const translating = ref(false);
 const showTicker = (prefer.s.instanceTicker === 'always') || (prefer.s.instanceTicker === 'remote' && appearNote.value.user.instance);
@@ -314,8 +304,6 @@ const pleaseLoginContext = computed<OpenOnRemoteOptions>(() => ({
 	url: appearNote.value.url ?? appearNote.value.uri ?? `${config.url}/notes/${appearNote.value.id}`,
 }));
 
-const mergedCW = computed(() => computeMergedCw(appearNote.value));
-
 const renoteTooltip = computeRenoteTooltip(appearNote);
 
 let renoting = false;
@@ -1291,16 +1279,7 @@ function emitUpdReaction(emoji: string, delta: number) {
 	}
 }
 
-.muted {
-	padding: 8px;
-	text-align: center;
-	opacity: 0.7;
-	cursor: pointer;
-}
-
-.muted:hover {
-	background: var(--MI_THEME-buttonBg);
-}
+// Mute CSS moved to SkMutedNote.vue
 
 .reactionOmitted {
 	display: inline-block;
diff --git a/packages/frontend/src/components/MkNoteDetailed.vue b/packages/frontend/src/components/MkNoteDetailed.vue
index 773cac73ac..98582c56fc 100644
--- a/packages/frontend/src/components/MkNoteDetailed.vue
+++ b/packages/frontend/src/components/MkNoteDetailed.vue
@@ -4,11 +4,11 @@ SPDX-License-Identifier: AGPL-3.0-only
 -->
 
 <template>
-<div
-	v-if="!muted && !threadMuted && !noteMuted"
+<SkMutedNote
 	v-show="!isDeleted"
-	ref="rootEl"
+	ref="rootComp"
 	v-hotkey="keymap"
+	:note="appearNote"
 	:class="$style.root"
 	:tabindex="isDeleted ? '-1' : '0'"
 >
@@ -75,10 +75,10 @@ SPDX-License-Identifier: AGPL-3.0-only
 			</div>
 		</header>
 		<div :class="$style.noteContent">
-			<p v-if="mergedCW != null" :class="$style.cw">
+			<p v-if="appearNote.cw != null" :class="$style.cw">
 				<Mfm
-					v-if="mergedCW != ''"
-					:text="mergedCW"
+					v-if="appearNote.cw != ''"
+					:text="appearNote.cw"
 					:author="appearNote.user"
 					:nyaize="'respect'"
 					:enableEmojiMenu="true"
@@ -87,7 +87,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 				/>
 				<MkCwButton v-model="showContent" :text="appearNote.text" :renote="appearNote.renote" :files="appearNote.files" :poll="appearNote.poll"/>
 			</p>
-			<div v-show="mergedCW == null || showContent">
+			<div v-show="appearNote.cw == null || showContent">
 				<span v-if="appearNote.isHidden" style="opacity: 0.5">({{ i18n.ts.private }})</span>
 				<div>
 					<MkA v-if="appearNote.replyId" :class="$style.noteReplyTarget" :to="`/notes/${appearNote.replyId}`"><i class="ph-arrow-bend-left-up ph-bold ph-lg"></i></MkA>
@@ -225,10 +225,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 			</MkPagination>
 		</div>
 	</div>
-</div>
-<div v-else class="_panel" :class="$style.muted" @click.stop="muted = false">
-	<SkMutedNote :muted="muted" :threadMuted="threadMuted" :noteMuted="noteMuted" :note="appearNote"></SkMutedNote>
-</div>
+</SkMutedNote>
 </template>
 
 <script lang="ts" setup>
@@ -253,7 +250,6 @@ import MkUsersTooltip from '@/components/MkUsersTooltip.vue';
 import MkUrlPreview from '@/components/MkUrlPreview.vue';
 import MkInstanceTicker from '@/components/MkInstanceTicker.vue';
 import { pleaseLogin } from '@/utility/please-login.js';
-import { checkMutes } from '@/utility/check-word-mute.js';
 import { userPage } from '@/filters/user.js';
 import { notePage } from '@/filters/note.js';
 import number from '@/filters/number.js';
@@ -264,7 +260,7 @@ import { reactionPicker } from '@/utility/reaction-picker.js';
 import { extractUrlFromMfm } from '@/utility/extract-url-from-mfm.js';
 import { $i } from '@/i.js';
 import { i18n } from '@/i18n.js';
-import { getNoteClipMenu, getNoteMenu, getRenoteMenu, translateNote } from '@/utility/get-note-menu.js';
+import { getNoteClipMenu, getNoteMenu, translateNote } from '@/utility/get-note-menu.js';
 import { getNoteVersionsMenu } from '@/utility/get-note-versions-menu.js';
 import { checkAnimationFromMfm } from '@/utility/check-animated-mfm.js';
 import { useNoteCapture } from '@/use/use-note-capture.js';
@@ -302,7 +298,8 @@ const note = ref(deepClone(props.note));
 
 const isRenote = Misskey.note.isPureRenote(note.value);
 
-const rootEl = useTemplateRef('rootEl');
+const rootComp = useTemplateRef('rootComp');
+const rootEl = computed(() => rootComp.value?.rootEl ?? null);
 const menuButton = useTemplateRef('menuButton');
 const renoteButton = useTemplateRef('renoteButton');
 const renoteTime = useTemplateRef('renoteTime');
@@ -329,12 +326,8 @@ const quotes = ref<Misskey.entities.Note[]>([]);
 const canRenote = computed(() => ['public', 'home'].includes(appearNote.value.visibility) || (appearNote.value.visibility === 'followers' && appearNote.value.userId === $i?.id));
 const defaultLike = computed(() => prefer.s.like ? prefer.s.like : null);
 
-const mergedCW = computed(() => computeMergedCw(appearNote.value));
-
 const renoteTooltip = computeRenoteTooltip(appearNote);
 
-const { muted, threadMuted, noteMuted } = checkMutes(appearNote);
-
 setupNoteViewInterruptors(note, isDeleted);
 
 watch(() => props.expandAllCws, (expandAllCws) => {
@@ -1149,14 +1142,5 @@ function animatedMFM() {
 	}
 }
 
-.muted {
-	padding: 8px;
-	text-align: center;
-	opacity: 0.7;
-	cursor: pointer;
-}
-
-.muted:hover {
-	background: var(--MI_THEME-buttonBg);
-}
+// Mute CSS moved to SkMutedNote.vue
 </style>
diff --git a/packages/frontend/src/components/MkNoteSimple.vue b/packages/frontend/src/components/MkNoteSimple.vue
index 2fd32f0f82..ba3719cf85 100644
--- a/packages/frontend/src/components/MkNoteSimple.vue
+++ b/packages/frontend/src/components/MkNoteSimple.vue
@@ -9,11 +9,11 @@ SPDX-License-Identifier: AGPL-3.0-only
 	<div :class="$style.main">
 		<MkNoteHeader :class="$style.header" :note="note" :mini="true"/>
 		<div>
-			<p v-if="mergedCW != null" :class="$style.cw">
-				<Mfm v-if="mergedCW != ''" style="margin-right: 8px;" :text="mergedCW" :isBlock="true" :author="note.user" :nyaize="'respect'" :emojiUrls="note.emojis"/>
+			<p v-if="props.note.cw != null" :class="$style.cw">
+				<Mfm v-if="props.note.cw != ''" style="margin-right: 8px;" :text="props.note.cw" :isBlock="true" :author="note.user" :nyaize="'respect'" :emojiUrls="note.emojis"/>
 				<MkCwButton v-model="showContent" :text="note.text" :files="note.files" :poll="note.poll" @click.stop/>
 			</p>
-			<div v-show="mergedCW == null || showContent">
+			<div v-show="props.note.cw == null || showContent">
 				<MkSubNoteContent :hideFiles="hideFiles" :class="$style.text" :note="note" :expandAllCws="props.expandAllCws"/>
 				<div v-if="note.isSchedule" style="margin-top: 10px;">
 					<MkButton :class="$style.button" inline @click.stop.prevent="editScheduleNote()"><i class="ti ti-eraser"></i> {{ i18n.ts.edit }}</MkButton>
@@ -53,8 +53,6 @@ const isDeleted = ref(false);
 
 const note = ref(deepClone(props.note));
 
-const mergedCW = computed(() => computeMergedCw(note.value));
-
 if (!note.value.isSchedule) {
 	setupNoteViewInterruptors(note, null);
 }
diff --git a/packages/frontend/src/components/MkNoteSub.vue b/packages/frontend/src/components/MkNoteSub.vue
index 948472d6ea..1c66d5580b 100644
--- a/packages/frontend/src/components/MkNoteSub.vue
+++ b/packages/frontend/src/components/MkNoteSub.vue
@@ -4,18 +4,18 @@ SPDX-License-Identifier: AGPL-3.0-only
 -->
 
 <template>
-<div v-show="!isDeleted" v-if="!muted && !noteMuted" ref="el" :class="[$style.root, { [$style.children]: depth > 1 }]">
+<SkMutedNote v-show="!isDeleted" ref="rootComp" :note="appearNote" :mutedClass="$style.muted" :expandedClass="[$style.root, { [$style.children]: depth > 1 }]">
 	<div :class="$style.main">
 		<div v-if="note.channel" :class="$style.colorBar" :style="{ background: note.channel.color }"></div>
 		<MkAvatar :class="$style.avatar" :user="note.user" link preview/>
 		<div :class="$style.body">
 			<MkNoteHeader :class="$style.header" :note="note" :mini="true"/>
 			<div :class="$style.content">
-				<p v-if="mergedCW != null" :class="$style.cw">
-					<Mfm v-if="mergedCW != ''" style="margin-right: 8px;" :text="mergedCW" :isBlock="true" :author="note.user" :nyaize="'respect'"/>
+				<p v-if="appearNote.cw != null" :class="$style.cw">
+					<Mfm v-if="appearNote.cw != ''" style="margin-right: 8px;" :text="appearNote.cw" :isBlock="true" :author="note.user" :nyaize="'respect'"/>
 					<MkCwButton v-model="showContent" :text="note.text" :files="note.files" :poll="note.poll"/>
 				</p>
-				<div v-show="mergedCW == null || showContent">
+				<div v-show="appearNote.cw == null || showContent">
 					<MkSubNoteContent :class="$style.text" :note="note" :translating="translating" :translation="translation" :expandAllCws="props.expandAllCws"/>
 				</div>
 			</div>
@@ -77,16 +77,12 @@ SPDX-License-Identifier: AGPL-3.0-only
 	<div v-else :class="$style.more">
 		<MkA class="_link" :to="notePage(note)">{{ i18n.ts.continueThread }} <i class="ti ti-chevron-double-right"></i></MkA>
 	</div>
-</div>
-<div v-else :class="$style.muted" @click.stop="muted = false">
-	<SkMutedNote :muted="muted" :threadMuted="false" :noteMuted="noteMuted" :note="appearNote"></SkMutedNote>
-</div>
+</SkMutedNote>
 </template>
 
 <script lang="ts" setup>
 import { computed, inject, ref, shallowRef, useTemplateRef, watch } from 'vue';
 import * as Misskey from 'misskey-js';
-import { computeMergedCw } from '@@/js/compute-merged-cw.js';
 import * as config from '@@/js/config.js';
 import type { Ref } from 'vue';
 import type { Visibility } from '@/utility/boost-quote.js';
@@ -102,7 +98,6 @@ import { misskeyApi } from '@/utility/misskey-api.js';
 import { i18n } from '@/i18n.js';
 import { $i } from '@/i.js';
 import { userPage } from '@/filters/user.js';
-import { checkMutes } from '@/utility/check-word-mute.js';
 import { pleaseLogin } from '@/utility/please-login.js';
 import { showMovedDialog } from '@/utility/show-moved-dialog.js';
 import MkRippleEffect from '@/components/MkRippleEffect.vue';
@@ -137,7 +132,8 @@ const appearNote = computed(() => getAppearNote(note.value));
 
 const canRenote = computed(() => ['public', 'home'].includes(appearNote.value.visibility) || appearNote.value.userId === $i?.id);
 
-const el = shallowRef<HTMLElement>();
+const rootComp = useTemplateRef('rootComp');
+const el = computed(() => rootComp.value?.rootEl ?? null);
 const translation = ref<Misskey.entities.NotesTranslateResponse | false | null>(null);
 const translating = ref(false);
 const isDeleted = ref(false);
@@ -153,8 +149,6 @@ const renoteTooltip = computeRenoteTooltip(appearNote);
 const defaultLike = computed(() => prefer.s.like ? prefer.s.like : null);
 const replies = ref<Misskey.entities.Note[]>([]);
 
-const mergedCW = computed(() => computeMergedCw(appearNote.value));
-
 const pleaseLoginContext = computed<OpenOnRemoteOptions>(() => ({
 	type: 'lookup',
 	url: appearNote.value.url ?? appearNote.value.uri ?? `${config.url}/notes/${appearNote.value.id}`,
@@ -177,8 +171,6 @@ async function removeReply(id: Misskey.entities.Note['id']) {
 	}
 }
 
-const { muted, noteMuted } = checkMutes(appearNote);
-
 useNoteCapture({
 	rootEl: el,
 	note: appearNote,
@@ -504,15 +496,8 @@ if (props.detail) {
 }
 
 .muted {
-	text-align: center;
-	padding: 8px !important;
 	border: 1px solid var(--MI_THEME-divider);
 	margin: 8px 8px 0 8px;
 	border-radius: var(--MI-radius-sm);
-	cursor: pointer;
-}
-
-.muted:hover {
-	background: var(--MI_THEME-buttonBg);
 }
 </style>
diff --git a/packages/frontend/src/components/SkFollowingFeedEntry.vue b/packages/frontend/src/components/SkFollowingFeedEntry.vue
index 9edff66977..047ec9144b 100644
--- a/packages/frontend/src/components/SkFollowingFeedEntry.vue
+++ b/packages/frontend/src/components/SkFollowingFeedEntry.vue
@@ -6,7 +6,7 @@ Selectable entry on the "Following" feed, displaying a user with their most rece
 -->
 
 <template>
-<div v-if="!hardMuted" :class="$style.root" @click="$emit('select', note.user)">
+<SkMutedNote :note="note" :mutedClass="$style.muted" :expandedClass="$style.root" @click="$emit('select', note.user)">
 	<div :class="$style.avatar">
 		<MkAvatar :class="$style.icon" :user="note.user" indictor/>
 	</div>
@@ -20,39 +20,26 @@ Selectable entry on the "Following" feed, displaying a user with their most rece
 			</MkA>
 		</header>
 		<div>
-			<div v-if="muted || threadMuted || noteMuted" :class="[$style.text, $style.muted]">
-				<SkMutedNote :muted="muted" :threadMuted="threadMuted" :noteMuted="noteMuted" :note="note"></SkMutedNote>
-			</div>
-			<Mfm v-else :class="$style.text" :text="getNoteSummary(note)" :isBlock="true" :plain="true" :nowrap="false" :isNote="true" nyaize="respect" :author="note.user"/>
+			<Mfm :class="$style.text" :text="getNoteSummary(note)" :isBlock="true" :plain="true" :nowrap="false" :isNote="true" nyaize="respect" :author="note.user"/>
 		</div>
 	</div>
-</div>
-<div v-else>
-	<!--
-		MkDateSeparatedList uses TransitionGroup which requires single element in the child elements
-		so MkNote create empty div instead of no elements
-	-->
-</div>
+</SkMutedNote>
 </template>
 
 <script lang="ts" setup>
 import * as Misskey from 'misskey-js';
-import { computed } from 'vue';
 import { getNoteSummary } from '@/utility/get-note-summary.js';
 import { userPage } from '@/filters/user.js';
 import { notePage } from '@/filters/note.js';
-import { checkMutes } from '@/utility/check-word-mute';
 import SkMutedNote from '@/components/SkMutedNote.vue';
 
-const props = defineProps<{
+defineProps<{
 	note: Misskey.entities.Note,
 }>();
 
 defineEmits<{
 	(event: 'select', user: Misskey.entities.UserLite): void
 }>();
-
-const { muted, hardMuted, threadMuted, noteMuted } = checkMutes(computed(() => props.note));
 </script>
 
 <style lang="scss" module>
@@ -67,6 +54,10 @@ const { muted, hardMuted, threadMuted, noteMuted } = checkMutes(computed(() => p
 	cursor: pointer;
 }
 
+.root:hover {
+	background: var(--MI_THEME-buttonBg);
+}
+
 .avatar {
 	align-self: center;
 	flex-shrink: 0;
@@ -116,6 +107,8 @@ const { muted, hardMuted, threadMuted, noteMuted } = checkMutes(computed(() => p
 
 .muted {
 	font-style: italic;
+	align-items: center;
+	justify-content: center;
 }
 
 @container (max-width: 600px) {
diff --git a/packages/frontend/src/components/SkMutedNote.vue b/packages/frontend/src/components/SkMutedNote.vue
index 83ce68c088..b392db7af2 100644
--- a/packages/frontend/src/components/SkMutedNote.vue
+++ b/packages/frontend/src/components/SkMutedNote.vue
@@ -6,62 +6,103 @@ Displays a placeholder for a muted note.
 -->
 
 <template>
-<I18n v-if="noteMuted" :src="i18n.ts.userSaysSomethingInMutedNote" tag="small">
-	<template #name>
-		<MkUserName :user="note.user"/>
-	</template>
-</I18n>
-<I18n v-else-if="threadMuted" :src="i18n.ts.userSaysSomethingInMutedThread" tag="small">
-	<template #name>
-		<MkUserName :user="note.user"/>
-	</template>
-</I18n>
+<div ref="rootEl" :class="rootClass">
+	<!-- The actual note (or whatever we're wrapping) will render here. -->
+	<slot v-if="isExpanded"></slot>
 
-<br v-if="threadMuted && muted">
+	<!-- If hard muted, we want to hide *everything*, including the placeholders and controls to expand. -->
+	<div v-else-if="!mute.hardMuted" :class="[$style.muted, mutedClass]" class="_gaps_s" @click.stop="expandNote = true">
+		<!-- Mandatory CWs -->
+		<I18n v-if="mute.userMandatoryCW" :src="i18n.ts.userIsFlaggedAs" tag="small">
+			<template #name>
+				<MkUserName :user="note.user"/>
+			</template>
+			<template #cw>
+				{{ mute.userMandatoryCW }}
+			</template>
+		</I18n>
 
-<template v-if="muted">
-	<I18n v-if="muted === 'sensitiveMute'" :src="i18n.ts.userSaysSomethingSensitive" tag="small">
-		<template #name>
-			<MkUserName :user="note.user"/>
+		<!-- Muted notes/threads -->
+		<I18n v-if="mute.noteMuted" :src="i18n.ts.userSaysSomethingInMutedNote" tag="small">
+			<template #name>
+				<MkUserName :user="note.user"/>
+			</template>
+		</I18n>
+		<I18n v-else-if="mute.threadMuted" :src="i18n.ts.userSaysSomethingInMutedThread" tag="small">
+			<template #name>
+				<MkUserName :user="note.user"/>
+			</template>
+		</I18n>
+
+		<!-- Word mutes -->
+		<template v-if="mutedWords">
+			<I18n v-if="prefer.s.showSoftWordMutedWord" :src="i18n.ts.userSaysSomethingAbout" tag="small">
+				<template #name>
+					<MkUserName :user="note.user"/>
+				</template>
+				<template #word>
+					{{ mutedWords }}
+				</template>
+			</I18n>
+			<I18n v-else :src="i18n.ts.userSaysSomething" tag="small">
+				<template #name>
+					<MkUserName :user="note.user"/>
+				</template>
+			</I18n>
 		</template>
-	</I18n>
-	<I18n v-else-if="!prefer.s.showSoftWordMutedWord" :src="i18n.ts.userSaysSomething" tag="small">
-		<template #name>
-			<MkUserName :user="note.user"/>
-		</template>
-	</I18n>
-	<I18n v-else :src="i18n.ts.userSaysSomethingAbout" tag="small">
-		<template #name>
-			<MkUserName :user="note.user"/>
-		</template>
-		<template #word>
-			{{ mutedWords }}
-		</template>
-	</I18n>
-</template>
+
+		<!-- Sensitive mute -->
+		<I18n v-if="mute.sensitiveMuted" :src="i18n.ts.userSaysSomethingSensitive" tag="small">
+			<template #name>
+				<MkUserName :user="note.user"/>
+			</template>
+		</I18n>
+	</div>
+</div>
 </template>
 
 <script setup lang="ts">
 import * as Misskey from 'misskey-js';
-import { computed } from 'vue';
+import { computed, ref, useTemplateRef, defineExpose } from 'vue';
+import type { Ref } from 'vue';
 import { i18n } from '@/i18n.js';
 import { prefer } from '@/preferences.js';
+import { checkMute } from '@/utility/check-word-mute';
 
 const props = withDefaults(defineProps<{
-	muted: false | 'sensitiveMute' | string[];
-	threadMuted?: boolean;
-	noteMuted?: boolean;
 	note: Misskey.entities.Note;
+	withHardMute?: boolean;
+	mutedClass?: string | string[] | Record<string, boolean> | (string | string[] | Record<string, boolean>)[];
+	expandedClass?: string | string[] | Record<string, boolean> | (string | string[] | Record<string, boolean>)[];
 }>(), {
-	threadMuted: false,
-	noteMuted: false,
+	withHardMute: false, // TODO check default
+	mutedClass: undefined,
+	expandedClass: undefined,
 });
 
-const mutedWords = computed(() => Array.isArray(props.muted)
-	? props.muted.join(', ')
-	: props.muted);
+const expandNote = ref(false);
+
+const mute = computed(() => checkMute(props.note, props.withHardMute));
+const mutedWords = computed(() => mute.value.softMutedWords?.join(', '));
+const isMuted = computed(() => mute.value.hardMuted || mutedWords.value || mute.value.userMandatoryCW || mute.value.noteMuted || mute.value.threadMuted || mute.value.sensitiveMuted);
+const isExpanded = computed(() => expandNote.value || !isMuted.value);
+const rootClass = computed(() => isExpanded.value ? props.expandedClass : undefined);
+
+const rootEl = useTemplateRef('rootEl');
+defineExpose({
+	rootEl: rootEl as Ref<HTMLElement | null>,
+});
 </script>
 
 <style module lang="scss">
+.muted {
+	padding: 8px;
+	text-align: center;
+	opacity: 0.7;
+	cursor: pointer;
+}
 
+.muted:hover {
+	background: var(--MI_THEME-buttonBg);
+}
 </style>
diff --git a/packages/frontend/src/components/SkNote.vue b/packages/frontend/src/components/SkNote.vue
index 08098f89a5..8cfdcec62b 100644
--- a/packages/frontend/src/components/SkNote.vue
+++ b/packages/frontend/src/components/SkNote.vue
@@ -6,11 +6,12 @@ Displays a note in the Sharkey style. Used to show the "main" note in a given co
 -->
 
 <template>
-<div
-	v-if="!hardMuted && muted === false && !threadMuted && !noteMuted"
+<SkMutedNote
 	v-show="!isDeleted"
-	ref="rootEl"
+	ref="rootComp"
 	v-hotkey="keymap"
+	:note="appearNote"
+	:withHardMute="withHardMute"
 	:class="[$style.root, { [$style.showActionsOnlyHover]: prefer.s.showNoteActionsOnlyHover, [$style.skipRender]: prefer.s.skipNoteRender }]"
 	:tabindex="isDeleted ? '-1' : '0'"
 >
@@ -62,10 +63,10 @@ Displays a note in the Sharkey style. Used to show the "main" note in a given co
 		</div>
 		<div :class="[{ [$style.clickToOpen]: prefer.s.clickToOpen }]" @click.stop="prefer.s.clickToOpen ? noteclick(appearNote.id) : undefined">
 			<div style="container-type: inline-size;">
-				<p v-if="mergedCW != null" :class="$style.cw">
+				<p v-if="appearNote.cw != null" :class="$style.cw">
 					<Mfm
-						v-if="mergedCW != ''"
-						:text="mergedCW"
+						v-if="appearNote.cw != ''"
+						:text="appearNote.cw"
 						:author="appearNote.user"
 						:nyaize="'respect'"
 						:enableEmojiMenu="true"
@@ -75,7 +76,7 @@ Displays a note in the Sharkey style. Used to show the "main" note in a given co
 					/>
 					<MkCwButton v-model="showContent" :text="appearNote.text" :renote="appearNote.renote" :files="appearNote.files" :poll="appearNote.poll" style="margin: 4px 0;" @click.stop/>
 				</p>
-				<div v-show="mergedCW == null || showContent" :class="[{ [$style.contentCollapsed]: collapsed }]">
+				<div v-show="appearNote.cw == null || showContent" :class="[{ [$style.contentCollapsed]: collapsed }]">
 					<div :class="$style.text">
 						<span v-if="appearNote.isHidden" style="opacity: 0.5">({{ i18n.ts.private }})</span>
 						<Mfm
@@ -169,16 +170,7 @@ Displays a note in the Sharkey style. Used to show the "main" note in a given co
 			</footer>
 		</div>
 	</article>
-</div>
-<div v-else-if="!hardMuted" :class="$style.muted" @click.stop="muted = false">
-	<SkMutedNote :muted="muted" :threadMuted="threadMuted" :noteMuted="noteMuted" :note="appearNote"></SkMutedNote>
-</div>
-<div v-else>
-	<!--
-		MkDateSeparatedList uses TransitionGroup which requires single element in the child elements
-		so MkNote create empty div instead of no elements
-	-->
-</div>
+</SkMutedNote>
 </template>
 
 <script lang="ts" setup>
@@ -188,7 +180,6 @@ import * as Misskey from 'misskey-js';
 import { isLink } from '@@/js/is-link.js';
 import { shouldCollapsed } from '@@/js/collapsed.js';
 import * as config from '@@/js/config.js';
-import { computeMergedCw } from '@@/js/compute-merged-cw.js';
 import type { Ref } from 'vue';
 import type { MenuItem } from '@/types/menu.js';
 import type { OpenOnRemoteOptions } from '@/utility/please-login.js';
@@ -206,7 +197,6 @@ import MkUsersTooltip from '@/components/MkUsersTooltip.vue';
 import MkUrlPreview from '@/components/MkUrlPreview.vue';
 import MkButton from '@/components/MkButton.vue';
 import { pleaseLogin } from '@/utility/please-login.js';
-import { checkMutes } from '@/utility/check-word-mute.js';
 import { notePage } from '@/filters/note.js';
 import { userPage } from '@/filters/user.js';
 import number from '@/filters/number.js';
@@ -273,7 +263,8 @@ function noteclick(id: string) {
 
 const isRenote = Misskey.note.isPureRenote(note.value);
 
-const rootEl = useTemplateRef('rootEl');
+const rootComp = useTemplateRef('rootComp');
+const rootEl = computed(() => rootComp.value?.rootEl ?? null);
 const menuButton = useTemplateRef('menuButton');
 const renoteButton = useTemplateRef('renoteButton');
 const renoteTime = useTemplateRef('renoteTime');
@@ -292,7 +283,6 @@ const selfNoteIds = computed(() => getSelfNoteIds(props.note));
 const isLong = shouldCollapsed(appearNote.value, urls.value);
 const collapsed = ref(prefer.s.expandLongNote && appearNote.value.cw == null && isLong ? false : appearNote.value.cw == null && isLong);
 const isDeleted = ref(false);
-const { muted, hardMuted, threadMuted, noteMuted } = checkMutes(appearNote, computed(() => props.withHardMute));
 const translation = ref<Misskey.entities.NotesTranslateResponse | false | null>(null);
 const translating = ref(false);
 const showTicker = (prefer.s.instanceTicker === 'always') || (prefer.s.instanceTicker === 'remote' && appearNote.value.user.instance);
@@ -315,8 +305,6 @@ const pleaseLoginContext = computed<OpenOnRemoteOptions>(() => ({
 	url: appearNote.value.url ?? appearNote.value.uri ?? `${config.url}/notes/${appearNote.value.id}`,
 }));
 
-const mergedCW = computed(() => computeMergedCw(appearNote.value));
-
 const renoteTooltip = computeRenoteTooltip(appearNote);
 
 let renoting = false;
@@ -1341,16 +1329,7 @@ function emitUpdReaction(emoji: string, delta: number) {
 	}
 }
 
-.muted {
-	padding: 8px;
-	text-align: center;
-	opacity: 0.7;
-	cursor: pointer;
-}
-
-.muted:hover {
-	background: var(--MI_THEME-buttonBg);
-}
+// Mute CSS moved to SkMutedNote.vue
 
 .reactionOmitted {
 	display: inline-block;
diff --git a/packages/frontend/src/components/SkNoteDetailed.vue b/packages/frontend/src/components/SkNoteDetailed.vue
index 7640dc4588..fe2da9f914 100644
--- a/packages/frontend/src/components/SkNoteDetailed.vue
+++ b/packages/frontend/src/components/SkNoteDetailed.vue
@@ -6,11 +6,11 @@ Detailed view of a note in the Sharkey style. Used when opening a note onto its
 -->
 
 <template>
-<div
-	v-if="!muted && !threadMuted && !noteMuted"
+<SkMutedNote
 	v-show="!isDeleted"
-	ref="rootEl"
+	ref="rootComp"
 	v-hotkey="keymap"
+	:note="appearNote"
 	:class="$style.root"
 	:tabindex="isDeleted ? '-1' : '0'"
 >
@@ -83,10 +83,10 @@ Detailed view of a note in the Sharkey style. Used when opening a note onto its
 			</div>
 		</header>
 		<div :class="$style.noteContent">
-			<p v-if="mergedCW != null" :class="$style.cw">
+			<p v-if="appearNote.cw != null" :class="$style.cw">
 				<Mfm
-					v-if="mergedCW != ''"
-					:text="mergedCW"
+					v-if="appearNote.cw != ''"
+					:text="appearNote.cw"
 					:author="appearNote.user"
 					:nyaize="'respect'"
 					:enableEmojiMenu="true"
@@ -95,7 +95,7 @@ Detailed view of a note in the Sharkey style. Used when opening a note onto its
 				/>
 				<MkCwButton v-model="showContent" :text="appearNote.text" :renote="appearNote.renote" :files="appearNote.files" :poll="appearNote.poll"/>
 			</p>
-			<div v-show="mergedCW == null || showContent">
+			<div v-show="appearNote.cw == null || showContent">
 				<span v-if="appearNote.isHidden" style="opacity: 0.5">({{ i18n.ts.private }})</span>
 				<Mfm
 					v-if="appearNote.text"
@@ -231,10 +231,7 @@ Detailed view of a note in the Sharkey style. Used when opening a note onto its
 			</MkPagination>
 		</div>
 	</div>
-</div>
-<div v-else class="_panel" :class="$style.muted" @click.stop="muted = false">
-	<SkMutedNote :muted="muted" :threadMuted="threadMuted" :noteMuted="noteMuted" :note="appearNote"></SkMutedNote>
-</div>
+</SkMutedNote>
 </template>
 
 <script lang="ts" setup>
@@ -243,7 +240,6 @@ import * as mfm from 'mfm-js';
 import * as Misskey from 'misskey-js';
 import { isLink } from '@@/js/is-link.js';
 import * as config from '@@/js/config.js';
-import { computeMergedCw } from '@@/js/compute-merged-cw.js';
 import type { OpenOnRemoteOptions } from '@/utility/please-login.js';
 import type { Paging } from '@/components/MkPagination.vue';
 import type { Keymap } from '@/utility/hotkey.js';
@@ -259,7 +255,6 @@ import MkUsersTooltip from '@/components/MkUsersTooltip.vue';
 import MkUrlPreview from '@/components/MkUrlPreview.vue';
 import SkInstanceTicker from '@/components/SkInstanceTicker.vue';
 import { pleaseLogin } from '@/utility/please-login.js';
-import { checkMutes } from '@/utility/check-word-mute.js';
 import { userPage } from '@/filters/user.js';
 import { notePage } from '@/filters/note.js';
 import number from '@/filters/number.js';
@@ -308,7 +303,8 @@ const note = ref(deepClone(props.note));
 
 const isRenote = Misskey.note.isPureRenote(note.value);
 
-const rootEl = useTemplateRef('rootEl');
+const rootComp = useTemplateRef('rootComp');
+const rootEl = computed(() => rootComp.value?.rootEl ?? null);
 const noteEl = useTemplateRef('noteEl');
 const menuButton = useTemplateRef('menuButton');
 const renoteButton = useTemplateRef('renoteButton');
@@ -336,12 +332,8 @@ const quotes = ref<Misskey.entities.Note[]>([]);
 const canRenote = computed(() => ['public', 'home'].includes(appearNote.value.visibility) || (appearNote.value.visibility === 'followers' && appearNote.value.userId === $i?.id));
 const defaultLike = computed(() => prefer.s.like ? prefer.s.like : null);
 
-const mergedCW = computed(() => computeMergedCw(appearNote.value));
-
 const renoteTooltip = computeRenoteTooltip(appearNote);
 
-const { muted, threadMuted, noteMuted } = checkMutes(appearNote);
-
 setupNoteViewInterruptors(note, isDeleted);
 
 watch(() => props.expandAllCws, (expandAllCws) => {
@@ -1226,16 +1218,7 @@ onUnmounted(() => {
 	border-radius: var(--MI-radius-sm) !important;
 }
 
-.muted {
-	padding: 8px;
-	text-align: center;
-	opacity: 0.7;
-	cursor: pointer;
-}
-
-.muted:hover {
-	background: var(--MI_THEME-buttonBg);
-}
+// Mute CSS moved to SkMutedNote.vue
 
 .badgeRoles {
 	margin: 0 .5em 0 0;
diff --git a/packages/frontend/src/components/SkNoteSimple.vue b/packages/frontend/src/components/SkNoteSimple.vue
index f543971508..3023498748 100644
--- a/packages/frontend/src/components/SkNoteSimple.vue
+++ b/packages/frontend/src/components/SkNoteSimple.vue
@@ -11,11 +11,11 @@ Simple view of a note in the Sharkey style. Used in quote renotes, link previews
 	<div :class="$style.main">
 		<MkNoteHeader :class="$style.header" :classic="true" :note="note" :mini="true"/>
 		<div>
-			<p v-if="mergedCW != null" :class="$style.cw">
-				<Mfm v-if="mergedCW != ''" style="margin-right: 8px;" :text="mergedCW" :isBlock="true" :author="note.user" :nyaize="'respect'" :emojiUrls="note.emojis"/>
+			<p v-if="props.note.cw != null" :class="$style.cw">
+				<Mfm v-if="props.note.cw != ''" style="margin-right: 8px;" :text="props.note.cw" :isBlock="true" :author="note.user" :nyaize="'respect'" :emojiUrls="note.emojis"/>
 				<MkCwButton v-model="showContent" :text="note.text" :files="note.files" :poll="note.poll" @click.stop/>
 			</p>
-			<div v-show="mergedCW == null || showContent">
+			<div v-show="props.note.cw == null || showContent">
 				<MkSubNoteContent :hideFiles="hideFiles" :class="$style.text" :note="note" :expandAllCws="props.expandAllCws"/>
 			</div>
 		</div>
@@ -44,8 +44,6 @@ let showContent = ref(prefer.s.uncollapseCW);
 
 const note = ref(deepClone(props.note));
 
-const mergedCW = computed(() => computeMergedCw(note.value));
-
 setupNoteViewInterruptors(note, null);
 
 watch(() => props.expandAllCws, (expandAllCws) => {
diff --git a/packages/frontend/src/components/SkNoteSub.vue b/packages/frontend/src/components/SkNoteSub.vue
index 0396f579af..584303bc5c 100644
--- a/packages/frontend/src/components/SkNoteSub.vue
+++ b/packages/frontend/src/components/SkNoteSub.vue
@@ -8,7 +8,7 @@ For example, when viewing a reply on the timeline, SkNoteSub will be used to dis
 -->
 
 <template>
-<div v-show="!isDeleted" v-if="!muted && !noteMuted" ref="el" :class="[$style.root, { [$style.children]: depth > 1, [$style.isReply]: props.isReply, [$style.detailed]: props.detailed }]">
+<SkMutedNote v-show="!isDeleted" ref="rootComp" :note="appearNote" :mutedClass="$style.muted" :expandedClass="[$style.root, { [$style.children]: depth > 1, [$style.isReply]: props.isReply, [$style.detailed]: props.detailed }]">
 	<div v-if="!hideLine" :class="$style.line"></div>
 	<div :class="$style.main">
 		<div v-if="note.channel" :class="$style.colorBar" :style="{ background: note.channel.color }"></div>
@@ -23,11 +23,11 @@ For example, when viewing a reply on the timeline, SkNoteSub will be used to dis
 		<div :class="$style.body">
 			<SkNoteHeader :class="$style.header" :note="note" :classic="true" :mini="true"/>
 			<div :class="$style.content">
-				<p v-if="mergedCW != null" :class="$style.cw">
-					<Mfm v-if="mergedCW != ''" style="margin-right: 8px;" :text="mergedCW" :isBlock="true" :author="note.user" :nyaize="'respect'"/>
+				<p v-if="appearNote.cw != null" :class="$style.cw">
+					<Mfm v-if="appearNote.cw != ''" style="margin-right: 8px;" :text="appearNote.cw" :isBlock="true" :author="note.user" :nyaize="'respect'"/>
 					<MkCwButton v-model="showContent" :text="note.text" :files="note.files" :poll="note.poll"/>
 				</p>
-				<div v-show="mergedCW == null || showContent">
+				<div v-show="appearNote.cw == null || showContent">
 					<MkSubNoteContent :class="$style.text" :note="note" :translating="translating" :translation="translation" :expandAllCws="props.expandAllCws"/>
 				</div>
 			</div>
@@ -89,16 +89,12 @@ For example, when viewing a reply on the timeline, SkNoteSub will be used to dis
 	<div v-else :class="$style.more">
 		<MkA class="_link" :to="notePage(note)">{{ i18n.ts.continueThread }} <i class="ti ti-chevron-double-right"></i></MkA>
 	</div>
-</div>
-<div v-else :class="$style.muted" @click.stop="muted = false">
-	<SkMutedNote :muted="muted" :threadMuted="false" :noteMuted="noteMuted" :note="appearNote"></SkMutedNote>
-</div>
+</SkMutedNote>
 </template>
 
 <script lang="ts" setup>
 import { computed, inject, ref, shallowRef, useTemplateRef, watch } from 'vue';
 import * as Misskey from 'misskey-js';
-import { computeMergedCw } from '@@/js/compute-merged-cw.js';
 import * as config from '@@/js/config.js';
 import type { Ref } from 'vue';
 import type { Visibility } from '@/utility/boost-quote.js';
@@ -114,7 +110,6 @@ import { misskeyApi } from '@/utility/misskey-api.js';
 import { i18n } from '@/i18n.js';
 import { $i } from '@/i.js';
 import { userPage } from '@/filters/user.js';
-import { checkMutes } from '@/utility/check-word-mute.js';
 import { pleaseLogin } from '@/utility/please-login.js';
 import { showMovedDialog } from '@/utility/show-moved-dialog.js';
 import MkRippleEffect from '@/components/MkRippleEffect.vue';
@@ -171,8 +166,6 @@ const renoteTooltip = computeRenoteTooltip(appearNote);
 const defaultLike = computed(() => prefer.s.like ? prefer.s.like : null);
 const replies = ref<Misskey.entities.Note[]>([]);
 
-const mergedCW = computed(() => computeMergedCw(appearNote.value));
-
 const pleaseLoginContext = computed<OpenOnRemoteOptions>(() => ({
 	type: 'lookup',
 	url: appearNote.value.url ?? appearNote.value.uri ?? `${config.url}/notes/${appearNote.value.id}`,
@@ -195,8 +188,6 @@ async function removeReply(id: Misskey.entities.Note['id']) {
 	}
 }
 
-const { muted, noteMuted } = checkMutes(appearNote);
-
 useNoteCapture({
 	rootEl: el,
 	note: appearNote,
@@ -602,16 +593,9 @@ if (props.detail) {
 }
 
 .muted {
-	text-align: center;
-	padding: 8px !important;
 	border: 1px solid var(--MI_THEME-divider);
 	margin: 8px 8px 0 8px;
 	border-radius: var(--MI-radius-sm);
-	cursor: pointer;
-}
-
-.muted:hover {
-	background: var(--MI_THEME-buttonBg);
 }
 
 // avatar container with line
diff --git a/packages/frontend/src/utility/check-word-mute.ts b/packages/frontend/src/utility/check-word-mute.ts
index 9c16841a39..9a6ad6b9c9 100644
--- a/packages/frontend/src/utility/check-word-mute.ts
+++ b/packages/frontend/src/utility/check-word-mute.ts
@@ -1,138 +1,184 @@
 /*
- * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-FileCopyrightText: hazelnoot and other Sharkey contributors
  * SPDX-License-Identifier: AGPL-3.0-only
  */
+
 import * as Misskey from 'misskey-js';
-import { computed, inject, ref } from 'vue';
-import type { Ref, ComputedRef } from 'vue';
+import { inject } from 'vue';
+import type { Ref } from 'vue';
 import { $i } from '@/i';
 
-export function checkMutes(noteToCheck: ComputedRef<Misskey.entities.Note>, withHardMute?: ComputedRef<boolean>) {
-	const muteEnable = ref(true);
+export interface Mute {
+	hardMuted?: boolean;
+	softMutedWords?: string[];
+	sensitiveMuted?: boolean;
 
-	const muted = computed<false | string[], boolean>({
-		get() {
-			if (!muteEnable.value) return false;
-			return checkMute(noteToCheck.value, $i?.mutedWords);
-		},
-		set(value: boolean) {
-			muteEnable.value = value;
-		},
-	});
+	isSensitive?: boolean;
 
-	const threadMuted = computed(() => {
-		if (!muteEnable.value) return false;
-		return noteToCheck.value.isMutingThread;
-	});
+	threadMuted?: boolean;
+	noteMuted?: boolean;
 
-	const noteMuted = computed(() => {
-		if (!muteEnable.value) return false;
-		return noteToCheck.value.isMutingNote;
-	});
-
-	const hardMuted = computed(() => {
-		if (!withHardMute?.value) return false;
-		return checkMute(noteToCheck.value, $i?.hardMutedWords, true);
-	});
-
-	return { muted, hardMuted, threadMuted, noteMuted };
+	// TODO show this as a single block on user timelines
+	userMandatoryCW?: string | null;
 }
 
-export function checkMute(note: Misskey.entities.Note, mutes: undefined | null): false;
-export function checkMute(note: Misskey.entities.Note, mutes: undefined | null, checkOnly: false): false;
-export function checkMute(note: Misskey.entities.Note, mutes: undefined | null, checkOnly?: boolean): false | 'sensitiveMute';
-export function checkMute(note: Misskey.entities.Note, mutes: Array<string | string[]> | undefined | null): string[] | false;
-export function checkMute(note: Misskey.entities.Note, mutes: Array<string | string[]> | undefined | null, checkOnly: false): string[] | false;
-export function checkMute(note: Misskey.entities.Note, mutes: Array<string | string[]> | undefined | null, checkOnly?: boolean): string[] | false | 'sensitiveMute';
-export function checkMute(note: Misskey.entities.Note, mutes: Array<string | string[]> | undefined | null, checkOnly = false): string[] | false | 'sensitiveMute' {
-	if (mutes != null) {
-		const result =
-			checkWordMute(note, $i, mutes)
-			|| checkWordMute(note.reply, $i, mutes)
-			|| checkWordMute(note.renote, $i, mutes);
+export function checkMute(note: Misskey.entities.Note, withHardMute?: boolean): Mute {
+	const sensitiveMuted = isSensitiveMuted(note);
 
-		// Only continue to sensitiveMute if we don't match any *actual* mutes
-		if (result) {
-			return result;
-		}
+	// My own note
+	if ($i && $i.id === note.userId) {
+		return { sensitiveMuted };
 	}
 
-	if (checkOnly) {
-		const inTimeline = inject<boolean>('inTimeline', false);
-		const tl_withSensitive = inject<Ref<boolean> | null>('tl_withSensitive', null);
-		if (inTimeline && tl_withSensitive?.value === false && note.files?.some((v) => v.isSensitive)) {
-			return 'sensitiveMute';
-		}
+	const threadMuted = note.isMutingThread;
+	const noteMuted = note.isMutingNote;
+	const userMandatoryCW = note.user.mandatoryCW;
+
+	// Hard mute
+	if (withHardMute && isHardMuted(note)) {
+		return { hardMuted: true, sensitiveMuted, threadMuted, noteMuted, userMandatoryCW };
 	}
 
-	return false;
+	// Soft mute
+	const softMutedWords = isSoftMuted(note);
+	if (softMutedWords.length > 0) {
+		return { softMutedWords, sensitiveMuted, threadMuted, noteMuted, userMandatoryCW };
+	}
+
+	// Other / no mute
+	return { sensitiveMuted, threadMuted, noteMuted, userMandatoryCW };
 }
 
-export function checkWordMute(note: string | Misskey.entities.Note | undefined | null, me: Misskey.entities.UserLite | null | undefined, mutedWords: Array<string | string[]>): string[] | false {
-	if (note == null) return false;
+function isHardMuted(note: Misskey.entities.Note): boolean {
+	if (!$i?.hardMutedWords.length) return false;
 
-	// 自分自身
-	if (me && typeof(note) === 'object' && (note.userId === me.id)) return false;
+	return containsMutedWord($i.hardMutedWords, note);
+}
 
-	if (mutedWords.length > 0) {
-		const text = typeof(note) === 'object' ? getNoteText(note) : note;
+function isSoftMuted(note: Misskey.entities.Note): string[] {
+	if (!$i?.mutedWords.length) return [];
 
-		if (text === '') return false;
+	return getMutedWords($i.mutedWords, note);
+}
 
-		const matched = mutedWords.reduce((matchedWords, filter) => {
-			if (Array.isArray(filter)) {
-				// Clean up
-				const filteredFilter = filter.filter(keyword => keyword !== '');
-				if (filteredFilter.length > 0 && filteredFilter.every(keyword => text.includes(keyword))) {
-					const fullFilter = filteredFilter.join(' ');
-					matchedWords.add(fullFilter);
-				}
-			} else {
-				// represents RegExp
-				const regexp = filter.match(/^\/(.+)\/(.*)$/);
+function isSensitiveMuted(note: Misskey.entities.Note): boolean {
+	// 1. At least one sensitive file
+	if (!note.files) return false;
+	if (!note.files.some((v) => v.isSensitive)) return false;
 
-				// This should never happen due to input sanitisation.
-				if (regexp) {
-					try {
-						const flags = regexp[2].includes('g') ? regexp[2] : (regexp[2] + 'g');
-						const matches = text.matchAll(new RegExp(regexp[1], flags));
-						for (const match of matches) {
-							matchedWords.add(match[0]);
-						}
-					} catch {
-						// This should never happen due to input sanitisation.
-					}
-				}
+	// 2. In a timeline
+	const inTimeline = inject<boolean>('inTimeline', false);
+	if (!inTimeline) return false;
+
+	// 3. With sensitive files hidden
+	const tl_withSensitive = inject<Ref<boolean> | null>('tl_withSensitive', null);
+	return tl_withSensitive?.value === false;
+}
+
+function getMutedWords(mutedWords: (string | string[])[], note: Misskey.entities.Note): string[] {
+	// Parse mutes
+	const { regexMutes, patternMutes } = parseMutes(mutedWords);
+
+	// Make sure we didn't filter them all out
+	if (regexMutes.length < 1 && patternMutes.length < 1) {
+		return [];
+	}
+
+	const matches = new Set<string>();
+
+	// Expand notes into searchable test
+	for (const text of expandNote(note)) {
+		for (const pattern of patternMutes) {
+			// Case-sensitive, non-boundary search for backwards compatibility
+			if (pattern.every(word => text.includes(word))) {
+				const muteLabel = pattern.join(' ');
+				matches.add(muteLabel);
 			}
+		}
 
-			return matchedWords;
-		}, new Set<string>());
+		for (const regex of regexMutes) {
+			for (const match of text.matchAll(regex)) {
+				matches.add(match[0]);
+			}
+		}
+	}
 
-		// Nested arrays are intentional, otherwise the note components will join with space (" ") and it's confusing.
-		if (matched.size > 0) return Array.from(matched);
+	return Array.from(matches);
+}
+
+function containsMutedWord(mutedWords: (string | string[])[], note: Misskey.entities.Note): boolean {
+	// Parse mutes
+	const { regexMutes, patternMutes } = parseMutes(mutedWords);
+
+	// Make sure we didn't filter them all out
+	if (regexMutes.length < 1 && patternMutes.length < 1) {
+		return false;
+	}
+
+	// Expand notes into searchable test
+	for (const text of expandNote(note)) {
+		for (const pattern of patternMutes) {
+			// Case-sensitive, non-boundary search for backwards compatibility
+			if (pattern.every(word => text.includes(word))) {
+				return true;
+			}
+		}
+
+		if (regexMutes.some(regex => text.match(regex))) {
+			return true;
+		}
 	}
 
 	return false;
 }
 
-function getNoteText(note: Misskey.entities.Note): string {
-	const textParts: string[] = [];
-
-	if (note.cw) textParts.push(note.cw);
-
-	if (note.text) textParts.push(note.text);
-
+function *expandNote(note: Misskey.entities.Note): Generator<string> {
+	if (note.cw) yield note.cw;
+	if (note.text) yield note.text;
 	if (note.files) {
 		for (const file of note.files) {
-			if (file.comment) textParts.push(file.comment);
+			if (file.comment) yield file.comment;
 		}
 	}
-
 	if (note.poll) {
 		for (const choice of note.poll.choices) {
-			if (choice.text) textParts.push(choice.text);
+			if (choice.text) yield choice.text;
+		}
+	}
+	if (note.reply) {
+		yield * expandNote(note.reply);
+	}
+	if (note.renote) {
+		yield * expandNote(note.renote);
+	}
+}
+
+function parseMutes(mutedWords: (string | string[])[]) {
+	const regexMutes: RegExp[] = [];
+	const patternMutes: string[][] = [];
+
+	for (const mute of mutedWords) {
+		if (Array.isArray(mute)) {
+			if (mute.length > 0) {
+				const filtered = mute.filter(keyword => keyword !== '');
+				if (filtered.length > 0) {
+					patternMutes.push(filtered);
+				} else {
+					console.warn('Skipping invalid pattern mute:', mute);
+				}
+			}
+		} else {
+			const parsed = mute.match(/^\/(.+)\/(.*)$/);
+			if (parsed && parsed.length === 3) {
+				try {
+					const flags = parsed[2].includes('g') ? parsed[2] : `${parsed[2]}g`;
+					regexMutes.push(new RegExp(parsed[1], flags));
+				} catch {
+					console.warn('Skipping invalid regexp mute:', mute);
+				}
+			}
 		}
 	}
 
-	return textParts.join('\n').trim();
+	return { regexMutes, patternMutes };
 }
diff --git a/sharkey-locales/en-US.yml b/sharkey-locales/en-US.yml
index 83d5560b28..47b6f80bdb 100644
--- a/sharkey-locales/en-US.yml
+++ b/sharkey-locales/en-US.yml
@@ -35,6 +35,7 @@ muteNote: "Mute note"
 unmuteNote: "Unmute note"
 userSaysSomethingInMutedNote: "{name} said something in a muted post"
 userSaysSomethingInMutedThread: "{name} said something in a muted thread"
+userIsFlaggedAs: "{name} is flagged: \"{cw}\""
 markAsNSFW: "Mark all media from user as NSFW"
 markInstanceAsNSFW: "Mark as NSFW"
 nsfwConfirm: "Are you sure that you want to mark all media from this account as NSFW?"

From 6f8d831e095e3bad1be6493301ddd8ec6ebdb226 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Fri, 27 Jun 2025 22:01:37 -0400
Subject: [PATCH 003/110] fix hard mutes not working

---
 packages/frontend/src/components/SkMutedNote.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/frontend/src/components/SkMutedNote.vue b/packages/frontend/src/components/SkMutedNote.vue
index b392db7af2..e85316848c 100644
--- a/packages/frontend/src/components/SkMutedNote.vue
+++ b/packages/frontend/src/components/SkMutedNote.vue
@@ -75,7 +75,7 @@ const props = withDefaults(defineProps<{
 	mutedClass?: string | string[] | Record<string, boolean> | (string | string[] | Record<string, boolean>)[];
 	expandedClass?: string | string[] | Record<string, boolean> | (string | string[] | Record<string, boolean>)[];
 }>(), {
-	withHardMute: false, // TODO check default
+	withHardMute: true,
 	mutedClass: undefined,
 	expandedClass: undefined,
 });

From 92750240ebf2439e75a648127ab8dde59300a726 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Fri, 27 Jun 2025 22:32:26 -0400
Subject: [PATCH 004/110] implement mandatory CW for notes (resolves #910)

---
 locales/index.d.ts                            | 22 ++++++-
 .../1751077195277-add-note-mandatoryCW.js     | 16 +++++
 .../backend/src/core/WebhookTestService.ts    |  1 +
 .../src/core/activitypub/ApRendererService.ts |  3 +
 .../src/core/entities/NoteEntityService.ts    |  1 +
 packages/backend/src/misc/get-note-summary.ts |  3 +
 packages/backend/src/models/Note.ts           |  9 +++
 .../backend/src/models/json-schema/note.ts    |  4 ++
 .../backend/src/server/api/endpoint-list.ts   |  1 +
 .../src/server/api/endpoints/admin/cw-note.ts | 63 +++++++++++++++++++
 .../src/server/api/endpoints/admin/cw-user.ts |  1 -
 .../server/api/mastodon/MastodonConverters.ts | 16 ++++-
 packages/backend/src/types.ts                 |  9 +++
 .../backend/test/unit/NoteCreateService.ts    |  1 +
 packages/backend/test/unit/misc/is-renote.ts  |  1 +
 .../frontend-shared/js/compute-merged-cw.ts   |  3 +
 .../frontend/src/components/SkMutedNote.vue   |  7 ++-
 .../src/pages/admin/modlog.ModLog.vue         | 13 ++++
 .../frontend/src/utility/check-word-mute.ts   |  8 ++-
 .../frontend/src/utility/get-note-menu.ts     | 26 ++++++++
 .../frontend/src/utility/get-note-summary.ts  |  3 +
 packages/misskey-js/etc/misskey-js.api.md     |  8 ++-
 .../misskey-js/src/autogen/apiClientJSDoc.ts  | 11 ++++
 packages/misskey-js/src/autogen/endpoint.ts   |  2 +
 packages/misskey-js/src/autogen/entities.ts   |  1 +
 packages/misskey-js/src/autogen/types.ts      | 63 +++++++++++++++++++
 packages/misskey-js/src/consts.ts             | 10 +++
 packages/misskey-js/src/entities.ts           |  3 +
 sharkey-locales/en-US.yml                     |  7 ++-
 29 files changed, 305 insertions(+), 11 deletions(-)
 create mode 100644 packages/backend/migration/1751077195277-add-note-mandatoryCW.js
 create mode 100644 packages/backend/src/server/api/endpoints/admin/cw-note.ts

diff --git a/locales/index.d.ts b/locales/index.d.ts
index bb953a4a5e..8287a5f3b7 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -9212,6 +9212,10 @@ export interface Locale extends ILocale {
          * Apply mandatory CW on users
          */
         "write:admin:cw-user": string;
+        /**
+         * Apply mandatory CW on notes
+         */
+        "write:admin:cw-note": string;
         /**
          * Silence users
          */
@@ -10948,6 +10952,10 @@ export interface Locale extends ILocale {
          * Set content warning for user
          */
         "setMandatoryCW": string;
+        /**
+         * Set content warning for note
+         */
+        "setMandatoryCWForNote": string;
         /**
          * Set remote instance as NSFW
          */
@@ -12088,6 +12096,10 @@ export interface Locale extends ILocale {
      * {name} is flagged: "{cw}"
      */
     "userIsFlaggedAs": ParameterizedString<"name" | "cw">;
+    /**
+     * Note is flagged: "{cw}"
+     */
+    "noteIsFlaggedAs": ParameterizedString<"cw">;
     /**
      * Mark all media from user as NSFW
      */
@@ -13038,9 +13050,17 @@ export interface Locale extends ILocale {
      */
     "mandatoryCW": string;
     /**
-     * Applies a content warning to all posts created by this user. If the post already has a CW, then this is appended to the end.
+     * Applies a content warning to all posts created by this user. The forced warnings will appear like a word mute to distinguish them from the author's own content warnings.
      */
     "mandatoryCWDescription": string;
+    /**
+     * Add content warning
+     */
+    "mandatoryCWForNote": string;
+    /**
+     * Applies an additional content warning to this post. The new warning will appear like a word mute to distinguish it from the author's own content warning.
+     */
+    "mandatoryCWForNoteDescription": string;
     /**
      * Fetch linked note
      */
diff --git a/packages/backend/migration/1751077195277-add-note-mandatoryCW.js b/packages/backend/migration/1751077195277-add-note-mandatoryCW.js
new file mode 100644
index 0000000000..9ebe27d4dd
--- /dev/null
+++ b/packages/backend/migration/1751077195277-add-note-mandatoryCW.js
@@ -0,0 +1,16 @@
+/*
+ * SPDX-FileCopyrightText: hazelnoot and other Sharkey contributors
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+export class AddNoteMandatoryCW1751077195277 {
+	name = 'AddNoteMandatoryCW1751077195277'
+
+	async up(queryRunner) {
+		await queryRunner.query(`ALTER TABLE "note" ADD "mandatoryCW" text`);
+	}
+
+	async down(queryRunner) {
+		await queryRunner.query(`ALTER TABLE "note" DROP COLUMN "mandatoryCW"`);
+	}
+}
diff --git a/packages/backend/src/core/WebhookTestService.ts b/packages/backend/src/core/WebhookTestService.ts
index 74a8b79a89..96b06ac0c2 100644
--- a/packages/backend/src/core/WebhookTestService.ts
+++ b/packages/backend/src/core/WebhookTestService.ts
@@ -127,6 +127,7 @@ function generateDummyNote(override?: Partial<MiNote>): MiNote {
 		renoteUserInstance: null,
 		updatedAt: null,
 		processErrors: [],
+		mandatoryCW: null,
 		...override,
 	};
 }
diff --git a/packages/backend/src/core/activitypub/ApRendererService.ts b/packages/backend/src/core/activitypub/ApRendererService.ts
index a13abc6369..82c0fba46a 100644
--- a/packages/backend/src/core/activitypub/ApRendererService.ts
+++ b/packages/backend/src/core/activitypub/ApRendererService.ts
@@ -497,6 +497,9 @@ export class ApRendererService {
 		let summary = note.cw === '' ? String.fromCharCode(0x200B) : note.cw;
 
 		// Apply mandatory CW, if applicable
+		if (note.mandatoryCW) {
+			summary = appendContentWarning(summary, note.mandatoryCW);
+		}
 		if (author.mandatoryCW) {
 			summary = appendContentWarning(summary, author.mandatoryCW);
 		}
diff --git a/packages/backend/src/core/entities/NoteEntityService.ts b/packages/backend/src/core/entities/NoteEntityService.ts
index 029a0b6ebb..3d329684ea 100644
--- a/packages/backend/src/core/entities/NoteEntityService.ts
+++ b/packages/backend/src/core/entities/NoteEntityService.ts
@@ -651,6 +651,7 @@ export class NoteEntityService implements OnModuleInit {
 			user: packedUsers?.get(note.userId) ?? this.userEntityService.pack(note.user ?? note.userId, me),
 			text: text,
 			cw: note.cw,
+			mandatoryCW: note.mandatoryCW,
 			visibility: note.visibility,
 			localOnly: note.localOnly,
 			reactionAcceptance: note.reactionAcceptance,
diff --git a/packages/backend/src/misc/get-note-summary.ts b/packages/backend/src/misc/get-note-summary.ts
index be2d3ea98d..6080f469b5 100644
--- a/packages/backend/src/misc/get-note-summary.ts
+++ b/packages/backend/src/misc/get-note-summary.ts
@@ -23,6 +23,9 @@ export const getNoteSummary = (note: Packed<'Note'>): string => {
 
 	// Append mandatory CW, if applicable
 	let cw = note.cw;
+	if (note.mandatoryCW) {
+		cw = appendContentWarning(cw, note.mandatoryCW);
+	}
 	if (note.user.mandatoryCW) {
 		cw = appendContentWarning(cw, note.user.mandatoryCW);
 	}
diff --git a/packages/backend/src/models/Note.ts b/packages/backend/src/models/Note.ts
index b064e95493..74e3630303 100644
--- a/packages/backend/src/models/Note.ts
+++ b/packages/backend/src/models/Note.ts
@@ -228,6 +228,15 @@ export class MiNote {
 	})
 	public processErrors: string[] | null;
 
+	/**
+	 * Specifies a Content Warning that should be forcibly attached to this note.
+	 * Does not replace the user's own CW.
+	 */
+	@Column('text', {
+		nullable: true,
+	})
+	public mandatoryCW: string | null;
+
 	//#region Denormalized fields
 	@Column('varchar', {
 		length: 128, nullable: true,
diff --git a/packages/backend/src/models/json-schema/note.ts b/packages/backend/src/models/json-schema/note.ts
index b57458235f..6d3b9fe15e 100644
--- a/packages/backend/src/models/json-schema/note.ts
+++ b/packages/backend/src/models/json-schema/note.ts
@@ -41,6 +41,10 @@ export const packedNoteSchema = {
 			type: 'string',
 			optional: true, nullable: true,
 		},
+		mandatoryCW: {
+			type: 'string',
+			optional: true, nullable: true,
+		},
 		userId: {
 			type: 'string',
 			optional: false, nullable: false,
diff --git a/packages/backend/src/server/api/endpoint-list.ts b/packages/backend/src/server/api/endpoint-list.ts
index 962055052d..392b45eab6 100644
--- a/packages/backend/src/server/api/endpoint-list.ts
+++ b/packages/backend/src/server/api/endpoint-list.ts
@@ -34,6 +34,7 @@ export * as 'admin/avatar-decorations/list' from './endpoints/admin/avatar-decor
 export * as 'admin/avatar-decorations/update' from './endpoints/admin/avatar-decorations/update.js';
 export * as 'admin/captcha/current' from './endpoints/admin/captcha/current.js';
 export * as 'admin/captcha/save' from './endpoints/admin/captcha/save.js';
+export * as 'admin/cw-note' from './endpoints/admin/cw-note.js';
 export * as 'admin/cw-user' from './endpoints/admin/cw-user.js';
 export * as 'admin/decline-user' from './endpoints/admin/decline-user.js';
 export * as 'admin/delete-account' from './endpoints/admin/delete-account.js';
diff --git a/packages/backend/src/server/api/endpoints/admin/cw-note.ts b/packages/backend/src/server/api/endpoints/admin/cw-note.ts
new file mode 100644
index 0000000000..498ad464ab
--- /dev/null
+++ b/packages/backend/src/server/api/endpoints/admin/cw-note.ts
@@ -0,0 +1,63 @@
+/*
+ * SPDX-FileCopyrightText: hazelnoot and other Sharkey contributors
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { Inject, Injectable } from '@nestjs/common';
+import { Endpoint } from '@/server/api/endpoint-base.js';
+import type { MiNote, MiUser, NotesRepository } from '@/models/_.js';
+import { DI } from '@/di-symbols.js';
+import { ModerationLogService } from '@/core/ModerationLogService.js';
+
+export const meta = {
+	tags: ['admin'],
+
+	requireCredential: true,
+	requireModerator: true,
+	kind: 'write:admin:cw-note',
+} as const;
+
+export const paramDef = {
+	type: 'object',
+	properties: {
+		noteId: { type: 'string', format: 'misskey:id' },
+		cw: { type: 'string', nullable: true },
+	},
+	required: ['noteId', 'cw'],
+} as const;
+
+@Injectable()
+export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-disable-line import/no-default-export
+	constructor(
+		@Inject(DI.notesRepository)
+		private readonly notesRepository: NotesRepository,
+
+		private readonly moderationLogService: ModerationLogService,
+	) {
+		super(meta, paramDef, async (ps, me) => {
+			const note = await this.notesRepository.findOneOrFail({
+				where: { id: ps.noteId },
+				relations: { user: true },
+			}) as MiNote & { user: MiUser };
+
+			// Skip if there's nothing to do
+			if (note.mandatoryCW === ps.cw) return;
+
+			// Log event first.
+			// This ensures that we don't "lose" the log if an error occurs
+			await this.moderationLogService.log(me, 'setMandatoryCWForNote', {
+				newCW: ps.cw,
+				oldCW: note.mandatoryCW,
+				noteId: note.id,
+				noteUserId: note.user.id,
+				noteUserUsername: note.user.username,
+				noteUserHost: note.user.host,
+			});
+
+			await this.notesRepository.update(ps.noteId, {
+				// Collapse empty strings to null
+				mandatoryCW: ps.cw || null,
+			});
+		});
+	}
+}
diff --git a/packages/backend/src/server/api/endpoints/admin/cw-user.ts b/packages/backend/src/server/api/endpoints/admin/cw-user.ts
index 07f7027756..37480e9302 100644
--- a/packages/backend/src/server/api/endpoints/admin/cw-user.ts
+++ b/packages/backend/src/server/api/endpoints/admin/cw-user.ts
@@ -46,7 +46,6 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 
 			await this.usersRepository.update(ps.userId, {
 				// Collapse empty strings to null
-				// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
 				mandatoryCW: ps.cw || null,
 			});
 
diff --git a/packages/backend/src/server/api/mastodon/MastodonConverters.ts b/packages/backend/src/server/api/mastodon/MastodonConverters.ts
index df8d68042a..2664a65b82 100644
--- a/packages/backend/src/server/api/mastodon/MastodonConverters.ts
+++ b/packages/backend/src/server/api/mastodon/MastodonConverters.ts
@@ -224,7 +224,13 @@ export class MastodonConverters {
 			// TODO avoid re-packing files for each edit
 			const files = await this.driveFileEntityService.packManyByIds(edit.fileIds);
 
-			const cw = appendContentWarning(edit.cw, noteUser.mandatoryCW) ?? '';
+			let cw = edit.cw ?? '';
+			if (note.mandatoryCW) {
+				cw = appendContentWarning(cw, note.mandatoryCW);
+			}
+			if (noteUser.mandatoryCW) {
+				cw = appendContentWarning(cw, noteUser.mandatoryCW);
+			}
 
 			const isQuote = renote && (edit.cw || edit.newText || edit.fileIds.length > 0 || note.replyId);
 			const quoteUri = isQuote
@@ -299,7 +305,13 @@ export class MastodonConverters {
 			? quoteUri.then(quote => this.mfmService.toMastoApiHtml(mfm.parse(text), mentionedRemoteUsers, false, quote) ?? escapeMFM(text))
 			: '';
 
-		const cw = appendContentWarning(note.cw, noteUser.mandatoryCW) ?? '';
+		let cw = note.cw ?? '';
+		if (note.mandatoryCW) {
+			cw = appendContentWarning(cw, note.mandatoryCW);
+		}
+		if (noteUser.mandatoryCW) {
+			cw = appendContentWarning(cw, noteUser.mandatoryCW);
+		}
 
 		const reblogged = await this.mastodonDataService.hasReblog(note.id, me);
 
diff --git a/packages/backend/src/types.ts b/packages/backend/src/types.ts
index 8aa047a3ab..0e1d36da55 100644
--- a/packages/backend/src/types.ts
+++ b/packages/backend/src/types.ts
@@ -106,6 +106,7 @@ export const moderationLogTypes = [
 	'deleteUserAnnouncement',
 	'resetPassword',
 	'setMandatoryCW',
+	'setMandatoryCWForNote',
 	'setRemoteInstanceNSFW',
 	'unsetRemoteInstanceNSFW',
 	'suspendRemoteInstance',
@@ -294,6 +295,14 @@ export type ModerationLogPayloads = {
 		userUsername: string;
 		userHost: string | null;
 	};
+	setMandatoryCWForNote: {
+		newCW: string | null;
+		oldCW: string | null;
+		noteId: string;
+		noteUserId: string;
+		noteUserUsername: string;
+		noteUserHost: string | null;
+	};
 	setRemoteInstanceNSFW: {
 		id: string;
 		host: string;
diff --git a/packages/backend/test/unit/NoteCreateService.ts b/packages/backend/test/unit/NoteCreateService.ts
index 63e3795a84..8f241cf0c7 100644
--- a/packages/backend/test/unit/NoteCreateService.ts
+++ b/packages/backend/test/unit/NoteCreateService.ts
@@ -65,6 +65,7 @@ describe('NoteCreateService', () => {
 			renoteUserHost: null,
 			renoteUserInstance: null,
 			processErrors: [],
+			mandatoryCW: null,
 		};
 
 		const poll: IPoll = {
diff --git a/packages/backend/test/unit/misc/is-renote.ts b/packages/backend/test/unit/misc/is-renote.ts
index b6cfa53466..c061cce3e6 100644
--- a/packages/backend/test/unit/misc/is-renote.ts
+++ b/packages/backend/test/unit/misc/is-renote.ts
@@ -48,6 +48,7 @@ const base: MiNote = {
 	renoteUserHost: null,
 	renoteUserInstance: null,
 	processErrors: [],
+	mandatoryCW: null,
 };
 
 describe('misc:is-renote', () => {
diff --git a/packages/frontend-shared/js/compute-merged-cw.ts b/packages/frontend-shared/js/compute-merged-cw.ts
index dfea57fdce..7d197accea 100644
--- a/packages/frontend-shared/js/compute-merged-cw.ts
+++ b/packages/frontend-shared/js/compute-merged-cw.ts
@@ -9,6 +9,9 @@ import { appendContentWarning } from '@@/js/append-content-warning.js';
 export function computeMergedCw(note: Misskey.entities.Note): string | null {
 	let cw = note.cw;
 
+	if (note.mandatoryCW) {
+		cw = appendContentWarning(cw, note.mandatoryCW);
+	}
 	if (note.user.mandatoryCW) {
 		cw = appendContentWarning(cw, note.user.mandatoryCW);
 	}
diff --git a/packages/frontend/src/components/SkMutedNote.vue b/packages/frontend/src/components/SkMutedNote.vue
index e85316848c..9fb6e4465d 100644
--- a/packages/frontend/src/components/SkMutedNote.vue
+++ b/packages/frontend/src/components/SkMutedNote.vue
@@ -13,6 +13,11 @@ Displays a placeholder for a muted note.
 	<!-- If hard muted, we want to hide *everything*, including the placeholders and controls to expand. -->
 	<div v-else-if="!mute.hardMuted" :class="[$style.muted, mutedClass]" class="_gaps_s" @click.stop="expandNote = true">
 		<!-- Mandatory CWs -->
+		<I18n v-if="mute.noteMandatoryCW" :src="i18n.ts.noteIsFlaggedAs" tag="small">
+			<template #cw>
+				{{ mute.noteMandatoryCW }}
+			</template>
+		</I18n>
 		<I18n v-if="mute.userMandatoryCW" :src="i18n.ts.userIsFlaggedAs" tag="small">
 			<template #name>
 				<MkUserName :user="note.user"/>
@@ -84,7 +89,7 @@ const expandNote = ref(false);
 
 const mute = computed(() => checkMute(props.note, props.withHardMute));
 const mutedWords = computed(() => mute.value.softMutedWords?.join(', '));
-const isMuted = computed(() => mute.value.hardMuted || mutedWords.value || mute.value.userMandatoryCW || mute.value.noteMuted || mute.value.threadMuted || mute.value.sensitiveMuted);
+const isMuted = computed(() => mute.value.hardMuted || mutedWords.value || mute.value.noteMandatoryCW || mute.value.userMandatoryCW || mute.value.noteMuted || mute.value.threadMuted || mute.value.sensitiveMuted);
 const isExpanded = computed(() => expandNote.value || !isMuted.value);
 const rootClass = computed(() => isExpanded.value ? props.expandedClass : undefined);
 
diff --git a/packages/frontend/src/pages/admin/modlog.ModLog.vue b/packages/frontend/src/pages/admin/modlog.ModLog.vue
index 5b049fb976..59de4cf7e8 100644
--- a/packages/frontend/src/pages/admin/modlog.ModLog.vue
+++ b/packages/frontend/src/pages/admin/modlog.ModLog.vue
@@ -27,6 +27,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 					'markSensitiveDriveFile',
 					'resetPassword',
 					'setMandatoryCW',
+					'setMandatoryCWForNote',
 					'suspendRemoteInstance',
 					'setRemoteInstanceNSFW',
 					'unsetRemoteInstanceNSFW',
@@ -79,6 +80,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 		<span v-else-if="log.type === 'unsuspend'">: @{{ log.info.userUsername }}{{ log.info.userHost ? '@' + log.info.userHost : '' }}</span>
 		<span v-else-if="log.type === 'resetPassword'">: @{{ log.info.userUsername }}{{ log.info.userHost ? '@' + log.info.userHost : '' }}</span>
 		<span v-else-if="log.type === 'setMandatoryCW'">: @{{ log.info.userUsername }}{{ log.info.userHost ? '@' + log.info.userHost : '' }}</span>
+		<span v-else-if="log.type === 'setMandatoryCWForNote'">: @{{ log.info.noteUserUsername }}{{ log.info.noteUserHost ? '@' + log.info.noteUserHost : '' }}</span>
 		<span v-else-if="log.type === 'assignRole'">: @{{ log.info.userUsername }}{{ log.info.userHost ? '@' + log.info.userHost : '' }} <i class="ti ti-arrow-right"></i> {{ log.info.roleName }}</span>
 		<span v-else-if="log.type === 'unassignRole'">: @{{ log.info.userUsername }}{{ log.info.userHost ? '@' + log.info.userHost : '' }} <i class="ti ti-equal-not"></i> {{ log.info.roleName }}</span>
 		<span v-else-if="log.type === 'createRole'">: {{ log.info.role.name }}</span>
@@ -208,6 +210,13 @@ SPDX-License-Identifier: AGPL-3.0-only
 				<CodeDiff :context="0" :hideHeader="true" :oldString="log.info.oldCW ?? ''" :newString="log.info.newCW ?? ''" maxHeight="150px"/>
 			</div>
 		</template>
+		<template v-else-if="log.type === 'setMandatoryCWForNote'">
+			<div>{{ i18n.ts.user }}: <MkA :to="`/admin/user/${log.info.noteUserId}`" class="_link">@{{ log.info.noteUserUsername }}{{ log.info.noteUserHost ? '@' + log.info.noteUserHost : '' }}</MkA></div>
+			<div>{{ i18n.ts.note }}: <MkA :to="`/notes/${log.info.noteId}`" class="_link">{{ log.info.noteId }}</MkA></div>
+			<div :class="$style.diff">
+				<CodeDiff :context="0" :hideHeader="true" :oldString="log.info.oldCW ?? ''" :newString="log.info.newCW ?? ''" maxHeight="150px"/>
+			</div>
+		</template>
 		<template v-else-if="log.type === 'unsuspend'">
 			<div>{{ i18n.ts.user }}: <MkA :to="`/admin/user/${log.info.userId}`" class="_link">@{{ log.info.userUsername }}{{ log.info.userHost ? '@' + log.info.userHost : '' }}</MkA></div>
 		</template>
@@ -323,6 +332,8 @@ SPDX-License-Identifier: AGPL-3.0-only
 			</div>
 		</template>
 
+		<MkUrlPreview v-if="'noteId' in log.info" :url="`${url}/notes/${log.info.noteId}`" :compact="false" :detail="false" :showAsQuote="true"></MkUrlPreview>
+
 		<details>
 			<summary>raw</summary>
 			<pre>{{ JSON5.stringify(log, null, '\t') }}</pre>
@@ -338,6 +349,8 @@ import JSON5 from 'json5';
 import { i18n } from '@/i18n.js';
 import MkFolder from '@/components/MkFolder.vue';
 import SkFetchNote from '@/components/SkFetchNote.vue';
+import MkUrlPreview from '@/components/MkUrlPreview.vue';
+import { url } from '@@/js/config.js';
 
 const props = defineProps<{
 	log: Misskey.entities.ModerationLog;
diff --git a/packages/frontend/src/utility/check-word-mute.ts b/packages/frontend/src/utility/check-word-mute.ts
index 9a6ad6b9c9..b0e4dda777 100644
--- a/packages/frontend/src/utility/check-word-mute.ts
+++ b/packages/frontend/src/utility/check-word-mute.ts
@@ -18,6 +18,7 @@ export interface Mute {
 	threadMuted?: boolean;
 	noteMuted?: boolean;
 
+	noteMandatoryCW?: string | null;
 	// TODO show this as a single block on user timelines
 	userMandatoryCW?: string | null;
 }
@@ -32,21 +33,22 @@ export function checkMute(note: Misskey.entities.Note, withHardMute?: boolean):
 
 	const threadMuted = note.isMutingThread;
 	const noteMuted = note.isMutingNote;
+	const noteMandatoryCW = note.mandatoryCW;
 	const userMandatoryCW = note.user.mandatoryCW;
 
 	// Hard mute
 	if (withHardMute && isHardMuted(note)) {
-		return { hardMuted: true, sensitiveMuted, threadMuted, noteMuted, userMandatoryCW };
+		return { hardMuted: true, sensitiveMuted, threadMuted, noteMuted, noteMandatoryCW, userMandatoryCW };
 	}
 
 	// Soft mute
 	const softMutedWords = isSoftMuted(note);
 	if (softMutedWords.length > 0) {
-		return { softMutedWords, sensitiveMuted, threadMuted, noteMuted, userMandatoryCW };
+		return { softMutedWords, sensitiveMuted, threadMuted, noteMuted, noteMandatoryCW, userMandatoryCW };
 	}
 
 	// Other / no mute
-	return { sensitiveMuted, threadMuted, noteMuted, userMandatoryCW };
+	return { sensitiveMuted, threadMuted, noteMuted, noteMandatoryCW, userMandatoryCW };
 }
 
 function isHardMuted(note: Misskey.entities.Note): boolean {
diff --git a/packages/frontend/src/utility/get-note-menu.ts b/packages/frontend/src/utility/get-note-menu.ts
index a7eb2f51a4..e73067baed 100644
--- a/packages/frontend/src/utility/get-note-menu.ts
+++ b/packages/frontend/src/utility/get-note-menu.ts
@@ -151,6 +151,28 @@ export function getAbuseNoteMenu(note: Misskey.entities.Note, text: string): Men
 	};
 }
 
+export function getMandatoryCWMenu(note: Misskey.entities.Note): MenuItem {
+	return {
+		icon: 'ph-warning ph-bold ph-lg',
+		text: i18n.ts.mandatoryCWForNote,
+		action: async () => {
+			const result = await os.inputText({
+				type: 'text',
+				title: i18n.ts.mandatoryCWForNote,
+				text: i18n.ts.mandatoryCWForNoteDescription,
+				default: note.mandatoryCW ?? '',
+			});
+
+			if (result.canceled) return;
+
+			await os.apiWithDialog('admin/cw-note', {
+				noteId: note.id,
+				cw: result.result || null,
+			});
+		},
+	};
+}
+
 export function getCopyNoteLinkMenu(note: Misskey.entities.Note, text: string): MenuItem {
 	return {
 		icon: 'ti ti-link',
@@ -442,6 +464,10 @@ export function getNoteMenu(props: {
 		if (appearNote.userId !== $i.id) {
 			menuItems.push({ type: 'divider' });
 			menuItems.push(getAbuseNoteMenu(appearNote, i18n.ts.reportAbuse));
+
+			if ($i.isModerator || $i.isAdmin) {
+				menuItems.push(getMandatoryCWMenu(appearNote));
+			}
 		}
 
 		if (appearNote.channel && (appearNote.channel.userId === $i.id || $i.isModerator || $i.isAdmin)) {
diff --git a/packages/frontend/src/utility/get-note-summary.ts b/packages/frontend/src/utility/get-note-summary.ts
index 4e093bcf4c..d91ff6853a 100644
--- a/packages/frontend/src/utility/get-note-summary.ts
+++ b/packages/frontend/src/utility/get-note-summary.ts
@@ -28,6 +28,9 @@ export const getNoteSummary = (note?: Misskey.entities.Note | null): string => {
 
 	// Append mandatory CW, if applicable
 	let cw = note.cw;
+	if (note.mandatoryCW) {
+		cw = appendContentWarning(cw, note.mandatoryCW);
+	}
 	if (note.user.mandatoryCW) {
 		cw = appendContentWarning(cw, note.user.mandatoryCW);
 	}
diff --git a/packages/misskey-js/etc/misskey-js.api.md b/packages/misskey-js/etc/misskey-js.api.md
index a553353d2a..86b59bdc8b 100644
--- a/packages/misskey-js/etc/misskey-js.api.md
+++ b/packages/misskey-js/etc/misskey-js.api.md
@@ -152,6 +152,9 @@ type AdminCaptchaCurrentResponse = operations['admin___captcha___current']['resp
 // @public (undocumented)
 type AdminCaptchaSaveRequest = operations['admin___captcha___save']['requestBody']['content']['application/json'];
 
+// @public (undocumented)
+type AdminCwNoteRequest = operations['admin___cw-note']['requestBody']['content']['application/json'];
+
 // @public (undocumented)
 type AdminCwUserRequest = operations['admin___cw-user']['requestBody']['content']['application/json'];
 
@@ -1542,6 +1545,7 @@ declare namespace entities {
         AdminAvatarDecorationsUpdateRequest,
         AdminCaptchaCurrentResponse,
         AdminCaptchaSaveRequest,
+        AdminCwNoteRequest,
         AdminCwUserRequest,
         AdminDeclineUserRequest,
         AdminDeleteAccountRequest,
@@ -3097,7 +3101,7 @@ type ModerationLog = {
 });
 
 // @public (undocumented)
-export const moderationLogTypes: readonly ["updateServerSettings", "suspend", "approve", "decline", "unsuspend", "updateUserNote", "addCustomEmoji", "updateCustomEmoji", "deleteCustomEmoji", "assignRole", "unassignRole", "createRole", "updateRole", "deleteRole", "clearQueue", "promoteQueue", "deleteDriveFile", "deleteNote", "createGlobalAnnouncement", "createUserAnnouncement", "updateGlobalAnnouncement", "updateUserAnnouncement", "deleteGlobalAnnouncement", "deleteUserAnnouncement", "resetPassword", "setMandatoryCW", "setRemoteInstanceNSFW", "unsetRemoteInstanceNSFW", "suspendRemoteInstance", "unsuspendRemoteInstance", "rejectRemoteInstanceReports", "acceptRemoteInstanceReports", "updateRemoteInstanceNote", "markSensitiveDriveFile", "unmarkSensitiveDriveFile", "resolveAbuseReport", "forwardAbuseReport", "updateAbuseReportNote", "createInvitation", "createAd", "updateAd", "deleteAd", "createAvatarDecoration", "updateAvatarDecoration", "deleteAvatarDecoration", "unsetUserAvatar", "unsetUserBanner", "createSystemWebhook", "updateSystemWebhook", "deleteSystemWebhook", "createAbuseReportNotificationRecipient", "updateAbuseReportNotificationRecipient", "deleteAbuseReportNotificationRecipient", "deleteAccount", "deletePage", "deleteFlash", "deleteGalleryPost", "deleteChatRoom"];
+export const moderationLogTypes: readonly ["updateServerSettings", "suspend", "approve", "decline", "unsuspend", "updateUserNote", "addCustomEmoji", "updateCustomEmoji", "deleteCustomEmoji", "assignRole", "unassignRole", "createRole", "updateRole", "deleteRole", "clearQueue", "promoteQueue", "deleteDriveFile", "deleteNote", "createGlobalAnnouncement", "createUserAnnouncement", "updateGlobalAnnouncement", "updateUserAnnouncement", "deleteGlobalAnnouncement", "deleteUserAnnouncement", "resetPassword", "setMandatoryCW", "setMandatoryCWForNote", "setRemoteInstanceNSFW", "unsetRemoteInstanceNSFW", "suspendRemoteInstance", "unsuspendRemoteInstance", "rejectRemoteInstanceReports", "acceptRemoteInstanceReports", "updateRemoteInstanceNote", "markSensitiveDriveFile", "unmarkSensitiveDriveFile", "resolveAbuseReport", "forwardAbuseReport", "updateAbuseReportNote", "createInvitation", "createAd", "updateAd", "deleteAd", "createAvatarDecoration", "updateAvatarDecoration", "deleteAvatarDecoration", "unsetUserAvatar", "unsetUserBanner", "createSystemWebhook", "updateSystemWebhook", "deleteSystemWebhook", "createAbuseReportNotificationRecipient", "updateAbuseReportNotificationRecipient", "deleteAbuseReportNotificationRecipient", "deleteAccount", "deletePage", "deleteFlash", "deleteGalleryPost", "deleteChatRoom"];
 
 // @public (undocumented)
 type MuteCreateRequest = operations['mute___create']['requestBody']['content']['application/json'];
@@ -3407,7 +3411,7 @@ type PartialRolePolicyOverride = Partial<{
 }>;
 
 // @public (undocumented)
-export const permissions: readonly ["read:account", "write:account", "read:blocks", "write:blocks", "read:drive", "write:drive", "read:favorites", "write:favorites", "read:following", "write:following", "read:messaging", "write:messaging", "read:mutes", "write:mutes", "write:notes", "read:notes-schedule", "write:notes-schedule", "read:notifications", "write:notifications", "read:reactions", "write:reactions", "write:votes", "read:pages", "write:pages", "write:page-likes", "read:page-likes", "read:user-groups", "write:user-groups", "read:channels", "write:channels", "read:gallery", "write:gallery", "read:gallery-likes", "write:gallery-likes", "read:flash", "write:flash", "read:flash-likes", "write:flash-likes", "read:admin:abuse-user-reports", "write:admin:delete-account", "write:admin:delete-all-files-of-a-user", "read:admin:index-stats", "read:admin:table-stats", "read:admin:user-ips", "read:admin:meta", "write:admin:reset-password", "write:admin:resolve-abuse-user-report", "write:admin:send-email", "read:admin:server-info", "read:admin:show-moderation-log", "read:admin:show-user", "write:admin:suspend-user", "write:admin:approve-user", "write:admin:decline-user", "write:admin:nsfw-user", "write:admin:unnsfw-user", "write:admin:cw-user", "write:admin:silence-user", "write:admin:unsilence-user", "write:admin:unset-user-avatar", "write:admin:unset-user-banner", "write:admin:unsuspend-user", "write:admin:reject-quotes", "write:admin:meta", "write:admin:user-note", "write:admin:roles", "read:admin:roles", "write:admin:relays", "read:admin:relays", "write:admin:invite-codes", "read:admin:invite-codes", "write:admin:announcements", "read:admin:announcements", "write:admin:avatar-decorations", "read:admin:avatar-decorations", "write:admin:federation", "write:admin:account", "read:admin:account", "write:admin:emoji", "read:admin:emoji", "write:admin:queue", "read:admin:queue", "write:admin:promo", "write:admin:drive", "read:admin:drive", "write:admin:ad", "read:admin:ad", "write:invite-codes", "read:invite-codes", "write:clip-favorite", "read:clip-favorite", "read:federation", "write:report-abuse", "write:chat", "read:chat"];
+export const permissions: readonly ["read:account", "write:account", "read:blocks", "write:blocks", "read:drive", "write:drive", "read:favorites", "write:favorites", "read:following", "write:following", "read:messaging", "write:messaging", "read:mutes", "write:mutes", "write:notes", "read:notes-schedule", "write:notes-schedule", "read:notifications", "write:notifications", "read:reactions", "write:reactions", "write:votes", "read:pages", "write:pages", "write:page-likes", "read:page-likes", "read:user-groups", "write:user-groups", "read:channels", "write:channels", "read:gallery", "write:gallery", "read:gallery-likes", "write:gallery-likes", "read:flash", "write:flash", "read:flash-likes", "write:flash-likes", "read:admin:abuse-user-reports", "write:admin:delete-account", "write:admin:delete-all-files-of-a-user", "read:admin:index-stats", "read:admin:table-stats", "read:admin:user-ips", "read:admin:meta", "write:admin:reset-password", "write:admin:resolve-abuse-user-report", "write:admin:send-email", "read:admin:server-info", "read:admin:show-moderation-log", "read:admin:show-user", "write:admin:suspend-user", "write:admin:approve-user", "write:admin:decline-user", "write:admin:nsfw-user", "write:admin:unnsfw-user", "write:admin:cw-user", "write:admin:cw-note", "write:admin:silence-user", "write:admin:unsilence-user", "write:admin:unset-user-avatar", "write:admin:unset-user-banner", "write:admin:unsuspend-user", "write:admin:reject-quotes", "write:admin:meta", "write:admin:user-note", "write:admin:roles", "read:admin:roles", "write:admin:relays", "read:admin:relays", "write:admin:invite-codes", "read:admin:invite-codes", "write:admin:announcements", "read:admin:announcements", "write:admin:avatar-decorations", "read:admin:avatar-decorations", "write:admin:federation", "write:admin:account", "read:admin:account", "write:admin:emoji", "read:admin:emoji", "write:admin:queue", "read:admin:queue", "write:admin:promo", "write:admin:drive", "read:admin:drive", "write:admin:ad", "read:admin:ad", "write:invite-codes", "read:invite-codes", "write:clip-favorite", "read:clip-favorite", "read:federation", "write:report-abuse", "write:chat", "read:chat"];
 
 // @public (undocumented)
 type PingResponse = operations['ping']['responses']['200']['content']['application/json'];
diff --git a/packages/misskey-js/src/autogen/apiClientJSDoc.ts b/packages/misskey-js/src/autogen/apiClientJSDoc.ts
index be7479b009..9246d4ae4f 100644
--- a/packages/misskey-js/src/autogen/apiClientJSDoc.ts
+++ b/packages/misskey-js/src/autogen/apiClientJSDoc.ts
@@ -272,6 +272,17 @@ declare module '../api.js' {
       credential?: string | null,
     ): Promise<SwitchCaseResponseType<E, P>>;
 
+    /**
+     * No description provided.
+     * 
+     * **Credential required**: *Yes* / **Permission**: *write:admin:cw-note*
+     */
+    request<E extends 'admin/cw-note', P extends Endpoints[E]['req']>(
+      endpoint: E,
+      params: P,
+      credential?: string | null,
+    ): Promise<SwitchCaseResponseType<E, P>>;
+
     /**
      * No description provided.
      * 
diff --git a/packages/misskey-js/src/autogen/endpoint.ts b/packages/misskey-js/src/autogen/endpoint.ts
index f08323d783..428b9e7a46 100644
--- a/packages/misskey-js/src/autogen/endpoint.ts
+++ b/packages/misskey-js/src/autogen/endpoint.ts
@@ -38,6 +38,7 @@ import type {
 	AdminAvatarDecorationsUpdateRequest,
 	AdminCaptchaCurrentResponse,
 	AdminCaptchaSaveRequest,
+	AdminCwNoteRequest,
 	AdminCwUserRequest,
 	AdminDeclineUserRequest,
 	AdminDeleteAccountRequest,
@@ -689,6 +690,7 @@ export type Endpoints = {
 	'admin/avatar-decorations/update': { req: AdminAvatarDecorationsUpdateRequest; res: EmptyResponse };
 	'admin/captcha/current': { req: EmptyRequest; res: AdminCaptchaCurrentResponse };
 	'admin/captcha/save': { req: AdminCaptchaSaveRequest; res: EmptyResponse };
+	'admin/cw-note': { req: AdminCwNoteRequest; res: EmptyResponse };
 	'admin/cw-user': { req: AdminCwUserRequest; res: EmptyResponse };
 	'admin/decline-user': { req: AdminDeclineUserRequest; res: EmptyResponse };
 	'admin/delete-account': { req: AdminDeleteAccountRequest; res: EmptyResponse };
diff --git a/packages/misskey-js/src/autogen/entities.ts b/packages/misskey-js/src/autogen/entities.ts
index cf40793792..f0e16175e4 100644
--- a/packages/misskey-js/src/autogen/entities.ts
+++ b/packages/misskey-js/src/autogen/entities.ts
@@ -41,6 +41,7 @@ export type AdminAvatarDecorationsListResponse = operations['admin___avatar-deco
 export type AdminAvatarDecorationsUpdateRequest = operations['admin___avatar-decorations___update']['requestBody']['content']['application/json'];
 export type AdminCaptchaCurrentResponse = operations['admin___captcha___current']['responses']['200']['content']['application/json'];
 export type AdminCaptchaSaveRequest = operations['admin___captcha___save']['requestBody']['content']['application/json'];
+export type AdminCwNoteRequest = operations['admin___cw-note']['requestBody']['content']['application/json'];
 export type AdminCwUserRequest = operations['admin___cw-user']['requestBody']['content']['application/json'];
 export type AdminDeclineUserRequest = operations['admin___decline-user']['requestBody']['content']['application/json'];
 export type AdminDeleteAccountRequest = operations['admin___delete-account']['requestBody']['content']['application/json'];
diff --git a/packages/misskey-js/src/autogen/types.ts b/packages/misskey-js/src/autogen/types.ts
index 7f5810598b..ab0ac51004 100644
--- a/packages/misskey-js/src/autogen/types.ts
+++ b/packages/misskey-js/src/autogen/types.ts
@@ -233,6 +233,15 @@ export type paths = {
      */
     post: operations['admin___captcha___save'];
   };
+  '/admin/cw-note': {
+    /**
+     * admin/cw-note
+     * @description No description provided.
+     *
+     * **Credential required**: *Yes* / **Permission**: *write:admin:cw-note*
+     */
+    post: operations['admin___cw-note'];
+  };
   '/admin/cw-user': {
     /**
      * admin/cw-user
@@ -4671,6 +4680,7 @@ export type components = {
       deletedAt?: string | null;
       text: string | null;
       cw?: string | null;
+      mandatoryCW?: string | null;
       /** Format: id */
       userId: string;
       user: components['schemas']['UserLite'];
@@ -7389,6 +7399,59 @@ export type operations = {
       };
     };
   };
+  /**
+   * admin/cw-note
+   * @description No description provided.
+   *
+   * **Credential required**: *Yes* / **Permission**: *write:admin:cw-note*
+   */
+  'admin___cw-note': {
+    requestBody: {
+      content: {
+        'application/json': {
+          /** Format: misskey:id */
+          noteId: string;
+          cw: string | null;
+        };
+      };
+    };
+    responses: {
+      /** @description OK (without any results) */
+      204: {
+        content: never;
+      };
+      /** @description Client error */
+      400: {
+        content: {
+          'application/json': components['schemas']['Error'];
+        };
+      };
+      /** @description Authentication error */
+      401: {
+        content: {
+          'application/json': components['schemas']['Error'];
+        };
+      };
+      /** @description Forbidden error */
+      403: {
+        content: {
+          'application/json': components['schemas']['Error'];
+        };
+      };
+      /** @description I'm Ai */
+      418: {
+        content: {
+          'application/json': components['schemas']['Error'];
+        };
+      };
+      /** @description Internal server error */
+      500: {
+        content: {
+          'application/json': components['schemas']['Error'];
+        };
+      };
+    };
+  };
   /**
    * admin/cw-user
    * @description No description provided.
diff --git a/packages/misskey-js/src/consts.ts b/packages/misskey-js/src/consts.ts
index d0874aad3a..f183d5352a 100644
--- a/packages/misskey-js/src/consts.ts
+++ b/packages/misskey-js/src/consts.ts
@@ -81,6 +81,7 @@ export const permissions = [
 	'write:admin:nsfw-user',
 	'write:admin:unnsfw-user',
 	'write:admin:cw-user',
+	'write:admin:cw-note',
 	'write:admin:silence-user',
 	'write:admin:unsilence-user',
 	'write:admin:unset-user-avatar',
@@ -148,6 +149,7 @@ export const moderationLogTypes = [
 	'deleteUserAnnouncement',
 	'resetPassword',
 	'setMandatoryCW',
+	'setMandatoryCWForNote',
 	'setRemoteInstanceNSFW',
 	'unsetRemoteInstanceNSFW',
 	'suspendRemoteInstance',
@@ -343,6 +345,14 @@ export type ModerationLogPayloads = {
 		userUsername: string;
 		userHost: string | null;
 	};
+	setMandatoryCWForNote: {
+		newCW: string | null;
+		oldCW: string | null;
+		noteId: string;
+		noteUserId: string;
+		noteUserUsername: string;
+		noteUserHost: string | null;
+	};
 	setRemoteInstanceNSFW: {
 		id: string;
 		host: string;
diff --git a/packages/misskey-js/src/entities.ts b/packages/misskey-js/src/entities.ts
index 29eb169ab8..697ff3f9e7 100644
--- a/packages/misskey-js/src/entities.ts
+++ b/packages/misskey-js/src/entities.ts
@@ -133,6 +133,9 @@ export type ModerationLog = {
 } | {
 	type: 'setMandatoryCW';
 	info: ModerationLogPayloads['setMandatoryCW'];
+} | {
+	type: 'setMandatoryCWForNote';
+	info: ModerationLogPayloads['setMandatoryCWForNote'];
 } | {
 	type: 'setRemoteInstanceNSFW';
 	info: ModerationLogPayloads['setRemoteInstanceNSFW'];
diff --git a/sharkey-locales/en-US.yml b/sharkey-locales/en-US.yml
index 47b6f80bdb..891f2ca154 100644
--- a/sharkey-locales/en-US.yml
+++ b/sharkey-locales/en-US.yml
@@ -36,6 +36,7 @@ unmuteNote: "Unmute note"
 userSaysSomethingInMutedNote: "{name} said something in a muted post"
 userSaysSomethingInMutedThread: "{name} said something in a muted thread"
 userIsFlaggedAs: "{name} is flagged: \"{cw}\""
+noteIsFlaggedAs: "Note is flagged: \"{cw}\""
 markAsNSFW: "Mark all media from user as NSFW"
 markInstanceAsNSFW: "Mark as NSFW"
 nsfwConfirm: "Are you sure that you want to mark all media from this account as NSFW?"
@@ -344,6 +345,7 @@ _moderationLogTypes:
   approve: "Approved"
   decline: "Declined"
   setMandatoryCW: "Set content warning for user"
+  setMandatoryCWForNote: "Set content warning for note"
   setRemoteInstanceNSFW: "Set remote instance as NSFW"
   unsetRemoteInstanceNSFW: "Unset remote instance as NSFW"
   rejectRemoteInstanceReports: "Rejected reports from remote instance"
@@ -504,6 +506,7 @@ _permissions:
   "write:admin:nsfw-user": "Mark users as NSFW"
   "write:admin:unnsfw-user": "Mark users as not NSFW"
   "write:admin:cw-user": "Apply mandatory CW on users"
+  "write:admin:cw-note": "Apply mandatory CW on notes"
   "write:admin:silence-user": "Silence users"
   "write:admin:unsilence-user": "Un-silence users"
   "write:admin:reject-quotes": "Allow/Prohibit quote posts from a user"
@@ -542,7 +545,9 @@ _noteSearch:
 id: "ID"
 
 mandatoryCW: "Force content warning"
-mandatoryCWDescription: "Applies a content warning to all posts created by this user. If the post already has a CW, then this is appended to the end."
+mandatoryCWDescription: "Applies a content warning to all posts created by this user. The forced warnings will appear like a word mute to distinguish them from the author's own content warnings."
+mandatoryCWForNote: "Force content warning"
+mandatoryCWForNoteDescription: "Applies an additional content warning to this post. The new warning will appear like a word mute to distinguish it from the author's own content warning."
 fetchLinkedNote: "Fetch linked note"
 showTranslationButtonInNoteFooter: "Add \"Translate\" to note action menu"
 translationFailed: "Failed to translate note. Please try again later or contact an administrator for assistance."

From 7c170776e50bbacbb1fa4788646b2a6b4e3444d7 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Fri, 27 Jun 2025 22:33:05 -0400
Subject: [PATCH 005/110] fix rate limit errors from notes/children

---
 .../backend/src/server/api/endpoints/notes/children.ts     | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/backend/src/server/api/endpoints/notes/children.ts b/packages/backend/src/server/api/endpoints/notes/children.ts
index 22b064d2a0..8a5a203d80 100644
--- a/packages/backend/src/server/api/endpoints/notes/children.ts
+++ b/packages/backend/src/server/api/endpoints/notes/children.ts
@@ -26,10 +26,11 @@ export const meta = {
 		},
 	},
 
-	// 10 calls per 5 seconds
+	// Up to 25 calls, then 4 / second
 	limit: {
-		duration: 1000 * 5,
-		max: 10,
+		type: 'bucket',
+		size: 25,
+		dripRate: 250,
 	},
 } as const;
 

From df0409604d8020203b8b30f08bdd4bef77530192 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Fri, 27 Jun 2025 23:20:01 -0400
Subject: [PATCH 006/110] fix clearing CW on admin-user

---
 packages/frontend/src/pages/admin-user.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/frontend/src/pages/admin-user.vue b/packages/frontend/src/pages/admin-user.vue
index dc29ae2f80..e22d5ab9cd 100644
--- a/packages/frontend/src/pages/admin-user.vue
+++ b/packages/frontend/src/pages/admin-user.vue
@@ -491,7 +491,7 @@ async function refreshUser() {
 
 async function onMandatoryCWChanged(value: string | number) {
 	await os.promiseDialog(async () => {
-		await misskeyApi('admin/cw-user', { userId: props.userId, cw: String(value) });
+		await misskeyApi('admin/cw-user', { userId: props.userId, cw: String(value) || null });
 		await refreshUser();
 	});
 }

From 595c004a7479432c256dabbe268350e758729810 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Fri, 27 Jun 2025 23:20:44 -0400
Subject: [PATCH 007/110] show mute info on single line

---
 packages/frontend/src/components/SkMutedNote.vue | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/packages/frontend/src/components/SkMutedNote.vue b/packages/frontend/src/components/SkMutedNote.vue
index 9fb6e4465d..ffb197323d 100644
--- a/packages/frontend/src/components/SkMutedNote.vue
+++ b/packages/frontend/src/components/SkMutedNote.vue
@@ -11,7 +11,7 @@ Displays a placeholder for a muted note.
 	<slot v-if="isExpanded"></slot>
 
 	<!-- If hard muted, we want to hide *everything*, including the placeholders and controls to expand. -->
-	<div v-else-if="!mute.hardMuted" :class="[$style.muted, mutedClass]" class="_gaps_s" @click.stop="expandNote = true">
+	<div v-else-if="!mute.hardMuted" :class="[$style.muted, $style.muteContainer, mutedClass]" @click.stop="expandNote = true">
 		<!-- Mandatory CWs -->
 		<I18n v-if="mute.noteMandatoryCW" :src="i18n.ts.noteIsFlaggedAs" tag="small">
 			<template #cw>
@@ -110,4 +110,14 @@ defineExpose({
 .muted:hover {
 	background: var(--MI_THEME-buttonBg);
 }
+
+.muteContainer > :not(:first-child) {
+	margin-left: 0.75rem;
+
+	&:before {
+		content: "•";
+		margin-right: 0.75rem;
+		font-size: 1rem;
+	}
+}
 </style>

From 5e0115335a04543a25adeccf5a7d13ffd4c95ef6 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Fri, 27 Jun 2025 23:20:59 -0400
Subject: [PATCH 008/110] add mandatory CW for instances

---
 locales/index.d.ts                            | 22 ++++++-
 .../1751078046239-add-instance-mandatoryCW.js | 14 +++++
 .../src/core/activitypub/ApRendererService.ts |  9 ++-
 .../core/entities/InstanceEntityService.ts    |  1 +
 .../src/core/entities/UserEntityService.ts    |  1 +
 packages/backend/src/misc/get-note-summary.ts |  3 +
 packages/backend/src/models/Instance.ts       |  9 +++
 .../models/json-schema/federation-instance.ts |  4 ++
 .../backend/src/models/json-schema/user.ts    |  4 ++
 .../backend/src/server/api/endpoint-list.ts   |  1 +
 .../server/api/endpoints/admin/cw-instance.ts | 54 ++++++++++++++++
 .../server/api/mastodon/MastodonConverters.ts |  6 ++
 packages/backend/src/types.ts                 |  6 ++
 .../frontend-shared/js/compute-merged-cw.ts   |  3 +
 .../frontend/src/components/SkMutedNote.vue   | 10 ++-
 .../src/pages/admin/modlog.ModLog.vue         |  7 +++
 packages/frontend/src/pages/instance-info.vue | 22 +++++++
 .../frontend/src/utility/check-word-mute.ts   |  8 ++-
 packages/misskey-js/etc/misskey-js.api.md     | 14 ++++-
 .../misskey-js/src/autogen/apiClientJSDoc.ts  | 11 ++++
 packages/misskey-js/src/autogen/endpoint.ts   |  2 +
 packages/misskey-js/src/autogen/entities.ts   |  1 +
 packages/misskey-js/src/autogen/types.ts      | 63 +++++++++++++++++++
 packages/misskey-js/src/consts.ts             |  7 +++
 packages/misskey-js/src/entities.ts           |  3 +
 sharkey-locales/en-US.yml                     |  5 ++
 26 files changed, 282 insertions(+), 8 deletions(-)
 create mode 100644 packages/backend/migration/1751078046239-add-instance-mandatoryCW.js
 create mode 100644 packages/backend/src/server/api/endpoints/admin/cw-instance.ts

diff --git a/locales/index.d.ts b/locales/index.d.ts
index 8287a5f3b7..06b9e26006 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -9216,6 +9216,10 @@ export interface Locale extends ILocale {
          * Apply mandatory CW on notes
          */
         "write:admin:cw-note": string;
+        /**
+         * Apply mandatory CW on instances
+         */
+        "write:admin:cw-instance": string;
         /**
          * Silence users
          */
@@ -10956,6 +10960,10 @@ export interface Locale extends ILocale {
          * Set content warning for note
          */
         "setMandatoryCWForNote": string;
+        /**
+         * Set content warning for instance
+         */
+        "setMandatoryCWForInstance": string;
         /**
          * Set remote instance as NSFW
          */
@@ -12100,6 +12108,10 @@ export interface Locale extends ILocale {
      * Note is flagged: "{cw}"
      */
     "noteIsFlaggedAs": ParameterizedString<"cw">;
+    /**
+     * {name} is flagged: "{cw}"
+     */
+    "instanceIsFlaggedAs": ParameterizedString<"name" | "cw">;
     /**
      * Mark all media from user as NSFW
      */
@@ -13054,13 +13066,21 @@ export interface Locale extends ILocale {
      */
     "mandatoryCWDescription": string;
     /**
-     * Add content warning
+     * Force content warning
      */
     "mandatoryCWForNote": string;
     /**
      * Applies an additional content warning to this post. The new warning will appear like a word mute to distinguish it from the author's own content warning.
      */
     "mandatoryCWForNoteDescription": string;
+    /**
+     * Force content warning
+     */
+    "mandatoryCWForInstance": string;
+    /**
+     * Applies a content warning to all posts originating from this instance. The forced warnings will appear like a word mute to distinguish them from the notes' own content warnings.
+     */
+    "mandatoryCWForInstanceDescription": string;
     /**
      * Fetch linked note
      */
diff --git a/packages/backend/migration/1751078046239-add-instance-mandatoryCW.js b/packages/backend/migration/1751078046239-add-instance-mandatoryCW.js
new file mode 100644
index 0000000000..8a71b6f5ef
--- /dev/null
+++ b/packages/backend/migration/1751078046239-add-instance-mandatoryCW.js
@@ -0,0 +1,14 @@
+/*
+ * SPDX-FileCopyrightText: hazelnoot and other Sharkey contributors
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+export class AddInstanceMandatoryCW1751078046239 {
+	async up(queryRunner) {
+		await queryRunner.query(`ALTER TABLE "instance" ADD "mandatoryCW" text`);
+	}
+
+	async down(queryRunner) {
+		await queryRunner.query(`ALTER TABLE "instance" DROP COLUMN "mandatoryCW"`);
+	}
+}
diff --git a/packages/backend/src/core/activitypub/ApRendererService.ts b/packages/backend/src/core/activitypub/ApRendererService.ts
index 82c0fba46a..25ad0852cb 100644
--- a/packages/backend/src/core/activitypub/ApRendererService.ts
+++ b/packages/backend/src/core/activitypub/ApRendererService.ts
@@ -34,6 +34,7 @@ import { QueryService } from '@/core/QueryService.js';
 import { UtilityService } from '@/core/UtilityService.js';
 import { CacheService } from '@/core/CacheService.js';
 import { isPureRenote, isQuote, isRenote } from '@/misc/is-renote.js';
+import { FederatedInstanceService } from '@/core/FederatedInstanceService.js';
 import { JsonLdService } from './JsonLdService.js';
 import { ApMfmService } from './ApMfmService.js';
 import { CONTEXT } from './misc/contexts.js';
@@ -75,9 +76,10 @@ export class ApRendererService {
 		private apMfmService: ApMfmService,
 		private mfmService: MfmService,
 		private idService: IdService,
-		private readonly queryService: QueryService,
 		private utilityService: UtilityService,
+		private readonly queryService: QueryService,
 		private readonly cacheService: CacheService,
+		private readonly federatedInstanceService: FederatedInstanceService,
 	) {
 	}
 
@@ -398,6 +400,8 @@ export class ApRendererService {
 			return ids.map(id => items.find(item => item.id === id)).filter(x => x != null);
 		};
 
+		const instance = author.instance ?? (author.host ? await this.federatedInstanceService.fetch(author.host) : null);
+
 		let inReplyTo;
 		let inReplyToNote: MiNote | null;
 
@@ -503,6 +507,9 @@ export class ApRendererService {
 		if (author.mandatoryCW) {
 			summary = appendContentWarning(summary, author.mandatoryCW);
 		}
+		if (instance?.mandatoryCW) {
+			summary = appendContentWarning(summary, instance.mandatoryCW);
+		}
 
 		const { content } = this.apMfmService.getNoteHtml(note, apAppend);
 
diff --git a/packages/backend/src/core/entities/InstanceEntityService.ts b/packages/backend/src/core/entities/InstanceEntityService.ts
index f1149fe113..09dd54812c 100644
--- a/packages/backend/src/core/entities/InstanceEntityService.ts
+++ b/packages/backend/src/core/entities/InstanceEntityService.ts
@@ -68,6 +68,7 @@ export class InstanceEntityService {
 			rejectQuotes: instance.rejectQuotes,
 			moderationNote: iAmModerator ? instance.moderationNote : null,
 			isBubbled: this.utilityService.isBubbledHost(instance.host),
+			mandatoryCW: instance.mandatoryCW,
 		};
 	}
 
diff --git a/packages/backend/src/core/entities/UserEntityService.ts b/packages/backend/src/core/entities/UserEntityService.ts
index 227814454d..af25300944 100644
--- a/packages/backend/src/core/entities/UserEntityService.ts
+++ b/packages/backend/src/core/entities/UserEntityService.ts
@@ -578,6 +578,7 @@ export class UserEntityService implements OnModuleInit {
 				faviconUrl: instance.faviconUrl,
 				themeColor: instance.themeColor,
 				isSilenced: instance.isSilenced,
+				mandatoryCW: instance.mandatoryCW,
 			} : undefined) : undefined,
 			followersCount: followersCount ?? 0,
 			followingCount: followingCount ?? 0,
diff --git a/packages/backend/src/misc/get-note-summary.ts b/packages/backend/src/misc/get-note-summary.ts
index 6080f469b5..3a725e4f43 100644
--- a/packages/backend/src/misc/get-note-summary.ts
+++ b/packages/backend/src/misc/get-note-summary.ts
@@ -29,6 +29,9 @@ export const getNoteSummary = (note: Packed<'Note'>): string => {
 	if (note.user.mandatoryCW) {
 		cw = appendContentWarning(cw, note.user.mandatoryCW);
 	}
+	if (note.user.instance?.mandatoryCW) {
+		cw = appendContentWarning(cw, note.user.instance.mandatoryCW);
+	}
 
 	// 本文
 	if (cw != null) {
diff --git a/packages/backend/src/models/Instance.ts b/packages/backend/src/models/Instance.ts
index 0cde4b75fc..b445247176 100644
--- a/packages/backend/src/models/Instance.ts
+++ b/packages/backend/src/models/Instance.ts
@@ -228,4 +228,13 @@ export class MiInstance {
 		length: 16384, default: '',
 	})
 	public moderationNote: string;
+
+	/**
+	 * Specifies a Content Warning that should be forcibly applied to all notes from this instance
+	 * If null (default), then no Content Warning is applied.
+	 */
+	@Column('text', {
+		nullable: true,
+	})
+	public mandatoryCW: string | null;
 }
diff --git a/packages/backend/src/models/json-schema/federation-instance.ts b/packages/backend/src/models/json-schema/federation-instance.ts
index 0e9ce9334e..51452b4598 100644
--- a/packages/backend/src/models/json-schema/federation-instance.ts
+++ b/packages/backend/src/models/json-schema/federation-instance.ts
@@ -139,5 +139,9 @@ export const packedFederationInstanceSchema = {
 			type: 'boolean',
 			optional: false, nullable: false,
 		},
+		mandatoryCW: {
+			type: 'string',
+			optional: false, nullable: true,
+		},
 	},
 } as const;
diff --git a/packages/backend/src/models/json-schema/user.ts b/packages/backend/src/models/json-schema/user.ts
index 4a2d5780d1..0c9f9f540a 100644
--- a/packages/backend/src/models/json-schema/user.ts
+++ b/packages/backend/src/models/json-schema/user.ts
@@ -228,6 +228,10 @@ export const packedUserLiteSchema = {
 					type: 'boolean',
 					nullable: false, optional: false,
 				},
+				mandatoryCW: {
+					type: 'string',
+					nullable: true, optional: false,
+				},
 			},
 		},
 		followersCount: {
diff --git a/packages/backend/src/server/api/endpoint-list.ts b/packages/backend/src/server/api/endpoint-list.ts
index 392b45eab6..446f554bcc 100644
--- a/packages/backend/src/server/api/endpoint-list.ts
+++ b/packages/backend/src/server/api/endpoint-list.ts
@@ -34,6 +34,7 @@ export * as 'admin/avatar-decorations/list' from './endpoints/admin/avatar-decor
 export * as 'admin/avatar-decorations/update' from './endpoints/admin/avatar-decorations/update.js';
 export * as 'admin/captcha/current' from './endpoints/admin/captcha/current.js';
 export * as 'admin/captcha/save' from './endpoints/admin/captcha/save.js';
+export * as 'admin/cw-instance' from './endpoints/admin/cw-instance.js';
 export * as 'admin/cw-note' from './endpoints/admin/cw-note.js';
 export * as 'admin/cw-user' from './endpoints/admin/cw-user.js';
 export * as 'admin/decline-user' from './endpoints/admin/decline-user.js';
diff --git a/packages/backend/src/server/api/endpoints/admin/cw-instance.ts b/packages/backend/src/server/api/endpoints/admin/cw-instance.ts
new file mode 100644
index 0000000000..5fd9fd10b3
--- /dev/null
+++ b/packages/backend/src/server/api/endpoints/admin/cw-instance.ts
@@ -0,0 +1,54 @@
+/*
+ * SPDX-FileCopyrightText: hazelnoot and other Sharkey contributors
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { Injectable } from '@nestjs/common';
+import { Endpoint } from '@/server/api/endpoint-base.js';
+import { ModerationLogService } from '@/core/ModerationLogService.js';
+import { FederatedInstanceService } from '@/core/FederatedInstanceService.js';
+
+export const meta = {
+	tags: ['admin'],
+
+	requireCredential: true,
+	requireModerator: true,
+	kind: 'write:admin:cw-instance',
+} as const;
+
+export const paramDef = {
+	type: 'object',
+	properties: {
+		host: { type: 'string' },
+		cw: { type: 'string', nullable: true },
+	},
+	required: ['host', 'cw'],
+} as const;
+
+@Injectable()
+export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-disable-line import/no-default-export
+	constructor(
+		private readonly moderationLogService: ModerationLogService,
+		private readonly federatedInstanceService: FederatedInstanceService,
+	) {
+		super(meta, paramDef, async (ps, me) => {
+			const instance = await this.federatedInstanceService.fetchOrRegister(ps.host);
+
+			// Skip if there's nothing to do
+			if (instance.mandatoryCW === ps.cw) return;
+
+			// Log event first.
+			// This ensures that we don't "lose" the log if an error occurs
+			await this.moderationLogService.log(me, 'setMandatoryCWForInstance', {
+				newCW: ps.cw,
+				oldCW: instance.mandatoryCW,
+				host: ps.host,
+			});
+
+			await this.federatedInstanceService.update(instance.id, {
+				// Collapse empty strings to null
+				mandatoryCW: ps.cw || null,
+			});
+		});
+	}
+}
diff --git a/packages/backend/src/server/api/mastodon/MastodonConverters.ts b/packages/backend/src/server/api/mastodon/MastodonConverters.ts
index 2664a65b82..42a1836e5c 100644
--- a/packages/backend/src/server/api/mastodon/MastodonConverters.ts
+++ b/packages/backend/src/server/api/mastodon/MastodonConverters.ts
@@ -23,6 +23,7 @@ import { MastodonDataService } from '@/server/api/mastodon/MastodonDataService.j
 import { GetterService } from '@/server/api/GetterService.js';
 import { appendContentWarning } from '@/misc/append-content-warning.js';
 import { isRenote } from '@/misc/is-renote.js';
+import { FederatedInstanceService } from '@/core/FederatedInstanceService.js';
 
 // Missing from Megalodon apparently
 // https://docs.joinmastodon.org/entities/StatusEdit/
@@ -68,6 +69,7 @@ export class MastodonConverters {
 		private readonly idService: IdService,
 		private readonly driveFileEntityService: DriveFileEntityService,
 		private readonly mastodonDataService: MastodonDataService,
+		private readonly federatedInstanceService: FederatedInstanceService,
 	) {}
 
 	private encode(u: MiUser, m: IMentionedRemoteUsers): MastodonEntity.Mention {
@@ -210,6 +212,7 @@ export class MastodonConverters {
 		}
 
 		const noteUser = await this.getUser(note.userId);
+		const noteInstance = noteUser.instance ?? (noteUser.host ? await this.federatedInstanceService.fetch(noteUser.host) : null);
 		const account = await this.convertAccount(noteUser);
 		const edits = await this.noteEditRepository.find({ where: { noteId: note.id }, order: { id: 'ASC' } });
 		const history: StatusEdit[] = [];
@@ -231,6 +234,9 @@ export class MastodonConverters {
 			if (noteUser.mandatoryCW) {
 				cw = appendContentWarning(cw, noteUser.mandatoryCW);
 			}
+			if (noteInstance?.mandatoryCW) {
+				cw = appendContentWarning(cw, noteInstance.mandatoryCW);
+			}
 
 			const isQuote = renote && (edit.cw || edit.newText || edit.fileIds.length > 0 || note.replyId);
 			const quoteUri = isQuote
diff --git a/packages/backend/src/types.ts b/packages/backend/src/types.ts
index 0e1d36da55..cbc490156f 100644
--- a/packages/backend/src/types.ts
+++ b/packages/backend/src/types.ts
@@ -107,6 +107,7 @@ export const moderationLogTypes = [
 	'resetPassword',
 	'setMandatoryCW',
 	'setMandatoryCWForNote',
+	'setMandatoryCWForInstance',
 	'setRemoteInstanceNSFW',
 	'unsetRemoteInstanceNSFW',
 	'suspendRemoteInstance',
@@ -303,6 +304,11 @@ export type ModerationLogPayloads = {
 		noteUserUsername: string;
 		noteUserHost: string | null;
 	};
+	setMandatoryCWForInstance: {
+		newCW: string | null;
+		oldCW: string | null;
+		host: string;
+	};
 	setRemoteInstanceNSFW: {
 		id: string;
 		host: string;
diff --git a/packages/frontend-shared/js/compute-merged-cw.ts b/packages/frontend-shared/js/compute-merged-cw.ts
index 7d197accea..88dcce2c04 100644
--- a/packages/frontend-shared/js/compute-merged-cw.ts
+++ b/packages/frontend-shared/js/compute-merged-cw.ts
@@ -15,6 +15,9 @@ export function computeMergedCw(note: Misskey.entities.Note): string | null {
 	if (note.user.mandatoryCW) {
 		cw = appendContentWarning(cw, note.user.mandatoryCW);
 	}
+	if (note.user.instance?.mandatoryCW) {
+		cw = appendContentWarning(cw, note.user.instance.mandatoryCW);
+	}
 
 	return cw ?? null;
 }
diff --git a/packages/frontend/src/components/SkMutedNote.vue b/packages/frontend/src/components/SkMutedNote.vue
index ffb197323d..1e7c2fbe17 100644
--- a/packages/frontend/src/components/SkMutedNote.vue
+++ b/packages/frontend/src/components/SkMutedNote.vue
@@ -26,6 +26,14 @@ Displays a placeholder for a muted note.
 				{{ mute.userMandatoryCW }}
 			</template>
 		</I18n>
+		<I18n v-if="mute.instanceMandatoryCW" :src="i18n.ts.instanceIsFlaggedAs" tag="small">
+			<template #name>
+				{{ note.user.instance?.name ?? note.user.host }}
+			</template>
+			<template #cw>
+				{{ mute.instanceMandatoryCW }}
+			</template>
+		</I18n>
 
 		<!-- Muted notes/threads -->
 		<I18n v-if="mute.noteMuted" :src="i18n.ts.userSaysSomethingInMutedNote" tag="small">
@@ -89,7 +97,7 @@ const expandNote = ref(false);
 
 const mute = computed(() => checkMute(props.note, props.withHardMute));
 const mutedWords = computed(() => mute.value.softMutedWords?.join(', '));
-const isMuted = computed(() => mute.value.hardMuted || mutedWords.value || mute.value.noteMandatoryCW || mute.value.userMandatoryCW || mute.value.noteMuted || mute.value.threadMuted || mute.value.sensitiveMuted);
+const isMuted = computed(() => mute.value.hardMuted || mutedWords.value || mute.value.noteMandatoryCW || mute.value.userMandatoryCW || mute.value.instanceMandatoryCW || mute.value.noteMuted || mute.value.threadMuted || mute.value.sensitiveMuted);
 const isExpanded = computed(() => expandNote.value || !isMuted.value);
 const rootClass = computed(() => isExpanded.value ? props.expandedClass : undefined);
 
diff --git a/packages/frontend/src/pages/admin/modlog.ModLog.vue b/packages/frontend/src/pages/admin/modlog.ModLog.vue
index 59de4cf7e8..1e3706c90e 100644
--- a/packages/frontend/src/pages/admin/modlog.ModLog.vue
+++ b/packages/frontend/src/pages/admin/modlog.ModLog.vue
@@ -28,6 +28,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 					'resetPassword',
 					'setMandatoryCW',
 					'setMandatoryCWForNote',
+					'setMandatoryCWForInstance',
 					'suspendRemoteInstance',
 					'setRemoteInstanceNSFW',
 					'unsetRemoteInstanceNSFW',
@@ -81,6 +82,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 		<span v-else-if="log.type === 'resetPassword'">: @{{ log.info.userUsername }}{{ log.info.userHost ? '@' + log.info.userHost : '' }}</span>
 		<span v-else-if="log.type === 'setMandatoryCW'">: @{{ log.info.userUsername }}{{ log.info.userHost ? '@' + log.info.userHost : '' }}</span>
 		<span v-else-if="log.type === 'setMandatoryCWForNote'">: @{{ log.info.noteUserUsername }}{{ log.info.noteUserHost ? '@' + log.info.noteUserHost : '' }}</span>
+		<span v-else-if="log.type === 'setMandatoryCWForInstance'">: {{ log.info.host }}</span>
 		<span v-else-if="log.type === 'assignRole'">: @{{ log.info.userUsername }}{{ log.info.userHost ? '@' + log.info.userHost : '' }} <i class="ti ti-arrow-right"></i> {{ log.info.roleName }}</span>
 		<span v-else-if="log.type === 'unassignRole'">: @{{ log.info.userUsername }}{{ log.info.userHost ? '@' + log.info.userHost : '' }} <i class="ti ti-equal-not"></i> {{ log.info.roleName }}</span>
 		<span v-else-if="log.type === 'createRole'">: {{ log.info.role.name }}</span>
@@ -217,6 +219,11 @@ SPDX-License-Identifier: AGPL-3.0-only
 				<CodeDiff :context="0" :hideHeader="true" :oldString="log.info.oldCW ?? ''" :newString="log.info.newCW ?? ''" maxHeight="150px"/>
 			</div>
 		</template>
+		<template v-else-if="log.type === 'setMandatoryCWForInstance'">
+			<div :class="$style.diff">
+				<CodeDiff :context="0" :hideHeader="true" :oldString="log.info.oldCW ?? ''" :newString="log.info.newCW ?? ''" maxHeight="150px"/>
+			</div>
+		</template>
 		<template v-else-if="log.type === 'unsuspend'">
 			<div>{{ i18n.ts.user }}: <MkA :to="`/admin/user/${log.info.userId}`" class="_link">@{{ log.info.userUsername }}{{ log.info.userHost ? '@' + log.info.userHost : '' }}</MkA></div>
 		</template>
diff --git a/packages/frontend/src/pages/instance-info.vue b/packages/frontend/src/pages/instance-info.vue
index 3532d16c47..813b1a471f 100644
--- a/packages/frontend/src/pages/instance-info.vue
+++ b/packages/frontend/src/pages/instance-info.vue
@@ -123,6 +123,11 @@ SPDX-License-Identifier: AGPL-3.0-only
 						<MkInfo v-if="isBaseMediaSilenced" warn>{{ i18n.ts.mediaSilencedByBase }}</MkInfo>
 						<MkSwitch v-model="isMediaSilenced" :disabled="!meta || !instance || isBaseMediaSilenced" @update:modelValue="toggleMediaSilenced">{{ i18n.ts.mediaSilenceThisInstance }}</MkSwitch>
 
+						<MkInput v-model="mandatoryCW" type="text" manualSave @update:modelValue="onMandatoryCWChanged">
+							<template #label>{{ i18n.ts.mandatoryCW }}</template>
+							<template #caption>{{ i18n.ts.mandatoryCWDescription }}</template>
+						</MkInput>
+
 						<div :class="$style.buttonStrip">
 							<MkButton inline :disabled="!instance" @click="refreshMetadata"><i class="ph-cloud-arrow-down ph-bold ph-lg"></i> {{ i18n.ts.updateRemoteUser }}</MkButton>
 							<MkButton inline :disabled="!instance" danger @click="deleteAllFiles"><i class="ph-trash ph-bold ph-lg"></i> {{ i18n.ts.deleteAllFiles }}</MkButton>
@@ -234,6 +239,7 @@ import { copyToClipboard } from '@/utility/copy-to-clipboard';
 import MkFolder from '@/components/MkFolder.vue';
 import MkNumber from '@/components/MkNumber.vue';
 import SkBadgeStrip from '@/components/SkBadgeStrip.vue';
+import MkInput from '@/components/MkInput.vue';
 
 const props = withDefaults(defineProps<{
 	host: string;
@@ -259,6 +265,7 @@ const rejectReports = ref(false);
 const isMediaSilenced = ref(false);
 const faviconUrl = ref<string | null>(null);
 const moderationNote = ref('');
+const mandatoryCW = ref<string | null>(null);
 
 const baseDomains = computed(() => {
 	const domains: string[] = [];
@@ -306,6 +313,13 @@ const badges = computed(() => {
 				style: 'warning',
 			});
 		}
+		if (instance.value.mandatoryCW) {
+			arr.push({
+				key: 'cw',
+				label: i18n.ts.cw,
+				style: 'warning',
+			});
+		}
 		if (instance.value.isNSFW) {
 			arr.push({
 				key: 'nsfw',
@@ -365,6 +379,13 @@ async function saveModerationNote() {
 	}
 }
 
+async function onMandatoryCWChanged(value: string | number) {
+	await os.promiseDialog(async () => {
+		await misskeyApi('admin/cw-instance', { host: props.host, cw: String(value) || null });
+		await fetch();
+	});
+}
+
 async function fetch(withHint = false): Promise<void> {
 	const [m, i] = await Promise.all([
 		(withHint && props.metaHint)
@@ -389,6 +410,7 @@ async function fetch(withHint = false): Promise<void> {
 	isMediaSilenced.value = instance.value?.isMediaSilenced ?? false;
 	faviconUrl.value = getProxiedImageUrlNullable(instance.value?.faviconUrl, 'preview') ?? getProxiedImageUrlNullable(instance.value?.iconUrl, 'preview');
 	moderationNote.value = instance.value?.moderationNote ?? '';
+	mandatoryCW.value = instance.value?.mandatoryCW ?? '';
 }
 
 async function toggleBlock(): Promise<void> {
diff --git a/packages/frontend/src/utility/check-word-mute.ts b/packages/frontend/src/utility/check-word-mute.ts
index b0e4dda777..b829ecebe0 100644
--- a/packages/frontend/src/utility/check-word-mute.ts
+++ b/packages/frontend/src/utility/check-word-mute.ts
@@ -21,6 +21,7 @@ export interface Mute {
 	noteMandatoryCW?: string | null;
 	// TODO show this as a single block on user timelines
 	userMandatoryCW?: string | null;
+	instanceMandatoryCW?: string | null;
 }
 
 export function checkMute(note: Misskey.entities.Note, withHardMute?: boolean): Mute {
@@ -35,20 +36,21 @@ export function checkMute(note: Misskey.entities.Note, withHardMute?: boolean):
 	const noteMuted = note.isMutingNote;
 	const noteMandatoryCW = note.mandatoryCW;
 	const userMandatoryCW = note.user.mandatoryCW;
+	const instanceMandatoryCW = note.user.instance?.mandatoryCW;
 
 	// Hard mute
 	if (withHardMute && isHardMuted(note)) {
-		return { hardMuted: true, sensitiveMuted, threadMuted, noteMuted, noteMandatoryCW, userMandatoryCW };
+		return { hardMuted: true, sensitiveMuted, threadMuted, noteMuted, noteMandatoryCW, userMandatoryCW, instanceMandatoryCW };
 	}
 
 	// Soft mute
 	const softMutedWords = isSoftMuted(note);
 	if (softMutedWords.length > 0) {
-		return { softMutedWords, sensitiveMuted, threadMuted, noteMuted, noteMandatoryCW, userMandatoryCW };
+		return { softMutedWords, sensitiveMuted, threadMuted, noteMuted, noteMandatoryCW, userMandatoryCW, instanceMandatoryCW };
 	}
 
 	// Other / no mute
-	return { sensitiveMuted, threadMuted, noteMuted, noteMandatoryCW, userMandatoryCW };
+	return { sensitiveMuted, threadMuted, noteMuted, noteMandatoryCW, userMandatoryCW, instanceMandatoryCW };
 }
 
 function isHardMuted(note: Misskey.entities.Note): boolean {
diff --git a/packages/misskey-js/etc/misskey-js.api.md b/packages/misskey-js/etc/misskey-js.api.md
index 86b59bdc8b..3575786e88 100644
--- a/packages/misskey-js/etc/misskey-js.api.md
+++ b/packages/misskey-js/etc/misskey-js.api.md
@@ -152,6 +152,9 @@ type AdminCaptchaCurrentResponse = operations['admin___captcha___current']['resp
 // @public (undocumented)
 type AdminCaptchaSaveRequest = operations['admin___captcha___save']['requestBody']['content']['application/json'];
 
+// @public (undocumented)
+type AdminCwInstanceRequest = operations['admin___cw-instance']['requestBody']['content']['application/json'];
+
 // @public (undocumented)
 type AdminCwNoteRequest = operations['admin___cw-note']['requestBody']['content']['application/json'];
 
@@ -1545,6 +1548,7 @@ declare namespace entities {
         AdminAvatarDecorationsUpdateRequest,
         AdminCaptchaCurrentResponse,
         AdminCaptchaSaveRequest,
+        AdminCwInstanceRequest,
         AdminCwNoteRequest,
         AdminCwUserRequest,
         AdminDeclineUserRequest,
@@ -2954,6 +2958,12 @@ type ModerationLog = {
 } | {
     type: 'setMandatoryCW';
     info: ModerationLogPayloads['setMandatoryCW'];
+} | {
+    type: 'setMandatoryCWForNote';
+    info: ModerationLogPayloads['setMandatoryCWForNote'];
+} | {
+    type: 'setMandatoryCWForInstance';
+    info: ModerationLogPayloads['setMandatoryCWForInstance'];
 } | {
     type: 'setRemoteInstanceNSFW';
     info: ModerationLogPayloads['setRemoteInstanceNSFW'];
@@ -3101,7 +3111,7 @@ type ModerationLog = {
 });
 
 // @public (undocumented)
-export const moderationLogTypes: readonly ["updateServerSettings", "suspend", "approve", "decline", "unsuspend", "updateUserNote", "addCustomEmoji", "updateCustomEmoji", "deleteCustomEmoji", "assignRole", "unassignRole", "createRole", "updateRole", "deleteRole", "clearQueue", "promoteQueue", "deleteDriveFile", "deleteNote", "createGlobalAnnouncement", "createUserAnnouncement", "updateGlobalAnnouncement", "updateUserAnnouncement", "deleteGlobalAnnouncement", "deleteUserAnnouncement", "resetPassword", "setMandatoryCW", "setMandatoryCWForNote", "setRemoteInstanceNSFW", "unsetRemoteInstanceNSFW", "suspendRemoteInstance", "unsuspendRemoteInstance", "rejectRemoteInstanceReports", "acceptRemoteInstanceReports", "updateRemoteInstanceNote", "markSensitiveDriveFile", "unmarkSensitiveDriveFile", "resolveAbuseReport", "forwardAbuseReport", "updateAbuseReportNote", "createInvitation", "createAd", "updateAd", "deleteAd", "createAvatarDecoration", "updateAvatarDecoration", "deleteAvatarDecoration", "unsetUserAvatar", "unsetUserBanner", "createSystemWebhook", "updateSystemWebhook", "deleteSystemWebhook", "createAbuseReportNotificationRecipient", "updateAbuseReportNotificationRecipient", "deleteAbuseReportNotificationRecipient", "deleteAccount", "deletePage", "deleteFlash", "deleteGalleryPost", "deleteChatRoom"];
+export const moderationLogTypes: readonly ["updateServerSettings", "suspend", "approve", "decline", "unsuspend", "updateUserNote", "addCustomEmoji", "updateCustomEmoji", "deleteCustomEmoji", "assignRole", "unassignRole", "createRole", "updateRole", "deleteRole", "clearQueue", "promoteQueue", "deleteDriveFile", "deleteNote", "createGlobalAnnouncement", "createUserAnnouncement", "updateGlobalAnnouncement", "updateUserAnnouncement", "deleteGlobalAnnouncement", "deleteUserAnnouncement", "resetPassword", "setMandatoryCW", "setMandatoryCWForNote", "setMandatoryCWForInstance", "setRemoteInstanceNSFW", "unsetRemoteInstanceNSFW", "suspendRemoteInstance", "unsuspendRemoteInstance", "rejectRemoteInstanceReports", "acceptRemoteInstanceReports", "updateRemoteInstanceNote", "markSensitiveDriveFile", "unmarkSensitiveDriveFile", "resolveAbuseReport", "forwardAbuseReport", "updateAbuseReportNote", "createInvitation", "createAd", "updateAd", "deleteAd", "createAvatarDecoration", "updateAvatarDecoration", "deleteAvatarDecoration", "unsetUserAvatar", "unsetUserBanner", "createSystemWebhook", "updateSystemWebhook", "deleteSystemWebhook", "createAbuseReportNotificationRecipient", "updateAbuseReportNotificationRecipient", "deleteAbuseReportNotificationRecipient", "deleteAccount", "deletePage", "deleteFlash", "deleteGalleryPost", "deleteChatRoom"];
 
 // @public (undocumented)
 type MuteCreateRequest = operations['mute___create']['requestBody']['content']['application/json'];
@@ -3411,7 +3421,7 @@ type PartialRolePolicyOverride = Partial<{
 }>;
 
 // @public (undocumented)
-export const permissions: readonly ["read:account", "write:account", "read:blocks", "write:blocks", "read:drive", "write:drive", "read:favorites", "write:favorites", "read:following", "write:following", "read:messaging", "write:messaging", "read:mutes", "write:mutes", "write:notes", "read:notes-schedule", "write:notes-schedule", "read:notifications", "write:notifications", "read:reactions", "write:reactions", "write:votes", "read:pages", "write:pages", "write:page-likes", "read:page-likes", "read:user-groups", "write:user-groups", "read:channels", "write:channels", "read:gallery", "write:gallery", "read:gallery-likes", "write:gallery-likes", "read:flash", "write:flash", "read:flash-likes", "write:flash-likes", "read:admin:abuse-user-reports", "write:admin:delete-account", "write:admin:delete-all-files-of-a-user", "read:admin:index-stats", "read:admin:table-stats", "read:admin:user-ips", "read:admin:meta", "write:admin:reset-password", "write:admin:resolve-abuse-user-report", "write:admin:send-email", "read:admin:server-info", "read:admin:show-moderation-log", "read:admin:show-user", "write:admin:suspend-user", "write:admin:approve-user", "write:admin:decline-user", "write:admin:nsfw-user", "write:admin:unnsfw-user", "write:admin:cw-user", "write:admin:cw-note", "write:admin:silence-user", "write:admin:unsilence-user", "write:admin:unset-user-avatar", "write:admin:unset-user-banner", "write:admin:unsuspend-user", "write:admin:reject-quotes", "write:admin:meta", "write:admin:user-note", "write:admin:roles", "read:admin:roles", "write:admin:relays", "read:admin:relays", "write:admin:invite-codes", "read:admin:invite-codes", "write:admin:announcements", "read:admin:announcements", "write:admin:avatar-decorations", "read:admin:avatar-decorations", "write:admin:federation", "write:admin:account", "read:admin:account", "write:admin:emoji", "read:admin:emoji", "write:admin:queue", "read:admin:queue", "write:admin:promo", "write:admin:drive", "read:admin:drive", "write:admin:ad", "read:admin:ad", "write:invite-codes", "read:invite-codes", "write:clip-favorite", "read:clip-favorite", "read:federation", "write:report-abuse", "write:chat", "read:chat"];
+export const permissions: readonly ["read:account", "write:account", "read:blocks", "write:blocks", "read:drive", "write:drive", "read:favorites", "write:favorites", "read:following", "write:following", "read:messaging", "write:messaging", "read:mutes", "write:mutes", "write:notes", "read:notes-schedule", "write:notes-schedule", "read:notifications", "write:notifications", "read:reactions", "write:reactions", "write:votes", "read:pages", "write:pages", "write:page-likes", "read:page-likes", "read:user-groups", "write:user-groups", "read:channels", "write:channels", "read:gallery", "write:gallery", "read:gallery-likes", "write:gallery-likes", "read:flash", "write:flash", "read:flash-likes", "write:flash-likes", "read:admin:abuse-user-reports", "write:admin:delete-account", "write:admin:delete-all-files-of-a-user", "read:admin:index-stats", "read:admin:table-stats", "read:admin:user-ips", "read:admin:meta", "write:admin:reset-password", "write:admin:resolve-abuse-user-report", "write:admin:send-email", "read:admin:server-info", "read:admin:show-moderation-log", "read:admin:show-user", "write:admin:suspend-user", "write:admin:approve-user", "write:admin:decline-user", "write:admin:nsfw-user", "write:admin:unnsfw-user", "write:admin:cw-user", "write:admin:cw-note", "write:admin:cw-instance", "write:admin:silence-user", "write:admin:unsilence-user", "write:admin:unset-user-avatar", "write:admin:unset-user-banner", "write:admin:unsuspend-user", "write:admin:reject-quotes", "write:admin:meta", "write:admin:user-note", "write:admin:roles", "read:admin:roles", "write:admin:relays", "read:admin:relays", "write:admin:invite-codes", "read:admin:invite-codes", "write:admin:announcements", "read:admin:announcements", "write:admin:avatar-decorations", "read:admin:avatar-decorations", "write:admin:federation", "write:admin:account", "read:admin:account", "write:admin:emoji", "read:admin:emoji", "write:admin:queue", "read:admin:queue", "write:admin:promo", "write:admin:drive", "read:admin:drive", "write:admin:ad", "read:admin:ad", "write:invite-codes", "read:invite-codes", "write:clip-favorite", "read:clip-favorite", "read:federation", "write:report-abuse", "write:chat", "read:chat"];
 
 // @public (undocumented)
 type PingResponse = operations['ping']['responses']['200']['content']['application/json'];
diff --git a/packages/misskey-js/src/autogen/apiClientJSDoc.ts b/packages/misskey-js/src/autogen/apiClientJSDoc.ts
index 9246d4ae4f..0e061c8e06 100644
--- a/packages/misskey-js/src/autogen/apiClientJSDoc.ts
+++ b/packages/misskey-js/src/autogen/apiClientJSDoc.ts
@@ -272,6 +272,17 @@ declare module '../api.js' {
       credential?: string | null,
     ): Promise<SwitchCaseResponseType<E, P>>;
 
+    /**
+     * No description provided.
+     * 
+     * **Credential required**: *Yes* / **Permission**: *write:admin:cw-instance*
+     */
+    request<E extends 'admin/cw-instance', P extends Endpoints[E]['req']>(
+      endpoint: E,
+      params: P,
+      credential?: string | null,
+    ): Promise<SwitchCaseResponseType<E, P>>;
+
     /**
      * No description provided.
      * 
diff --git a/packages/misskey-js/src/autogen/endpoint.ts b/packages/misskey-js/src/autogen/endpoint.ts
index 428b9e7a46..bf7d179c50 100644
--- a/packages/misskey-js/src/autogen/endpoint.ts
+++ b/packages/misskey-js/src/autogen/endpoint.ts
@@ -38,6 +38,7 @@ import type {
 	AdminAvatarDecorationsUpdateRequest,
 	AdminCaptchaCurrentResponse,
 	AdminCaptchaSaveRequest,
+	AdminCwInstanceRequest,
 	AdminCwNoteRequest,
 	AdminCwUserRequest,
 	AdminDeclineUserRequest,
@@ -690,6 +691,7 @@ export type Endpoints = {
 	'admin/avatar-decorations/update': { req: AdminAvatarDecorationsUpdateRequest; res: EmptyResponse };
 	'admin/captcha/current': { req: EmptyRequest; res: AdminCaptchaCurrentResponse };
 	'admin/captcha/save': { req: AdminCaptchaSaveRequest; res: EmptyResponse };
+	'admin/cw-instance': { req: AdminCwInstanceRequest; res: EmptyResponse };
 	'admin/cw-note': { req: AdminCwNoteRequest; res: EmptyResponse };
 	'admin/cw-user': { req: AdminCwUserRequest; res: EmptyResponse };
 	'admin/decline-user': { req: AdminDeclineUserRequest; res: EmptyResponse };
diff --git a/packages/misskey-js/src/autogen/entities.ts b/packages/misskey-js/src/autogen/entities.ts
index f0e16175e4..4d2a669cf3 100644
--- a/packages/misskey-js/src/autogen/entities.ts
+++ b/packages/misskey-js/src/autogen/entities.ts
@@ -41,6 +41,7 @@ export type AdminAvatarDecorationsListResponse = operations['admin___avatar-deco
 export type AdminAvatarDecorationsUpdateRequest = operations['admin___avatar-decorations___update']['requestBody']['content']['application/json'];
 export type AdminCaptchaCurrentResponse = operations['admin___captcha___current']['responses']['200']['content']['application/json'];
 export type AdminCaptchaSaveRequest = operations['admin___captcha___save']['requestBody']['content']['application/json'];
+export type AdminCwInstanceRequest = operations['admin___cw-instance']['requestBody']['content']['application/json'];
 export type AdminCwNoteRequest = operations['admin___cw-note']['requestBody']['content']['application/json'];
 export type AdminCwUserRequest = operations['admin___cw-user']['requestBody']['content']['application/json'];
 export type AdminDeclineUserRequest = operations['admin___decline-user']['requestBody']['content']['application/json'];
diff --git a/packages/misskey-js/src/autogen/types.ts b/packages/misskey-js/src/autogen/types.ts
index ab0ac51004..f41bca6fb3 100644
--- a/packages/misskey-js/src/autogen/types.ts
+++ b/packages/misskey-js/src/autogen/types.ts
@@ -233,6 +233,15 @@ export type paths = {
      */
     post: operations['admin___captcha___save'];
   };
+  '/admin/cw-instance': {
+    /**
+     * admin/cw-instance
+     * @description No description provided.
+     *
+     * **Credential required**: *Yes* / **Permission**: *write:admin:cw-instance*
+     */
+    post: operations['admin___cw-instance'];
+  };
   '/admin/cw-note': {
     /**
      * admin/cw-note
@@ -4309,6 +4318,7 @@ export type components = {
         faviconUrl: string | null;
         themeColor: string | null;
         isSilenced: boolean;
+        mandatoryCW: string | null;
       };
       followersCount: number;
       followingCount: number;
@@ -5341,6 +5351,7 @@ export type components = {
       rejectQuotes: boolean;
       moderationNote?: string | null;
       isBubbled: boolean;
+      mandatoryCW: string | null;
     };
     GalleryPost: {
       /**
@@ -7399,6 +7410,58 @@ export type operations = {
       };
     };
   };
+  /**
+   * admin/cw-instance
+   * @description No description provided.
+   *
+   * **Credential required**: *Yes* / **Permission**: *write:admin:cw-instance*
+   */
+  'admin___cw-instance': {
+    requestBody: {
+      content: {
+        'application/json': {
+          host: string;
+          cw: string | null;
+        };
+      };
+    };
+    responses: {
+      /** @description OK (without any results) */
+      204: {
+        content: never;
+      };
+      /** @description Client error */
+      400: {
+        content: {
+          'application/json': components['schemas']['Error'];
+        };
+      };
+      /** @description Authentication error */
+      401: {
+        content: {
+          'application/json': components['schemas']['Error'];
+        };
+      };
+      /** @description Forbidden error */
+      403: {
+        content: {
+          'application/json': components['schemas']['Error'];
+        };
+      };
+      /** @description I'm Ai */
+      418: {
+        content: {
+          'application/json': components['schemas']['Error'];
+        };
+      };
+      /** @description Internal server error */
+      500: {
+        content: {
+          'application/json': components['schemas']['Error'];
+        };
+      };
+    };
+  };
   /**
    * admin/cw-note
    * @description No description provided.
diff --git a/packages/misskey-js/src/consts.ts b/packages/misskey-js/src/consts.ts
index f183d5352a..25e02a9f1c 100644
--- a/packages/misskey-js/src/consts.ts
+++ b/packages/misskey-js/src/consts.ts
@@ -82,6 +82,7 @@ export const permissions = [
 	'write:admin:unnsfw-user',
 	'write:admin:cw-user',
 	'write:admin:cw-note',
+	'write:admin:cw-instance',
 	'write:admin:silence-user',
 	'write:admin:unsilence-user',
 	'write:admin:unset-user-avatar',
@@ -150,6 +151,7 @@ export const moderationLogTypes = [
 	'resetPassword',
 	'setMandatoryCW',
 	'setMandatoryCWForNote',
+	'setMandatoryCWForInstance',
 	'setRemoteInstanceNSFW',
 	'unsetRemoteInstanceNSFW',
 	'suspendRemoteInstance',
@@ -353,6 +355,11 @@ export type ModerationLogPayloads = {
 		noteUserUsername: string;
 		noteUserHost: string | null;
 	};
+	setMandatoryCWForInstance: {
+		newCW: string | null;
+		oldCW: string | null;
+		host: string;
+	};
 	setRemoteInstanceNSFW: {
 		id: string;
 		host: string;
diff --git a/packages/misskey-js/src/entities.ts b/packages/misskey-js/src/entities.ts
index 697ff3f9e7..b42d52115c 100644
--- a/packages/misskey-js/src/entities.ts
+++ b/packages/misskey-js/src/entities.ts
@@ -136,6 +136,9 @@ export type ModerationLog = {
 } | {
 	type: 'setMandatoryCWForNote';
 	info: ModerationLogPayloads['setMandatoryCWForNote'];
+} | {
+	type: 'setMandatoryCWForInstance';
+	info: ModerationLogPayloads['setMandatoryCWForInstance'];
 } | {
 	type: 'setRemoteInstanceNSFW';
 	info: ModerationLogPayloads['setRemoteInstanceNSFW'];
diff --git a/sharkey-locales/en-US.yml b/sharkey-locales/en-US.yml
index 891f2ca154..96a3d58fe0 100644
--- a/sharkey-locales/en-US.yml
+++ b/sharkey-locales/en-US.yml
@@ -37,6 +37,7 @@ userSaysSomethingInMutedNote: "{name} said something in a muted post"
 userSaysSomethingInMutedThread: "{name} said something in a muted thread"
 userIsFlaggedAs: "{name} is flagged: \"{cw}\""
 noteIsFlaggedAs: "Note is flagged: \"{cw}\""
+instanceIsFlaggedAs: "{name} is flagged: \"{cw}\""
 markAsNSFW: "Mark all media from user as NSFW"
 markInstanceAsNSFW: "Mark as NSFW"
 nsfwConfirm: "Are you sure that you want to mark all media from this account as NSFW?"
@@ -346,6 +347,7 @@ _moderationLogTypes:
   decline: "Declined"
   setMandatoryCW: "Set content warning for user"
   setMandatoryCWForNote: "Set content warning for note"
+  setMandatoryCWForInstance: "Set content warning for instance"
   setRemoteInstanceNSFW: "Set remote instance as NSFW"
   unsetRemoteInstanceNSFW: "Unset remote instance as NSFW"
   rejectRemoteInstanceReports: "Rejected reports from remote instance"
@@ -507,6 +509,7 @@ _permissions:
   "write:admin:unnsfw-user": "Mark users as not NSFW"
   "write:admin:cw-user": "Apply mandatory CW on users"
   "write:admin:cw-note": "Apply mandatory CW on notes"
+  "write:admin:cw-instance": "Apply mandatory CW on instances"
   "write:admin:silence-user": "Silence users"
   "write:admin:unsilence-user": "Un-silence users"
   "write:admin:reject-quotes": "Allow/Prohibit quote posts from a user"
@@ -548,6 +551,8 @@ mandatoryCW: "Force content warning"
 mandatoryCWDescription: "Applies a content warning to all posts created by this user. The forced warnings will appear like a word mute to distinguish them from the author's own content warnings."
 mandatoryCWForNote: "Force content warning"
 mandatoryCWForNoteDescription: "Applies an additional content warning to this post. The new warning will appear like a word mute to distinguish it from the author's own content warning."
+mandatoryCWForInstance: "Force content warning"
+mandatoryCWForInstanceDescription: "Applies a content warning to all posts originating from this instance. The forced warnings will appear like a word mute to distinguish them from the notes' own content warnings."
 fetchLinkedNote: "Fetch linked note"
 showTranslationButtonInNoteFooter: "Add \"Translate\" to note action menu"
 translationFailed: "Failed to translate note. Please try again later or contact an administrator for assistance."

From 812a82d41eb05f67d322c442769a98e67e115648 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Sat, 28 Jun 2025 07:58:21 -0400
Subject: [PATCH 009/110] emit event when expanding a muted note

---
 packages/frontend/src/components/SkMutedNote.vue | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/packages/frontend/src/components/SkMutedNote.vue b/packages/frontend/src/components/SkMutedNote.vue
index 1e7c2fbe17..6b27ac42ba 100644
--- a/packages/frontend/src/components/SkMutedNote.vue
+++ b/packages/frontend/src/components/SkMutedNote.vue
@@ -11,7 +11,7 @@ Displays a placeholder for a muted note.
 	<slot v-if="isExpanded"></slot>
 
 	<!-- If hard muted, we want to hide *everything*, including the placeholders and controls to expand. -->
-	<div v-else-if="!mute.hardMuted" :class="[$style.muted, $style.muteContainer, mutedClass]" @click.stop="expandNote = true">
+	<div v-else-if="!mute.hardMuted" :class="[$style.muted, $style.muteContainer, mutedClass]" @click.stop="expand">
 		<!-- Mandatory CWs -->
 		<I18n v-if="mute.noteMandatoryCW" :src="i18n.ts.noteIsFlaggedAs" tag="small">
 			<template #cw>
@@ -80,7 +80,7 @@ import { computed, ref, useTemplateRef, defineExpose } from 'vue';
 import type { Ref } from 'vue';
 import { i18n } from '@/i18n.js';
 import { prefer } from '@/preferences.js';
-import { checkMute } from '@/utility/check-word-mute';
+import { checkMute } from '@/utility/check-word-mute.js';
 
 const props = withDefaults(defineProps<{
 	note: Misskey.entities.Note;
@@ -93,8 +93,17 @@ const props = withDefaults(defineProps<{
 	expandedClass: undefined,
 });
 
+const emit = defineEmits<{
+	(type: 'expand', note: Misskey.entities.Note): void;
+}>();
+
 const expandNote = ref(false);
 
+function expand() {
+	expandNote.value = true;
+	emit('expand', props.note);
+}
+
 const mute = computed(() => checkMute(props.note, props.withHardMute));
 const mutedWords = computed(() => mute.value.softMutedWords?.join(', '));
 const isMuted = computed(() => mute.value.hardMuted || mutedWords.value || mute.value.noteMandatoryCW || mute.value.userMandatoryCW || mute.value.instanceMandatoryCW || mute.value.noteMuted || mute.value.threadMuted || mute.value.sensitiveMuted);

From ca9410e4fec5b016260b1dbfc6022936061a6b22 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Sat, 28 Jun 2025 07:58:57 -0400
Subject: [PATCH 010/110] allow mutes to be overridden by DI

---
 .../frontend/src/utility/check-word-mute.ts   | 40 +++++++++++++++++--
 1 file changed, 37 insertions(+), 3 deletions(-)

diff --git a/packages/frontend/src/utility/check-word-mute.ts b/packages/frontend/src/utility/check-word-mute.ts
index b829ecebe0..fb61ad74ad 100644
--- a/packages/frontend/src/utility/check-word-mute.ts
+++ b/packages/frontend/src/utility/check-word-mute.ts
@@ -4,9 +4,9 @@
  */
 
 import * as Misskey from 'misskey-js';
-import { inject } from 'vue';
-import type { Ref } from 'vue';
-import { $i } from '@/i';
+import { provide, inject, reactive } from 'vue';
+import type { Ref, Reactive } from 'vue';
+import { $i } from '@/i.js';
 
 export interface Mute {
 	hardMuted?: boolean;
@@ -24,7 +24,41 @@ export interface Mute {
 	instanceMandatoryCW?: string | null;
 }
 
+export const muteOverridesSymbol = Symbol('muteOverrides');
+
+export function injectMuteOverrides(): Reactive<Partial<Mute>> | null {
+	return inject(muteOverridesSymbol, null);
+}
+
+export function provideMuteOverrides(overrides: Reactive<Partial<Mute>> | null) {
+	provide(muteOverridesSymbol, overrides);
+}
+
+export function patchMuteOverrides(patch?: Partial<Mute>): Reactive<Partial<Mute>> {
+	// Inject and re-provide to merge with any overrides injected from above
+	const overrides = injectMuteOverrides() ?? reactive({});
+	provideMuteOverrides(overrides);
+
+	// Assign caller's changes, if any
+	if (patch) {
+		Object.assign(overrides, patch);
+	}
+
+	return overrides;
+}
+
 export function checkMute(note: Misskey.entities.Note, withHardMute?: boolean): Mute {
+	const mutes = getMutes(note, withHardMute);
+
+	const override = injectMuteOverrides();
+	if (override) {
+		Object.assign(mutes, override);
+	}
+
+	return mutes;
+}
+
+function getMutes(note: Misskey.entities.Note, withHardMute?: boolean): Mute {
 	const sensitiveMuted = isSensitiveMuted(note);
 
 	// My own note

From 40695c7925d30b5dda40a848b75e87240e854e8f Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Sat, 28 Jun 2025 07:59:54 -0400
Subject: [PATCH 011/110] expand all user/instance mutes when viewing a user's
 profile

---
 packages/frontend/src/components/DynamicNote.vue |  9 +++++----
 packages/frontend/src/components/MkNote.vue      |  2 ++
 packages/frontend/src/components/SkNote.vue      |  2 ++
 packages/frontend/src/pages/user/home.vue        | 13 +++++++++++--
 packages/frontend/src/utility/check-word-mute.ts |  1 -
 5 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/packages/frontend/src/components/DynamicNote.vue b/packages/frontend/src/components/DynamicNote.vue
index 6b3e36c9e5..115aeecfb3 100644
--- a/packages/frontend/src/components/DynamicNote.vue
+++ b/packages/frontend/src/components/DynamicNote.vue
@@ -14,12 +14,13 @@ Displays a note with either Misskey or Sharkey style, based on user preference.
 	:withHardMute="withHardMute"
 	@reaction="emoji => emit('reaction', emoji)"
 	@removeReaction="emoji => emit('removeReaction', emoji)"
+	@expandCW="n => emit('expandCW', n)"
 />
 </template>
 
 <script setup lang="ts">
 import * as Misskey from 'misskey-js';
-import { computed, defineAsyncComponent, useTemplateRef } from 'vue';
+import { defineAsyncComponent, useTemplateRef } from 'vue';
 import type { ComponentExposed } from 'vue-component-type-helpers';
 import type MkNote from '@/components/MkNote.vue';
 import type SkNote from '@/components/SkNote.vue';
@@ -27,9 +28,8 @@ import { prefer } from '@/preferences';
 
 const XNote = defineAsyncComponent(() =>
 	prefer.s.noteDesign === 'misskey'
-	? import('@/components/MkNote.vue')
-	: import('@/components/SkNote.vue')
-);
+		? import('@/components/MkNote.vue')
+		: import('@/components/SkNote.vue'));
 
 const rootEl = useTemplateRef<ComponentExposed<typeof MkNote | typeof SkNote>>('rootEl');
 
@@ -45,5 +45,6 @@ defineProps<{
 const emit = defineEmits<{
 	(ev: 'reaction', emoji: string): void;
 	(ev: 'removeReaction', emoji: string): void;
+	(ev: 'expandCW', note: Misskey.entities.Note): void;
 }>();
 </script>
diff --git a/packages/frontend/src/components/MkNote.vue b/packages/frontend/src/components/MkNote.vue
index fd752eb3f8..9feed0acc6 100644
--- a/packages/frontend/src/components/MkNote.vue
+++ b/packages/frontend/src/components/MkNote.vue
@@ -12,6 +12,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 	:withHardMute="withHardMute"
 	:class="[$style.root, { [$style.showActionsOnlyHover]: prefer.s.showNoteActionsOnlyHover, [$style.skipRender]: prefer.s.skipNoteRender }]"
 	:tabindex="isDeleted ? '-1' : '0'"
+	@expand="n => emit('expandCW', n)"
 >
 	<div v-if="appearNote.reply && inReplyToCollapsed" :class="$style.collapsedInReplyTo">
 		<MkAvatar :class="$style.collapsedInReplyToAvatar" :user="appearNote.reply.user" link preview/>
@@ -244,6 +245,7 @@ provide(DI.mock, props.mock);
 const emit = defineEmits<{
 	(ev: 'reaction', emoji: string): void;
 	(ev: 'removeReaction', emoji: string): void;
+	(ev: 'expandCW', note: Misskey.entities.Note): void;
 }>();
 
 const router = useRouter();
diff --git a/packages/frontend/src/components/SkNote.vue b/packages/frontend/src/components/SkNote.vue
index 8cfdcec62b..d2b31e3df7 100644
--- a/packages/frontend/src/components/SkNote.vue
+++ b/packages/frontend/src/components/SkNote.vue
@@ -14,6 +14,7 @@ Displays a note in the Sharkey style. Used to show the "main" note in a given co
 	:withHardMute="withHardMute"
 	:class="[$style.root, { [$style.showActionsOnlyHover]: prefer.s.showNoteActionsOnlyHover, [$style.skipRender]: prefer.s.skipNoteRender }]"
 	:tabindex="isDeleted ? '-1' : '0'"
+	@expand="n => emit('expandCW', n)"
 >
 	<SkNoteSub v-if="appearNote.reply" v-show="!renoteCollapsed && !inReplyToCollapsed" :note="appearNote.reply" :class="$style.replyTo"/>
 	<div v-if="appearNote.reply && inReplyToCollapsed && !renoteCollapsed" :class="$style.collapsedInReplyTo">
@@ -245,6 +246,7 @@ provide(DI.mock, props.mock);
 const emit = defineEmits<{
 	(ev: 'reaction', emoji: string): void;
 	(ev: 'removeReaction', emoji: string): void;
+	(ev: 'expandCW', note: Misskey.entities.Note): void;
 }>();
 
 const router = useRouter();
diff --git a/packages/frontend/src/pages/user/home.vue b/packages/frontend/src/pages/user/home.vue
index 156eab004f..0df9b425ed 100644
--- a/packages/frontend/src/pages/user/home.vue
+++ b/packages/frontend/src/pages/user/home.vue
@@ -176,10 +176,10 @@ SPDX-License-Identifier: AGPL-3.0-only
 								<MkResult type="empty" :text="i18n.ts.noNotes"/>
 							</div>
 							<div v-else class="_panel">
-								<DynamicNote v-for="note of user.pinnedNotes" :key="note.id" class="note" :class="$style.pinnedNote" :note="note" :pinned="true"/>
+								<DynamicNote v-for="note of user.pinnedNotes" :key="note.id" class="note" :class="$style.pinnedNote" :note="note" :pinned="true" @expandCW="onExpandCW"/>
 							</div>
 						</div>
-						<MkNotes v-else :class="$style.tl" :noGap="true" :pagination="AllPagination"/>
+						<MkNotes v-else :class="$style.tl" :noGap="true" :pagination="AllPagination" @expandCW="onExpandCW"/>
 					</MkLazy>
 				</MkStickyContainer>
 			</div>
@@ -198,6 +198,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 import { defineAsyncComponent, computed, onMounted, onUnmounted, nextTick, watch, ref } from 'vue';
 import * as Misskey from 'misskey-js';
 import { getScrollPosition } from '@@/js/scroll.js';
+import { patchMuteOverrides } from '@/utility/check-word-mute.js';
 import MkTab from '@/components/MkTab.vue';
 import MkNotes from '@/components/MkNotes.vue';
 import MkFollowButton from '@/components/MkFollowButton.vue';
@@ -255,6 +256,14 @@ const emit = defineEmits<{
 	(ev: 'unfoldFiles'): void;
 }>();
 
+const cwOverrides = patchMuteOverrides();
+
+function onExpandCW() {
+	// This kills the user-level and instance-level CWs for all notes below this point
+	cwOverrides.userMandatoryCW = null;
+	cwOverrides.instanceMandatoryCW = null;
+}
+
 const router = useRouter();
 
 const user = ref(props.user);
diff --git a/packages/frontend/src/utility/check-word-mute.ts b/packages/frontend/src/utility/check-word-mute.ts
index fb61ad74ad..6b054852f5 100644
--- a/packages/frontend/src/utility/check-word-mute.ts
+++ b/packages/frontend/src/utility/check-word-mute.ts
@@ -19,7 +19,6 @@ export interface Mute {
 	noteMuted?: boolean;
 
 	noteMandatoryCW?: string | null;
-	// TODO show this as a single block on user timelines
 	userMandatoryCW?: string | null;
 	instanceMandatoryCW?: string | null;
 }

From 4847257011b49ab37ede121d5fa843aba9b74c8c Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Sat, 28 Jun 2025 18:38:43 -0400
Subject: [PATCH 012/110] fix bulk expand mute

---
 .../frontend/src/components/DynamicNote.vue   |   4 +-
 .../src/components/DynamicNoteDetailed.vue    |  41 +++++-
 packages/frontend/src/components/MkNote.vue   |   4 +-
 .../src/components/MkNoteDetailed.vue         |   5 +
 packages/frontend/src/components/MkNotes.vue  |   6 +-
 .../frontend/src/components/SkMutedNote.vue   |   9 +-
 packages/frontend/src/components/SkNote.vue   |   4 +-
 .../src/components/SkNoteDetailed.vue         |   5 +
 packages/frontend/src/pages/user/home.vue     |  25 ++--
 .../frontend/src/utility/check-word-mute.ts   | 135 +++++++++++-------
 packages/frontend/src/utility/merge.ts        |  36 +++++
 11 files changed, 201 insertions(+), 73 deletions(-)

diff --git a/packages/frontend/src/components/DynamicNote.vue b/packages/frontend/src/components/DynamicNote.vue
index 115aeecfb3..5d01d3e255 100644
--- a/packages/frontend/src/components/DynamicNote.vue
+++ b/packages/frontend/src/components/DynamicNote.vue
@@ -14,7 +14,7 @@ Displays a note with either Misskey or Sharkey style, based on user preference.
 	:withHardMute="withHardMute"
 	@reaction="emoji => emit('reaction', emoji)"
 	@removeReaction="emoji => emit('removeReaction', emoji)"
-	@expandCW="n => emit('expandCW', n)"
+	@expandMute="n => emit('expandMute', n)"
 />
 </template>
 
@@ -45,6 +45,6 @@ defineProps<{
 const emit = defineEmits<{
 	(ev: 'reaction', emoji: string): void;
 	(ev: 'removeReaction', emoji: string): void;
-	(ev: 'expandCW', note: Misskey.entities.Note): void;
+	(ev: 'expandMute', note: Misskey.entities.Note): void;
 }>();
 </script>
diff --git a/packages/frontend/src/components/DynamicNoteDetailed.vue b/packages/frontend/src/components/DynamicNoteDetailed.vue
index f47536d47a..959cba3e4d 100644
--- a/packages/frontend/src/components/DynamicNoteDetailed.vue
+++ b/packages/frontend/src/components/DynamicNoteDetailed.vue
@@ -11,30 +11,61 @@ Displays a note in the detailed view with either Misskey or Sharkey style, based
 	:note="note"
 	:initialTab="initialTab"
 	:expandAllCws="expandAllCws"
+	@expandMute="n => onExpandNote(n)"
 />
 </template>
 
 <script setup lang="ts">
 import * as Misskey from 'misskey-js';
-import { computed, defineAsyncComponent, useTemplateRef } from 'vue';
+import { defineAsyncComponent, useTemplateRef } from 'vue';
 import type { ComponentExposed } from 'vue-component-type-helpers';
 import type MkNoteDetailed from '@/components/MkNoteDetailed.vue';
 import type SkNoteDetailed from '@/components/SkNoteDetailed.vue';
 import { prefer } from '@/preferences';
+import { useMuteOverrides } from '@/utility/check-word-mute';
+import { deepAssign } from '@/utility/merge';
 
 const XNoteDetailed = defineAsyncComponent(() =>
 	prefer.s.noteDesign === 'misskey'
-	? import('@/components/MkNoteDetailed.vue')
-	: import('@/components/SkNoteDetailed.vue'),
-);
+		? import('@/components/MkNoteDetailed.vue')
+		: import('@/components/SkNoteDetailed.vue'));
 
 const rootEl = useTemplateRef<ComponentExposed<typeof MkNoteDetailed | typeof SkNoteDetailed>>('rootEl');
+const muteOverrides = useMuteOverrides();
 
 defineExpose({ rootEl });
 
-defineProps<{
+const props = defineProps<{
 	note: Misskey.entities.Note;
 	initialTab?: string;
 	expandAllCws?: boolean;
 }>();
+
+// TODO map to expand all CWs?
+
+const emit = defineEmits<{
+	(ev: 'expandMute', note: Misskey.entities.Note): void;
+}>();
+
+function onExpandNote(note: Misskey.entities.Note) {
+	// Since this is a Detailed note, note.props must point to the top of a thread.
+	// Go ahead and expand matching user/instance/thread mutes downstream, since the user is very likely to want them.
+	if (note.id === props.note.id) {
+		deepAssign(muteOverrides, {
+			user: {
+				[note.user.id]: {
+					userMandatoryCW: null,
+					instanceMandatoryCW: null,
+				},
+			},
+			thread: {
+				[note.threadId]: {
+					threadMuted: false,
+				},
+			},
+		});
+	}
+
+	emit('expandMute', note);
+}
 </script>
diff --git a/packages/frontend/src/components/MkNote.vue b/packages/frontend/src/components/MkNote.vue
index 9feed0acc6..30a9a1ad00 100644
--- a/packages/frontend/src/components/MkNote.vue
+++ b/packages/frontend/src/components/MkNote.vue
@@ -12,7 +12,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 	:withHardMute="withHardMute"
 	:class="[$style.root, { [$style.showActionsOnlyHover]: prefer.s.showNoteActionsOnlyHover, [$style.skipRender]: prefer.s.skipNoteRender }]"
 	:tabindex="isDeleted ? '-1' : '0'"
-	@expand="n => emit('expandCW', n)"
+	@expandMute="n => emit('expandMute', n)"
 >
 	<div v-if="appearNote.reply && inReplyToCollapsed" :class="$style.collapsedInReplyTo">
 		<MkAvatar :class="$style.collapsedInReplyToAvatar" :user="appearNote.reply.user" link preview/>
@@ -245,7 +245,7 @@ provide(DI.mock, props.mock);
 const emit = defineEmits<{
 	(ev: 'reaction', emoji: string): void;
 	(ev: 'removeReaction', emoji: string): void;
-	(ev: 'expandCW', note: Misskey.entities.Note): void;
+	(ev: 'expandMute', note: Misskey.entities.Note): void;
 }>();
 
 const router = useRouter();
diff --git a/packages/frontend/src/components/MkNoteDetailed.vue b/packages/frontend/src/components/MkNoteDetailed.vue
index 98582c56fc..f63e18f42a 100644
--- a/packages/frontend/src/components/MkNoteDetailed.vue
+++ b/packages/frontend/src/components/MkNoteDetailed.vue
@@ -11,6 +11,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 	:note="appearNote"
 	:class="$style.root"
 	:tabindex="isDeleted ? '-1' : '0'"
+	@expandMute="n => emit('expandMute', n)"
 >
 	<div v-if="appearNote.reply && appearNote.reply.replyId">
 		<div v-if="!conversationLoaded" style="padding: 16px">
@@ -292,6 +293,10 @@ const props = withDefaults(defineProps<{
 	initialTab: 'replies',
 });
 
+const emit = defineEmits<{
+	(ev: 'expandMute', note: Misskey.entities.Note): void;
+}>();
+
 const inChannel = inject('inChannel', null);
 
 const note = ref(deepClone(props.note));
diff --git a/packages/frontend/src/components/MkNotes.vue b/packages/frontend/src/components/MkNotes.vue
index e31b56eee7..7108a5721b 100644
--- a/packages/frontend/src/components/MkNotes.vue
+++ b/packages/frontend/src/components/MkNotes.vue
@@ -10,7 +10,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 	<template #default="{ items: notes }">
 		<div :class="[$style.root, { [$style.noGap]: noGap, '_gaps': !noGap, [$style.reverse]: pagination.reversed }]">
 			<template v-for="(note, i) in notes" :key="note.id">
-				<DynamicNote :class="$style.note" :note="note as Misskey.entities.Note" :withHardMute="true" :data-scroll-anchor="note.id"/>
+				<DynamicNote :class="$style.note" :note="note as Misskey.entities.Note" :withHardMute="true" :data-scroll-anchor="note.id" @expandMute="n => emit('expandMute', n)"/>
 				<MkAd v-if="note._shouldInsertAd_" :preferForms="['horizontal', 'horizontal-big']" :class="$style.ad"/>
 			</template>
 		</div>
@@ -37,6 +37,10 @@ const pagingComponent = useTemplateRef('pagingComponent');
 defineExpose({
 	pagingComponent,
 });
+
+const emit = defineEmits<{
+	(ev: 'expandMute', note: Misskey.entities.Note): void;
+}>();
 </script>
 
 <style lang="scss" module>
diff --git a/packages/frontend/src/components/SkMutedNote.vue b/packages/frontend/src/components/SkMutedNote.vue
index 6b27ac42ba..b5d3473b5b 100644
--- a/packages/frontend/src/components/SkMutedNote.vue
+++ b/packages/frontend/src/components/SkMutedNote.vue
@@ -94,20 +94,19 @@ const props = withDefaults(defineProps<{
 });
 
 const emit = defineEmits<{
-	(type: 'expand', note: Misskey.entities.Note): void;
+	(type: 'expandMute', note: Misskey.entities.Note): void;
 }>();
 
 const expandNote = ref(false);
 
 function expand() {
 	expandNote.value = true;
-	emit('expand', props.note);
+	emit('expandMute', props.note);
 }
 
-const mute = computed(() => checkMute(props.note, props.withHardMute));
+const mute = checkMute(computed(() => props.note), computed(() => props.withHardMute));
 const mutedWords = computed(() => mute.value.softMutedWords?.join(', '));
-const isMuted = computed(() => mute.value.hardMuted || mutedWords.value || mute.value.noteMandatoryCW || mute.value.userMandatoryCW || mute.value.instanceMandatoryCW || mute.value.noteMuted || mute.value.threadMuted || mute.value.sensitiveMuted);
-const isExpanded = computed(() => expandNote.value || !isMuted.value);
+const isExpanded = computed(() => expandNote.value || !mute.value.hasMute);
 const rootClass = computed(() => isExpanded.value ? props.expandedClass : undefined);
 
 const rootEl = useTemplateRef('rootEl');
diff --git a/packages/frontend/src/components/SkNote.vue b/packages/frontend/src/components/SkNote.vue
index d2b31e3df7..15b90e205e 100644
--- a/packages/frontend/src/components/SkNote.vue
+++ b/packages/frontend/src/components/SkNote.vue
@@ -14,7 +14,7 @@ Displays a note in the Sharkey style. Used to show the "main" note in a given co
 	:withHardMute="withHardMute"
 	:class="[$style.root, { [$style.showActionsOnlyHover]: prefer.s.showNoteActionsOnlyHover, [$style.skipRender]: prefer.s.skipNoteRender }]"
 	:tabindex="isDeleted ? '-1' : '0'"
-	@expand="n => emit('expandCW', n)"
+	@expandMute="n => emit('expandMute', n)"
 >
 	<SkNoteSub v-if="appearNote.reply" v-show="!renoteCollapsed && !inReplyToCollapsed" :note="appearNote.reply" :class="$style.replyTo"/>
 	<div v-if="appearNote.reply && inReplyToCollapsed && !renoteCollapsed" :class="$style.collapsedInReplyTo">
@@ -246,7 +246,7 @@ provide(DI.mock, props.mock);
 const emit = defineEmits<{
 	(ev: 'reaction', emoji: string): void;
 	(ev: 'removeReaction', emoji: string): void;
-	(ev: 'expandCW', note: Misskey.entities.Note): void;
+	(ev: 'expandMute', note: Misskey.entities.Note): void;
 }>();
 
 const router = useRouter();
diff --git a/packages/frontend/src/components/SkNoteDetailed.vue b/packages/frontend/src/components/SkNoteDetailed.vue
index fe2da9f914..d02987c9f6 100644
--- a/packages/frontend/src/components/SkNoteDetailed.vue
+++ b/packages/frontend/src/components/SkNoteDetailed.vue
@@ -13,6 +13,7 @@ Detailed view of a note in the Sharkey style. Used when opening a note onto its
 	:note="appearNote"
 	:class="$style.root"
 	:tabindex="isDeleted ? '-1' : '0'"
+	@expandMute="n => emit('expandMute', n)"
 >
 	<div v-if="appearNote.reply && appearNote.reply.replyId && !conversationLoaded" style="padding: 16px">
 		<MkButton style="margin: 0 auto;" primary rounded @click="loadConversation">{{ i18n.ts.loadConversation }}</MkButton>
@@ -297,6 +298,10 @@ const props = withDefaults(defineProps<{
 	initialTab: 'replies',
 });
 
+const emit = defineEmits<{
+	(ev: 'expandMute', note: Misskey.entities.Note): void;
+}>();
+
 const inChannel = inject('inChannel', null);
 
 const note = ref(deepClone(props.note));
diff --git a/packages/frontend/src/pages/user/home.vue b/packages/frontend/src/pages/user/home.vue
index 0df9b425ed..fcb03e89a3 100644
--- a/packages/frontend/src/pages/user/home.vue
+++ b/packages/frontend/src/pages/user/home.vue
@@ -176,10 +176,10 @@ SPDX-License-Identifier: AGPL-3.0-only
 								<MkResult type="empty" :text="i18n.ts.noNotes"/>
 							</div>
 							<div v-else class="_panel">
-								<DynamicNote v-for="note of user.pinnedNotes" :key="note.id" class="note" :class="$style.pinnedNote" :note="note" :pinned="true" @expandCW="onExpandCW"/>
+								<DynamicNote v-for="note of user.pinnedNotes" :key="note.id" class="note" :class="$style.pinnedNote" :note="note" :pinned="true" @expandMute="n => onExpandCW(n)"/>
 							</div>
 						</div>
-						<MkNotes v-else :class="$style.tl" :noGap="true" :pagination="AllPagination" @expandCW="onExpandCW"/>
+						<MkNotes v-else :class="$style.tl" :noGap="true" :pagination="AllPagination" @expandMute="n => onExpandCW(n)"/>
 					</MkLazy>
 				</MkStickyContainer>
 			</div>
@@ -198,7 +198,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 import { defineAsyncComponent, computed, onMounted, onUnmounted, nextTick, watch, ref } from 'vue';
 import * as Misskey from 'misskey-js';
 import { getScrollPosition } from '@@/js/scroll.js';
-import { patchMuteOverrides } from '@/utility/check-word-mute.js';
+import { useMuteOverrides } from '@/utility/check-word-mute.js';
 import MkTab from '@/components/MkTab.vue';
 import MkNotes from '@/components/MkNotes.vue';
 import MkFollowButton from '@/components/MkFollowButton.vue';
@@ -224,6 +224,7 @@ import MkSparkle from '@/components/MkSparkle.vue';
 import { prefer } from '@/preferences.js';
 import DynamicNote from '@/components/DynamicNote.vue';
 import MkOmit from '@/components/MkOmit.vue';
+import { deepAssign } from '@/utility/merge';
 
 function calcAge(birthdate: string): number {
 	const date = new Date(birthdate);
@@ -256,12 +257,20 @@ const emit = defineEmits<{
 	(ev: 'unfoldFiles'): void;
 }>();
 
-const cwOverrides = patchMuteOverrides();
+const muteOverrides = useMuteOverrides();
 
-function onExpandCW() {
-	// This kills the user-level and instance-level CWs for all notes below this point
-	cwOverrides.userMandatoryCW = null;
-	cwOverrides.instanceMandatoryCW = null;
+function onExpandCW(note: Misskey.entities.Note) {
+	if (note.user.id === props.user.id) {
+		// This kills the mandatoryCW for this user below this point
+		deepAssign(muteOverrides, {
+			user: {
+				[props.user.id]: {
+					userMandatoryCW: null,
+					instanceMandatoryCW: null,
+				},
+			},
+		});
+	}
 }
 
 const router = useRouter();
diff --git a/packages/frontend/src/utility/check-word-mute.ts b/packages/frontend/src/utility/check-word-mute.ts
index 6b054852f5..8301e88fdd 100644
--- a/packages/frontend/src/utility/check-word-mute.ts
+++ b/packages/frontend/src/utility/check-word-mute.ts
@@ -4,11 +4,14 @@
  */
 
 import * as Misskey from 'misskey-js';
-import { provide, inject, reactive } from 'vue';
-import type { Ref, Reactive } from 'vue';
+import { provide, inject, reactive, computed } from 'vue';
+import type { Ref, ComputedRef, Reactive } from 'vue';
 import { $i } from '@/i.js';
+import { deepAssign } from '@/utility/merge';
 
 export interface Mute {
+	hasMute: boolean;
+
 	hardMuted?: boolean;
 	softMutedWords?: string[];
 	sensitiveMuted?: boolean;
@@ -23,67 +26,103 @@ export interface Mute {
 	instanceMandatoryCW?: string | null;
 }
 
+export interface MuteOverrides {
+	/**
+	 * Allows directly modifying the Mute object for all mutes.
+	 */
+	all?: Partial<Omit<Mute, 'hasMute'>>;
+
+	/**
+	 * Per instance overrides.
+	 * Key: instance hostname.
+	 */
+	instance: Partial<Record<string, Partial<Mute>>>;
+
+	/**
+	 * Per user overrides.
+	 * Key: user ID.
+	 */
+	user: Partial<Record<string, Partial<Mute>>>;
+
+	/**
+	 * Per note overrides.
+	 * Key: note ID.
+	 */
+	note: Partial<Record<string, Partial<Mute>>>;
+
+	/**
+	 * Per thread overrides.
+	 * Key: thread ID.
+	 */
+	thread: Partial<Record<string, Partial<Mute>>>;
+}
+
 export const muteOverridesSymbol = Symbol('muteOverrides');
 
-export function injectMuteOverrides(): Reactive<Partial<Mute>> | null {
-	return inject(muteOverridesSymbol, null);
-}
+export function useMuteOverrides(): Reactive<MuteOverrides> {
+	// Re-use the same instance if possible
+	let overrides = injectMuteOverrides();
 
-export function provideMuteOverrides(overrides: Reactive<Partial<Mute>> | null) {
-	provide(muteOverridesSymbol, overrides);
-}
-
-export function patchMuteOverrides(patch?: Partial<Mute>): Reactive<Partial<Mute>> {
-	// Inject and re-provide to merge with any overrides injected from above
-	const overrides = injectMuteOverrides() ?? reactive({});
-	provideMuteOverrides(overrides);
-
-	// Assign caller's changes, if any
-	if (patch) {
-		Object.assign(overrides, patch);
+	if (!overrides) {
+		overrides = reactive({
+			note: {},
+			user: {},
+			instance: {},
+			thread: {},
+		});
+		provideMuteOverrides(overrides);
 	}
 
 	return overrides;
 }
 
-export function checkMute(note: Misskey.entities.Note, withHardMute?: boolean): Mute {
-	const mutes = getMutes(note, withHardMute);
-
-	const override = injectMuteOverrides();
-	if (override) {
-		Object.assign(mutes, override);
-	}
-
-	return mutes;
+function injectMuteOverrides(): Reactive<MuteOverrides> | null {
+	return inject(muteOverridesSymbol, null);
 }
 
-function getMutes(note: Misskey.entities.Note, withHardMute?: boolean): Mute {
-	const sensitiveMuted = isSensitiveMuted(note);
+function provideMuteOverrides(overrides: Reactive<MuteOverrides> | null) {
+	provide(muteOverridesSymbol, overrides);
+}
 
-	// My own note
-	if ($i && $i.id === note.userId) {
-		return { sensitiveMuted };
-	}
+export function checkMute(note: ComputedRef<Misskey.entities.Note>, withHardMute?: ComputedRef<boolean>): ComputedRef<Mute> {
+	// inject() can only be used inside script setup, so it MUST be outside the computed block!
+	const overrides = injectMuteOverrides();
 
-	const threadMuted = note.isMutingThread;
-	const noteMuted = note.isMutingNote;
-	const noteMandatoryCW = note.mandatoryCW;
-	const userMandatoryCW = note.user.mandatoryCW;
-	const instanceMandatoryCW = note.user.instance?.mandatoryCW;
+	return computed(() => getMutes(note.value, withHardMute?.value ?? true, overrides));
+}
 
-	// Hard mute
-	if (withHardMute && isHardMuted(note)) {
-		return { hardMuted: true, sensitiveMuted, threadMuted, noteMuted, noteMandatoryCW, userMandatoryCW, instanceMandatoryCW };
-	}
+function getMutes(note: Misskey.entities.Note, withHardMute: boolean, overrides: MuteOverrides | null): Mute {
+	const override: Partial<Mute> = overrides ? deepAssign(
+		{},
+		note.user.host ? overrides.instance[note.user.host] : undefined,
+		overrides.user[note.user.id],
+		overrides.thread[note.threadId],
+		overrides.note[note.id],
+		overrides.all,
+	) : {};
 
-	// Soft mute
-	const softMutedWords = isSoftMuted(note);
-	if (softMutedWords.length > 0) {
-		return { softMutedWords, sensitiveMuted, threadMuted, noteMuted, noteMandatoryCW, userMandatoryCW, instanceMandatoryCW };
-	}
+	const isMe = $i != null && $i.id === note.userId;
 
-	// Other / no mute
-	return { sensitiveMuted, threadMuted, noteMuted, noteMandatoryCW, userMandatoryCW, instanceMandatoryCW };
+	const hardMuted = override.hardMuted ?? (!isMe && withHardMute && isHardMuted(note));
+	const softMutedWords = override.softMutedWords ?? (isMe ? [] : isSoftMuted(note));
+	const sensitiveMuted = override.sensitiveMuted ?? isSensitiveMuted(note);
+	const threadMuted = override.threadMuted ?? (!isMe && note.isMutingThread);
+	const noteMuted = override.noteMuted ?? (!isMe && note.isMutingNote);
+	const noteMandatoryCW = override.noteMandatoryCW !== undefined
+		? override.noteMandatoryCW
+		: (isMe ? null : note.mandatoryCW);
+	const userMandatoryCW = override.userMandatoryCW !== undefined
+		? override.userMandatoryCW
+		: (isMe ? null : note.user.mandatoryCW);
+	const instanceMandatoryCW = override.instanceMandatoryCW !== undefined
+		? override.instanceMandatoryCW
+		: (!isMe && note.user.instance)
+			? note.user.instance.mandatoryCW
+			: null;
+
+	const hasMute = hardMuted || softMutedWords.length > 0 || sensitiveMuted || threadMuted || noteMuted || !!noteMandatoryCW || !!userMandatoryCW || !!instanceMandatoryCW;
+
+	return { hasMute, hardMuted, softMutedWords, sensitiveMuted, threadMuted, noteMuted, noteMandatoryCW, userMandatoryCW, instanceMandatoryCW };
 }
 
 function isHardMuted(note: Misskey.entities.Note): boolean {
diff --git a/packages/frontend/src/utility/merge.ts b/packages/frontend/src/utility/merge.ts
index 6ad1577353..a571830e9a 100644
--- a/packages/frontend/src/utility/merge.ts
+++ b/packages/frontend/src/utility/merge.ts
@@ -33,3 +33,39 @@ export function deepMerge<X extends Record<PropertyKey, unknown>>(value: DeepPar
 	}
 	throw new Error('deepMerge: value and def must be pure objects');
 }
+
+/**
+ * Assigns properties from one or more partial objects into a target.
+ * Nested objects are assigned in the same way.
+ * Like Object.assign, but deep.
+ */
+export function deepAssign<T extends Record<PropertyKey, unknown>>(target: T, ...partials: (DeepPartial<T> | undefined)[]): T {
+	return _deepAssign(target, ...partials) as T;
+}
+
+function _deepAssign(target: Record<PropertyKey, unknown>, ...partials: (Record<PropertyKey, unknown> | undefined)[]): Record<PropertyKey, unknown> {
+	if (isPureObject(target)) {
+		for (const partial of partials) {
+			if (!isPureObject(partial)) continue;
+
+			for (const [key, value] of Object.entries(partial)) {
+				// Populate empty keys
+				if (!Reflect.has(target, key)) {
+					target[key] = value;
+					continue;
+				}
+
+				// Merge objects
+				if (isPureObject(target[key]) && isPureObject(value)) {
+					_deepAssign(target[key], value);
+					continue;
+				}
+
+				// Replace flat values
+				target[key] = value;
+			}
+		}
+	}
+
+	return target;
+}

From 9f0fdbbb514a2c68bec041cb1b30142fa26fb152 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Sun, 29 Jun 2025 16:01:13 -0400
Subject: [PATCH 013/110] bulk-expand mandatory CWs

---
 .../frontend/src/components/DynamicNoteDetailed.vue | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/packages/frontend/src/components/DynamicNoteDetailed.vue b/packages/frontend/src/components/DynamicNoteDetailed.vue
index 959cba3e4d..2fd13512ec 100644
--- a/packages/frontend/src/components/DynamicNoteDetailed.vue
+++ b/packages/frontend/src/components/DynamicNoteDetailed.vue
@@ -17,7 +17,7 @@ Displays a note in the detailed view with either Misskey or Sharkey style, based
 
 <script setup lang="ts">
 import * as Misskey from 'misskey-js';
-import { defineAsyncComponent, useTemplateRef } from 'vue';
+import { defineAsyncComponent, useTemplateRef, watch } from 'vue';
 import type { ComponentExposed } from 'vue-component-type-helpers';
 import type MkNoteDetailed from '@/components/MkNoteDetailed.vue';
 import type SkNoteDetailed from '@/components/SkNoteDetailed.vue';
@@ -41,7 +41,16 @@ const props = defineProps<{
 	expandAllCws?: boolean;
 }>();
 
-// TODO map to expand all CWs?
+// Expand mandatory CWs when "expand all CWs" is clicked
+watch(() => props.expandAllCws, () => {
+	deepAssign(muteOverrides, {
+		all: {
+			noteMandatoryCW: null,
+			userMandatoryCW: null,
+			instanceMandatoryCW: null,
+		},
+	});
+});
 
 const emit = defineEmits<{
 	(ev: 'expandMute', note: Misskey.entities.Note): void;

From 376997cbccd826aa23643e8c04888b8aa03b1a3f Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Sun, 29 Jun 2025 16:05:53 -0400
Subject: [PATCH 014/110] limit length of instance name in mutes

---
 packages/frontend/src/components/SkMutedNote.vue | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/packages/frontend/src/components/SkMutedNote.vue b/packages/frontend/src/components/SkMutedNote.vue
index b5d3473b5b..387d68a338 100644
--- a/packages/frontend/src/components/SkMutedNote.vue
+++ b/packages/frontend/src/components/SkMutedNote.vue
@@ -28,7 +28,7 @@ Displays a placeholder for a muted note.
 		</I18n>
 		<I18n v-if="mute.instanceMandatoryCW" :src="i18n.ts.instanceIsFlaggedAs" tag="small">
 			<template #name>
-				{{ note.user.instance?.name ?? note.user.host }}
+				{{ instanceName }}
 			</template>
 			<template #cw>
 				{{ mute.instanceMandatoryCW }}
@@ -77,6 +77,7 @@ Displays a placeholder for a muted note.
 <script setup lang="ts">
 import * as Misskey from 'misskey-js';
 import { computed, ref, useTemplateRef, defineExpose } from 'vue';
+import { host } from '@@/js/config.js';
 import type { Ref } from 'vue';
 import { i18n } from '@/i18n.js';
 import { prefer } from '@/preferences.js';
@@ -109,6 +110,18 @@ const mutedWords = computed(() => mute.value.softMutedWords?.join(', '));
 const isExpanded = computed(() => expandNote.value || !mute.value.hasMute);
 const rootClass = computed(() => isExpanded.value ? props.expandedClass : undefined);
 
+const instanceName = computed(() => {
+	if (props.note.user.instance?.name) {
+		if (props.note.user.instance.name.length <= 32) {
+			return props.note.user.instance.name;
+		}
+
+		return `${props.note.user.instance.name.substring(0, 30)}...`;
+	}
+
+	return props.note.user.host ?? host;
+});
+
 const rootEl = useTemplateRef('rootEl');
 defineExpose({
 	rootEl: rootEl as Ref<HTMLElement | null>,

From 604f5a5c68d0bee50c13e6e1ca74992a85060072 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Sun, 29 Jun 2025 17:35:52 -0400
Subject: [PATCH 015/110] fix SkPatternTest.vue

---
 .../frontend/src/components/SkPatternTest.vue    |  8 ++++----
 packages/frontend/src/utility/check-word-mute.ts | 16 +++++++++-------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/packages/frontend/src/components/SkPatternTest.vue b/packages/frontend/src/components/SkPatternTest.vue
index f3bbf723a0..660b5d8a0a 100644
--- a/packages/frontend/src/components/SkPatternTest.vue
+++ b/packages/frontend/src/components/SkPatternTest.vue
@@ -27,8 +27,8 @@ import { i18n } from '@/i18n';
 import MkFolder from '@/components/MkFolder.vue';
 import MkButton from '@/components/MkButton.vue';
 import MkTextarea from '@/components/MkTextarea.vue';
-import { parseMutes } from '@/utility/parse-mutes';
-import { checkWordMute } from '@/utility/check-word-mute';
+import { parseMutes } from '@/utility/parse-mutes.js';
+import { getMutedWords } from '@/utility/check-word-mute.js';
 
 const props = defineProps<{
 	mutedWords?: string | null,
@@ -45,8 +45,8 @@ function testWordMutes() {
 
 	try {
 		const mutes = parseMutes(props.mutedWords);
-		const matches = checkWordMute(testWords.value, null, mutes);
-		testMatches.value = matches ? matches.join(', ') : '';
+		const matches = getMutedWords(mutes, testWords.value);
+		testMatches.value = matches.join(', ');
 	} catch {
 		// Error is displayed by above function
 		testMatches.value = null;
diff --git a/packages/frontend/src/utility/check-word-mute.ts b/packages/frontend/src/utility/check-word-mute.ts
index 8301e88fdd..3f363573e7 100644
--- a/packages/frontend/src/utility/check-word-mute.ts
+++ b/packages/frontend/src/utility/check-word-mute.ts
@@ -128,13 +128,15 @@ function getMutes(note: Misskey.entities.Note, withHardMute: boolean, overrides:
 function isHardMuted(note: Misskey.entities.Note): boolean {
 	if (!$i?.hardMutedWords.length) return false;
 
-	return containsMutedWord($i.hardMutedWords, note);
+	const inputs = expandNote(note);
+	return containsMutedWord($i.hardMutedWords, inputs);
 }
 
 function isSoftMuted(note: Misskey.entities.Note): string[] {
 	if (!$i?.mutedWords.length) return [];
 
-	return getMutedWords($i.mutedWords, note);
+	const inputs = expandNote(note);
+	return getMutedWords($i.mutedWords, inputs);
 }
 
 function isSensitiveMuted(note: Misskey.entities.Note): boolean {
@@ -151,7 +153,7 @@ function isSensitiveMuted(note: Misskey.entities.Note): boolean {
 	return tl_withSensitive?.value === false;
 }
 
-function getMutedWords(mutedWords: (string | string[])[], note: Misskey.entities.Note): string[] {
+export function getMutedWords(mutedWords: (string | string[])[], inputs: Iterable<string>): string[] {
 	// Parse mutes
 	const { regexMutes, patternMutes } = parseMutes(mutedWords);
 
@@ -163,7 +165,7 @@ function getMutedWords(mutedWords: (string | string[])[], note: Misskey.entities
 	const matches = new Set<string>();
 
 	// Expand notes into searchable test
-	for (const text of expandNote(note)) {
+	for (const text of inputs) {
 		for (const pattern of patternMutes) {
 			// Case-sensitive, non-boundary search for backwards compatibility
 			if (pattern.every(word => text.includes(word))) {
@@ -182,7 +184,7 @@ function getMutedWords(mutedWords: (string | string[])[], note: Misskey.entities
 	return Array.from(matches);
 }
 
-function containsMutedWord(mutedWords: (string | string[])[], note: Misskey.entities.Note): boolean {
+export function containsMutedWord(mutedWords: (string | string[])[], inputs: Iterable<string>): boolean {
 	// Parse mutes
 	const { regexMutes, patternMutes } = parseMutes(mutedWords);
 
@@ -192,7 +194,7 @@ function containsMutedWord(mutedWords: (string | string[])[], note: Misskey.enti
 	}
 
 	// Expand notes into searchable test
-	for (const text of expandNote(note)) {
+	for (const text of inputs) {
 		for (const pattern of patternMutes) {
 			// Case-sensitive, non-boundary search for backwards compatibility
 			if (pattern.every(word => text.includes(word))) {
@@ -208,7 +210,7 @@ function containsMutedWord(mutedWords: (string | string[])[], note: Misskey.enti
 	return false;
 }
 
-function *expandNote(note: Misskey.entities.Note): Generator<string> {
+export function *expandNote(note: Misskey.entities.Note): Generator<string> {
 	if (note.cw) yield note.cw;
 	if (note.text) yield note.text;
 	if (note.files) {

From d62be884b39926d6e67582a1d8e7327c746b6d89 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Sun, 29 Jun 2025 18:56:42 -0400
Subject: [PATCH 016/110] replace "Mark instance as NSFW" toggle with an
 instance-level mandatory CW

---
 UPGRADE_NOTES.md                              | 16 +++++++++++-
 locales/index.d.ts                            |  8 ------
 .../1751236746539-replace-instance-isNSFW.js  | 25 +++++++++++++++++++
 .../backend/src/core/NoteCreateService.ts     |  8 ------
 packages/backend/src/core/NoteEditService.ts  |  8 ------
 .../core/activitypub/models/ApImageService.ts |  2 +-
 .../core/entities/InstanceEntityService.ts    |  1 -
 packages/backend/src/models/Instance.ts       |  5 ----
 .../models/json-schema/federation-instance.ts |  5 ----
 .../admin/federation/update-instance.ts       | 10 --------
 packages/backend/src/types.ts                 | 10 --------
 .../frontend/src/pages/about.federation.vue   |  5 +---
 .../frontend/src/pages/admin/federation.vue   |  4 ---
 .../src/pages/admin/modlog.ModLog.vue         |  6 +----
 packages/frontend/src/pages/instance-info.vue | 22 ----------------
 packages/misskey-js/etc/misskey-js.api.md     |  8 +-----
 packages/misskey-js/src/autogen/types.ts      |  2 --
 packages/misskey-js/src/consts.ts             | 10 --------
 packages/misskey-js/src/entities.ts           |  6 -----
 sharkey-locales/de-DE.yml                     |  2 --
 sharkey-locales/en-US.yml                     |  2 --
 sharkey-locales/ja-JP.yml                     |  2 --
 sharkey-locales/th-TH.yml                     |  2 --
 sharkey-locales/vi-VN.yml                     |  2 --
 24 files changed, 44 insertions(+), 127 deletions(-)
 create mode 100644 packages/backend/migration/1751236746539-replace-instance-isNSFW.js

diff --git a/UPGRADE_NOTES.md b/UPGRADE_NOTES.md
index 47ac649c31..c16a65eb10 100644
--- a/UPGRADE_NOTES.md
+++ b/UPGRADE_NOTES.md
@@ -1,6 +1,18 @@
 # Upgrade Notes
 
-## 2025.X.X
+## 2025.5.2
+
+### Mark instance as NSFW
+
+The "Mark instance as NSFW" has been removed in favor of the new "mandatory CW" / "force CW" system.
+Moderators can now apply any Content Warning of their choice to all notes from an instance by populating the "Force content warning" field on that instance's info page.
+The new Content Warning applies immediately, is retroactive, and does not federate or "infect" replies in a thread.
+
+The upgrade will automatically a content warning of "NSFW" for instances that were formerly marked as NSFW, which displays as `[instance name] is flagged: "NSFW"` to users.
+The `notes` table is also cleaned up to remove any leftover "Instance is marked as NSFW" content warnings from posts.
+Staff can then remove or modify the new CW as usual.
+
+## 2025.2.2
 
 ### Authorized Fetch
 
@@ -13,6 +25,8 @@ Do not remove it before migration, or else the setting will reset to default (di
 
 ### Hellspawns
 
+**Note: this workaround is no longer needed on Sharkey version 2025.5.2 and later, as "Mark instance as NSFW" has been completely rewritten.**
+
 Sharkey versions before 2024.10 suffered from a bug in the "Mark instance as NSFW" feature.
 When a user from such an instance boosted a note, the boost would be converted to a hellspawn (pure renote with Content Warning).
 Hellspawns are buggy and do not properly federate, so it may be desirable to correct any that already exist in the database.
diff --git a/locales/index.d.ts b/locales/index.d.ts
index 06b9e26006..303f5df9c5 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -10964,14 +10964,6 @@ export interface Locale extends ILocale {
          * Set content warning for instance
          */
         "setMandatoryCWForInstance": string;
-        /**
-         * Set remote instance as NSFW
-         */
-        "setRemoteInstanceNSFW": string;
-        /**
-         * Unset remote instance as NSFW
-         */
-        "unsetRemoteInstanceNSFW": string;
         /**
          * Rejected reports from remote instance
          */
diff --git a/packages/backend/migration/1751236746539-replace-instance-isNSFW.js b/packages/backend/migration/1751236746539-replace-instance-isNSFW.js
new file mode 100644
index 0000000000..632fa98d6b
--- /dev/null
+++ b/packages/backend/migration/1751236746539-replace-instance-isNSFW.js
@@ -0,0 +1,25 @@
+/*
+ * SPDX-FileCopyrightText: hazelnoot and other Sharkey contributors
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+export class ReplaceInstanceIsNSFW1751236746539 {
+	name = 'ReplaceInstanceIsNSFW1751236746539'
+
+	async up(queryRunner) {
+		// Data migration
+		await queryRunner.query(`UPDATE "instance" SET "mandatoryCW" = 'NSFW' WHERE "isNSFW" = true`);
+		await queryRunner.query(`UPDATE "note" SET "cw" = null WHERE "cw" = 'Instance is marked as NSFW'`);
+
+		// Schema migration
+		await queryRunner.query(`ALTER TABLE "instance" DROP COLUMN "isNSFW"`);
+	}
+
+	async down(queryRunner) {
+		// Schema migration
+		await queryRunner.query(`ALTER TABLE "instance" ADD "isNSFW" boolean NOT NULL DEFAULT false`);
+
+		// Data migration
+		await queryRunner.query(`UPDATE "instance" SET "isNSFW" = true WHERE "mandatoryCW" ILIKE '%NSFW%'`);
+	}
+}
diff --git a/packages/backend/src/core/NoteCreateService.ts b/packages/backend/src/core/NoteCreateService.ts
index bf7d209fef..0732624a99 100644
--- a/packages/backend/src/core/NoteCreateService.ts
+++ b/packages/backend/src/core/NoteCreateService.ts
@@ -414,14 +414,6 @@ export class NoteCreateService implements OnApplicationShutdown {
 			}
 		}
 
-		if (user.host && !data.cw) {
-			await this.federatedInstanceService.fetchOrRegister(user.host).then(async i => {
-				if (i.isNSFW && !this.isPureRenote(data)) {
-					data.cw = 'Instance is marked as NSFW';
-				}
-			});
-		}
-
 		if (mentionedUsers.length > 0 && mentionedUsers.length > (await this.roleService.getUserPolicies(user.id)).mentionLimit) {
 			throw new IdentifiableError('9f466dab-c856-48cd-9e65-ff90ff750580', 'Note contains too many mentions');
 		}
diff --git a/packages/backend/src/core/NoteEditService.ts b/packages/backend/src/core/NoteEditService.ts
index 5b0d1980c3..f8c732c4f1 100644
--- a/packages/backend/src/core/NoteEditService.ts
+++ b/packages/backend/src/core/NoteEditService.ts
@@ -443,14 +443,6 @@ export class NoteEditService implements OnApplicationShutdown {
 			}
 		}
 
-		if (user.host && !data.cw) {
-			await this.federatedInstanceService.fetchOrRegister(user.host).then(async i => {
-				if (i.isNSFW && !this.noteCreateService.isPureRenote(data)) {
-					data.cw = 'Instance is marked as NSFW';
-				}
-			});
-		}
-
 		if (mentionedUsers.length > 0 && mentionedUsers.length > (await this.roleService.getUserPolicies(user.id)).mentionLimit) {
 			throw new IdentifiableError('9f466dab-c856-48cd-9e65-ff90ff750580', 'Note contains too many mentions');
 		}
diff --git a/packages/backend/src/core/activitypub/models/ApImageService.ts b/packages/backend/src/core/activitypub/models/ApImageService.ts
index 8973195f53..51ea4f5ed3 100644
--- a/packages/backend/src/core/activitypub/models/ApImageService.ts
+++ b/packages/backend/src/core/activitypub/models/ApImageService.ts
@@ -75,7 +75,7 @@ export class ApImageService {
 		const shouldBeCached = this.meta.cacheRemoteFiles && (this.meta.cacheRemoteSensitiveFiles || !image.sensitive);
 
 		await this.federatedInstanceService.fetchOrRegister(actor.host).then(async i => {
-			if (i.isNSFW) {
+			if (i.isMediaSilenced) {
 				image.sensitive = true;
 			}
 		});
diff --git a/packages/backend/src/core/entities/InstanceEntityService.ts b/packages/backend/src/core/entities/InstanceEntityService.ts
index 09dd54812c..1225b6484a 100644
--- a/packages/backend/src/core/entities/InstanceEntityService.ts
+++ b/packages/backend/src/core/entities/InstanceEntityService.ts
@@ -63,7 +63,6 @@ export class InstanceEntityService {
 			themeColor: instance.themeColor,
 			infoUpdatedAt: instance.infoUpdatedAt ? instance.infoUpdatedAt.toISOString() : null,
 			latestRequestReceivedAt: instance.latestRequestReceivedAt ? instance.latestRequestReceivedAt.toISOString() : null,
-			isNSFW: instance.isNSFW,
 			rejectReports: instance.rejectReports,
 			rejectQuotes: instance.rejectQuotes,
 			moderationNote: iAmModerator ? instance.moderationNote : null,
diff --git a/packages/backend/src/models/Instance.ts b/packages/backend/src/models/Instance.ts
index b445247176..e52ba65e1c 100644
--- a/packages/backend/src/models/Instance.ts
+++ b/packages/backend/src/models/Instance.ts
@@ -205,11 +205,6 @@ export class MiInstance {
 	})
 	public infoUpdatedAt: Date | null;
 
-	@Column('boolean', {
-		default: false,
-	})
-	public isNSFW: boolean;
-
 	@Column('boolean', {
 		default: false,
 	})
diff --git a/packages/backend/src/models/json-schema/federation-instance.ts b/packages/backend/src/models/json-schema/federation-instance.ts
index 51452b4598..f04ac810d1 100644
--- a/packages/backend/src/models/json-schema/federation-instance.ts
+++ b/packages/backend/src/models/json-schema/federation-instance.ts
@@ -116,11 +116,6 @@ export const packedFederationInstanceSchema = {
 			optional: false, nullable: true,
 			format: 'date-time',
 		},
-		isNSFW: {
-			type: 'boolean',
-			optional: false,
-			nullable: false,
-		},
 		rejectReports: {
 			type: 'boolean',
 			optional: false,
diff --git a/packages/backend/src/server/api/endpoints/admin/federation/update-instance.ts b/packages/backend/src/server/api/endpoints/admin/federation/update-instance.ts
index 24d0b8527c..e4b2a28429 100644
--- a/packages/backend/src/server/api/endpoints/admin/federation/update-instance.ts
+++ b/packages/backend/src/server/api/endpoints/admin/federation/update-instance.ts
@@ -24,7 +24,6 @@ export const paramDef = {
 	properties: {
 		host: { type: 'string' },
 		isSuspended: { type: 'boolean' },
-		isNSFW: { type: 'boolean' },
 		rejectReports: { type: 'boolean' },
 		moderationNote: { type: 'string' },
 		rejectQuotes: { type: 'boolean' },
@@ -58,7 +57,6 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 
 			await this.federatedInstanceService.update(instance.id, {
 				suspensionState,
-				isNSFW: ps.isNSFW,
 				rejectReports: ps.rejectReports,
 				rejectQuotes: ps.rejectQuotes,
 				moderationNote: ps.moderationNote,
@@ -78,14 +76,6 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				}
 			}
 
-			if (ps.isNSFW != null && instance.isNSFW !== ps.isNSFW) {
-				const message = ps.rejectReports ? 'setRemoteInstanceNSFW' : 'unsetRemoteInstanceNSFW';
-				this.moderationLogService.log(me, message, {
-					id: instance.id,
-					host: instance.host,
-				});
-			}
-
 			if (ps.rejectReports != null && instance.rejectReports !== ps.rejectReports) {
 				const message = ps.rejectReports ? 'rejectRemoteInstanceReports' : 'acceptRemoteInstanceReports';
 				this.moderationLogService.log(me, message, {
diff --git a/packages/backend/src/types.ts b/packages/backend/src/types.ts
index cbc490156f..8f37b45004 100644
--- a/packages/backend/src/types.ts
+++ b/packages/backend/src/types.ts
@@ -108,8 +108,6 @@ export const moderationLogTypes = [
 	'setMandatoryCW',
 	'setMandatoryCWForNote',
 	'setMandatoryCWForInstance',
-	'setRemoteInstanceNSFW',
-	'unsetRemoteInstanceNSFW',
 	'suspendRemoteInstance',
 	'unsuspendRemoteInstance',
 	'rejectRemoteInstanceReports',
@@ -309,14 +307,6 @@ export type ModerationLogPayloads = {
 		oldCW: string | null;
 		host: string;
 	};
-	setRemoteInstanceNSFW: {
-		id: string;
-		host: string;
-	};
-	unsetRemoteInstanceNSFW: {
-		id: string;
-		host: string;
-	};
 	suspendRemoteInstance: {
 		id: string;
 		host: string;
diff --git a/packages/frontend/src/pages/about.federation.vue b/packages/frontend/src/pages/about.federation.vue
index 675f1eb809..48dc7cff42 100644
--- a/packages/frontend/src/pages/about.federation.vue
+++ b/packages/frontend/src/pages/about.federation.vue
@@ -19,7 +19,6 @@ SPDX-License-Identifier: AGPL-3.0-only
 				<option value="subscribing">{{ i18n.ts.subscribing }}</option>
 				<option value="publishing">{{ i18n.ts.publishing }}</option>
 				<option value="bubble">Bubble</option>
-				<option value="nsfw">NSFW</option>
 				<option v-if="$i" value="suspended">{{ i18n.ts.suspended }}</option>
 				<option v-if="$i" value="silenced">{{ i18n.ts.silence }}</option>
 				<option v-if="$i" value="blocked">{{ i18n.ts.blocked }}</option>
@@ -83,18 +82,16 @@ const pagination = {
 			state.value === 'blocked' ? { blocked: true } :
 			state.value === 'silenced' ? { silenced: true } :
 			state.value === 'notResponding' ? { notResponding: true } :
-			state.value === 'nsfw' ? { nsfw: true } :
 			state.value === 'bubble' ? { bubble: true } :
 			{}),
 	})),
-} as Paging;
+} satisfies Paging;
 
 function getStatus(instance) {
 	if (instance.isSuspended) return 'Suspended';
 	if (instance.isBlocked) return 'Blocked';
 	if (instance.isSilenced) return 'Silenced';
 	if (instance.isNotResponding) return 'Error';
-	if (instance.isNSFW) return 'NSFW';
 	return 'Alive';
 }
 </script>
diff --git a/packages/frontend/src/pages/admin/federation.vue b/packages/frontend/src/pages/admin/federation.vue
index 16bed50002..9b67854145 100644
--- a/packages/frontend/src/pages/admin/federation.vue
+++ b/packages/frontend/src/pages/admin/federation.vue
@@ -19,8 +19,6 @@ SPDX-License-Identifier: AGPL-3.0-only
 						<option value="federating">{{ i18n.ts.federating }}</option>
 						<option value="subscribing">{{ i18n.ts.subscribing }}</option>
 						<option value="publishing">{{ i18n.ts.publishing }}</option>
-						<!-- TODO translate -->
-						<option value="nsfw">NSFW</option>
 						<option value="suspended">{{ i18n.ts.suspended }}</option>
 						<option value="blocked">{{ i18n.ts.blocked }}</option>
 						<option value="silenced">{{ i18n.ts.silence }}</option>
@@ -85,7 +83,6 @@ const pagination = {
 			state.value === 'blocked' ? { blocked: true } :
 			state.value === 'silenced' ? { silenced: true } :
 			state.value === 'notResponding' ? { notResponding: true } :
-			state.value === 'nsfw' ? { nsfw: true } :
 			{}),
 	})),
 };
@@ -104,7 +101,6 @@ function getStatus(instance: Misskey.entities.FederationInstance) {
 	if (instance.isBlocked) return 'Blocked';
 	if (instance.isSilenced) return 'Silenced';
 	if (instance.isNotResponding) return 'Error';
-	if (instance.isNSFW) return 'NSFW';
 	return 'Alive';
 }
 
diff --git a/packages/frontend/src/pages/admin/modlog.ModLog.vue b/packages/frontend/src/pages/admin/modlog.ModLog.vue
index 1e3706c90e..03c59ae0f5 100644
--- a/packages/frontend/src/pages/admin/modlog.ModLog.vue
+++ b/packages/frontend/src/pages/admin/modlog.ModLog.vue
@@ -30,8 +30,6 @@ SPDX-License-Identifier: AGPL-3.0-only
 					'setMandatoryCWForNote',
 					'setMandatoryCWForInstance',
 					'suspendRemoteInstance',
-					'setRemoteInstanceNSFW',
-					'unsetRemoteInstanceNSFW',
 					'rejectRemoteInstanceReports',
 					'acceptRemoteInstanceReports',
 					'rejectQuotesUser',
@@ -69,7 +67,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 					'removeRelay',
 				].includes(log.type)
 			}"
-		>{{ i18n.ts._moderationLogTypes[log.type] }}</b>
+		>{{ i18n.ts._moderationLogTypes[log.type] ?? log.type }}</b>
 		<span v-if="log.type === 'updateUserNote'">: @{{ log.info.userUsername }}{{ log.info.userHost ? '@' + log.info.userHost : '' }}</span>
 		<span v-else-if="log.type === 'suspend'">: @{{ log.info.userUsername }}{{ log.info.userHost ? '@' + log.info.userHost : '' }}</span>
 		<span v-else-if="log.type === 'approve'">: @{{ log.info.userUsername }}{{ log.info.userHost ? '@' + log.info.userHost : '' }}</span>
@@ -95,8 +93,6 @@ SPDX-License-Identifier: AGPL-3.0-only
 		<span v-else-if="log.type === 'unmarkSensitiveDriveFile'">: @{{ log.info.fileUserUsername }}{{ log.info.fileUserHost ? '@' + log.info.fileUserHost : '' }}</span>
 		<span v-else-if="log.type === 'suspendRemoteInstance'">: {{ log.info.host }}</span>
 		<span v-else-if="log.type === 'unsuspendRemoteInstance'">: {{ log.info.host }}</span>
-		<span v-else-if="log.type === 'setRemoteInstanceNSFW'">: {{ log.info.host }}</span>
-		<span v-else-if="log.type === 'unsetRemoteInstanceNSFW'">: {{ log.info.host }}</span>
 		<span v-else-if="log.type === 'rejectRemoteInstanceReports'">: {{ log.info.host }}</span>
 		<span v-else-if="log.type === 'acceptRemoteInstanceReports'">: {{ log.info.host }}</span>
 		<span v-else-if="log.type === 'createGlobalAnnouncement'">: {{ log.info.announcement.title }}</span>
diff --git a/packages/frontend/src/pages/instance-info.vue b/packages/frontend/src/pages/instance-info.vue
index 813b1a471f..1ac95c3a95 100644
--- a/packages/frontend/src/pages/instance-info.vue
+++ b/packages/frontend/src/pages/instance-info.vue
@@ -118,7 +118,6 @@ SPDX-License-Identifier: AGPL-3.0-only
 						<MkInfo v-if="isBaseBlocked" warn>{{ i18n.ts.blockedByBase }}</MkInfo>
 						<MkSwitch v-model="isBlocked" :disabled="!meta || !instance || isBaseBlocked" @update:modelValue="toggleBlock">{{ i18n.ts.blockThisInstance }}</MkSwitch>
 						<MkSwitch v-model="rejectQuotes" :disabled="!instance" @update:modelValue="toggleRejectQuotes">{{ i18n.ts.rejectQuotesInstance }}</MkSwitch>
-						<MkSwitch v-model="isNSFW" :disabled="!instance" @update:modelValue="toggleNSFW">{{ i18n.ts.markInstanceAsNSFW }}</MkSwitch>
 						<MkSwitch v-model="rejectReports" :disabled="!instance" @update:modelValue="toggleRejectReports">{{ i18n.ts.rejectReports }}</MkSwitch>
 						<MkInfo v-if="isBaseMediaSilenced" warn>{{ i18n.ts.mediaSilencedByBase }}</MkInfo>
 						<MkSwitch v-model="isMediaSilenced" :disabled="!meta || !instance || isBaseMediaSilenced" @update:modelValue="toggleMediaSilenced">{{ i18n.ts.mediaSilenceThisInstance }}</MkSwitch>
@@ -259,7 +258,6 @@ const suspensionState = ref<'none' | 'manuallySuspended' | 'goneSuspended' | 'au
 const isSuspended = ref(false);
 const isBlocked = ref(false);
 const isSilenced = ref(false);
-const isNSFW = ref(false);
 const rejectQuotes = ref(false);
 const rejectReports = ref(false);
 const isMediaSilenced = ref(false);
@@ -320,13 +318,6 @@ const badges = computed(() => {
 				style: 'warning',
 			});
 		}
-		if (instance.value.isNSFW) {
-			arr.push({
-				key: 'nsfw',
-				label: i18n.ts.nsfw,
-				style: 'warning',
-			});
-		}
 		if (instance.value.isBubbled) {
 			arr.push({
 				key: 'bubbled',
@@ -404,7 +395,6 @@ async function fetch(withHint = false): Promise<void> {
 	isSuspended.value = suspensionState.value !== 'none';
 	isBlocked.value = instance.value?.isBlocked ?? false;
 	isSilenced.value = instance.value?.isSilenced ?? false;
-	isNSFW.value = instance.value?.isNSFW ?? false;
 	rejectReports.value = instance.value?.rejectReports ?? false;
 	rejectQuotes.value = instance.value?.rejectQuotes ?? false;
 	isMediaSilenced.value = instance.value?.isMediaSilenced ?? false;
@@ -470,18 +460,6 @@ async function toggleSuspended(): Promise<void> {
 	});
 }
 
-async function toggleNSFW(): Promise<void> {
-	if (!iAmModerator) return;
-	await os.promiseDialog(async () => {
-		if (!instance.value) throw new Error('No instance?');
-		await misskeyApi('admin/federation/update-instance', {
-			host: instance.value.host,
-			isNSFW: isNSFW.value,
-		});
-		await fetch();
-	});
-}
-
 async function toggleRejectReports(): Promise<void> {
 	if (!iAmModerator) return;
 	await os.promiseDialog(async () => {
diff --git a/packages/misskey-js/etc/misskey-js.api.md b/packages/misskey-js/etc/misskey-js.api.md
index 3575786e88..a6b5fa8338 100644
--- a/packages/misskey-js/etc/misskey-js.api.md
+++ b/packages/misskey-js/etc/misskey-js.api.md
@@ -2964,12 +2964,6 @@ type ModerationLog = {
 } | {
     type: 'setMandatoryCWForInstance';
     info: ModerationLogPayloads['setMandatoryCWForInstance'];
-} | {
-    type: 'setRemoteInstanceNSFW';
-    info: ModerationLogPayloads['setRemoteInstanceNSFW'];
-} | {
-    type: 'unsetRemoteInstanceNSFW';
-    info: ModerationLogPayloads['unsetRemoteInstanceNSFW'];
 } | {
     type: 'resetPassword';
     info: ModerationLogPayloads['resetPassword'];
@@ -3111,7 +3105,7 @@ type ModerationLog = {
 });
 
 // @public (undocumented)
-export const moderationLogTypes: readonly ["updateServerSettings", "suspend", "approve", "decline", "unsuspend", "updateUserNote", "addCustomEmoji", "updateCustomEmoji", "deleteCustomEmoji", "assignRole", "unassignRole", "createRole", "updateRole", "deleteRole", "clearQueue", "promoteQueue", "deleteDriveFile", "deleteNote", "createGlobalAnnouncement", "createUserAnnouncement", "updateGlobalAnnouncement", "updateUserAnnouncement", "deleteGlobalAnnouncement", "deleteUserAnnouncement", "resetPassword", "setMandatoryCW", "setMandatoryCWForNote", "setMandatoryCWForInstance", "setRemoteInstanceNSFW", "unsetRemoteInstanceNSFW", "suspendRemoteInstance", "unsuspendRemoteInstance", "rejectRemoteInstanceReports", "acceptRemoteInstanceReports", "updateRemoteInstanceNote", "markSensitiveDriveFile", "unmarkSensitiveDriveFile", "resolveAbuseReport", "forwardAbuseReport", "updateAbuseReportNote", "createInvitation", "createAd", "updateAd", "deleteAd", "createAvatarDecoration", "updateAvatarDecoration", "deleteAvatarDecoration", "unsetUserAvatar", "unsetUserBanner", "createSystemWebhook", "updateSystemWebhook", "deleteSystemWebhook", "createAbuseReportNotificationRecipient", "updateAbuseReportNotificationRecipient", "deleteAbuseReportNotificationRecipient", "deleteAccount", "deletePage", "deleteFlash", "deleteGalleryPost", "deleteChatRoom"];
+export const moderationLogTypes: readonly ["updateServerSettings", "suspend", "approve", "decline", "unsuspend", "updateUserNote", "addCustomEmoji", "updateCustomEmoji", "deleteCustomEmoji", "assignRole", "unassignRole", "createRole", "updateRole", "deleteRole", "clearQueue", "promoteQueue", "deleteDriveFile", "deleteNote", "createGlobalAnnouncement", "createUserAnnouncement", "updateGlobalAnnouncement", "updateUserAnnouncement", "deleteGlobalAnnouncement", "deleteUserAnnouncement", "resetPassword", "setMandatoryCW", "setMandatoryCWForNote", "setMandatoryCWForInstance", "suspendRemoteInstance", "unsuspendRemoteInstance", "rejectRemoteInstanceReports", "acceptRemoteInstanceReports", "updateRemoteInstanceNote", "markSensitiveDriveFile", "unmarkSensitiveDriveFile", "resolveAbuseReport", "forwardAbuseReport", "updateAbuseReportNote", "createInvitation", "createAd", "updateAd", "deleteAd", "createAvatarDecoration", "updateAvatarDecoration", "deleteAvatarDecoration", "unsetUserAvatar", "unsetUserBanner", "createSystemWebhook", "updateSystemWebhook", "deleteSystemWebhook", "createAbuseReportNotificationRecipient", "updateAbuseReportNotificationRecipient", "deleteAbuseReportNotificationRecipient", "deleteAccount", "deletePage", "deleteFlash", "deleteGalleryPost", "deleteChatRoom"];
 
 // @public (undocumented)
 type MuteCreateRequest = operations['mute___create']['requestBody']['content']['application/json'];
diff --git a/packages/misskey-js/src/autogen/types.ts b/packages/misskey-js/src/autogen/types.ts
index f41bca6fb3..ead1ca0c27 100644
--- a/packages/misskey-js/src/autogen/types.ts
+++ b/packages/misskey-js/src/autogen/types.ts
@@ -5346,7 +5346,6 @@ export type components = {
       infoUpdatedAt: string | null;
       /** Format: date-time */
       latestRequestReceivedAt: string | null;
-      isNSFW: boolean;
       rejectReports: boolean;
       rejectQuotes: boolean;
       moderationNote?: string | null;
@@ -8909,7 +8908,6 @@ export type operations = {
         'application/json': {
           host: string;
           isSuspended?: boolean;
-          isNSFW?: boolean;
           rejectReports?: boolean;
           moderationNote?: string;
           rejectQuotes?: boolean;
diff --git a/packages/misskey-js/src/consts.ts b/packages/misskey-js/src/consts.ts
index 25e02a9f1c..51c6c85053 100644
--- a/packages/misskey-js/src/consts.ts
+++ b/packages/misskey-js/src/consts.ts
@@ -152,8 +152,6 @@ export const moderationLogTypes = [
 	'setMandatoryCW',
 	'setMandatoryCWForNote',
 	'setMandatoryCWForInstance',
-	'setRemoteInstanceNSFW',
-	'unsetRemoteInstanceNSFW',
 	'suspendRemoteInstance',
 	'unsuspendRemoteInstance',
 	'rejectRemoteInstanceReports',
@@ -360,14 +358,6 @@ export type ModerationLogPayloads = {
 		oldCW: string | null;
 		host: string;
 	};
-	setRemoteInstanceNSFW: {
-		id: string;
-		host: string;
-	};
-	unsetRemoteInstanceNSFW: {
-		id: string;
-		host: string;
-	};
 	suspendRemoteInstance: {
 		id: string;
 		host: string;
diff --git a/packages/misskey-js/src/entities.ts b/packages/misskey-js/src/entities.ts
index b42d52115c..be3f83fda5 100644
--- a/packages/misskey-js/src/entities.ts
+++ b/packages/misskey-js/src/entities.ts
@@ -139,12 +139,6 @@ export type ModerationLog = {
 } | {
 	type: 'setMandatoryCWForInstance';
 	info: ModerationLogPayloads['setMandatoryCWForInstance'];
-} | {
-	type: 'setRemoteInstanceNSFW';
-	info: ModerationLogPayloads['setRemoteInstanceNSFW'];
-} | {
-	type: 'unsetRemoteInstanceNSFW';
-	info: ModerationLogPayloads['unsetRemoteInstanceNSFW'];
 } | {
 	type: 'resetPassword';
 	info: ModerationLogPayloads['resetPassword'];
diff --git a/sharkey-locales/de-DE.yml b/sharkey-locales/de-DE.yml
index bde6c9d759..7c7fcced01 100644
--- a/sharkey-locales/de-DE.yml
+++ b/sharkey-locales/de-DE.yml
@@ -221,8 +221,6 @@ _moderationLogTypes:
   approve: "Genehmigt"
   decline: "Abgelehnt"
   setMandatoryCW: "Inhaltswarnung für Benutzer gesetzt"
-  setRemoteInstanceNSFW: "Fremde Instanz als NSFW markiert"
-  unsetRemoteInstanceNSFW: "NSFW-Markierung für fremde Instanz entfernt"
   rejectRemoteInstanceReports: "Meldungen von fremder Instanz abgelehnt"
   acceptRemoteInstanceReports: "Meldungen von fremder Instanz akzeptiert"
   rejectQuotesUser: "Zitate von Benutzer gesperrt/entfernt"
diff --git a/sharkey-locales/en-US.yml b/sharkey-locales/en-US.yml
index 96a3d58fe0..f3e3951a7b 100644
--- a/sharkey-locales/en-US.yml
+++ b/sharkey-locales/en-US.yml
@@ -348,8 +348,6 @@ _moderationLogTypes:
   setMandatoryCW: "Set content warning for user"
   setMandatoryCWForNote: "Set content warning for note"
   setMandatoryCWForInstance: "Set content warning for instance"
-  setRemoteInstanceNSFW: "Set remote instance as NSFW"
-  unsetRemoteInstanceNSFW: "Unset remote instance as NSFW"
   rejectRemoteInstanceReports: "Rejected reports from remote instance"
   acceptRemoteInstanceReports: "Accepted reports from remote instance"
   rejectQuotesUser: "Blocked/Stripped quote posts from user"
diff --git a/sharkey-locales/ja-JP.yml b/sharkey-locales/ja-JP.yml
index 46566c39ac..9f326ed8e4 100644
--- a/sharkey-locales/ja-JP.yml
+++ b/sharkey-locales/ja-JP.yml
@@ -277,8 +277,6 @@ _abuseReport:
         webhook: "指定したSystemWebhookに通知を送ります(通報を受けた時と通報を解決した時にそれぞれ発信)"
 _moderationLogTypes:
   approve: "承認済み"
-  setRemoteInstanceNSFW: "Set remote instance as NSFW"
-  unsetRemoteInstanceNSFW: "Set remote instance as NSFW"
   rejectRemoteInstanceReports: "Rejected reports from remote instance"
   acceptRemoteInstanceReports: "Accepted reports from remote instance"
 _mfm:
diff --git a/sharkey-locales/th-TH.yml b/sharkey-locales/th-TH.yml
index 22d1eda8dd..5160361f46 100644
--- a/sharkey-locales/th-TH.yml
+++ b/sharkey-locales/th-TH.yml
@@ -46,8 +46,6 @@ _moderationLogTypes:
   approve: "ที่ได้รับการอนุมัติ"
   decline: "ปฏิเสธ"
   setMandatoryCW: "ตั้งค่าคำเตือนเนื้อหาสำหรับผู้ใช้"
-  setRemoteInstanceNSFW: "ตั้งค่าเซิร์ฟเวอร์ระยะไกลเป็น NSFW"
-  unsetRemoteInstanceNSFW: "ปิดการใช้งานการตั้งค่าเซิร์ฟเวอร์ระยะไกลเป็น NSFW"
   rejectRemoteInstanceReports: "รายงานถูกปฏิเสธจากเซิร์ฟเวอร์ระยะไกล"
   acceptRemoteInstanceReports: "รายงานได้รับการยอมรับจากเซิร์ฟเวอร์ระยะไกล"
   rejectQuotesUser: "โพสต์คำพูดของผู้ใช้ถูกบล็อค/ลบ"
diff --git a/sharkey-locales/vi-VN.yml b/sharkey-locales/vi-VN.yml
index c382e317e6..2ff8bd7225 100644
--- a/sharkey-locales/vi-VN.yml
+++ b/sharkey-locales/vi-VN.yml
@@ -41,8 +41,6 @@ _moderationLogTypes:
     approve: "Đã chấp thuận"
     decline: "Từ chối"
     setMandatoryCW: "Đặt cảnh báo nội dung cho người dùng"
-    setRemoteInstanceNSFW: "Đặt máy chủ từ xa thành NSFW"
-    unsetRemoteInstanceNSFW: "Hủy cài đặt máy chủ từ xa thành NSFW"
     rejectRemoteInstanceReports: "Báo cáo bị từ chối từ máy chủ từ xa"
     acceptRemoteInstanceReports: "Đã chấp nhận báo cáo từ máy chủ từ xa"
     rejectQuotesUser: "Đã chặn/Xóa bài đăng trích dẫn của người dùng"

From ffcb6de3c03633fd2edace28c47b358604e2be90 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Sun, 29 Jun 2025 19:25:45 -0400
Subject: [PATCH 017/110] expand matching user/instance in DynamicNote

---
 .../frontend/src/components/DynamicNote.vue   | 27 +++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/packages/frontend/src/components/DynamicNote.vue b/packages/frontend/src/components/DynamicNote.vue
index 5d01d3e255..985831d2f8 100644
--- a/packages/frontend/src/components/DynamicNote.vue
+++ b/packages/frontend/src/components/DynamicNote.vue
@@ -14,7 +14,7 @@ Displays a note with either Misskey or Sharkey style, based on user preference.
 	:withHardMute="withHardMute"
 	@reaction="emoji => emit('reaction', emoji)"
 	@removeReaction="emoji => emit('removeReaction', emoji)"
-	@expandMute="n => emit('expandMute', n)"
+	@expandMute="n => onExpandNote(n)"
 />
 </template>
 
@@ -25,6 +25,8 @@ import type { ComponentExposed } from 'vue-component-type-helpers';
 import type MkNote from '@/components/MkNote.vue';
 import type SkNote from '@/components/SkNote.vue';
 import { prefer } from '@/preferences';
+import { deepAssign } from '@/utility/merge';
+import { useMuteOverrides } from '@/utility/check-word-mute';
 
 const XNote = defineAsyncComponent(() =>
 	prefer.s.noteDesign === 'misskey'
@@ -32,10 +34,11 @@ const XNote = defineAsyncComponent(() =>
 		: import('@/components/SkNote.vue'));
 
 const rootEl = useTemplateRef<ComponentExposed<typeof MkNote | typeof SkNote>>('rootEl');
+const muteOverrides = useMuteOverrides();
 
 defineExpose({ rootEl });
 
-defineProps<{
+const props = defineProps<{
 	note: Misskey.entities.Note;
 	pinned?: boolean;
 	mock?: boolean;
@@ -47,4 +50,24 @@ const emit = defineEmits<{
 	(ev: 'removeReaction', emoji: string): void;
 	(ev: 'expandMute', note: Misskey.entities.Note): void;
 }>();
+
+function onExpandNote(note: Misskey.entities.Note) {
+	// Expand the user/instance CW for matching subthread (and the inline reply/renote view)
+	if (note.id === props.note.id) {
+		deepAssign(muteOverrides, {
+			user: {
+				[note.user.id]: {
+					userMandatoryCW: null,
+				},
+			},
+			instance: {
+				[note.user.host ?? '']: {
+					instanceMandatoryCW: null,
+				},
+			},
+		});
+	}
+
+	emit('expandMute', note);
+}
 </script>

From dfb3106deabad29a80aee7ec1f2aba0a1d6818ad Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Sun, 29 Jun 2025 19:26:04 -0400
Subject: [PATCH 018/110] propagate mute expand events from all note types

---
 .../frontend/src/components/DynamicNoteSimple.vue   |  7 +++----
 packages/frontend/src/components/MkNote.vue         |  2 +-
 packages/frontend/src/components/MkNoteDetailed.vue |  9 ++++-----
 packages/frontend/src/components/MkNoteSimple.vue   |  4 ++--
 packages/frontend/src/components/MkNoteSub.vue      |  8 ++++++--
 packages/frontend/src/components/SkNote.vue         |  3 ++-
 packages/frontend/src/components/SkNoteDetailed.vue |  9 +++++----
 packages/frontend/src/components/SkNoteSimple.vue   | 13 ++++++++++---
 packages/frontend/src/components/SkNoteSub.vue      |  8 ++++++--
 9 files changed, 39 insertions(+), 24 deletions(-)

diff --git a/packages/frontend/src/components/DynamicNoteSimple.vue b/packages/frontend/src/components/DynamicNoteSimple.vue
index 7729c8e7eb..fdb895713e 100644
--- a/packages/frontend/src/components/DynamicNoteSimple.vue
+++ b/packages/frontend/src/components/DynamicNoteSimple.vue
@@ -17,7 +17,7 @@ Displays a note in the simple view with either Misskey or Sharkey style, based o
 
 <script setup lang="ts">
 import * as Misskey from 'misskey-js';
-import { computed, defineAsyncComponent, useTemplateRef } from 'vue';
+import { defineAsyncComponent, useTemplateRef } from 'vue';
 import type { ComponentExposed } from 'vue-component-type-helpers';
 import type MkNoteSimple from '@/components/MkNoteSimple.vue';
 import type SkNoteSimple from '@/components/SkNoteSimple.vue';
@@ -25,9 +25,8 @@ import { prefer } from '@/preferences';
 
 const XNoteSimple = defineAsyncComponent(() =>
 	prefer.s.noteDesign === 'misskey'
-	? import('@/components/MkNoteSimple.vue')
-	: import('@/components/SkNoteSimple.vue'),
-);
+		? import('@/components/MkNoteSimple.vue')
+		: import('@/components/SkNoteSimple.vue'));
 
 const rootEl = useTemplateRef<ComponentExposed<typeof MkNoteSimple | typeof SkNoteSimple>>('rootEl');
 
diff --git a/packages/frontend/src/components/MkNote.vue b/packages/frontend/src/components/MkNote.vue
index 30a9a1ad00..bf4f48497b 100644
--- a/packages/frontend/src/components/MkNote.vue
+++ b/packages/frontend/src/components/MkNote.vue
@@ -19,7 +19,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 		<MkAcct :user="appearNote.reply.user" :class="$style.collapsedInReplyToText" @click="inReplyToCollapsed = false"/>:
 		<Mfm :text="getNoteSummary(appearNote.reply)" :plain="true" :nowrap="true" :author="appearNote.reply.user" :nyaize="'respect'" :class="$style.collapsedInReplyToText" @click="inReplyToCollapsed = false"/>
 	</div>
-	<MkNoteSub v-if="appearNote.reply" v-show="!renoteCollapsed && !inReplyToCollapsed" :note="appearNote.reply" :class="$style.replyTo"/>
+	<MkNoteSub v-if="appearNote.reply" v-show="!renoteCollapsed && !inReplyToCollapsed" :note="appearNote.reply" :class="$style.replyTo" @expandMute="n => emit('expandMute', n)"/>
 	<div v-if="pinned" :class="$style.tip"><i class="ti ti-pin"></i> {{ i18n.ts.pinnedNote }}</div>
 	<div v-if="isRenote" :class="$style.renote">
 		<div v-if="note.channel" :class="$style.colorBar" :style="{ background: note.channel.color }"></div>
diff --git a/packages/frontend/src/components/MkNoteDetailed.vue b/packages/frontend/src/components/MkNoteDetailed.vue
index f63e18f42a..92f23224d7 100644
--- a/packages/frontend/src/components/MkNoteDetailed.vue
+++ b/packages/frontend/src/components/MkNoteDetailed.vue
@@ -17,9 +17,9 @@ SPDX-License-Identifier: AGPL-3.0-only
 		<div v-if="!conversationLoaded" style="padding: 16px">
 			<MkButton style="margin: 0 auto;" primary rounded @click="loadConversation">{{ i18n.ts.loadConversation }}</MkButton>
 		</div>
-		<MkNoteSub v-for="note in conversation" :key="note.id" :class="$style.replyToMore" :note="note" :expandAllCws="props.expandAllCws"/>
+		<MkNoteSub v-for="note in conversation" :key="note.id" :class="$style.replyToMore" :note="note" :expandAllCws="props.expandAllCws" @expandMute="n => emit('expandMute', n)"/>
 	</div>
-	<MkNoteSub v-if="appearNote.reply" :note="appearNote.reply" :class="$style.replyTo" :expandAllCws="props.expandAllCws"/>
+	<MkNoteSub v-if="appearNote.reply" :note="appearNote.reply" :class="$style.replyTo" :expandAllCws="props.expandAllCws" @expandMute="n => emit('expandMute', n)"/>
 	<div v-if="isRenote" :class="$style.renote">
 		<MkAvatar :class="$style.renoteAvatar" :user="note.user" link preview/>
 		<i class="ti ti-repeat" style="margin-right: 4px;"></i>
@@ -189,7 +189,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 			<div v-if="!repliesLoaded" style="padding: 16px">
 				<MkButton style="margin: 0 auto;" primary rounded @click="loadReplies">{{ i18n.ts.loadReplies }}</MkButton>
 			</div>
-			<MkNoteSub v-for="note in replies" :key="note.id" :note="note" :class="$style.reply" :detail="true" :expandAllCws="props.expandAllCws" :onDeleteCallback="removeReply"/>
+			<MkNoteSub v-for="note in replies" :key="note.id" :note="note" :class="$style.reply" :detail="true" :expandAllCws="props.expandAllCws" :onDeleteCallback="removeReply" @expandMute="n => emit('expandMute', n)"/>
 		</div>
 		<div v-else-if="tab === 'renotes'" :class="$style.tab_renotes">
 			<MkPagination :pagination="renotesPagination" :disableAutoLoad="true">
@@ -206,7 +206,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 			<div v-if="!quotesLoaded" style="padding: 16px">
 				<MkButton style="margin: 0 auto;" primary rounded @click="loadQuotes">{{ i18n.ts.loadReplies }}</MkButton>
 			</div>
-			<MkNoteSub v-for="note in quotes" :key="note.id" :note="note" :class="$style.reply" :detail="true" :expandAllCws="props.expandAllCws"/>
+			<MkNoteSub v-for="note in quotes" :key="note.id" :note="note" :class="$style.reply" :detail="true" :expandAllCws="props.expandAllCws" @expandMute="n => emit('expandMute', n)"/>
 		</div>
 		<div v-else-if="tab === 'reactions'" :class="$style.tab_reactions">
 			<div :class="$style.reactionTabs">
@@ -235,7 +235,6 @@ import * as mfm from 'mfm-js';
 import * as Misskey from 'misskey-js';
 import { isLink } from '@@/js/is-link.js';
 import * as config from '@@/js/config.js';
-import { computeMergedCw } from '@@/js/compute-merged-cw.js';
 import type { OpenOnRemoteOptions } from '@/utility/please-login.js';
 import type { Paging } from '@/components/MkPagination.vue';
 import type { Keymap } from '@/utility/hotkey.js';
diff --git a/packages/frontend/src/components/MkNoteSimple.vue b/packages/frontend/src/components/MkNoteSimple.vue
index ba3719cf85..ad59350af5 100644
--- a/packages/frontend/src/components/MkNoteSimple.vue
+++ b/packages/frontend/src/components/MkNoteSimple.vue
@@ -26,9 +26,8 @@ SPDX-License-Identifier: AGPL-3.0-only
 </template>
 
 <script lang="ts" setup>
-import { computed, ref, watch } from 'vue';
+import { ref, watch } from 'vue';
 import * as Misskey from 'misskey-js';
-import { computeMergedCw } from '@@/js/compute-merged-cw.js';
 import * as os from '@/os.js';
 import MkNoteHeader from '@/components/MkNoteHeader.vue';
 import MkSubNoteContent from '@/components/MkSubNoteContent.vue';
@@ -59,6 +58,7 @@ if (!note.value.isSchedule) {
 
 const emit = defineEmits<{
 	(ev: 'editScheduleNote'): void;
+	(ev: 'expandMute', note: Misskey.entities.Note): void;
 }>();
 
 async function deleteScheduleNote() {
diff --git a/packages/frontend/src/components/MkNoteSub.vue b/packages/frontend/src/components/MkNoteSub.vue
index 1c66d5580b..7a04494fff 100644
--- a/packages/frontend/src/components/MkNoteSub.vue
+++ b/packages/frontend/src/components/MkNoteSub.vue
@@ -4,7 +4,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 -->
 
 <template>
-<SkMutedNote v-show="!isDeleted" ref="rootComp" :note="appearNote" :mutedClass="$style.muted" :expandedClass="[$style.root, { [$style.children]: depth > 1 }]">
+<SkMutedNote v-show="!isDeleted" ref="rootComp" :note="appearNote" :mutedClass="$style.muted" :expandedClass="[$style.root, { [$style.children]: depth > 1 }]" @expandMute="n => emit('expandMute', n)">
 	<div :class="$style.main">
 		<div v-if="note.channel" :class="$style.colorBar" :style="{ background: note.channel.color }"></div>
 		<MkAvatar :class="$style.avatar" :user="note.user" link preview/>
@@ -72,7 +72,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 		</div>
 	</div>
 	<template v-if="depth < prefer.s.numberOfReplies">
-		<MkNoteSub v-for="reply in replies" :key="reply.id" :note="reply" :class="$style.reply" :detail="true" :depth="depth + 1" :expandAllCws="props.expandAllCws" :onDeleteCallback="removeReply"/>
+		<MkNoteSub v-for="reply in replies" :key="reply.id" :note="reply" :class="$style.reply" :detail="true" :depth="depth + 1" :expandAllCws="props.expandAllCws" :onDeleteCallback="removeReply" @expandMute="n => emit('expandMute', n)"/>
 	</template>
 	<div v-else :class="$style.more">
 		<MkA class="_link" :to="notePage(note)">{{ i18n.ts.continueThread }} <i class="ti ti-chevron-double-right"></i></MkA>
@@ -126,6 +126,10 @@ const props = withDefaults(defineProps<{
 	onDeleteCallback: undefined,
 });
 
+const emit = defineEmits<{
+	(ev: 'expandMute', note: Misskey.entities.Note): void;
+}>();
+
 const note = ref(deepClone(props.note));
 
 const appearNote = computed(() => getAppearNote(note.value));
diff --git a/packages/frontend/src/components/SkNote.vue b/packages/frontend/src/components/SkNote.vue
index 15b90e205e..851ae0b86b 100644
--- a/packages/frontend/src/components/SkNote.vue
+++ b/packages/frontend/src/components/SkNote.vue
@@ -16,7 +16,7 @@ Displays a note in the Sharkey style. Used to show the "main" note in a given co
 	:tabindex="isDeleted ? '-1' : '0'"
 	@expandMute="n => emit('expandMute', n)"
 >
-	<SkNoteSub v-if="appearNote.reply" v-show="!renoteCollapsed && !inReplyToCollapsed" :note="appearNote.reply" :class="$style.replyTo"/>
+	<SkNoteSub v-if="appearNote.reply" v-show="!renoteCollapsed && !inReplyToCollapsed" :note="appearNote.reply" :class="$style.replyTo" @expandMute="n => emit('expandMute', n)"/>
 	<div v-if="appearNote.reply && inReplyToCollapsed && !renoteCollapsed" :class="$style.collapsedInReplyTo">
 		<div :class="$style.collapsedInReplyToLine"></div>
 		<MkAvatar :class="$style.collapsedInReplyToAvatar" :user="appearNote.reply.user" link preview/>
@@ -231,6 +231,7 @@ import SkNoteTranslation from '@/components/SkNoteTranslation.vue';
 import { getSelfNoteIds } from '@/utility/get-self-note-ids.js';
 import { extractPreviewUrls } from '@/utility/extract-preview-urls.js';
 import SkUrlPreviewGroup from '@/components/SkUrlPreviewGroup.vue';
+import MkNoteSub from '@/components/MkNoteSub.vue';
 
 const props = withDefaults(defineProps<{
 	note: Misskey.entities.Note;
diff --git a/packages/frontend/src/components/SkNoteDetailed.vue b/packages/frontend/src/components/SkNoteDetailed.vue
index d02987c9f6..16759bb3b4 100644
--- a/packages/frontend/src/components/SkNoteDetailed.vue
+++ b/packages/frontend/src/components/SkNoteDetailed.vue
@@ -44,9 +44,9 @@ Detailed view of a note in the Sharkey style. Used when opening a note onto its
 		</div>
 	</div>
 	<template v-if="appearNote.reply && appearNote.reply.replyId">
-		<SkNoteSub v-for="note in conversation" :key="note.id" :note="note" :expandAllCws="props.expandAllCws" detailed/>
+		<SkNoteSub v-for="note in conversation" :key="note.id" :note="note" :expandAllCws="props.expandAllCws" detailed @expandMute="n => emit('expandMute', n)"/>
 	</template>
-	<SkNoteSub v-if="appearNote.reply" :note="appearNote.reply" :class="$style.replyTo" :expandAllCws="props.expandAllCws" detailed/>
+	<SkNoteSub v-if="appearNote.reply" :note="appearNote.reply" :class="$style.replyTo" :expandAllCws="props.expandAllCws" detailed @expandMute="n => emit('expandMute', n)"/>
 	<article :id="appearNote.id" ref="noteEl" :class="$style.note" tabindex="-1" @contextmenu.stop="onContextmenu">
 		<header :class="$style.noteHeader">
 			<MkAvatar :class="$style.noteHeaderAvatar" :user="appearNote.user" indicator link preview/>
@@ -195,7 +195,7 @@ Detailed view of a note in the Sharkey style. Used when opening a note onto its
 			<div v-if="!repliesLoaded" style="padding: 16px">
 				<MkButton style="margin: 0 auto;" primary rounded @click="loadReplies">{{ i18n.ts.loadReplies }}</MkButton>
 			</div>
-			<SkNoteSub v-for="note in replies" :key="note.id" :note="note" :class="$style.reply" :detail="true" :expandAllCws="props.expandAllCws" :onDeleteCallback="removeReply" :isReply="true"/>
+			<SkNoteSub v-for="note in replies" :key="note.id" :note="note" :class="$style.reply" :detail="true" :expandAllCws="props.expandAllCws" :onDeleteCallback="removeReply" :isReply="true" @expandMute="n => emit('expandMute', n)"/>
 		</div>
 		<div v-else-if="tab === 'renotes'" :class="$style.tab_renotes">
 			<MkPagination :pagination="renotesPagination" :disableAutoLoad="true">
@@ -212,7 +212,7 @@ Detailed view of a note in the Sharkey style. Used when opening a note onto its
 			<div v-if="!quotesLoaded" style="padding: 16px">
 				<MkButton style="margin: 0 auto;" primary rounded @click="loadQuotes">{{ i18n.ts.loadReplies }}</MkButton>
 			</div>
-			<SkNoteSub v-for="note in quotes" :key="note.id" :note="note" :class="$style.reply" :detail="true" :expandAllCws="props.expandAllCws" :reply="true"/>
+			<SkNoteSub v-for="note in quotes" :key="note.id" :note="note" :class="$style.reply" :detail="true" :expandAllCws="props.expandAllCws" :reply="true" @expandMute="n => emit('expandMute', n)"/>
 		</div>
 		<div v-else-if="tab === 'reactions'" :class="$style.tab_reactions">
 			<div :class="$style.reactionTabs">
@@ -289,6 +289,7 @@ import SkMutedNote from '@/components/SkMutedNote.vue';
 import SkNoteTranslation from '@/components/SkNoteTranslation.vue';
 import { getSelfNoteIds } from '@/utility/get-self-note-ids.js';
 import SkUrlPreviewGroup from '@/components/SkUrlPreviewGroup.vue';
+import MkNoteSub from '@/components/MkNoteSub.vue';
 
 const props = withDefaults(defineProps<{
 	note: Misskey.entities.Note;
diff --git a/packages/frontend/src/components/SkNoteSimple.vue b/packages/frontend/src/components/SkNoteSimple.vue
index 3023498748..809272b833 100644
--- a/packages/frontend/src/components/SkNoteSimple.vue
+++ b/packages/frontend/src/components/SkNoteSimple.vue
@@ -24,9 +24,8 @@ Simple view of a note in the Sharkey style. Used in quote renotes, link previews
 </template>
 
 <script lang="ts" setup>
-import { watch, ref, computed } from 'vue';
+import { watch, ref } from 'vue';
 import * as Misskey from 'misskey-js';
-import { computeMergedCw } from '@@/js/compute-merged-cw.js';
 import MkNoteHeader from '@/components/MkNoteHeader.vue';
 import MkSubNoteContent from '@/components/MkSubNoteContent.vue';
 import MkCwButton from '@/components/MkCwButton.vue';
@@ -35,11 +34,19 @@ import { setupNoteViewInterruptors } from '@/plugin.js';
 import { deepClone } from '@/utility/clone.js';
 
 const props = defineProps<{
-	note: Misskey.entities.Note;
+	note: Misskey.entities.Note & {
+		isSchedule?: boolean,
+		scheduledNoteId?: string
+	};
 	expandAllCws?: boolean;
 	hideFiles?: boolean;
 }>();
 
+defineEmits<{
+	(ev: 'editScheduleNote'): void;
+	(ev: 'expandMute', note: Misskey.entities.Note): void;
+}>();
+
 let showContent = ref(prefer.s.uncollapseCW);
 
 const note = ref(deepClone(props.note));
diff --git a/packages/frontend/src/components/SkNoteSub.vue b/packages/frontend/src/components/SkNoteSub.vue
index 584303bc5c..d8ec33df3c 100644
--- a/packages/frontend/src/components/SkNoteSub.vue
+++ b/packages/frontend/src/components/SkNoteSub.vue
@@ -8,7 +8,7 @@ For example, when viewing a reply on the timeline, SkNoteSub will be used to dis
 -->
 
 <template>
-<SkMutedNote v-show="!isDeleted" ref="rootComp" :note="appearNote" :mutedClass="$style.muted" :expandedClass="[$style.root, { [$style.children]: depth > 1, [$style.isReply]: props.isReply, [$style.detailed]: props.detailed }]">
+<SkMutedNote v-show="!isDeleted" ref="rootComp" :note="appearNote" :mutedClass="$style.muted" :expandedClass="[$style.root, { [$style.children]: depth > 1, [$style.isReply]: props.isReply, [$style.detailed]: props.detailed }]" @expandMute="n => emit('expandMute', n)">
 	<div v-if="!hideLine" :class="$style.line"></div>
 	<div :class="$style.main">
 		<div v-if="note.channel" :class="$style.colorBar" :style="{ background: note.channel.color }"></div>
@@ -84,7 +84,7 @@ For example, when viewing a reply on the timeline, SkNoteSub will be used to dis
 		</div>
 	</div>
 	<template v-if="depth < prefer.s.numberOfReplies">
-		<SkNoteSub v-for="reply in replies" :key="reply.id" :note="reply" :class="[$style.reply, { [$style.single]: replies.length === 1 }]" :detail="true" :depth="depth + 1" :expandAllCws="props.expandAllCws" :onDeleteCallback="removeReply" :isReply="props.isReply"/>
+		<SkNoteSub v-for="reply in replies" :key="reply.id" :note="reply" :class="[$style.reply, { [$style.single]: replies.length === 1 }]" :detail="true" :depth="depth + 1" :expandAllCws="props.expandAllCws" :onDeleteCallback="removeReply" :isReply="props.isReply" @expandMute="n => emit('expandMute', n)"/>
 	</template>
 	<div v-else :class="$style.more">
 		<MkA class="_link" :to="notePage(note)">{{ i18n.ts.continueThread }} <i class="ti ti-chevron-double-right"></i></MkA>
@@ -143,6 +143,10 @@ const props = withDefaults(defineProps<{
 	onDeleteCallback: undefined,
 });
 
+const emit = defineEmits<{
+	(ev: 'expandMute', note: Misskey.entities.Note): void;
+}>();
+
 const note = ref(deepClone(props.note));
 
 const appearNote = computed(() => getAppearNote(note.value));

From 57b9988c81ccbeea6c68895b40a0e8a9833b27d8 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Sun, 29 Jun 2025 19:30:26 -0400
Subject: [PATCH 019/110] bulk-expand mandatory CWs on the following feed's
 user view

---
 .../src/components/SkUserRecentNotes.vue      | 20 ++++++++++++++++++-
 packages/frontend/src/pages/user/home.vue     |  6 +++---
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/packages/frontend/src/components/SkUserRecentNotes.vue b/packages/frontend/src/components/SkUserRecentNotes.vue
index a08899a740..dbc4b324f9 100644
--- a/packages/frontend/src/components/SkUserRecentNotes.vue
+++ b/packages/frontend/src/components/SkUserRecentNotes.vue
@@ -9,7 +9,7 @@ Displays a user's recent notes for the "Following" feed.
 <MkPullToRefresh :refresher="() => reload()">
 	<div v-if="user" :class="$style.userInfo">
 		<MkUserInfo :class="$style.userInfo" class="user" :user="user"/>
-		<MkNotes :noGap="true" :pagination="pagination"/>
+		<MkNotes :noGap="true" :pagination="pagination" @expandMute="n => onExpandMute(n)"/>
 	</div>
 	<div v-else-if="loadError" :class="$style.panel">{{ loadError }}</div>
 	<MkLoading v-else-if="userId"/>
@@ -26,6 +26,8 @@ import MkNotes from '@/components/MkNotes.vue';
 import MkUserInfo from '@/components/MkUserInfo.vue';
 import MkPullToRefresh from '@/components/MkPullToRefresh.vue';
 import { misskeyApi } from '@/utility/misskey-api.js';
+import { useMuteOverrides } from '@/utility/check-word-mute';
+import { deepAssign } from '@/utility/merge';
 
 const props = defineProps<{
 	userId: string;
@@ -54,6 +56,22 @@ const pagination: Paging<'users/notes'> = {
 	})),
 };
 
+const muteOverrides = useMuteOverrides();
+
+function onExpandMute(note: Misskey.entities.Note) {
+	if (note.user.id === props.userId) {
+		// This kills the mandatoryCW for this user below this point
+		deepAssign(muteOverrides, {
+			user: {
+				[props.userId]: {
+					userMandatoryCW: null,
+					instanceMandatoryCW: null,
+				},
+			},
+		});
+	}
+}
+
 defineExpose({
 	reload,
 	user,
diff --git a/packages/frontend/src/pages/user/home.vue b/packages/frontend/src/pages/user/home.vue
index fcb03e89a3..241bdcd579 100644
--- a/packages/frontend/src/pages/user/home.vue
+++ b/packages/frontend/src/pages/user/home.vue
@@ -176,10 +176,10 @@ SPDX-License-Identifier: AGPL-3.0-only
 								<MkResult type="empty" :text="i18n.ts.noNotes"/>
 							</div>
 							<div v-else class="_panel">
-								<DynamicNote v-for="note of user.pinnedNotes" :key="note.id" class="note" :class="$style.pinnedNote" :note="note" :pinned="true" @expandMute="n => onExpandCW(n)"/>
+								<DynamicNote v-for="note of user.pinnedNotes" :key="note.id" class="note" :class="$style.pinnedNote" :note="note" :pinned="true" @expandMute="n => onExpandMute(n)"/>
 							</div>
 						</div>
-						<MkNotes v-else :class="$style.tl" :noGap="true" :pagination="AllPagination" @expandMute="n => onExpandCW(n)"/>
+						<MkNotes v-else :class="$style.tl" :noGap="true" :pagination="AllPagination" @expandMute="n => onExpandMute(n)"/>
 					</MkLazy>
 				</MkStickyContainer>
 			</div>
@@ -259,7 +259,7 @@ const emit = defineEmits<{
 
 const muteOverrides = useMuteOverrides();
 
-function onExpandCW(note: Misskey.entities.Note) {
+function onExpandMute(note: Misskey.entities.Note) {
 	if (note.user.id === props.user.id) {
 		// This kills the mandatoryCW for this user below this point
 		deepAssign(muteOverrides, {

From 8652a4c63b8830e0283c1d49deee294743c8f8b7 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Mon, 30 Jun 2025 13:33:56 -0400
Subject: [PATCH 020/110] allow SkMutedNote to not recurse for word mutes

---
 .../frontend/src/components/SkMutedNote.vue   |  9 ++++-
 .../frontend/src/utility/check-word-mute.ts   | 40 +++++++++++--------
 2 files changed, 32 insertions(+), 17 deletions(-)

diff --git a/packages/frontend/src/components/SkMutedNote.vue b/packages/frontend/src/components/SkMutedNote.vue
index 387d68a338..13e2760e0e 100644
--- a/packages/frontend/src/components/SkMutedNote.vue
+++ b/packages/frontend/src/components/SkMutedNote.vue
@@ -86,10 +86,12 @@ import { checkMute } from '@/utility/check-word-mute.js';
 const props = withDefaults(defineProps<{
 	note: Misskey.entities.Note;
 	withHardMute?: boolean;
+	dive?: boolean;
 	mutedClass?: string | string[] | Record<string, boolean> | (string | string[] | Record<string, boolean>)[];
 	expandedClass?: string | string[] | Record<string, boolean> | (string | string[] | Record<string, boolean>)[];
 }>(), {
 	withHardMute: true,
+	dive: true,
 	mutedClass: undefined,
 	expandedClass: undefined,
 });
@@ -105,7 +107,12 @@ function expand() {
 	emit('expandMute', props.note);
 }
 
-const mute = checkMute(computed(() => props.note), computed(() => props.withHardMute));
+const mute = checkMute(
+	computed(() => props.note),
+	computed(() => props.withHardMute),
+	computed(() => props.dive),
+);
+
 const mutedWords = computed(() => mute.value.softMutedWords?.join(', '));
 const isExpanded = computed(() => expandNote.value || !mute.value.hasMute);
 const rootClass = computed(() => isExpanded.value ? props.expandedClass : undefined);
diff --git a/packages/frontend/src/utility/check-word-mute.ts b/packages/frontend/src/utility/check-word-mute.ts
index 3f363573e7..78869e9250 100644
--- a/packages/frontend/src/utility/check-word-mute.ts
+++ b/packages/frontend/src/utility/check-word-mute.ts
@@ -4,7 +4,7 @@
  */
 
 import * as Misskey from 'misskey-js';
-import { provide, inject, reactive, computed } from 'vue';
+import { provide, inject, reactive, computed, unref } from 'vue';
 import type { Ref, ComputedRef, Reactive } from 'vue';
 import { $i } from '@/i.js';
 import { deepAssign } from '@/utility/merge';
@@ -84,14 +84,19 @@ function provideMuteOverrides(overrides: Reactive<MuteOverrides> | null) {
 	provide(muteOverridesSymbol, overrides);
 }
 
-export function checkMute(note: ComputedRef<Misskey.entities.Note>, withHardMute?: ComputedRef<boolean>): ComputedRef<Mute> {
+export function checkMute(note: Misskey.entities.Note | ComputedRef<Misskey.entities.Note>, withHardMute?: boolean | ComputedRef<boolean>, dive?: boolean | ComputedRef<boolean>): ComputedRef<Mute> {
 	// inject() can only be used inside script setup, so it MUST be outside the computed block!
 	const overrides = injectMuteOverrides();
 
-	return computed(() => getMutes(note.value, withHardMute?.value ?? true, overrides));
+	return computed(() => {
+		const _note = unref(note);
+		const _withHardMute = unref(withHardMute) ?? true;
+		const _dive = unref(dive) ?? false;
+		return getMutes(_note, _withHardMute, _dive, overrides);
+	});
 }
 
-function getMutes(note: Misskey.entities.Note, withHardMute: boolean, overrides: MuteOverrides | null): Mute {
+function getMutes(note: Misskey.entities.Note, withHardMute: boolean, dive: boolean, overrides: MuteOverrides | null): Mute {
 	const override: Partial<Mute> = overrides ? deepAssign(
 		{},
 		note.user.host ? overrides.instance[note.user.host] : undefined,
@@ -103,8 +108,8 @@ function getMutes(note: Misskey.entities.Note, withHardMute: boolean, overrides:
 
 	const isMe = $i != null && $i.id === note.userId;
 
-	const hardMuted = override.hardMuted ?? (!isMe && withHardMute && isHardMuted(note));
-	const softMutedWords = override.softMutedWords ?? (isMe ? [] : isSoftMuted(note));
+	const hardMuted = override.hardMuted ?? (!isMe && withHardMute && isHardMuted(note, dive));
+	const softMutedWords = override.softMutedWords ?? (isMe ? [] : isSoftMuted(note, dive));
 	const sensitiveMuted = override.sensitiveMuted ?? isSensitiveMuted(note);
 	const threadMuted = override.threadMuted ?? (!isMe && note.isMutingThread);
 	const noteMuted = override.noteMuted ?? (!isMe && note.isMutingNote);
@@ -125,17 +130,17 @@ function getMutes(note: Misskey.entities.Note, withHardMute: boolean, overrides:
 	return { hasMute, hardMuted, softMutedWords, sensitiveMuted, threadMuted, noteMuted, noteMandatoryCW, userMandatoryCW, instanceMandatoryCW };
 }
 
-function isHardMuted(note: Misskey.entities.Note): boolean {
+function isHardMuted(note: Misskey.entities.Note, dive: boolean): boolean {
 	if (!$i?.hardMutedWords.length) return false;
 
-	const inputs = expandNote(note);
+	const inputs = expandNote(note, dive);
 	return containsMutedWord($i.hardMutedWords, inputs);
 }
 
-function isSoftMuted(note: Misskey.entities.Note): string[] {
+function isSoftMuted(note: Misskey.entities.Note, dive: boolean): string[] {
 	if (!$i?.mutedWords.length) return [];
 
-	const inputs = expandNote(note);
+	const inputs = expandNote(note, dive);
 	return getMutedWords($i.mutedWords, inputs);
 }
 
@@ -210,7 +215,7 @@ export function containsMutedWord(mutedWords: (string | string[])[], inputs: Ite
 	return false;
 }
 
-export function *expandNote(note: Misskey.entities.Note): Generator<string> {
+export function *expandNote(note: Misskey.entities.Note, dive: boolean): Generator<string> {
 	if (note.cw) yield note.cw;
 	if (note.text) yield note.text;
 	if (note.files) {
@@ -223,11 +228,14 @@ export function *expandNote(note: Misskey.entities.Note): Generator<string> {
 			if (choice.text) yield choice.text;
 		}
 	}
-	if (note.reply) {
-		yield * expandNote(note.reply);
-	}
-	if (note.renote) {
-		yield * expandNote(note.renote);
+
+	if (dive) {
+		if (note.reply) {
+			yield* expandNote(note.reply, true);
+		}
+		if (note.renote) {
+			yield* expandNote(note.renote, true);
+		}
 	}
 }
 

From 179c7e18bd59773592f81bec66a49f658ca6bdc8 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Mon, 30 Jun 2025 13:34:15 -0400
Subject: [PATCH 021/110] don't recurse for word mutes in sub-notes and
 following-feed entries

---
 packages/frontend/src/components/MkNoteSub.vue            | 2 +-
 packages/frontend/src/components/SkFollowingFeedEntry.vue | 2 +-
 packages/frontend/src/components/SkNoteSub.vue            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/frontend/src/components/MkNoteSub.vue b/packages/frontend/src/components/MkNoteSub.vue
index 7a04494fff..2b1b7ac9dd 100644
--- a/packages/frontend/src/components/MkNoteSub.vue
+++ b/packages/frontend/src/components/MkNoteSub.vue
@@ -4,7 +4,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 -->
 
 <template>
-<SkMutedNote v-show="!isDeleted" ref="rootComp" :note="appearNote" :mutedClass="$style.muted" :expandedClass="[$style.root, { [$style.children]: depth > 1 }]" @expandMute="n => emit('expandMute', n)">
+<SkMutedNote v-show="!isDeleted" ref="rootComp" :note="appearNote" :dive="false" :mutedClass="$style.muted" :expandedClass="[$style.root, { [$style.children]: depth > 1 }]" @expandMute="n => emit('expandMute', n)">
 	<div :class="$style.main">
 		<div v-if="note.channel" :class="$style.colorBar" :style="{ background: note.channel.color }"></div>
 		<MkAvatar :class="$style.avatar" :user="note.user" link preview/>
diff --git a/packages/frontend/src/components/SkFollowingFeedEntry.vue b/packages/frontend/src/components/SkFollowingFeedEntry.vue
index 047ec9144b..24e8dea888 100644
--- a/packages/frontend/src/components/SkFollowingFeedEntry.vue
+++ b/packages/frontend/src/components/SkFollowingFeedEntry.vue
@@ -6,7 +6,7 @@ Selectable entry on the "Following" feed, displaying a user with their most rece
 -->
 
 <template>
-<SkMutedNote :note="note" :mutedClass="$style.muted" :expandedClass="$style.root" @click="$emit('select', note.user)">
+<SkMutedNote :note="note" :dive="false" :mutedClass="$style.muted" :expandedClass="$style.root" @click="$emit('select', note.user)">
 	<div :class="$style.avatar">
 		<MkAvatar :class="$style.icon" :user="note.user" indictor/>
 	</div>
diff --git a/packages/frontend/src/components/SkNoteSub.vue b/packages/frontend/src/components/SkNoteSub.vue
index d8ec33df3c..5cc78e5b46 100644
--- a/packages/frontend/src/components/SkNoteSub.vue
+++ b/packages/frontend/src/components/SkNoteSub.vue
@@ -8,7 +8,7 @@ For example, when viewing a reply on the timeline, SkNoteSub will be used to dis
 -->
 
 <template>
-<SkMutedNote v-show="!isDeleted" ref="rootComp" :note="appearNote" :mutedClass="$style.muted" :expandedClass="[$style.root, { [$style.children]: depth > 1, [$style.isReply]: props.isReply, [$style.detailed]: props.detailed }]" @expandMute="n => emit('expandMute', n)">
+<SkMutedNote v-show="!isDeleted" ref="rootComp" :note="appearNote" :dive="false" :mutedClass="$style.muted" :expandedClass="[$style.root, { [$style.children]: depth > 1, [$style.isReply]: props.isReply, [$style.detailed]: props.detailed }]" @expandMute="n => emit('expandMute', n)">
 	<div v-if="!hideLine" :class="$style.line"></div>
 	<div :class="$style.main">
 		<div v-if="note.channel" :class="$style.colorBar" :style="{ background: note.channel.color }"></div>

From ba433d8914830501a8735c88c8196f73023d4870 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Sun, 6 Jul 2025 19:40:22 -0400
Subject: [PATCH 022/110] don't recursively check mute text and improve
 grouping

---
 .../src/components/DynamicNoteSimple.vue      |  4 +++
 packages/frontend/src/components/MkNote.vue   |  4 +--
 .../src/components/MkNoteDetailed.vue         |  4 +--
 .../frontend/src/components/MkNoteSimple.vue  |  6 ++--
 .../frontend/src/components/MkNoteSub.vue     |  2 +-
 .../frontend/src/components/MkPostForm.vue    |  4 +--
 .../components/MkSchedulePostListDialog.vue   |  2 +-
 .../frontend/src/components/MkUrlPreview.vue  |  6 +++-
 .../src/components/SkFollowingFeedEntry.vue   |  2 +-
 .../frontend/src/components/SkMutedNote.vue   | 12 +++-----
 packages/frontend/src/components/SkNote.vue   |  2 +-
 .../src/components/SkNoteDetailed.vue         |  2 +-
 .../frontend/src/components/SkNoteSimple.vue  |  8 +++--
 .../frontend/src/components/SkNoteSub.vue     |  2 +-
 .../src/components/SkOldNoteWindow.vue        |  2 +-
 .../src/components/SkUrlPreviewGroup.vue      | 27 +++++++++++++++++
 .../src/components/page/page.block.vue        | 28 ++++++++++++++++-
 .../src/components/page/page.dynamic.vue      |  4 +++
 .../src/components/page/page.image.vue        |  4 +++
 .../src/components/page/page.note.vue         |  8 +++--
 .../src/components/page/page.section.vue      |  4 +++
 .../src/components/page/page.text.vue         |  6 +++-
 .../frontend/src/utility/check-word-mute.ts   | 30 +++++++------------
 23 files changed, 122 insertions(+), 51 deletions(-)

diff --git a/packages/frontend/src/components/DynamicNoteSimple.vue b/packages/frontend/src/components/DynamicNoteSimple.vue
index fdb895713e..5608062f72 100644
--- a/packages/frontend/src/components/DynamicNoteSimple.vue
+++ b/packages/frontend/src/components/DynamicNoteSimple.vue
@@ -10,8 +10,10 @@ Displays a note in the simple view with either Misskey or Sharkey style, based o
 	ref="rootEl"
 	:note="note"
 	:expandAllCws="expandAllCws"
+	:skipMute="skipMute"
 	:hideFiles="hideFiles"
 	@editScheduledNote="() => emit('editScheduleNote')"
+	@expandMute="n => emit('expandMute', n)"
 />
 </template>
 
@@ -38,10 +40,12 @@ defineProps<{
 		scheduledNoteId?: string
 	};
 	expandAllCws?: boolean;
+	skipMute?: boolean;
 	hideFiles?: boolean;
 }>();
 
 const emit = defineEmits<{
 	(ev: 'editScheduleNote'): void;
+	(ev: 'expandMute', note: Misskey.entities.Note): void;
 }>();
 </script>
diff --git a/packages/frontend/src/components/MkNote.vue b/packages/frontend/src/components/MkNote.vue
index bf4f48497b..2465d9e4a2 100644
--- a/packages/frontend/src/components/MkNote.vue
+++ b/packages/frontend/src/components/MkNote.vue
@@ -98,9 +98,9 @@ SPDX-License-Identifier: AGPL-3.0-only
 					</div>
 					<MkPoll v-if="appearNote.poll" :noteId="appearNote.id" :poll="appearNote.poll" :local="!appearNote.user.host" :author="appearNote.user" :emojiUrls="appearNote.emojis" :class="$style.poll" @click.stop/>
 					<div v-if="isEnabledUrlPreview" :class="[$style.urlPreview, '_gaps_s']" @click.stop>
-						<SkUrlPreviewGroup :sourceUrls="urls" :sourceNote="appearNote" :compact="true" :detail="false" :showAsQuote="!appearNote.user.rejectQuotes" :skipNoteIds="selfNoteIds"/>
+						<SkUrlPreviewGroup :sourceUrls="urls" :sourceNote="appearNote" :compact="true" :detail="false" :showAsQuote="!appearNote.user.rejectQuotes" :skipNoteIds="selfNoteIds" @expandMute="n => emit('expandMute', n)"/>
 					</div>
-					<div v-if="appearNote.renote" :class="$style.quote"><MkNoteSimple :note="appearNote.renote" :class="$style.quoteNote"/></div>
+					<div v-if="appearNote.renote" :class="$style.quote"><MkNoteSimple :note="appearNote.renote" :class="$style.quoteNote" @expandMute="n => emit('expandMute', n)"/></div>
 					<button v-if="isLong && collapsed" :class="$style.collapsed" class="_button" @click.stop @click="collapsed = false">
 						<span :class="$style.collapsedLabel">{{ i18n.ts.showMore }}</span>
 					</button>
diff --git a/packages/frontend/src/components/MkNoteDetailed.vue b/packages/frontend/src/components/MkNoteDetailed.vue
index 92f23224d7..fae068dd70 100644
--- a/packages/frontend/src/components/MkNoteDetailed.vue
+++ b/packages/frontend/src/components/MkNoteDetailed.vue
@@ -113,9 +113,9 @@ SPDX-License-Identifier: AGPL-3.0-only
 				</div>
 				<MkPoll v-if="appearNote.poll" ref="pollViewer" :noteId="appearNote.id" :poll="appearNote.poll" :local="!appearNote.user.host" :class="$style.poll" :author="appearNote.user" :emojiUrls="appearNote.emojis"/>
 				<div v-if="isEnabledUrlPreview" class="_gaps_s" style="margin-top: 6px;" @click.stop>
-					<SkUrlPreviewGroup :sourceNodes="parsed" :sourceNote="appearNote" :compact="true" :detail="true" :showAsQuote="!appearNote.user.rejectQuotes" :skipNoteIds="selfNoteIds"/>
+					<SkUrlPreviewGroup :sourceNodes="parsed" :sourceNote="appearNote" :compact="true" :detail="true" :showAsQuote="!appearNote.user.rejectQuotes" :skipNoteIds="selfNoteIds" @expandMute="n => emit('expandMute', n)"/>
 				</div>
-				<div v-if="appearNote.renote" :class="$style.quote"><MkNoteSimple :note="appearNote.renote" :class="$style.quoteNote" :expandAllCws="props.expandAllCws"/></div>
+				<div v-if="appearNote.renote" :class="$style.quote"><MkNoteSimple :note="appearNote.renote" :class="$style.quoteNote" :expandAllCws="props.expandAllCws" @expandMute="n => emit('expandMute', n)"/></div>
 			</div>
 			<MkA v-if="appearNote.channel && !inChannel" :class="$style.channel" :to="`/channels/${appearNote.channel.id}`"><i class="ti ti-device-tv"></i> {{ appearNote.channel.name }}</MkA>
 		</div>
diff --git a/packages/frontend/src/components/MkNoteSimple.vue b/packages/frontend/src/components/MkNoteSimple.vue
index ad59350af5..3773d1d9fb 100644
--- a/packages/frontend/src/components/MkNoteSimple.vue
+++ b/packages/frontend/src/components/MkNoteSimple.vue
@@ -4,7 +4,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 -->
 
 <template>
-<div v-if="!isDeleted" :class="$style.root">
+<SkMutedNote v-if="!isDeleted" :note="note" :skipMute="skipMute" :class="$style.root" @expandMute="n => emit('expandMute', n)">
 	<MkAvatar :class="$style.avatar" :user="note.user" link preview/>
 	<div :class="$style.main">
 		<MkNoteHeader :class="$style.header" :note="note" :mini="true"/>
@@ -22,7 +22,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 			</div>
 		</div>
 	</div>
-</div>
+</SkMutedNote>
 </template>
 
 <script lang="ts" setup>
@@ -33,6 +33,7 @@ import MkNoteHeader from '@/components/MkNoteHeader.vue';
 import MkSubNoteContent from '@/components/MkSubNoteContent.vue';
 import MkCwButton from '@/components/MkCwButton.vue';
 import MkButton from '@/components/MkButton.vue';
+import SkMutedNote from '@/components/SkMutedNote.vue';
 import { i18n } from '@/i18n.js';
 import { prefer } from '@/preferences.js';
 import { setupNoteViewInterruptors } from '@/plugin.js';
@@ -44,6 +45,7 @@ const props = defineProps<{
 		scheduledNoteId?: string
 	};
 	expandAllCws?: boolean;
+	skipMute?: boolean;
 	hideFiles?: boolean;
 }>();
 
diff --git a/packages/frontend/src/components/MkNoteSub.vue b/packages/frontend/src/components/MkNoteSub.vue
index 2b1b7ac9dd..7a04494fff 100644
--- a/packages/frontend/src/components/MkNoteSub.vue
+++ b/packages/frontend/src/components/MkNoteSub.vue
@@ -4,7 +4,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 -->
 
 <template>
-<SkMutedNote v-show="!isDeleted" ref="rootComp" :note="appearNote" :dive="false" :mutedClass="$style.muted" :expandedClass="[$style.root, { [$style.children]: depth > 1 }]" @expandMute="n => emit('expandMute', n)">
+<SkMutedNote v-show="!isDeleted" ref="rootComp" :note="appearNote" :mutedClass="$style.muted" :expandedClass="[$style.root, { [$style.children]: depth > 1 }]" @expandMute="n => emit('expandMute', n)">
 	<div :class="$style.main">
 		<div v-if="note.channel" :class="$style.colorBar" :style="{ background: note.channel.color }"></div>
 		<MkAvatar :class="$style.avatar" :user="note.user" link preview/>
diff --git a/packages/frontend/src/components/MkPostForm.vue b/packages/frontend/src/components/MkPostForm.vue
index 3df78712d5..ef69880444 100644
--- a/packages/frontend/src/components/MkPostForm.vue
+++ b/packages/frontend/src/components/MkPostForm.vue
@@ -52,8 +52,8 @@ SPDX-License-Identifier: AGPL-3.0-only
 			</button>
 		</div>
 	</header>
-	<MkNoteSimple v-if="reply" :class="$style.targetNote" :hideFiles="true" :note="reply"/>
-	<MkNoteSimple v-if="renoteTargetNote" :class="$style.targetNote" :hideFiles="true" :note="renoteTargetNote"/>
+	<MkNoteSimple v-if="reply" :class="$style.targetNote" :hideFiles="true" :note="reply" :skipMute="true"/>
+	<MkNoteSimple v-if="renoteTargetNote" :class="$style.targetNote" :hideFiles="true" :note="renoteTargetNote" :skipMute="true"/>
 	<div v-if="quoteId" :class="$style.withQuote"><i class="ti ti-quote"></i> {{ i18n.ts.quoteAttached }}<button @click="quoteId = null; renoteTargetNote = null;"><i class="ti ti-x"></i></button></div>
 	<div v-if="visibility === 'specified'" :class="$style.toSpecified">
 		<span style="margin-right: 8px;">{{ i18n.ts.recipient }}</span>
diff --git a/packages/frontend/src/components/MkSchedulePostListDialog.vue b/packages/frontend/src/components/MkSchedulePostListDialog.vue
index d86a1c56a2..feec19c276 100644
--- a/packages/frontend/src/components/MkSchedulePostListDialog.vue
+++ b/packages/frontend/src/components/MkSchedulePostListDialog.vue
@@ -17,7 +17,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 
 			<template #default="{ items }">
 				<div class="_gaps">
-					<MkNoteSimple v-for="item in items" :key="item.id" :scheduled="true" :note="item.note" @editScheduleNote="listUpdate"/>
+					<MkNoteSimple v-for="item in items" :key="item.id" :scheduled="true" :note="item.note" :skipMute="true" @editScheduleNote="listUpdate"/>
 				</div>
 			</template>
 		</MkPagination>
diff --git a/packages/frontend/src/components/MkUrlPreview.vue b/packages/frontend/src/components/MkUrlPreview.vue
index 5d0e6e3df7..2ffce44a5b 100644
--- a/packages/frontend/src/components/MkUrlPreview.vue
+++ b/packages/frontend/src/components/MkUrlPreview.vue
@@ -43,7 +43,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 		</MkButton>
 	</div>
 </template>
-<div v-else-if="theNote" :class="[$style.link, { [$style.compact]: compact }]"><DynamicNoteSimple :note="theNote" :class="$style.body"/></div>
+<div v-else-if="theNote" :class="[$style.link, { [$style.compact]: compact }]"><DynamicNoteSimple :note="theNote" :class="$style.body" @expandMute="n => emit('expandMute', n)"/></div>
 <div v-else-if="!hidePreview">
 	<component :is="self ? 'MkA' : 'a'" :class="[$style.link, { [$style.compact]: compact }]" :[attr]="maybeRelativeUrl" rel="nofollow noopener" :target="target" :title="url" @click.prevent="self ? true : warningExternalWebsite(url)" @click.stop>
 		<div v-if="thumbnail && !sensitive" :class="$style.thumbnail" :style="prefer.s.dataSaver.urlPreview ? '' : { backgroundImage: `url('${thumbnail}')` }">
@@ -151,6 +151,10 @@ const props = withDefaults(defineProps<{
 	attributionHint: undefined,
 });
 
+const emit = defineEmits<{
+	(ev: 'expandMute', note: Misskey.entities.Note): void;
+}>();
+
 const MOBILE_THRESHOLD = 500;
 const isMobile = ref(deviceKind === 'smartphone' || window.innerWidth <= MOBILE_THRESHOLD);
 
diff --git a/packages/frontend/src/components/SkFollowingFeedEntry.vue b/packages/frontend/src/components/SkFollowingFeedEntry.vue
index 24e8dea888..047ec9144b 100644
--- a/packages/frontend/src/components/SkFollowingFeedEntry.vue
+++ b/packages/frontend/src/components/SkFollowingFeedEntry.vue
@@ -6,7 +6,7 @@ Selectable entry on the "Following" feed, displaying a user with their most rece
 -->
 
 <template>
-<SkMutedNote :note="note" :dive="false" :mutedClass="$style.muted" :expandedClass="$style.root" @click="$emit('select', note.user)">
+<SkMutedNote :note="note" :mutedClass="$style.muted" :expandedClass="$style.root" @click="$emit('select', note.user)">
 	<div :class="$style.avatar">
 		<MkAvatar :class="$style.icon" :user="note.user" indictor/>
 	</div>
diff --git a/packages/frontend/src/components/SkMutedNote.vue b/packages/frontend/src/components/SkMutedNote.vue
index 13e2760e0e..05a1273238 100644
--- a/packages/frontend/src/components/SkMutedNote.vue
+++ b/packages/frontend/src/components/SkMutedNote.vue
@@ -86,14 +86,14 @@ import { checkMute } from '@/utility/check-word-mute.js';
 const props = withDefaults(defineProps<{
 	note: Misskey.entities.Note;
 	withHardMute?: boolean;
-	dive?: boolean;
 	mutedClass?: string | string[] | Record<string, boolean> | (string | string[] | Record<string, boolean>)[];
 	expandedClass?: string | string[] | Record<string, boolean> | (string | string[] | Record<string, boolean>)[];
+	skipMute?: boolean;
 }>(), {
 	withHardMute: true,
-	dive: true,
 	mutedClass: undefined,
 	expandedClass: undefined,
+	skipMute: false,
 });
 
 const emit = defineEmits<{
@@ -107,14 +107,10 @@ function expand() {
 	emit('expandMute', props.note);
 }
 
-const mute = checkMute(
-	computed(() => props.note),
-	computed(() => props.withHardMute),
-	computed(() => props.dive),
-);
+const mute = checkMute(computed(() => props.note), computed(() => props.withHardMute));
 
 const mutedWords = computed(() => mute.value.softMutedWords?.join(', '));
-const isExpanded = computed(() => expandNote.value || !mute.value.hasMute);
+const isExpanded = computed(() => props.skipMute || expandNote.value || !mute.value.hasMute);
 const rootClass = computed(() => isExpanded.value ? props.expandedClass : undefined);
 
 const instanceName = computed(() => {
diff --git a/packages/frontend/src/components/SkNote.vue b/packages/frontend/src/components/SkNote.vue
index 851ae0b86b..a4d2851d87 100644
--- a/packages/frontend/src/components/SkNote.vue
+++ b/packages/frontend/src/components/SkNote.vue
@@ -101,7 +101,7 @@ Displays a note in the Sharkey style. Used to show the "main" note in a given co
 					</div>
 					<MkPoll v-if="appearNote.poll" :noteId="appearNote.id" :poll="appearNote.poll" :local="!appearNote.user.host" :author="appearNote.user" :emojiUrls="appearNote.emojis" :class="$style.poll" @click.stop/>
 					<div v-if="isEnabledUrlPreview" :class="[$style.urlPreview, '_gaps_s']" @click.stop>
-						<SkUrlPreviewGroup :sourceUrls="urls" :sourceNote="appearNote" :compact="true" :detail="false" :showAsQuote="!appearNote.user.rejectQuotes" :skipNoteIds="selfNoteIds"/>
+						<SkUrlPreviewGroup :sourceUrls="urls" :sourceNote="appearNote" :compact="true" :detail="false" :showAsQuote="!appearNote.user.rejectQuotes" :skipNoteIds="selfNoteIds" @expandMute="n => emit('expandMute', n)"/>
 					</div>
 					<div v-if="appearNote.renote" :class="$style.quote"><SkNoteSimple :note="appearNote.renote" :class="$style.quoteNote"/></div>
 					<button v-if="isLong && collapsed" :class="$style.collapsed" class="_button" @click.stop @click="collapsed = false">
diff --git a/packages/frontend/src/components/SkNoteDetailed.vue b/packages/frontend/src/components/SkNoteDetailed.vue
index 16759bb3b4..357744da9c 100644
--- a/packages/frontend/src/components/SkNoteDetailed.vue
+++ b/packages/frontend/src/components/SkNoteDetailed.vue
@@ -119,7 +119,7 @@ Detailed view of a note in the Sharkey style. Used when opening a note onto its
 				</div>
 				<MkPoll v-if="appearNote.poll" ref="pollViewer" :noteId="appearNote.id" :poll="appearNote.poll" :local="!appearNote.user.host" :class="$style.poll" :author="appearNote.user" :emojiUrls="appearNote.emojis"/>
 				<div v-if="isEnabledUrlPreview" class="_gaps_s" style="margin-top: 6px;" @click.stop>
-					<SkUrlPreviewGroup :sourceNodes="parsed" :sourceNote="appearNote" :compact="true" :detail="true" :showAsQuote="!appearNote.user.rejectQuotes" :skipNoteIds="selfNoteIds"/>
+					<SkUrlPreviewGroup :sourceNodes="parsed" :sourceNote="appearNote" :compact="true" :detail="true" :showAsQuote="!appearNote.user.rejectQuotes" :skipNoteIds="selfNoteIds" @expandMute="n => emit('expandMute', n)"/>
 				</div>
 				<div v-if="appearNote.renote" :class="$style.quote"><SkNoteSimple :note="appearNote.renote" :class="$style.quoteNote" :expandAllCws="props.expandAllCws"/></div>
 			</div>
diff --git a/packages/frontend/src/components/SkNoteSimple.vue b/packages/frontend/src/components/SkNoteSimple.vue
index 809272b833..7ad7721a8e 100644
--- a/packages/frontend/src/components/SkNoteSimple.vue
+++ b/packages/frontend/src/components/SkNoteSimple.vue
@@ -6,7 +6,7 @@ Simple view of a note in the Sharkey style. Used in quote renotes, link previews
 -->
 
 <template>
-<div :class="$style.root">
+<SkMutedNote :note="note" :skipMute="skipMute" :class="$style.root" @expandMute="n => emit('expandMute', n)">
 	<MkAvatar :class="$style.avatar" :user="note.user" link preview/>
 	<div :class="$style.main">
 		<MkNoteHeader :class="$style.header" :classic="true" :note="note" :mini="true"/>
@@ -20,7 +20,7 @@ Simple view of a note in the Sharkey style. Used in quote renotes, link previews
 			</div>
 		</div>
 	</div>
-</div>
+</SkMutedNote>
 </template>
 
 <script lang="ts" setup>
@@ -32,6 +32,7 @@ import MkCwButton from '@/components/MkCwButton.vue';
 import { prefer } from '@/preferences.js';
 import { setupNoteViewInterruptors } from '@/plugin.js';
 import { deepClone } from '@/utility/clone.js';
+import SkMutedNote from '@/components/SkMutedNote.vue';
 
 const props = defineProps<{
 	note: Misskey.entities.Note & {
@@ -39,10 +40,11 @@ const props = defineProps<{
 		scheduledNoteId?: string
 	};
 	expandAllCws?: boolean;
+	skipMute?: boolean;
 	hideFiles?: boolean;
 }>();
 
-defineEmits<{
+const emit = defineEmits<{
 	(ev: 'editScheduleNote'): void;
 	(ev: 'expandMute', note: Misskey.entities.Note): void;
 }>();
diff --git a/packages/frontend/src/components/SkNoteSub.vue b/packages/frontend/src/components/SkNoteSub.vue
index 5cc78e5b46..d8ec33df3c 100644
--- a/packages/frontend/src/components/SkNoteSub.vue
+++ b/packages/frontend/src/components/SkNoteSub.vue
@@ -8,7 +8,7 @@ For example, when viewing a reply on the timeline, SkNoteSub will be used to dis
 -->
 
 <template>
-<SkMutedNote v-show="!isDeleted" ref="rootComp" :note="appearNote" :dive="false" :mutedClass="$style.muted" :expandedClass="[$style.root, { [$style.children]: depth > 1, [$style.isReply]: props.isReply, [$style.detailed]: props.detailed }]" @expandMute="n => emit('expandMute', n)">
+<SkMutedNote v-show="!isDeleted" ref="rootComp" :note="appearNote" :mutedClass="$style.muted" :expandedClass="[$style.root, { [$style.children]: depth > 1, [$style.isReply]: props.isReply, [$style.detailed]: props.detailed }]" @expandMute="n => emit('expandMute', n)">
 	<div v-if="!hideLine" :class="$style.line"></div>
 	<div :class="$style.main">
 		<div v-if="note.channel" :class="$style.colorBar" :style="{ background: note.channel.color }"></div>
diff --git a/packages/frontend/src/components/SkOldNoteWindow.vue b/packages/frontend/src/components/SkOldNoteWindow.vue
index 77f28d359a..ebfa9ec836 100644
--- a/packages/frontend/src/components/SkOldNoteWindow.vue
+++ b/packages/frontend/src/components/SkOldNoteWindow.vue
@@ -52,7 +52,7 @@ Displays an old version of an edited note.
 					<div class="_gaps_s" style="margin-top: 6px;" @click.stop>
 						<SkUrlPreviewGroup :sourceNodes="parsed" :sourceNote="appearNote" :compact="true" :detail="true" :showAsQuote="!appearNote.user.rejectQuotes" :skipNoteIds="selfNoteIds"/>
 					</div>
-					<div v-if="appearNote.renote" :class="$style.quote"><MkNoteSimple :note="appearNote.renote" :class="$style.quoteNote"/></div>
+					<div v-if="appearNote.renote" :class="$style.quote"><MkNoteSimple :note="appearNote.renote" :class="$style.quoteNote" :skipMute="true"/></div>
 				</div>
 				<MkA v-if="appearNote.channel && !inChannel" :class="$style.channel" :to="`/channels/${appearNote.channel.id}`"><i class="ph-television ph-bold ph-lg"></i> {{ appearNote.channel.name }}</MkA>
 			</div>
diff --git a/packages/frontend/src/components/SkUrlPreviewGroup.vue b/packages/frontend/src/components/SkUrlPreviewGroup.vue
index aea5cc566d..a22c5d8050 100644
--- a/packages/frontend/src/components/SkUrlPreviewGroup.vue
+++ b/packages/frontend/src/components/SkUrlPreviewGroup.vue
@@ -25,6 +25,7 @@ Attempts to avoid displaying the same preview twice, even if multiple URLs point
 		:showAsQuote="showAsQuote"
 		:showActions="showActions"
 		:skipNoteIds="skipNoteIds"
+		@expandMute="n => onExpandNote(n)"
 	></MkUrlPreview>
 </template>
 </template>
@@ -42,6 +43,8 @@ import { $i } from '@/i';
 import { misskeyApi } from '@/utility/misskey-api';
 import MkUrlPreview from '@/components/MkUrlPreview.vue';
 import { getNoteUrls } from '@/utility/getNoteUrls';
+import { deepAssign } from '@/utility/merge';
+import { useMuteOverrides } from '@/utility/check-word-mute';
 
 type Summary = SummalyResult & {
 	note?: Misskey.entities.Note | null;
@@ -74,6 +77,30 @@ const props = withDefaults(defineProps<{
 	skipNoteIds: () => [],
 });
 
+const emit = defineEmits<{
+	(ev: 'expandMute', note: Misskey.entities.Note): void;
+}>();
+
+const muteOverrides = useMuteOverrides();
+
+function onExpandNote(note: Misskey.entities.Note) {
+	// Expand related mutes within this preview group
+	deepAssign(muteOverrides, {
+		user: {
+			[note.user.id]: {
+				userMandatoryCW: null,
+			},
+		},
+		instance: {
+			[note.user.host ?? '']: {
+				instanceMandatoryCW: null,
+			},
+		},
+	});
+
+	emit('expandMute', note);
+}
+
 const urlPreviews = ref<Summary[]>([]);
 
 const urls = computed<string[]>(() => {
diff --git a/packages/frontend/src/components/page/page.block.vue b/packages/frontend/src/components/page/page.block.vue
index c7f72dce8c..8e60a95c6b 100644
--- a/packages/frontend/src/components/page/page.block.vue
+++ b/packages/frontend/src/components/page/page.block.vue
@@ -4,7 +4,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 -->
 
 <template>
-<component :is="getComponent(block.type)" :key="block.id" :page="page" :block="block" :h="h"/>
+<component :is="getComponent(block.type)" :key="block.id" :page="page" :block="block" :h="h" @expandMute="n => onExpandNote(n)"/>
 </template>
 
 <script lang="ts" setup>
@@ -15,6 +15,8 @@ import XSection from './page.section.vue';
 import XImage from './page.image.vue';
 import XNote from './page.note.vue';
 import XDynamic from './page.dynamic.vue';
+import { deepAssign } from '@/utility/merge';
+import { useMuteOverrides } from '@/utility/check-word-mute';
 
 function getComponent(type: string) {
 	switch (type) {
@@ -45,4 +47,28 @@ defineProps<{
 	h: number,
 	page: Misskey.entities.Page,
 }>();
+
+const emit = defineEmits<{
+	(ev: 'expandMute', note: Misskey.entities.Note): void;
+}>();
+
+const muteOverrides = useMuteOverrides();
+
+function onExpandNote(note: Misskey.entities.Note) {
+	// Expand related mutes within this page group
+	deepAssign(muteOverrides, {
+		user: {
+			[note.user.id]: {
+				userMandatoryCW: null,
+			},
+		},
+		instance: {
+			[note.user.host ?? '']: {
+				instanceMandatoryCW: null,
+			},
+		},
+	});
+
+	emit('expandMute', note);
+}
 </script>
diff --git a/packages/frontend/src/components/page/page.dynamic.vue b/packages/frontend/src/components/page/page.dynamic.vue
index c2449931c1..cec42effd4 100644
--- a/packages/frontend/src/components/page/page.dynamic.vue
+++ b/packages/frontend/src/components/page/page.dynamic.vue
@@ -23,6 +23,10 @@ const props = defineProps<{
 	block: Misskey.entities.PageBlock,
 	page: Misskey.entities.Page,
 }>();
+
+defineEmits<{
+	(ev: 'expandMute', note: Misskey.entities.Note): void;
+}>();
 </script>
 
 <style lang="scss" module>
diff --git a/packages/frontend/src/components/page/page.image.vue b/packages/frontend/src/components/page/page.image.vue
index 69443ce7dd..8a494463c1 100644
--- a/packages/frontend/src/components/page/page.image.vue
+++ b/packages/frontend/src/components/page/page.image.vue
@@ -19,6 +19,10 @@ const props = defineProps<{
 	page: Misskey.entities.Page,
 }>();
 
+defineEmits<{
+	(ev: 'expandMute', note: Misskey.entities.Note): void;
+}>();
+
 const image = ref<Misskey.entities.DriveFile | null>(null);
 
 onMounted(() => {
diff --git a/packages/frontend/src/components/page/page.note.vue b/packages/frontend/src/components/page/page.note.vue
index 543e9afdaf..74617254a8 100644
--- a/packages/frontend/src/components/page/page.note.vue
+++ b/packages/frontend/src/components/page/page.note.vue
@@ -5,8 +5,8 @@ SPDX-License-Identifier: AGPL-3.0-only
 
 <template>
 <div :class="$style.root">
-	<MkNote v-if="note && !block.detailed" :key="note.id + ':normal'" :note="note"/>
-	<MkNoteDetailed v-if="note && block.detailed" :key="note.id + ':detail'" :note="note"/>
+	<MkNote v-if="note && !block.detailed" :key="note.id + ':normal'" :note="note" @expandMute="n => emit('expandMute', n)"/>
+	<MkNoteDetailed v-if="note && block.detailed" :key="note.id + ':detail'" :note="note" @expandMute="n => emit('expandMute', n)"/>
 </div>
 </template>
 
@@ -24,6 +24,10 @@ const props = defineProps<{
 	index: number;
 }>();
 
+const emit = defineEmits<{
+	(ev: 'expandMute', note: Misskey.entities.Note): void;
+}>();
+
 const note = ref<Misskey.entities.Note | null>(null);
 
 // eslint-disable-next-line id-denylist
diff --git a/packages/frontend/src/components/page/page.section.vue b/packages/frontend/src/components/page/page.section.vue
index e3d26d924f..cf8df620db 100644
--- a/packages/frontend/src/components/page/page.section.vue
+++ b/packages/frontend/src/components/page/page.section.vue
@@ -33,6 +33,10 @@ defineProps<{
 	h: number,
 	page: Misskey.entities.Page,
 }>();
+
+defineEmits<{
+	(ev: 'expandMute', note: Misskey.entities.Note): void;
+}>();
 </script>
 
 <style lang="scss" module>
diff --git a/packages/frontend/src/components/page/page.text.vue b/packages/frontend/src/components/page/page.text.vue
index 74967d7f26..6044c144c6 100644
--- a/packages/frontend/src/components/page/page.text.vue
+++ b/packages/frontend/src/components/page/page.text.vue
@@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 <div class="_gaps" :class="$style.textRoot">
 	<Mfm :text="block.text ?? ''" :isBlock="true" :isNote="false"/>
 	<div v-if="isEnabledUrlPreview" class="_gaps_s" @click.stop>
-		<SkUrlPreviewGroup :sourceText="block.text" :showAsQuote="!page.user.rejectQuotes"/>
+		<SkUrlPreviewGroup :sourceText="block.text" :showAsQuote="!page.user.rejectQuotes" @expandMute="n => emit('expandMute', n)"/>
 	</div>
 </div>
 </template>
@@ -21,6 +21,10 @@ defineProps<{
 	block: Misskey.entities.PageBlock,
 	page: Misskey.entities.Page,
 }>();
+
+const emit = defineEmits<{
+	(ev: 'expandMute', note: Misskey.entities.Note): void;
+}>();
 </script>
 
 <style lang="scss" module>
diff --git a/packages/frontend/src/utility/check-word-mute.ts b/packages/frontend/src/utility/check-word-mute.ts
index 78869e9250..9406004312 100644
--- a/packages/frontend/src/utility/check-word-mute.ts
+++ b/packages/frontend/src/utility/check-word-mute.ts
@@ -84,19 +84,18 @@ function provideMuteOverrides(overrides: Reactive<MuteOverrides> | null) {
 	provide(muteOverridesSymbol, overrides);
 }
 
-export function checkMute(note: Misskey.entities.Note | ComputedRef<Misskey.entities.Note>, withHardMute?: boolean | ComputedRef<boolean>, dive?: boolean | ComputedRef<boolean>): ComputedRef<Mute> {
+export function checkMute(note: Misskey.entities.Note | ComputedRef<Misskey.entities.Note>, withHardMute?: boolean | ComputedRef<boolean>): ComputedRef<Mute> {
 	// inject() can only be used inside script setup, so it MUST be outside the computed block!
 	const overrides = injectMuteOverrides();
 
 	return computed(() => {
 		const _note = unref(note);
 		const _withHardMute = unref(withHardMute) ?? true;
-		const _dive = unref(dive) ?? false;
-		return getMutes(_note, _withHardMute, _dive, overrides);
+		return getMutes(_note, _withHardMute, overrides);
 	});
 }
 
-function getMutes(note: Misskey.entities.Note, withHardMute: boolean, dive: boolean, overrides: MuteOverrides | null): Mute {
+function getMutes(note: Misskey.entities.Note, withHardMute: boolean, overrides: MuteOverrides | null): Mute {
 	const override: Partial<Mute> = overrides ? deepAssign(
 		{},
 		note.user.host ? overrides.instance[note.user.host] : undefined,
@@ -108,8 +107,8 @@ function getMutes(note: Misskey.entities.Note, withHardMute: boolean, dive: bool
 
 	const isMe = $i != null && $i.id === note.userId;
 
-	const hardMuted = override.hardMuted ?? (!isMe && withHardMute && isHardMuted(note, dive));
-	const softMutedWords = override.softMutedWords ?? (isMe ? [] : isSoftMuted(note, dive));
+	const hardMuted = override.hardMuted ?? (!isMe && withHardMute && isHardMuted(note));
+	const softMutedWords = override.softMutedWords ?? (isMe ? [] : isSoftMuted(note));
 	const sensitiveMuted = override.sensitiveMuted ?? isSensitiveMuted(note);
 	const threadMuted = override.threadMuted ?? (!isMe && note.isMutingThread);
 	const noteMuted = override.noteMuted ?? (!isMe && note.isMutingNote);
@@ -130,17 +129,17 @@ function getMutes(note: Misskey.entities.Note, withHardMute: boolean, dive: bool
 	return { hasMute, hardMuted, softMutedWords, sensitiveMuted, threadMuted, noteMuted, noteMandatoryCW, userMandatoryCW, instanceMandatoryCW };
 }
 
-function isHardMuted(note: Misskey.entities.Note, dive: boolean): boolean {
+function isHardMuted(note: Misskey.entities.Note): boolean {
 	if (!$i?.hardMutedWords.length) return false;
 
-	const inputs = expandNote(note, dive);
+	const inputs = expandNote(note);
 	return containsMutedWord($i.hardMutedWords, inputs);
 }
 
-function isSoftMuted(note: Misskey.entities.Note, dive: boolean): string[] {
+function isSoftMuted(note: Misskey.entities.Note): string[] {
 	if (!$i?.mutedWords.length) return [];
 
-	const inputs = expandNote(note, dive);
+	const inputs = expandNote(note);
 	return getMutedWords($i.mutedWords, inputs);
 }
 
@@ -215,7 +214,7 @@ export function containsMutedWord(mutedWords: (string | string[])[], inputs: Ite
 	return false;
 }
 
-export function *expandNote(note: Misskey.entities.Note, dive: boolean): Generator<string> {
+export function *expandNote(note: Misskey.entities.Note): Generator<string> {
 	if (note.cw) yield note.cw;
 	if (note.text) yield note.text;
 	if (note.files) {
@@ -228,15 +227,6 @@ export function *expandNote(note: Misskey.entities.Note, dive: boolean): Generat
 			if (choice.text) yield choice.text;
 		}
 	}
-
-	if (dive) {
-		if (note.reply) {
-			yield* expandNote(note.reply, true);
-		}
-		if (note.renote) {
-			yield* expandNote(note.renote, true);
-		}
-	}
 }
 
 function parseMutes(mutedWords: (string | string[])[]) {

From 1448533957c5fbf9a4a41ea54cb3eb2a9fbd3df3 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Sun, 6 Jul 2025 20:03:46 -0400
Subject: [PATCH 023/110] add context menu to set user CW

---
 .../frontend/src/utility/get-user-menu.ts     | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/packages/frontend/src/utility/get-user-menu.ts b/packages/frontend/src/utility/get-user-menu.ts
index fde390cece..f65660ff6c 100644
--- a/packages/frontend/src/utility/get-user-menu.ts
+++ b/packages/frontend/src/utility/get-user-menu.ts
@@ -102,6 +102,22 @@ export function getUserMenu(user: Misskey.entities.UserDetailed, router: Router
 		});
 	}
 
+	async function setMandatoryCW() {
+		const result = await os.inputText({
+			type: 'text',
+			title: i18n.ts.mandatoryCW,
+			text: i18n.ts.mandatoryCWDescription,
+			default: user.mandatoryCW ?? '',
+		});
+
+		if (result.canceled) return;
+
+		await os.apiWithDialog('admin/cw-user', {
+			userId: user.id,
+			cw: result.result || null,
+		});
+	}
+
 	async function getConfirmed(text: string): Promise<boolean> {
 		const confirm = await os.confirm({
 			type: 'question',
@@ -399,6 +415,14 @@ export function getUserMenu(user: Misskey.entities.UserDetailed, router: Router
 			text: i18n.ts.reportAbuse,
 			action: reportAbuse,
 		});
+
+		if ($i.isModerator) {
+			menuItems.push({
+				icon: 'ph-warning ph-bold ph-lg',
+				text: i18n.ts.mandatoryCW,
+				action: setMandatoryCW,
+			});
+		}
 	}
 
 	if (user.host !== null) {

From a04f49b932df06d8a299ab31fb57b9c1a4ca173f Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Tue, 8 Jul 2025 18:00:15 -0400
Subject: [PATCH 024/110] move "force CW" button to moderation section

---
 packages/frontend/src/utility/get-note-menu.ts |  7 +++----
 packages/frontend/src/utility/get-user-menu.ts | 12 ++++--------
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/packages/frontend/src/utility/get-note-menu.ts b/packages/frontend/src/utility/get-note-menu.ts
index e73067baed..dbdff5f000 100644
--- a/packages/frontend/src/utility/get-note-menu.ts
+++ b/packages/frontend/src/utility/get-note-menu.ts
@@ -464,10 +464,6 @@ export function getNoteMenu(props: {
 		if (appearNote.userId !== $i.id) {
 			menuItems.push({ type: 'divider' });
 			menuItems.push(getAbuseNoteMenu(appearNote, i18n.ts.reportAbuse));
-
-			if ($i.isModerator || $i.isAdmin) {
-				menuItems.push(getMandatoryCWMenu(appearNote));
-			}
 		}
 
 		if (appearNote.channel && (appearNote.channel.userId === $i.id || $i.isModerator || $i.isAdmin)) {
@@ -520,6 +516,9 @@ export function getNoteMenu(props: {
 					action: delEdit,
 				});
 			}
+			if ($i.isModerator || $i.isAdmin) {
+				menuItems.push(getMandatoryCWMenu(appearNote));
+			}
 			menuItems.push({
 				icon: 'ti ti-trash',
 				text: i18n.ts.delete,
diff --git a/packages/frontend/src/utility/get-user-menu.ts b/packages/frontend/src/utility/get-user-menu.ts
index f65660ff6c..1bad4b9d01 100644
--- a/packages/frontend/src/utility/get-user-menu.ts
+++ b/packages/frontend/src/utility/get-user-menu.ts
@@ -173,6 +173,10 @@ export function getUserMenu(user: Misskey.entities.UserDetailed, router: Router
 			action: () => {
 				router.push(`/admin/user/${user.id}`);
 			},
+		}, {
+			icon: 'ph-warning ph-bold ph-lg',
+			text: i18n.ts.mandatoryCW,
+			action: setMandatoryCW,
 		}, { type: 'divider' });
 	}
 
@@ -415,14 +419,6 @@ export function getUserMenu(user: Misskey.entities.UserDetailed, router: Router
 			text: i18n.ts.reportAbuse,
 			action: reportAbuse,
 		});
-
-		if ($i.isModerator) {
-			menuItems.push({
-				icon: 'ph-warning ph-bold ph-lg',
-				text: i18n.ts.mandatoryCW,
-				action: setMandatoryCW,
-			});
-		}
 	}
 
 	if (user.host !== null) {

From 1413be08a0cdbdb8734b93a6ad23ea3d0448994c Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Wed, 9 Jul 2025 19:04:35 -0400
Subject: [PATCH 025/110] apply note mandatory CW through NoteEditService

---
 packages/backend/src/core/NoteCreateService.ts     |  2 ++
 packages/backend/src/core/NoteEditService.ts       | 12 +++++-------
 .../src/server/api/endpoints/admin/cw-note.ts      | 14 ++++++++------
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/packages/backend/src/core/NoteCreateService.ts b/packages/backend/src/core/NoteCreateService.ts
index 0732624a99..d23eb520cf 100644
--- a/packages/backend/src/core/NoteCreateService.ts
+++ b/packages/backend/src/core/NoteCreateService.ts
@@ -144,6 +144,7 @@ type Option = {
 	url?: string | null;
 	app?: MiApp | null;
 	processErrors?: string[] | null;
+	mandatoryCW?: string | null;
 };
 
 export type PureRenoteOption = Option & { renote: MiNote } & ({ text?: null } | { cw?: null } | { reply?: null } | { poll?: null } | { files?: null | [] });
@@ -477,6 +478,7 @@ export class NoteCreateService implements OnApplicationShutdown {
 			renoteUserHost: data.renote ? data.renote.userHost : null,
 			userHost: user.host,
 			processErrors: data.processErrors,
+			mandatoryCW: data.mandatoryCW,
 		});
 
 		// should really not happen, but better safe than sorry
diff --git a/packages/backend/src/core/NoteEditService.ts b/packages/backend/src/core/NoteEditService.ts
index f8c732c4f1..3aaf9b165c 100644
--- a/packages/backend/src/core/NoteEditService.ts
+++ b/packages/backend/src/core/NoteEditService.ts
@@ -224,13 +224,7 @@ export class NoteEditService implements OnApplicationShutdown {
 	}
 
 	@bindThis
-	public async edit(user: MiUser & {
-		id: MiUser['id'];
-		username: MiUser['username'];
-		host: MiUser['host'];
-		isBot: MiUser['isBot'];
-		noindex: MiUser['noindex'];
-	}, editid: MiNote['id'], data: Option, silent = false): Promise<MiNote> {
+	public async edit(user: MiUser, editid: MiNote['id'], data: Option, silent = false): Promise<MiNote> {
 		if (!editid) {
 			throw new UnrecoverableError('edit failed: missing editid');
 		}
@@ -457,6 +451,9 @@ export class NoteEditService implements OnApplicationShutdown {
 		if (oldnote.hasPoll !== !!data.poll) {
 			update.hasPoll = !!data.poll;
 		}
+		if (data.mandatoryCW !== undefined && oldnote.mandatoryCW !== data.mandatoryCW) {
+			update.mandatoryCW = data.mandatoryCW;
+		}
 
 		// TODO deep-compare files
 		const filesChanged = oldnote.fileIds.length || data.files?.length;
@@ -518,6 +515,7 @@ export class NoteEditService implements OnApplicationShutdown {
 				renoteUserHost: data.renote ? data.renote.userHost : null,
 				userHost: user.host,
 				reactionAndUserPairCache: oldnote.reactionAndUserPairCache,
+				mandatoryCW: data.mandatoryCW,
 			});
 
 			if (data.uri != null) note.uri = data.uri;
diff --git a/packages/backend/src/server/api/endpoints/admin/cw-note.ts b/packages/backend/src/server/api/endpoints/admin/cw-note.ts
index 498ad464ab..cf513a4922 100644
--- a/packages/backend/src/server/api/endpoints/admin/cw-note.ts
+++ b/packages/backend/src/server/api/endpoints/admin/cw-note.ts
@@ -8,6 +8,7 @@ import { Endpoint } from '@/server/api/endpoint-base.js';
 import type { MiNote, MiUser, NotesRepository } from '@/models/_.js';
 import { DI } from '@/di-symbols.js';
 import { ModerationLogService } from '@/core/ModerationLogService.js';
+import { NoteEditService } from '@/core/NoteEditService.js';
 
 export const meta = {
 	tags: ['admin'],
@@ -32,6 +33,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 		@Inject(DI.notesRepository)
 		private readonly notesRepository: NotesRepository,
 
+		private readonly noteEditService: NoteEditService,
 		private readonly moderationLogService: ModerationLogService,
 	) {
 		super(meta, paramDef, async (ps, me) => {
@@ -40,13 +42,16 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				relations: { user: true },
 			}) as MiNote & { user: MiUser };
 
+			// Collapse empty strings to null
+			const mandatoryCW = ps.cw || null;
+
 			// Skip if there's nothing to do
-			if (note.mandatoryCW === ps.cw) return;
+			if (note.mandatoryCW === mandatoryCW) return;
 
 			// Log event first.
 			// This ensures that we don't "lose" the log if an error occurs
 			await this.moderationLogService.log(me, 'setMandatoryCWForNote', {
-				newCW: ps.cw,
+				newCW: mandatoryCW,
 				oldCW: note.mandatoryCW,
 				noteId: note.id,
 				noteUserId: note.user.id,
@@ -54,10 +59,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				noteUserHost: note.user.host,
 			});
 
-			await this.notesRepository.update(ps.noteId, {
-				// Collapse empty strings to null
-				mandatoryCW: ps.cw || null,
-			});
+			await this.noteEditService.edit(note.user, note.id, { mandatoryCW });
 		});
 	}
 }

From 62ec2ff34e2edd3ed7ad53084ed2f51a785e039b Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Wed, 9 Jul 2025 19:05:30 -0400
Subject: [PATCH 026/110] move mandatory CW button above edit controls in note
 menu

---
 packages/frontend/src/utility/get-note-menu.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/frontend/src/utility/get-note-menu.ts b/packages/frontend/src/utility/get-note-menu.ts
index dbdff5f000..1698124623 100644
--- a/packages/frontend/src/utility/get-note-menu.ts
+++ b/packages/frontend/src/utility/get-note-menu.ts
@@ -503,6 +503,9 @@ export function getNoteMenu(props: {
 
 		if (appearNote.userId === $i.id || $i.isModerator || $i.isAdmin) {
 			menuItems.push({ type: 'divider' });
+			if ($i.isModerator || $i.isAdmin) {
+				menuItems.push(getMandatoryCWMenu(appearNote));
+			}
 			if (appearNote.userId === $i.id) {
 				menuItems.push({
 					icon: 'ph-pencil-simple ph-bold ph-lg',
@@ -516,9 +519,6 @@ export function getNoteMenu(props: {
 					action: delEdit,
 				});
 			}
-			if ($i.isModerator || $i.isAdmin) {
-				menuItems.push(getMandatoryCWMenu(appearNote));
-			}
 			menuItems.push({
 				icon: 'ti ti-trash',
 				text: i18n.ts.delete,

From 7ab3a20b3b8e9ce22058022c2da743b9b505377d Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Wed, 9 Jul 2025 19:12:53 -0400
Subject: [PATCH 027/110] fix cherry-pick error

---
 packages/backend/src/core/NoteEditService.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/backend/src/core/NoteEditService.ts b/packages/backend/src/core/NoteEditService.ts
index 3aaf9b165c..f3825ca49a 100644
--- a/packages/backend/src/core/NoteEditService.ts
+++ b/packages/backend/src/core/NoteEditService.ts
@@ -141,6 +141,7 @@ type Option = {
 	updatedAt?: Date | null;
 	editcount?: boolean | null;
 	processErrors?: string[] | null;
+	mandatoryCW?: string | null;
 };
 
 @Injectable()

From ae9c21e3227b9d31b3428c3e9f56c77be6f713b3 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Mon, 21 Jul 2025 15:59:33 -0400
Subject: [PATCH 028/110] fix mandatory CW for notes erasiong content

---
 packages/backend/src/core/NoteEditService.ts | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/packages/backend/src/core/NoteEditService.ts b/packages/backend/src/core/NoteEditService.ts
index f3825ca49a..6062e464ba 100644
--- a/packages/backend/src/core/NoteEditService.ts
+++ b/packages/backend/src/core/NoteEditService.ts
@@ -374,8 +374,6 @@ export class NoteEditService implements OnApplicationShutdown {
 			if (data.text === '') {
 				data.text = null;
 			}
-		} else {
-			data.text = null;
 		}
 
 		const maxCwLength = user.host == null
@@ -390,8 +388,6 @@ export class NoteEditService implements OnApplicationShutdown {
 			if (data.cw === '') {
 				data.cw = null;
 			}
-		} else {
-			data.cw = null;
 		}
 
 		let tags = data.apHashtags;
@@ -443,13 +439,13 @@ export class NoteEditService implements OnApplicationShutdown {
 		}
 
 		const update: Partial<MiNote> = {};
-		if (data.text !== oldnote.text) {
+		if (data.text !== undefined && data.text !== oldnote.text) {
 			update.text = data.text;
 		}
-		if (data.cw !== oldnote.cw) {
+		if (data.cw !== undefined && data.cw !== oldnote.cw) {
 			update.cw = data.cw;
 		}
-		if (oldnote.hasPoll !== !!data.poll) {
+		if (data.poll !== undefined && oldnote.hasPoll !== !!data.poll) {
 			update.hasPoll = !!data.poll;
 		}
 		if (data.mandatoryCW !== undefined && oldnote.mandatoryCW !== data.mandatoryCW) {

From 24e14c78fd54671f7a34cd6aff71c7c48c2c7f28 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Fri, 25 Jul 2025 17:15:31 -0400
Subject: [PATCH 029/110] fix optional parameter in SkPatternText

---
 packages/frontend/src/components/SkPatternTest.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/frontend/src/components/SkPatternTest.vue b/packages/frontend/src/components/SkPatternTest.vue
index 660b5d8a0a..4cf95d4696 100644
--- a/packages/frontend/src/components/SkPatternTest.vue
+++ b/packages/frontend/src/components/SkPatternTest.vue
@@ -31,14 +31,14 @@ import { parseMutes } from '@/utility/parse-mutes.js';
 import { getMutedWords } from '@/utility/check-word-mute.js';
 
 const props = defineProps<{
-	mutedWords?: string | null,
+	mutedWords: string,
 }>();
 
 const testWords = ref<string | null>(null);
 const testMatches = ref<string | null>(null);
 
 function testWordMutes() {
-	if (!testWords.value || !props.mutedWords) {
+	if (!testWords.value) {
 		testMatches.value = null;
 		return;
 	}

From 64694be0048d996c1b95884e3aa80ff66ad9cd09 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Fri, 25 Jul 2025 18:24:28 -0400
Subject: [PATCH 030/110] mute silenced notes in frontend

---
 locales/index.d.ts                               |  4 ++++
 packages/backend/src/core/WebhookTestService.ts  |  1 +
 .../src/core/entities/NoteEntityService.ts       | 16 +++++++++++++++-
 packages/backend/src/models/json-schema/note.ts  |  4 ++++
 packages/frontend/src/components/SkMutedNote.vue | 10 ++++++++++
 packages/frontend/src/utility/check-word-mute.ts |  5 +++--
 packages/misskey-js/src/autogen/types.ts         |  1 +
 sharkey-locales/en-US.yml                        |  1 +
 8 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/locales/index.d.ts b/locales/index.d.ts
index 303f5df9c5..6a9d9f294e 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -12092,6 +12092,10 @@ export interface Locale extends ILocale {
      * {name} said something in a muted thread
      */
     "userSaysSomethingInMutedThread": ParameterizedString<"name">;
+    /**
+     * {name} has been silenced by {host} staff
+     */
+    "silencedUserSaysSomething": ParameterizedString<"name" | "host">;
     /**
      * {name} is flagged: "{cw}"
      */
diff --git a/packages/backend/src/core/WebhookTestService.ts b/packages/backend/src/core/WebhookTestService.ts
index 96b06ac0c2..5fabe2052d 100644
--- a/packages/backend/src/core/WebhookTestService.ts
+++ b/packages/backend/src/core/WebhookTestService.ts
@@ -409,6 +409,7 @@ export class WebhookTestService {
 			isMutingNote: false,
 			isFavorited: false,
 			isRenoted: false,
+			isSilenced: false,
 			visibility: note.visibility,
 			mentions: note.mentions,
 			visibleUserIds: note.visibleUserIds,
diff --git a/packages/backend/src/core/entities/NoteEntityService.ts b/packages/backend/src/core/entities/NoteEntityService.ts
index 3d329684ea..9df6e909a6 100644
--- a/packages/backend/src/core/entities/NoteEntityService.ts
+++ b/packages/backend/src/core/entities/NoteEntityService.ts
@@ -642,13 +642,26 @@ export class NoteEntityService implements OnModuleInit {
 					.getExists() : false),
 		]);
 
+		const packedUser = packedUsers?.get(note.userId) ?? this.userEntityService.pack(note.user ?? note.userId, me);
+		const isSilenced = Promise.resolve(packedUser).then(async u => {
+			if (!u.isSilenced && !u.instance?.isSilenced) return false;
+			if (note.userId === meId) return false;
+
+			if (meId) {
+				const followings = opts._hint_?.userFollowings ?? await this.cacheService.userFollowingsCache.fetch(meId);
+				if (followings.has(note.userId)) return false;
+			}
+
+			return true;
+		});
+
 		const packed: Packed<'Note'> = await awaitAll({
 			id: note.id,
 			threadId,
 			createdAt: this.idService.parse(note.id).date.toISOString(),
 			updatedAt: note.updatedAt ? note.updatedAt.toISOString() : undefined,
 			userId: note.userId,
-			user: packedUsers?.get(note.userId) ?? this.userEntityService.pack(note.user ?? note.userId, me),
+			user: packedUser,
 			text: text,
 			cw: note.cw,
 			mandatoryCW: note.mandatoryCW,
@@ -689,6 +702,7 @@ export class NoteEntityService implements OnModuleInit {
 			isMutingNote: mutedNotes.has(note.id),
 			isFavorited,
 			isRenoted,
+			isSilenced,
 
 			...(meId && Object.keys(reactions).length > 0 ? {
 				myReaction: this.populateMyReaction({
diff --git a/packages/backend/src/models/json-schema/note.ts b/packages/backend/src/models/json-schema/note.ts
index 6d3b9fe15e..5ebea6c740 100644
--- a/packages/backend/src/models/json-schema/note.ts
+++ b/packages/backend/src/models/json-schema/note.ts
@@ -193,6 +193,10 @@ export const packedNoteSchema = {
 			type: 'boolean',
 			optional: false, nullable: false,
 		},
+		isSilenced: {
+			type: 'boolean',
+			optional: false, nullable: false,
+		},
 		emojis: {
 			type: 'object',
 			optional: true, nullable: false,
diff --git a/packages/frontend/src/components/SkMutedNote.vue b/packages/frontend/src/components/SkMutedNote.vue
index 05a1273238..fac948a987 100644
--- a/packages/frontend/src/components/SkMutedNote.vue
+++ b/packages/frontend/src/components/SkMutedNote.vue
@@ -47,6 +47,16 @@ Displays a placeholder for a muted note.
 			</template>
 		</I18n>
 
+		<!-- Silenced users/instances -->
+		<I18n v-if="mute.isSilenced" :src="i18n.ts.silencedUserSaysSomething" tag="small">
+			<template #name>
+				<MkUserName :user="note.user"/>
+			</template>
+			<template #host>
+				{{ host }}
+			</template>
+		</I18n>
+
 		<!-- Word mutes -->
 		<template v-if="mutedWords">
 			<I18n v-if="prefer.s.showSoftWordMutedWord" :src="i18n.ts.userSaysSomethingAbout" tag="small">
diff --git a/packages/frontend/src/utility/check-word-mute.ts b/packages/frontend/src/utility/check-word-mute.ts
index 9406004312..c626cb48bf 100644
--- a/packages/frontend/src/utility/check-word-mute.ts
+++ b/packages/frontend/src/utility/check-word-mute.ts
@@ -16,7 +16,7 @@ export interface Mute {
 	softMutedWords?: string[];
 	sensitiveMuted?: boolean;
 
-	isSensitive?: boolean;
+	isSilenced?: boolean;
 
 	threadMuted?: boolean;
 	noteMuted?: boolean;
@@ -110,6 +110,7 @@ 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 isSilenced = override.isSilenced ?? note.isSilenced;
 	const threadMuted = override.threadMuted ?? (!isMe && note.isMutingThread);
 	const noteMuted = override.noteMuted ?? (!isMe && note.isMutingNote);
 	const noteMandatoryCW = override.noteMandatoryCW !== undefined
@@ -126,7 +127,7 @@ function getMutes(note: Misskey.entities.Note, withHardMute: boolean, overrides:
 
 	const hasMute = hardMuted || softMutedWords.length > 0 || sensitiveMuted || threadMuted || noteMuted || !!noteMandatoryCW || !!userMandatoryCW || !!instanceMandatoryCW;
 
-	return { hasMute, hardMuted, softMutedWords, sensitiveMuted, threadMuted, noteMuted, noteMandatoryCW, userMandatoryCW, instanceMandatoryCW };
+	return { hasMute, hardMuted, softMutedWords, sensitiveMuted, isSilenced, threadMuted, noteMuted, noteMandatoryCW, userMandatoryCW, instanceMandatoryCW };
 }
 
 function isHardMuted(note: Misskey.entities.Note): boolean {
diff --git a/packages/misskey-js/src/autogen/types.ts b/packages/misskey-js/src/autogen/types.ts
index ead1ca0c27..569b91158c 100644
--- a/packages/misskey-js/src/autogen/types.ts
+++ b/packages/misskey-js/src/autogen/types.ts
@@ -4731,6 +4731,7 @@ export type components = {
       isMutingNote: boolean;
       isFavorited: boolean;
       isRenoted: boolean;
+      isSilenced: boolean;
       emojis?: {
         [key: string]: string;
       };
diff --git a/sharkey-locales/en-US.yml b/sharkey-locales/en-US.yml
index f3e3951a7b..ddedfc92ef 100644
--- a/sharkey-locales/en-US.yml
+++ b/sharkey-locales/en-US.yml
@@ -35,6 +35,7 @@ muteNote: "Mute note"
 unmuteNote: "Unmute note"
 userSaysSomethingInMutedNote: "{name} said something in a muted post"
 userSaysSomethingInMutedThread: "{name} said something in a muted thread"
+silencedUserSaysSomething: "{name} has been silenced by {host} staff"
 userIsFlaggedAs: "{name} is flagged: \"{cw}\""
 noteIsFlaggedAs: "Note is flagged: \"{cw}\""
 instanceIsFlaggedAs: "{name} is flagged: \"{cw}\""

From 16dedf7219934a93abd62892c78a71c663336b13 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Fri, 25 Jul 2025 18:25:45 -0400
Subject: [PATCH 031/110] filter silenced notes in many more places

---
 packages/backend/src/core/QueryService.ts     | 61 +++++++++++++------
 packages/backend/src/core/SearchService.ts    |  2 +
 .../server/api/endpoints/antennas/notes.ts    |  1 +
 .../api/endpoints/notes/bubble-timeline.ts    |  2 +-
 .../server/api/endpoints/notes/featured.ts    |  1 +
 .../src/server/api/endpoints/notes/renotes.ts |  1 +
 .../api/endpoints/notes/user-list-timeline.ts |  1 +
 .../api/endpoints/users/featured-notes.ts     |  1 +
 .../src/server/api/endpoints/users/notes.ts   |  1 +
 .../server/api/endpoints/users/reactions.ts   |  1 +
 10 files changed, 51 insertions(+), 21 deletions(-)

diff --git a/packages/backend/src/core/QueryService.ts b/packages/backend/src/core/QueryService.ts
index e1bfe8d3b9..d0de136938 100644
--- a/packages/backend/src/core/QueryService.ts
+++ b/packages/backend/src/core/QueryService.ts
@@ -7,7 +7,6 @@ import { Inject, Injectable } from '@nestjs/common';
 import { Brackets, Not, WhereExpressionBuilder } from 'typeorm';
 import { DI } from '@/di-symbols.js';
 import type { MiUser } from '@/models/User.js';
-import { MiInstance } from '@/models/Instance.js';
 import type { UserProfilesRepository, FollowingsRepository, ChannelFollowingsRepository, BlockingsRepository, NoteThreadMutingsRepository, MutingsRepository, RenoteMutingsRepository, MiMeta, InstancesRepository } from '@/models/_.js';
 import { bindThis } from '@/decorators.js';
 import { IdService } from '@/core/IdService.js';
@@ -204,7 +203,7 @@ export class QueryService {
 	@bindThis
 	public generateBlockedHostQueryForNote<E extends ObjectLiteral>(q: SelectQueryBuilder<E>, excludeAuthor?: boolean): SelectQueryBuilder<E> {
 		const checkFor = (key: 'user' | 'replyUser' | 'renoteUser') => this
-			.leftJoinInstance(q, `note.${key}Instance`, `${key}Instance`)
+			.leftJoin(q, `note.${key}Instance`, `${key}Instance`)
 			.andWhere(new Brackets(qb => {
 				qb
 					.orWhere(`"${key}Instance" IS NULL`) // local
@@ -225,31 +224,53 @@ export class QueryService {
 	}
 
 	@bindThis
-	public generateSilencedUserQueryForNotes<E extends ObjectLiteral>(q: SelectQueryBuilder<E>, me?: { id: MiUser['id'] } | null): SelectQueryBuilder<E> {
-		if (!me) {
-			return q.andWhere('user.isSilenced = false');
+	public generateSilencedUserQueryForNotes<E extends ObjectLiteral>(q: SelectQueryBuilder<E>, me?: { id: MiUser['id'] } | null, excludeAuthor = false): SelectQueryBuilder<E> {
+		const checkFor = (key: 'user' | 'replyUser' | 'renoteUser') => {
+			// These are de-duplicated, since most call sites already provide some of them.
+			this.leftJoin(q, `note.${key}Instance`, `${key}Instance`); // note->instance
+			this.leftJoin(q, `note.${key}`, key); // note->user
+
+			q.andWhere(new Brackets(qb => {
+				// case 1: user does not exist (note is not reply/renote)
+				qb.orWhere(`note.${key}Id IS NULL`);
+
+				// case 2: user not silenced AND instance not silenced
+				qb.orWhere(new Brackets(qbb => qbb
+					.andWhere(new Brackets(qbbb => qbbb
+						.orWhere(`"${key}Instance"."isSilenced" = false`)
+						.orWhere(`"${key}Instance" IS NULL`)))
+					.andWhere(`"${key}"."isSilenced" = false`)));
+
+				if (me) {
+					// case 3: we are the author
+					qb.orWhere(`note.${key}Id = :meId`);
+
+					// case 4: we are following the user
+					this.orFollowingUser(qb, ':meId', `note.${key}Id`);
+				}
+			}));
+		};
+
+		// Set parameters only once
+		if (me) {
+			q.setParameters({ meId: me.id });
 		}
 
-		return this
-			.leftJoinInstance(q, 'note.userInstance', 'userInstance')
-			.andWhere(new Brackets(qb => this
-				// case 1: we are following the user
-				.orFollowingUser(qb, ':meId', 'note.userId')
-				// case 2: user not silenced AND instance not silenced
-				.orWhere(new Brackets(qbb => qbb
-					.andWhere(new Brackets(qbbb => qbbb
-						.orWhere('"userInstance"."isSilenced" = false')
-						.orWhere('"userInstance" IS NULL')))
-					.andWhere('user.isSilenced = false')))))
-			.setParameters({ meId: me.id });
+		if (!excludeAuthor) {
+			checkFor('user');
+		}
+		checkFor('replyUser');
+		checkFor('renoteUser');
+
+		return q;
 	}
 
 	/**
-	 * Left-joins an instance in to the query with a given alias and optional condition.
-	 * These calls are de-duplicated - multiple uses of the same alias are skipped.
+	 * Left-joins a relation into the query with a given alias and optional condition.
+	 * These calls are de-duplicated - multiple uses of the same relation+alias are skipped.
 	 */
 	@bindThis
-	public leftJoinInstance<E extends ObjectLiteral>(q: SelectQueryBuilder<E>, relation: string | typeof MiInstance, alias: string, condition?: string): SelectQueryBuilder<E> {
+	public leftJoin<E extends ObjectLiteral>(q: SelectQueryBuilder<E>, relation: string, alias: string, condition?: string): SelectQueryBuilder<E> {
 		// Skip if it's already joined, otherwise we'll get an error
 		if (!q.expressionMap.joinAttributes.some(j => j.alias.name === alias)) {
 			q.leftJoin(relation, alias, condition);
diff --git a/packages/backend/src/core/SearchService.ts b/packages/backend/src/core/SearchService.ts
index 9b9ae27739..1f308a2234 100644
--- a/packages/backend/src/core/SearchService.ts
+++ b/packages/backend/src/core/SearchService.ts
@@ -302,6 +302,7 @@ export class SearchService {
 		this.queryService.generateVisibilityQuery(query, me);
 		this.queryService.generateBlockedHostQueryForNote(query);
 		this.queryService.generateSuspendedUserQueryForNote(query);
+		this.queryService.generateSilencedUserQueryForNotes(query, me);
 		if (me) this.queryService.generateMutedUserQueryForNotes(query, me);
 		if (me) this.queryService.generateBlockedUserQueryForNotes(query, me);
 
@@ -380,6 +381,7 @@ export class SearchService {
 
 		this.queryService.generateBlockedHostQueryForNote(query);
 		this.queryService.generateSuspendedUserQueryForNote(query);
+		this.queryService.generateSilencedUserQueryForNotes(query, me);
 
 		const notes = (await query.getMany()).filter(note => {
 			if (me && isUserRelated(note, userIdsWhoBlockingMe)) return false;
diff --git a/packages/backend/src/server/api/endpoints/antennas/notes.ts b/packages/backend/src/server/api/endpoints/antennas/notes.ts
index f8c12298cd..0aeceda038 100644
--- a/packages/backend/src/server/api/endpoints/antennas/notes.ts
+++ b/packages/backend/src/server/api/endpoints/antennas/notes.ts
@@ -122,6 +122,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 
 			this.queryService.generateBlockedHostQueryForNote(query);
 			this.queryService.generateSuspendedUserQueryForNote(query);
+			this.queryService.generateSilencedUserQueryForNotes(query, me);
 			this.queryService.generateVisibilityQuery(query, me);
 			this.queryService.generateMutedUserQueryForNotes(query, me);
 			this.queryService.generateBlockedUserQueryForNotes(query, me);
diff --git a/packages/backend/src/server/api/endpoints/notes/bubble-timeline.ts b/packages/backend/src/server/api/endpoints/notes/bubble-timeline.ts
index 6bb5856f96..e31b9be702 100644
--- a/packages/backend/src/server/api/endpoints/notes/bubble-timeline.ts
+++ b/packages/backend/src/server/api/endpoints/notes/bubble-timeline.ts
@@ -93,7 +93,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				.leftJoin('(select "host" from "instance" where "isBubbled" = true)', 'bubbleInstance', '"bubbleInstance"."host" = "note"."userHost"')
 				.andWhere('"bubbleInstance" IS NOT NULL');
 			this.queryService
-				.leftJoinInstance(query, 'note.userInstance', 'userInstance', '"userInstance"."host" = "bubbleInstance"."host"');
+				.leftJoin(query, 'note.userInstance', 'userInstance', '"userInstance"."host" = "bubbleInstance"."host"');
 
 			this.queryService.generateBlockedHostQueryForNote(query);
 			this.queryService.generateSilencedUserQueryForNotes(query, me);
diff --git a/packages/backend/src/server/api/endpoints/notes/featured.ts b/packages/backend/src/server/api/endpoints/notes/featured.ts
index 12d928c9a7..abb7941d47 100644
--- a/packages/backend/src/server/api/endpoints/notes/featured.ts
+++ b/packages/backend/src/server/api/endpoints/notes/featured.ts
@@ -122,6 +122,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 
 			this.queryService.generateBlockedHostQueryForNote(query);
 			this.queryService.generateSuspendedUserQueryForNote(query);
+			this.queryService.generateSilencedUserQueryForNotes(query, me);
 
 			const notes = (await query.getMany()).filter(note => {
 				if (me && isUserRelated(note, userIdsWhoBlockingMe)) return false;
diff --git a/packages/backend/src/server/api/endpoints/notes/renotes.ts b/packages/backend/src/server/api/endpoints/notes/renotes.ts
index 4a4ef0b77e..71c40421b9 100644
--- a/packages/backend/src/server/api/endpoints/notes/renotes.ts
+++ b/packages/backend/src/server/api/endpoints/notes/renotes.ts
@@ -93,6 +93,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 			this.queryService.generateVisibilityQuery(query, me);
 			this.queryService.generateBlockedHostQueryForNote(query);
 			this.queryService.generateSuspendedUserQueryForNote(query);
+			this.queryService.generateSilencedUserQueryForNotes(query, me);
 			if (me) {
 				this.queryService.generateMutedUserQueryForNotes(query, me);
 				this.queryService.generateBlockedUserQueryForNotes(query, me);
diff --git a/packages/backend/src/server/api/endpoints/notes/user-list-timeline.ts b/packages/backend/src/server/api/endpoints/notes/user-list-timeline.ts
index d54a24f0a1..ff37e0aaba 100644
--- a/packages/backend/src/server/api/endpoints/notes/user-list-timeline.ts
+++ b/packages/backend/src/server/api/endpoints/notes/user-list-timeline.ts
@@ -177,6 +177,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 		this.queryService.generateVisibilityQuery(query, me);
 		this.queryService.generateBlockedHostQueryForNote(query);
 		this.queryService.generateSuspendedUserQueryForNote(query);
+		this.queryService.generateSilencedUserQueryForNotes(query, me, true);
 		this.queryService.generateMutedUserQueryForNotes(query, me);
 		this.queryService.generateBlockedUserQueryForNotes(query, me);
 
diff --git a/packages/backend/src/server/api/endpoints/users/featured-notes.ts b/packages/backend/src/server/api/endpoints/users/featured-notes.ts
index 8be5bb0de9..f77e81708a 100644
--- a/packages/backend/src/server/api/endpoints/users/featured-notes.ts
+++ b/packages/backend/src/server/api/endpoints/users/featured-notes.ts
@@ -95,6 +95,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 
 			this.queryService.generateBlockedHostQueryForNote(query);
 			this.queryService.generateSuspendedUserQueryForNote(query);
+			this.queryService.generateSilencedUserQueryForNotes(query, me, true);
 
 			const notes = (await query.getMany()).filter(note => {
 				if (me && isUserRelated(note, userIdsWhoBlockingMe, false)) return false;
diff --git a/packages/backend/src/server/api/endpoints/users/notes.ts b/packages/backend/src/server/api/endpoints/users/notes.ts
index 5b16ef32a4..b87d4abd7c 100644
--- a/packages/backend/src/server/api/endpoints/users/notes.ts
+++ b/packages/backend/src/server/api/endpoints/users/notes.ts
@@ -221,6 +221,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 		this.queryService.generateVisibilityQuery(query, me);
 		this.queryService.generateBlockedHostQueryForNote(query, true);
 		this.queryService.generateSuspendedUserQueryForNote(query, true);
+		this.queryService.generateSilencedUserQueryForNotes(query, me, true);
 		if (me) {
 			this.queryService.generateMutedUserQueryForNotes(query, me, { id: ps.userId });
 			this.queryService.generateBlockedUserQueryForNotes(query, me);
diff --git a/packages/backend/src/server/api/endpoints/users/reactions.ts b/packages/backend/src/server/api/endpoints/users/reactions.ts
index f0d2000f58..16e19fc1b5 100644
--- a/packages/backend/src/server/api/endpoints/users/reactions.ts
+++ b/packages/backend/src/server/api/endpoints/users/reactions.ts
@@ -115,6 +115,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 			this.queryService.generateVisibilityQuery(query, me);
 			this.queryService.generateBlockedHostQueryForNote(query);
 			this.queryService.generateSuspendedUserQueryForNote(query);
+			this.queryService.generateSilencedUserQueryForNotes(query, me, true);
 			if (me) {
 				this.queryService.generateMutedUserQueryForNotes(query, me);
 				this.queryService.generateBlockedUserQueryForNotes(query, me);

From 0a97e442b224045e180bf3497ee2abadafb66c71 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Fri, 25 Jul 2025 23:44:28 -0400
Subject: [PATCH 032/110] count "isSilenced" as a mute condition

---
 packages/frontend/src/utility/check-word-mute.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/frontend/src/utility/check-word-mute.ts b/packages/frontend/src/utility/check-word-mute.ts
index c626cb48bf..32b1064162 100644
--- a/packages/frontend/src/utility/check-word-mute.ts
+++ b/packages/frontend/src/utility/check-word-mute.ts
@@ -125,7 +125,7 @@ function getMutes(note: Misskey.entities.Note, withHardMute: boolean, overrides:
 			? note.user.instance.mandatoryCW
 			: null;
 
-	const hasMute = hardMuted || softMutedWords.length > 0 || sensitiveMuted || threadMuted || noteMuted || !!noteMandatoryCW || !!userMandatoryCW || !!instanceMandatoryCW;
+	const hasMute = hardMuted || softMutedWords.length > 0 || sensitiveMuted || isSilenced || threadMuted || noteMuted || !!noteMandatoryCW || !!userMandatoryCW || !!instanceMandatoryCW;
 
 	return { hasMute, hardMuted, softMutedWords, sensitiveMuted, isSilenced, threadMuted, noteMuted, noteMandatoryCW, userMandatoryCW, instanceMandatoryCW };
 }

From e5dfcf6f64dff49b53ddddffbd5be8619c2b91a4 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Sat, 26 Jul 2025 16:51:57 -0400
Subject: [PATCH 033/110] fix SkPatternTest

---
 packages/frontend/src/utility/check-word-mute.ts | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/packages/frontend/src/utility/check-word-mute.ts b/packages/frontend/src/utility/check-word-mute.ts
index 32b1064162..0bd888fb20 100644
--- a/packages/frontend/src/utility/check-word-mute.ts
+++ b/packages/frontend/src/utility/check-word-mute.ts
@@ -159,6 +159,14 @@ function isSensitiveMuted(note: Misskey.entities.Note): boolean {
 }
 
 export function getMutedWords(mutedWords: (string | string[])[], inputs: Iterable<string>): string[] {
+	// Fixup: string is assignable to Iterable<string>, but doesn't work below.
+	// As a workaround, we can special-case it to "upgrade" plain strings into arrays instead.
+	// We also need a noinspection tag, since JetBrains IDEs don't understand this behavior either.
+	// noinspection SuspiciousTypeOfGuard
+	if (typeof(inputs) === 'string') {
+		inputs = [inputs];
+	}
+
 	// Parse mutes
 	const { regexMutes, patternMutes } = parseMutes(mutedWords);
 

From 807aa1be3db2ce2a61977b6d6ac75961e47b837e Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Sat, 26 Jul 2025 18:55:19 -0400
Subject: [PATCH 034/110] normalize new CW in all mandatory CW endpoints

---
 .../server/api/endpoints/admin/cw-instance.ts | 20 +++++++++----------
 .../src/server/api/endpoints/admin/cw-note.ts | 15 +++++++-------
 .../src/server/api/endpoints/admin/cw-user.ts | 17 ++++++++--------
 3 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/packages/backend/src/server/api/endpoints/admin/cw-instance.ts b/packages/backend/src/server/api/endpoints/admin/cw-instance.ts
index 5fd9fd10b3..0a60316170 100644
--- a/packages/backend/src/server/api/endpoints/admin/cw-instance.ts
+++ b/packages/backend/src/server/api/endpoints/admin/cw-instance.ts
@@ -34,21 +34,21 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 		super(meta, paramDef, async (ps, me) => {
 			const instance = await this.federatedInstanceService.fetchOrRegister(ps.host);
 
+			// Collapse empty strings to null
+			const newCW = ps.cw || null;
+			const oldCW = instance.mandatoryCW;
+
 			// Skip if there's nothing to do
-			if (instance.mandatoryCW === ps.cw) return;
+			if (oldCW === newCW) return;
+
+			// This synchronizes caches automatically
+			await this.federatedInstanceService.update(instance.id, { mandatoryCW: newCW });
 
-			// Log event first.
-			// This ensures that we don't "lose" the log if an error occurs
 			await this.moderationLogService.log(me, 'setMandatoryCWForInstance', {
-				newCW: ps.cw,
-				oldCW: instance.mandatoryCW,
+				newCW,
+				oldCW,
 				host: ps.host,
 			});
-
-			await this.federatedInstanceService.update(instance.id, {
-				// Collapse empty strings to null
-				mandatoryCW: ps.cw || null,
-			});
 		});
 	}
 }
diff --git a/packages/backend/src/server/api/endpoints/admin/cw-note.ts b/packages/backend/src/server/api/endpoints/admin/cw-note.ts
index cf513a4922..e036c2e530 100644
--- a/packages/backend/src/server/api/endpoints/admin/cw-note.ts
+++ b/packages/backend/src/server/api/endpoints/admin/cw-note.ts
@@ -43,23 +43,22 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 			}) as MiNote & { user: MiUser };
 
 			// Collapse empty strings to null
-			const mandatoryCW = ps.cw || null;
+			const newCW = ps.cw || null;
+			const oldCW = note.mandatoryCW;
 
 			// Skip if there's nothing to do
-			if (note.mandatoryCW === mandatoryCW) return;
+			if (oldCW === newCW) return;
+
+			await this.noteEditService.edit(note.user, note.id, { mandatoryCW: newCW });
 
-			// Log event first.
-			// This ensures that we don't "lose" the log if an error occurs
 			await this.moderationLogService.log(me, 'setMandatoryCWForNote', {
-				newCW: mandatoryCW,
-				oldCW: note.mandatoryCW,
+				newCW,
+				oldCW,
 				noteId: note.id,
 				noteUserId: note.user.id,
 				noteUserUsername: note.user.username,
 				noteUserHost: note.user.host,
 			});
-
-			await this.noteEditService.edit(note.user, note.id, { mandatoryCW });
 		});
 	}
 }
diff --git a/packages/backend/src/server/api/endpoints/admin/cw-user.ts b/packages/backend/src/server/api/endpoints/admin/cw-user.ts
index 37480e9302..a318f830cf 100644
--- a/packages/backend/src/server/api/endpoints/admin/cw-user.ts
+++ b/packages/backend/src/server/api/endpoints/admin/cw-user.ts
@@ -41,20 +41,21 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 		super(meta, paramDef, async (ps, me) => {
 			const user = await this.cacheService.findUserById(ps.userId);
 
-			// Skip if there's nothing to do
-			if (user.mandatoryCW === ps.cw) return;
+			// Collapse empty strings to null
+			const newCW = ps.cw || null;
+			const oldCW = user.mandatoryCW;
 
-			await this.usersRepository.update(ps.userId, {
-				// Collapse empty strings to null
-				mandatoryCW: ps.cw || null,
-			});
+			// Skip if there's nothing to do
+			if (oldCW === newCW) return;
+
+			await this.usersRepository.update(ps.userId, { mandatoryCW: newCW });
 
 			// Synchronize caches and other processes
 			this.globalEventService.publishInternalEvent('localUserUpdated', { id: ps.userId });
 
 			await this.moderationLogService.log(me, 'setMandatoryCW', {
-				newCW: ps.cw,
-				oldCW: user.mandatoryCW,
+				newCW,
+				oldCW,
 				userId: user.id,
 				userUsername: user.username,
 				userHost: user.host,

From a42edb03241f015997c117afec1e0f6a1ff94bf5 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Sat, 26 Jul 2025 18:58:10 -0400
Subject: [PATCH 035/110] fix event type for cw-user

---
 packages/backend/src/server/api/endpoints/admin/cw-user.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/backend/src/server/api/endpoints/admin/cw-user.ts b/packages/backend/src/server/api/endpoints/admin/cw-user.ts
index a318f830cf..a42a83f4c6 100644
--- a/packages/backend/src/server/api/endpoints/admin/cw-user.ts
+++ b/packages/backend/src/server/api/endpoints/admin/cw-user.ts
@@ -51,7 +51,8 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 			await this.usersRepository.update(ps.userId, { mandatoryCW: newCW });
 
 			// Synchronize caches and other processes
-			this.globalEventService.publishInternalEvent('localUserUpdated', { id: ps.userId });
+			const evt = user.host == null ? 'localUserUpdated' : 'remoteUserUpdated';
+			this.globalEventService.publishInternalEvent(evt, { id: ps.userId });
 
 			await this.moderationLogService.log(me, 'setMandatoryCW', {
 				newCW,

From 2be12dfe6487bbb8b4c018583ba98d26a20d3eea Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Sat, 26 Jul 2025 20:26:33 -0400
Subject: [PATCH 036/110] fix silenced users being hidden from their followers

---
 packages/backend/src/core/entities/NoteEntityService.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/backend/src/core/entities/NoteEntityService.ts b/packages/backend/src/core/entities/NoteEntityService.ts
index 9df6e909a6..368586d2fb 100644
--- a/packages/backend/src/core/entities/NoteEntityService.ts
+++ b/packages/backend/src/core/entities/NoteEntityService.ts
@@ -648,7 +648,7 @@ export class NoteEntityService implements OnModuleInit {
 			if (note.userId === meId) return false;
 
 			if (meId) {
-				const followings = opts._hint_?.userFollowings ?? await this.cacheService.userFollowingsCache.fetch(meId);
+				const followings = opts._hint_?.userFollowings.get(meId) ?? await this.cacheService.userFollowingsCache.fetch(meId);
 				if (followings.has(note.userId)) return false;
 			}
 

From 32ae618ca6e452ad7141e303f6572cd98a23e0aa Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Sat, 26 Jul 2025 20:31:40 -0400
Subject: [PATCH 037/110] hide silenced users in following feed

---
 packages/backend/src/server/api/endpoints/notes/following.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/backend/src/server/api/endpoints/notes/following.ts b/packages/backend/src/server/api/endpoints/notes/following.ts
index 0f8c61ab3e..6a1a99f73f 100644
--- a/packages/backend/src/server/api/endpoints/notes/following.ts
+++ b/packages/backend/src/server/api/endpoints/notes/following.ts
@@ -150,6 +150,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 			// Hide blocked users / instances
 			query.andWhere('"user"."isSuspended" = false');
 			this.queryService.generateBlockedHostQueryForNote(query);
+			this.queryService.generateSilencedUserQueryForNotes(query, me, ps.list !== 'followers');
 
 			// Respect blocks, mutes, and privacy
 			this.queryService.generateVisibilityQuery(query, me);

From b76bb672d940b2c7aec132f81e0c087f143e3dea Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Sat, 26 Jul 2025 20:32:00 -0400
Subject: [PATCH 038/110] bulk-expand silenced notes

---
 packages/frontend/src/components/DynamicNote.vue       | 1 +
 packages/frontend/src/components/SkUrlPreviewGroup.vue | 1 +
 packages/frontend/src/components/page/page.block.vue   | 1 +
 packages/frontend/src/pages/user/home.vue              | 1 +
 4 files changed, 4 insertions(+)

diff --git a/packages/frontend/src/components/DynamicNote.vue b/packages/frontend/src/components/DynamicNote.vue
index 985831d2f8..10f4ea36cf 100644
--- a/packages/frontend/src/components/DynamicNote.vue
+++ b/packages/frontend/src/components/DynamicNote.vue
@@ -58,6 +58,7 @@ function onExpandNote(note: Misskey.entities.Note) {
 			user: {
 				[note.user.id]: {
 					userMandatoryCW: null,
+					isSilenced: false,
 				},
 			},
 			instance: {
diff --git a/packages/frontend/src/components/SkUrlPreviewGroup.vue b/packages/frontend/src/components/SkUrlPreviewGroup.vue
index a22c5d8050..ea7ab34ef2 100644
--- a/packages/frontend/src/components/SkUrlPreviewGroup.vue
+++ b/packages/frontend/src/components/SkUrlPreviewGroup.vue
@@ -89,6 +89,7 @@ function onExpandNote(note: Misskey.entities.Note) {
 		user: {
 			[note.user.id]: {
 				userMandatoryCW: null,
+				isSilenced: false,
 			},
 		},
 		instance: {
diff --git a/packages/frontend/src/components/page/page.block.vue b/packages/frontend/src/components/page/page.block.vue
index 8e60a95c6b..252b310231 100644
--- a/packages/frontend/src/components/page/page.block.vue
+++ b/packages/frontend/src/components/page/page.block.vue
@@ -60,6 +60,7 @@ function onExpandNote(note: Misskey.entities.Note) {
 		user: {
 			[note.user.id]: {
 				userMandatoryCW: null,
+				isSilenced: false,
 			},
 		},
 		instance: {
diff --git a/packages/frontend/src/pages/user/home.vue b/packages/frontend/src/pages/user/home.vue
index 241bdcd579..b49440d6a3 100644
--- a/packages/frontend/src/pages/user/home.vue
+++ b/packages/frontend/src/pages/user/home.vue
@@ -267,6 +267,7 @@ function onExpandMute(note: Misskey.entities.Note) {
 				[props.user.id]: {
 					userMandatoryCW: null,
 					instanceMandatoryCW: null,
+					isSilenced: false,
 				},
 			},
 		});

From 455be9e197e2b8c3000d80370fdf5f855bd5ea4e Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Sat, 26 Jul 2025 22:04:11 -0400
Subject: [PATCH 039/110] replace note.isSilenced with user.isSilencedForMe

---
 .../src/core/entities/NoteEntityService.ts    | 16 +------
 .../src/core/entities/UserEntityService.ts    | 43 ++++++++++++++-----
 .../backend/src/models/json-schema/note.ts    |  4 --
 .../backend/src/models/json-schema/user.ts    |  4 ++
 .../frontend/src/utility/check-word-mute.ts   |  2 +-
 packages/misskey-js/src/autogen/types.ts      |  2 +-
 6 files changed, 40 insertions(+), 31 deletions(-)

diff --git a/packages/backend/src/core/entities/NoteEntityService.ts b/packages/backend/src/core/entities/NoteEntityService.ts
index 368586d2fb..3d329684ea 100644
--- a/packages/backend/src/core/entities/NoteEntityService.ts
+++ b/packages/backend/src/core/entities/NoteEntityService.ts
@@ -642,26 +642,13 @@ export class NoteEntityService implements OnModuleInit {
 					.getExists() : false),
 		]);
 
-		const packedUser = packedUsers?.get(note.userId) ?? this.userEntityService.pack(note.user ?? note.userId, me);
-		const isSilenced = Promise.resolve(packedUser).then(async u => {
-			if (!u.isSilenced && !u.instance?.isSilenced) return false;
-			if (note.userId === meId) return false;
-
-			if (meId) {
-				const followings = opts._hint_?.userFollowings.get(meId) ?? await this.cacheService.userFollowingsCache.fetch(meId);
-				if (followings.has(note.userId)) return false;
-			}
-
-			return true;
-		});
-
 		const packed: Packed<'Note'> = await awaitAll({
 			id: note.id,
 			threadId,
 			createdAt: this.idService.parse(note.id).date.toISOString(),
 			updatedAt: note.updatedAt ? note.updatedAt.toISOString() : undefined,
 			userId: note.userId,
-			user: packedUser,
+			user: packedUsers?.get(note.userId) ?? this.userEntityService.pack(note.user ?? note.userId, me),
 			text: text,
 			cw: note.cw,
 			mandatoryCW: note.mandatoryCW,
@@ -702,7 +689,6 @@ export class NoteEntityService implements OnModuleInit {
 			isMutingNote: mutedNotes.has(note.id),
 			isFavorited,
 			isRenoted,
-			isSilenced,
 
 			...(meId && Object.keys(reactions).length > 0 ? {
 				myReaction: this.populateMyReaction({
diff --git a/packages/backend/src/core/entities/UserEntityService.ts b/packages/backend/src/core/entities/UserEntityService.ts
index af25300944..a8667b4469 100644
--- a/packages/backend/src/core/entities/UserEntityService.ts
+++ b/packages/backend/src/core/entities/UserEntityService.ts
@@ -183,7 +183,7 @@ export class UserEntityService implements OnModuleInit {
 	public isRemoteUser = isRemoteUser;
 
 	@bindThis
-	public async getRelation(me: MiUser['id'], target: MiUser['id']): Promise<UserRelation> {
+	public async getRelation(me: MiUser['id'], target: MiUser['id'], hint?: { myFollowings?: Map<string, Omit<MiFollowing, 'isFollowerHibernated'>> }): Promise<UserRelation> {
 		const [
 			following,
 			isFollowed,
@@ -197,7 +197,9 @@ export class UserEntityService implements OnModuleInit {
 			memo,
 			mutedInstances,
 		] = await Promise.all([
-			this.cacheService.userFollowingsCache.fetch(me).then(f => f.get(target) ?? null),
+			hint?.myFollowings
+				? (hint.myFollowings.get(target) ?? null)
+				: this.cacheService.userFollowingsCache.fetch(me).then(f => f.get(target) ?? null),
 			this.cacheService.userFollowingsCache.fetch(target).then(f => f.has(me)),
 			this.followRequestsRepository.exists({
 				where: {
@@ -248,7 +250,8 @@ export class UserEntityService implements OnModuleInit {
 	}
 
 	@bindThis
-	public async getRelations(me: MiUser['id'], targets: MiUser['id'][]): Promise<Map<MiUser['id'], UserRelation>> {
+	public async getRelations(me: MiUser['id'], targets: MiUser['id'][], hint?: { myFollowings?: Map<string, Omit<MiFollowing, 'isFollowerHibernated'>> }): Promise<Map<MiUser['id'], UserRelation>> {
+		// noinspection ES6MissingAwait
 		const [
 			myFollowing,
 			myFollowers,
@@ -262,7 +265,7 @@ export class UserEntityService implements OnModuleInit {
 			memos,
 			mutedInstances,
 		] = await Promise.all([
-			this.cacheService.userFollowingsCache.fetch(me),
+			hint?.myFollowings ?? this.cacheService.userFollowingsCache.fetch(me),
 			this.cacheService.userFollowersCache.fetch(me),
 			this.followRequestsRepository.createQueryBuilder('f')
 				.select('f.followeeId')
@@ -432,6 +435,7 @@ export class UserEntityService implements OnModuleInit {
 			userIdsByUri?: Map<string, string>,
 			instances?: Map<string, MiInstance | null>,
 			securityKeyCounts?: Map<string, number>,
+			myFollowings?: Map<string, Omit<MiFollowing, 'isFollowerHibernated'>>,
 		},
 	): Promise<Packed<S>> {
 		const opts = Object.assign({
@@ -479,12 +483,14 @@ export class UserEntityService implements OnModuleInit {
 			? (opts.userProfile ?? user.userProfile ?? await this.userProfilesRepository.findOneByOrFail({ userId: user.id }))
 			: null;
 
+		const myFollowings = opts.myFollowings ?? (meId ? await this.cacheService.userFollowingsCache.fetch(meId) : undefined);
+
 		let relation: UserRelation | null = null;
 		if (meId && !isMe && isDetailed) {
 			if (opts.userRelations) {
 				relation = opts.userRelations.get(user.id) ?? null;
 			} else {
-				relation = await this.getRelation(meId, user.id);
+				relation = await this.getRelation(meId, user.id, { myFollowings });
 			}
 		}
 
@@ -537,6 +543,14 @@ export class UserEntityService implements OnModuleInit {
 		let fetchPoliciesPromise: Promise<RolePolicies> | null = null;
 		const fetchPolicies = () => fetchPoliciesPromise ??= this.roleService.getUserPolicies(user);
 
+		const instancePromise = Promise.resolve(user.host
+			? opts.instances?.has(user.host)
+				? opts.instances.get(user.host)
+				: this.federatedInstanceService.fetch(user.host)
+			: null);
+
+		const bypassSilence = isMe || (meId && myFollowings ? myFollowings.has(meId) : false);
+
 		const packed = {
 			id: user.id,
 			name: user.name,
@@ -564,13 +578,14 @@ export class UserEntityService implements OnModuleInit {
 			mandatoryCW: user.mandatoryCW,
 			rejectQuotes: user.rejectQuotes,
 			attributionDomains: user.attributionDomains,
-			isSilenced: user.isSilenced || fetchPolicies().then(r => !r.canPublicNote),
+			isSilenced: user.isSilenced,
+			isSilencedForMe: !bypassSilence && instancePromise.then(i => user.isSilenced || i?.isSilenced),
 			speakAsCat: user.speakAsCat ?? false,
 			approved: user.approved,
 			requireSigninToViewContents: user.requireSigninToViewContents === false ? undefined : true,
 			makeNotesFollowersOnlyBefore: user.makeNotesFollowersOnlyBefore ?? undefined,
 			makeNotesHiddenBefore: user.makeNotesHiddenBefore ?? undefined,
-			instance: user.host ? Promise.resolve(opts.instances?.has(user.host) ? opts.instances.get(user.host) : this.federatedInstanceService.fetch(user.host)).then(instance => instance ? {
+			instance: instancePromise.then(instance => instance ? {
 				name: instance.name,
 				softwareName: instance.softwareName,
 				softwareVersion: instance.softwareVersion,
@@ -579,7 +594,7 @@ export class UserEntityService implements OnModuleInit {
 				themeColor: instance.themeColor,
 				isSilenced: instance.isSilenced,
 				mandatoryCW: instance.mandatoryCW,
-			} : undefined) : undefined,
+			} : undefined),
 			followersCount: followersCount ?? 0,
 			followingCount: followingCount ?? 0,
 			notesCount: user.notesCount,
@@ -783,14 +798,20 @@ export class UserEntityService implements OnModuleInit {
 
 		// -- 実行者の有無や指定スキーマの種別によって要否が異なる値群を取得
 
-		const [profilesMap, userMemos, userRelations, pinNotes, userIdsByUri, instances, securityKeyCounts] = await Promise.all([
+		const myFollowingsPromise: Promise<Map<string, Omit<MiFollowing, 'isFollowerHibernated'>> | undefined> = meId
+			? this.cacheService.userFollowingsCache.fetch(meId)
+			: Promise.resolve(undefined);
+
+		const [profilesMap, userMemos, userRelations, pinNotes, userIdsByUri, instances, securityKeyCounts, myFollowings] = await Promise.all([
 			// profilesMap
 			this.cacheService.userProfileCache.fetchMany(_profilesToFetch).then(profiles => new Map(profiles.concat(_profilesFromUsers))),
 			// userMemos
 			isDetailed && meId ? this.userMemosRepository.findBy({ userId: meId })
 				.then(memos => new Map(memos.map(memo => [memo.targetUserId, memo.memo]))) : new Map(),
 			// userRelations
-			isDetailed && meId ? this.getRelations(meId, _userIds) : new Map(),
+			meId
+				? myFollowingsPromise.then(myFollowings => this.getRelations(meId, _userIds, { myFollowings }))
+				: new Map(),
 			// pinNotes
 			isDetailed ? this.userNotePiningsRepository.createQueryBuilder('pin')
 				.where('pin.userId IN (:...userIds)', { userIds: _userIds })
@@ -834,6 +855,8 @@ export class UserEntityService implements OnModuleInit {
 				.getRawMany<{ userId: string, userCount: number }>()
 				.then(counts => new Map(counts.map(c => [c.userId, c.userCount])))
 			: undefined, // .pack will fetch the keys for the requesting user if it's in the _userIds
+			// myFollowings
+			myFollowingsPromise,
 		]);
 
 		return Promise.all(
diff --git a/packages/backend/src/models/json-schema/note.ts b/packages/backend/src/models/json-schema/note.ts
index 5ebea6c740..6d3b9fe15e 100644
--- a/packages/backend/src/models/json-schema/note.ts
+++ b/packages/backend/src/models/json-schema/note.ts
@@ -193,10 +193,6 @@ export const packedNoteSchema = {
 			type: 'boolean',
 			optional: false, nullable: false,
 		},
-		isSilenced: {
-			type: 'boolean',
-			optional: false, nullable: false,
-		},
 		emojis: {
 			type: 'object',
 			optional: true, nullable: false,
diff --git a/packages/backend/src/models/json-schema/user.ts b/packages/backend/src/models/json-schema/user.ts
index 0c9f9f540a..54c4ba3516 100644
--- a/packages/backend/src/models/json-schema/user.ts
+++ b/packages/backend/src/models/json-schema/user.ts
@@ -184,6 +184,10 @@ export const packedUserLiteSchema = {
 			type: 'boolean',
 			nullable: false, optional: false,
 		},
+		isSilencedForMe: {
+			type: 'boolean',
+			nullable: false, optional: false,
+		},
 		requireSigninToViewContents: {
 			type: 'boolean',
 			nullable: false, optional: true,
diff --git a/packages/frontend/src/utility/check-word-mute.ts b/packages/frontend/src/utility/check-word-mute.ts
index 0bd888fb20..7569493a07 100644
--- a/packages/frontend/src/utility/check-word-mute.ts
+++ b/packages/frontend/src/utility/check-word-mute.ts
@@ -110,7 +110,7 @@ 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 isSilenced = override.isSilenced ?? note.isSilenced;
+	const isSilenced = override.isSilenced ?? note.user.isSilencedForMe;
 	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 569b91158c..92a884411c 100644
--- a/packages/misskey-js/src/autogen/types.ts
+++ b/packages/misskey-js/src/autogen/types.ts
@@ -4307,6 +4307,7 @@ export type components = {
       isCat?: boolean;
       speakAsCat?: boolean;
       isSilenced: boolean;
+      isSilencedForMe: boolean;
       requireSigninToViewContents?: boolean;
       makeNotesFollowersOnlyBefore?: number | null;
       makeNotesHiddenBefore?: number | null;
@@ -4731,7 +4732,6 @@ export type components = {
       isMutingNote: boolean;
       isFavorited: boolean;
       isRenoted: boolean;
-      isSilenced: boolean;
       emojis?: {
         [key: string]: string;
       };

From e4316e9721e5a1cabd5996fb28a92f2900fff571 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Sat, 26 Jul 2025 22:08:16 -0400
Subject: [PATCH 040/110] fix WebhookTestService.ts

---
 packages/backend/src/core/WebhookTestService.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/backend/src/core/WebhookTestService.ts b/packages/backend/src/core/WebhookTestService.ts
index 5fabe2052d..31a9f50b14 100644
--- a/packages/backend/src/core/WebhookTestService.ts
+++ b/packages/backend/src/core/WebhookTestService.ts
@@ -409,7 +409,6 @@ export class WebhookTestService {
 			isMutingNote: false,
 			isFavorited: false,
 			isRenoted: false,
-			isSilenced: false,
 			visibility: note.visibility,
 			mentions: note.mentions,
 			visibleUserIds: note.visibleUserIds,
@@ -452,6 +451,8 @@ export class WebhookTestService {
 			username: user.username,
 			host: user.host,
 			description: 'dummy user',
+			isSilenced: false,
+			isSilencedForMe: false,
 			avatarUrl: user.avatarId == null ? null : user.avatarUrl,
 			avatarBlurhash: user.avatarId == null ? null : user.avatarBlurhash,
 			avatarDecorations: user.avatarDecorations.map(it => ({

From bc16dc78d4421df3261b78630b2261c27c64ecad Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Sat, 26 Jul 2025 22:18:43 -0400
Subject: [PATCH 041/110] add instance.isSilencedForMe

---
 locales/index.d.ts                            |  4 ++
 .../src/core/entities/UserEntityService.ts    |  1 +
 .../backend/src/models/json-schema/user.ts    |  4 ++
 .../frontend/src/components/SkMutedNote.vue   | 39 ++++++++++---------
 .../frontend/src/utility/check-word-mute.ts   | 10 +++--
 packages/misskey-js/src/autogen/types.ts      |  1 +
 sharkey-locales/en-US.yml                     |  1 +
 7 files changed, 37 insertions(+), 23 deletions(-)

diff --git a/locales/index.d.ts b/locales/index.d.ts
index 6a9d9f294e..0ac3fe5844 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -12096,6 +12096,10 @@ export interface Locale extends ILocale {
      * {name} has been silenced by {host} staff
      */
     "silencedUserSaysSomething": ParameterizedString<"name" | "host">;
+    /**
+     * {name} has been silenced by {host} staff
+     */
+    "silencedInstanceSaysSomething": ParameterizedString<"name" | "host">;
     /**
      * {name} is flagged: "{cw}"
      */
diff --git a/packages/backend/src/core/entities/UserEntityService.ts b/packages/backend/src/core/entities/UserEntityService.ts
index a8667b4469..49b7a05666 100644
--- a/packages/backend/src/core/entities/UserEntityService.ts
+++ b/packages/backend/src/core/entities/UserEntityService.ts
@@ -593,6 +593,7 @@ export class UserEntityService implements OnModuleInit {
 				faviconUrl: instance.faviconUrl,
 				themeColor: instance.themeColor,
 				isSilenced: instance.isSilenced,
+				isSilencedForMe: !bypassSilence && instance.isSilenced,
 				mandatoryCW: instance.mandatoryCW,
 			} : 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 54c4ba3516..5b0ecf181c 100644
--- a/packages/backend/src/models/json-schema/user.ts
+++ b/packages/backend/src/models/json-schema/user.ts
@@ -232,6 +232,10 @@ 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/components/SkMutedNote.vue b/packages/frontend/src/components/SkMutedNote.vue
index fac948a987..9765c6b212 100644
--- a/packages/frontend/src/components/SkMutedNote.vue
+++ b/packages/frontend/src/components/SkMutedNote.vue
@@ -20,7 +20,7 @@ Displays a placeholder for a muted note.
 		</I18n>
 		<I18n v-if="mute.userMandatoryCW" :src="i18n.ts.userIsFlaggedAs" tag="small">
 			<template #name>
-				<MkUserName :user="note.user"/>
+				{{ userName }}
 			</template>
 			<template #cw>
 				{{ mute.userMandatoryCW }}
@@ -38,19 +38,27 @@ Displays a placeholder for a muted note.
 		<!-- Muted notes/threads -->
 		<I18n v-if="mute.noteMuted" :src="i18n.ts.userSaysSomethingInMutedNote" tag="small">
 			<template #name>
-				<MkUserName :user="note.user"/>
+				{{ userName }}
 			</template>
 		</I18n>
 		<I18n v-else-if="mute.threadMuted" :src="i18n.ts.userSaysSomethingInMutedThread" tag="small">
 			<template #name>
-				<MkUserName :user="note.user"/>
+				{{ userName }}
 			</template>
 		</I18n>
 
 		<!-- Silenced users/instances -->
-		<I18n v-if="mute.isSilenced" :src="i18n.ts.silencedUserSaysSomething" tag="small">
+		<I18n v-if="mute.userSilenced" :src="i18n.ts.silencedUserSaysSomething" tag="small">
 			<template #name>
-				<MkUserName :user="note.user"/>
+				{{ userName }}
+			</template>
+			<template #host>
+				{{ host }}
+			</template>
+		</I18n>
+		<I18n v-if="mute.instanceSilenced" :src="i18n.ts.silencedInstanceSaysSomething" tag="small">
+			<template #name>
+				{{ instanceName }}
 			</template>
 			<template #host>
 				{{ host }}
@@ -61,7 +69,7 @@ Displays a placeholder for a muted note.
 		<template v-if="mutedWords">
 			<I18n v-if="prefer.s.showSoftWordMutedWord" :src="i18n.ts.userSaysSomethingAbout" tag="small">
 				<template #name>
-					<MkUserName :user="note.user"/>
+					{{ userName }}
 				</template>
 				<template #word>
 					{{ mutedWords }}
@@ -69,7 +77,7 @@ Displays a placeholder for a muted note.
 			</I18n>
 			<I18n v-else :src="i18n.ts.userSaysSomething" tag="small">
 				<template #name>
-					<MkUserName :user="note.user"/>
+					{{ userName }}
 				</template>
 			</I18n>
 		</template>
@@ -77,7 +85,7 @@ Displays a placeholder for a muted note.
 		<!-- Sensitive mute -->
 		<I18n v-if="mute.sensitiveMuted" :src="i18n.ts.userSaysSomethingSensitive" tag="small">
 			<template #name>
-				<MkUserName :user="note.user"/>
+				{{ userName }}
 			</template>
 		</I18n>
 	</div>
@@ -123,17 +131,10 @@ const mutedWords = computed(() => mute.value.softMutedWords?.join(', '));
 const isExpanded = computed(() => props.skipMute || expandNote.value || !mute.value.hasMute);
 const rootClass = computed(() => isExpanded.value ? props.expandedClass : undefined);
 
-const instanceName = computed(() => {
-	if (props.note.user.instance?.name) {
-		if (props.note.user.instance.name.length <= 32) {
-			return props.note.user.instance.name;
-		}
-
-		return `${props.note.user.instance.name.substring(0, 30)}...`;
-	}
-
-	return props.note.user.host ?? host;
-});
+const userName = computed(() => props.note.user.host
+	? `@${props.note.user.username}@${props.note.user.host}`
+	: `@${props.note.user.username}`);
+const instanceName = computed(() => props.note.user.host ?? host);
 
 const rootEl = useTemplateRef('rootEl');
 defineExpose({
diff --git a/packages/frontend/src/utility/check-word-mute.ts b/packages/frontend/src/utility/check-word-mute.ts
index 7569493a07..f39b83a140 100644
--- a/packages/frontend/src/utility/check-word-mute.ts
+++ b/packages/frontend/src/utility/check-word-mute.ts
@@ -16,7 +16,8 @@ export interface Mute {
 	softMutedWords?: string[];
 	sensitiveMuted?: boolean;
 
-	isSilenced?: boolean;
+	userSilenced?: boolean;
+	instanceSilenced?: boolean;
 
 	threadMuted?: boolean;
 	noteMuted?: boolean;
@@ -110,7 +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 isSilenced = override.isSilenced ?? note.user.isSilencedForMe;
+	const userSilenced = override.userSilenced ?? note.user.isSilencedForMe;
+	const instanceSilenced = override.instanceSilenced ?? note.user.instance?.isSilencedForMe ?? false;
 	const threadMuted = override.threadMuted ?? (!isMe && note.isMutingThread);
 	const noteMuted = override.noteMuted ?? (!isMe && note.isMutingNote);
 	const noteMandatoryCW = override.noteMandatoryCW !== undefined
@@ -125,9 +127,9 @@ function getMutes(note: Misskey.entities.Note, withHardMute: boolean, overrides:
 			? note.user.instance.mandatoryCW
 			: null;
 
-	const hasMute = hardMuted || softMutedWords.length > 0 || sensitiveMuted || isSilenced || threadMuted || noteMuted || !!noteMandatoryCW || !!userMandatoryCW || !!instanceMandatoryCW;
+	const hasMute = hardMuted || softMutedWords.length > 0 || sensitiveMuted || userSilenced || instanceSilenced || threadMuted || noteMuted || !!noteMandatoryCW || !!userMandatoryCW || !!instanceMandatoryCW;
 
-	return { hasMute, hardMuted, softMutedWords, sensitiveMuted, isSilenced, threadMuted, noteMuted, noteMandatoryCW, userMandatoryCW, instanceMandatoryCW };
+	return { hasMute, hardMuted, softMutedWords, sensitiveMuted, userSilenced, instanceSilenced, threadMuted, noteMuted, noteMandatoryCW, userMandatoryCW, instanceMandatoryCW };
 }
 
 function isHardMuted(note: Misskey.entities.Note): boolean {
diff --git a/packages/misskey-js/src/autogen/types.ts b/packages/misskey-js/src/autogen/types.ts
index 92a884411c..fd9aff3e34 100644
--- a/packages/misskey-js/src/autogen/types.ts
+++ b/packages/misskey-js/src/autogen/types.ts
@@ -4319,6 +4319,7 @@ export type components = {
         faviconUrl: string | null;
         themeColor: string | null;
         isSilenced: boolean;
+        isSilencedForMe: boolean;
         mandatoryCW: string | null;
       };
       followersCount: number;
diff --git a/sharkey-locales/en-US.yml b/sharkey-locales/en-US.yml
index ddedfc92ef..9a88296086 100644
--- a/sharkey-locales/en-US.yml
+++ b/sharkey-locales/en-US.yml
@@ -36,6 +36,7 @@ unmuteNote: "Unmute note"
 userSaysSomethingInMutedNote: "{name} said something in a muted post"
 userSaysSomethingInMutedThread: "{name} said something in a muted thread"
 silencedUserSaysSomething: "{name} has been silenced by {host} staff"
+silencedInstanceSaysSomething: "{name} has been silenced by {host} staff"
 userIsFlaggedAs: "{name} is flagged: \"{cw}\""
 noteIsFlaggedAs: "Note is flagged: \"{cw}\""
 instanceIsFlaggedAs: "{name} is flagged: \"{cw}\""

From 1b4263eba23cf7747b98091cfb8647cf85eb5612 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Sat, 26 Jul 2025 22:23:44 -0400
Subject: [PATCH 042/110] don't include instance silence in user silence flag

---
 .../backend/src/core/entities/UserEntityService.ts   | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/packages/backend/src/core/entities/UserEntityService.ts b/packages/backend/src/core/entities/UserEntityService.ts
index 49b7a05666..37c3b8c3b7 100644
--- a/packages/backend/src/core/entities/UserEntityService.ts
+++ b/packages/backend/src/core/entities/UserEntityService.ts
@@ -543,12 +543,6 @@ export class UserEntityService implements OnModuleInit {
 		let fetchPoliciesPromise: Promise<RolePolicies> | null = null;
 		const fetchPolicies = () => fetchPoliciesPromise ??= this.roleService.getUserPolicies(user);
 
-		const instancePromise = Promise.resolve(user.host
-			? opts.instances?.has(user.host)
-				? opts.instances.get(user.host)
-				: this.federatedInstanceService.fetch(user.host)
-			: null);
-
 		const bypassSilence = isMe || (meId && myFollowings ? myFollowings.has(meId) : false);
 
 		const packed = {
@@ -579,13 +573,13 @@ export class UserEntityService implements OnModuleInit {
 			rejectQuotes: user.rejectQuotes,
 			attributionDomains: user.attributionDomains,
 			isSilenced: user.isSilenced,
-			isSilencedForMe: !bypassSilence && instancePromise.then(i => user.isSilenced || i?.isSilenced),
+			isSilencedForMe: !bypassSilence && user.isSilenced,
 			speakAsCat: user.speakAsCat ?? false,
 			approved: user.approved,
 			requireSigninToViewContents: user.requireSigninToViewContents === false ? undefined : true,
 			makeNotesFollowersOnlyBefore: user.makeNotesFollowersOnlyBefore ?? undefined,
 			makeNotesHiddenBefore: user.makeNotesHiddenBefore ?? undefined,
-			instance: instancePromise.then(instance => instance ? {
+			instance: user.host ? Promise.resolve(opts.instances?.has(user.host) ? opts.instances.get(user.host) : this.federatedInstanceService.fetch(user.host)).then(instance => instance ? {
 				name: instance.name,
 				softwareName: instance.softwareName,
 				softwareVersion: instance.softwareVersion,
@@ -595,7 +589,7 @@ export class UserEntityService implements OnModuleInit {
 				isSilenced: instance.isSilenced,
 				isSilencedForMe: !bypassSilence && instance.isSilenced,
 				mandatoryCW: instance.mandatoryCW,
-			} : undefined),
+			} : undefined) : undefined,
 			followersCount: followersCount ?? 0,
 			followingCount: followingCount ?? 0,
 			notesCount: user.notesCount,

From c373d814e9aaf267fca48dec0f606cfe120ff990 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Sat, 26 Jul 2025 22:28:39 -0400
Subject: [PATCH 043/110] fix bypassSilence flag

---
 packages/backend/src/core/entities/UserEntityService.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/backend/src/core/entities/UserEntityService.ts b/packages/backend/src/core/entities/UserEntityService.ts
index 37c3b8c3b7..a7d8138779 100644
--- a/packages/backend/src/core/entities/UserEntityService.ts
+++ b/packages/backend/src/core/entities/UserEntityService.ts
@@ -543,7 +543,7 @@ export class UserEntityService implements OnModuleInit {
 		let fetchPoliciesPromise: Promise<RolePolicies> | null = null;
 		const fetchPolicies = () => fetchPoliciesPromise ??= this.roleService.getUserPolicies(user);
 
-		const bypassSilence = isMe || (meId && myFollowings ? myFollowings.has(meId) : false);
+		const bypassSilence = isMe || (myFollowings ? myFollowings.has(user.id) : false);
 
 		const packed = {
 			id: user.id,

From e425d841b13625253a4f198db5f50efae97a55e6 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Sat, 9 Aug 2025 13:08:29 -0400
Subject: [PATCH 044/110] fix vue warning about defineExpose import

---
 packages/frontend/src/components/SkMutedNote.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/frontend/src/components/SkMutedNote.vue b/packages/frontend/src/components/SkMutedNote.vue
index 9765c6b212..db5b4f2316 100644
--- a/packages/frontend/src/components/SkMutedNote.vue
+++ b/packages/frontend/src/components/SkMutedNote.vue
@@ -94,7 +94,7 @@ Displays a placeholder for a muted note.
 
 <script setup lang="ts">
 import * as Misskey from 'misskey-js';
-import { computed, ref, useTemplateRef, defineExpose } from 'vue';
+import { computed, ref, useTemplateRef } from 'vue';
 import { host } from '@@/js/config.js';
 import type { Ref } from 'vue';
 import { i18n } from '@/i18n.js';

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 045/110] 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;

From 21f3834729207f8fbf2505423330883f2e0d6a27 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Sat, 9 Aug 2025 13:40:56 -0400
Subject: [PATCH 046/110] 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;
 

From 252536ad9fff0b910a9c271cd986608ad8bd5bf2 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Sat, 9 Aug 2025 23:55:26 -0400
Subject: [PATCH 047/110] fix WebhookTestService.ts

---
 packages/backend/src/core/WebhookTestService.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/backend/src/core/WebhookTestService.ts b/packages/backend/src/core/WebhookTestService.ts
index 31a9f50b14..fefb0f59a8 100644
--- a/packages/backend/src/core/WebhookTestService.ts
+++ b/packages/backend/src/core/WebhookTestService.ts
@@ -452,7 +452,7 @@ export class WebhookTestService {
 			host: user.host,
 			description: 'dummy user',
 			isSilenced: false,
-			isSilencedForMe: false,
+			bypassSilence: false,
 			avatarUrl: user.avatarId == null ? null : user.avatarUrl,
 			avatarBlurhash: user.avatarId == null ? null : user.avatarBlurhash,
 			avatarDecorations: user.avatarDecorations.map(it => ({

From 29ed47d326e2d197b1c7af8f20989d7a5f3591d5 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Mon, 11 Aug 2025 16:21:41 -0400
Subject: [PATCH 048/110] fix logic in NoteEntityService.isVisibleForMe to be
 more consistent with everything else

---
 .../src/core/entities/NoteEntityService.ts    | 63 ++++++++++---------
 1 file changed, 32 insertions(+), 31 deletions(-)

diff --git a/packages/backend/src/core/entities/NoteEntityService.ts b/packages/backend/src/core/entities/NoteEntityService.ts
index 3d329684ea..8841c2b63d 100644
--- a/packages/backend/src/core/entities/NoteEntityService.ts
+++ b/packages/backend/src/core/entities/NoteEntityService.ts
@@ -480,50 +480,58 @@ export class NoteEntityService implements OnModuleInit {
 	@bindThis
 	public async isVisibleForMe(note: MiNote, meId: MiUser['id'] | null, hint?: {
 		myFollowing?: ReadonlySet<string>,
-		myBlocking?: ReadonlySet<string>,
 		myBlockers?: ReadonlySet<string>,
-		me?: Pick<MiUser, 'host'> | null,
+		me?: Pick<MiUser, 'id' | 'host'> | null,
 	}): Promise<boolean> {
+		const [myFollowings, myBlockers, me] = await Promise.all([
+			hint?.myFollowing ?? (meId ? this.cacheService.userFollowingsCache.fetch(meId).then(fs => new Set(fs.keys())) : null),
+			hint?.myBlockers ?? (meId ? this.cacheService.userBlockedCache.fetch(meId) : null),
+			hint?.me ?? (meId ? this.cacheService.findUserById(meId) : null),
+		]);
+
+		return this.isVisibleForMeSync(note, me, myFollowings, myBlockers);
+	}
+
+	@bindThis
+	public isVisibleForMeSync(note: MiNote, me: Pick<MiUser, 'id' | 'host'> | null, myFollowings: ReadonlySet<string> | null, myBlockers: ReadonlySet<string> | null): boolean {
+		// We can always view our own notes
+		if (me?.id === note.userId) {
+			return true;
+		}
+
+		// We can *never* view blocked notes
+		if (myBlockers?.has(note.userId)) {
+			return false;
+		}
+
 		// This code must always be synchronized with the checks in generateVisibilityQuery.
 		// visibility が specified かつ自分が指定されていなかったら非表示
 		if (note.visibility === 'specified') {
-			if (meId == null) {
+			if (me == null) {
 				return false;
-			} else if (meId === note.userId) {
-				return true;
 			} else {
 				// 指定されているかどうか
-				return note.visibleUserIds.some(id => meId === id);
+				return note.visibleUserIds.includes(me.id);
 			}
 		}
 
 		// visibility が followers かつ自分が投稿者のフォロワーでなかったら非表示
 		if (note.visibility === 'followers') {
-			if (meId == null) {
+			if (me == null) {
 				return false;
-			} else if (meId === note.userId) {
-				return true;
-			} else if (note.reply && (meId === note.reply.userId)) {
+			} else if (note.reply && (me.id === note.reply.userId)) {
 				// 自分の投稿に対するリプライ
 				return true;
-			} else if (note.mentions && note.mentions.some(id => meId === id)) {
+			} else if (note.mentions.includes(me.id)) {
 				// 自分へのメンション
 				return true;
+			} else if (note.visibleUserIds.includes(me.id)) {
+				// Explicitly visible to me
+				return true;
 			} else {
 				// フォロワーかどうか
-				const [blocked, following, userHost] = await Promise.all([
-					hint?.myBlocking
-						? hint.myBlocking.has(note.userId)
-						: this.cacheService.userBlockingCache.fetch(meId).then((ids) => ids.has(note.userId)),
-					hint?.myFollowing
-						? hint.myFollowing.has(note.userId)
-						: this.cacheService.userFollowingsCache.fetch(meId).then(ids => ids.has(note.userId)),
-					hint?.me !== undefined
-						? (hint.me?.host ?? null)
-						: this.cacheService.findUserById(meId).then(me => me.host),
-				]);
-
-				if (blocked) return false;
+				const following = myFollowings?.has(note.userId);
+				const userHost = me.host;
 
 				/* If we know the following, everyhting is fine.
 
@@ -536,13 +544,6 @@ export class NoteEntityService implements OnModuleInit {
 			}
 		}
 
-		if (meId != null) {
-			const blockers = hint?.myBlockers ?? await this.cacheService.userBlockedCache.fetch(meId);
-			const isBlocked = blockers.has(note.userId);
-
-			if (isBlocked) return false;
-		}
-
 		return true;
 	}
 

From c31283e9d6f38fefb038b4f88ffb4243d810c3f7 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Mon, 11 Aug 2025 16:22:16 -0400
Subject: [PATCH 049/110] don't populate relations in packMany unless we really
 need to

---
 packages/backend/src/core/entities/UserEntityService.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/backend/src/core/entities/UserEntityService.ts b/packages/backend/src/core/entities/UserEntityService.ts
index b944e952ea..ab33864440 100644
--- a/packages/backend/src/core/entities/UserEntityService.ts
+++ b/packages/backend/src/core/entities/UserEntityService.ts
@@ -803,7 +803,7 @@ export class UserEntityService implements OnModuleInit {
 			isDetailed && meId ? this.userMemosRepository.findBy({ userId: meId })
 				.then(memos => new Map(memos.map(memo => [memo.targetUserId, memo.memo]))) : new Map(),
 			// userRelations
-			meId
+			meId && isDetailed
 				? myFollowingsPromise.then(myFollowings => this.getRelations(meId, _userIds, { myFollowings }))
 				: new Map(),
 			// pinNotes

From 6936ccf8db36868cb8f6f9da235adc83dcdd59ec Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Mon, 11 Aug 2025 16:22:33 -0400
Subject: [PATCH 050/110] fix myFollowings not being passed from packMany to
 pack

---
 packages/backend/src/core/entities/UserEntityService.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/backend/src/core/entities/UserEntityService.ts b/packages/backend/src/core/entities/UserEntityService.ts
index ab33864440..2abf2ee4f5 100644
--- a/packages/backend/src/core/entities/UserEntityService.ts
+++ b/packages/backend/src/core/entities/UserEntityService.ts
@@ -867,6 +867,7 @@ export class UserEntityService implements OnModuleInit {
 					userIdsByUri,
 					instances,
 					securityKeyCounts,
+					myFollowings,
 				},
 			)),
 		);

From 06e944e66616d085a810b6a40690428bb2761c31 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Mon, 11 Aug 2025 16:23:41 -0400
Subject: [PATCH 051/110] check for silenced users, muted notes/threads, and
 note visibility in FanoutTimelineEndpointService.getMiNotes

---
 .../src/core/FanoutTimelineEndpointService.ts | 58 +++++++++++++++++--
 1 file changed, 53 insertions(+), 5 deletions(-)

diff --git a/packages/backend/src/core/FanoutTimelineEndpointService.ts b/packages/backend/src/core/FanoutTimelineEndpointService.ts
index 40e2af1487..9bfc372e56 100644
--- a/packages/backend/src/core/FanoutTimelineEndpointService.ts
+++ b/packages/backend/src/core/FanoutTimelineEndpointService.ts
@@ -15,7 +15,7 @@ import { NoteEntityService } from '@/core/entities/NoteEntityService.js';
 import { FanoutTimelineName, FanoutTimelineService } from '@/core/FanoutTimelineService.js';
 import { UtilityService } from '@/core/UtilityService.js';
 import { isUserRelated } from '@/misc/is-user-related.js';
-import { isQuote, isRenote } from '@/misc/is-renote.js';
+import { isPureRenote, isQuote, isRenote } from '@/misc/is-renote.js';
 import { CacheService } from '@/core/CacheService.js';
 import { isReply } from '@/misc/is-reply.js';
 import { isInstanceMuted } from '@/misc/is-instance-muted.js';
@@ -37,7 +37,9 @@ type TimelineOptions = {
 	excludeReplies?: boolean;
 	excludeBots?: boolean;
 	excludePureRenotes: boolean;
+	includeMutedNotes?: boolean;
 	ignoreAuthorFromUserSuspension?: boolean;
+	ignoreAuthorFromUserSilence?: boolean;
 	dbFallback: (untilId: string | null, sinceId: string | null, limit: number) => Promise<MiNote[]>,
 };
 
@@ -109,17 +111,24 @@ export class FanoutTimelineEndpointService {
 			}
 
 			if (ps.me) {
-				const me = ps.me;
 				const [
 					userIdsWhoMeMuting,
 					userIdsWhoMeMutingRenotes,
 					userIdsWhoBlockingMe,
 					userMutedInstances,
+					myFollowings,
+					myThreadMutings,
+					myNoteMutings,
+					me,
 				] = await Promise.all([
 					this.cacheService.userMutingsCache.fetch(ps.me.id),
 					this.cacheService.renoteMutingsCache.fetch(ps.me.id),
 					this.cacheService.userBlockedCache.fetch(ps.me.id),
-					this.cacheService.userProfileCache.fetch(me.id).then(p => new Set(p.mutedInstances)),
+					this.cacheService.userProfileCache.fetch(ps.me.id).then(p => new Set(p.mutedInstances)),
+					this.cacheService.userFollowingsCache.fetch(ps.me.id).then(fs => new Set(fs.keys())),
+					this.cacheService.threadMutingsCache.fetch(ps.me.id),
+					this.cacheService.noteMutingsCache.fetch(ps.me.id),
+					this.cacheService.findUserById(ps.me.id),
 				]);
 
 				const parentFilter = filter;
@@ -129,6 +138,25 @@ export class FanoutTimelineEndpointService {
 					if (!ps.ignoreAuthorFromMute && isRenote(note) && !isQuote(note) && userIdsWhoMeMutingRenotes.has(note.userId)) return false;
 					if (isInstanceMuted(note, userMutedInstances)) return false;
 
+					// Silenced users (when logged in)
+					if (!ps.ignoreAuthorFromUserSilence && !myFollowings.has(note.userId)) {
+						if (note.user?.isSilenced || note.user?.instance?.isSilenced) return false;
+						if (note.reply?.user?.isSilenced || note.reply?.user?.instance?.isSilenced) return false;
+						if (note.renote?.user?.isSilenced || note.renote?.user?.instance?.isSilenced) return false;
+					}
+
+					// Muted threads / posts
+					if (!ps.includeMutedNotes) {
+						if (myThreadMutings.has(note.threadId ?? note.id) || myNoteMutings.has(note.id)) return false;
+						if (note.replyId && myNoteMutings.has(note.replyId)) return false;
+						if (note.renote && (myThreadMutings.has(note.renote.threadId ?? note.renote.id) || myNoteMutings.has(note.renote.id))) return false;
+					}
+
+					// Invisible notes
+					if (!this.noteEntityService.isVisibleForMeSync(note, me, myFollowings, userIdsWhoBlockingMe)) {
+						return false;
+					}
+
 					return parentFilter(note);
 				};
 			}
@@ -154,7 +182,7 @@ export class FanoutTimelineEndpointService {
 						replyUser: MiUser | null;
 					};
 					if (!ps.ignoreAuthorFromUserSuspension) {
-						if (note.user!.isSuspended) return false;
+						if (note.user?.isSuspended) return false;
 					}
 					if (note.userId !== note.renoteUserId && noteJoined.renoteUser?.isSuspended) return false;
 					if (note.userId !== note.replyUserId && noteJoined.replyUser?.isSuspended) return false;
@@ -163,6 +191,20 @@ export class FanoutTimelineEndpointService {
 				};
 			}
 
+			{
+				const parentFilter = filter;
+				filter = (note) => {
+					// Silenced users (when logged out)
+					if (!ps.ignoreAuthorFromUserSilence && !ps.me) {
+						if (note.user?.isSilenced || note.user?.instance?.isSilenced) return false;
+						if (note.reply?.user?.isSilenced || note.reply?.user?.instance?.isSilenced) return false;
+						if (note.renote?.user?.isSilenced || note.renote?.user?.instance?.isSilenced) return false;
+					}
+
+					return parentFilter(note);
+				};
+			}
+
 			const redisTimeline: MiNote[] = [];
 			let readFromRedis = 0;
 			let lastSuccessfulRate = 1; // rateをキャッシュする？
@@ -215,7 +257,13 @@ export class FanoutTimelineEndpointService {
 			.leftJoinAndSelect('note.channel', 'channel')
 			.leftJoinAndSelect('note.userInstance', 'userInstance')
 			.leftJoinAndSelect('note.replyUserInstance', 'replyUserInstance')
-			.leftJoinAndSelect('note.renoteUserInstance', 'renoteUserInstance');
+			.leftJoinAndSelect('note.renoteUserInstance', 'renoteUserInstance')
+
+			// These are used to ensure full data for boosted replies.
+			// Without loading these relations, certain filters may fail open.
+			.leftJoinAndSelect('renote.reply', 'renoteReply')
+			.leftJoinAndSelect('renote.reply.user', 'renoteReplyUser')
+			.leftJoinAndSelect('renote.replyUserInstance', 'renoteReplyUserInstance');
 
 		const notes = (await query.getMany()).filter(noteFilter);
 

From 24e1294a70c40166d95fa7ef5e8ece8a95b4c143 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Mon, 11 Aug 2025 16:23:58 -0400
Subject: [PATCH 052/110] recurse to filter boosts in
 FanoutTimelineEndpointService filters

---
 .../src/core/FanoutTimelineEndpointService.ts    | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/packages/backend/src/core/FanoutTimelineEndpointService.ts b/packages/backend/src/core/FanoutTimelineEndpointService.ts
index 9bfc372e56..7699df4ad6 100644
--- a/packages/backend/src/core/FanoutTimelineEndpointService.ts
+++ b/packages/backend/src/core/FanoutTimelineEndpointService.ts
@@ -205,6 +205,22 @@ export class FanoutTimelineEndpointService {
 				};
 			}
 
+			// This one MUST be last!
+			{
+				const parentFilter = filter;
+				filter = (note) => {
+					// If this is a boost, then first run all checks for the boost target.
+					if (isPureRenote(note) && note.renote) {
+						if (!parentFilter(note.renote)) {
+							return false;
+						}
+					}
+
+					// Either way, make sure to run the checks for the actual note too!
+					return parentFilter(note);
+				};
+			}
+
 			const redisTimeline: MiNote[] = [];
 			let readFromRedis = 0;
 			let lastSuccessfulRate = 1; // rateをキャッシュする？

From 613e05dcc98117b10cfbacbc7974cfda6dadb260 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Mon, 11 Aug 2025 16:25:08 -0400
Subject: [PATCH 053/110] fix muted note/thread checks in QueryService

---
 packages/backend/src/core/QueryService.ts | 52 ++++++++++++++++++++---
 1 file changed, 47 insertions(+), 5 deletions(-)

diff --git a/packages/backend/src/core/QueryService.ts b/packages/backend/src/core/QueryService.ts
index d0de136938..bd9248ecf4 100644
--- a/packages/backend/src/core/QueryService.ts
+++ b/packages/backend/src/core/QueryService.ts
@@ -106,11 +106,24 @@ export class QueryService {
 
 	@bindThis
 	public generateMutedNoteThreadQuery<E extends ObjectLiteral>(q: SelectQueryBuilder<E>, me: { id: MiUser['id'] }): SelectQueryBuilder<E> {
+		// Muted thread
+		this.andNotMutingThread(q, ':meId', 'coalesce(note.threadId, note.id)');
+
+		// Muted note
+		this.andNotMutingNote(q, ':meId', 'note.id');
+
+		q.andWhere(new Brackets(qb => qb
+			.orWhere('note.renoteId IS NULL')
+			.orWhere(new Brackets(qbb => {
+				// Renote muted thread
+				this.andNotMutingThread(qbb, ':meId', 'coalesce(renote.threadId, renote.id)');
+
+				// Renote muted note
+				this.andNotMutingNote(qbb, ':meId', 'renote.id');
+			}))));
+
 		return this
-			.andNotMutingThread(q, ':meId', 'note.id')
-			.andWhere(new Brackets(qb => this
-				.orNotMutingThread(qb, ':meId', 'note.threadId')
-				.orWhere('note.threadId IS NULL')))
+			.leftJoin(q, 'note.renote', 'renote')
 			.setParameters({ meId: me.id });
 	}
 
@@ -581,7 +594,36 @@ export class QueryService {
 		const threadMutedQuery = this.noteThreadMutingsRepository.createQueryBuilder('threadMuted')
 			.select('1')
 			.andWhere(`threadMuted.userId = ${muterProp}`)
-			.andWhere(`threadMuted.threadId = ${muteeProp}`);
+			.andWhere(`threadMuted.threadId = ${muteeProp}`)
+			.andWhere('threadMuted.isPostMute = false');
+
+		return q[join](`NOT EXISTS (${threadMutedQuery.getQuery()})`, threadMutedQuery.getParameters());
+	}
+
+	/**
+	 * Adds OR condition that muterProp (user ID) is not muting muteeProp (note ID).
+	 * Both props should be expressions, not raw values.
+	 */
+	@bindThis
+	public orNotMutingNote<Q extends WhereExpressionBuilder>(q: Q, muterProp: string, muteeProp: string): Q {
+		return this.excludeMutingNote(q, muterProp, muteeProp, 'orWhere');
+	}
+
+	/**
+	 * Adds AND condition that muterProp (user ID) is not muting muteeProp (note ID).
+	 * Both props should be expressions, not raw values.
+	 */
+	@bindThis
+	public andNotMutingNote<Q extends WhereExpressionBuilder>(q: Q, muterProp: string, muteeProp: string): Q {
+		return this.excludeMutingNote(q, muterProp, muteeProp, 'andWhere');
+	}
+
+	private excludeMutingNote<Q extends WhereExpressionBuilder>(q: Q, muterProp: string, muteeProp: string, join: 'andWhere' | 'orWhere'): Q {
+		const threadMutedQuery = this.noteThreadMutingsRepository.createQueryBuilder('threadMuted')
+			.select('1')
+			.andWhere(`threadMuted.userId = ${muterProp}`)
+			.andWhere(`threadMuted.threadId = ${muteeProp}`)
+			.andWhere('threadMuted.isPostMute = true');
 
 		return q[join](`NOT EXISTS (${threadMutedQuery.getQuery()})`, threadMutedQuery.getParameters());
 	}

From efc8bbb4b38b0ea8ad269ab93977559681aa7d67 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Mon, 11 Aug 2025 16:25:18 -0400
Subject: [PATCH 054/110] fix comment typo in QueryService

---
 packages/backend/src/core/QueryService.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/backend/src/core/QueryService.ts b/packages/backend/src/core/QueryService.ts
index bd9248ecf4..1cca99d452 100644
--- a/packages/backend/src/core/QueryService.ts
+++ b/packages/backend/src/core/QueryService.ts
@@ -166,7 +166,7 @@ export class QueryService {
 	// For moderation purposes, you can set isSilenced to forcibly hide existing posts by a user.
 	@bindThis
 	public generateVisibilityQuery<E extends ObjectLiteral>(q: SelectQueryBuilder<E>, me?: { id: MiUser['id'] } | null): SelectQueryBuilder<E> {
-		// This code must always be synchronized with the checks in Notes.isVisibleForMe.
+		// This code must always be synchronized with the checks in NoteEntityService.isVisibleForMe.
 		return q.andWhere(new Brackets(qb => {
 			// Public post
 			qb.orWhere('note.visibility = \'public\'')

From 21700a668ede087235cf27b06fa7d2fa5bd6cd5c Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Mon, 11 Aug 2025 16:25:46 -0400
Subject: [PATCH 055/110] add error checking for QueryService.leftJoin

---
 packages/backend/src/core/QueryService.ts | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/packages/backend/src/core/QueryService.ts b/packages/backend/src/core/QueryService.ts
index 1cca99d452..2fdea12fc8 100644
--- a/packages/backend/src/core/QueryService.ts
+++ b/packages/backend/src/core/QueryService.ts
@@ -285,7 +285,27 @@ export class QueryService {
 	@bindThis
 	public leftJoin<E extends ObjectLiteral>(q: SelectQueryBuilder<E>, relation: string, alias: string, condition?: string): SelectQueryBuilder<E> {
 		// Skip if it's already joined, otherwise we'll get an error
-		if (!q.expressionMap.joinAttributes.some(j => j.alias.name === alias)) {
+		const join = q.expressionMap.joinAttributes.find(j => j.alias.name === alias);
+		if (join) {
+			const oldRelation = typeof(join.entityOrProperty) === 'function'
+				? join.entityOrProperty.name
+				: join.entityOrProperty;
+
+			const oldQuery = join.condition
+				? `JOIN ${oldRelation} AS ${alias} ON ${join.condition}`
+				: `JOIN ${oldRelation} AS ${alias}`;
+			const newQuery = condition
+				? `JOIN ${relation} AS ${alias} ON ${oldRelation}`
+				: `JOIN ${relation} AS ${alias}`;
+
+			if (oldRelation !== relation) {
+				throw new Error(`Query error: cannot add ${newQuery}: alias already used by ${oldQuery}`);
+			}
+
+			if (join.condition !== condition) {
+				throw new Error(`Query error: cannot add ${newQuery}: relation already defined with different condition by ${oldQuery}`);
+			}
+		} else {
 			q.leftJoin(relation, alias, condition);
 		}
 

From e9d9246f64f2beec51f17bafa669168225cf56e5 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Mon, 11 Aug 2025 16:25:57 -0400
Subject: [PATCH 056/110] reformat generateSilencedUserQueryForNotes for
 readability

---
 packages/backend/src/core/QueryService.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/backend/src/core/QueryService.ts b/packages/backend/src/core/QueryService.ts
index 2fdea12fc8..6c6ecbae6a 100644
--- a/packages/backend/src/core/QueryService.ts
+++ b/packages/backend/src/core/QueryService.ts
@@ -247,12 +247,12 @@ export class QueryService {
 				// case 1: user does not exist (note is not reply/renote)
 				qb.orWhere(`note.${key}Id IS NULL`);
 
-				// case 2: user not silenced AND instance not silenced
+				// case 2: user not silenced AND (instance not silenced OR instance is local)
 				qb.orWhere(new Brackets(qbb => qbb
+					.andWhere(`"${key}"."isSilenced" = false`)
 					.andWhere(new Brackets(qbbb => qbbb
 						.orWhere(`"${key}Instance"."isSilenced" = false`)
-						.orWhere(`"${key}Instance" IS NULL`)))
-					.andWhere(`"${key}"."isSilenced" = false`)));
+						.orWhere(`"note"."${key}Host" IS NULL`)))));
 
 				if (me) {
 					// case 3: we are the author

From d1912362e05ac2a916d58eac0ab1337a84767c2e Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Mon, 11 Aug 2025 16:26:27 -0400
Subject: [PATCH 057/110] remove duplicate / incorrect filtering from fanout
 timeline endpoints

---
 .../server/api/endpoints/channels/timeline.ts |  9 ---------
 .../api/endpoints/notes/hybrid-timeline.ts    | 19 -------------------
 .../api/endpoints/notes/local-timeline.ts     |  9 ---------
 .../server/api/endpoints/notes/timeline.ts    | 18 ------------------
 .../api/endpoints/notes/user-list-timeline.ts |  1 +
 .../src/server/api/endpoints/users/notes.ts   |  5 +----
 6 files changed, 2 insertions(+), 59 deletions(-)

diff --git a/packages/backend/src/server/api/endpoints/channels/timeline.ts b/packages/backend/src/server/api/endpoints/channels/timeline.ts
index 0b1944fb99..806b203b51 100644
--- a/packages/backend/src/server/api/endpoints/channels/timeline.ts
+++ b/packages/backend/src/server/api/endpoints/channels/timeline.ts
@@ -107,8 +107,6 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				return await this.noteEntityService.packMany(await this.getFromDb({ untilId, sinceId, limit: ps.limit, channelId: channel.id, withFiles: ps.withFiles, withRenotes: ps.withRenotes }, me), me);
 			}
 
-			const threadMutings = me ? await this.cacheService.threadMutingsCache.fetch(me.id) : null;
-
 			return await this.fanoutTimelineEndpointService.timeline({
 				untilId,
 				sinceId,
@@ -122,13 +120,6 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				dbFallback: async (untilId, sinceId, limit) => {
 					return await this.getFromDb({ untilId, sinceId, limit, channelId: channel.id, withFiles: ps.withFiles, withRenotes: ps.withRenotes }, me);
 				},
-				noteFilter: note => {
-					if (threadMutings?.has(note.threadId ?? note.id)) {
-						return false;
-					}
-
-					return true;
-				},
 			});
 		});
 	}
diff --git a/packages/backend/src/server/api/endpoints/notes/hybrid-timeline.ts b/packages/backend/src/server/api/endpoints/notes/hybrid-timeline.ts
index ecf75421f5..0c39ec1f57 100644
--- a/packages/backend/src/server/api/endpoints/notes/hybrid-timeline.ts
+++ b/packages/backend/src/server/api/endpoints/notes/hybrid-timeline.ts
@@ -145,14 +145,6 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				];
 			}
 
-			const [
-				followings,
-				mutedThreads,
-			] = await Promise.all([
-				this.cacheService.userFollowingsCache.fetch(me.id),
-				this.cacheService.threadMutingsCache.fetch(me.id),
-			]);
-
 			const redisTimeline = await this.fanoutTimelineEndpointService.timeline({
 				untilId,
 				sinceId,
@@ -164,17 +156,6 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				alwaysIncludeMyNotes: true,
 				excludePureRenotes: !ps.withRenotes,
 				excludeBots: !ps.withBots,
-				noteFilter: note => {
-					if (note.reply && note.reply.visibility === 'followers') {
-						if (!followings.has(note.reply.userId) && note.reply.userId !== me.id) return false;
-					}
-
-					if (mutedThreads.has(note.threadId ?? note.id)) {
-						return false;
-					}
-
-					return true;
-				},
 				dbFallback: async (untilId, sinceId, limit) => await this.getFromDb({
 					untilId,
 					sinceId,
diff --git a/packages/backend/src/server/api/endpoints/notes/local-timeline.ts b/packages/backend/src/server/api/endpoints/notes/local-timeline.ts
index 592f2e2feb..7b9e70aefd 100644
--- a/packages/backend/src/server/api/endpoints/notes/local-timeline.ts
+++ b/packages/backend/src/server/api/endpoints/notes/local-timeline.ts
@@ -117,8 +117,6 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				return await this.noteEntityService.packMany(timeline, me);
 			}
 
-			const mutedThreads = me ? await this.cacheService.threadMutingsCache.fetch(me.id) : null;
-
 			const timeline = await this.fanoutTimelineEndpointService.timeline({
 				untilId,
 				sinceId,
@@ -143,13 +141,6 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 					withBots: ps.withBots,
 					withRenotes: ps.withRenotes,
 				}, me),
-				noteFilter: note => {
-					if (mutedThreads?.has(note.threadId ?? note.id)) {
-						return false;
-					}
-
-					return true;
-				},
 			});
 
 			if (me) {
diff --git a/packages/backend/src/server/api/endpoints/notes/timeline.ts b/packages/backend/src/server/api/endpoints/notes/timeline.ts
index d442de2a64..790c87ae60 100644
--- a/packages/backend/src/server/api/endpoints/notes/timeline.ts
+++ b/packages/backend/src/server/api/endpoints/notes/timeline.ts
@@ -97,14 +97,6 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				return await this.noteEntityService.packMany(timeline, me);
 			}
 
-			const [
-				followings,
-				threadMutings,
-			] = await Promise.all([
-				this.cacheService.userFollowingsCache.fetch(me.id),
-				this.cacheService.threadMutingsCache.fetch(me.id),
-			]);
-
 			const timeline = this.fanoutTimelineEndpointService.timeline({
 				untilId,
 				sinceId,
@@ -115,16 +107,6 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				redisTimelines: ps.withFiles ? [`homeTimelineWithFiles:${me.id}`] : [`homeTimeline:${me.id}`],
 				alwaysIncludeMyNotes: true,
 				excludePureRenotes: !ps.withRenotes,
-				noteFilter: note => {
-					if (note.reply && note.reply.visibility === 'followers') {
-						if (!followings.has(note.reply.userId) && note.reply.userId !== me.id) return false;
-					}
-					if (!ps.withBots && note.user?.isBot) return false;
-
-					if (threadMutings.has(note.threadId ?? note.id)) return false;
-
-					return true;
-				},
 				dbFallback: async (untilId, sinceId, limit) => await this.getFromDb({
 					untilId,
 					sinceId,
diff --git a/packages/backend/src/server/api/endpoints/notes/user-list-timeline.ts b/packages/backend/src/server/api/endpoints/notes/user-list-timeline.ts
index ff37e0aaba..6d245226ac 100644
--- a/packages/backend/src/server/api/endpoints/notes/user-list-timeline.ts
+++ b/packages/backend/src/server/api/endpoints/notes/user-list-timeline.ts
@@ -127,6 +127,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				redisTimelines: ps.withFiles ? [`userListTimelineWithFiles:${list.id}`] : [`userListTimeline:${list.id}`],
 				alwaysIncludeMyNotes: true,
 				excludePureRenotes: !ps.withRenotes,
+				ignoreAuthorFromUserSilence: true,
 				dbFallback: async (untilId, sinceId, limit) => await this.getFromDb(list, {
 					untilId,
 					sinceId,
diff --git a/packages/backend/src/server/api/endpoints/users/notes.ts b/packages/backend/src/server/api/endpoints/users/notes.ts
index b87d4abd7c..4db16ad7a0 100644
--- a/packages/backend/src/server/api/endpoints/users/notes.ts
+++ b/packages/backend/src/server/api/endpoints/users/notes.ts
@@ -134,8 +134,6 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 			if (ps.withReplies) redisTimelines.push(`userTimelineWithReplies:${ps.userId}`);
 			if (ps.withChannelNotes) redisTimelines.push(`userTimelineWithChannel:${ps.userId}`);
 
-			const isFollowing = me && (await this.cacheService.userFollowingsCache.fetch(me.id)).has(ps.userId);
-
 			const timeline = await this.fanoutTimelineEndpointService.timeline({
 				untilId,
 				sinceId,
@@ -147,14 +145,13 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				ignoreAuthorFromMute: true,
 				ignoreAuthorFromInstanceBlock: true,
 				ignoreAuthorFromUserSuspension: true,
+				ignoreAuthorFromUserSilence: true,
 				excludeReplies: ps.withChannelNotes && !ps.withReplies, // userTimelineWithChannel may include replies
 				excludeNoFiles: ps.withChannelNotes && ps.withFiles, // userTimelineWithChannel may include notes without files
 				excludePureRenotes: !ps.withRenotes,
 				excludeBots: !ps.withBots,
 				noteFilter: note => {
 					if (note.channel?.isSensitive && !isSelf) return false;
-					if (note.visibility === 'specified' && (!me || (me.id !== note.userId && !note.visibleUserIds.some(v => v === me.id)))) return false;
-					if (note.visibility === 'followers' && !isFollowing && !isSelf) return false;
 
 					// These are handled by DB fallback, but we duplicate them here in case a timeline was already populated with notes
 					if (!ps.withRepliesToSelf && note.reply?.userId === note.userId) return false;

From 85ca2269e448b977b35e30517f9f1f916ef44489 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Tue, 12 Aug 2025 23:40:49 -0400
Subject: [PATCH 058/110] completely re-implement note visibility as
 NoteVisibilityService

---
 packages/backend/src/core/CoreModule.ts       |   6 +
 .../src/core/FanoutTimelineEndpointService.ts |  82 +---
 .../backend/src/core/NoteVisibilityService.ts | 420 ++++++++++++++++++
 packages/backend/src/core/QueryService.ts     |  63 ++-
 packages/backend/src/core/ReactionService.ts  |   5 +-
 .../backend/src/core/WebhookTestService.ts    |   1 +
 .../src/core/activitypub/ApInboxService.ts    |   5 +-
 .../src/core/entities/NoteEntityService.ts    |  83 ++--
 .../backend/src/models/json-schema/note.ts    |   4 +
 .../api/endpoints/notes/bubble-timeline.ts    |   2 +-
 .../src/server/api/endpoints/notes/create.ts  |   6 +-
 .../src/server/api/endpoints/notes/edit.ts    |   4 +-
 .../server/api/endpoints/notes/translate.ts   |   5 +-
 .../src/server/api/endpoints/users/notes.ts   |   2 +-
 .../backend/src/server/api/stream/channel.ts  |  41 +-
 .../src/server/api/stream/channels/antenna.ts |   3 +-
 .../api/stream/channels/bubble-timeline.ts    |  28 +-
 .../src/server/api/stream/channels/channel.ts |   7 +-
 .../api/stream/channels/global-timeline.ts    |  29 +-
 .../src/server/api/stream/channels/hashtag.ts |   3 +-
 .../api/stream/channels/home-timeline.ts      |  27 +-
 .../api/stream/channels/hybrid-timeline.ts    |  28 +-
 .../api/stream/channels/local-timeline.ts     |  30 +-
 .../src/server/api/stream/channels/main.ts    |  23 +-
 .../api/stream/channels/role-timeline.ts      |  24 +-
 .../server/api/stream/channels/user-list.ts   |  29 +-
 pnpm-lock.yaml                                | 385 ++++++++++++----
 27 files changed, 925 insertions(+), 420 deletions(-)
 create mode 100644 packages/backend/src/core/NoteVisibilityService.ts

diff --git a/packages/backend/src/core/CoreModule.ts b/packages/backend/src/core/CoreModule.ts
index 6839ba0159..f818a65ff8 100644
--- a/packages/backend/src/core/CoreModule.ts
+++ b/packages/backend/src/core/CoreModule.ts
@@ -20,6 +20,7 @@ import { EnvService } from '@/core/EnvService.js';
 import { ApUtilityService } from '@/core/activitypub/ApUtilityService.js';
 import { ApLogService } from '@/core/ApLogService.js';
 import { UpdateInstanceQueue } from '@/core/UpdateInstanceQueue.js';
+import { NoteVisibilityService } from '@/core/NoteVisibilityService.js';
 import { AccountMoveService } from './AccountMoveService.js';
 import { AccountUpdateService } from './AccountUpdateService.js';
 import { AnnouncementService } from './AnnouncementService.js';
@@ -240,6 +241,7 @@ const $RegistryApiService: Provider = { provide: 'RegistryApiService', useExisti
 const $ReversiService: Provider = { provide: 'ReversiService', useExisting: ReversiService };
 const $TimeService: Provider = { provide: 'TimeService', useExisting: TimeService };
 const $EnvService: Provider = { provide: 'EnvService', useExisting: EnvService };
+const $NoteVisibilityService: Provider = { provide: 'NoteVisibilityService', useExisting: NoteVisibilityService };
 
 const $ChartLoggerService: Provider = { provide: 'ChartLoggerService', useExisting: ChartLoggerService };
 const $FederationChart: Provider = { provide: 'FederationChart', useExisting: FederationChart };
@@ -400,6 +402,7 @@ const $SponsorsService: Provider = { provide: 'SponsorsService', useExisting: Sp
 		ReversiService,
 		TimeService,
 		EnvService,
+		NoteVisibilityService,
 
 		ChartLoggerService,
 		FederationChart,
@@ -556,6 +559,7 @@ const $SponsorsService: Provider = { provide: 'SponsorsService', useExisting: Sp
 		$ReversiService,
 		$TimeService,
 		$EnvService,
+		$NoteVisibilityService,
 
 		$ChartLoggerService,
 		$FederationChart,
@@ -713,6 +717,7 @@ const $SponsorsService: Provider = { provide: 'SponsorsService', useExisting: Sp
 		ReversiService,
 		TimeService,
 		EnvService,
+		NoteVisibilityService,
 
 		FederationChart,
 		NotesChart,
@@ -867,6 +872,7 @@ const $SponsorsService: Provider = { provide: 'SponsorsService', useExisting: Sp
 		$ReversiService,
 		$TimeService,
 		$EnvService,
+		$NoteVisibilityService,
 
 		$FederationChart,
 		$NotesChart,
diff --git a/packages/backend/src/core/FanoutTimelineEndpointService.ts b/packages/backend/src/core/FanoutTimelineEndpointService.ts
index 7699df4ad6..1a4af8cf1e 100644
--- a/packages/backend/src/core/FanoutTimelineEndpointService.ts
+++ b/packages/backend/src/core/FanoutTimelineEndpointService.ts
@@ -15,10 +15,11 @@ import { NoteEntityService } from '@/core/entities/NoteEntityService.js';
 import { FanoutTimelineName, FanoutTimelineService } from '@/core/FanoutTimelineService.js';
 import { UtilityService } from '@/core/UtilityService.js';
 import { isUserRelated } from '@/misc/is-user-related.js';
-import { isPureRenote, isQuote, isRenote } from '@/misc/is-renote.js';
+import { isQuote, isRenote } from '@/misc/is-renote.js';
 import { CacheService } from '@/core/CacheService.js';
 import { isReply } from '@/misc/is-reply.js';
 import { isInstanceMuted } from '@/misc/is-instance-muted.js';
+import { NoteVisibilityService, PopulatedNote } from '@/core/NoteVisibilityService.js';
 
 type TimelineOptions = {
 	untilId: string | null,
@@ -56,6 +57,7 @@ export class FanoutTimelineEndpointService {
 		private cacheService: CacheService,
 		private fanoutTimelineService: FanoutTimelineService,
 		private utilityService: UtilityService,
+		private readonly noteVisibilityService: NoteVisibilityService,
 	) {
 	}
 
@@ -110,52 +112,14 @@ export class FanoutTimelineEndpointService {
 				filter = (note) => (!isRenote(note) || isQuote(note)) && parentFilter(note);
 			}
 
-			if (ps.me) {
-				const [
-					userIdsWhoMeMuting,
-					userIdsWhoMeMutingRenotes,
-					userIdsWhoBlockingMe,
-					userMutedInstances,
-					myFollowings,
-					myThreadMutings,
-					myNoteMutings,
-					me,
-				] = await Promise.all([
-					this.cacheService.userMutingsCache.fetch(ps.me.id),
-					this.cacheService.renoteMutingsCache.fetch(ps.me.id),
-					this.cacheService.userBlockedCache.fetch(ps.me.id),
-					this.cacheService.userProfileCache.fetch(ps.me.id).then(p => new Set(p.mutedInstances)),
-					this.cacheService.userFollowingsCache.fetch(ps.me.id).then(fs => new Set(fs.keys())),
-					this.cacheService.threadMutingsCache.fetch(ps.me.id),
-					this.cacheService.noteMutingsCache.fetch(ps.me.id),
-					this.cacheService.findUserById(ps.me.id),
-				]);
+			{
+				const me = ps.me ? await this.cacheService.findUserById(ps.me.id) : null;
+				const data = await this.noteVisibilityService.populateData(me);
 
 				const parentFilter = filter;
 				filter = (note) => {
-					if (isUserRelated(note, userIdsWhoBlockingMe, ps.ignoreAuthorFromBlock)) return false;
-					if (isUserRelated(note, userIdsWhoMeMuting, ps.ignoreAuthorFromMute)) return false;
-					if (!ps.ignoreAuthorFromMute && isRenote(note) && !isQuote(note) && userIdsWhoMeMutingRenotes.has(note.userId)) return false;
-					if (isInstanceMuted(note, userMutedInstances)) return false;
-
-					// Silenced users (when logged in)
-					if (!ps.ignoreAuthorFromUserSilence && !myFollowings.has(note.userId)) {
-						if (note.user?.isSilenced || note.user?.instance?.isSilenced) return false;
-						if (note.reply?.user?.isSilenced || note.reply?.user?.instance?.isSilenced) return false;
-						if (note.renote?.user?.isSilenced || note.renote?.user?.instance?.isSilenced) return false;
-					}
-
-					// Muted threads / posts
-					if (!ps.includeMutedNotes) {
-						if (myThreadMutings.has(note.threadId ?? note.id) || myNoteMutings.has(note.id)) return false;
-						if (note.replyId && myNoteMutings.has(note.replyId)) return false;
-						if (note.renote && (myThreadMutings.has(note.renote.threadId ?? note.renote.id) || myNoteMutings.has(note.renote.id))) return false;
-					}
-
-					// Invisible notes
-					if (!this.noteEntityService.isVisibleForMeSync(note, me, myFollowings, userIdsWhoBlockingMe)) {
-						return false;
-					}
+					const { accessible, silence } = this.noteVisibilityService.checkNoteVisibility(note as PopulatedNote, me, { data, filters: { includeSilencedAuthor: ps.ignoreAuthorFromUserSilence } });
+					if (!accessible || silence) return false;
 
 					return parentFilter(note);
 				};
@@ -191,36 +155,6 @@ export class FanoutTimelineEndpointService {
 				};
 			}
 
-			{
-				const parentFilter = filter;
-				filter = (note) => {
-					// Silenced users (when logged out)
-					if (!ps.ignoreAuthorFromUserSilence && !ps.me) {
-						if (note.user?.isSilenced || note.user?.instance?.isSilenced) return false;
-						if (note.reply?.user?.isSilenced || note.reply?.user?.instance?.isSilenced) return false;
-						if (note.renote?.user?.isSilenced || note.renote?.user?.instance?.isSilenced) return false;
-					}
-
-					return parentFilter(note);
-				};
-			}
-
-			// This one MUST be last!
-			{
-				const parentFilter = filter;
-				filter = (note) => {
-					// If this is a boost, then first run all checks for the boost target.
-					if (isPureRenote(note) && note.renote) {
-						if (!parentFilter(note.renote)) {
-							return false;
-						}
-					}
-
-					// Either way, make sure to run the checks for the actual note too!
-					return parentFilter(note);
-				};
-			}
-
 			const redisTimeline: MiNote[] = [];
 			let readFromRedis = 0;
 			let lastSuccessfulRate = 1; // rateをキャッシュする？
diff --git a/packages/backend/src/core/NoteVisibilityService.ts b/packages/backend/src/core/NoteVisibilityService.ts
new file mode 100644
index 0000000000..8df83b4c5e
--- /dev/null
+++ b/packages/backend/src/core/NoteVisibilityService.ts
@@ -0,0 +1,420 @@
+/*
+ * SPDX-FileCopyrightText: hazelnoot and other Sharkey contributors
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { Inject, Injectable } from '@nestjs/common';
+import { CacheService } from '@/core/CacheService.js';
+import type { MiNote } from '@/models/Note.js';
+import type { MiUser } from '@/models/User.js';
+import { MiInstance } from '@/models/Instance.js';
+import { bindThis } from '@/decorators.js';
+import { Packed } from '@/misc/json-schema.js';
+import { IdService } from '@/core/IdService.js';
+import { awaitAll } from '@/misc/prelude/await-all.js';
+import { FederatedInstanceService } from '@/core/FederatedInstanceService.js';
+import type { MiFollowing, NotesRepository } from '@/models/_.js';
+import { DI } from '@/di-symbols.js';
+
+/**
+ * Visibility level for a given user towards a given post.
+ */
+export interface NoteVisibilityResult {
+	/**
+	 * Whether the user has access to view this post.
+	 */
+	accessible: boolean;
+
+	/**
+	 * If the user should be shown only a redacted version of the post.
+	 * (see NoteEntityService.hideNote() for details.)
+	 */
+	redact: boolean;
+
+	/**
+	 * If false, the note should be visible by default. (normal case)
+	 * If true, the note should be hidden by default. (Silences, mutes, etc.)
+	 * If "timeline", the note should be hidden in timelines only. (following w/o replies)
+	 */
+	silence: boolean;
+}
+
+export interface NoteVisibilityFilters {
+	/**
+	 * If false, exclude replies to other users unless the "include replies to others in timeline" has been enabled for the note's author.
+	 * If true (default), then replies are treated like any other post.
+	 */
+	includeReplies?: boolean;
+
+	/**
+	 * If true, treat the note's author as never being silenced. Does not apply to reply or renote targets, unless they're by the same author.
+	 * If false (default), then silence is enforced for all notes.
+	 */
+	includeSilencedAuthor?: boolean;
+}
+
+@Injectable()
+export class NoteVisibilityService {
+	constructor(
+		@Inject(DI.notesRepository)
+		private readonly notesRepository: NotesRepository,
+
+		private readonly cacheService: CacheService,
+		private readonly idService: IdService,
+		private readonly federatedInstanceService: FederatedInstanceService,
+	) {}
+
+	@bindThis
+	public async checkNoteVisibilityAsync(note: MiNote | Packed<'Note'>, user: string | PopulatedUser, opts?: { filters?: NoteVisibilityFilters, hint?: Partial<NoteVisibilityData> }): Promise<NoteVisibilityResult> {
+		if (typeof(user) === 'string') {
+			user = await this.cacheService.findUserById(user);
+		}
+
+		const populatedNote = await this.populateNote(note);
+		const populatedData = await this.populateData(user, opts?.hint ?? {});
+
+		return this.checkNoteVisibility(populatedNote, user, { filters: opts?.filters, data: populatedData });
+	}
+
+	private async populateNote(note: Packed<'Note'>, dive?: boolean): Promise<Packed<'Note'>>;
+	private async populateNote(note: MiNote, dive?: boolean): Promise<PopulatedMiNote>;
+	private async populateNote(note: MiNote | Packed<'Note'>, dive?: boolean): Promise<PopulatedNote>;
+	private async populateNote(note: MiNote | Packed<'Note'>, dive = true): Promise<PopulatedNote> {
+		// Packed<'Note'> is already fully loaded
+		if (isPackedNote(note)) return note;
+
+		// noinspection ES6MissingAwait
+		return await awaitAll({
+			...note,
+			user: this.getNoteUser(note),
+			renote: dive ? this.getNoteRenote(note) : null,
+			reply: dive ? this.getNoteReply(note) : null,
+		});
+	}
+
+	private async getNoteUser(note: MiNote): Promise<PopulatedMiNote['user']> {
+		const user = note.user ?? await this.cacheService.findUserById(note.userId);
+		return {
+			...user,
+			instance: user.instance ?? (user.host ? await this.federatedInstanceService.fetchOrRegister(user.host) : null),
+		};
+	}
+
+	private async getNoteRenote(note: MiNote): Promise<PopulatedMiNote['renote']> {
+		if (!note.renoteId) return null;
+
+		const renote = note.renote ?? await this.notesRepository.findOneOrFail({
+			where: { id: note.renoteId },
+			relations: {
+				user: {
+					instance: true,
+				},
+			},
+		});
+
+		return await this.populateNote(renote, false);
+	}
+
+	private async getNoteReply(note: MiNote): Promise<PopulatedMiNote['reply']> {
+		if (!note.replyId) return null;
+
+		const reply = note.reply ?? await this.notesRepository.findOneOrFail({
+			where: { id: note.replyId },
+			relations: {
+				user: {
+					instance: true,
+				},
+			},
+		});
+
+		return await this.populateNote(reply, false);
+	}
+
+	@bindThis
+	public async populateData(user: PopulatedUser, hint?: Partial<NoteVisibilityData>): Promise<NoteVisibilityData> {
+		// noinspection ES6MissingAwait
+		const [
+			userBlockers,
+			userFollowings,
+			userMutedThreads,
+			userMutedNotes,
+			userMutedUsers,
+			userMutedUserRenotes,
+			userMutedInstances,
+		] = await Promise.all([
+			user ? (hint?.userBlockers ?? this.cacheService.userBlockedCache.fetch(user.id)) : null,
+			user ? (hint?.userFollowings ?? this.cacheService.userFollowingsCache.fetch(user.id)) : null,
+			user ? (hint?.userMutedThreads ?? this.cacheService.threadMutingsCache.fetch(user.id)) : null,
+			user ? (hint?.userMutedNotes ?? this.cacheService.noteMutingsCache.fetch(user.id)) : null,
+			user ? (hint?.userMutedUsers ?? this.cacheService.userMutingsCache.fetch(user.id)) : null,
+			user ? (hint?.userMutedUserRenotes ?? this.cacheService.renoteMutingsCache.fetch(user.id)) : null,
+			user ? (hint?.userMutedInstances ?? this.cacheService.userProfileCache.fetch(user.id).then(p => new Set(p.mutedInstances))) : null,
+		]);
+
+		return {
+			userBlockers,
+			userFollowings,
+			userMutedThreads,
+			userMutedNotes,
+			userMutedUsers,
+			userMutedUserRenotes,
+			userMutedInstances,
+		};
+	}
+
+	@bindThis
+	public checkNoteVisibility(note: PopulatedNote, user: PopulatedUser, opts: { filters?: NoteVisibilityFilters, data: NoteVisibilityData }): NoteVisibilityResult {
+		// Copy note since we mutate it below
+		note = {
+			...note,
+			renote: note.renote ? { ...note.renote } : null,
+			reply: note.reply ? { ...note.reply } : null,
+		} as PopulatedNote;
+
+		this.syncVisibility(note);
+
+		const accessible = this.isAccessible(note, user, opts.data);
+		const redact = this.shouldRedact(note, user, opts.data);
+		const silence = this.shouldSilence(note, user, opts.data, opts.filters);
+
+		const baseVisibility = { accessible, redact, silence };
+
+		// For boosts (pure renotes), we must recurse and pick the lowest common access level.
+		if (isPopulatedBoost(note)) {
+			const boostVisibility = this.checkNoteVisibility(note.renote, user, opts);
+			return {
+				accessible: baseVisibility.accessible && boostVisibility.accessible,
+				redact: baseVisibility.redact || boostVisibility.redact,
+				silence: baseVisibility.silence || boostVisibility.silence,
+			};
+		}
+
+		return baseVisibility;
+	}
+
+	// Based on NoteEntityService.isVisibleForMe
+	private isAccessible(note: PopulatedNote, user: PopulatedUser, data: NoteVisibilityData): boolean {
+		// We can always view our own notes
+		if (user?.id === note.userId) return true;
+
+		// We can *never* view blocked notes
+		if (data.userBlockers?.has(note.userId)) return false;
+
+		if (note.visibility === 'specified') {
+			return this.isAccessibleDM(note, user);
+		} else if (note.visibility === 'followers') {
+			return this.isAccessibleFO(note, user, data);
+		} else {
+			return true;
+		}
+	}
+
+	private isAccessibleDM(note: PopulatedNote, user: PopulatedUser): boolean {
+		// Must be logged in to view DM
+		if (user == null) return false;
+
+		// Can be visible to me
+		if (note.visibleUserIds?.includes(user.id)) return true;
+
+		// Otherwise invisible
+		return false;
+	}
+
+	private isAccessibleFO(note: PopulatedNote, user: PopulatedUser, data: NoteVisibilityData): boolean {
+		// Must be logged in to view FO
+		if (user == null) return false;
+
+		// Can be a reply to me
+		if (note.reply?.userId === user.id) return true;
+
+		// Can mention me
+		if (note.mentions?.includes(user.id)) return true;
+
+		// Can be visible to me
+		if (note.visibleUserIds?.includes(user.id)) return true;
+
+		// Can be followed by me
+		if (data.userFollowings?.has(note.userId)) return true;
+
+		// Can be two remote users, since we can't verify remote->remote following.
+		if (note.userHost != null && user.host != null) return true;
+
+		// Otherwise invisible
+		return false;
+	}
+
+	// Based on NoteEntityService.treatVisibility
+	@bindThis
+	public syncVisibility(note: PopulatedNote): void {
+		// Make followers-only
+		if (note.user.makeNotesFollowersOnlyBefore && note.visibility !== 'specified' && note.visibility !== 'followers') {
+			const followersOnlyBefore = note.user.makeNotesFollowersOnlyBefore * 1000;
+			const createdAt = 'createdAt' in note
+				? new Date(note.createdAt).getTime()
+				: this.idService.parse(note.id).date.getTime();
+
+			// I don't understand this logic, but I tried to break it out for readability
+			const followersOnlyOpt1 = followersOnlyBefore <= 0 && (Date.now() - createdAt > 0 - followersOnlyBefore);
+			const followersOnlyOpt2 = followersOnlyBefore > 0 && (createdAt < followersOnlyBefore);
+			if (followersOnlyOpt1 || followersOnlyOpt2) {
+				note.visibility = 'followers';
+			}
+		}
+
+		// Recurse
+		if (note.renote) {
+			this.syncVisibility(note.renote);
+		}
+		if (note.reply) {
+			this.syncVisibility(note.reply);
+		}
+	}
+
+	// Based on NoteEntityService.hideNote
+	private shouldRedact(note: PopulatedNote, user: PopulatedUser, data: NoteVisibilityData): boolean {
+		// Never redact our own notes
+		if (user?.id === note.userId) return false;
+
+		// Redact if sign-in required
+		if (note.user.requireSigninToViewContents && !user) return true;
+
+		// Redact if note has expired
+		if (note.user.makeNotesHiddenBefore) {
+			const hiddenBefore = note.user.makeNotesHiddenBefore * 1000;
+			const createdAt = 'createdAt' in note
+				? new Date(note.createdAt).getTime()
+				: this.idService.parse(note.id).date.getTime();
+
+			// I don't understand this logic, but I tried to break it out for readability
+			const hiddenOpt1 = hiddenBefore <= 0 && (Date.now() - createdAt > 0 - hiddenBefore);
+			const hiddenOpt2 = hiddenBefore > 0 && (createdAt < hiddenBefore);
+			if (hiddenOpt1 || hiddenOpt2) return true;
+		}
+
+		// Redact if inaccessible.
+		// We have to repeat the check in case note visibility changed in treatVisibility!
+		if (!this.isAccessible(note, user, data)) {
+			return true;
+		}
+
+		// Otherwise don't redact
+		return false;
+	}
+
+	// Based on inconsistent logic from all around the app
+	private shouldSilence(note: PopulatedNote, user: PopulatedUser, data: NoteVisibilityData, filters: NoteVisibilityFilters | undefined): boolean {
+		if (this.shouldSilenceForMute(note, data)) {
+			return true;
+		}
+
+		if (this.shouldSilenceForSilence(note, user, data, filters?.includeSilencedAuthor ?? false)) {
+			return true;
+		}
+
+		if (!filters?.includeReplies && this.shouldSilenceForFollowWithoutReplies(note, user, data)) {
+			return true;
+		}
+
+		return false;
+	}
+
+	private shouldSilenceForMute(note: PopulatedNote, data: NoteVisibilityData): boolean {
+		// Silence if we've muted the thread
+		if (data.userMutedThreads?.has(note.threadId ?? note.id)) return true;
+
+		// Silence if we've muted the note
+		if (data.userMutedNotes?.has(note.id)) return true;
+
+		// Silence if we've muted the user
+		if (data.userMutedUsers?.has(note.userId)) return true;
+
+		// Silence if we've muted renotes from the user
+		if (isPopulatedBoost(note) && data.userMutedUserRenotes?.has(note.userId)) return true;
+
+		// Silence if we've muted the instance
+		if (note.userHost && data.userMutedInstances?.has(note.userHost)) return true;
+
+		// Otherwise don't silence
+		return false;
+	}
+
+	private shouldSilenceForSilence(note: PopulatedNote, user: PopulatedUser, data: NoteVisibilityData, includeSilencedAuthor: boolean): boolean {
+		// Don't silence if it's us
+		if (note.userId === user?.id) return false;
+
+		// Don't silence if we're following
+		if (data.userFollowings?.has(note.userId)) return false;
+
+		if (!includeSilencedAuthor) {
+			// Silence if user is silenced
+			if (note.user.isSilenced) return true;
+
+			// Silence if user instance is silenced
+			if (note.user.instance?.isSilenced) return true;
+		}
+
+		// Silence if renote is silenced
+		if (note.renote && note.renote.userId !== note.userId && this.shouldSilenceForSilence(note.renote, user, data, false)) return true;
+
+		// Silence if reply is silenced
+		if (note.reply && note.reply.userId !== note.userId && this.shouldSilenceForSilence(note.reply, user, data, false)) return true;
+
+		// Otherwise don't silence
+		return false;
+	}
+
+	private shouldSilenceForFollowWithoutReplies(note: PopulatedNote, user: PopulatedUser, data: NoteVisibilityData): boolean {
+		// Don't silence if it's not a reply
+		if (!note.reply) return false;
+
+		// Don't silence if it's a self-reply
+		if (note.reply.userId === note.userId) return false;
+
+		// Don't silence if it's a reply to us
+		if (note.reply.userId === user?.id) return false;
+
+		// Don't silence if it's our post
+		if (note.userId === user?.id) return false;
+
+		// Don't silence if we follow w/ replies
+		if (user && data.userFollowings?.get(user.id)?.withReplies) return false;
+
+		// Silence otherwise
+		return true;
+	}
+}
+
+export interface NoteVisibilityData {
+	userBlockers: Set<string> | null;
+	userFollowings: Map<string, Omit<MiFollowing, 'isFollowerHibernated'>> | null;
+	userMutedThreads: Set<string> | null;
+	userMutedNotes: Set<string> | null;
+	userMutedUsers: Set<string> | null;
+	userMutedUserRenotes: Set<string> | null;
+	userMutedInstances: Set<string> | null;
+}
+
+export type PopulatedUser = Pick<MiUser, 'id' | 'host'> | null | undefined;
+
+export type PopulatedNote = PopulatedMiNote | Packed<'Note'>;
+
+type PopulatedMiNote = MiNote & {
+	user: MiUser & {
+		instance: MiInstance | null,
+	}
+	renote: PopulatedMiNote | null,
+	reply: PopulatedMiNote | null,
+};
+
+function isPopulatedBoost(note: PopulatedNote): note is PopulatedNote & { renote: PopulatedNote } {
+	return note.renoteId != null
+		&& note.replyId == null
+		&& note.text == null
+		&& note.cw == null
+		&& (note.fileIds == null || note.fileIds.length === 0);
+}
+
+function isPackedNote(note: MiNote | Packed<'Note'>): note is Packed<'Note'> {
+	// Kind of a hack: determine whether it's packed by looking for property that doesn't exist in MiNote
+	return 'isFavorited' in note;
+}
diff --git a/packages/backend/src/core/QueryService.ts b/packages/backend/src/core/QueryService.ts
index 6c6ecbae6a..4fa0afc71e 100644
--- a/packages/backend/src/core/QueryService.ts
+++ b/packages/backend/src/core/QueryService.ts
@@ -128,29 +128,44 @@ export class QueryService {
 	}
 
 	@bindThis
-	public generateMutedUserQueryForNotes<E extends ObjectLiteral>(q: SelectQueryBuilder<E>, me: { id: MiUser['id'] }, exclude?: { id: MiUser['id'] }): SelectQueryBuilder<E> {
-		// 投稿の作者をミュートしていない かつ
-		// 投稿の返信先の作者をミュートしていない かつ
-		// 投稿の引用元の作者をミュートしていない
-		return this
-			.andNotMutingUser(q, ':meId', 'note.userId', exclude)
+	public generateMutedUserQueryForNotes<E extends ObjectLiteral>(q: SelectQueryBuilder<E>, me: { id: MiUser['id'] }, excludeAuthor = false): SelectQueryBuilder<E> {
+		if (!excludeAuthor) {
+			this
+				// muted user
+				.andNotMutingUser(q, ':meId', 'note.userId')
+				// muted host
+				.andWhere(new Brackets(qb => {
+					qb.orWhere('note.userHost IS NULL');
+					this.orFollowingUser(qb, ':meId', 'note.userId');
+					this.orNotMutingInstance(qb, ':meId', 'note.userHost');
+				}));
+		}
+
+		return q
+			// muted reply user
 			.andWhere(new Brackets(qb => this
-				.orNotMutingUser(qb, ':meId', 'note.replyUserId', exclude)
+				.orNotMutingUser(qb, ':meId', 'note.replyUserId')
+				.orWhere('note.replyUserId = note.userId')
 				.orWhere('note.replyUserId IS NULL')))
+			// muted renote user
 			.andWhere(new Brackets(qb => this
-				.orNotMutingUser(qb, ':meId', 'note.renoteUserId', exclude)
+				.orNotMutingUser(qb, ':meId', 'note.renoteUserId')
+				.orWhere('note.renoteUserId = note.userId')
 				.orWhere('note.renoteUserId IS NULL')))
-			// TODO exclude should also pass a host to skip these instances
-			// mute instances
-			.andWhere(new Brackets(qb => this
-				.andNotMutingInstance(qb, ':meId', 'note.userHost')
-				.orWhere('note.userHost IS NULL')))
-			.andWhere(new Brackets(qb => this
-				.orNotMutingInstance(qb, ':meId', 'note.replyUserHost')
-				.orWhere('note.replyUserHost IS NULL')))
-			.andWhere(new Brackets(qb => this
-				.orNotMutingInstance(qb, ':meId', 'note.renoteUserHost')
-				.orWhere('note.renoteUserHost IS NULL')))
+			// muted reply host
+			.andWhere(new Brackets(qb => {
+				qb.orWhere('note.replyUserHost IS NULL');
+				qb.orWhere('note.replyUserHost = note.userHost');
+				this.orFollowingUser(qb, ':meId', 'note.replyUserId');
+				this.orNotMutingInstance(qb, ':meId', 'note.replyUserHost');
+			}))
+			// muted renote host
+			.andWhere(new Brackets(qb => {
+				qb.orWhere('note.renoteUserHost IS NULL');
+				qb.orWhere('note.renoteUserHost = note.userHost');
+				this.orFollowingUser(qb, ':meId', 'note.renoteUserId');
+				this.orNotMutingInstance(qb, ':meId', 'note.renoteUserHost');
+			}))
 			.setParameters({ meId: me.id });
 	}
 
@@ -238,10 +253,10 @@ export class QueryService {
 
 	@bindThis
 	public generateSilencedUserQueryForNotes<E extends ObjectLiteral>(q: SelectQueryBuilder<E>, me?: { id: MiUser['id'] } | null, excludeAuthor = false): SelectQueryBuilder<E> {
-		const checkFor = (key: 'user' | 'replyUser' | 'renoteUser') => {
+		const checkFor = (key: 'user' | 'replyUser' | 'renoteUser', userKey: 'note.user' | 'reply.user' | 'renote.user') => {
 			// These are de-duplicated, since most call sites already provide some of them.
 			this.leftJoin(q, `note.${key}Instance`, `${key}Instance`); // note->instance
-			this.leftJoin(q, `note.${key}`, key); // note->user
+			this.leftJoin(q, userKey, key); // note->user
 
 			q.andWhere(new Brackets(qb => {
 				// case 1: user does not exist (note is not reply/renote)
@@ -270,10 +285,10 @@ export class QueryService {
 		}
 
 		if (!excludeAuthor) {
-			checkFor('user');
+			checkFor('user', 'note.user');
 		}
-		checkFor('replyUser');
-		checkFor('renoteUser');
+		checkFor('replyUser', 'reply.user');
+		checkFor('renoteUser', 'renote.user');
 
 		return q;
 	}
diff --git a/packages/backend/src/core/ReactionService.ts b/packages/backend/src/core/ReactionService.ts
index bb56c6c745..478438b042 100644
--- a/packages/backend/src/core/ReactionService.ts
+++ b/packages/backend/src/core/ReactionService.ts
@@ -31,6 +31,7 @@ import { isQuote, isRenote } from '@/misc/is-renote.js';
 import { ReactionsBufferingService } from '@/core/ReactionsBufferingService.js';
 import { PER_NOTE_REACTION_USER_PAIR_CACHE_MAX } from '@/const.js';
 import { CacheService } from '@/core/CacheService.js';
+import { NoteVisibilityService } from '@/core/NoteVisibilityService.js';
 import type { DataSource } from 'typeorm';
 
 const FALLBACK = '\u2764';
@@ -108,6 +109,7 @@ export class ReactionService {
 		private notificationService: NotificationService,
 		private perUserReactionsChart: PerUserReactionsChart,
 		private readonly cacheService: CacheService,
+		private readonly noteVisibilityService: NoteVisibilityService,
 	) {
 	}
 
@@ -122,7 +124,8 @@ export class ReactionService {
 		}
 
 		// check visibility
-		if (!await this.noteEntityService.isVisibleForMe(note, user.id, { me: user })) {
+		const { accessible } = await this.noteVisibilityService.checkNoteVisibilityAsync(note, user);
+		if (!accessible) {
 			throw new IdentifiableError('68e9d2d1-48bf-42c2-b90a-b20e09fd3d48', 'Note not accessible for you.');
 		}
 
diff --git a/packages/backend/src/core/WebhookTestService.ts b/packages/backend/src/core/WebhookTestService.ts
index fefb0f59a8..6fac67f42d 100644
--- a/packages/backend/src/core/WebhookTestService.ts
+++ b/packages/backend/src/core/WebhookTestService.ts
@@ -401,6 +401,7 @@ export class WebhookTestService {
 			text: note.text,
 			cw: note.cw,
 			userId: note.userId,
+			userHost: note.userHost ?? null,
 			user: await this.toPackedUserLite(note.user ?? generateDummyUser()),
 			replyId: note.replyId,
 			renoteId: note.renoteId,
diff --git a/packages/backend/src/core/activitypub/ApInboxService.ts b/packages/backend/src/core/activitypub/ApInboxService.ts
index 009d4cbd39..8aaa229466 100644
--- a/packages/backend/src/core/activitypub/ApInboxService.ts
+++ b/packages/backend/src/core/activitypub/ApInboxService.ts
@@ -38,6 +38,7 @@ import FederationChart from '@/core/chart/charts/federation.js';
 import { FetchInstanceMetadataService } from '@/core/FetchInstanceMetadataService.js';
 import { UpdateInstanceQueue } from '@/core/UpdateInstanceQueue.js';
 import { CacheService } from '@/core/CacheService.js';
+import { NoteVisibilityService } from '@/core/NoteVisibilityService.js';
 import { getApHrefNullable, getApId, getApIds, getApType, getNullableApId, isAccept, isActor, isAdd, isAnnounce, isApObject, isBlock, isCollectionOrOrderedCollection, isCreate, isDelete, isFlag, isFollow, isLike, isDislike, isMove, isPost, isReject, isRemove, isTombstone, isUndo, isUpdate, validActor, validPost, isActivity, IObjectWithId } from './type.js';
 import { ApNoteService } from './models/ApNoteService.js';
 import { ApLoggerService } from './ApLoggerService.js';
@@ -100,6 +101,7 @@ export class ApInboxService {
 		private readonly federationChart: FederationChart,
 		private readonly updateInstanceQueue: UpdateInstanceQueue,
 		private readonly cacheService: CacheService,
+		private readonly noteVisibilityService: NoteVisibilityService,
 	) {
 		this.logger = this.apLoggerService.logger;
 	}
@@ -367,7 +369,8 @@ export class ApInboxService {
 			const renote = await this.apNoteService.resolveNote(target, { resolver, sentFrom: getApId(target) });
 			if (renote == null) return 'announce target is null';
 
-			if (!await this.noteEntityService.isVisibleForMe(renote, actor.id, { me: actor })) {
+			const { accessible } = await this.noteVisibilityService.checkNoteVisibilityAsync(renote, actor);
+			if (!accessible) {
 				return 'skip: invalid actor for this activity';
 			}
 
diff --git a/packages/backend/src/core/entities/NoteEntityService.ts b/packages/backend/src/core/entities/NoteEntityService.ts
index 8841c2b63d..1f5496aa93 100644
--- a/packages/backend/src/core/entities/NoteEntityService.ts
+++ b/packages/backend/src/core/entities/NoteEntityService.ts
@@ -17,8 +17,9 @@ import { DebounceLoader } from '@/misc/loader.js';
 import { IdService } from '@/core/IdService.js';
 import { ReactionsBufferingService } from '@/core/ReactionsBufferingService.js';
 import { QueryService } from '@/core/QueryService.js';
-import { isPackedPureRenote } from '@/misc/is-renote.js';
 import type { Config } from '@/config.js';
+import { NoteVisibilityService } from '@/core/NoteVisibilityService.js';
+import type { NoteVisibilityData } from '@/core/NoteVisibilityService.js';
 import type { OnModuleInit } from '@nestjs/common';
 import type { CacheService } from '../CacheService.js';
 import type { CustomEmojiService } from '../CustomEmojiService.js';
@@ -101,6 +102,9 @@ export class NoteEntityService implements OnModuleInit {
 		@Inject(DI.noteFavoritesRepository)
 		private noteFavoritesRepository: NoteFavoritesRepository,
 
+		// This is public to avoid weaving a whole new service through the Channel class hierarchy.
+		public readonly noteVisibilityService: NoteVisibilityService,
+
 		private readonly queryService: QueryService,
 		//private userEntityService: UserEntityService,
 		//private driveFileEntityService: DriveFileEntityService,
@@ -121,6 +125,8 @@ export class NoteEntityService implements OnModuleInit {
 		this.idService = this.moduleRef.get('IdService');
 	}
 
+	// Implementation moved to NoteVisibilityService
+	/*
 	@bindThis
 	private treatVisibility(packedNote: Packed<'Note'>): Packed<'Note'>['visibility'] {
 		if (packedNote.visibility === 'public' || packedNote.visibility === 'home') {
@@ -136,24 +142,31 @@ export class NoteEntityService implements OnModuleInit {
 		}
 		return packedNote.visibility;
 	}
+	*/
 
 	@bindThis
-	public async hideNotes(notes: Packed<'Note'>[], meId: string | null): Promise<void> {
-		const myFollowing = meId ? new Map(await this.cacheService.userFollowingsCache.fetch(meId)) : new Map<string, Omit<MiFollowing, 'isFollowerHibernated'>>();
-		const myBlockers = meId ? new Set(await this.cacheService.userBlockedCache.fetch(meId)) : new Set<string>();
+	public async hideNotes(notes: Packed<'Note'>[], meId: string | null, hint?: Partial<NoteVisibilityData>): Promise<void> {
+		const me = meId ? await this.cacheService.findUserById(meId) : null;
+		const data = await this.noteVisibilityService.populateData(me, hint);
 
-		// This shouldn't actually await, but we have to wrap it anyway because hideNote() is async
-		await Promise.all(notes.map(note => this.hideNote(note, meId, {
-			myFollowing,
-			myBlockers,
-		})));
+		for (const note of notes) {
+			this.hideNote(note, me, data);
+		}
 	}
 
 	@bindThis
-	public async hideNote(packedNote: Packed<'Note'>, meId: MiUser['id'] | null, hint?: {
-		myFollowing?: ReadonlyMap<string, Omit<MiFollowing, 'isFollowerHibernated'>> | ReadonlySet<string>,
-		myBlockers?: ReadonlySet<string>,
-	}): Promise<void> {
+	public async hideNoteAsync(packedNote: Packed<'Note'>, me: string | Pick<MiUser, 'id' | 'host'> | null, hint?: Partial<NoteVisibilityData>): Promise<void> {
+		const { redact } = await this.noteVisibilityService.checkNoteVisibilityAsync(packedNote, me, { hint });
+
+		if (redact) {
+			this.redactNoteContents(packedNote);
+		}
+	}
+
+	@bindThis
+	public hideNote(packedNote: Packed<'Note'>, me: Pick<MiUser, 'id' | 'host'> | null, data: NoteVisibilityData): void {
+		// Implementation moved to NoteVisibilityService
+		/*
 		if (meId === packedNote.userId) return;
 
 		// TODO: isVisibleForMe を使うようにしても良さそう(型違うけど)
@@ -232,8 +245,17 @@ export class NoteEntityService implements OnModuleInit {
 
 			if (isBlocked) hide = true;
 		}
+		*/
+
+		const hide = this.noteVisibilityService.checkNoteVisibility(packedNote, me, { data }).redact;
 
 		if (hide) {
+			this.redactNoteContents(packedNote);
+		}
+	}
+
+	private redactNoteContents(packedNote: Packed<'Note'>) {
+		{
 			packedNote.visibleUserIds = undefined;
 			packedNote.fileIds = [];
 			packedNote.files = [];
@@ -477,6 +499,8 @@ export class NoteEntityService implements OnModuleInit {
 		return undefined;
 	}
 
+	// Implementation moved to NoteVisibilityService
+	/*
 	@bindThis
 	public async isVisibleForMe(note: MiNote, meId: MiUser['id'] | null, hint?: {
 		myFollowing?: ReadonlySet<string>,
@@ -493,7 +517,7 @@ export class NoteEntityService implements OnModuleInit {
 	}
 
 	@bindThis
-	public isVisibleForMeSync(note: MiNote, me: Pick<MiUser, 'id' | 'host'> | null, myFollowings: ReadonlySet<string> | null, myBlockers: ReadonlySet<string> | null): boolean {
+	public isVisibleForMeSync(note: MiNote | Packed<'Note'>, me: Pick<MiUser, 'id' | 'host'> | null, myFollowings: ReadonlySet<string> | null, myBlockers: ReadonlySet<string> | null): boolean {
 		// We can always view our own notes
 		if (me?.id === note.userId) {
 			return true;
@@ -509,6 +533,8 @@ export class NoteEntityService implements OnModuleInit {
 		if (note.visibility === 'specified') {
 			if (me == null) {
 				return false;
+			} else if (!note.visibleUserIds) {
+				return false;
 			} else {
 				// 指定されているかどうか
 				return note.visibleUserIds.includes(me.id);
@@ -522,9 +548,13 @@ export class NoteEntityService implements OnModuleInit {
 			} else if (note.reply && (me.id === note.reply.userId)) {
 				// 自分の投稿に対するリプライ
 				return true;
+			} else if (!note.mentions) {
+				return false;
 			} else if (note.mentions.includes(me.id)) {
 				// 自分へのメンション
 				return true;
+			} else if (!note.visibleUserIds) {
+				return false;
 			} else if (note.visibleUserIds.includes(me.id)) {
 				// Explicitly visible to me
 				return true;
@@ -533,19 +563,19 @@ export class NoteEntityService implements OnModuleInit {
 				const following = myFollowings?.has(note.userId);
 				const userHost = me.host;
 
-				/* If we know the following, everyhting is fine.
-
-				But if we do not know the following, it might be that both the
-				author of the note and the author of the like are remote users,
-				in which case we can never know the following. Instead we have
-				to assume that the users are following each other.
-				*/
+				// If we know the following, everyhting is fine.
+				//
+				// But if we do not know the following, it might be that both the
+				// author of the note and the author of the like are remote users,
+				// in which case we can never know the following. Instead we have
+				// to assume that the users are following each other.
 				return following || (note.userHost != null && userHost != null);
 			}
 		}
 
 		return true;
 	}
+	*/
 
 	@bindThis
 	public async packAttachedFiles(fileIds: MiNote['fileIds'], packedFiles: Map<MiNote['fileIds'][number], Packed<'DriveFile'> | null>): Promise<Packed<'DriveFile'>[]> {
@@ -649,6 +679,7 @@ export class NoteEntityService implements OnModuleInit {
 			createdAt: this.idService.parse(note.id).date.toISOString(),
 			updatedAt: note.updatedAt ? note.updatedAt.toISOString() : undefined,
 			userId: note.userId,
+			userHost: note.userHost,
 			user: packedUsers?.get(note.userId) ?? this.userEntityService.pack(note.user ?? note.userId, me),
 			text: text,
 			cw: note.cw,
@@ -719,12 +750,14 @@ export class NoteEntityService implements OnModuleInit {
 			} : {}),
 		});
 
-		this.treatVisibility(packed);
+		this.noteVisibilityService.syncVisibility(packed);
 
 		if (!opts.skipHide) {
-			await this.hideNote(packed, meId, meId == null ? undefined : {
-				myFollowing: opts._hint_?.userFollowings.get(meId),
-				myBlockers: opts._hint_?.userBlockers.get(meId),
+			await this.hideNoteAsync(packed, meId, {
+				userFollowings: meId ? opts._hint_?.userFollowings.get(meId) : null,
+				userBlockers: meId ? opts._hint_?.userBlockers.get(meId) : null,
+				userMutedNotes: opts._hint_?.mutedNotes,
+				userMutedThreads: opts._hint_?.mutedThreads,
 			});
 		}
 
diff --git a/packages/backend/src/models/json-schema/note.ts b/packages/backend/src/models/json-schema/note.ts
index 6d3b9fe15e..79b36ba0da 100644
--- a/packages/backend/src/models/json-schema/note.ts
+++ b/packages/backend/src/models/json-schema/note.ts
@@ -50,6 +50,10 @@ export const packedNoteSchema = {
 			optional: false, nullable: false,
 			format: 'id',
 		},
+		userHost: {
+			type: 'string',
+			optional: false, nullable: true,
+		},
 		user: {
 			type: 'object',
 			ref: 'UserLite',
diff --git a/packages/backend/src/server/api/endpoints/notes/bubble-timeline.ts b/packages/backend/src/server/api/endpoints/notes/bubble-timeline.ts
index e31b9be702..f5236e9423 100644
--- a/packages/backend/src/server/api/endpoints/notes/bubble-timeline.ts
+++ b/packages/backend/src/server/api/endpoints/notes/bubble-timeline.ts
@@ -93,7 +93,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				.leftJoin('(select "host" from "instance" where "isBubbled" = true)', 'bubbleInstance', '"bubbleInstance"."host" = "note"."userHost"')
 				.andWhere('"bubbleInstance" IS NOT NULL');
 			this.queryService
-				.leftJoin(query, 'note.userInstance', 'userInstance', '"userInstance"."host" = "bubbleInstance"."host"');
+				.leftJoin(query, 'note.userInstance', 'userInstance');
 
 			this.queryService.generateBlockedHostQueryForNote(query);
 			this.queryService.generateSilencedUserQueryForNotes(query, me);
diff --git a/packages/backend/src/server/api/endpoints/notes/create.ts b/packages/backend/src/server/api/endpoints/notes/create.ts
index 42dbf33d0d..d6fccd1b84 100644
--- a/packages/backend/src/server/api/endpoints/notes/create.ts
+++ b/packages/backend/src/server/api/endpoints/notes/create.ts
@@ -18,6 +18,7 @@ import { NoteCreateService } from '@/core/NoteCreateService.js';
 import { DI } from '@/di-symbols.js';
 import { isQuote, isRenote } from '@/misc/is-renote.js';
 import { IdentifiableError } from '@/misc/identifiable-error.js';
+import { NoteVisibilityService } from '@/core/NoteVisibilityService.js';
 import { ApiError } from '../../error.js';
 
 export const meta = {
@@ -261,6 +262,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 
 		private noteEntityService: NoteEntityService,
 		private noteCreateService: NoteCreateService,
+		private readonly noteVisibilityService: NoteVisibilityService,
 	) {
 		super(meta, paramDef, async (ps, me) => {
 			if (ps.text && ps.text.length > this.config.maxNoteLength) {
@@ -303,7 +305,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 					throw new ApiError(meta.errors.noSuchRenoteTarget);
 				} else if (isRenote(renote) && !isQuote(renote)) {
 					throw new ApiError(meta.errors.cannotReRenote);
-				} else if (!await this.noteEntityService.isVisibleForMe(renote, me.id)) {
+				} else if (!(await this.noteVisibilityService.checkNoteVisibilityAsync(renote, me)).accessible) {
 					throw new ApiError(meta.errors.cannotRenoteDueToVisibility);
 				}
 
@@ -351,7 +353,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 					throw new ApiError(meta.errors.noSuchReplyTarget);
 				} else if (isRenote(reply) && !isQuote(reply)) {
 					throw new ApiError(meta.errors.cannotReplyToPureRenote);
-				} else if (!await this.noteEntityService.isVisibleForMe(reply, me.id, { me })) {
+				} else if (!(await this.noteVisibilityService.checkNoteVisibilityAsync(reply, me)).accessible) {
 					throw new ApiError(meta.errors.cannotReplyToInvisibleNote);
 				} else if (reply.visibility === 'specified' && ps.visibility !== 'specified') {
 					throw new ApiError(meta.errors.cannotReplyToSpecifiedVisibilityNoteWithExtendedVisibility);
diff --git a/packages/backend/src/server/api/endpoints/notes/edit.ts b/packages/backend/src/server/api/endpoints/notes/edit.ts
index 2689451a73..717dab59e1 100644
--- a/packages/backend/src/server/api/endpoints/notes/edit.ts
+++ b/packages/backend/src/server/api/endpoints/notes/edit.ts
@@ -17,6 +17,7 @@ import { NoteEditService } from '@/core/NoteEditService.js';
 import { DI } from '@/di-symbols.js';
 import { isQuote, isRenote } from '@/misc/is-renote.js';
 import { IdentifiableError } from '@/misc/identifiable-error.js';
+import { NoteVisibilityService } from '@/core/NoteVisibilityService.js';
 import { ApiError } from '../../error.js';
 
 export const meta = {
@@ -311,6 +312,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 
 		private noteEntityService: NoteEntityService,
 		private noteEditService: NoteEditService,
+		private readonly noteVisibilityService: NoteVisibilityService,
 	) {
 		super(meta, paramDef, async (ps, me) => {
 			if (ps.text && ps.text.length > this.config.maxNoteLength) {
@@ -408,7 +410,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 					throw new ApiError(meta.errors.noSuchReplyTarget);
 				} else if (isRenote(reply) && !isQuote(reply)) {
 					throw new ApiError(meta.errors.cannotReplyToPureRenote);
-				} else if (!await this.noteEntityService.isVisibleForMe(reply, me.id, { me })) {
+				} else if (!(await this.noteVisibilityService.checkNoteVisibilityAsync(reply, me)).accessible) {
 					throw new ApiError(meta.errors.cannotReplyToInvisibleNote);
 				} else if (reply.visibility === 'specified' && ps.visibility !== 'specified') {
 					throw new ApiError(meta.errors.cannotReplyToSpecifiedVisibilityNoteWithExtendedVisibility);
diff --git a/packages/backend/src/server/api/endpoints/notes/translate.ts b/packages/backend/src/server/api/endpoints/notes/translate.ts
index 5ebd5ef362..f8c29b60d4 100644
--- a/packages/backend/src/server/api/endpoints/notes/translate.ts
+++ b/packages/backend/src/server/api/endpoints/notes/translate.ts
@@ -15,6 +15,7 @@ import { DI } from '@/di-symbols.js';
 import { CacheService } from '@/core/CacheService.js';
 import { hasText } from '@/models/Note.js';
 import { ApiLoggerService } from '@/server/api/ApiLoggerService.js';
+import { NoteVisibilityService } from '@/core/NoteVisibilityService.js';
 import { ApiError } from '../../error.js';
 
 export const meta = {
@@ -84,6 +85,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 		private roleService: RoleService,
 		private readonly cacheService: CacheService,
 		private readonly loggerService: ApiLoggerService,
+		private readonly noteVisibilityService: NoteVisibilityService,
 	) {
 		super(meta, paramDef, async (ps, me) => {
 			const note = await this.getterService.getNote(ps.noteId).catch(err => {
@@ -91,7 +93,8 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				throw err;
 			});
 
-			if (!(await this.noteEntityService.isVisibleForMe(note, me?.id ?? null, { me }))) {
+			const { accessible } = await this.noteVisibilityService.checkNoteVisibilityAsync(note, me);
+			if (!accessible) {
 				throw new ApiError(meta.errors.cannotTranslateInvisibleNote);
 			}
 
diff --git a/packages/backend/src/server/api/endpoints/users/notes.ts b/packages/backend/src/server/api/endpoints/users/notes.ts
index 4db16ad7a0..d0363c83f8 100644
--- a/packages/backend/src/server/api/endpoints/users/notes.ts
+++ b/packages/backend/src/server/api/endpoints/users/notes.ts
@@ -220,7 +220,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 		this.queryService.generateSuspendedUserQueryForNote(query, true);
 		this.queryService.generateSilencedUserQueryForNotes(query, me, true);
 		if (me) {
-			this.queryService.generateMutedUserQueryForNotes(query, me, { id: ps.userId });
+			this.queryService.generateMutedUserQueryForNotes(query, me, true);
 			this.queryService.generateBlockedUserQueryForNotes(query, me);
 		}
 
diff --git a/packages/backend/src/server/api/stream/channel.ts b/packages/backend/src/server/api/stream/channel.ts
index 7e0e3e0bc6..71845125ad 100644
--- a/packages/backend/src/server/api/stream/channel.ts
+++ b/packages/backend/src/server/api/stream/channel.ts
@@ -12,6 +12,7 @@ import type { JsonObject, JsonValue } from '@/misc/json-value.js';
 import { NoteEntityService } from '@/core/entities/NoteEntityService.js';
 import { deepClone } from '@/misc/clone.js';
 import type Connection from '@/server/api/stream/Connection.js';
+import { NoteVisibilityFilters } from '@/core/NoteVisibilityService.js';
 
 /**
  * Stream channel
@@ -26,6 +27,10 @@ export default abstract class Channel {
 	public static readonly requireCredential: boolean;
 	public static readonly kind?: string | null;
 
+	protected get noteVisibilityService() {
+		return this.noteEntityService.noteVisibilityService;
+	}
+
 	protected get user() {
 		return this.connection.user;
 	}
@@ -105,8 +110,14 @@ export default abstract class Channel {
 		return this.connection.myRecentFavorites;
 	}
 
+	protected async checkNoteVisibility(note: Packed<'Note'>, filters?: NoteVisibilityFilters) {
+		// Don't use any of the local cached data, because this does everything through CacheService which is just as fast with updated data.
+		return await this.noteVisibilityService.checkNoteVisibilityAsync(note, this.user, { filters });
+	}
+
 	/**
 	 * Checks if a note is visible to the current user *excluding* blocks and mutes.
+	 * @deprecated use isNoteHidden instead
 	 */
 	protected isNoteVisibleToMe(note: Packed<'Note'>): boolean {
 		if (note.visibility === 'public') return true;
@@ -120,8 +131,9 @@ export default abstract class Channel {
 		return note.visibleUserIds.includes(this.user.id);
 	}
 
-	/*
+	/**
 	 * ミュートとブロックされてるを処理する
+	 * @deprecated use isNoteHidden instead
 	 */
 	protected isNoteMutedOrBlocked(note: Packed<'Note'>): boolean {
 		// Ignore notes that require sign-in
@@ -196,12 +208,11 @@ export default abstract class Channel {
 		// If we didn't clone the notes here, different connections would asynchronously write
 		// different values to the same object, resulting in a random value being sent to each frontend. -- Dakkar
 		const clonedNote = deepClone(note);
-		const notes = crawl(clonedNote);
 
 		// Hide notes before everything else, since this modifies fields that the other functions will check.
-		await this.noteEntityService.hideNotes(notes, this.user.id);
+		const notes = crawl(clonedNote);
 
-		const [myReactions, myRenotes, myFavorites, myThreadMutings, myNoteMutings] = await Promise.all([
+		const [myReactions, myRenotes, myFavorites, myThreadMutings, myNoteMutings, myFollowings] = await Promise.all([
 			this.noteEntityService.populateMyReactions(notes, this.user.id, {
 				myReactions: this.myRecentReactions,
 			}),
@@ -213,13 +224,25 @@ export default abstract class Channel {
 			}),
 			this.noteEntityService.populateMyTheadMutings(notes, this.user.id),
 			this.noteEntityService.populateMyNoteMutings(notes, this.user.id),
+			this.cacheService.userFollowingsCache.fetch(this.user.id),
 		]);
 
-		note.myReaction = myReactions.get(note.id) ?? null;
-		note.isRenoted = myRenotes.has(note.id);
-		note.isFavorited = myFavorites.has(note.id);
-		note.isMutingThread = myThreadMutings.has(note.id);
-		note.isMutingNote = myNoteMutings.has(note.id);
+		for (const n of notes) {
+			// Sync visibility in case there's something like "makeNotesFollowersOnlyBefore" enabled
+			this.noteVisibilityService.syncVisibility(n);
+
+			n.myReaction = myReactions.get(n.id) ?? null;
+			n.isRenoted = myRenotes.has(n.id);
+			n.isFavorited = myFavorites.has(n.id);
+			n.isMutingThread = myThreadMutings.has(n.id);
+			n.isMutingNote = myNoteMutings.has(n.id);
+			n.user.bypassSilence = n.userId === this.user.id || myFollowings.has(n.userId);
+		}
+
+		// Hide notes *after* we sync visibility
+		await this.noteEntityService.hideNotes(notes, this.user.id, {
+			userFollowings: myFollowings,
+		});
 
 		return clonedNote;
 	}
diff --git a/packages/backend/src/server/api/stream/channels/antenna.ts b/packages/backend/src/server/api/stream/channels/antenna.ts
index 0974dbdb25..20aa934468 100644
--- a/packages/backend/src/server/api/stream/channels/antenna.ts
+++ b/packages/backend/src/server/api/stream/channels/antenna.ts
@@ -41,7 +41,8 @@ class AntennaChannel extends Channel {
 		if (data.type === 'note') {
 			const note = await this.noteEntityService.pack(data.body.id, this.user, { detail: true });
 
-			if (this.isNoteMutedOrBlocked(note)) return;
+			const { accessible, silence } = await this.checkNoteVisibility(note, { includeReplies: true });
+			if (!accessible || silence) return;
 
 			this.send('note', note);
 		} else {
diff --git a/packages/backend/src/server/api/stream/channels/bubble-timeline.ts b/packages/backend/src/server/api/stream/channels/bubble-timeline.ts
index a7f538eeda..6adb861ff3 100644
--- a/packages/backend/src/server/api/stream/channels/bubble-timeline.ts
+++ b/packages/backend/src/server/api/stream/channels/bubble-timeline.ts
@@ -8,9 +8,9 @@ import type { Packed } from '@/misc/json-schema.js';
 import { NoteEntityService } from '@/core/entities/NoteEntityService.js';
 import { bindThis } from '@/decorators.js';
 import { RoleService } from '@/core/RoleService.js';
-import { isRenotePacked, isQuotePacked } from '@/misc/is-renote.js';
 import type { JsonObject } from '@/misc/json-value.js';
 import { UtilityService } from '@/core/UtilityService.js';
+import { isPackedPureRenote } from '@/misc/is-renote.js';
 import Channel, { MiChannelService } from '../channel.js';
 
 class BubbleTimelineChannel extends Channel {
@@ -47,8 +47,6 @@ class BubbleTimelineChannel extends Channel {
 
 	@bindThis
 	private async onNote(note: Packed<'Note'>) {
-		const isMe = this.user?.id === note.userId;
-
 		if (this.withFiles && (note.fileIds == null || note.fileIds.length === 0)) return;
 		if (!this.withBots && note.user.isBot) return;
 
@@ -56,27 +54,9 @@ class BubbleTimelineChannel extends Channel {
 		if (note.channelId != null) return;
 		if (!this.utilityService.isBubbledHost(note.user.host)) return;
 
-		if (this.isNoteMutedOrBlocked(note)) return;
-
-		if (note.reply) {
-			const reply = note.reply;
-			// 自分のフォローしていないユーザーの visibility: followers な投稿への返信は弾く
-			if (!this.isNoteVisibleToMe(reply)) return;
-			if (!this.following.get(note.userId)?.withReplies) {
-				// 「チャンネル接続主への返信」でもなければ、「チャンネル接続主が行った返信」でもなければ、「投稿者の投稿者自身への返信」でもない場合
-				if (reply.userId !== this.user?.id && !isMe && reply.userId !== note.userId) return;
-			}
-		}
-
-		// 純粋なリノート（引用リノートでないリノート）の場合
-		if (isRenotePacked(note) && !isQuotePacked(note) && note.renote) {
-			if (!this.withRenotes) return;
-			if (note.renote.reply) {
-				const reply = note.renote.reply;
-				// 自分のフォローしていないユーザーの visibility: followers な投稿への返信のリノートは弾く
-				if (!this.isNoteVisibleToMe(reply)) return;
-			}
-		}
+		const { accessible, silence } = await this.checkNoteVisibility(note);
+		if (!accessible || silence) return;
+		if (!this.withRenotes && isPackedPureRenote(note)) return;
 
 		const clonedNote = await this.rePackNote(note);
 		this.send('note', clonedNote);
diff --git a/packages/backend/src/server/api/stream/channels/channel.ts b/packages/backend/src/server/api/stream/channels/channel.ts
index 9eea423088..08d9c59c83 100644
--- a/packages/backend/src/server/api/stream/channels/channel.ts
+++ b/packages/backend/src/server/api/stream/channels/channel.ts
@@ -8,6 +8,7 @@ import type { Packed } from '@/misc/json-schema.js';
 import { NoteEntityService } from '@/core/entities/NoteEntityService.js';
 import { bindThis } from '@/decorators.js';
 import type { JsonObject } from '@/misc/json-value.js';
+import { isPackedPureRenote } from '@/misc/is-renote.js';
 import Channel, { type MiChannelService } from '../channel.js';
 
 class ChannelChannel extends Channel {
@@ -45,9 +46,9 @@ class ChannelChannel extends Channel {
 
 		if (this.withFiles && (note.fileIds == null || note.fileIds.length === 0)) return;
 
-		if (note.renote && note.text == null && (note.fileIds == null || note.fileIds.length === 0) && !this.withRenotes) return;
-
-		if (this.isNoteMutedOrBlocked(note)) return;
+		const { accessible, silence } = await this.checkNoteVisibility(note, { includeReplies: true });
+		if (!accessible || silence) return;
+		if (!this.withRenotes && isPackedPureRenote(note)) return;
 
 		const clonedNote = await this.rePackNote(note);
 		this.send('note', clonedNote);
diff --git a/packages/backend/src/server/api/stream/channels/global-timeline.ts b/packages/backend/src/server/api/stream/channels/global-timeline.ts
index 9bdd299ddb..8e6fa0c4ea 100644
--- a/packages/backend/src/server/api/stream/channels/global-timeline.ts
+++ b/packages/backend/src/server/api/stream/channels/global-timeline.ts
@@ -9,7 +9,7 @@ import { MetaService } from '@/core/MetaService.js';
 import { NoteEntityService } from '@/core/entities/NoteEntityService.js';
 import { bindThis } from '@/decorators.js';
 import { RoleService } from '@/core/RoleService.js';
-import { isRenotePacked, isQuotePacked } from '@/misc/is-renote.js';
+import { isPackedPureRenote } from '@/misc/is-renote.js';
 import type { JsonObject } from '@/misc/json-value.js';
 import Channel, { type MiChannelService } from '../channel.js';
 
@@ -48,36 +48,15 @@ class GlobalTimelineChannel extends Channel {
 
 	@bindThis
 	private async onNote(note: Packed<'Note'>) {
-		const isMe = this.user?.id === note.userId;
-
 		if (this.withFiles && (note.fileIds == null || note.fileIds.length === 0)) return;
 		if (!this.withBots && note.user.isBot) return;
 
 		if (note.visibility !== 'public') return;
 		if (note.channelId != null) return;
 
-		if (this.isNoteMutedOrBlocked(note)) return;
-		if (!this.isNoteVisibleToMe(note)) return;
-
-		if (note.reply) {
-			const reply = note.reply;
-			// 自分のフォローしていないユーザーの visibility: followers な投稿への返信は弾く
-			if (!this.isNoteVisibleToMe(reply)) return;
-			if (!this.following.get(note.userId)?.withReplies) {
-				// 「チャンネル接続主への返信」でもなければ、「チャンネル接続主が行った返信」でもなければ、「投稿者の投稿者自身への返信」でもない場合
-				if (reply.userId !== this.user?.id && !isMe && reply.userId !== note.userId) return;
-			}
-		}
-
-		// 純粋なリノート（引用リノートでないリノート）の場合
-		if (isRenotePacked(note) && !isQuotePacked(note) && note.renote) {
-			if (!this.withRenotes) return;
-			if (note.renote.reply) {
-				const reply = note.renote.reply;
-				// 自分のフォローしていないユーザーの visibility: followers な投稿への返信のリノートは弾く
-				if (!this.isNoteVisibleToMe(reply)) return;
-			}
-		}
+		const { accessible, silence } = await this.checkNoteVisibility(note);
+		if (!accessible || silence) return;
+		if (!this.withRenotes && isPackedPureRenote(note)) return;
 
 		const clonedNote = await this.rePackNote(note);
 		this.send('note', clonedNote);
diff --git a/packages/backend/src/server/api/stream/channels/hashtag.ts b/packages/backend/src/server/api/stream/channels/hashtag.ts
index e0331828d2..953c296c11 100644
--- a/packages/backend/src/server/api/stream/channels/hashtag.ts
+++ b/packages/backend/src/server/api/stream/channels/hashtag.ts
@@ -43,7 +43,8 @@ class HashtagChannel extends Channel {
 		const matched = this.q.some(tags => tags.every(tag => noteTags.includes(normalizeForSearch(tag))));
 		if (!matched) return;
 
-		if (this.isNoteMutedOrBlocked(note)) return;
+		const { accessible, silence } = await this.checkNoteVisibility(note, { includeReplies: true });
+		if (!accessible || silence) return;
 
 		const clonedNote = await this.rePackNote(note);
 		this.send('note', clonedNote);
diff --git a/packages/backend/src/server/api/stream/channels/home-timeline.ts b/packages/backend/src/server/api/stream/channels/home-timeline.ts
index bb28cbf81e..6e7936c3e0 100644
--- a/packages/backend/src/server/api/stream/channels/home-timeline.ts
+++ b/packages/backend/src/server/api/stream/channels/home-timeline.ts
@@ -7,7 +7,7 @@ import { Injectable } from '@nestjs/common';
 import type { Packed } from '@/misc/json-schema.js';
 import { NoteEntityService } from '@/core/entities/NoteEntityService.js';
 import { bindThis } from '@/decorators.js';
-import { isRenotePacked, isQuotePacked } from '@/misc/is-renote.js';
+import { isPackedPureRenote } from '@/misc/is-renote.js';
 import type { JsonObject } from '@/misc/json-value.js';
 import Channel, { type MiChannelService } from '../channel.js';
 
@@ -50,28 +50,9 @@ class HomeTimelineChannel extends Channel {
 			if (!isMe && !this.following.has(note.userId)) return;
 		}
 
-		if (this.isNoteMutedOrBlocked(note)) return;
-		if (!this.isNoteVisibleToMe(note)) return;
-
-		if (note.reply) {
-			const reply = note.reply;
-			// 自分のフォローしていないユーザーの visibility: followers な投稿への返信は弾く
-			if (!this.isNoteVisibleToMe(reply)) return;
-			if (!this.following.get(note.userId)?.withReplies) {
-				// 「チャンネル接続主への返信」でもなければ、「チャンネル接続主が行った返信」でもなければ、「投稿者の投稿者自身への返信」でもない場合
-				if (reply.userId !== this.user!.id && !isMe && reply.userId !== note.userId) return;
-			}
-		}
-
-		// 純粋なリノート（引用リノートでないリノート）の場合
-		if (isRenotePacked(note) && !isQuotePacked(note) && note.renote) {
-			if (!this.withRenotes) return;
-			if (note.renote.reply) {
-				const reply = note.renote.reply;
-				// 自分のフォローしていないユーザーの visibility: followers な投稿への返信のリノートは弾く
-				if (!this.isNoteVisibleToMe(reply)) return;
-			}
-		}
+		const { accessible, silence } = await this.checkNoteVisibility(note);
+		if (!accessible || silence) return;
+		if (!this.withRenotes && isPackedPureRenote(note)) return;
 
 		const clonedNote = await this.rePackNote(note);
 		this.send('note', clonedNote);
diff --git a/packages/backend/src/server/api/stream/channels/hybrid-timeline.ts b/packages/backend/src/server/api/stream/channels/hybrid-timeline.ts
index 82d96c6e7e..e5576e9102 100644
--- a/packages/backend/src/server/api/stream/channels/hybrid-timeline.ts
+++ b/packages/backend/src/server/api/stream/channels/hybrid-timeline.ts
@@ -9,7 +9,7 @@ import { MetaService } from '@/core/MetaService.js';
 import { NoteEntityService } from '@/core/entities/NoteEntityService.js';
 import { bindThis } from '@/decorators.js';
 import { RoleService } from '@/core/RoleService.js';
-import { isRenotePacked, isQuotePacked } from '@/misc/is-renote.js';
+import { isPackedPureRenote } from '@/misc/is-renote.js';
 import type { JsonObject } from '@/misc/json-value.js';
 import Channel, { type MiChannelService } from '../channel.js';
 
@@ -67,28 +67,10 @@ class HybridTimelineChannel extends Channel {
 			(note.channelId != null && this.followingChannels.has(note.channelId))
 		)) return;
 
-		if (this.isNoteMutedOrBlocked(note)) return;
-		if (!this.isNoteVisibleToMe(note)) return;
-
-		if (note.reply) {
-			const reply = note.reply;
-			// 自分のフォローしていないユーザーの visibility: followers な投稿への返信は弾く
-			if (!this.isNoteVisibleToMe(reply)) return;
-			if (!this.following.get(note.userId)?.withReplies && !this.withReplies) {
-				// 「チャンネル接続主への返信」でもなければ、「チャンネル接続主が行った返信」でもなければ、「投稿者の投稿者自身への返信」でもない場合
-				if (reply.userId !== this.user!.id && !isMe && reply.userId !== note.userId) return;
-			}
-		}
-
-		// 純粋なリノート（引用リノートでないリノート）の場合
-		if (isRenotePacked(note) && !isQuotePacked(note) && note.renote) {
-			if (!this.withRenotes) return;
-			if (note.renote.reply) {
-				const reply = note.renote.reply;
-				// 自分のフォローしていないユーザーの visibility: followers な投稿への返信のリノートは弾く
-				if (!this.isNoteVisibleToMe(reply)) return;
-			}
-		}
+		const { accessible, silence } = await this.checkNoteVisibility(note);
+		if (!accessible || silence) return;
+		if (!this.withRenotes && isPackedPureRenote(note)) return;
+		if (!this.withReplies && note.replyId != null) return;
 
 		const clonedNote = await this.rePackNote(note);
 		this.send('note', clonedNote);
diff --git a/packages/backend/src/server/api/stream/channels/local-timeline.ts b/packages/backend/src/server/api/stream/channels/local-timeline.ts
index c6c04d356f..9d76419c6b 100644
--- a/packages/backend/src/server/api/stream/channels/local-timeline.ts
+++ b/packages/backend/src/server/api/stream/channels/local-timeline.ts
@@ -9,7 +9,7 @@ import { MetaService } from '@/core/MetaService.js';
 import { NoteEntityService } from '@/core/entities/NoteEntityService.js';
 import { bindThis } from '@/decorators.js';
 import { RoleService } from '@/core/RoleService.js';
-import { isQuotePacked, isRenotePacked } from '@/misc/is-renote.js';
+import { isPackedPureRenote } from '@/misc/is-renote.js';
 import type { JsonObject } from '@/misc/json-value.js';
 import Channel, { type MiChannelService } from '../channel.js';
 
@@ -50,8 +50,6 @@ class LocalTimelineChannel extends Channel {
 
 	@bindThis
 	private async onNote(note: Packed<'Note'>) {
-		const isMe = this.user?.id === note.userId;
-
 		if (this.withFiles && (note.fileIds == null || note.fileIds.length === 0)) return;
 		if (!this.withBots && note.user.isBot) return;
 
@@ -59,28 +57,10 @@ class LocalTimelineChannel extends Channel {
 		if (note.visibility !== 'public') return;
 		if (note.channelId != null) return;
 
-		if (this.isNoteMutedOrBlocked(note)) return;
-		if (!this.isNoteVisibleToMe(note)) return;
-
-		// 関係ない返信は除外
-		if (note.reply) {
-			const reply = note.reply;
-			// 自分のフォローしていないユーザーの visibility: followers な投稿への返信は弾く
-			if (!this.isNoteVisibleToMe(reply)) return;
-			if (!this.following.get(note.userId)?.withReplies) {
-				// 「チャンネル接続主への返信」でもなければ、「チャンネル接続主が行った返信」でもなければ、「投稿者の投稿者自身への返信」でもない場合
-				if (reply.userId !== this.user?.id && !isMe && reply.userId !== note.userId) return;
-			}
-		}
-
-		if (isRenotePacked(note) && !isQuotePacked(note) && note.renote) {
-			if (!this.withRenotes) return;
-			if (note.renote.reply) {
-				const reply = note.renote.reply;
-				// 自分のフォローしていないユーザーの visibility: followers な投稿への返信のリノートは弾く
-				if (!this.isNoteVisibleToMe(reply)) return;
-			}
-		}
+		const { accessible, silence } = await this.checkNoteVisibility(note);
+		if (!accessible || silence) return;
+		if (!this.withRenotes && isPackedPureRenote(note)) return;
+		if (!this.withReplies && note.replyId != null) return;
 
 		const clonedNote = await this.rePackNote(note);
 		this.send('note', clonedNote);
diff --git a/packages/backend/src/server/api/stream/channels/main.ts b/packages/backend/src/server/api/stream/channels/main.ts
index 193907504a..30f18053f2 100644
--- a/packages/backend/src/server/api/stream/channels/main.ts
+++ b/packages/backend/src/server/api/stream/channels/main.ts
@@ -35,24 +35,19 @@ class MainChannel extends Channel {
 					if (isUserFromMutedInstance(data.body, this.userMutedInstances)) return;
 					if (data.body.userId && this.userIdsWhoMeMuting.has(data.body.userId)) return;
 
-					if (data.body.note && data.body.note.isHidden) {
-						if (this.isNoteMutedOrBlocked(data.body.note)) return;
-						if (!this.isNoteVisibleToMe(data.body.id)) return;
-						const note = await this.noteEntityService.pack(data.body.note.id, this.user, {
-							detail: true,
-						});
-						data.body.note = note;
+					if (data.body.note) {
+						const { accessible, silence } = await this.checkNoteVisibility(data.body.note, { includeReplies: true });
+						if (!accessible || silence) return;
+
+						data.body.note = await this.rePackNote(data.body.note);
 					}
 					break;
 				}
 				case 'mention': {
-					if (this.isNoteMutedOrBlocked(data.body)) return;
-					if (data.body.isHidden) {
-						const note = await this.noteEntityService.pack(data.body.id, this.user, {
-							detail: true,
-						});
-						data.body = note;
-					}
+					const { accessible, silence } = await this.checkNoteVisibility(data.body, { includeReplies: true });
+					if (!accessible || silence) return;
+
+					data.body = await this.rePackNote(data.body);
 					break;
 				}
 			}
diff --git a/packages/backend/src/server/api/stream/channels/role-timeline.ts b/packages/backend/src/server/api/stream/channels/role-timeline.ts
index 2a8d4f7ffd..9c86734285 100644
--- a/packages/backend/src/server/api/stream/channels/role-timeline.ts
+++ b/packages/backend/src/server/api/stream/channels/role-timeline.ts
@@ -9,7 +9,7 @@ import { bindThis } from '@/decorators.js';
 import { RoleService } from '@/core/RoleService.js';
 import type { GlobalEvents } from '@/core/GlobalEventService.js';
 import type { JsonObject } from '@/misc/json-value.js';
-import { isQuotePacked, isRenotePacked } from '@/misc/is-renote.js';
+import { isPackedPureRenote, isQuotePacked, isRenotePacked } from '@/misc/is-renote.js';
 import Channel, { type MiChannelService } from '../channel.js';
 
 class RoleTimelineChannel extends Channel {
@@ -49,26 +49,8 @@ class RoleTimelineChannel extends Channel {
 			}
 			if (note.visibility !== 'public') return;
 
-			if (this.isNoteMutedOrBlocked(note)) return;
-
-			if (note.reply) {
-				const reply = note.reply;
-				// 自分のフォローしていないユーザーの visibility: followers な投稿への返信は弾く
-				if (!this.isNoteVisibleToMe(reply)) return;
-				if (!this.following.get(note.userId)?.withReplies) {
-					// 「チャンネル接続主への返信」でもなければ、「チャンネル接続主が行った返信」でもなければ、「投稿者の投稿者自身への返信」でもない場合
-					if (reply.userId !== this.user?.id && !isMe && reply.userId !== note.userId) return;
-				}
-			}
-
-			// 純粋なリノート（引用リノートでないリノート）の場合
-			if (isRenotePacked(note) && !isQuotePacked(note) && note.renote) {
-				if (note.renote.reply) {
-					const reply = note.renote.reply;
-					// 自分のフォローしていないユーザーの visibility: followers な投稿への返信のリノートは弾く
-					if (!this.isNoteVisibleToMe(reply)) return;
-				}
-			}
+			const { accessible, silence } = await this.checkNoteVisibility(note);
+			if (!accessible || silence) return;
 
 			const clonedNote = await this.rePackNote(note);
 			this.send('note', clonedNote);
diff --git a/packages/backend/src/server/api/stream/channels/user-list.ts b/packages/backend/src/server/api/stream/channels/user-list.ts
index 98bcbd11ba..18dbd40902 100644
--- a/packages/backend/src/server/api/stream/channels/user-list.ts
+++ b/packages/backend/src/server/api/stream/channels/user-list.ts
@@ -9,7 +9,7 @@ import type { Packed } from '@/misc/json-schema.js';
 import { NoteEntityService } from '@/core/entities/NoteEntityService.js';
 import { DI } from '@/di-symbols.js';
 import { bindThis } from '@/decorators.js';
-import { isRenotePacked, isQuotePacked } from '@/misc/is-renote.js';
+import { isPackedPureRenote } from '@/misc/is-renote.js';
 import type { JsonObject } from '@/misc/json-value.js';
 import Channel, { type MiChannelService } from '../channel.js';
 
@@ -82,8 +82,6 @@ class UserListChannel extends Channel {
 
 	@bindThis
 	private async onNote(note: Packed<'Note'>) {
-		const isMe = this.user?.id === note.userId;
-
 		// チャンネル投稿は無視する
 		if (note.channelId) return;
 
@@ -91,28 +89,9 @@ class UserListChannel extends Channel {
 
 		if (!Object.hasOwn(this.membershipsMap, note.userId)) return;
 
-		if (this.isNoteMutedOrBlocked(note)) return;
-		if (!this.isNoteVisibleToMe(note)) return;
-
-		if (note.reply) {
-			const reply = note.reply;
-			// 自分のフォローしていないユーザーの visibility: followers な投稿への返信は弾く
-			if (!this.isNoteVisibleToMe(reply)) return;
-			if (!this.following.get(note.userId)?.withReplies) {
-				// 「チャンネル接続主への返信」でもなければ、「チャンネル接続主が行った返信」でもなければ、「投稿者の投稿者自身への返信」でもない場合
-				if (reply.userId !== this.user!.id && !isMe && reply.userId !== note.userId) return;
-			}
-		}
-
-		// 純粋なリノート（引用リノートでないリノート）の場合
-		if (isRenotePacked(note) && !isQuotePacked(note) && note.renote) {
-			if (!this.withRenotes) return;
-			if (note.renote.reply) {
-				const reply = note.renote.reply;
-				// 自分のフォローしていないユーザーの visibility: followers な投稿への返信のリノートは弾く
-				if (!this.isNoteVisibleToMe(reply)) return;
-			}
-		}
+		const { accessible, silence } = await this.checkNoteVisibility(note, { includeReplies: true });
+		if (!accessible || silence) return;
+		if (!this.withRenotes && isPackedPureRenote(note)) return;
 
 		const clonedNote = await this.rePackNote(note);
 		this.send('note', clonedNote);
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 08d5ef8445..faf9725c3b 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1508,8 +1508,8 @@ packages:
   '@apidevtools/swagger-methods@3.0.2':
     resolution: {integrity: sha512-QAkD5kK2b1WfjDS/UQn/qQkbwF31uqRjPTrsCs5ZG9BQGAkjwvqGFjjPqAuzac/IYzpPtRzjCP1WrTuAIjMrXg==}
 
-  '@asamuzakjp/css-color@3.1.1':
-    resolution: {integrity: sha512-hpRD68SV2OMcZCsrbdkccTw5FXjNDLo5OuqSHyHZfwweGsDWZwDJ2+gONyNAbazZclobMirACLw0lk8WVxIqxA==}
+  '@asamuzakjp/css-color@3.2.0':
+    resolution: {integrity: sha512-K1A6z8tS3XsmCMM86xoWdn7Fkdn9m6RSVtocUrJYIwZnFVkng/PvkEoWtOWmP+Scc6saYWHWZYbndEEXxl24jw==}
 
   '@aws-crypto/crc32@5.2.0':
     resolution: {integrity: sha512-nLbCWqQNgUiwwtFsen1AdzAtvuLRsQS8rYgMuxCrdKf9kOssamGLuPwyTY9wyYblNr9+1XM8v6zoDTPPSIeANg==}
@@ -1965,28 +1965,28 @@ packages:
     resolution: {integrity: sha512-JqWH1vsgdGcw2RR6VliXXdA0/59LttzlU8UlRT/iUUsEeWfYq8I+K0yhihEUTTHLRm1EXvpsCx3083EU15ecsA==}
     engines: {node: '>=18'}
 
-  '@csstools/css-calc@2.1.2':
-    resolution: {integrity: sha512-TklMyb3uBB28b5uQdxjReG4L80NxAqgrECqLZFQbyLekwwlcDDS8r3f07DKqeo8C4926Br0gf/ZDe17Zv4wIuw==}
+  '@csstools/css-calc@2.1.4':
+    resolution: {integrity: sha512-3N8oaj+0juUw/1H3YwmDDJXCgTB1gKU6Hc/bB502u9zR0q2vd786XJH9QfrKIEgFlZmhZiq6epXl4rHqhzsIgQ==}
     engines: {node: '>=18'}
     peerDependencies:
-      '@csstools/css-parser-algorithms': ^3.0.4
-      '@csstools/css-tokenizer': ^3.0.3
+      '@csstools/css-parser-algorithms': ^3.0.5
+      '@csstools/css-tokenizer': ^3.0.4
 
-  '@csstools/css-color-parser@3.0.8':
-    resolution: {integrity: sha512-pdwotQjCCnRPuNi06jFuP68cykU1f3ZWExLe/8MQ1LOs8Xq+fTkYgd+2V8mWUWMrOn9iS2HftPVaMZDaXzGbhQ==}
+  '@csstools/css-color-parser@3.0.10':
+    resolution: {integrity: sha512-TiJ5Ajr6WRd1r8HSiwJvZBiJOqtH86aHpUjq5aEKWHiII2Qfjqd/HCWKPOW8EP4vcspXbHnXrwIDlu5savQipg==}
     engines: {node: '>=18'}
     peerDependencies:
-      '@csstools/css-parser-algorithms': ^3.0.4
-      '@csstools/css-tokenizer': ^3.0.3
+      '@csstools/css-parser-algorithms': ^3.0.5
+      '@csstools/css-tokenizer': ^3.0.4
 
-  '@csstools/css-parser-algorithms@3.0.4':
-    resolution: {integrity: sha512-Up7rBoV77rv29d3uKHUIVubz1BTcgyUK72IvCQAbfbMv584xHcGKCKbWh7i8hPrRJ7qU4Y8IO3IY9m+iTB7P3A==}
+  '@csstools/css-parser-algorithms@3.0.5':
+    resolution: {integrity: sha512-DaDeUkXZKjdGhgYaHNJTV9pV7Y9B3b644jCLs9Upc3VeNGg6LWARAT6O+Q+/COo+2gg/bM5rhpMAtf70WqfBdQ==}
     engines: {node: '>=18'}
     peerDependencies:
-      '@csstools/css-tokenizer': ^3.0.3
+      '@csstools/css-tokenizer': ^3.0.4
 
-  '@csstools/css-tokenizer@3.0.3':
-    resolution: {integrity: sha512-UJnjoFsmxfKUdNYdWgOB0mWUypuLvAfQPH1+pyvRJs6euowbFkFC6P13w1l8mJyi3vxYMxc9kld5jZEGRQs6bw==}
+  '@csstools/css-tokenizer@3.0.4':
+    resolution: {integrity: sha512-Vd/9EVDiu6PPJt9yAh6roZP6El1xHrdvIVGjyBsHR0RYwNHgL7FJPyIIW4fANJNG6FtyZfvlRPpFI4ZM/lubvw==}
     engines: {node: '>=18'}
 
   '@cypress/request@3.0.8':
@@ -2168,6 +2168,12 @@ packages:
     peerDependencies:
       eslint: ^6.0.0 || ^7.0.0 || >=8.0.0
 
+  '@eslint-community/eslint-utils@4.7.0':
+    resolution: {integrity: sha512-dyybb3AcajC7uha6CvhdVRJqaKyn7w2YKqKyAN37NKYgZT36w+iRb0Dymmc5qEJ549c/S31cMMSFd75bteCpCw==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    peerDependencies:
+      eslint: ^6.0.0 || ^7.0.0 || >=8.0.0
+
   '@eslint-community/regexpp@4.12.1':
     resolution: {integrity: sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==}
     engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0}
@@ -3099,6 +3105,7 @@ packages:
 
   '@readme/json-schema-ref-parser@1.2.0':
     resolution: {integrity: sha512-Bt3QVovFSua4QmHa65EHUmh2xS0XJ3rgTEUPH998f4OW4VVJke3BuS16f+kM0ZLOGdvIrzrPRqwihuv5BAjtrA==}
+    deprecated: This package is no longer maintained. Please use `@apidevtools/json-schema-ref-parser` instead.
 
   '@readme/openapi-parser@2.7.0':
     resolution: {integrity: sha512-P8WSr8WTOxilnT89tcCRKWYsG/II4sAwt1a/DIWub8xTtkrG9cCBBy/IUcvc5X8oGWN82MwcTA3uEkDrXZd/7A==}
@@ -4221,8 +4228,8 @@ packages:
   '@types/pg@8.6.1':
     resolution: {integrity: sha512-1Kc4oAGzAl7uqUStZCDvaLFqZrW9qWSjXOmBfdgyBP5La7Us6Mg4GBvRlSoaZMhQF/zSj1C8CtKMBkoiT8eL8w==}
 
-  '@types/prop-types@15.7.14':
-    resolution: {integrity: sha512-gNMvNH49DJ7OJYv+KAKn0Xp45p8PLl6zo2YnvDIbTd4J6MER2BmWN49TG7n9LvkyihINxeKW8+3bfS2yDC9dzQ==}
+  '@types/prop-types@15.7.15':
+    resolution: {integrity: sha512-F6bEyamV9jKGAFBEmlQnesRPGOQqS2+Uwi0Em15xenOxHaf2hv6L8YCVn3rPdPJOiJfPiCnLIRyvwVaqMY3MIw==}
 
   '@types/proxy-addr@2.0.3':
     resolution: {integrity: sha512-TgAHHO4tNG3HgLTUhB+hM4iwW6JUNeQHCLnF1DjaDA9c69PN+IasoFu2MYDhubFc+ZIw5c5t9DMtjvrD6R3Egg==}
@@ -4266,8 +4273,8 @@ packages:
   '@types/sanitize-html@2.15.0':
     resolution: {integrity: sha512-71Z6PbYsVKfp4i6Jvr37s5ql6if1Q/iJQT80NbaSi7uGaG8CqBMXP0pk/EsURAOuGdk5IJCd/vnzKrR7S3Txsw==}
 
-  '@types/scheduler@0.23.0':
-    resolution: {integrity: sha512-YIoDCTH3Af6XM5VuwGG/QL/CJqga1Zm3NkU3HZ4ZHK2fRMPYP1VczsTUqtsf43PH/iJNVlPHAo2oWX7BSdB2Hw==}
+  '@types/scheduler@0.26.0':
+    resolution: {integrity: sha512-WFHp9YUJQ6CKshqoC37iOlHnQSmxNc795UhB26CyBBttrN9svdIrUjl/NjnNmfcwtncN0h/0PPAFWv9ovP8mLA==}
 
   '@types/seedrandom@3.0.8':
     resolution: {integrity: sha512-TY1eezMU2zH2ozQoAFAQFOPpvP15g+ZgSfTZt31AUUH/Rxtnz3H+A/Sv1Snw2/amp//omibc+AEkTaA8KUeOLQ==}
@@ -4365,10 +4372,26 @@ packages:
       eslint: ^8.57.0 || ^9.0.0
       typescript: '>=4.8.4 <5.9.0'
 
+  '@typescript-eslint/project-service@8.39.1':
+    resolution: {integrity: sha512-8fZxek3ONTwBu9ptw5nCKqZOSkXshZB7uAxuFF0J/wTMkKydjXCzqqga7MlFMpHi9DoG4BadhmTkITBcg8Aybw==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+    peerDependencies:
+      typescript: '>=4.8.4 <6.0.0'
+
   '@typescript-eslint/scope-manager@8.31.0':
     resolution: {integrity: sha512-knO8UyF78Nt8O/B64i7TlGXod69ko7z6vJD9uhSlm0qkAbGeRUSudcm0+K/4CrRjrpiHfBCjMWlc08Vav1xwcw==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
+  '@typescript-eslint/scope-manager@8.39.1':
+    resolution: {integrity: sha512-RkBKGBrjgskFGWuyUGz/EtD8AF/GW49S21J8dvMzpJitOF1slLEbbHnNEtAHtnDAnx8qDEdRrULRnWVx27wGBw==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+
+  '@typescript-eslint/tsconfig-utils@8.39.1':
+    resolution: {integrity: sha512-ePUPGVtTMR8XMU2Hee8kD0Pu4NDE1CN9Q1sxGSGd/mbOtGZDM7pnhXNJnzW63zk/q+Z54zVzj44HtwXln5CvHA==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+    peerDependencies:
+      typescript: '>=4.8.4 <6.0.0'
+
   '@typescript-eslint/type-utils@8.31.0':
     resolution: {integrity: sha512-DJ1N1GdjI7IS7uRlzJuEDCgDQix3ZVYVtgeWEyhyn4iaoitpMBX6Ndd488mXSx0xah/cONAkEaYyylDyAeHMHg==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
@@ -4380,12 +4403,22 @@ packages:
     resolution: {integrity: sha512-Ch8oSjVyYyJxPQk8pMiP2FFGYatqXQfQIaMp+TpuuLlDachRWpUAeEu1u9B/v/8LToehUIWyiKcA/w5hUFRKuQ==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
+  '@typescript-eslint/types@8.39.1':
+    resolution: {integrity: sha512-7sPDKQQp+S11laqTrhHqeAbsCfMkwJMrV7oTDvtDds4mEofJYir414bYKUEb8YPUm9QL3U+8f6L6YExSoAGdQw==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+
   '@typescript-eslint/typescript-estree@8.31.0':
     resolution: {integrity: sha512-xLmgn4Yl46xi6aDSZ9KkyfhhtnYI15/CvHbpOy/eR5NWhK/BK8wc709KKwhAR0m4ZKRP7h07bm4BWUYOCuRpQQ==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
       typescript: '>=4.8.4 <5.9.0'
 
+  '@typescript-eslint/typescript-estree@8.39.1':
+    resolution: {integrity: sha512-EKkpcPuIux48dddVDXyQBlKdeTPMmALqBUbEk38McWv0qVEZwOpVJBi7ugK5qVNgeuYjGNQxrrnoM/5+TI/BPw==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+    peerDependencies:
+      typescript: '>=4.8.4 <6.0.0'
+
   '@typescript-eslint/utils@8.31.0':
     resolution: {integrity: sha512-qi6uPLt9cjTFxAb1zGNgTob4x9ur7xC6mHQJ8GwEzGMGE9tYniublmJaowOJ9V2jUzxrltTPfdG2nKlWsq0+Ww==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
@@ -4393,10 +4426,21 @@ packages:
       eslint: ^8.57.0 || ^9.0.0
       typescript: '>=4.8.4 <5.9.0'
 
+  '@typescript-eslint/utils@8.39.1':
+    resolution: {integrity: sha512-VF5tZ2XnUSTuiqZFXCZfZs1cgkdd3O/sSYmdo2EpSyDlC86UM/8YytTmKnehOW3TGAlivqTDT6bS87B/GQ/jyg==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+    peerDependencies:
+      eslint: ^8.57.0 || ^9.0.0
+      typescript: '>=4.8.4 <6.0.0'
+
   '@typescript-eslint/visitor-keys@8.31.0':
     resolution: {integrity: sha512-QcGHmlRHWOl93o64ZUMNewCdwKGU6WItOU52H0djgNmn1EOrhVudrDzXz4OycCRSCPwFCDrE2iIt5vmuUdHxuQ==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
+  '@typescript-eslint/visitor-keys@8.39.1':
+    resolution: {integrity: sha512-W8FQi6kEh2e8zVhQ0eeRnxdvIoOkAp/CPAahcNio6nO9dsIwb9b34z90KOlheoyuVf6LSOEdjlkxSkapNEc+4A==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+
   '@ungap/structured-clone@1.2.0':
     resolution: {integrity: sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==}
 
@@ -4649,6 +4693,11 @@ packages:
     engines: {node: '>=0.4.0'}
     hasBin: true
 
+  acorn@8.15.0:
+    resolution: {integrity: sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==}
+    engines: {node: '>=0.4.0'}
+    hasBin: true
+
   agent-base@7.1.0:
     resolution: {integrity: sha512-o/zjMZRhJxny7OyEF+Op8X+efiELC7k7yOjMzgfzVqOzXqkBkWI79YoTdOtsuWd5BWhAGAuOY/Xa6xpiaWXiNg==}
     engines: {node: '>= 14'}
@@ -5538,8 +5587,8 @@ packages:
     resolution: {integrity: sha512-0LrrStPOdJj+SPCCrGhzryycLjwcgUSHBtxNA8aIDxf0GLsRh1cKYhB00Gd1lDOS4yGH69+SNn13+TWbVHETFQ==}
     engines: {node: ^10 || ^12.20.0 || ^14.13.0 || >=15.0.0, npm: '>=7.0.0'}
 
-  cssstyle@4.3.0:
-    resolution: {integrity: sha512-6r0NiY0xizYqfBvWp1G7WXJ06/bZyrk7Dc6PHql82C/pKGUTKu4yAX4Y8JPamb1ob9nBKuxWzCGTRuGwU3yxJQ==}
+  cssstyle@4.6.0:
+    resolution: {integrity: sha512-2z+rWdzbbSZv6/rhtvzvqeZQHrBaqgogqt85sqFNbabZOuFbCVFb8kPeEtZjiKkbrm395irpNKiYeFeLiQnFPg==}
     engines: {node: '>=18'}
 
   csstype@3.1.3:
@@ -5630,6 +5679,15 @@ packages:
       supports-color:
         optional: true
 
+  debug@4.4.1:
+    resolution: {integrity: sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==}
+    engines: {node: '>=6.0'}
+    peerDependencies:
+      supports-color: '*'
+    peerDependenciesMeta:
+      supports-color:
+        optional: true
+
   decamelize-keys@1.1.1:
     resolution: {integrity: sha512-WiPxgEirIV0/eIOMcnFBA3/IJZAZqKnwAwWyvvdi4lsr1WCN22nhdf/3db3DoZcUjTV2SqfzIwNyp6y2xs3nmg==}
     engines: {node: '>=0.10.0'}
@@ -5638,8 +5696,8 @@ packages:
     resolution: {integrity: sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==}
     engines: {node: '>=0.10.0'}
 
-  decimal.js@10.5.0:
-    resolution: {integrity: sha512-8vDa8Qxvr/+d94hSh5P3IJwI5t8/c0KsMp+g8bNw9cY2icONa5aPfvKeieW1WlG0WQYwwhJ7mjui2xtiePQSXw==}
+  decimal.js@10.6.0:
+    resolution: {integrity: sha512-YpgQiITW3JXGntzdUmyUR1V812Hn8T1YVXhCu+wO3OpS4eU9l4YdD3qjyiKdV6mvV29zapkMeD390UVEf2lkUg==}
 
   decode-bmp@0.2.1:
     resolution: {integrity: sha512-NiOaGe+GN0KJqi2STf24hfMkFitDUaIoUU3eKvP/wAbLe8o6FuW5n/x7MHPR0HKvBokp6MQY/j7w8lewEeVCIA==}
@@ -6056,6 +6114,10 @@ packages:
     resolution: {integrity: sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
+  eslint-visitor-keys@4.2.1:
+    resolution: {integrity: sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+
   eslint@9.25.1:
     resolution: {integrity: sha512-E6Mtz9oGQWDCpV12319d59n4tx9zOTXSTmc8BLVxBx+G/0RdM5MvEEJLU9c0+aleoePYYgVTOsRblx433qmhWQ==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
@@ -6070,6 +6132,10 @@ packages:
     resolution: {integrity: sha512-0QYC8b24HWY8zjRnDTL6RiHfDbAWn63qb4LMj1Z4b076A4une81+z03Kg7l7mn/48PUTqoLptSXez8oknU8Clg==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
+  espree@10.4.0:
+    resolution: {integrity: sha512-j6PAQ2uUr79PZhBjP5C5fhl8e39FmRnOjsD5lGnWrFU8i2G776tBK7+nP8KuQUTTyAZUwfQqXAgrVH5MbH9CYQ==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+
   esprima@4.0.1:
     resolution: {integrity: sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==}
     engines: {node: '>=4'}
@@ -6354,6 +6420,7 @@ packages:
   fluent-ffmpeg@2.1.3:
     resolution: {integrity: sha512-Be3narBNt2s6bsaqP6Jzq91heDgOEaDCJAXcE3qcma/EJBSy5FB4cvO31XBInuAuKBx8Kptf8dkhjK0IOru39Q==}
     engines: {node: '>=18'}
+    deprecated: Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.
 
   follow-redirects@1.15.9:
     resolution: {integrity: sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==}
@@ -6538,10 +6605,12 @@ packages:
 
   glob@7.2.3:
     resolution: {integrity: sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==}
+    deprecated: Glob versions prior to v9 are no longer supported
 
   glob@8.1.0:
     resolution: {integrity: sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==}
     engines: {node: '>=12'}
+    deprecated: Glob versions prior to v9 are no longer supported
 
   global-dirs@3.0.1:
     resolution: {integrity: sha512-NBcGGFbBA9s1VzD41QXDG+3++t9Mn5t1FpLdhESY6oKY4gYTFpX4wO3sqGUa0Srjtbfj3szX0RnemmrVRUdULA==}
@@ -6827,6 +6896,7 @@ packages:
 
   inflight@1.0.6:
     resolution: {integrity: sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==}
+    deprecated: This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.
 
   inherits@2.0.4:
     resolution: {integrity: sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==}
@@ -7494,6 +7564,7 @@ packages:
 
   lodash.get@4.4.2:
     resolution: {integrity: sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==}
+    deprecated: This package is deprecated. Use the optional chaining (?.) operator instead.
 
   lodash.isarguments@3.1.0:
     resolution: {integrity: sha512-chi4NHZlZqZD18a0imDHnZPrDeBbTtVN7GXMwuGdRH9qotxAjYs3aVLKc7zNOG9eddR5Ksd8rvFEBc9SsggPpg==}
@@ -7975,6 +8046,7 @@ packages:
   multer@1.4.5-lts.2:
     resolution: {integrity: sha512-VzGiVigcG9zUAoCNU+xShztrlr1auZOlurXynNvO9GiWD1/mTBbUljOKY+qMeazBqXgRnjzeEgJI/wyjJUHg9A==}
     engines: {node: '>= 6.0.0'}
+    deprecated: Multer 1.x is impacted by a number of vulnerabilities, which have been patched in 2.x. You should upgrade to the latest 2.x version.
 
   mute-stream@2.0.0:
     resolution: {integrity: sha512-WWdIxpyjEn+FhQJQQv9aQAYlHoNVdzIzUySNV1gHUPDSdZJ3yZn7pAAbQcV7B56Mvu881q9FZV+0Vx2xC44VWA==}
@@ -8055,6 +8127,7 @@ packages:
   node-domexception@1.0.0:
     resolution: {integrity: sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==}
     engines: {node: '>=10.5.0'}
+    deprecated: Use your platform's native DOMException instead
 
   node-fetch@2.7.0:
     resolution: {integrity: sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==}
@@ -8156,8 +8229,8 @@ packages:
   nth-check@2.1.1:
     resolution: {integrity: sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==}
 
-  nwsapi@2.2.19:
-    resolution: {integrity: sha512-94bcyI3RsqiZufXjkr3ltkI86iEl+I7uiHVDtcq9wJUTwYQJ5odHDeSzkkrRzi80jJ8MaeZgqKjH1bAWAFw9bA==}
+  nwsapi@2.2.21:
+    resolution: {integrity: sha512-o6nIY3qwiSXl7/LuOU0Dmuctd34Yay0yeuZRLFmDPrrdHpXKFndPj3hM+YEPVHYC5fx2otBx4Ilc/gyYSAUaIA==}
 
   oauth@0.10.2:
     resolution: {integrity: sha512-JtFnB+8nxDEXgNyniwz573xxbKSOu3R8D40xQKqcjwJ2CDkYqUDI53o6IuzDJBx60Z8VKCm271+t8iFjakrl8Q==}
@@ -8466,6 +8539,10 @@ packages:
     resolution: {integrity: sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==}
     engines: {node: '>=12'}
 
+  picomatch@4.0.3:
+    resolution: {integrity: sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==}
+    engines: {node: '>=12'}
+
   pid-port@1.0.2:
     resolution: {integrity: sha512-Khqp07zX8IJpmIg56bHrLxS3M0iSL4cq6wnMq8YE7r/hSw3Kn4QxYS6QJg8Bs22Z7CSVj7eSsxFuigYVIFWmjg==}
     engines: {node: '>=18'}
@@ -9745,10 +9822,12 @@ packages:
   superagent@9.0.2:
     resolution: {integrity: sha512-xuW7dzkUpcJq7QnhOsnNUgtYp3xRwpt2F7abdRYIpCsAt0hhUqia0EdxyXZQQpNmGtsCzYHryaKSV3q3GJnq7w==}
     engines: {node: '>=14.18.0'}
+    deprecated: Please upgrade to superagent v10.2.2+, see release notes at https://github.com/forwardemail/superagent/releases/tag/v10.2.2 - maintenance is supported by Forward Email @ https://forwardemail.net
 
   supertest@7.1.0:
     resolution: {integrity: sha512-5QeSO8hSrKghtcWEoPiO036fxH0Ii2wVQfFZSP0oqQhmjk8bOLhDFXr4JrvaFmPuEWUoq4znY3uSi8UzLKxGqw==}
     engines: {node: '>=14.18.0'}
+    deprecated: Please upgrade to supertest v7.1.3+, see release notes at https://github.com/forwardemail/supertest/releases/tag/v7.1.3 - maintenance is supported by Forward Email @ https://forwardemail.net
 
   supports-color@5.5.0:
     resolution: {integrity: sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==}
@@ -9880,10 +9959,17 @@ packages:
   tldts-core@6.1.63:
     resolution: {integrity: sha512-H1XCt54xY+QPbwhTgmxLkepX0MVHu3USfMmejiCOdkMbRcP22Pn2FVF127r/GWXVDmXTRezyF3Ckvhn4Fs6j7Q==}
 
+  tldts-core@6.1.86:
+    resolution: {integrity: sha512-Je6p7pkk+KMzMv2XXKmAE3McmolOQFdxkKw0R8EYNr7sELW46JqnNeTX8ybPiQgvg1ymCoF8LXs5fzFaZvJPTA==}
+
   tldts@6.1.63:
     resolution: {integrity: sha512-YWwhsjyn9sB/1rOkSRYxvkN/wl5LFM1QDv6F2pVR+pb/jFne4EOBxHfkKVWvDIBEAw9iGOwwubHtQTm0WRT5sQ==}
     hasBin: true
 
+  tldts@6.1.86:
+    resolution: {integrity: sha512-WMi/OQ2axVTf/ykqCQgXiIct+mSQDFdH2fkwhPwgEwvJ1kSzZRiinb0zF2Xb8u4+OqPChmyI6MEu4EezNJz+FQ==}
+    hasBin: true
+
   tmp@0.2.3:
     resolution: {integrity: sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w==}
     engines: {node: '>=14.14'}
@@ -9936,8 +10022,8 @@ packages:
   tr46@0.0.3:
     resolution: {integrity: sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==}
 
-  tr46@5.1.0:
-    resolution: {integrity: sha512-IUWnUK7ADYR5Sl1fZlO1INDUhVhatWl7BtJWsIhwJ0UAK7ilzzIa8uIqOO/aYVWHZPJkKbEL+362wrzoeRF7bw==}
+  tr46@5.1.1:
+    resolution: {integrity: sha512-hdF5ZgjTqgAntKkklYw0R03MG2x/bSzTtkxmIRw/sTNV8YXsCJ1tfLAX23lhxhHJlEf3CRCOCGGWw3vI3GaSPw==}
     engines: {node: '>=18'}
 
   tree-kill@1.2.2:
@@ -10456,6 +10542,9 @@ packages:
   vue-component-type-helpers@2.2.10:
     resolution: {integrity: sha512-iDUO7uQK+Sab2tYuiP9D1oLujCWlhHELHMgV/cB13cuGbG4qwkLHvtfWb6FzvxrIOPDnU0oHsz2MlQjhYDeaHA==}
 
+  vue-component-type-helpers@3.0.5:
+    resolution: {integrity: sha512-uoNZaJ+a1/zppa/Vgmi8zIOP2PHXDN2rT8NyF+zQRK6ZG94lNB9prcV0GdLJbY9i9lrD47JOVIH92SaiA7oJ1A==}
+
   vue-demi@0.14.7:
     resolution: {integrity: sha512-EOG8KXDQNwkJILkx/gPcoL/7vH+hORoBaKgGe+6W7VFMvCYJfmF2dGbvgDroVnI8LU7/kTu8mbjRZGBU1z9NTA==}
     engines: {node: '>=12'}
@@ -10654,6 +10743,18 @@ packages:
       utf-8-validate:
         optional: true
 
+  ws@8.18.3:
+    resolution: {integrity: sha512-PEIGCY5tSlUt50cqyMXfCzX+oOPqN0vuGqWzbcJ2xvnkzkq46oOpz7dQaTDBdfICb4N14+GARUDw2XV2N4tvzg==}
+    engines: {node: '>=10.0.0'}
+    peerDependencies:
+      bufferutil: ^4.0.1
+      utf-8-validate: '>=5.0.2'
+    peerDependenciesMeta:
+      bufferutil:
+        optional: true
+      utf-8-validate:
+        optional: true
+
   xev@3.0.2:
     resolution: {integrity: sha512-8kxuH95iMXzHZj+fwqfA4UrPcYOy6bGIgfWzo9Ji23JoEc30ge/Z++Ubkiuy8c0+M64nXmmxrmJ7C8wnuBhluw==}
 
@@ -10763,12 +10864,12 @@ snapshots:
 
   '@apidevtools/swagger-methods@3.0.2': {}
 
-  '@asamuzakjp/css-color@3.1.1':
+  '@asamuzakjp/css-color@3.2.0':
     dependencies:
-      '@csstools/css-calc': 2.1.2(@csstools/css-parser-algorithms@3.0.4(@csstools/css-tokenizer@3.0.3))(@csstools/css-tokenizer@3.0.3)
-      '@csstools/css-color-parser': 3.0.8(@csstools/css-parser-algorithms@3.0.4(@csstools/css-tokenizer@3.0.3))(@csstools/css-tokenizer@3.0.3)
-      '@csstools/css-parser-algorithms': 3.0.4(@csstools/css-tokenizer@3.0.3)
-      '@csstools/css-tokenizer': 3.0.3
+      '@csstools/css-calc': 2.1.4(@csstools/css-parser-algorithms@3.0.5(@csstools/css-tokenizer@3.0.4))(@csstools/css-tokenizer@3.0.4)
+      '@csstools/css-color-parser': 3.0.10(@csstools/css-parser-algorithms@3.0.5(@csstools/css-tokenizer@3.0.4))(@csstools/css-tokenizer@3.0.4)
+      '@csstools/css-parser-algorithms': 3.0.5(@csstools/css-tokenizer@3.0.4)
+      '@csstools/css-tokenizer': 3.0.4
       lru-cache: 10.4.3
     optional: true
 
@@ -11268,7 +11369,7 @@ snapshots:
       '@babel/traverse': 7.24.7
       '@babel/types': 7.27.1
       convert-source-map: 2.0.0
-      debug: 4.4.0(supports-color@8.1.1)
+      debug: 4.4.0(supports-color@5.5.0)
       gensync: 1.0.0-beta.2
       json5: 2.2.3
       semver: 6.3.1
@@ -11288,7 +11389,7 @@ snapshots:
       '@babel/traverse': 7.24.7
       '@babel/types': 7.25.7
       convert-source-map: 2.0.0
-      debug: 4.4.0(supports-color@8.1.1)
+      debug: 4.4.0(supports-color@5.5.0)
       gensync: 1.0.0-beta.2
       json5: 2.2.3
       semver: 6.3.1
@@ -11521,7 +11622,7 @@ snapshots:
       '@babel/helper-split-export-declaration': 7.24.7
       '@babel/parser': 7.27.2
       '@babel/types': 7.25.7
-      debug: 4.4.0(supports-color@8.1.1)
+      debug: 4.4.0(supports-color@5.5.0)
       globals: 11.12.0
     transitivePeerDependencies:
       - supports-color
@@ -11636,26 +11737,26 @@ snapshots:
   '@csstools/color-helpers@5.0.2':
     optional: true
 
-  '@csstools/css-calc@2.1.2(@csstools/css-parser-algorithms@3.0.4(@csstools/css-tokenizer@3.0.3))(@csstools/css-tokenizer@3.0.3)':
+  '@csstools/css-calc@2.1.4(@csstools/css-parser-algorithms@3.0.5(@csstools/css-tokenizer@3.0.4))(@csstools/css-tokenizer@3.0.4)':
     dependencies:
-      '@csstools/css-parser-algorithms': 3.0.4(@csstools/css-tokenizer@3.0.3)
-      '@csstools/css-tokenizer': 3.0.3
+      '@csstools/css-parser-algorithms': 3.0.5(@csstools/css-tokenizer@3.0.4)
+      '@csstools/css-tokenizer': 3.0.4
     optional: true
 
-  '@csstools/css-color-parser@3.0.8(@csstools/css-parser-algorithms@3.0.4(@csstools/css-tokenizer@3.0.3))(@csstools/css-tokenizer@3.0.3)':
+  '@csstools/css-color-parser@3.0.10(@csstools/css-parser-algorithms@3.0.5(@csstools/css-tokenizer@3.0.4))(@csstools/css-tokenizer@3.0.4)':
     dependencies:
       '@csstools/color-helpers': 5.0.2
-      '@csstools/css-calc': 2.1.2(@csstools/css-parser-algorithms@3.0.4(@csstools/css-tokenizer@3.0.3))(@csstools/css-tokenizer@3.0.3)
-      '@csstools/css-parser-algorithms': 3.0.4(@csstools/css-tokenizer@3.0.3)
-      '@csstools/css-tokenizer': 3.0.3
+      '@csstools/css-calc': 2.1.4(@csstools/css-parser-algorithms@3.0.5(@csstools/css-tokenizer@3.0.4))(@csstools/css-tokenizer@3.0.4)
+      '@csstools/css-parser-algorithms': 3.0.5(@csstools/css-tokenizer@3.0.4)
+      '@csstools/css-tokenizer': 3.0.4
     optional: true
 
-  '@csstools/css-parser-algorithms@3.0.4(@csstools/css-tokenizer@3.0.3)':
+  '@csstools/css-parser-algorithms@3.0.5(@csstools/css-tokenizer@3.0.4)':
     dependencies:
-      '@csstools/css-tokenizer': 3.0.3
+      '@csstools/css-tokenizer': 3.0.4
     optional: true
 
-  '@csstools/css-tokenizer@3.0.3':
+  '@csstools/css-tokenizer@3.0.4':
     optional: true
 
   '@cypress/request@3.0.8':
@@ -11793,6 +11894,11 @@ snapshots:
       eslint: 9.25.1
       eslint-visitor-keys: 3.4.3
 
+  '@eslint-community/eslint-utils@4.7.0(eslint@9.25.1)':
+    dependencies:
+      eslint: 9.25.1
+      eslint-visitor-keys: 3.4.3
+
   '@eslint-community/regexpp@4.12.1': {}
 
   '@eslint/compat@1.1.1': {}
@@ -11800,7 +11906,7 @@ snapshots:
   '@eslint/config-array@0.20.0':
     dependencies:
       '@eslint/object-schema': 2.1.6
-      debug: 4.4.0(supports-color@8.1.1)
+      debug: 4.4.0(supports-color@5.5.0)
       minimatch: 3.1.2
     transitivePeerDependencies:
       - supports-color
@@ -11814,7 +11920,7 @@ snapshots:
   '@eslint/eslintrc@3.3.1':
     dependencies:
       ajv: 6.12.6
-      debug: 4.4.0(supports-color@8.1.1)
+      debug: 4.4.0(supports-color@5.5.0)
       espree: 10.3.0
       globals: 14.0.0
       ignore: 5.3.2
@@ -13905,16 +14011,16 @@ snapshots:
       ts-dedent: 2.2.0
       type-fest: 2.19.0
       vue: 3.5.14(typescript@5.8.3)
-      vue-component-type-helpers: 2.2.10
+      vue-component-type-helpers: 3.0.5
 
   '@stylistic/eslint-plugin@4.2.0(eslint@9.25.1)(typescript@5.8.3)':
     dependencies:
-      '@typescript-eslint/utils': 8.31.0(eslint@9.25.1)(typescript@5.8.3)
+      '@typescript-eslint/utils': 8.39.1(eslint@9.25.1)(typescript@5.8.3)
       eslint: 9.25.1
-      eslint-visitor-keys: 4.2.0
-      espree: 10.3.0
+      eslint-visitor-keys: 4.2.1
+      espree: 10.4.0
       estraverse: 5.3.0
-      picomatch: 4.0.2
+      picomatch: 4.0.3
     transitivePeerDependencies:
       - supports-color
       - typescript
@@ -14065,7 +14171,7 @@ snapshots:
 
   '@tokenizer/inflate@0.2.7':
     dependencies:
-      debug: 4.4.0(supports-color@8.1.1)
+      debug: 4.4.0(supports-color@5.5.0)
       fflate: 0.8.2
       token-types: 6.0.0
     transitivePeerDependencies:
@@ -14306,7 +14412,7 @@ snapshots:
       pg-protocol: 1.8.0
       pg-types: 2.2.0
 
-  '@types/prop-types@15.7.14': {}
+  '@types/prop-types@15.7.15': {}
 
   '@types/proxy-addr@2.0.3':
     dependencies:
@@ -14330,8 +14436,8 @@ snapshots:
 
   '@types/react@18.0.28':
     dependencies:
-      '@types/prop-types': 15.7.14
-      '@types/scheduler': 0.23.0
+      '@types/prop-types': 15.7.15
+      '@types/scheduler': 0.26.0
       csstype: 3.1.3
 
   '@types/readdir-glob@1.1.1':
@@ -14348,7 +14454,7 @@ snapshots:
     dependencies:
       htmlparser2: 8.0.1
 
-  '@types/scheduler@0.23.0': {}
+  '@types/scheduler@0.26.0': {}
 
   '@types/seedrandom@3.0.8': {}
 
@@ -14455,22 +14561,40 @@ snapshots:
       '@typescript-eslint/types': 8.31.0
       '@typescript-eslint/typescript-estree': 8.31.0(typescript@5.8.3)
       '@typescript-eslint/visitor-keys': 8.31.0
-      debug: 4.4.0(supports-color@8.1.1)
+      debug: 4.4.0(supports-color@5.5.0)
       eslint: 9.25.1
       typescript: 5.8.3
     transitivePeerDependencies:
       - supports-color
 
+  '@typescript-eslint/project-service@8.39.1(typescript@5.8.3)':
+    dependencies:
+      '@typescript-eslint/tsconfig-utils': 8.39.1(typescript@5.8.3)
+      '@typescript-eslint/types': 8.39.1
+      debug: 4.4.1
+      typescript: 5.8.3
+    transitivePeerDependencies:
+      - supports-color
+
   '@typescript-eslint/scope-manager@8.31.0':
     dependencies:
       '@typescript-eslint/types': 8.31.0
       '@typescript-eslint/visitor-keys': 8.31.0
 
+  '@typescript-eslint/scope-manager@8.39.1':
+    dependencies:
+      '@typescript-eslint/types': 8.39.1
+      '@typescript-eslint/visitor-keys': 8.39.1
+
+  '@typescript-eslint/tsconfig-utils@8.39.1(typescript@5.8.3)':
+    dependencies:
+      typescript: 5.8.3
+
   '@typescript-eslint/type-utils@8.31.0(eslint@9.25.1)(typescript@5.8.3)':
     dependencies:
       '@typescript-eslint/typescript-estree': 8.31.0(typescript@5.8.3)
       '@typescript-eslint/utils': 8.31.0(eslint@9.25.1)(typescript@5.8.3)
-      debug: 4.4.0(supports-color@8.1.1)
+      debug: 4.4.0(supports-color@5.5.0)
       eslint: 9.25.1
       ts-api-utils: 2.1.0(typescript@5.8.3)
       typescript: 5.8.3
@@ -14479,11 +14603,13 @@ snapshots:
 
   '@typescript-eslint/types@8.31.0': {}
 
+  '@typescript-eslint/types@8.39.1': {}
+
   '@typescript-eslint/typescript-estree@8.31.0(typescript@5.8.3)':
     dependencies:
       '@typescript-eslint/types': 8.31.0
       '@typescript-eslint/visitor-keys': 8.31.0
-      debug: 4.4.0(supports-color@8.1.1)
+      debug: 4.4.0(supports-color@5.5.0)
       fast-glob: 3.3.3
       is-glob: 4.0.3
       minimatch: 9.0.5
@@ -14493,6 +14619,22 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  '@typescript-eslint/typescript-estree@8.39.1(typescript@5.8.3)':
+    dependencies:
+      '@typescript-eslint/project-service': 8.39.1(typescript@5.8.3)
+      '@typescript-eslint/tsconfig-utils': 8.39.1(typescript@5.8.3)
+      '@typescript-eslint/types': 8.39.1
+      '@typescript-eslint/visitor-keys': 8.39.1
+      debug: 4.4.1
+      fast-glob: 3.3.3
+      is-glob: 4.0.3
+      minimatch: 9.0.5
+      semver: 7.7.2
+      ts-api-utils: 2.1.0(typescript@5.8.3)
+      typescript: 5.8.3
+    transitivePeerDependencies:
+      - supports-color
+
   '@typescript-eslint/utils@8.31.0(eslint@9.25.1)(typescript@5.8.3)':
     dependencies:
       '@eslint-community/eslint-utils': 4.5.1(eslint@9.25.1)
@@ -14504,11 +14646,27 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  '@typescript-eslint/utils@8.39.1(eslint@9.25.1)(typescript@5.8.3)':
+    dependencies:
+      '@eslint-community/eslint-utils': 4.7.0(eslint@9.25.1)
+      '@typescript-eslint/scope-manager': 8.39.1
+      '@typescript-eslint/types': 8.39.1
+      '@typescript-eslint/typescript-estree': 8.39.1(typescript@5.8.3)
+      eslint: 9.25.1
+      typescript: 5.8.3
+    transitivePeerDependencies:
+      - supports-color
+
   '@typescript-eslint/visitor-keys@8.31.0':
     dependencies:
       '@typescript-eslint/types': 8.31.0
       eslint-visitor-keys: 4.2.0
 
+  '@typescript-eslint/visitor-keys@8.39.1':
+    dependencies:
+      '@typescript-eslint/types': 8.39.1
+      eslint-visitor-keys: 4.2.1
+
   '@ungap/structured-clone@1.2.0': {}
 
   '@vitejs/plugin-vue@5.2.3(vite@6.3.4(@types/node@22.15.2)(sass@1.87.0)(terser@5.39.0)(tsx@4.19.3))(vue@3.5.14(typescript@5.8.3))':
@@ -14520,7 +14678,7 @@ snapshots:
     dependencies:
       '@ampproject/remapping': 2.3.0
       '@bcoe/v8-coverage': 1.0.2
-      debug: 4.4.0(supports-color@8.1.1)
+      debug: 4.4.0(supports-color@5.5.0)
       istanbul-lib-coverage: 3.2.2
       istanbul-lib-report: 3.0.1
       istanbul-lib-source-maps: 5.0.6
@@ -14874,13 +15032,19 @@ snapshots:
     dependencies:
       acorn: 8.14.1
 
+  acorn-jsx@5.3.2(acorn@8.15.0):
+    dependencies:
+      acorn: 8.15.0
+
   acorn@7.4.1: {}
 
   acorn@8.14.1: {}
 
+  acorn@8.15.0: {}
+
   agent-base@7.1.0:
     dependencies:
-      debug: 4.4.0(supports-color@8.1.1)
+      debug: 4.4.0(supports-color@5.5.0)
     transitivePeerDependencies:
       - supports-color
 
@@ -15292,7 +15456,7 @@ snapshots:
     dependencies:
       bytes: 3.1.2
       content-type: 1.0.5
-      debug: 4.4.0(supports-color@8.1.1)
+      debug: 4.4.0(supports-color@5.5.0)
       http-errors: 2.0.0
       iconv-lite: 0.6.3
       on-finished: 2.4.1
@@ -15914,9 +16078,9 @@ snapshots:
     dependencies:
       css-tree: 2.2.1
 
-  cssstyle@4.3.0:
+  cssstyle@4.6.0:
     dependencies:
-      '@asamuzakjp/css-color': 3.1.1
+      '@asamuzakjp/css-color': 3.2.0
       rrweb-cssom: 0.8.0
     optional: true
 
@@ -16038,6 +16202,11 @@ snapshots:
       ms: 2.1.3
     optionalDependencies:
       supports-color: 8.1.1
+    optional: true
+
+  debug@4.4.1:
+    dependencies:
+      ms: 2.1.3
 
   decamelize-keys@1.1.1:
     dependencies:
@@ -16046,7 +16215,7 @@ snapshots:
 
   decamelize@1.2.0: {}
 
-  decimal.js@10.5.0:
+  decimal.js@10.6.0:
     optional: true
 
   decode-bmp@0.2.1:
@@ -16409,7 +16578,7 @@ snapshots:
 
   esbuild-register@3.5.0(esbuild@0.25.3):
     dependencies:
-      debug: 4.4.0(supports-color@8.1.1)
+      debug: 4.4.0(supports-color@5.5.0)
       esbuild: 0.25.3
     transitivePeerDependencies:
       - supports-color
@@ -16540,6 +16709,8 @@ snapshots:
 
   eslint-visitor-keys@4.2.0: {}
 
+  eslint-visitor-keys@4.2.1: {}
+
   eslint@9.25.1:
     dependencies:
       '@eslint-community/eslint-utils': 4.5.1(eslint@9.25.1)
@@ -16558,7 +16729,7 @@ snapshots:
       ajv: 6.12.6
       chalk: 4.1.2
       cross-spawn: 7.0.6
-      debug: 4.4.0(supports-color@8.1.1)
+      debug: 4.4.0(supports-color@5.5.0)
       escape-string-regexp: 4.0.0
       eslint-scope: 8.3.0
       eslint-visitor-keys: 4.2.0
@@ -16586,6 +16757,12 @@ snapshots:
       acorn-jsx: 5.3.2(acorn@8.14.1)
       eslint-visitor-keys: 4.2.0
 
+  espree@10.4.0:
+    dependencies:
+      acorn: 8.15.0
+      acorn-jsx: 5.3.2(acorn@8.15.0)
+      eslint-visitor-keys: 4.2.1
+
   esprima@4.0.1: {}
 
   esquery@1.6.0:
@@ -16758,7 +16935,7 @@ snapshots:
       content-type: 1.0.5
       cookie: 0.7.2
       cookie-signature: 1.2.2
-      debug: 4.4.0(supports-color@8.1.1)
+      debug: 4.4.0(supports-color@5.5.0)
       encodeurl: 2.0.0
       escape-html: 1.0.3
       etag: 1.8.1
@@ -16965,7 +17142,7 @@ snapshots:
 
   finalhandler@2.1.0:
     dependencies:
-      debug: 4.4.0(supports-color@8.1.1)
+      debug: 4.4.0(supports-color@5.5.0)
       encodeurl: 2.0.0
       escape-html: 1.0.3
       on-finished: 2.4.1
@@ -17019,7 +17196,7 @@ snapshots:
 
   follow-redirects@1.15.9(debug@4.4.0):
     optionalDependencies:
-      debug: 4.4.0(supports-color@8.1.1)
+      debug: 4.4.0(supports-color@5.5.0)
 
   for-each@0.3.3:
     dependencies:
@@ -17434,7 +17611,7 @@ snapshots:
   http-proxy-agent@7.0.2:
     dependencies:
       agent-base: 7.1.3
-      debug: 4.4.0(supports-color@8.1.1)
+      debug: 4.4.0(supports-color@5.5.0)
     transitivePeerDependencies:
       - supports-color
 
@@ -17462,7 +17639,7 @@ snapshots:
   https-proxy-agent@7.0.6:
     dependencies:
       agent-base: 7.1.3
-      debug: 4.4.0(supports-color@8.1.1)
+      debug: 4.4.0(supports-color@5.5.0)
     transitivePeerDependencies:
       - supports-color
 
@@ -17564,7 +17741,7 @@ snapshots:
     dependencies:
       '@ioredis/commands': 1.2.0
       cluster-key-slot: 1.1.2
-      debug: 4.4.0(supports-color@8.1.1)
+      debug: 4.4.0(supports-color@5.5.0)
       denque: 2.1.0
       lodash.defaults: 4.2.0
       lodash.isarguments: 3.1.0
@@ -17807,7 +17984,7 @@ snapshots:
 
   istanbul-lib-source-maps@4.0.1:
     dependencies:
-      debug: 4.4.0(supports-color@8.1.1)
+      debug: 4.4.0(supports-color@5.5.0)
       istanbul-lib-coverage: 3.2.2
       source-map: 0.6.1
     transitivePeerDependencies:
@@ -17816,7 +17993,7 @@ snapshots:
   istanbul-lib-source-maps@5.0.6:
     dependencies:
       '@jridgewell/trace-mapping': 0.3.25
-      debug: 4.4.0(supports-color@8.1.1)
+      debug: 4.4.0(supports-color@5.5.0)
       istanbul-lib-coverage: 3.2.2
     transitivePeerDependencies:
       - supports-color
@@ -18215,14 +18392,14 @@ snapshots:
 
   jsdom@26.1.0(bufferutil@4.0.9)(utf-8-validate@6.0.5):
     dependencies:
-      cssstyle: 4.3.0
+      cssstyle: 4.6.0
       data-urls: 5.0.0
-      decimal.js: 10.5.0
+      decimal.js: 10.6.0
       html-encoding-sniffer: 4.0.0
       http-proxy-agent: 7.0.2
       https-proxy-agent: 7.0.6
       is-potential-custom-element-name: 1.0.1
-      nwsapi: 2.2.19
+      nwsapi: 2.2.21
       parse5: 7.3.0
       rrweb-cssom: 0.8.0
       saxes: 6.0.0
@@ -18233,7 +18410,7 @@ snapshots:
       whatwg-encoding: 3.1.1
       whatwg-mimetype: 4.0.0
       whatwg-url: 14.2.0
-      ws: 8.18.1(bufferutil@4.0.9)(utf-8-validate@6.0.5)
+      ws: 8.18.3(bufferutil@4.0.9)(utf-8-validate@6.0.5)
       xml-name-validator: 5.0.0
     transitivePeerDependencies:
       - bufferutil
@@ -18845,7 +19022,7 @@ snapshots:
   micromark@4.0.0:
     dependencies:
       '@types/debug': 4.1.12
-      debug: 4.4.0(supports-color@8.1.1)
+      debug: 4.4.0(supports-color@5.5.0)
       decode-named-character-reference: 1.0.2
       devlop: 1.1.0
       micromark-core-commonmark: 2.0.0
@@ -19229,7 +19406,7 @@ snapshots:
     dependencies:
       boolbase: 1.0.0
 
-  nwsapi@2.2.19:
+  nwsapi@2.2.21:
     optional: true
 
   oauth@0.10.2: {}
@@ -19522,6 +19699,8 @@ snapshots:
 
   picomatch@4.0.2: {}
 
+  picomatch@4.0.3: {}
+
   pid-port@1.0.2:
     dependencies:
       execa: 8.0.1
@@ -20211,7 +20390,7 @@ snapshots:
 
   require-in-the-middle@7.3.0:
     dependencies:
-      debug: 4.4.0(supports-color@8.1.1)
+      debug: 4.4.0(supports-color@5.5.0)
       module-details-from-path: 1.0.3
       resolve: 1.22.8
     transitivePeerDependencies:
@@ -20291,7 +20470,7 @@ snapshots:
 
   router@2.2.0:
     dependencies:
-      debug: 4.4.0(supports-color@8.1.1)
+      debug: 4.4.0(supports-color@5.5.0)
       depd: 2.0.0
       is-promise: 4.0.0
       parseurl: 1.3.3
@@ -20411,7 +20590,7 @@ snapshots:
 
   send@1.2.0:
     dependencies:
-      debug: 4.4.0(supports-color@8.1.1)
+      debug: 4.4.0(supports-color@5.5.0)
       encodeurl: 2.0.0
       escape-html: 1.0.3
       etag: 1.8.1
@@ -20673,7 +20852,7 @@ snapshots:
   socks-proxy-agent@8.0.2:
     dependencies:
       agent-base: 7.1.0
-      debug: 4.4.0(supports-color@8.1.1)
+      debug: 4.4.0(supports-color@5.5.0)
       socks: 2.7.1
     transitivePeerDependencies:
       - supports-color
@@ -20783,7 +20962,7 @@ snapshots:
       arg: 5.0.2
       bluebird: 3.7.2
       check-more-types: 2.24.0
-      debug: 4.4.0(supports-color@8.1.1)
+      debug: 4.4.0(supports-color@5.5.0)
       execa: 5.1.1
       lazy-ass: 1.6.0
       ps-tree: 1.2.0
@@ -20960,7 +21139,7 @@ snapshots:
     dependencies:
       component-emitter: 1.3.1
       cookiejar: 2.1.4
-      debug: 4.4.0(supports-color@8.1.1)
+      debug: 4.4.0(supports-color@5.5.0)
       fast-safe-stringify: 2.1.1
       form-data: 4.0.2
       formidable: 3.5.4
@@ -21120,11 +21299,19 @@ snapshots:
   tldts-core@6.1.63:
     optional: true
 
+  tldts-core@6.1.86:
+    optional: true
+
   tldts@6.1.63:
     dependencies:
       tldts-core: 6.1.63
     optional: true
 
+  tldts@6.1.86:
+    dependencies:
+      tldts-core: 6.1.86
+    optional: true
+
   tmp@0.2.3: {}
 
   tmpl@1.0.5: {}
@@ -21166,12 +21353,12 @@ snapshots:
 
   tough-cookie@5.1.2:
     dependencies:
-      tldts: 6.1.63
+      tldts: 6.1.86
     optional: true
 
   tr46@0.0.3: {}
 
-  tr46@5.1.0:
+  tr46@5.1.1:
     dependencies:
       punycode: 2.3.1
     optional: true
@@ -21340,7 +21527,7 @@ snapshots:
       app-root-path: 3.1.0
       buffer: 6.0.3
       dayjs: 1.11.13
-      debug: 4.4.0(supports-color@8.1.1)
+      debug: 4.4.0(supports-color@5.5.0)
       dotenv: 16.5.0
       glob: 10.4.5
       reflect-metadata: 0.2.2
@@ -21540,7 +21727,7 @@ snapshots:
   vite-node@3.1.2(@types/node@22.15.2)(sass@1.87.0)(terser@5.39.0)(tsx@4.19.3):
     dependencies:
       cac: 6.7.14
-      debug: 4.4.0(supports-color@8.1.1)
+      debug: 4.4.0(supports-color@5.5.0)
       es-module-lexer: 1.6.0
       pathe: 2.0.3
       vite: 6.3.4(@types/node@22.15.2)(sass@1.87.0)(terser@5.39.0)(tsx@4.19.3)
@@ -21589,7 +21776,7 @@ snapshots:
       '@vitest/spy': 3.1.2
       '@vitest/utils': 3.1.2
       chai: 5.2.0
-      debug: 4.4.0(supports-color@8.1.1)
+      debug: 4.4.0(supports-color@5.5.0)
       expect-type: 1.2.1
       magic-string: 0.30.17
       pathe: 2.0.3
@@ -21661,6 +21848,8 @@ snapshots:
 
   vue-component-type-helpers@2.2.10: {}
 
+  vue-component-type-helpers@3.0.5: {}
+
   vue-demi@0.14.7(vue@3.5.14(typescript@5.8.3)):
     dependencies:
       vue: 3.5.14(typescript@5.8.3)
@@ -21682,7 +21871,7 @@ snapshots:
 
   vue-eslint-parser@10.1.3(eslint@9.25.1):
     dependencies:
-      debug: 4.4.0(supports-color@8.1.1)
+      debug: 4.4.0(supports-color@5.5.0)
       eslint: 9.25.1
       eslint-scope: 8.3.0
       eslint-visitor-keys: 4.2.0
@@ -21795,7 +21984,7 @@ snapshots:
 
   whatwg-url@14.2.0:
     dependencies:
-      tr46: 5.1.0
+      tr46: 5.1.1
       webidl-conversions: 7.0.0
     optional: true
 
@@ -21893,6 +22082,12 @@ snapshots:
       bufferutil: 4.0.9
       utf-8-validate: 6.0.5
 
+  ws@8.18.3(bufferutil@4.0.9)(utf-8-validate@6.0.5):
+    optionalDependencies:
+      bufferutil: 4.0.9
+      utf-8-validate: 6.0.5
+    optional: true
+
   xev@3.0.2: {}
 
   xml-js@1.6.11:

From f9a45238e9623fb18ba659f7b9ca152aa9b69aae Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Wed, 13 Aug 2025 00:27:55 -0400
Subject: [PATCH 059/110] fix mute overrides for bulk-disabling silence

---
 packages/frontend/src/components/DynamicNote.vue       | 3 ++-
 packages/frontend/src/components/SkUrlPreviewGroup.vue | 3 ++-
 packages/frontend/src/components/page/page.block.vue   | 3 ++-
 packages/frontend/src/pages/user/home.vue              | 9 +++++++--
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/packages/frontend/src/components/DynamicNote.vue b/packages/frontend/src/components/DynamicNote.vue
index 10f4ea36cf..b10cf2aef3 100644
--- a/packages/frontend/src/components/DynamicNote.vue
+++ b/packages/frontend/src/components/DynamicNote.vue
@@ -58,12 +58,13 @@ function onExpandNote(note: Misskey.entities.Note) {
 			user: {
 				[note.user.id]: {
 					userMandatoryCW: null,
-					isSilenced: false,
+					userSilenced: false,
 				},
 			},
 			instance: {
 				[note.user.host ?? '']: {
 					instanceMandatoryCW: null,
+					instanceSilenced: false,
 				},
 			},
 		});
diff --git a/packages/frontend/src/components/SkUrlPreviewGroup.vue b/packages/frontend/src/components/SkUrlPreviewGroup.vue
index ea7ab34ef2..6eb816114d 100644
--- a/packages/frontend/src/components/SkUrlPreviewGroup.vue
+++ b/packages/frontend/src/components/SkUrlPreviewGroup.vue
@@ -89,12 +89,13 @@ function onExpandNote(note: Misskey.entities.Note) {
 		user: {
 			[note.user.id]: {
 				userMandatoryCW: null,
-				isSilenced: false,
+				userSilenced: false,
 			},
 		},
 		instance: {
 			[note.user.host ?? '']: {
 				instanceMandatoryCW: null,
+				instanceSilenced: false,
 			},
 		},
 	});
diff --git a/packages/frontend/src/components/page/page.block.vue b/packages/frontend/src/components/page/page.block.vue
index 252b310231..7e6669088b 100644
--- a/packages/frontend/src/components/page/page.block.vue
+++ b/packages/frontend/src/components/page/page.block.vue
@@ -60,12 +60,13 @@ function onExpandNote(note: Misskey.entities.Note) {
 		user: {
 			[note.user.id]: {
 				userMandatoryCW: null,
-				isSilenced: false,
+				userSilenced: false,
 			},
 		},
 		instance: {
 			[note.user.host ?? '']: {
 				instanceMandatoryCW: null,
+				instanceSilenced: false,
 			},
 		},
 	});
diff --git a/packages/frontend/src/pages/user/home.vue b/packages/frontend/src/pages/user/home.vue
index b49440d6a3..199d061832 100644
--- a/packages/frontend/src/pages/user/home.vue
+++ b/packages/frontend/src/pages/user/home.vue
@@ -266,8 +266,13 @@ function onExpandMute(note: Misskey.entities.Note) {
 			user: {
 				[props.user.id]: {
 					userMandatoryCW: null,
-					instanceMandatoryCW: null,
-					isSilenced: false,
+					userSilenced: false,
+				},
+				instance: {
+					[props.user.host ?? '']: {
+						instanceMandatoryCW: null,
+						instanceSilenced: false,
+					},
 				},
 			},
 		});

From 0f2e8fd454cdfead98f566cd33c3b76a0cf94bfe Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Wed, 13 Aug 2025 00:28:11 -0400
Subject: [PATCH 060/110] disable silence for the entire user profile section

---
 packages/frontend/src/pages/user/index.vue | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/packages/frontend/src/pages/user/index.vue b/packages/frontend/src/pages/user/index.vue
index 105dedcb6d..11096a3b45 100644
--- a/packages/frontend/src/pages/user/index.vue
+++ b/packages/frontend/src/pages/user/index.vue
@@ -36,6 +36,8 @@ import { i18n } from '@/i18n.js';
 import { $i } from '@/i.js';
 import { serverContext, assertServerContext } from '@/server-context.js';
 import { isTouchUsing } from '@/utility/touch.js';
+import { useMuteOverrides } from '@/utility/check-word-mute';
+import { deepAssign } from '@/utility/merge';
 
 const XHome = defineAsyncComponent(() => import('./home.vue'));
 const XTimeline = defineAsyncComponent(() => import('./index.timeline.vue'));
@@ -65,6 +67,21 @@ const tab = ref(props.page);
 const user = ref<null | Misskey.entities.UserDetailed>(CTX_USER);
 const error = ref<any>(null);
 
+const muteOverrides = useMuteOverrides();
+
+watch(user, () => {
+	if (user.value) {
+		deepAssign(muteOverrides, {
+			user: {
+				[user.value.id]: {
+					userSilenced: false,
+					instanceSilenced: false,
+				},
+			},
+		});
+	}
+});
+
 function fetchUser(): void {
 	if (props.acct == null) return;
 

From b9778e7fc8a3015771db78e8b51bae3906709fa4 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Wed, 13 Aug 2025 00:41:00 -0400
Subject: [PATCH 061/110] remove extra relations from
 FanoutTimelineEndpointService

---
 .../src/core/FanoutTimelineEndpointService.ts       | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/packages/backend/src/core/FanoutTimelineEndpointService.ts b/packages/backend/src/core/FanoutTimelineEndpointService.ts
index 1a4af8cf1e..a8c124077e 100644
--- a/packages/backend/src/core/FanoutTimelineEndpointService.ts
+++ b/packages/backend/src/core/FanoutTimelineEndpointService.ts
@@ -202,18 +202,9 @@ export class FanoutTimelineEndpointService {
 			.innerJoinAndSelect('note.user', 'user')
 			.leftJoinAndSelect('note.reply', 'reply')
 			.leftJoinAndSelect('note.renote', 'renote')
-			.leftJoinAndSelect('reply.user', 'replyUser')
-			.leftJoinAndSelect('renote.user', 'renoteUser')
 			.leftJoinAndSelect('note.channel', 'channel')
-			.leftJoinAndSelect('note.userInstance', 'userInstance')
-			.leftJoinAndSelect('note.replyUserInstance', 'replyUserInstance')
-			.leftJoinAndSelect('note.renoteUserInstance', 'renoteUserInstance')
-
-			// These are used to ensure full data for boosted replies.
-			// Without loading these relations, certain filters may fail open.
-			.leftJoinAndSelect('renote.reply', 'renoteReply')
-			.leftJoinAndSelect('renote.reply.user', 'renoteReplyUser')
-			.leftJoinAndSelect('renote.replyUserInstance', 'renoteReplyUserInstance');
+			.leftJoinAndSelect('reply.user', 'replyUser')
+			.leftJoinAndSelect('renote.user', 'renoteUser');
 
 		const notes = (await query.getMany()).filter(noteFilter);
 

From f1fc8bc35734dfa010161bdfa63c751ab0baede5 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Wed, 13 Aug 2025 11:54:17 -0400
Subject: [PATCH 062/110] add bypassSilence property at note level to fix
 silenced users' self-boosts showing a warning even when the user is followed

---
 packages/backend/src/core/entities/NoteEntityService.ts | 9 +++++++++
 packages/backend/src/models/json-schema/note.ts         | 4 ++++
 packages/frontend/src/utility/check-word-mute.ts        | 9 +++++----
 packages/misskey-js/src/autogen/types.ts                | 1 +
 4 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/packages/backend/src/core/entities/NoteEntityService.ts b/packages/backend/src/core/entities/NoteEntityService.ts
index 1f5496aa93..d0d7b0e9cf 100644
--- a/packages/backend/src/core/entities/NoteEntityService.ts
+++ b/packages/backend/src/core/entities/NoteEntityService.ts
@@ -600,6 +600,7 @@ export class NoteEntityService implements OnModuleInit {
 			detail?: boolean;
 			skipHide?: boolean;
 			withReactionAndUserPairCache?: boolean;
+			bypassSilence?: boolean;
 			_hint_?: {
 				bufferedReactions: Map<MiNote['id'], { deltas: Record<string, number>; pairs: ([MiUser['id'], string])[] }> | null;
 				myReactions: Map<MiNote['id'], string | null>;
@@ -721,6 +722,7 @@ export class NoteEntityService implements OnModuleInit {
 			isMutingNote: mutedNotes.has(note.id),
 			isFavorited,
 			isRenoted,
+			bypassSilence: opts.bypassSilence ?? false,
 
 			...(meId && Object.keys(reactions).length > 0 ? {
 				myReaction: this.populateMyReaction({
@@ -739,6 +741,9 @@ export class NoteEntityService implements OnModuleInit {
 					skipHide: opts.skipHide,
 					withReactionAndUserPairCache: opts.withReactionAndUserPairCache,
 					_hint_: options?._hint_,
+
+					// Don't silence target of self-renote, since the outer note will already be silenced.
+					bypassSilence: options?.bypassSilence || note.userId === note.replyUserId,
 				}) : undefined,
 
 				renote: note.renoteId ? this.pack(note.renote ?? opts._hint_?.notes.get(note.renoteId) ?? note.renoteId, me, {
@@ -746,6 +751,9 @@ export class NoteEntityService implements OnModuleInit {
 					skipHide: opts.skipHide,
 					withReactionAndUserPairCache: opts.withReactionAndUserPairCache,
 					_hint_: options?._hint_,
+
+					// Don't silence target of self-reply, since the outer note will already be silenced.
+					bypassSilence: options?.bypassSilence || note.userId === note.renoteUserId,
 				}) : undefined,
 			} : {}),
 		});
@@ -771,6 +779,7 @@ export class NoteEntityService implements OnModuleInit {
 		options?: {
 			detail?: boolean;
 			skipHide?: boolean;
+			bypassSilence?: boolean;
 		},
 	) {
 		if (notes.length === 0) return [];
diff --git a/packages/backend/src/models/json-schema/note.ts b/packages/backend/src/models/json-schema/note.ts
index 79b36ba0da..960865facd 100644
--- a/packages/backend/src/models/json-schema/note.ts
+++ b/packages/backend/src/models/json-schema/note.ts
@@ -197,6 +197,10 @@ export const packedNoteSchema = {
 			type: 'boolean',
 			optional: false, nullable: false,
 		},
+		bypassSilence: {
+			type: 'boolean',
+			optional: false, nullable: false,
+		},
 		emojis: {
 			type: 'object',
 			optional: true, nullable: false,
diff --git a/packages/frontend/src/utility/check-word-mute.ts b/packages/frontend/src/utility/check-word-mute.ts
index 70d2491dc5..a92104a403 100644
--- a/packages/frontend/src/utility/check-word-mute.ts
+++ b/packages/frontend/src/utility/check-word-mute.ts
@@ -107,12 +107,13 @@ function getMutes(note: Misskey.entities.Note, withHardMute: boolean, overrides:
 	) : {};
 
 	const isMe = $i != null && $i.id === note.userId;
+	const bypassSilence = note.bypassSilence || note.user.bypassSilence;
 
 	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.isSilenced && !note.user.bypassSilence);
-	const instanceSilenced = override.instanceSilenced ?? (note.user.instance?.isSilenced && !note.user.bypassSilence) ?? false;
+	const userSilenced = override.userSilenced ?? (note.user.isSilenced && !bypassSilence);
+	const instanceSilenced = override.instanceSilenced ?? (note.user.instance?.isSilenced && !bypassSilence) ?? false;
 	const threadMuted = override.threadMuted ?? (!isMe && note.isMutingThread);
 	const noteMuted = override.noteMuted ?? (!isMe && note.isMutingNote);
 	const noteMandatoryCW = override.noteMandatoryCW !== undefined
@@ -120,13 +121,13 @@ function getMutes(note: Misskey.entities.Note, withHardMute: boolean, overrides:
 		: (isMe ? null : note.mandatoryCW);
 	const userMandatoryCW = override.userMandatoryCW !== undefined
 		? override.userMandatoryCW
-		: !note.user.bypassSilence
+		: !bypassSilence
 			? note.user.mandatoryCW
 			: null;
 
 	const instanceMandatoryCW = override.instanceMandatoryCW !== undefined
 		? override.instanceMandatoryCW
-		: (!note.user.bypassSilence && note.user.instance)
+		: (!bypassSilence && note.user.instance)
 			? note.user.instance.mandatoryCW
 			: null;
 
diff --git a/packages/misskey-js/src/autogen/types.ts b/packages/misskey-js/src/autogen/types.ts
index 71c30d66e5..fa86d3447d 100644
--- a/packages/misskey-js/src/autogen/types.ts
+++ b/packages/misskey-js/src/autogen/types.ts
@@ -4732,6 +4732,7 @@ export type components = {
       isMutingNote: boolean;
       isFavorited: boolean;
       isRenoted: boolean;
+      bypassSilence: boolean;
       emojis?: {
         [key: string]: string;
       };

From 96ee6357652a25f7175373dbaacedca2e2e69ba3 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Wed, 13 Aug 2025 11:54:44 -0400
Subject: [PATCH 063/110] make QueryService.generateSuspendedUserQueryForNote
 automatically add all required joins

---
 packages/backend/src/core/QueryService.ts | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/packages/backend/src/core/QueryService.ts b/packages/backend/src/core/QueryService.ts
index 4fa0afc71e..00696b23a7 100644
--- a/packages/backend/src/core/QueryService.ts
+++ b/packages/backend/src/core/QueryService.ts
@@ -663,9 +663,14 @@ export class QueryService {
 		return q[join](`NOT EXISTS (${threadMutedQuery.getQuery()})`, threadMutedQuery.getParameters());
 	}
 
-	// Requirements: user replyUser renoteUser must be joined
 	@bindThis
-	public generateSuspendedUserQueryForNote(q: SelectQueryBuilder<any>, excludeAuthor?: boolean): void {
+	public generateSuspendedUserQueryForNote<E extends ObjectLiteral>(q: SelectQueryBuilder<E>, excludeAuthor?: boolean): void {
+		this.leftJoin(q, 'note.user', 'user');
+		this.leftJoin(q, 'note.reply', 'reply');
+		this.leftJoin(q, 'note.renote', 'renote');
+		this.leftJoin(q, 'reply.user', 'replyUser');
+		this.leftJoin(q, 'renote.user', 'renoteUser');
+
 		if (excludeAuthor) {
 			const brakets = (user: string) => new Brackets(qb => qb
 				.where(`note.${user}Id IS NULL`)

From c9fbe58715b589c53934d988f49c4bc6eaf80933 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Wed, 13 Aug 2025 11:55:07 -0400
Subject: [PATCH 064/110] add missing condition in
 QueryService.generateSilencedUserQueryForNotes

---
 packages/backend/src/core/QueryService.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/backend/src/core/QueryService.ts b/packages/backend/src/core/QueryService.ts
index 00696b23a7..12efe18f3c 100644
--- a/packages/backend/src/core/QueryService.ts
+++ b/packages/backend/src/core/QueryService.ts
@@ -276,6 +276,11 @@ export class QueryService {
 					// case 4: we are following the user
 					this.orFollowingUser(qb, ':meId', `note.${key}Id`);
 				}
+
+				// case 5: user is the same
+				if (key !== 'user') {
+					qb.orWhere(`note.${key}Id = note.userId`);
+				}
 			}));
 		};
 

From f26566e8440ccd3c18706fec1062a2d7be958f56 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Wed, 13 Aug 2025 11:56:14 -0400
Subject: [PATCH 065/110] add withReplies option to
 QueryService.addFollowingUser, .andFollowingUser, and .orFollowingUser

---
 packages/backend/src/core/QueryService.ts | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/packages/backend/src/core/QueryService.ts b/packages/backend/src/core/QueryService.ts
index 12efe18f3c..ac608071f4 100644
--- a/packages/backend/src/core/QueryService.ts
+++ b/packages/backend/src/core/QueryService.ts
@@ -449,27 +449,33 @@ export class QueryService {
 	/**
 	 * Adds OR condition that followerProp (user ID) is following followeeProp (user ID).
 	 * Both props should be expressions, not raw values.
+	 * If withReplies is set to a boolean, then this method will only count followings with the matching withReplies value.
 	 */
 	@bindThis
-	public orFollowingUser<Q extends WhereExpressionBuilder>(q: Q, followerProp: string, followeeProp: string): Q {
-		return this.addFollowingUser(q, followerProp, followeeProp, 'orWhere');
+	public orFollowingUser<Q extends WhereExpressionBuilder>(q: Q, followerProp: string, followeeProp: string, withReplies?: boolean): Q {
+		return this.addFollowingUser(q, followerProp, followeeProp, 'orWhere', withReplies);
 	}
 
 	/**
 	 * Adds AND condition that followerProp (user ID) is following followeeProp (user ID).
 	 * Both props should be expressions, not raw values.
+	 * If withReplies is set to a boolean, then this method will only count followings with the matching withReplies value.
 	 */
 	@bindThis
-	public andFollowingUser<Q extends WhereExpressionBuilder>(q: Q, followerProp: string, followeeProp: string): Q {
-		return this.addFollowingUser(q, followerProp, followeeProp, 'andWhere');
+	public andFollowingUser<Q extends WhereExpressionBuilder>(q: Q, followerProp: string, followeeProp: string, withReplies?: boolean): Q {
+		return this.addFollowingUser(q, followerProp, followeeProp, 'andWhere', withReplies);
 	}
 
-	private addFollowingUser<Q extends WhereExpressionBuilder>(q: Q, followerProp: string, followeeProp: string, join: 'andWhere' | 'orWhere'): Q {
+	private addFollowingUser<Q extends WhereExpressionBuilder>(q: Q, followerProp: string, followeeProp: string, join: 'andWhere' | 'orWhere', withReplies?: boolean): Q {
 		const followingQuery = this.followingsRepository.createQueryBuilder('following')
 			.select('1')
 			.andWhere(`following.followerId = ${followerProp}`)
 			.andWhere(`following.followeeId = ${followeeProp}`);
 
+		if (withReplies !== undefined) {
+			followingQuery.andWhere('following.withReplies = :withReplies', { withReplies });
+		}
+
 		return q[join](`EXISTS (${followingQuery.getQuery()})`, followingQuery.getParameters());
 	};
 

From 7842847f6b47ea676ede67f92cd9e147995ee941 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Wed, 13 Aug 2025 11:56:31 -0400
Subject: [PATCH 066/110] implement
 QueryService.generateExcludedRepliesQueryForNotes

---
 packages/backend/src/core/QueryService.ts | 29 +++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/packages/backend/src/core/QueryService.ts b/packages/backend/src/core/QueryService.ts
index ac608071f4..cb7cfb4453 100644
--- a/packages/backend/src/core/QueryService.ts
+++ b/packages/backend/src/core/QueryService.ts
@@ -80,6 +80,35 @@ export class QueryService {
 		return q;
 	}
 
+	/**
+	 * Exclude replies from the queries, used for timelines.
+	 * withRepliesProp can be specified to additionally allow replies when a given property is true.
+	 * Must match logic NoteVisibilityService.shouldSilenceForFollowWithoutReplies.
+	 */
+	@bindThis
+	public generateExcludedRepliesQueryForNotes<E extends ObjectLiteral>(q: SelectQueryBuilder<E>, me?: { id: MiUser['id'] } | null, withRepliesProp?: string): SelectQueryBuilder<E> {
+		return q
+			.andWhere(new Brackets(qb => {
+				if (withRepliesProp) {
+					// Allow if query specifies it
+					qb.orWhere(`${withRepliesProp} = true`);
+				}
+
+				return this
+					// Allow if we're following w/ replies
+					.orFollowingUser(qb, ':meId', 'note.userId', true)
+					// Allow if it's not a reply
+					.orWhere('note.replyId IS NULL') // 返信ではない
+					// Allow if it's a self-reply (user replied to themself)
+					.orWhere('note.replyUserId = note.userId')
+					// Allow if it's a reply to me
+					.orWhere('note.replyUserId = :meId')
+					// Allow if it's my reply
+					.orWhere('note.userId = :meId');
+			}))
+			.setParameters({ meId: me?.id ?? null });
+	}
+
 	// ここでいうBlockedは被Blockedの意
 	@bindThis
 	public generateBlockedUserQueryForNotes<E extends ObjectLiteral>(q: SelectQueryBuilder<E>, me: { id: MiUser['id'] }): SelectQueryBuilder<E> {

From 61033dd0c02f35c7c22b94c44e92549c0c01c303 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Wed, 13 Aug 2025 11:56:48 -0400
Subject: [PATCH 067/110] fix note ordering in antennas

---
 packages/backend/src/server/api/endpoints/antennas/notes.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/backend/src/server/api/endpoints/antennas/notes.ts b/packages/backend/src/server/api/endpoints/antennas/notes.ts
index 0aeceda038..988cdbd4e9 100644
--- a/packages/backend/src/server/api/endpoints/antennas/notes.ts
+++ b/packages/backend/src/server/api/endpoints/antennas/notes.ts
@@ -111,6 +111,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 			const query = this.queryService.makePaginationQuery(this.notesRepository.createQueryBuilder('note'),
 				ps.sinceId, ps.untilId)
 				.where('note.id IN (:...noteIds)', { noteIds: noteIds })
+				.orderBy('note.id', 'DESC')
 				.innerJoinAndSelect('note.user', 'user')
 				.leftJoinAndSelect('note.reply', 'reply')
 				.leftJoinAndSelect('note.renote', 'renote')

From c8d3e92c9c7d76b97b35fe6ecbc84e809f38383a Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Wed, 13 Aug 2025 11:57:12 -0400
Subject: [PATCH 068/110] hide suspended users from bubble and global timelines

---
 .../backend/src/server/api/endpoints/notes/bubble-timeline.ts    | 1 +
 .../backend/src/server/api/endpoints/notes/global-timeline.ts    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/packages/backend/src/server/api/endpoints/notes/bubble-timeline.ts b/packages/backend/src/server/api/endpoints/notes/bubble-timeline.ts
index f5236e9423..abafcc19de 100644
--- a/packages/backend/src/server/api/endpoints/notes/bubble-timeline.ts
+++ b/packages/backend/src/server/api/endpoints/notes/bubble-timeline.ts
@@ -96,6 +96,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				.leftJoin(query, 'note.userInstance', 'userInstance');
 
 			this.queryService.generateBlockedHostQueryForNote(query);
+			this.queryService.generateSuspendedUserQueryForNote(query);
 			this.queryService.generateSilencedUserQueryForNotes(query, me);
 			if (me) {
 				this.queryService.generateMutedUserQueryForNotes(query, me);
diff --git a/packages/backend/src/server/api/endpoints/notes/global-timeline.ts b/packages/backend/src/server/api/endpoints/notes/global-timeline.ts
index ce70c5ae5e..ae4ee3bece 100644
--- a/packages/backend/src/server/api/endpoints/notes/global-timeline.ts
+++ b/packages/backend/src/server/api/endpoints/notes/global-timeline.ts
@@ -88,6 +88,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				.leftJoinAndSelect('renote.user', 'renoteUser');
 
 			this.queryService.generateBlockedHostQueryForNote(query);
+			this.queryService.generateSuspendedUserQueryForNote(query);
 			this.queryService.generateSilencedUserQueryForNotes(query, me);
 			if (me) {
 				this.queryService.generateMutedUserQueryForNotes(query, me);

From a4012b535b5ca213d0a464588cbc1a17f41c5b7c Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Wed, 13 Aug 2025 11:57:31 -0400
Subject: [PATCH 069/110] exclude muted author in list timelines

---
 .../src/server/api/endpoints/notes/user-list-timeline.ts        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/backend/src/server/api/endpoints/notes/user-list-timeline.ts b/packages/backend/src/server/api/endpoints/notes/user-list-timeline.ts
index 6d245226ac..61a2c65ce4 100644
--- a/packages/backend/src/server/api/endpoints/notes/user-list-timeline.ts
+++ b/packages/backend/src/server/api/endpoints/notes/user-list-timeline.ts
@@ -179,7 +179,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 		this.queryService.generateBlockedHostQueryForNote(query);
 		this.queryService.generateSuspendedUserQueryForNote(query);
 		this.queryService.generateSilencedUserQueryForNotes(query, me, true);
-		this.queryService.generateMutedUserQueryForNotes(query, me);
+		this.queryService.generateMutedUserQueryForNotes(query, me, true);
 		this.queryService.generateBlockedUserQueryForNotes(query, me);
 
 		if (ps.withFiles) {

From 6e00abc1f0ad69e08bd1afe815daf338e68dafa4 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Wed, 13 Aug 2025 11:58:18 -0400
Subject: [PATCH 070/110] call generateExcludedRepliesQueryForNotes from
 bubble, global, hybrid, local, home, list, and role timelines

---
 .../src/server/api/endpoints/notes/bubble-timeline.ts |  1 +
 .../src/server/api/endpoints/notes/global-timeline.ts |  1 +
 .../src/server/api/endpoints/notes/hybrid-timeline.ts | 10 +++-------
 .../src/server/api/endpoints/notes/local-timeline.ts  |  6 +-----
 .../src/server/api/endpoints/notes/timeline.ts        |  7 ++-----
 .../server/api/endpoints/notes/user-list-timeline.ts  | 11 +----------
 .../backend/src/server/api/endpoints/roles/notes.ts   |  1 +
 7 files changed, 10 insertions(+), 27 deletions(-)

diff --git a/packages/backend/src/server/api/endpoints/notes/bubble-timeline.ts b/packages/backend/src/server/api/endpoints/notes/bubble-timeline.ts
index abafcc19de..cd97a7773b 100644
--- a/packages/backend/src/server/api/endpoints/notes/bubble-timeline.ts
+++ b/packages/backend/src/server/api/endpoints/notes/bubble-timeline.ts
@@ -95,6 +95,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 			this.queryService
 				.leftJoin(query, 'note.userInstance', 'userInstance');
 
+			this.queryService.generateExcludedRepliesQueryForNotes(query, me);
 			this.queryService.generateBlockedHostQueryForNote(query);
 			this.queryService.generateSuspendedUserQueryForNote(query);
 			this.queryService.generateSilencedUserQueryForNotes(query, me);
diff --git a/packages/backend/src/server/api/endpoints/notes/global-timeline.ts b/packages/backend/src/server/api/endpoints/notes/global-timeline.ts
index ae4ee3bece..601c5e7a48 100644
--- a/packages/backend/src/server/api/endpoints/notes/global-timeline.ts
+++ b/packages/backend/src/server/api/endpoints/notes/global-timeline.ts
@@ -87,6 +87,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				.leftJoinAndSelect('reply.user', 'replyUser')
 				.leftJoinAndSelect('renote.user', 'renoteUser');
 
+			this.queryService.generateExcludedRepliesQueryForNotes(query, me);
 			this.queryService.generateBlockedHostQueryForNote(query);
 			this.queryService.generateSuspendedUserQueryForNote(query);
 			this.queryService.generateSilencedUserQueryForNotes(query, me);
diff --git a/packages/backend/src/server/api/endpoints/notes/hybrid-timeline.ts b/packages/backend/src/server/api/endpoints/notes/hybrid-timeline.ts
index 0c39ec1f57..13d8b41d47 100644
--- a/packages/backend/src/server/api/endpoints/notes/hybrid-timeline.ts
+++ b/packages/backend/src/server/api/endpoints/notes/hybrid-timeline.ts
@@ -185,14 +185,14 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 		withRenotes: boolean,
 	}, me: MiLocalUser) {
 		const query = this.queryService.makePaginationQuery(this.notesRepository.createQueryBuilder('note'), ps.sinceId, ps.untilId)
-			// 1. by a user I follow, 2. a public local post, 3. my own post
+			// by a user I follow OR a public local post OR my own post
 			.andWhere(new Brackets(qb => this.queryService
 				.orFollowingUser(qb, ':meId', 'note.userId')
 				.orWhere(new Brackets(qbb => qbb
 					.andWhere('note.visibility = \'public\'')
 					.andWhere('note.userHost IS NULL')))
 				.orWhere(':meId = note.userId')))
-			// 1. in a channel I follow, 2. not in a channel
+			// in a channel I follow OR not in a channel
 			.andWhere(new Brackets(qb => this.queryService
 				.orFollowingChannel(qb, ':meId', 'note.channelId')
 				.orWhere('note.channelId IS NULL')))
@@ -205,11 +205,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 			.limit(ps.limit);
 
 		if (!ps.withReplies) {
-			query
-				// 1. Not a reply, 2. a self-reply
-				.andWhere(new Brackets(qb => qb
-					.orWhere('note.replyId IS NULL') // 返信ではない
-					.orWhere('note.replyUserId = note.userId')));
+			this.queryService.generateExcludedRepliesQueryForNotes(query, me);
 		}
 
 		this.queryService.generateVisibilityQuery(query, me);
diff --git a/packages/backend/src/server/api/endpoints/notes/local-timeline.ts b/packages/backend/src/server/api/endpoints/notes/local-timeline.ts
index 7b9e70aefd..2379bf8a6a 100644
--- a/packages/backend/src/server/api/endpoints/notes/local-timeline.ts
+++ b/packages/backend/src/server/api/endpoints/notes/local-timeline.ts
@@ -175,11 +175,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 			.limit(ps.limit);
 
 		if (!ps.withReplies) {
-			query
-				// 1. Not a reply, 2. a self-reply
-				.andWhere(new Brackets(qb => qb
-					.orWhere('note.replyId IS NULL') // 返信ではない
-					.orWhere('note.replyUserId = note.userId')));
+			this.queryService.generateExcludedRepliesQueryForNotes(query, me);
 		}
 
 		this.queryService.generateBlockedHostQueryForNote(query);
diff --git a/packages/backend/src/server/api/endpoints/notes/timeline.ts b/packages/backend/src/server/api/endpoints/notes/timeline.ts
index 790c87ae60..3fbcd82e9b 100644
--- a/packages/backend/src/server/api/endpoints/notes/timeline.ts
+++ b/packages/backend/src/server/api/endpoints/notes/timeline.ts
@@ -128,7 +128,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 	private async getFromDb(ps: { untilId: string | null; sinceId: string | null; limit: number; withFiles: boolean; withRenotes: boolean; withBots: boolean; }, me: MiLocalUser) {
 		//#region Construct query
 		const query = this.queryService.makePaginationQuery(this.notesRepository.createQueryBuilder('note'), ps.sinceId, ps.untilId)
-			// 1. in a channel I follow, 2. my own post, 3. by a user I follow
+			// in a channel I follow OR my own post OR by a user I follow
 			.andWhere(new Brackets(qb => this.queryService
 				.orFollowingChannel(qb, ':meId', 'note.channelId')
 				.orWhere(':meId = note.userId')
@@ -136,10 +136,6 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 					.andFollowingUser(qb2, ':meId', 'note.userId')
 					.andWhere('note.channelId IS NULL'))),
 			))
-			// 1. Not a reply, 2. a self-reply
-			.andWhere(new Brackets(qb => qb
-				.orWhere('note.replyId IS NULL') // 返信ではない
-				.orWhere('note.replyUserId = note.userId')))
 			.setParameters({ meId: me.id })
 			.innerJoinAndSelect('note.user', 'user')
 			.leftJoinAndSelect('note.reply', 'reply')
@@ -148,6 +144,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 			.leftJoinAndSelect('renote.user', 'renoteUser')
 			.limit(ps.limit);
 
+		this.queryService.generateExcludedRepliesQueryForNotes(query, me);
 		this.queryService.generateVisibilityQuery(query, me);
 		this.queryService.generateBlockedHostQueryForNote(query);
 		this.queryService.generateSuspendedUserQueryForNote(query);
diff --git a/packages/backend/src/server/api/endpoints/notes/user-list-timeline.ts b/packages/backend/src/server/api/endpoints/notes/user-list-timeline.ts
index 61a2c65ce4..f6022093e1 100644
--- a/packages/backend/src/server/api/endpoints/notes/user-list-timeline.ts
+++ b/packages/backend/src/server/api/endpoints/notes/user-list-timeline.ts
@@ -157,16 +157,6 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 			.innerJoin(this.userListMembershipsRepository.metadata.targetName, 'userListMemberships', 'userListMemberships.userId = note.userId')
 			.andWhere('userListMemberships.userListId = :userListId', { userListId: list.id })
 			.andWhere('note.channelId IS NULL') // チャンネルノートではない
-			.andWhere(new Brackets(qb => qb
-				// 返信ではない
-				.orWhere('note.replyId IS NULL')
-				// 返信だけど投稿者自身への返信
-				.orWhere('note.replyUserId = note.userId')
-				// 返信だけど自分宛ての返信
-				.orWhere('note.replyUserId = :meId')
-				// 返信だけどwithRepliesがtrueの場合
-				.orWhere('userListMemberships.withReplies = true'),
-			))
 			.setParameters({ meId: me.id })
 			.innerJoinAndSelect('note.user', 'user')
 			.leftJoinAndSelect('note.reply', 'reply')
@@ -175,6 +165,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 			.leftJoinAndSelect('renote.user', 'renoteUser')
 			.limit(ps.limit);
 
+		this.queryService.generateExcludedRepliesQueryForNotes(query, me, 'userListMemberships.withReplies');
 		this.queryService.generateVisibilityQuery(query, me);
 		this.queryService.generateBlockedHostQueryForNote(query);
 		this.queryService.generateSuspendedUserQueryForNote(query);
diff --git a/packages/backend/src/server/api/endpoints/roles/notes.ts b/packages/backend/src/server/api/endpoints/roles/notes.ts
index 33cb3f94a0..a061bba6de 100644
--- a/packages/backend/src/server/api/endpoints/roles/notes.ts
+++ b/packages/backend/src/server/api/endpoints/roles/notes.ts
@@ -110,6 +110,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				.leftJoinAndSelect('reply.user', 'replyUser')
 				.leftJoinAndSelect('renote.user', 'renoteUser');
 
+			this.queryService.generateExcludedRepliesQueryForNotes(query, me);
 			this.queryService.generateBlockedHostQueryForNote(query);
 			this.queryService.generateSuspendedUserQueryForNote(query);
 			this.queryService.generateSilencedUserQueryForNotes(query, me);

From 143373f6c050c1b5bddc0501b5cfe8f0df5df518 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Wed, 13 Aug 2025 12:01:52 -0400
Subject: [PATCH 071/110] regenerate misskey-js

---
 packages/misskey-js/src/autogen/types.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/misskey-js/src/autogen/types.ts b/packages/misskey-js/src/autogen/types.ts
index fa86d3447d..2c00ddac3e 100644
--- a/packages/misskey-js/src/autogen/types.ts
+++ b/packages/misskey-js/src/autogen/types.ts
@@ -4694,6 +4694,7 @@ export type components = {
       mandatoryCW?: string | null;
       /** Format: id */
       userId: string;
+      userHost: string | null;
       user: components['schemas']['UserLite'];
       /**
        * Format: id

From d0605c2220cb0357f4a9b61c316bef8bbb0804b5 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Wed, 13 Aug 2025 12:02:05 -0400
Subject: [PATCH 072/110] fix WebhookTestService

---
 packages/backend/src/core/WebhookTestService.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/backend/src/core/WebhookTestService.ts b/packages/backend/src/core/WebhookTestService.ts
index 6fac67f42d..dd90d147c0 100644
--- a/packages/backend/src/core/WebhookTestService.ts
+++ b/packages/backend/src/core/WebhookTestService.ts
@@ -410,6 +410,7 @@ export class WebhookTestService {
 			isMutingNote: false,
 			isFavorited: false,
 			isRenoted: false,
+			bypassSilence: false,
 			visibility: note.visibility,
 			mentions: note.mentions,
 			visibleUserIds: note.visibleUserIds,

From 26b19c9008a0512518f88fff61bbd0813eb40483 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Wed, 13 Aug 2025 14:46:30 -0400
Subject: [PATCH 073/110] refactor queries in NoteEntityService.pack to load
 less data and cover more edge cases

---
 .../src/core/entities/NoteEntityService.ts    | 149 ++++++++++--------
 1 file changed, 80 insertions(+), 69 deletions(-)

diff --git a/packages/backend/src/core/entities/NoteEntityService.ts b/packages/backend/src/core/entities/NoteEntityService.ts
index d0d7b0e9cf..7c91c7c3ea 100644
--- a/packages/backend/src/core/entities/NoteEntityService.ts
+++ b/packages/backend/src/core/entities/NoteEntityService.ts
@@ -784,75 +784,8 @@ export class NoteEntityService implements OnModuleInit {
 	) {
 		if (notes.length === 0) return [];
 
-		const targetNotesMap = new Map<string, MiNote>();
-		const targetNotesToFetch : string[] = [];
-		for (const note of notes) {
-			if (isPureRenote(note)) {
-				// we may need to fetch 'my reaction' for renote target.
-				if (note.renote) {
-					targetNotesMap.set(note.renote.id, note.renote);
-					if (note.renote.reply) {
-						// idem if the renote is also a reply.
-						targetNotesMap.set(note.renote.reply.id, note.renote.reply);
-					}
-				} else if (options?.detail) {
-					targetNotesToFetch.push(note.renoteId);
-				}
-			} else {
-				if (note.reply) {
-					// idem for OP of a regular reply.
-					targetNotesMap.set(note.reply.id, note.reply);
-				} else if (note.replyId && options?.detail) {
-					targetNotesToFetch.push(note.replyId);
-				}
-
-				targetNotesMap.set(note.id, note);
-			}
-		}
-
-		// Don't fetch notes that were added by ID and then found inline in another note.
-		for (let i = targetNotesToFetch.length - 1; i >= 0; i--) {
-			if (targetNotesMap.has(targetNotesToFetch[i])) {
-				targetNotesToFetch.splice(i, 1);
-			}
-		}
-
-		// Populate any relations that weren't included in the source
-		if (targetNotesToFetch.length > 0) {
-			const newNotes = await this.notesRepository.find({
-				where: {
-					id: In(targetNotesToFetch),
-				},
-				relations: {
-					user: {
-						userProfile: true,
-					},
-					reply: {
-						user: {
-							userProfile: true,
-						},
-					},
-					renote: {
-						user: {
-							userProfile: true,
-						},
-						reply: {
-							user: {
-								userProfile: true,
-							},
-						},
-					},
-					channel: true,
-				},
-			});
-
-			for (const note of newNotes) {
-				targetNotesMap.set(note.id, note);
-			}
-		}
-
-		const targetNotes = Array.from(targetNotesMap.values());
-		const noteIds = Array.from(targetNotesMap.keys());
+		const targetNotes = await this.fetchRequiredNotes(notes, options?.detail ?? false);
+		const noteIds = Array.from(new Set(targetNotes.map(n => n.id)));
 
 		const usersMap = new Map<string, MiUser | string>();
 		const allUsers = notes.flatMap(note => [
@@ -959,6 +892,84 @@ export class NoteEntityService implements OnModuleInit {
 		})));
 	}
 
+	// TODO find a way to de-duplicate pack() calls when we have multiple references to the same note.
+
+	private async fetchRequiredNotes(notes: MiNote[], detail: boolean): Promise<MiNote[]> {
+		const notesMap = new Map<string, MiNote>();
+		const notesToFetch = new Set<string>();
+
+		function addNote(note: string | MiNote | null | undefined) {
+			if (note == null) return;
+
+			if (typeof(note) === 'object') {
+				notesMap.set(note.id, note);
+				notesToFetch.delete(note.id);
+			} else if (detail) {
+				if (!notesMap.has(note)) {
+					notesToFetch.add(note);
+				}
+			}
+		}
+
+		// Enumerate 1st-tier dependencies
+		for (const note of notes) {
+			// Add note itself
+			addNote(note);
+
+			// Add renote
+			if (note.renoteId) {
+				if (note.renote) {
+					addNote(note.renote);
+					addNote(note.renote.reply ?? note.renote.replyId);
+					addNote(note.renote.renote ?? note.renote.renoteId);
+				} else {
+					addNote(note.renoteId);
+				}
+			}
+
+			// Add reply
+			addNote(note.reply ?? note.replyId);
+		}
+
+		// Populate 1st-tier dependencies
+		if (notesToFetch.size > 0) {
+			const newNotes = await this.notesRepository.find({
+				where: {
+					id: In(Array.from(notesToFetch)),
+				},
+				relations: {
+					reply: true,
+					renote: {
+						reply: true,
+						renote: true,
+					},
+					channel: true,
+				},
+			});
+
+			for (const note of newNotes) {
+				addNote(note);
+			}
+
+			notesToFetch.clear();
+		}
+
+		// Extract second-tier dependencies
+		for (const note of Array.from(notesMap.values())) {
+			if (isPureRenote(note) && note.renote) {
+				if (note.renote.reply && !notesMap.has(note.renote.reply.id)) {
+					notesMap.set(note.renote.reply.id, note.renote.reply);
+				}
+
+				if (note.renote.renote && !notesMap.has(note.renote.renote.id)) {
+					notesMap.set(note.renote.renote.id, note.renote.renote);
+				}
+			}
+		}
+
+		return Array.from(notesMap.values());
+	}
+
 	@bindThis
 	public aggregateNoteEmojis(notes: MiNote[]) {
 		let emojis: { name: string | null; host: string | null; }[] = [];

From 738106f493fc7037b5ed5766b439881632a11a54 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Wed, 13 Aug 2025 14:47:11 -0400
Subject: [PATCH 074/110] recurse into boosts in
 generateSilencedUserQueryForNotes (needs a cleanup later, but working for
 now)

---
 packages/backend/src/core/QueryService.ts | 39 +++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/packages/backend/src/core/QueryService.ts b/packages/backend/src/core/QueryService.ts
index cb7cfb4453..dfa38ade87 100644
--- a/packages/backend/src/core/QueryService.ts
+++ b/packages/backend/src/core/QueryService.ts
@@ -313,6 +313,35 @@ export class QueryService {
 			}));
 		};
 
+		const checkForRenote = (_q: WhereExpressionBuilder, key: 'replyUser' | 'renoteUser', userRel: 'renoteReply.user' | 'renoteRenote.user', userAlias: 'renoteReplyUser' | 'renoteRenoteUser') => {
+			const instanceAlias = `${userAlias}Instance`;
+			this.leftJoin(q, `renote.${key}Instance`, instanceAlias); // note->instance
+			this.leftJoin(q, userRel, userAlias); // note->user
+
+			_q.andWhere(new Brackets(qb => {
+				// case 1: user does not exist (note is not reply/renote)
+				qb.orWhere(`renote.${key}Id IS NULL`);
+
+				// case 2: user not silenced AND (instance not silenced OR instance is local)
+				qb.orWhere(new Brackets(qbb => qbb
+					.andWhere(`"${userAlias}"."isSilenced" = false`)
+					.andWhere(new Brackets(qbbb => qbbb
+						.orWhere(`"${instanceAlias}"."isSilenced" = false`)
+						.orWhere(`"renote"."${key}Host" IS NULL`)))));
+
+				if (me) {
+					// case 3: we are the author
+					qb.orWhere(`renote.${key}Id = :meId`);
+
+					// case 4: we are following the user
+					this.orFollowingUser(qb, ':meId', `renote.${key}Id`);
+				}
+
+				// case 5: user is the same
+				qb.orWhere(`renote.${key}Id = renote.userId`);
+			}));
+		};
+
 		// Set parameters only once
 		if (me) {
 			q.setParameters({ meId: me.id });
@@ -324,6 +353,16 @@ export class QueryService {
 		checkFor('replyUser', 'reply.user');
 		checkFor('renoteUser', 'renote.user');
 
+		// Filter for boosts
+		this.leftJoin(q, 'renote.reply', 'renoteReply');
+		this.leftJoin(q, 'renote.renote', 'renoteRenote');
+		q.andWhere(new Brackets(qb => this
+			.orIsNotRenote(qb, 'note')
+			.orWhere(new Brackets(qbb => {
+				checkForRenote(qbb, 'replyUser', 'renoteReply.user', 'renoteReplyUser');
+				checkForRenote(qbb, 'renoteUser', 'renoteRenote.user', 'renoteRenoteUser');
+			}))));
+
 		return q;
 	}
 

From f5df44e028a63960923e11cc7e381c9737cd8ab8 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Wed, 13 Aug 2025 14:47:37 -0400
Subject: [PATCH 075/110] enforce role policies in /notes endpoint

---
 .../backend/src/server/api/endpoints/notes.ts | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/packages/backend/src/server/api/endpoints/notes.ts b/packages/backend/src/server/api/endpoints/notes.ts
index 00a88521fd..38ec1427db 100644
--- a/packages/backend/src/server/api/endpoints/notes.ts
+++ b/packages/backend/src/server/api/endpoints/notes.ts
@@ -9,6 +9,8 @@ import { Endpoint } from '@/server/api/endpoint-base.js';
 import { QueryService } from '@/core/QueryService.js';
 import { NoteEntityService } from '@/core/entities/NoteEntityService.js';
 import { DI } from '@/di-symbols.js';
+import { ApiError } from '@/server/api/error.js';
+import { RoleService } from '@/core/RoleService.js';
 
 export const meta = {
 	tags: ['notes'],
@@ -23,6 +25,19 @@ export const meta = {
 		},
 	},
 
+	errors: {
+		gtlDisabled: {
+			message: 'Global timeline has been disabled.',
+			code: 'GTL_DISABLED',
+			id: '0332fc13-6ab2-4427-ae80-a9fadffd1a6b',
+		},
+		ltlDisabled: {
+			message: 'Local timeline has been disabled.',
+			code: 'LTL_DISABLED',
+			id: '45a6eb02-7695-4393-b023-dd3be9aaaefd',
+		},
+	},
+
 	// 120 calls per minute
 	// 200 ms between calls
 	limit: {
@@ -55,8 +70,17 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 
 		private noteEntityService: NoteEntityService,
 		private queryService: QueryService,
+		private readonly roleService: RoleService,
 	) {
 		super(meta, paramDef, async (ps, me) => {
+			const policies = await this.roleService.getUserPolicies(me ? me.id : null);
+			if (!ps.local && !policies.gtlAvailable) {
+				throw new ApiError(meta.errors.gtlDisabled);
+			}
+			if (ps.local && !policies.ltlAvailable) {
+				throw new ApiError(meta.errors.ltlDisabled);
+			}
+
 			const query = this.queryService.makePaginationQuery(this.notesRepository.createQueryBuilder('note'), ps.sinceId, ps.untilId)
 				.andWhere('note.visibility = \'public\'')
 				.andWhere('note.localOnly = FALSE')

From a756b309f0c2bdae68a23736bf35ad1fc38ca994 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Wed, 13 Aug 2025 14:48:14 -0400
Subject: [PATCH 076/110] don't filter /drive/files/attached-notes when called
 by a moderator

---
 .../endpoints/drive/files/attached-notes.ts    | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/packages/backend/src/server/api/endpoints/drive/files/attached-notes.ts b/packages/backend/src/server/api/endpoints/drive/files/attached-notes.ts
index 9d70044db8..095a497f3a 100644
--- a/packages/backend/src/server/api/endpoints/drive/files/attached-notes.ts
+++ b/packages/backend/src/server/api/endpoints/drive/files/attached-notes.ts
@@ -71,10 +71,12 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 		private roleService: RoleService,
 	) {
 		super(meta, paramDef, async (ps, me) => {
+			const isModerator = await this.roleService.isModerator(me);
+
 			// Fetch file
 			const file = await this.driveFilesRepository.findOneBy({
 				id: ps.fileId,
-				userId: await this.roleService.isModerator(me) ? undefined : me.id,
+				userId: isModerator ? undefined : me.id,
 			});
 
 			if (file == null) {
@@ -90,16 +92,20 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				.leftJoinAndSelect('renote.user', 'renoteUser')
 				.limit(ps.limit);
 
-			this.queryService.generateVisibilityQuery(query, me);
-			this.queryService.generateBlockedHostQueryForNote(query);
-			this.queryService.generateSilencedUserQueryForNotes(query, me);
-			this.queryService.generateMutedUserQueryForNotes(query, me);
-			this.queryService.generateBlockedUserQueryForNotes(query, me);
+			if (!isModerator) {
+				this.queryService.generateVisibilityQuery(query, me);
+				this.queryService.generateBlockedHostQueryForNote(query);
+				this.queryService.generateSilencedUserQueryForNotes(query, me);
+				this.queryService.generateMutedUserQueryForNotes(query, me);
+				this.queryService.generateMutedNoteThreadQuery(query, me);
+				this.queryService.generateBlockedUserQueryForNotes(query, me);
+			}
 
 			const notes = await query.getMany();
 
 			return await this.noteEntityService.packMany(notes, me, {
 				detail: true,
+				skipHide: isModerator,
 			});
 		});
 	}

From 8ca9f90afea7cd623f8499df46bf4fb064878c4d Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Wed, 13 Aug 2025 14:48:39 -0400
Subject: [PATCH 077/110] normalize more endpoint filtering code

---
 .../src/server/api/endpoints/clips/notes.ts   |  1 +
 .../backend/src/server/api/endpoints/notes.ts |  9 +++++---
 .../server/api/endpoints/notes/featured.ts    | 21 +++++++------------
 .../server/api/endpoints/notes/following.ts   |  3 ++-
 .../server/api/endpoints/notes/mentions.ts    |  1 +
 .../endpoints/notes/polls/recommendation.ts   |  3 +++
 .../src/server/api/endpoints/notes/renotes.ts |  1 +
 .../api/endpoints/notes/search-by-tag.ts      | 19 ++++++++++-------
 .../api/endpoints/users/featured-notes.ts     | 19 +++++++----------
 .../src/server/api/endpoints/users/notes.ts   |  6 ++++--
 .../server/api/endpoints/users/reactions.ts   | 14 ++-----------
 11 files changed, 46 insertions(+), 51 deletions(-)

diff --git a/packages/backend/src/server/api/endpoints/clips/notes.ts b/packages/backend/src/server/api/endpoints/clips/notes.ts
index a238d7d002..fbdd8b45b8 100644
--- a/packages/backend/src/server/api/endpoints/clips/notes.ts
+++ b/packages/backend/src/server/api/endpoints/clips/notes.ts
@@ -93,6 +93,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 
 			this.queryService.generateVisibilityQuery(query, me);
 			this.queryService.generateBlockedHostQueryForNote(query);
+			this.queryService.generateExcludedRepliesQueryForNotes(query, me);
 			// this.queryService.generateSuspendedUserQueryForNote(query); // To avoid problems with removing notes, ignoring suspended user for now
 			if (me) {
 				this.queryService.generateMutedUserQueryForNotes(query, me);
diff --git a/packages/backend/src/server/api/endpoints/notes.ts b/packages/backend/src/server/api/endpoints/notes.ts
index 38ec1427db..53e666e1d1 100644
--- a/packages/backend/src/server/api/endpoints/notes.ts
+++ b/packages/backend/src/server/api/endpoints/notes.ts
@@ -92,7 +92,6 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				.limit(ps.limit);
 
 			this.queryService.generateVisibilityQuery(query, me);
-			this.queryService.generateBlockedHostQueryForNote(query);
 			if (me) {
 				this.queryService.generateSilencedUserQueryForNotes(query, me);
 				this.queryService.generateMutedUserQueryForNotes(query, me);
@@ -101,10 +100,14 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 
 			if (ps.local) {
 				query.andWhere('note.userHost IS NULL');
+			} else {
+				this.queryService.generateBlockedHostQueryForNote(query);
 			}
 
-			if (ps.reply !== undefined) {
-				query.andWhere(ps.reply ? 'note.replyId IS NOT NULL' : 'note.replyId IS NULL');
+			if (ps.reply) {
+				this.queryService.generateExcludedRepliesQueryForNotes(query, me);
+			} else if (ps.reply === false) {
+				query.andWhere('note.replyId IS NULL');
 			}
 
 			if (ps.renote !== undefined) {
diff --git a/packages/backend/src/server/api/endpoints/notes/featured.ts b/packages/backend/src/server/api/endpoints/notes/featured.ts
index abb7941d47..ac6dfe8da6 100644
--- a/packages/backend/src/server/api/endpoints/notes/featured.ts
+++ b/packages/backend/src/server/api/endpoints/notes/featured.ts
@@ -102,14 +102,6 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				return [];
 			}
 
-			const [
-				userIdsWhoMeMuting,
-				userIdsWhoBlockingMe,
-			] = me ? await Promise.all([
-				this.cacheService.userMutingsCache.fetch(me.id),
-				this.cacheService.userBlockedCache.fetch(me.id),
-			]) : [new Set<string>(), new Set<string>()];
-
 			const query = this.notesRepository.createQueryBuilder('note')
 				.where('note.id IN (:...noteIds)', { noteIds: noteIds })
 				.innerJoinAndSelect('note.user', 'user')
@@ -120,16 +112,17 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				.leftJoinAndSelect('note.channel', 'channel')
 				.andWhere('user.isExplorable = TRUE');
 
+			this.queryService.generateVisibilityQuery(query, me);
 			this.queryService.generateBlockedHostQueryForNote(query);
 			this.queryService.generateSuspendedUserQueryForNote(query);
 			this.queryService.generateSilencedUserQueryForNotes(query, me);
+			if (me) {
+				this.queryService.generateMutedUserQueryForNotes(query, me);
+				this.queryService.generateBlockedUserQueryForNotes(query, me);
+				this.queryService.generateMutedNoteThreadQuery(query, me);
+			}
 
-			const notes = (await query.getMany()).filter(note => {
-				if (me && isUserRelated(note, userIdsWhoBlockingMe)) return false;
-				if (me && isUserRelated(note, userIdsWhoMeMuting)) return false;
-
-				return true;
-			});
+			const notes = await query.getMany();
 
 			notes.sort((a, b) => a.id > b.id ? -1 : 1);
 
diff --git a/packages/backend/src/server/api/endpoints/notes/following.ts b/packages/backend/src/server/api/endpoints/notes/following.ts
index 6a1a99f73f..8c2938b3bd 100644
--- a/packages/backend/src/server/api/endpoints/notes/following.ts
+++ b/packages/backend/src/server/api/endpoints/notes/following.ts
@@ -151,11 +151,12 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 			query.andWhere('"user"."isSuspended" = false');
 			this.queryService.generateBlockedHostQueryForNote(query);
 			this.queryService.generateSilencedUserQueryForNotes(query, me, ps.list !== 'followers');
+			this.queryService.generateSuspendedUserQueryForNote(query);
 
 			// Respect blocks, mutes, and privacy
 			this.queryService.generateVisibilityQuery(query, me);
 			this.queryService.generateBlockedUserQueryForNotes(query, me);
-			this.queryService.generateMutedUserQueryForNotes(query, me);
+			this.queryService.generateMutedUserQueryForNotes(query, me, ps.list !== 'followers');
 
 			// Support pagination
 			this.queryService
diff --git a/packages/backend/src/server/api/endpoints/notes/mentions.ts b/packages/backend/src/server/api/endpoints/notes/mentions.ts
index 9e19d1676c..05d0a5aebd 100644
--- a/packages/backend/src/server/api/endpoints/notes/mentions.ts
+++ b/packages/backend/src/server/api/endpoints/notes/mentions.ts
@@ -87,6 +87,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 					this.queryService.generateVisibilityQuery(qb, me);
 					this.queryService.generateBlockedHostQueryForNote(qb);
 					this.queryService.generateSuspendedUserQueryForNote(qb);
+					this.queryService.generateSilencedUserQueryForNotes(qb, me);
 					this.queryService.generateMutedUserQueryForNotes(qb, me);
 					this.queryService.generateMutedNoteThreadQuery(qb, me);
 					this.queryService.generateBlockedUserQueryForNotes(qb, me);
diff --git a/packages/backend/src/server/api/endpoints/notes/polls/recommendation.ts b/packages/backend/src/server/api/endpoints/notes/polls/recommendation.ts
index 6f96821a63..6e5fdaa281 100644
--- a/packages/backend/src/server/api/endpoints/notes/polls/recommendation.ts
+++ b/packages/backend/src/server/api/endpoints/notes/polls/recommendation.ts
@@ -137,10 +137,13 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 
 			//#region block/mute/vis
 			this.queryService.generateVisibilityQuery(query, me);
+			this.queryService.generateSilencedUserQueryForNotes(query, me);
+			this.queryService.generateSuspendedUserQueryForNote(query);
 			this.queryService.generateBlockedHostQueryForNote(query);
 			if (me) {
 				this.queryService.generateBlockedUserQueryForNotes(query, me);
 				this.queryService.generateMutedUserQueryForNotes(query, me);
+				this.queryService.generateMutedNoteThreadQuery(query, me);
 			}
 			//#endregion
 
diff --git a/packages/backend/src/server/api/endpoints/notes/renotes.ts b/packages/backend/src/server/api/endpoints/notes/renotes.ts
index 71c40421b9..cc38e9a405 100644
--- a/packages/backend/src/server/api/endpoints/notes/renotes.ts
+++ b/packages/backend/src/server/api/endpoints/notes/renotes.ts
@@ -97,6 +97,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 			if (me) {
 				this.queryService.generateMutedUserQueryForNotes(query, me);
 				this.queryService.generateBlockedUserQueryForNotes(query, me);
+				this.queryService.generateMutedNoteThreadQuery(query, me);
 			}
 
 			const renotes = await query.limit(ps.limit).getMany();
diff --git a/packages/backend/src/server/api/endpoints/notes/search-by-tag.ts b/packages/backend/src/server/api/endpoints/notes/search-by-tag.ts
index 5ef54856da..fa962feca7 100644
--- a/packages/backend/src/server/api/endpoints/notes/search-by-tag.ts
+++ b/packages/backend/src/server/api/endpoints/notes/search-by-tag.ts
@@ -98,7 +98,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 			this.queryService.generateSilencedUserQueryForNotes(query, me);
 			if (me) this.queryService.generateMutedUserQueryForNotes(query, me);
 			if (me) this.queryService.generateBlockedUserQueryForNotes(query, me);
-			if (me) this.queryService.generateMutedUserRenotesQueryForNotes(query, me);
+			if (me) this.queryService.generateMutedNoteThreadQuery(query, me);
 
 			if (!this.serverSettings.enableBotTrending) query.andWhere('user.isBot = FALSE');
 
@@ -123,19 +123,24 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				throw e;
 			}
 
-			if (ps.reply != null) {
+			if (ps.reply === false) {
+				query.andWhere('note.replyId IS NULL');
+			} else {
 				if (ps.reply) {
 					query.andWhere('note.replyId IS NOT NULL');
-				} else {
-					query.andWhere('note.replyId IS NULL');
 				}
+				this.queryService.generateExcludedRepliesQueryForNotes(query, me);
 			}
 
-			if (ps.renote != null) {
+			if (ps.renote === false) {
+				this.queryService.andIsNotRenote(query, 'note');
+			} else {
 				if (ps.renote) {
 					this.queryService.andIsRenote(query, 'note');
-				} else {
-					this.queryService.andIsNotRenote(query, 'note');
+				}
+
+				if (me) {
+					this.queryService.generateMutedUserRenotesQueryForNotes(query, me);
 				}
 			}
 
diff --git a/packages/backend/src/server/api/endpoints/users/featured-notes.ts b/packages/backend/src/server/api/endpoints/users/featured-notes.ts
index f77e81708a..cf328ad71c 100644
--- a/packages/backend/src/server/api/endpoints/users/featured-notes.ts
+++ b/packages/backend/src/server/api/endpoints/users/featured-notes.ts
@@ -78,12 +78,6 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				return [];
 			}
 
-			const [
-				userIdsWhoMeMuting,
-			] = me ? await Promise.all([
-				this.cacheService.userMutingsCache.fetch(me.id),
-			]) : [new Set<string>()];
-
 			const query = this.notesRepository.createQueryBuilder('note')
 				.where('note.id IN (:...noteIds)', { noteIds: noteIds })
 				.innerJoinAndSelect('note.user', 'user')
@@ -96,13 +90,14 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 			this.queryService.generateBlockedHostQueryForNote(query);
 			this.queryService.generateSuspendedUserQueryForNote(query);
 			this.queryService.generateSilencedUserQueryForNotes(query, me, true);
+			this.queryService.generateExcludedRepliesQueryForNotes(query, me);
+			if (me) {
+				this.queryService.generateBlockedUserQueryForNotes(query, me);
+				this.queryService.generateMutedNoteThreadQuery(query, me);
+				this.queryService.generateMutedUserQueryForNotes(query, me, true);
+			}
 
-			const notes = (await query.getMany()).filter(note => {
-				if (me && isUserRelated(note, userIdsWhoBlockingMe, false)) return false;
-				if (me && isUserRelated(note, userIdsWhoMeMuting, true)) return false;
-
-				return true;
-			});
+			const notes = await query.getMany();
 
 			notes.sort((a, b) => a.id > b.id ? -1 : 1);
 
diff --git a/packages/backend/src/server/api/endpoints/users/notes.ts b/packages/backend/src/server/api/endpoints/users/notes.ts
index d0363c83f8..2822b52ec8 100644
--- a/packages/backend/src/server/api/endpoints/users/notes.ts
+++ b/packages/backend/src/server/api/endpoints/users/notes.ts
@@ -215,13 +215,13 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 			query.andWhere('note.channelId IS NULL');
 		}
 
-		this.queryService.generateVisibilityQuery(query, me);
 		this.queryService.generateBlockedHostQueryForNote(query, true);
 		this.queryService.generateSuspendedUserQueryForNote(query, true);
 		this.queryService.generateSilencedUserQueryForNotes(query, me, true);
 		if (me) {
 			this.queryService.generateMutedUserQueryForNotes(query, me, true);
 			this.queryService.generateBlockedUserQueryForNotes(query, me);
+			this.queryService.generateMutedNoteThreadQuery(query, me);
 		}
 
 		if (ps.withFiles) {
@@ -239,13 +239,15 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 		if (!ps.withRepliesToOthers && !ps.withRepliesToSelf) {
 			query.andWhere('reply.id IS NULL');
 		} else if (!ps.withRepliesToOthers) {
-			query.andWhere('(reply.id IS NULL OR reply."userId" = note."userId")');
+			this.queryService.generateExcludedRepliesQueryForNotes(query, me);
 		} else if (!ps.withRepliesToSelf) {
 			query.andWhere('(reply.id IS NULL OR reply."userId" != note."userId")');
 		}
 
 		if (!ps.withNonPublic) {
 			query.andWhere('note.visibility = \'public\'');
+		} else {
+			this.queryService.generateVisibilityQuery(query, me);
 		}
 
 		if (!ps.withBots) {
diff --git a/packages/backend/src/server/api/endpoints/users/reactions.ts b/packages/backend/src/server/api/endpoints/users/reactions.ts
index 16e19fc1b5..8409631c8e 100644
--- a/packages/backend/src/server/api/endpoints/users/reactions.ts
+++ b/packages/backend/src/server/api/endpoints/users/reactions.ts
@@ -100,8 +100,6 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				}
 			}
 
-			const userIdsWhoMeMuting = me ? await this.cacheService.userMutingsCache.fetch(me.id) : new Set<string>();
-
 			const query = this.queryService.makePaginationQuery(this.noteReactionsRepository.createQueryBuilder('reaction'),
 				ps.sinceId, ps.untilId, ps.sinceDate, ps.untilDate)
 				.andWhere('reaction.userId = :userId', { userId: ps.userId })
@@ -117,20 +115,12 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 			this.queryService.generateSuspendedUserQueryForNote(query);
 			this.queryService.generateSilencedUserQueryForNotes(query, me, true);
 			if (me) {
-				this.queryService.generateMutedUserQueryForNotes(query, me);
+				this.queryService.generateMutedUserQueryForNotes(query, me, true);
 				this.queryService.generateBlockedUserQueryForNotes(query, me);
 				this.queryService.generateMutedUserRenotesQueryForNotes(query, me);
 			}
 
-			const reactions = (await query
-				.limit(ps.limit)
-				.getMany()).filter(reaction => {
-				if (reaction.note?.userId === ps.userId) return true; // we can see reactions to note of requesting user
-				if (me && isUserRelated(reaction.note, userIdsWhoBlockingMe)) return false;
-				if (me && isUserRelated(reaction.note, userIdsWhoMeMuting)) return false;
-
-				return true;
-			});
+			const reactions = await query.limit(ps.limit).getMany();
 
 			return await this.noteReactionEntityService.packMany(reactions, me, { withNote: true });
 		});

From a63c66c07303e404fc0b935840b6786224cebc05 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Thu, 14 Aug 2025 01:19:19 -0400
Subject: [PATCH 078/110] set packedNote.bypassSilence when it's our own note

---
 .../backend/src/core/entities/NoteEntityService.ts   | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/packages/backend/src/core/entities/NoteEntityService.ts b/packages/backend/src/core/entities/NoteEntityService.ts
index 7c91c7c3ea..b3313abe08 100644
--- a/packages/backend/src/core/entities/NoteEntityService.ts
+++ b/packages/backend/src/core/entities/NoteEntityService.ts
@@ -674,6 +674,8 @@ export class NoteEntityService implements OnModuleInit {
 					.getExists() : false),
 		]);
 
+		const bypassSilence = opts.bypassSilence || note.userId === meId;
+
 		const packed: Packed<'Note'> = await awaitAll({
 			id: note.id,
 			threadId,
@@ -722,7 +724,7 @@ export class NoteEntityService implements OnModuleInit {
 			isMutingNote: mutedNotes.has(note.id),
 			isFavorited,
 			isRenoted,
-			bypassSilence: opts.bypassSilence ?? false,
+			bypassSilence,
 
 			...(meId && Object.keys(reactions).length > 0 ? {
 				myReaction: this.populateMyReaction({
@@ -742,8 +744,8 @@ export class NoteEntityService implements OnModuleInit {
 					withReactionAndUserPairCache: opts.withReactionAndUserPairCache,
 					_hint_: options?._hint_,
 
-					// Don't silence target of self-renote, since the outer note will already be silenced.
-					bypassSilence: options?.bypassSilence || note.userId === note.replyUserId,
+					// Don't silence target of self-reply, since the outer note will already be silenced.
+					bypassSilence: bypassSilence || note.userId === note.replyUserId,
 				}) : undefined,
 
 				renote: note.renoteId ? this.pack(note.renote ?? opts._hint_?.notes.get(note.renoteId) ?? note.renoteId, me, {
@@ -752,8 +754,8 @@ export class NoteEntityService implements OnModuleInit {
 					withReactionAndUserPairCache: opts.withReactionAndUserPairCache,
 					_hint_: options?._hint_,
 
-					// Don't silence target of self-reply, since the outer note will already be silenced.
-					bypassSilence: options?.bypassSilence || note.userId === note.renoteUserId,
+					// Don't silence target of self-renote, since the outer note will already be silenced.
+					bypassSilence: bypassSilence || note.userId === note.renoteUserId,
 				}) : undefined,
 			} : {}),
 		});

From 877e93a8473374645436caf7e12e57375ee4e044 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Thu, 14 Aug 2025 01:19:43 -0400
Subject: [PATCH 079/110] don't hide replies in clips

---
 packages/backend/src/server/api/endpoints/clips/notes.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/backend/src/server/api/endpoints/clips/notes.ts b/packages/backend/src/server/api/endpoints/clips/notes.ts
index fbdd8b45b8..a238d7d002 100644
--- a/packages/backend/src/server/api/endpoints/clips/notes.ts
+++ b/packages/backend/src/server/api/endpoints/clips/notes.ts
@@ -93,7 +93,6 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 
 			this.queryService.generateVisibilityQuery(query, me);
 			this.queryService.generateBlockedHostQueryForNote(query);
-			this.queryService.generateExcludedRepliesQueryForNotes(query, me);
 			// this.queryService.generateSuspendedUserQueryForNote(query); // To avoid problems with removing notes, ignoring suspended user for now
 			if (me) {
 				this.queryService.generateMutedUserQueryForNotes(query, me);

From fbf6fc0c5446796786fb0ec4406bb6b9778f0792 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Thu, 14 Aug 2025 01:20:09 -0400
Subject: [PATCH 080/110] rename includeSilencedAuthor to ignoreSilencedAuthor
 for readability

---
 packages/backend/src/core/NoteVisibilityService.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/backend/src/core/NoteVisibilityService.ts b/packages/backend/src/core/NoteVisibilityService.ts
index 8df83b4c5e..8035dab59c 100644
--- a/packages/backend/src/core/NoteVisibilityService.ts
+++ b/packages/backend/src/core/NoteVisibilityService.ts
@@ -338,14 +338,14 @@ export class NoteVisibilityService {
 		return false;
 	}
 
-	private shouldSilenceForSilence(note: PopulatedNote, user: PopulatedUser, data: NoteVisibilityData, includeSilencedAuthor: boolean): boolean {
+	private shouldSilenceForSilence(note: PopulatedNote, user: PopulatedUser, data: NoteVisibilityData, ignoreSilencedAuthor: boolean): boolean {
 		// Don't silence if it's us
 		if (note.userId === user?.id) return false;
 
 		// Don't silence if we're following
 		if (data.userFollowings?.has(note.userId)) return false;
 
-		if (!includeSilencedAuthor) {
+		if (!ignoreSilencedAuthor) {
 			// Silence if user is silenced
 			if (note.user.isSilenced) return true;
 

From 4b37bb23a2b6d40b702f353b4bf81a2fcf0032fa Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Thu, 14 Aug 2025 01:20:30 -0400
Subject: [PATCH 081/110] expose federatedInstanceCache for access to bulk
 cache APIs

---
 .../src/core/FederatedInstanceService.ts      | 112 +++++++++++++-----
 1 file changed, 84 insertions(+), 28 deletions(-)

diff --git a/packages/backend/src/core/FederatedInstanceService.ts b/packages/backend/src/core/FederatedInstanceService.ts
index 34df10f0ff..1b97820541 100644
--- a/packages/backend/src/core/FederatedInstanceService.ts
+++ b/packages/backend/src/core/FederatedInstanceService.ts
@@ -5,37 +5,72 @@
 
 import { Inject, Injectable, OnApplicationShutdown } from '@nestjs/common';
 import * as Redis from 'ioredis';
+import { In } from 'typeorm';
 import type { InstancesRepository, MiMeta } from '@/models/_.js';
 import type { MiInstance } from '@/models/Instance.js';
-import { MemoryKVCache } from '@/misc/cache.js';
 import { IdService } from '@/core/IdService.js';
 import { DI } from '@/di-symbols.js';
 import { UtilityService } from '@/core/UtilityService.js';
 import { bindThis } from '@/decorators.js';
-import type { GlobalEvents } from '@/core/GlobalEventService.js';
-import { Serialized } from '@/types.js';
-import { diffArrays, diffArraysSimple } from '@/misc/diff-arrays.js';
+import { diffArraysSimple } from '@/misc/diff-arrays.js';
+import { QuantumKVCache } from '@/misc/QuantumKVCache.js';
+import { InternalEventService } from '@/core/InternalEventService.js';
+import type { QueryDeepPartialEntity } from 'typeorm/query-builder/QueryPartialEntity.js';
 
 @Injectable()
 export class FederatedInstanceService implements OnApplicationShutdown {
-	private readonly federatedInstanceCache: MemoryKVCache<MiInstance | null>;
+	public readonly federatedInstanceCache: QuantumKVCache<MiInstance>;
 
 	constructor(
-		@Inject(DI.redisForSub)
-		private redisForSub: Redis.Redis,
-
 		@Inject(DI.instancesRepository)
 		private instancesRepository: InstancesRepository,
 
+		@Inject(DI.meta)
+		private readonly meta: MiMeta,
+
 		private utilityService: UtilityService,
 		private idService: IdService,
+		private readonly internalEventService: InternalEventService,
 	) {
-		this.federatedInstanceCache = new MemoryKVCache(1000 * 60 * 3); // 3m
-		this.redisForSub.on('message', this.onMessage);
+		this.federatedInstanceCache = new QuantumKVCache(this.internalEventService, 'federatedInstance', {
+			lifetime: 1000 * 60 * 3, // 3 minutes
+			fetcher: async key => {
+				const host = this.utilityService.toPuny(key);
+				let instance = await this.instancesRepository.findOneBy({ host });
+				if (instance == null) {
+					await this.instancesRepository.createQueryBuilder('instance')
+						.insert()
+						.values({
+							id: this.idService.gen(),
+							host,
+							firstRetrievedAt: new Date(),
+							isBlocked: this.utilityService.isBlockedHost(host),
+							isSilenced: this.utilityService.isSilencedHost(host),
+							isMediaSilenced: this.utilityService.isMediaSilencedHost(host),
+							isAllowListed: this.utilityService.isAllowListedHost(host),
+							isBubbled: this.utilityService.isBubbledHost(host),
+						})
+						.orIgnore()
+						.execute();
+
+					instance = await this.instancesRepository.findOneByOrFail({ host });
+				}
+				return instance;
+			},
+			bulkFetcher: async keys => {
+				const hosts = keys.map(key => this.utilityService.toPuny(key));
+				const instances = await this.instancesRepository.findBy({ host: In(hosts) });
+				return new Map(instances.map(i => [i.host, i]));
+			},
+		});
+
+		this.internalEventService.on('metaUpdated', this.onMetaUpdated);
 	}
 
 	@bindThis
 	public async fetchOrRegister(host: string): Promise<MiInstance> {
+		return this.federatedInstanceCache.fetch(host);
+		/*
 		host = this.utilityService.toPuny(host);
 
 		const cached = this.federatedInstanceCache.get(host);
@@ -61,12 +96,15 @@ export class FederatedInstanceService implements OnApplicationShutdown {
 			index = await this.instancesRepository.findOneByOrFail({ host });
 		}
 
-		this.federatedInstanceCache.set(host, index);
+		await this.federatedInstanceCache.set(host, index);
 		return index;
+		 */
 	}
 
 	@bindThis
-	public async fetch(host: string): Promise<MiInstance | null> {
+	public async fetch(host: string): Promise<MiInstance> {
+		return this.federatedInstanceCache.fetch(host);
+		/*
 		host = this.utilityService.toPuny(host);
 
 		const cached = this.federatedInstanceCache.get(host);
@@ -75,29 +113,54 @@ export class FederatedInstanceService implements OnApplicationShutdown {
 		const index = await this.instancesRepository.findOneBy({ host });
 
 		if (index == null) {
-			this.federatedInstanceCache.set(host, null);
+			await this.federatedInstanceCache.set(host, null);
 			return null;
 		} else {
-			this.federatedInstanceCache.set(host, index);
+			await this.federatedInstanceCache.set(host, index);
 			return index;
 		}
+		*/
 	}
 
 	@bindThis
-	public async update(id: MiInstance['id'], data: Partial<MiInstance>): Promise<void> {
+	public async update(id: MiInstance['id'], data: QueryDeepPartialEntity<MiInstance>): Promise<MiInstance> {
 		const result = await this.instancesRepository.createQueryBuilder().update()
 			.set(data)
 			.where('id = :id', { id })
 			.returning('*')
 			.execute()
 			.then((response) => {
-				return response.raw[0];
+				return response.raw[0] as MiInstance;
 			});
 
-		this.federatedInstanceCache.set(result.host, result);
+		await this.federatedInstanceCache.set(result.host, result);
+
+		return result;
 	}
 
-	private syncCache(before: Serialized<MiMeta | undefined>, after: Serialized<MiMeta>): void {
+	/**
+	 * Gets all instances in the allowlist (meta.federationHosts).
+	 */
+	@bindThis
+	public async getAllowList(): Promise<MiInstance[]> {
+		const allowedHosts = new Set(this.meta.federationHosts);
+		this.meta.blockedHosts.forEach(h => allowedHosts.delete(h));
+
+		const instances = await this.federatedInstanceCache.fetchMany(this.meta.federationHosts);
+		return instances.map(i => i[1]);
+	}
+
+	/**
+	 * Gets all instances in the denylist (meta.blockedHosts).
+	 */
+	@bindThis
+	public async getDenyList(): Promise<MiInstance[]> {
+		const instances = await this.federatedInstanceCache.fetchMany(this.meta.blockedHosts);
+		return instances.map(i => i[1]);
+	}
+
+	// This gets fired *in each process* so don't do anything to trigger cache notifications!
+	private syncCache(before: MiMeta | undefined, after: MiMeta): void {
 		const changed =
 			diffArraysSimple(before?.blockedHosts, after.blockedHosts) ||
 			diffArraysSimple(before?.silencedHosts, after.silencedHosts) ||
@@ -112,20 +175,13 @@ export class FederatedInstanceService implements OnApplicationShutdown {
 	}
 
 	@bindThis
-	private async onMessage(_: string, data: string): Promise<void> {
-		const obj = JSON.parse(data);
-
-		if (obj.channel === 'internal') {
-			const { type, body } = obj.message as GlobalEvents['internal']['payload'];
-			if (type === 'metaUpdated') {
-				this.syncCache(body.before, body.after);
-			}
-		}
+	private async onMetaUpdated(body: { before?: MiMeta; after: MiMeta; }) {
+		this.syncCache(body.before, body.after);
 	}
 
 	@bindThis
 	public dispose(): void {
-		this.redisForSub.off('message', this.onMessage);
+		this.internalEventService.off('metaUpdated', this.onMetaUpdated);
 		this.federatedInstanceCache.dispose();
 	}
 

From 1e2f34c8138378bce8ff1738f06a7c8191a5967e Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Thu, 14 Aug 2025 01:21:00 -0400
Subject: [PATCH 082/110] make sure that fanout timeline notes are fully
 populated

---
 .../src/core/FanoutTimelineEndpointService.ts | 83 +++++++++++++++++--
 1 file changed, 78 insertions(+), 5 deletions(-)

diff --git a/packages/backend/src/core/FanoutTimelineEndpointService.ts b/packages/backend/src/core/FanoutTimelineEndpointService.ts
index a8c124077e..76040f6c02 100644
--- a/packages/backend/src/core/FanoutTimelineEndpointService.ts
+++ b/packages/backend/src/core/FanoutTimelineEndpointService.ts
@@ -20,6 +20,7 @@ import { CacheService } from '@/core/CacheService.js';
 import { isReply } from '@/misc/is-reply.js';
 import { isInstanceMuted } from '@/misc/is-instance-muted.js';
 import { NoteVisibilityService, PopulatedNote } from '@/core/NoteVisibilityService.js';
+import { FederatedInstanceService } from '@/core/FederatedInstanceService.js';
 
 type TimelineOptions = {
 	untilId: string | null,
@@ -58,6 +59,7 @@ export class FanoutTimelineEndpointService {
 		private fanoutTimelineService: FanoutTimelineService,
 		private utilityService: UtilityService,
 		private readonly noteVisibilityService: NoteVisibilityService,
+		private readonly federatedInstanceService: FederatedInstanceService,
 	) {
 	}
 
@@ -199,17 +201,88 @@ export class FanoutTimelineEndpointService {
 	private async getAndFilterFromDb(noteIds: string[], noteFilter: (note: MiNote) => boolean, idCompare: (a: string, b: string) => number): Promise<MiNote[]> {
 		const query = this.notesRepository.createQueryBuilder('note')
 			.where('note.id IN (:...noteIds)', { noteIds: noteIds })
-			.innerJoinAndSelect('note.user', 'user')
 			.leftJoinAndSelect('note.reply', 'reply')
 			.leftJoinAndSelect('note.renote', 'renote')
 			.leftJoinAndSelect('note.channel', 'channel')
-			.leftJoinAndSelect('reply.user', 'replyUser')
-			.leftJoinAndSelect('renote.user', 'renoteUser');
 
-		const notes = (await query.getMany()).filter(noteFilter);
+			// Needed for populated note
+			.leftJoinAndSelect('renote.renote', 'renoteRenote')
+			.leftJoinAndSelect('renote.reply', 'renoteReply')
+		;
 
-		notes.sort((a, b) => idCompare(a.id, b.id));
+		const notes = await query.getMany();
+
+		// Manually populate user/instance since it's cacheable and avoids many joins.
+		// These fields *must* be populated or NoteVisibilityService won't work right!
+		await this.populateUsers(notes);
+
+		notes.filter(noteFilter).sort((a, b) => idCompare(a.id, b.id));
 
 		return notes;
 	}
+
+	private async populateUsers(notes: MiNote[]): Promise<void> {
+		// Enumerate users and instances
+		const usersToFetch = new Set<string>();
+		const instancesToFetch = new Set<string>();
+		for (const note of notes) {
+			usersToFetch.add(note.userId);
+			if (note.userHost) {
+				instancesToFetch.add(note.userHost);
+			}
+			if (note.reply) {
+				usersToFetch.add(note.reply.userId);
+				if (note.replyUserHost) {
+					instancesToFetch.add(note.replyUserHost);
+				}
+			}
+			if (note.renote) {
+				usersToFetch.add(note.renote.userId);
+				if (note.renoteUserHost) {
+					instancesToFetch.add(note.renoteUserHost);
+				}
+				if (note.renote.reply) {
+					usersToFetch.add(note.renote.reply.userId);
+					if (note.renote.replyUserHost) {
+						instancesToFetch.add(note.renote.replyUserHost);
+					}
+				}
+				if (note.renote.renote) {
+					usersToFetch.add(note.renote.renote.userId);
+					if (note.renote.renoteUserHost) {
+						instancesToFetch.add(note.renote.renoteUserHost);
+					}
+				}
+			}
+		}
+
+		// Fetch everything and populate users
+		const [users, instances] = await Promise.all([
+			this.cacheService.getUsers(usersToFetch),
+			this.federatedInstanceService.federatedInstanceCache.fetchMany(instancesToFetch).then(i => new Map(i)),
+		]);
+		for (const [id, user] of Array.from(users)) {
+			users.set(id, {
+				...user,
+				instance: (user.host && instances.get(user.host)) || null,
+			});
+		}
+
+		// Assign users back to notes
+		for (const note of notes) {
+			note.user = users.get(note.userId) ?? null;
+			if (note.reply) {
+				note.reply.user = users.get(note.reply.userId) ?? null;
+			}
+			if (note.renote) {
+				note.renote.user = users.get(note.renote.userId) ?? null;
+				if (note.renote.reply) {
+					note.renote.reply.user = users.get(note.renote.reply.userId) ?? null;
+				}
+				if (note.renote.renote) {
+					note.renote.renote.user = users.get(note.renote.renote.userId) ?? null;
+				}
+			}
+		}
+	}
 }

From e6547be0a22596380d14c2a450d723a92d65ff6c Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Thu, 14 Aug 2025 02:35:07 -0400
Subject: [PATCH 083/110] tweak populateUsers for consistency between user &
 instance code paths

---
 .../src/core/FanoutTimelineEndpointService.ts    | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/backend/src/core/FanoutTimelineEndpointService.ts b/packages/backend/src/core/FanoutTimelineEndpointService.ts
index 76040f6c02..8c3c8687b8 100644
--- a/packages/backend/src/core/FanoutTimelineEndpointService.ts
+++ b/packages/backend/src/core/FanoutTimelineEndpointService.ts
@@ -232,25 +232,25 @@ export class FanoutTimelineEndpointService {
 			}
 			if (note.reply) {
 				usersToFetch.add(note.reply.userId);
-				if (note.replyUserHost) {
-					instancesToFetch.add(note.replyUserHost);
+				if (note.reply.userHost) {
+					instancesToFetch.add(note.reply.userHost);
 				}
 			}
 			if (note.renote) {
 				usersToFetch.add(note.renote.userId);
-				if (note.renoteUserHost) {
-					instancesToFetch.add(note.renoteUserHost);
+				if (note.renote.userHost) {
+					instancesToFetch.add(note.renote.userHost);
 				}
 				if (note.renote.reply) {
 					usersToFetch.add(note.renote.reply.userId);
-					if (note.renote.replyUserHost) {
-						instancesToFetch.add(note.renote.replyUserHost);
+					if (note.renote.reply.userHost) {
+						instancesToFetch.add(note.renote.reply.userHost);
 					}
 				}
 				if (note.renote.renote) {
 					usersToFetch.add(note.renote.renote.userId);
-					if (note.renote.renoteUserHost) {
-						instancesToFetch.add(note.renote.renoteUserHost);
+					if (note.renote.renote.userHost) {
+						instancesToFetch.add(note.renote.renote.userHost);
 					}
 				}
 			}

From 023d4dd850795a6e68a9d01634e77bb8f7e7be2d Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Thu, 14 Aug 2025 02:35:22 -0400
Subject: [PATCH 084/110] fix ignoring the result of .filter() in
 FanoutTimelineEndpointService

---
 packages/backend/src/core/FanoutTimelineEndpointService.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/backend/src/core/FanoutTimelineEndpointService.ts b/packages/backend/src/core/FanoutTimelineEndpointService.ts
index 8c3c8687b8..3637bb0358 100644
--- a/packages/backend/src/core/FanoutTimelineEndpointService.ts
+++ b/packages/backend/src/core/FanoutTimelineEndpointService.ts
@@ -216,9 +216,9 @@ export class FanoutTimelineEndpointService {
 		// These fields *must* be populated or NoteVisibilityService won't work right!
 		await this.populateUsers(notes);
 
-		notes.filter(noteFilter).sort((a, b) => idCompare(a.id, b.id));
-
-		return notes;
+		return notes
+			.filter(noteFilter)
+			.sort((a, b) => idCompare(a.id, b.id));
 	}
 
 	private async populateUsers(notes: MiNote[]): Promise<void> {

From bac4d437735bf9589e3bd27ec3cbc442c2857e32 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Thu, 14 Aug 2025 02:35:38 -0400
Subject: [PATCH 085/110] avoid creating an unnecessary Map in
 FederatedInstanceService

---
 packages/backend/src/core/FederatedInstanceService.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/backend/src/core/FederatedInstanceService.ts b/packages/backend/src/core/FederatedInstanceService.ts
index 1b97820541..e549dbc93e 100644
--- a/packages/backend/src/core/FederatedInstanceService.ts
+++ b/packages/backend/src/core/FederatedInstanceService.ts
@@ -60,7 +60,7 @@ export class FederatedInstanceService implements OnApplicationShutdown {
 			bulkFetcher: async keys => {
 				const hosts = keys.map(key => this.utilityService.toPuny(key));
 				const instances = await this.instancesRepository.findBy({ host: In(hosts) });
-				return new Map(instances.map(i => [i.host, i]));
+				return instances.map(i => [i.host, i]);
 			},
 		});
 

From 2bb7980fe7fa11df3f1000375b62a8f7e6c56bb6 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Thu, 14 Aug 2025 02:35:54 -0400
Subject: [PATCH 086/110] deep-copy notes before syncing visibility

---
 packages/backend/src/core/NoteVisibilityService.ts | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/packages/backend/src/core/NoteVisibilityService.ts b/packages/backend/src/core/NoteVisibilityService.ts
index 8035dab59c..b4bede4a52 100644
--- a/packages/backend/src/core/NoteVisibilityService.ts
+++ b/packages/backend/src/core/NoteVisibilityService.ts
@@ -167,8 +167,16 @@ export class NoteVisibilityService {
 		// Copy note since we mutate it below
 		note = {
 			...note,
-			renote: note.renote ? { ...note.renote } : null,
-			reply: note.reply ? { ...note.reply } : null,
+			renote: note.renote ? {
+				...note.renote,
+				renote: note.renote.renote ? { ...note.renote.renote } : null,
+				reply: note.renote.reply ? { ...note.renote.reply } : null,
+			} : null,
+			reply: note.reply ? {
+				...note.reply,
+				renote: note.reply.renote ? { ...note.reply.renote } : null,
+				reply: note.reply.reply ? { ...note.reply.reply } : null,
+			} : null,
 		} as PopulatedNote;
 
 		this.syncVisibility(note);

From b289a0c09149a3482332bc775b3ff2abd5447313 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Thu, 14 Aug 2025 02:36:10 -0400
Subject: [PATCH 087/110] don't copy note multiple times while recursing in
 checkNoteVisibility

---
 .../backend/src/core/NoteVisibilityService.ts   | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/packages/backend/src/core/NoteVisibilityService.ts b/packages/backend/src/core/NoteVisibilityService.ts
index b4bede4a52..10dbdc4547 100644
--- a/packages/backend/src/core/NoteVisibilityService.ts
+++ b/packages/backend/src/core/NoteVisibilityService.ts
@@ -180,24 +180,25 @@ export class NoteVisibilityService {
 		} as PopulatedNote;
 
 		this.syncVisibility(note);
+		return this.checkNoteVisibilityFor(note, user, opts);
+	}
 
+	private checkNoteVisibilityFor(note: PopulatedNote, user: PopulatedUser, opts: { filters?: NoteVisibilityFilters, data: NoteVisibilityData }): NoteVisibilityResult {
 		const accessible = this.isAccessible(note, user, opts.data);
-		const redact = this.shouldRedact(note, user, opts.data);
+		const redact = !accessible || this.shouldRedact(note, user);
 		const silence = this.shouldSilence(note, user, opts.data, opts.filters);
 
-		const baseVisibility = { accessible, redact, silence };
-
 		// For boosts (pure renotes), we must recurse and pick the lowest common access level.
 		if (isPopulatedBoost(note)) {
-			const boostVisibility = this.checkNoteVisibility(note.renote, user, opts);
+			const boostVisibility = this.checkNoteVisibilityFor(note.renote, user, opts);
 			return {
-				accessible: baseVisibility.accessible && boostVisibility.accessible,
-				redact: baseVisibility.redact || boostVisibility.redact,
-				silence: baseVisibility.silence || boostVisibility.silence,
+				accessible: accessible && boostVisibility.accessible,
+				redact: redact || boostVisibility.redact,
+				silence: silence || boostVisibility.silence,
 			};
 		}
 
-		return baseVisibility;
+		return { accessible, redact, silence };
 	}
 
 	// Based on NoteEntityService.isVisibleForMe

From c9fc153fe23a5501afe377f8c38e67ee810d3da4 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Thu, 14 Aug 2025 02:36:32 -0400
Subject: [PATCH 088/110] remove un-necessary call to isAccessible from
 shouldRedact

---
 packages/backend/src/core/NoteVisibilityService.ts | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/packages/backend/src/core/NoteVisibilityService.ts b/packages/backend/src/core/NoteVisibilityService.ts
index 10dbdc4547..884efe6a83 100644
--- a/packages/backend/src/core/NoteVisibilityService.ts
+++ b/packages/backend/src/core/NoteVisibilityService.ts
@@ -280,7 +280,7 @@ export class NoteVisibilityService {
 	}
 
 	// Based on NoteEntityService.hideNote
-	private shouldRedact(note: PopulatedNote, user: PopulatedUser, data: NoteVisibilityData): boolean {
+	private shouldRedact(note: PopulatedNote, user: PopulatedUser): boolean {
 		// Never redact our own notes
 		if (user?.id === note.userId) return false;
 
@@ -300,12 +300,6 @@ export class NoteVisibilityService {
 			if (hiddenOpt1 || hiddenOpt2) return true;
 		}
 
-		// Redact if inaccessible.
-		// We have to repeat the check in case note visibility changed in treatVisibility!
-		if (!this.isAccessible(note, user, data)) {
-			return true;
-		}
-
 		// Otherwise don't redact
 		return false;
 	}

From 929ddb7e76f8a38fcade54a87276d56e0be4cc32 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Thu, 14 Aug 2025 09:54:03 -0400
Subject: [PATCH 089/110] fix excludeAuthor check in
 QueryService.generateBlockedHostQueryForNote

---
 packages/backend/src/core/QueryService.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/backend/src/core/QueryService.ts b/packages/backend/src/core/QueryService.ts
index dfa38ade87..f5d83d5ea8 100644
--- a/packages/backend/src/core/QueryService.ts
+++ b/packages/backend/src/core/QueryService.ts
@@ -266,8 +266,9 @@ export class QueryService {
 					.orWhere(`"${key}Instance" IS NULL`) // local
 					.orWhere(`"${key}Instance"."isBlocked" = false`); // not blocked
 
-				if (excludeAuthor) {
-					qb.orWhere(`note.userId = note.${key}Id`); // author
+				if (key !== 'user') {
+					// Don't re-check self-replies and self-renote targets
+					qb.orWhere(`note.userId = note.${key}Id`);
 				}
 			}));
 

From 4c87289e70073af85d870f6a434fb066133d2faf Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Thu, 14 Aug 2025 09:54:29 -0400
Subject: [PATCH 090/110] fix Fanout excludeReplies option include our own
 replies

---
 packages/backend/src/core/FanoutTimelineEndpointService.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/backend/src/core/FanoutTimelineEndpointService.ts b/packages/backend/src/core/FanoutTimelineEndpointService.ts
index 3637bb0358..49ba2c3c58 100644
--- a/packages/backend/src/core/FanoutTimelineEndpointService.ts
+++ b/packages/backend/src/core/FanoutTimelineEndpointService.ts
@@ -101,7 +101,10 @@ export class FanoutTimelineEndpointService {
 
 			if (ps.excludeReplies) {
 				const parentFilter = filter;
-				filter = (note) => !isReply(note, ps.me?.id) && parentFilter(note);
+				filter = (note) => {
+					if (note.userId !== ps.me?.id && isReply(note, ps.me?.id)) return false;
+					return parentFilter(note);
+				};
 			}
 
 			if (ps.excludeBots) {

From f0b180959819488a855739d803bb57cb83900e0d Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Thu, 14 Aug 2025 09:54:50 -0400
Subject: [PATCH 091/110] fix Fanout ignoreAuthorFromInstanceBlock option not
 working after relation changes

---
 packages/backend/src/core/FanoutTimelineEndpointService.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/backend/src/core/FanoutTimelineEndpointService.ts b/packages/backend/src/core/FanoutTimelineEndpointService.ts
index 49ba2c3c58..cd8c562bbd 100644
--- a/packages/backend/src/core/FanoutTimelineEndpointService.ts
+++ b/packages/backend/src/core/FanoutTimelineEndpointService.ts
@@ -134,10 +134,10 @@ export class FanoutTimelineEndpointService {
 				const parentFilter = filter;
 				filter = (note) => {
 					if (!ps.ignoreAuthorFromInstanceBlock) {
-						if (note.userInstance?.isBlocked) return false;
+						if (note.user?.instance?.isBlocked) return false;
 					}
-					if (note.userId !== note.renoteUserId && note.renoteUserInstance?.isBlocked) return false;
-					if (note.userId !== note.replyUserId && note.replyUserInstance?.isBlocked) return false;
+					if (note.userId !== note.renoteUserId && note.renote?.user?.instance?.isBlocked) return false;
+					if (note.userId !== note.replyUserId && note.reply?.user?.instance?.isBlocked) return false;
 
 					return parentFilter(note);
 				};

From 9dad384f815b296f4e96a66924ae93281a2f020c Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Thu, 14 Aug 2025 09:55:02 -0400
Subject: [PATCH 092/110] fix Fanout ignoreAuthorFromUserSuspension option not
 working after relation changes

---
 .../backend/src/core/FanoutTimelineEndpointService.ts     | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/packages/backend/src/core/FanoutTimelineEndpointService.ts b/packages/backend/src/core/FanoutTimelineEndpointService.ts
index cd8c562bbd..5cdf5fc3e3 100644
--- a/packages/backend/src/core/FanoutTimelineEndpointService.ts
+++ b/packages/backend/src/core/FanoutTimelineEndpointService.ts
@@ -146,15 +146,11 @@ export class FanoutTimelineEndpointService {
 			{
 				const parentFilter = filter;
 				filter = (note) => {
-					const noteJoined = note as MiNote & {
-						renoteUser: MiUser | null;
-						replyUser: MiUser | null;
-					};
 					if (!ps.ignoreAuthorFromUserSuspension) {
 						if (note.user?.isSuspended) return false;
 					}
-					if (note.userId !== note.renoteUserId && noteJoined.renoteUser?.isSuspended) return false;
-					if (note.userId !== note.replyUserId && noteJoined.replyUser?.isSuspended) return false;
+					if (note.userId !== note.renoteUserId && note.renote?.user?.isSuspended) return false;
+					if (note.userId !== note.replyUserId && note.reply?.user?.isSuspended) return false;
 
 					return parentFilter(note);
 				};

From cd25ed8d186d70fb3fb518a87adaa8c2b238e222 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Thu, 14 Aug 2025 09:55:18 -0400
Subject: [PATCH 093/110] remove no-op Fanout alwaysIncludeMyNotes option

---
 packages/backend/src/core/FanoutTimelineEndpointService.ts | 7 -------
 .../src/server/api/endpoints/notes/hybrid-timeline.ts      | 1 -
 .../src/server/api/endpoints/notes/local-timeline.ts       | 1 -
 .../backend/src/server/api/endpoints/notes/timeline.ts     | 1 -
 .../src/server/api/endpoints/notes/user-list-timeline.ts   | 1 -
 5 files changed, 11 deletions(-)

diff --git a/packages/backend/src/core/FanoutTimelineEndpointService.ts b/packages/backend/src/core/FanoutTimelineEndpointService.ts
index 5cdf5fc3e3..5531f0b0ae 100644
--- a/packages/backend/src/core/FanoutTimelineEndpointService.ts
+++ b/packages/backend/src/core/FanoutTimelineEndpointService.ts
@@ -31,7 +31,6 @@ type TimelineOptions = {
 	useDbFallback: boolean,
 	redisTimelines: FanoutTimelineName[],
 	noteFilter?: (note: MiNote) => boolean,
-	alwaysIncludeMyNotes?: boolean;
 	ignoreAuthorFromBlock?: boolean;
 	ignoreAuthorFromMute?: boolean;
 	ignoreAuthorFromInstanceBlock?: boolean;
@@ -88,12 +87,6 @@ export class FanoutTimelineEndpointService {
 		if (!shouldFallbackToDb) {
 			let filter = ps.noteFilter ?? (_note => true);
 
-			if (ps.alwaysIncludeMyNotes && ps.me) {
-				const me = ps.me;
-				const parentFilter = filter;
-				filter = (note) => note.userId === me.id || parentFilter(note);
-			}
-
 			if (ps.excludeNoFiles) {
 				const parentFilter = filter;
 				filter = (note) => note.fileIds.length !== 0 && parentFilter(note);
diff --git a/packages/backend/src/server/api/endpoints/notes/hybrid-timeline.ts b/packages/backend/src/server/api/endpoints/notes/hybrid-timeline.ts
index 13d8b41d47..7ad1b0bf6e 100644
--- a/packages/backend/src/server/api/endpoints/notes/hybrid-timeline.ts
+++ b/packages/backend/src/server/api/endpoints/notes/hybrid-timeline.ts
@@ -153,7 +153,6 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				me,
 				redisTimelines: timelineConfig,
 				useDbFallback: this.serverSettings.enableFanoutTimelineDbFallback,
-				alwaysIncludeMyNotes: true,
 				excludePureRenotes: !ps.withRenotes,
 				excludeBots: !ps.withBots,
 				dbFallback: async (untilId, sinceId, limit) => await this.getFromDb({
diff --git a/packages/backend/src/server/api/endpoints/notes/local-timeline.ts b/packages/backend/src/server/api/endpoints/notes/local-timeline.ts
index 2379bf8a6a..73725f9af2 100644
--- a/packages/backend/src/server/api/endpoints/notes/local-timeline.ts
+++ b/packages/backend/src/server/api/endpoints/notes/local-timeline.ts
@@ -129,7 +129,6 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 					: ps.withReplies ? ['localTimeline', 'localTimelineWithReplies']
 					: me ? ['localTimeline', `localTimelineWithReplyTo:${me.id}`]
 					: ['localTimeline'],
-				alwaysIncludeMyNotes: true,
 				excludePureRenotes: !ps.withRenotes,
 				excludeBots: !ps.withBots,
 				dbFallback: async (untilId, sinceId, limit) => await this.getFromDb({
diff --git a/packages/backend/src/server/api/endpoints/notes/timeline.ts b/packages/backend/src/server/api/endpoints/notes/timeline.ts
index 3fbcd82e9b..27ba7399a7 100644
--- a/packages/backend/src/server/api/endpoints/notes/timeline.ts
+++ b/packages/backend/src/server/api/endpoints/notes/timeline.ts
@@ -105,7 +105,6 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				me,
 				useDbFallback: this.serverSettings.enableFanoutTimelineDbFallback,
 				redisTimelines: ps.withFiles ? [`homeTimelineWithFiles:${me.id}`] : [`homeTimeline:${me.id}`],
-				alwaysIncludeMyNotes: true,
 				excludePureRenotes: !ps.withRenotes,
 				dbFallback: async (untilId, sinceId, limit) => await this.getFromDb({
 					untilId,
diff --git a/packages/backend/src/server/api/endpoints/notes/user-list-timeline.ts b/packages/backend/src/server/api/endpoints/notes/user-list-timeline.ts
index f6022093e1..7fb671a446 100644
--- a/packages/backend/src/server/api/endpoints/notes/user-list-timeline.ts
+++ b/packages/backend/src/server/api/endpoints/notes/user-list-timeline.ts
@@ -125,7 +125,6 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				me,
 				useDbFallback: this.serverSettings.enableFanoutTimelineDbFallback,
 				redisTimelines: ps.withFiles ? [`userListTimelineWithFiles:${list.id}`] : [`userListTimeline:${list.id}`],
-				alwaysIncludeMyNotes: true,
 				excludePureRenotes: !ps.withRenotes,
 				ignoreAuthorFromUserSilence: true,
 				dbFallback: async (untilId, sinceId, limit) => await this.getFromDb(list, {

From 5cb94e3c606a2460ef04b4141acb1b5d53cfd482 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Thu, 11 Sep 2025 14:29:32 -0400
Subject: [PATCH 094/110] fix replies / renotes of silenced users/instances by
 a followed user appearing in the streaming API

---
 packages/backend/src/core/NoteVisibilityService.ts | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/backend/src/core/NoteVisibilityService.ts b/packages/backend/src/core/NoteVisibilityService.ts
index 884efe6a83..6f3171d083 100644
--- a/packages/backend/src/core/NoteVisibilityService.ts
+++ b/packages/backend/src/core/NoteVisibilityService.ts
@@ -345,10 +345,8 @@ export class NoteVisibilityService {
 		// Don't silence if it's us
 		if (note.userId === user?.id) return false;
 
-		// Don't silence if we're following
-		if (data.userFollowings?.has(note.userId)) return false;
-
-		if (!ignoreSilencedAuthor) {
+		// Don't silence if we're following or ignoring the author
+		if (!data.userFollowings?.has(note.userId) && !ignoreSilencedAuthor) {
 			// Silence if user is silenced
 			if (note.user.isSilenced) return true;
 

From d960c4b86398a35e1028ef92541e1cb057075ef4 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Thu, 11 Sep 2025 14:34:44 -0400
Subject: [PATCH 095/110] trim mandatory CWs

---
 packages/backend/src/server/api/endpoints/admin/cw-instance.ts | 2 +-
 packages/backend/src/server/api/endpoints/admin/cw-note.ts     | 2 +-
 packages/backend/src/server/api/endpoints/admin/cw-user.ts     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/backend/src/server/api/endpoints/admin/cw-instance.ts b/packages/backend/src/server/api/endpoints/admin/cw-instance.ts
index 0a60316170..c7df9ee588 100644
--- a/packages/backend/src/server/api/endpoints/admin/cw-instance.ts
+++ b/packages/backend/src/server/api/endpoints/admin/cw-instance.ts
@@ -35,7 +35,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 			const instance = await this.federatedInstanceService.fetchOrRegister(ps.host);
 
 			// Collapse empty strings to null
-			const newCW = ps.cw || null;
+			const newCW = ps.cw?.trim() || null;
 			const oldCW = instance.mandatoryCW;
 
 			// Skip if there's nothing to do
diff --git a/packages/backend/src/server/api/endpoints/admin/cw-note.ts b/packages/backend/src/server/api/endpoints/admin/cw-note.ts
index e036c2e530..01f6ffb019 100644
--- a/packages/backend/src/server/api/endpoints/admin/cw-note.ts
+++ b/packages/backend/src/server/api/endpoints/admin/cw-note.ts
@@ -43,7 +43,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 			}) as MiNote & { user: MiUser };
 
 			// Collapse empty strings to null
-			const newCW = ps.cw || null;
+			const newCW = ps.cw?.trim() || null;
 			const oldCW = note.mandatoryCW;
 
 			// Skip if there's nothing to do
diff --git a/packages/backend/src/server/api/endpoints/admin/cw-user.ts b/packages/backend/src/server/api/endpoints/admin/cw-user.ts
index a42a83f4c6..7dcec85ef9 100644
--- a/packages/backend/src/server/api/endpoints/admin/cw-user.ts
+++ b/packages/backend/src/server/api/endpoints/admin/cw-user.ts
@@ -42,7 +42,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 			const user = await this.cacheService.findUserById(ps.userId);
 
 			// Collapse empty strings to null
-			const newCW = ps.cw || null;
+			const newCW = ps.cw?.trim() || null;
 			const oldCW = user.mandatoryCW;
 
 			// Skip if there's nothing to do

From 2e41f580e3ebd0bab099da4abfbcaeabdf037fb0 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Thu, 11 Sep 2025 14:35:01 -0400
Subject: [PATCH 096/110] fix API return type of cw-instance, cw-user, and
 cw-note endpoints

---
 .../server/api/endpoints/admin/cw-instance.ts |  2 ++
 .../src/server/api/endpoints/admin/cw-note.ts |  2 ++
 .../src/server/api/endpoints/admin/cw-user.ts |  2 ++
 packages/misskey-js/etc/misskey-js.api.md     | 12 ++++++++++
 packages/misskey-js/src/autogen/endpoint.ts   |  9 ++++---
 packages/misskey-js/src/autogen/entities.ts   |  3 +++
 packages/misskey-js/src/autogen/types.ts      | 24 ++++++++++++-------
 7 files changed, 42 insertions(+), 12 deletions(-)

diff --git a/packages/backend/src/server/api/endpoints/admin/cw-instance.ts b/packages/backend/src/server/api/endpoints/admin/cw-instance.ts
index c7df9ee588..5e5d83283e 100644
--- a/packages/backend/src/server/api/endpoints/admin/cw-instance.ts
+++ b/packages/backend/src/server/api/endpoints/admin/cw-instance.ts
@@ -14,6 +14,8 @@ export const meta = {
 	requireCredential: true,
 	requireModerator: true,
 	kind: 'write:admin:cw-instance',
+
+	res: {},
 } as const;
 
 export const paramDef = {
diff --git a/packages/backend/src/server/api/endpoints/admin/cw-note.ts b/packages/backend/src/server/api/endpoints/admin/cw-note.ts
index 01f6ffb019..a549f57fb3 100644
--- a/packages/backend/src/server/api/endpoints/admin/cw-note.ts
+++ b/packages/backend/src/server/api/endpoints/admin/cw-note.ts
@@ -16,6 +16,8 @@ export const meta = {
 	requireCredential: true,
 	requireModerator: true,
 	kind: 'write:admin:cw-note',
+
+	res: {},
 } as const;
 
 export const paramDef = {
diff --git a/packages/backend/src/server/api/endpoints/admin/cw-user.ts b/packages/backend/src/server/api/endpoints/admin/cw-user.ts
index 7dcec85ef9..a7cd2af235 100644
--- a/packages/backend/src/server/api/endpoints/admin/cw-user.ts
+++ b/packages/backend/src/server/api/endpoints/admin/cw-user.ts
@@ -17,6 +17,8 @@ export const meta = {
 	requireCredential: true,
 	requireModerator: true,
 	kind: 'write:admin:cw-user',
+
+	res: {},
 } as const;
 
 export const paramDef = {
diff --git a/packages/misskey-js/etc/misskey-js.api.md b/packages/misskey-js/etc/misskey-js.api.md
index a6b5fa8338..040e9429f0 100644
--- a/packages/misskey-js/etc/misskey-js.api.md
+++ b/packages/misskey-js/etc/misskey-js.api.md
@@ -155,12 +155,21 @@ type AdminCaptchaSaveRequest = operations['admin___captcha___save']['requestBody
 // @public (undocumented)
 type AdminCwInstanceRequest = operations['admin___cw-instance']['requestBody']['content']['application/json'];
 
+// @public (undocumented)
+type AdminCwInstanceResponse = operations['admin___cw-instance']['responses']['200']['content']['application/json'];
+
 // @public (undocumented)
 type AdminCwNoteRequest = operations['admin___cw-note']['requestBody']['content']['application/json'];
 
+// @public (undocumented)
+type AdminCwNoteResponse = operations['admin___cw-note']['responses']['200']['content']['application/json'];
+
 // @public (undocumented)
 type AdminCwUserRequest = operations['admin___cw-user']['requestBody']['content']['application/json'];
 
+// @public (undocumented)
+type AdminCwUserResponse = operations['admin___cw-user']['responses']['200']['content']['application/json'];
+
 // @public (undocumented)
 type AdminDeclineUserRequest = operations['admin___decline-user']['requestBody']['content']['application/json'];
 
@@ -1549,8 +1558,11 @@ declare namespace entities {
         AdminCaptchaCurrentResponse,
         AdminCaptchaSaveRequest,
         AdminCwInstanceRequest,
+        AdminCwInstanceResponse,
         AdminCwNoteRequest,
+        AdminCwNoteResponse,
         AdminCwUserRequest,
+        AdminCwUserResponse,
         AdminDeclineUserRequest,
         AdminDeleteAccountRequest,
         AdminDeleteAllFilesOfAUserRequest,
diff --git a/packages/misskey-js/src/autogen/endpoint.ts b/packages/misskey-js/src/autogen/endpoint.ts
index bf7d179c50..5bdaa58a6f 100644
--- a/packages/misskey-js/src/autogen/endpoint.ts
+++ b/packages/misskey-js/src/autogen/endpoint.ts
@@ -39,8 +39,11 @@ import type {
 	AdminCaptchaCurrentResponse,
 	AdminCaptchaSaveRequest,
 	AdminCwInstanceRequest,
+	AdminCwInstanceResponse,
 	AdminCwNoteRequest,
+	AdminCwNoteResponse,
 	AdminCwUserRequest,
+	AdminCwUserResponse,
 	AdminDeclineUserRequest,
 	AdminDeleteAccountRequest,
 	AdminDeleteAllFilesOfAUserRequest,
@@ -691,9 +694,9 @@ export type Endpoints = {
 	'admin/avatar-decorations/update': { req: AdminAvatarDecorationsUpdateRequest; res: EmptyResponse };
 	'admin/captcha/current': { req: EmptyRequest; res: AdminCaptchaCurrentResponse };
 	'admin/captcha/save': { req: AdminCaptchaSaveRequest; res: EmptyResponse };
-	'admin/cw-instance': { req: AdminCwInstanceRequest; res: EmptyResponse };
-	'admin/cw-note': { req: AdminCwNoteRequest; res: EmptyResponse };
-	'admin/cw-user': { req: AdminCwUserRequest; res: EmptyResponse };
+	'admin/cw-instance': { req: AdminCwInstanceRequest; res: AdminCwInstanceResponse };
+	'admin/cw-note': { req: AdminCwNoteRequest; res: AdminCwNoteResponse };
+	'admin/cw-user': { req: AdminCwUserRequest; res: AdminCwUserResponse };
 	'admin/decline-user': { req: AdminDeclineUserRequest; res: EmptyResponse };
 	'admin/delete-account': { req: AdminDeleteAccountRequest; res: EmptyResponse };
 	'admin/delete-all-files-of-a-user': { req: AdminDeleteAllFilesOfAUserRequest; res: EmptyResponse };
diff --git a/packages/misskey-js/src/autogen/entities.ts b/packages/misskey-js/src/autogen/entities.ts
index 4d2a669cf3..4ad9c9afbb 100644
--- a/packages/misskey-js/src/autogen/entities.ts
+++ b/packages/misskey-js/src/autogen/entities.ts
@@ -42,8 +42,11 @@ export type AdminAvatarDecorationsUpdateRequest = operations['admin___avatar-dec
 export type AdminCaptchaCurrentResponse = operations['admin___captcha___current']['responses']['200']['content']['application/json'];
 export type AdminCaptchaSaveRequest = operations['admin___captcha___save']['requestBody']['content']['application/json'];
 export type AdminCwInstanceRequest = operations['admin___cw-instance']['requestBody']['content']['application/json'];
+export type AdminCwInstanceResponse = operations['admin___cw-instance']['responses']['200']['content']['application/json'];
 export type AdminCwNoteRequest = operations['admin___cw-note']['requestBody']['content']['application/json'];
+export type AdminCwNoteResponse = operations['admin___cw-note']['responses']['200']['content']['application/json'];
 export type AdminCwUserRequest = operations['admin___cw-user']['requestBody']['content']['application/json'];
+export type AdminCwUserResponse = operations['admin___cw-user']['responses']['200']['content']['application/json'];
 export type AdminDeclineUserRequest = operations['admin___decline-user']['requestBody']['content']['application/json'];
 export type AdminDeleteAccountRequest = operations['admin___delete-account']['requestBody']['content']['application/json'];
 export type AdminDeleteAllFilesOfAUserRequest = operations['admin___delete-all-files-of-a-user']['requestBody']['content']['application/json'];
diff --git a/packages/misskey-js/src/autogen/types.ts b/packages/misskey-js/src/autogen/types.ts
index 2c00ddac3e..03304eb69f 100644
--- a/packages/misskey-js/src/autogen/types.ts
+++ b/packages/misskey-js/src/autogen/types.ts
@@ -7428,9 +7428,11 @@ export type operations = {
       };
     };
     responses: {
-      /** @description OK (without any results) */
-      204: {
-        content: never;
+      /** @description OK (with results) */
+      200: {
+        content: {
+          'application/json': unknown;
+        };
       };
       /** @description Client error */
       400: {
@@ -7481,9 +7483,11 @@ export type operations = {
       };
     };
     responses: {
-      /** @description OK (without any results) */
-      204: {
-        content: never;
+      /** @description OK (with results) */
+      200: {
+        content: {
+          'application/json': unknown;
+        };
       };
       /** @description Client error */
       400: {
@@ -7534,9 +7538,11 @@ export type operations = {
       };
     };
     responses: {
-      /** @description OK (without any results) */
-      204: {
-        content: never;
+      /** @description OK (with results) */
+      200: {
+        content: {
+          'application/json': unknown;
+        };
       };
       /** @description Client error */
       400: {

From f3d7229c558bf3319d5091045d0bdba679e64075 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Fri, 12 Sep 2025 14:04:08 -0400
Subject: [PATCH 097/110] add missing instance mandatory CW to frontend
 getNoteSummary

---
 packages/frontend/src/utility/get-note-summary.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/frontend/src/utility/get-note-summary.ts b/packages/frontend/src/utility/get-note-summary.ts
index d91ff6853a..57be0a006c 100644
--- a/packages/frontend/src/utility/get-note-summary.ts
+++ b/packages/frontend/src/utility/get-note-summary.ts
@@ -34,6 +34,9 @@ export const getNoteSummary = (note?: Misskey.entities.Note | null): string => {
 	if (note.user.mandatoryCW) {
 		cw = appendContentWarning(cw, note.user.mandatoryCW);
 	}
+	if (note.user.instance?.mandatoryCW) {
+		cw = appendContentWarning(cw, note.user.instance.mandatoryCW);
+	}
 
 	// 本文
 	if (cw != null) {

From 84ffc6361bc39c0beff6403618081502f3397ba3 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Fri, 12 Sep 2025 14:07:43 -0400
Subject: [PATCH 098/110] fix duplicate mandatory CWs in following feed

---
 .../src/components/SkFollowingFeedEntry.vue   |  2 +-
 .../frontend/src/utility/get-note-summary.ts  | 23 +++++++++++--------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/packages/frontend/src/components/SkFollowingFeedEntry.vue b/packages/frontend/src/components/SkFollowingFeedEntry.vue
index 047ec9144b..40249458e5 100644
--- a/packages/frontend/src/components/SkFollowingFeedEntry.vue
+++ b/packages/frontend/src/components/SkFollowingFeedEntry.vue
@@ -20,7 +20,7 @@ Selectable entry on the "Following" feed, displaying a user with their most rece
 			</MkA>
 		</header>
 		<div>
-			<Mfm :class="$style.text" :text="getNoteSummary(note)" :isBlock="true" :plain="true" :nowrap="false" :isNote="true" nyaize="respect" :author="note.user"/>
+			<Mfm :class="$style.text" :text="getNoteSummary(note, false)" :isBlock="true" :plain="true" :nowrap="false" :isNote="true" nyaize="respect" :author="note.user"/>
 		</div>
 	</div>
 </SkMutedNote>
diff --git a/packages/frontend/src/utility/get-note-summary.ts b/packages/frontend/src/utility/get-note-summary.ts
index 57be0a006c..424f298528 100644
--- a/packages/frontend/src/utility/get-note-summary.ts
+++ b/packages/frontend/src/utility/get-note-summary.ts
@@ -9,9 +9,10 @@ import { i18n } from '@/i18n.js';
 
 /**
  * 投稿を表す文字列を取得します。
- * @param {*} note (packされた)投稿
+ * @param note (packされた)投稿
+ * @param withMandatoryCw if true (default), include the note/user/instance mandatory CW
  */
-export const getNoteSummary = (note?: Misskey.entities.Note | null): string => {
+export const getNoteSummary = (note: Misskey.entities.Note | null | undefined, withMandatoryCw = true): string => {
 	if (note == null) {
 		return '';
 	}
@@ -28,14 +29,16 @@ export const getNoteSummary = (note?: Misskey.entities.Note | null): string => {
 
 	// Append mandatory CW, if applicable
 	let cw = note.cw;
-	if (note.mandatoryCW) {
-		cw = appendContentWarning(cw, note.mandatoryCW);
-	}
-	if (note.user.mandatoryCW) {
-		cw = appendContentWarning(cw, note.user.mandatoryCW);
-	}
-	if (note.user.instance?.mandatoryCW) {
-		cw = appendContentWarning(cw, note.user.instance.mandatoryCW);
+	if (withMandatoryCw) {
+		if (note.mandatoryCW) {
+			cw = appendContentWarning(cw, note.mandatoryCW);
+		}
+		if (note.user.mandatoryCW) {
+			cw = appendContentWarning(cw, note.user.mandatoryCW);
+		}
+		if (note.user.instance?.mandatoryCW) {
+			cw = appendContentWarning(cw, note.user.instance.mandatoryCW);
+		}
 	}
 
 	// 本文

From 97371bd893cb95d86b860326b8e8747635b85cba Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Fri, 12 Sep 2025 14:16:16 -0400
Subject: [PATCH 099/110] update get-note-summary (both copies) to use same
 wording as SkMutedNote

---
 packages/backend/src/misc/get-note-summary.ts     | 10 ++++++----
 packages/frontend/src/utility/get-note-summary.ts | 12 ++++++++----
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/packages/backend/src/misc/get-note-summary.ts b/packages/backend/src/misc/get-note-summary.ts
index 3a725e4f43..079eda6fbb 100644
--- a/packages/backend/src/misc/get-note-summary.ts
+++ b/packages/backend/src/misc/get-note-summary.ts
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import { appendContentWarning } from './append-content-warning.js';
 import type { Packed } from './json-schema.js';
 
 /**
@@ -24,13 +23,16 @@ export const getNoteSummary = (note: Packed<'Note'>): string => {
 	// Append mandatory CW, if applicable
 	let cw = note.cw;
 	if (note.mandatoryCW) {
-		cw = appendContentWarning(cw, note.mandatoryCW);
+		cw = `Note is flagged: "${note.mandatoryCW}", ${cw}`;
 	}
 	if (note.user.mandatoryCW) {
-		cw = appendContentWarning(cw, note.user.mandatoryCW);
+		const username = note.user.host
+			? `@${note.user.username}@${note.user.host}`
+			: `@${note.user.username}`;
+		cw = `${username} is flagged: "${note.user.mandatoryCW}", ${cw}`;
 	}
 	if (note.user.instance?.mandatoryCW) {
-		cw = appendContentWarning(cw, note.user.instance.mandatoryCW);
+		cw = `${note.user.host} is flagged: "${note.user.instance.mandatoryCW}", ${cw}`;
 	}
 
 	// 本文
diff --git a/packages/frontend/src/utility/get-note-summary.ts b/packages/frontend/src/utility/get-note-summary.ts
index 424f298528..f96f75b8a9 100644
--- a/packages/frontend/src/utility/get-note-summary.ts
+++ b/packages/frontend/src/utility/get-note-summary.ts
@@ -4,7 +4,7 @@
  */
 
 import * as Misskey from 'misskey-js';
-import { appendContentWarning } from '@@/js/append-content-warning.js';
+import { host } from '@@/js/config.js';
 import { i18n } from '@/i18n.js';
 
 /**
@@ -31,13 +31,17 @@ export const getNoteSummary = (note: Misskey.entities.Note | null | undefined, w
 	let cw = note.cw;
 	if (withMandatoryCw) {
 		if (note.mandatoryCW) {
-			cw = appendContentWarning(cw, note.mandatoryCW);
+			cw = i18n.tsx.noteIsFlaggedAs({ cw: note.mandatoryCW }) + ', ' + cw;
 		}
 		if (note.user.mandatoryCW) {
-			cw = appendContentWarning(cw, note.user.mandatoryCW);
+			const username = note.user.host
+				? `@${note.user.username}@${note.user.host}`
+				: `@${note.user.username}`;
+			cw = i18n.tsx.userIsFlaggedAs({ name: username, cw: note.user.mandatoryCW }) + ', ' + cw;
 		}
 		if (note.user.instance?.mandatoryCW) {
-			cw = appendContentWarning(cw, note.user.instance.mandatoryCW);
+			const instanceName = note.user.host ?? host;
+			cw = i18n.tsx.instanceIsFlaggedAs({ name: instanceName, cw: note.user.instance.mandatoryCW }) + ', ' + cw;
 		}
 	}
 

From b3428480decee97433efd53dafeb4995fe06f2bb Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Fri, 12 Sep 2025 14:31:13 -0400
Subject: [PATCH 100/110] hide mandatory CWs when "uncollapse CWs on notes" is
 enabled

---
 .../frontend/src/components/SkMutedNote.vue   |  6 ++-
 .../frontend/src/utility/check-word-mute.ts   | 45 ++++++++++++-------
 2 files changed, 33 insertions(+), 18 deletions(-)

diff --git a/packages/frontend/src/components/SkMutedNote.vue b/packages/frontend/src/components/SkMutedNote.vue
index db5b4f2316..5eee592d86 100644
--- a/packages/frontend/src/components/SkMutedNote.vue
+++ b/packages/frontend/src/components/SkMutedNote.vue
@@ -125,7 +125,11 @@ function expand() {
 	emit('expandMute', props.note);
 }
 
-const mute = checkMute(computed(() => props.note), computed(() => props.withHardMute));
+const mute = checkMute(
+	computed(() => props.note),
+	computed(() => props.withHardMute),
+	computed(() => prefer.s.uncollapseCW),
+);
 
 const mutedWords = computed(() => mute.value.softMutedWords?.join(', '));
 const isExpanded = computed(() => props.skipMute || expandNote.value || !mute.value.hasMute);
diff --git a/packages/frontend/src/utility/check-word-mute.ts b/packages/frontend/src/utility/check-word-mute.ts
index a92104a403..a2d4296cad 100644
--- a/packages/frontend/src/utility/check-word-mute.ts
+++ b/packages/frontend/src/utility/check-word-mute.ts
@@ -85,18 +85,19 @@ function provideMuteOverrides(overrides: Reactive<MuteOverrides> | null) {
 	provide(muteOverridesSymbol, overrides);
 }
 
-export function checkMute(note: Misskey.entities.Note | ComputedRef<Misskey.entities.Note>, withHardMute?: boolean | ComputedRef<boolean>): ComputedRef<Mute> {
+export function checkMute(note: Misskey.entities.Note | ComputedRef<Misskey.entities.Note>, withHardMute?: boolean | ComputedRef<boolean>, uncollapseCW?: boolean | ComputedRef<boolean>): ComputedRef<Mute> {
 	// inject() can only be used inside script setup, so it MUST be outside the computed block!
 	const overrides = injectMuteOverrides();
 
 	return computed(() => {
 		const _note = unref(note);
 		const _withHardMute = unref(withHardMute) ?? true;
-		return getMutes(_note, _withHardMute, overrides);
+		const _uncollapseCW = unref(uncollapseCW) ?? false;
+		return getMutes(_note, _withHardMute, _uncollapseCW, overrides);
 	});
 }
 
-function getMutes(note: Misskey.entities.Note, withHardMute: boolean, overrides: MuteOverrides | null): Mute {
+function getMutes(note: Misskey.entities.Note, withHardMute: boolean, uncollapseCW: boolean, overrides: MuteOverrides | null): Mute {
 	const override: Partial<Mute> = overrides ? deepAssign(
 		{},
 		note.user.host ? overrides.instance[note.user.host] : undefined,
@@ -116,26 +117,36 @@ function getMutes(note: Misskey.entities.Note, withHardMute: boolean, overrides:
 	const instanceSilenced = override.instanceSilenced ?? (note.user.instance?.isSilenced && !bypassSilence) ?? false;
 	const threadMuted = override.threadMuted ?? (!isMe && note.isMutingThread);
 	const noteMuted = override.noteMuted ?? (!isMe && note.isMutingNote);
-	const noteMandatoryCW = override.noteMandatoryCW !== undefined
-		? override.noteMandatoryCW
-		: (isMe ? null : note.mandatoryCW);
-	const userMandatoryCW = override.userMandatoryCW !== undefined
-		? override.userMandatoryCW
-		: !bypassSilence
-			? note.user.mandatoryCW
-			: null;
-
-	const instanceMandatoryCW = override.instanceMandatoryCW !== undefined
-		? override.instanceMandatoryCW
-		: (!bypassSilence && note.user.instance)
-			? note.user.instance.mandatoryCW
-			: null;
+	const noteMandatoryCW = getNoteMandatoryCW(note, isMe, uncollapseCW, override);
+	const userMandatoryCW = getUserMandatoryCW(note, bypassSilence, uncollapseCW, override);
+	const instanceMandatoryCW = getInstanceMandatoryCW(note, bypassSilence, uncollapseCW, override);
 
 	const hasMute = hardMuted || softMutedWords.length > 0 || sensitiveMuted || userSilenced || instanceSilenced || threadMuted || noteMuted || !!noteMandatoryCW || !!userMandatoryCW || !!instanceMandatoryCW;
 
 	return { hasMute, hardMuted, softMutedWords, sensitiveMuted, userSilenced, instanceSilenced, threadMuted, noteMuted, noteMandatoryCW, userMandatoryCW, instanceMandatoryCW };
 }
 
+function getNoteMandatoryCW(note: Misskey.entities.Note, isMe: boolean, uncollapseCW: boolean, override: Partial<Mute>): string | null {
+	if (override.noteMandatoryCW !== undefined) return override.noteMandatoryCW;
+	if (uncollapseCW) return null;
+	if (isMe) return null;
+	return note.mandatoryCW ?? null;
+}
+
+function getUserMandatoryCW(note: Misskey.entities.Note, bypassSilence: boolean, uncollapseCW: boolean, override: Partial<Mute>): string | null {
+	if (override.userMandatoryCW !== undefined) return override.userMandatoryCW;
+	if (uncollapseCW) return null;
+	if (bypassSilence) return null;
+	return note.user.mandatoryCW ?? null;
+}
+
+function getInstanceMandatoryCW(note: Misskey.entities.Note, bypassSilence: boolean, uncollapseCW: boolean, override: Partial<Mute>): string | null {
+	if (override.instanceMandatoryCW !== undefined) return override.instanceMandatoryCW;
+	if (uncollapseCW) return null;
+	if (bypassSilence) return null;
+	return note.user.instance?.mandatoryCW ?? null;
+}
+
 function isHardMuted(note: Misskey.entities.Note): boolean {
 	if (!$i?.hardMutedWords.length) return false;
 

From 641180fb2fc446ace5d17caf63574075f9a643bf Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Fri, 12 Sep 2025 14:42:23 -0400
Subject: [PATCH 101/110] fix muted notes not filling their container

---
 packages/frontend/src/components/SkMutedNote.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/frontend/src/components/SkMutedNote.vue b/packages/frontend/src/components/SkMutedNote.vue
index 5eee592d86..c7b80ee6ab 100644
--- a/packages/frontend/src/components/SkMutedNote.vue
+++ b/packages/frontend/src/components/SkMutedNote.vue
@@ -152,6 +152,9 @@ defineExpose({
 	text-align: center;
 	opacity: 0.7;
 	cursor: pointer;
+
+	// Without this, the mute placeholder collapses weirdly when the note is rendered in a flax container.
+	flex: 1;
 }
 
 .muted:hover {

From 77a9979535ffa6e098a79bba0fc3305a515be080 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Sat, 13 Sep 2025 11:01:19 -0400
Subject: [PATCH 102/110] fix typo in UPGRADE_NOTES.md

---
 UPGRADE_NOTES.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UPGRADE_NOTES.md b/UPGRADE_NOTES.md
index c16a65eb10..4a1ec87b86 100644
--- a/UPGRADE_NOTES.md
+++ b/UPGRADE_NOTES.md
@@ -8,7 +8,7 @@ The "Mark instance as NSFW" has been removed in favor of the new "mandatory CW"
 Moderators can now apply any Content Warning of their choice to all notes from an instance by populating the "Force content warning" field on that instance's info page.
 The new Content Warning applies immediately, is retroactive, and does not federate or "infect" replies in a thread.
 
-The upgrade will automatically a content warning of "NSFW" for instances that were formerly marked as NSFW, which displays as `[instance name] is flagged: "NSFW"` to users.
+The upgrade will automatically set a content warning of "NSFW" for instances that were formerly marked as NSFW, which displays as `[instance name] is flagged: "NSFW"` to users.
 The `notes` table is also cleaned up to remove any leftover "Instance is marked as NSFW" content warnings from posts.
 Staff can then remove or modify the new CW as usual.
 

From d118333f54f10e85fd930f51b9f9fa1bf03d77d6 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Sat, 13 Sep 2025 11:03:36 -0400
Subject: [PATCH 103/110] Revert "fix note ordering in antennas"

This reverts commit 39d76f7d662f66cf5d1a0396c43820ddc89362fc.
---
 packages/backend/src/server/api/endpoints/antennas/notes.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/backend/src/server/api/endpoints/antennas/notes.ts b/packages/backend/src/server/api/endpoints/antennas/notes.ts
index 988cdbd4e9..0aeceda038 100644
--- a/packages/backend/src/server/api/endpoints/antennas/notes.ts
+++ b/packages/backend/src/server/api/endpoints/antennas/notes.ts
@@ -111,7 +111,6 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 			const query = this.queryService.makePaginationQuery(this.notesRepository.createQueryBuilder('note'),
 				ps.sinceId, ps.untilId)
 				.where('note.id IN (:...noteIds)', { noteIds: noteIds })
-				.orderBy('note.id', 'DESC')
 				.innerJoinAndSelect('note.user', 'user')
 				.leftJoinAndSelect('note.reply', 'reply')
 				.leftJoinAndSelect('note.renote', 'renote')

From c66020c6cd913be7374dedb3102c05b6dd499cd2 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Sat, 13 Sep 2025 11:06:08 -0400
Subject: [PATCH 104/110] restore appendContentWarning

---
 packages/backend/src/misc/get-note-summary.ts     | 7 ++++---
 packages/frontend/src/utility/get-note-summary.ts | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/packages/backend/src/misc/get-note-summary.ts b/packages/backend/src/misc/get-note-summary.ts
index 079eda6fbb..be183b4979 100644
--- a/packages/backend/src/misc/get-note-summary.ts
+++ b/packages/backend/src/misc/get-note-summary.ts
@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
+import { appendContentWarning } from './append-content-warning.js';
 import type { Packed } from './json-schema.js';
 
 /**
@@ -23,16 +24,16 @@ export const getNoteSummary = (note: Packed<'Note'>): string => {
 	// Append mandatory CW, if applicable
 	let cw = note.cw;
 	if (note.mandatoryCW) {
-		cw = `Note is flagged: "${note.mandatoryCW}", ${cw}`;
+		cw = appendContentWarning(cw, `Note is flagged: "${note.mandatoryCW}"`);
 	}
 	if (note.user.mandatoryCW) {
 		const username = note.user.host
 			? `@${note.user.username}@${note.user.host}`
 			: `@${note.user.username}`;
-		cw = `${username} is flagged: "${note.user.mandatoryCW}", ${cw}`;
+		cw = appendContentWarning(cw, `${username} is flagged: "${note.user.mandatoryCW}"`);
 	}
 	if (note.user.instance?.mandatoryCW) {
-		cw = `${note.user.host} is flagged: "${note.user.instance.mandatoryCW}", ${cw}`;
+		cw = appendContentWarning(cw, `${note.user.host} is flagged: "${note.user.instance.mandatoryCW}"`);
 	}
 
 	// 本文
diff --git a/packages/frontend/src/utility/get-note-summary.ts b/packages/frontend/src/utility/get-note-summary.ts
index f96f75b8a9..35da364c11 100644
--- a/packages/frontend/src/utility/get-note-summary.ts
+++ b/packages/frontend/src/utility/get-note-summary.ts
@@ -4,6 +4,7 @@
  */
 
 import * as Misskey from 'misskey-js';
+import { appendContentWarning } from '@@/js/append-content-warning.js';
 import { host } from '@@/js/config.js';
 import { i18n } from '@/i18n.js';
 
@@ -31,17 +32,17 @@ export const getNoteSummary = (note: Misskey.entities.Note | null | undefined, w
 	let cw = note.cw;
 	if (withMandatoryCw) {
 		if (note.mandatoryCW) {
-			cw = i18n.tsx.noteIsFlaggedAs({ cw: note.mandatoryCW }) + ', ' + cw;
+			cw = appendContentWarning(cw, i18n.tsx.noteIsFlaggedAs({ cw: note.mandatoryCW }));
 		}
 		if (note.user.mandatoryCW) {
 			const username = note.user.host
 				? `@${note.user.username}@${note.user.host}`
 				: `@${note.user.username}`;
-			cw = i18n.tsx.userIsFlaggedAs({ name: username, cw: note.user.mandatoryCW }) + ', ' + cw;
+			cw = appendContentWarning(cw, i18n.tsx.userIsFlaggedAs({ name: username, cw: note.user.mandatoryCW }));
 		}
 		if (note.user.instance?.mandatoryCW) {
 			const instanceName = note.user.host ?? host;
-			cw = i18n.tsx.instanceIsFlaggedAs({ name: instanceName, cw: note.user.instance.mandatoryCW }) + ', ' + cw;
+			cw = appendContentWarning(cw, i18n.tsx.instanceIsFlaggedAs({ name: instanceName, cw: note.user.instance.mandatoryCW }));
 		}
 	}
 

From a1a35cad255faacaa41f0bfc3403037e944eb771 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Thu, 18 Sep 2025 17:34:19 -0400
Subject: [PATCH 105/110] fix data load/passing in NoteVisibilityService

---
 .../backend/src/core/NoteVisibilityService.ts | 162 +++++++++++-------
 1 file changed, 98 insertions(+), 64 deletions(-)

diff --git a/packages/backend/src/core/NoteVisibilityService.ts b/packages/backend/src/core/NoteVisibilityService.ts
index 6f3171d083..8ec872fd9c 100644
--- a/packages/backend/src/core/NoteVisibilityService.ts
+++ b/packages/backend/src/core/NoteVisibilityService.ts
@@ -7,7 +7,6 @@ import { Inject, Injectable } from '@nestjs/common';
 import { CacheService } from '@/core/CacheService.js';
 import type { MiNote } from '@/models/Note.js';
 import type { MiUser } from '@/models/User.js';
-import { MiInstance } from '@/models/Instance.js';
 import { bindThis } from '@/decorators.js';
 import { Packed } from '@/misc/json-schema.js';
 import { IdService } from '@/core/IdService.js';
@@ -65,7 +64,7 @@ export class NoteVisibilityService {
 	) {}
 
 	@bindThis
-	public async checkNoteVisibilityAsync(note: MiNote | Packed<'Note'>, user: string | PopulatedUser, opts?: { filters?: NoteVisibilityFilters, hint?: Partial<NoteVisibilityData> }): Promise<NoteVisibilityResult> {
+	public async checkNoteVisibilityAsync(note: MiNote | Packed<'Note'>, user: string | PopulatedMe, opts?: { filters?: NoteVisibilityFilters, hint?: Partial<NoteVisibilityData> }): Promise<NoteVisibilityResult> {
 		if (typeof(user) === 'string') {
 			user = await this.cacheService.findUserById(user);
 		}
@@ -76,62 +75,68 @@ export class NoteVisibilityService {
 		return this.checkNoteVisibility(populatedNote, user, { filters: opts?.filters, data: populatedData });
 	}
 
-	private async populateNote(note: Packed<'Note'>, dive?: boolean): Promise<Packed<'Note'>>;
-	private async populateNote(note: MiNote, dive?: boolean): Promise<PopulatedMiNote>;
-	private async populateNote(note: MiNote | Packed<'Note'>, dive?: boolean): Promise<PopulatedNote>;
+	// TODO pass in notes hint
 	private async populateNote(note: MiNote | Packed<'Note'>, dive = true): Promise<PopulatedNote> {
-		// Packed<'Note'> is already fully loaded
-		if (isPackedNote(note)) return note;
+		const userPromise = this.getNoteUser(note);
 
 		// noinspection ES6MissingAwait
 		return await awaitAll({
-			...note,
-			user: this.getNoteUser(note),
+			id: note.id,
+			threadId: note.threadId ?? note.id,
+			createdAt: 'createdAt' in note
+				? new Date(note.createdAt)
+				: this.idService.parse(note.id).date,
+			userId: note.userId,
+			userHost: userPromise.then(u => u.host),
+			user: userPromise,
+			renoteId: note.renoteId ?? null,
 			renote: dive ? this.getNoteRenote(note) : null,
+			replyId: note.replyId ?? null,
 			reply: dive ? this.getNoteReply(note) : null,
+			hasPoll: 'hasPoll' in note ? note.hasPoll : (note.poll != null),
+			mentions: note.mentions ?? [],
+			visibleUserIds: note.visibleUserIds ?? [],
+			visibility: note.visibility,
+			text: note.text,
+			cw: note.cw ?? null,
+			fileIds: note.fileIds ?? [],
 		});
 	}
 
-	private async getNoteUser(note: MiNote): Promise<PopulatedMiNote['user']> {
+	private async getNoteUser(note: MiNote | Packed<'Note'>): Promise<PopulatedUser> {
 		const user = note.user ?? await this.cacheService.findUserById(note.userId);
+		const instance = user.instance ?? (user.host ? await this.federatedInstanceService.fetchOrRegister(user.host) : null);
 		return {
 			...user,
-			instance: user.instance ?? (user.host ? await this.federatedInstanceService.fetchOrRegister(user.host) : null),
+			makeNotesHiddenBefore: user.makeNotesHiddenBefore ?? null,
+			makeNotesFollowersOnlyBefore: user.makeNotesFollowersOnlyBefore ?? null,
+			requireSigninToViewContents: user.requireSigninToViewContents ?? false,
+			instance: instance ? {
+				...instance,
+				host: user.host as string,
+			} : null,
 		};
 	}
 
-	private async getNoteRenote(note: MiNote): Promise<PopulatedMiNote['renote']> {
+	private async getNoteRenote(note: MiNote | Packed<'Note'>): Promise<PopulatedNote | null> {
 		if (!note.renoteId) return null;
 
-		const renote = note.renote ?? await this.notesRepository.findOneOrFail({
-			where: { id: note.renoteId },
-			relations: {
-				user: {
-					instance: true,
-				},
-			},
-		});
+		const renote = note.renote ?? await this.notesRepository.findOneByOrFail({ id: note.renoteId });
 
+		// TODO dive into renote.reply
 		return await this.populateNote(renote, false);
 	}
 
-	private async getNoteReply(note: MiNote): Promise<PopulatedMiNote['reply']> {
+	private async getNoteReply(note: MiNote | Packed<'Note'>): Promise<PopulatedNote | null> {
 		if (!note.replyId) return null;
 
-		const reply = note.reply ?? await this.notesRepository.findOneOrFail({
-			where: { id: note.replyId },
-			relations: {
-				user: {
-					instance: true,
-				},
-			},
-		});
+		const reply = note.reply ?? await this.notesRepository.findOneByOrFail({ id: note.replyId });
 
 		return await this.populateNote(reply, false);
 	}
 
 	@bindThis
-	public async populateData(user: PopulatedUser, hint?: Partial<NoteVisibilityData>): Promise<NoteVisibilityData> {
+	public async populateData(user: PopulatedMe, hint?: Partial<NoteVisibilityData>): Promise<NoteVisibilityData> {
 		// noinspection ES6MissingAwait
 		const [
 			userBlockers,
@@ -163,7 +168,7 @@ export class NoteVisibilityService {
 	}
 
 	@bindThis
-	public checkNoteVisibility(note: PopulatedNote, user: PopulatedUser, opts: { filters?: NoteVisibilityFilters, data: NoteVisibilityData }): NoteVisibilityResult {
+	public checkNoteVisibility(note: PopulatedNote, user: PopulatedMe, opts: { filters?: NoteVisibilityFilters, data: NoteVisibilityData }): NoteVisibilityResult {
 		// Copy note since we mutate it below
 		note = {
 			...note,
@@ -183,7 +188,7 @@ export class NoteVisibilityService {
 		return this.checkNoteVisibilityFor(note, user, opts);
 	}
 
-	private checkNoteVisibilityFor(note: PopulatedNote, user: PopulatedUser, opts: { filters?: NoteVisibilityFilters, data: NoteVisibilityData }): NoteVisibilityResult {
+	private checkNoteVisibilityFor(note: PopulatedNote, user: PopulatedMe, opts: { filters?: NoteVisibilityFilters, data: NoteVisibilityData }): NoteVisibilityResult {
 		const accessible = this.isAccessible(note, user, opts.data);
 		const redact = !accessible || this.shouldRedact(note, user);
 		const silence = this.shouldSilence(note, user, opts.data, opts.filters);
@@ -202,7 +207,7 @@ export class NoteVisibilityService {
 	}
 
 	// Based on NoteEntityService.isVisibleForMe
-	private isAccessible(note: PopulatedNote, user: PopulatedUser, data: NoteVisibilityData): boolean {
+	private isAccessible(note: PopulatedNote, user: PopulatedMe, data: NoteVisibilityData): boolean {
 		// We can always view our own notes
 		if (user?.id === note.userId) return true;
 
@@ -218,18 +223,18 @@ export class NoteVisibilityService {
 		}
 	}
 
-	private isAccessibleDM(note: PopulatedNote, user: PopulatedUser): boolean {
+	private isAccessibleDM(note: PopulatedNote, user: PopulatedMe): boolean {
 		// Must be logged in to view DM
 		if (user == null) return false;
 
 		// Can be visible to me
-		if (note.visibleUserIds?.includes(user.id)) return true;
+		if (note.visibleUserIds.includes(user.id)) return true;
 
 		// Otherwise invisible
 		return false;
 	}
 
-	private isAccessibleFO(note: PopulatedNote, user: PopulatedUser, data: NoteVisibilityData): boolean {
+	private isAccessibleFO(note: PopulatedNote, user: PopulatedMe, data: NoteVisibilityData): boolean {
 		// Must be logged in to view FO
 		if (user == null) return false;
 
@@ -237,10 +242,10 @@ export class NoteVisibilityService {
 		if (note.reply?.userId === user.id) return true;
 
 		// Can mention me
-		if (note.mentions?.includes(user.id)) return true;
+		if (note.mentions.includes(user.id)) return true;
 
 		// Can be visible to me
-		if (note.visibleUserIds?.includes(user.id)) return true;
+		if (note.visibleUserIds.includes(user.id)) return true;
 
 		// Can be followed by me
 		if (data.userFollowings?.has(note.userId)) return true;
@@ -258,9 +263,7 @@ export class NoteVisibilityService {
 		// Make followers-only
 		if (note.user.makeNotesFollowersOnlyBefore && note.visibility !== 'specified' && note.visibility !== 'followers') {
 			const followersOnlyBefore = note.user.makeNotesFollowersOnlyBefore * 1000;
-			const createdAt = 'createdAt' in note
-				? new Date(note.createdAt).getTime()
-				: this.idService.parse(note.id).date.getTime();
+			const createdAt = note.createdAt.valueOf();
 
 			// I don't understand this logic, but I tried to break it out for readability
 			const followersOnlyOpt1 = followersOnlyBefore <= 0 && (Date.now() - createdAt > 0 - followersOnlyBefore);
@@ -280,7 +283,7 @@ export class NoteVisibilityService {
 	}
 
 	// Based on NoteEntityService.hideNote
-	private shouldRedact(note: PopulatedNote, user: PopulatedUser): boolean {
+	private shouldRedact(note: PopulatedNote, user: PopulatedMe): boolean {
 		// Never redact our own notes
 		if (user?.id === note.userId) return false;
 
@@ -290,9 +293,7 @@ export class NoteVisibilityService {
 		// Redact if note has expired
 		if (note.user.makeNotesHiddenBefore) {
 			const hiddenBefore = note.user.makeNotesHiddenBefore * 1000;
-			const createdAt = 'createdAt' in note
-				? new Date(note.createdAt).getTime()
-				: this.idService.parse(note.id).date.getTime();
+			const createdAt = note.createdAt.valueOf();
 
 			// I don't understand this logic, but I tried to break it out for readability
 			const hiddenOpt1 = hiddenBefore <= 0 && (Date.now() - createdAt > 0 - hiddenBefore);
@@ -305,7 +306,7 @@ export class NoteVisibilityService {
 	}
 
 	// Based on inconsistent logic from all around the app
-	private shouldSilence(note: PopulatedNote, user: PopulatedUser, data: NoteVisibilityData, filters: NoteVisibilityFilters | undefined): boolean {
+	private shouldSilence(note: PopulatedNote, user: PopulatedMe, data: NoteVisibilityData, filters: NoteVisibilityFilters | undefined): boolean {
 		if (this.shouldSilenceForMute(note, data)) {
 			return true;
 		}
@@ -323,7 +324,7 @@ export class NoteVisibilityService {
 
 	private shouldSilenceForMute(note: PopulatedNote, data: NoteVisibilityData): boolean {
 		// Silence if we've muted the thread
-		if (data.userMutedThreads?.has(note.threadId ?? note.id)) return true;
+		if (data.userMutedThreads?.has(note.threadId)) return true;
 
 		// Silence if we've muted the note
 		if (data.userMutedNotes?.has(note.id)) return true;
@@ -341,7 +342,7 @@ export class NoteVisibilityService {
 		return false;
 	}
 
-	private shouldSilenceForSilence(note: PopulatedNote, user: PopulatedUser, data: NoteVisibilityData, ignoreSilencedAuthor: boolean): boolean {
+	private shouldSilenceForSilence(note: PopulatedNote, user: PopulatedMe, data: NoteVisibilityData, ignoreSilencedAuthor: boolean): boolean {
 		// Don't silence if it's us
 		if (note.userId === user?.id) return false;
 
@@ -364,7 +365,7 @@ export class NoteVisibilityService {
 		return false;
 	}
 
-	private shouldSilenceForFollowWithoutReplies(note: PopulatedNote, user: PopulatedUser, data: NoteVisibilityData): boolean {
+	private shouldSilenceForFollowWithoutReplies(note: PopulatedNote, user: PopulatedMe, data: NoteVisibilityData): boolean {
 		// Don't silence if it's not a reply
 		if (!note.reply) return false;
 
@@ -395,27 +396,60 @@ export interface NoteVisibilityData {
 	userMutedInstances: Set<string> | null;
 }
 
-export type PopulatedUser = Pick<MiUser, 'id' | 'host'> | null | undefined;
+// This represents the *requesting* user!
+export type PopulatedMe = Pick<MiUser, 'id' | 'host'> | null | undefined;
 
-export type PopulatedNote = PopulatedMiNote | Packed<'Note'>;
+// type PopulatedNote = Flatten<PopulatedObjectNote>;
+// type PopulatedNote = Flatten<Packed<'Note'>, MiNote> & {
+// 	user: PopulatedUser,
+// 	renote?: PopulatedNote | null,
+// 	reply?: PopulatedNote | null,
+// };
+// type PopulatedUser = Flatten<Packed<'UserLite'>, MiUser> & {
+// 	instance?: PopulatedInstance | null,
+// };
+// type PopulatedInstance = Flatten<Packed<'UserLite'>['instance'], MiInstance>;
 
-type PopulatedMiNote = MiNote & {
-	user: MiUser & {
-		instance: MiInstance | null,
-	}
-	renote: PopulatedMiNote | null,
-	reply: PopulatedMiNote | null,
-};
+interface PopulatedNote {
+	id: string;
+	threadId: string;
+	userId: string;
+	userHost: string | null;
+	user: PopulatedUser;
+	renoteId: string | null;
+	renote: PopulatedNote | null;
+	replyId: string | null;
+	reply: PopulatedNote | null;
+	mentions: string[];
+	visibleUserIds: string[];
+	visibility: 'public' | 'followers' | 'home' | 'specified';
+	createdAt: Date;
+	text: string | null;
+	cw: string | null;
+	hasPoll: boolean;
+	fileIds: string[];
+}
+
+interface PopulatedUser {
+	id: string;
+	host: string | null;
+	instance: PopulatedInstance | null;
+	isSilenced: boolean;
+	requireSigninToViewContents: boolean;
+	makeNotesHiddenBefore: number | null;
+	makeNotesFollowersOnlyBefore: number | null;
+}
+
+interface PopulatedInstance {
+	host: string;
+	isSilenced: boolean;
+}
 
 function isPopulatedBoost(note: PopulatedNote): note is PopulatedNote & { renote: PopulatedNote } {
 	return note.renoteId != null
 		&& note.replyId == null
 		&& note.text == null
 		&& note.cw == null
-		&& (note.fileIds == null || note.fileIds.length === 0);
-}
-
-function isPackedNote(note: MiNote | Packed<'Note'>): note is Packed<'Note'> {
-	// Kind of a hack: determine whether it's packed by looking for property that doesn't exist in MiNote
-	return 'isFavorited' in note;
+		&& note.fileIds.length === 0
+		&& !note.hasPoll;
 }

From 4b57d7d6dd598afbf66c729d164fc50e6cb6d27e Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Thu, 18 Sep 2025 17:36:01 -0400
Subject: [PATCH 106/110] populate renote target in NoteVisibilityService

---
 packages/backend/src/core/NoteVisibilityService.ts | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/packages/backend/src/core/NoteVisibilityService.ts b/packages/backend/src/core/NoteVisibilityService.ts
index 8ec872fd9c..ed18671c37 100644
--- a/packages/backend/src/core/NoteVisibilityService.ts
+++ b/packages/backend/src/core/NoteVisibilityService.ts
@@ -76,7 +76,7 @@ export class NoteVisibilityService {
 	}
 
 	// TODO pass in notes hint
-	private async populateNote(note: MiNote | Packed<'Note'>, dive = true): Promise<PopulatedNote> {
+	private async populateNote(note: MiNote | Packed<'Note'>, diveReply = true, diveRenote = true): Promise<PopulatedNote> {
 		const userPromise = this.getNoteUser(note);
 
 		// noinspection ES6MissingAwait
@@ -90,9 +90,9 @@ export class NoteVisibilityService {
 			userHost: userPromise.then(u => u.host),
 			user: userPromise,
 			renoteId: note.renoteId ?? null,
-			renote: dive ? this.getNoteRenote(note) : null,
+			renote: diveRenote ? this.getNoteRenote(note) : null,
 			replyId: note.replyId ?? null,
-			reply: dive ? this.getNoteReply(note) : null,
+			reply: diveReply ? this.getNoteReply(note) : null,
 			hasPoll: 'hasPoll' in note ? note.hasPoll : (note.poll != null),
 			mentions: note.mentions ?? [],
 			visibleUserIds: note.visibleUserIds ?? [],
@@ -123,8 +123,10 @@ export class NoteVisibilityService {
 
 		const renote = note.renote ?? await this.notesRepository.findOneByOrFail({ id: note.renoteId });
 
-		// TODO dive into renote.reply
-		return await this.populateNote(renote, false);
+		// Renote needs to include the reply!
+		// This will dive one more time before landing in getNoteReply, which terminates recursion.
+		// Based on the logic in NoteEntityService.pack()
+		return await this.populateNote(renote, true, false);
 	}
 
 	private async getNoteReply(note: MiNote | Packed<'Note'>): Promise<PopulatedNote | null> {
@@ -132,7 +134,7 @@ export class NoteVisibilityService {
 
 		const reply = note.reply ?? await this.notesRepository.findOneByOrFail({ id: note.replyId });
 
-		return await this.populateNote(reply, false);
+		return await this.populateNote(reply, false, false);
 	}
 
 	@bindThis

From 4bab56609f84b57f0c03b1190756ea3cac6cd6e7 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Thu, 18 Sep 2025 19:27:36 -0400
Subject: [PATCH 107/110] follow-up fixes to NoteVisibilityService changes

---
 .../src/core/FanoutTimelineEndpointService.ts | 104 +++++++++++-------
 .../backend/src/core/NoteVisibilityService.ts |  72 ++++++------
 .../src/core/entities/NoteEntityService.ts    |  94 +---------------
 3 files changed, 107 insertions(+), 163 deletions(-)

diff --git a/packages/backend/src/core/FanoutTimelineEndpointService.ts b/packages/backend/src/core/FanoutTimelineEndpointService.ts
index 5531f0b0ae..ddb0ddb7d2 100644
--- a/packages/backend/src/core/FanoutTimelineEndpointService.ts
+++ b/packages/backend/src/core/FanoutTimelineEndpointService.ts
@@ -19,7 +19,7 @@ import { isQuote, isRenote } from '@/misc/is-renote.js';
 import { CacheService } from '@/core/CacheService.js';
 import { isReply } from '@/misc/is-reply.js';
 import { isInstanceMuted } from '@/misc/is-instance-muted.js';
-import { NoteVisibilityService, PopulatedNote } from '@/core/NoteVisibilityService.js';
+import { NotePopulationData, NoteVisibilityService, PopulatedNote } from '@/core/NoteVisibilityService.js';
 import { FederatedInstanceService } from '@/core/FederatedInstanceService.js';
 
 type TimelineOptions = {
@@ -85,29 +85,29 @@ export class FanoutTimelineEndpointService {
 		const shouldFallbackToDb = noteIds.length === 0 || ps.sinceId != null && ps.sinceId < oldestNoteId;
 
 		if (!shouldFallbackToDb) {
-			let filter = ps.noteFilter ?? (_note => true);
+			let filter: (note: MiNote, populated: PopulatedNote) => boolean = ps.noteFilter ?? (() => true);
 
 			if (ps.excludeNoFiles) {
 				const parentFilter = filter;
-				filter = (note) => note.fileIds.length !== 0 && parentFilter(note);
+				filter = (note, populated) => note.fileIds.length !== 0 && parentFilter(note, populated);
 			}
 
 			if (ps.excludeReplies) {
 				const parentFilter = filter;
-				filter = (note) => {
+				filter = (note, populated) => {
 					if (note.userId !== ps.me?.id && isReply(note, ps.me?.id)) return false;
-					return parentFilter(note);
+					return parentFilter(note, populated);
 				};
 			}
 
 			if (ps.excludeBots) {
 				const parentFilter = filter;
-				filter = (note) => !note.user?.isBot && parentFilter(note);
+				filter = (note, populated) => !note.user?.isBot && parentFilter(note, populated);
 			}
 
 			if (ps.excludePureRenotes) {
 				const parentFilter = filter;
-				filter = (note) => (!isRenote(note) || isQuote(note)) && parentFilter(note);
+				filter = (note, populated) => (!isRenote(note) || isQuote(note)) && parentFilter(note, populated);
 			}
 
 			{
@@ -115,37 +115,37 @@ export class FanoutTimelineEndpointService {
 				const data = await this.noteVisibilityService.populateData(me);
 
 				const parentFilter = filter;
-				filter = (note) => {
-					const { accessible, silence } = this.noteVisibilityService.checkNoteVisibility(note as PopulatedNote, me, { data, filters: { includeSilencedAuthor: ps.ignoreAuthorFromUserSilence } });
+				filter = (note, populated) => {
+					const { accessible, silence } = this.noteVisibilityService.checkNoteVisibility(populated, me, { data, filters: { includeSilencedAuthor: ps.ignoreAuthorFromUserSilence } });
 					if (!accessible || silence) return false;
 
-					return parentFilter(note);
+					return parentFilter(note, populated);
 				};
 			}
 
 			{
 				const parentFilter = filter;
-				filter = (note) => {
+				filter = (note, populated) => {
 					if (!ps.ignoreAuthorFromInstanceBlock) {
 						if (note.user?.instance?.isBlocked) return false;
 					}
 					if (note.userId !== note.renoteUserId && note.renote?.user?.instance?.isBlocked) return false;
 					if (note.userId !== note.replyUserId && note.reply?.user?.instance?.isBlocked) return false;
 
-					return parentFilter(note);
+					return parentFilter(note, populated);
 				};
 			}
 
 			{
 				const parentFilter = filter;
-				filter = (note) => {
+				filter = (note, populated) => {
 					if (!ps.ignoreAuthorFromUserSuspension) {
 						if (note.user?.isSuspended) return false;
 					}
 					if (note.userId !== note.renoteUserId && note.renote?.user?.isSuspended) return false;
 					if (note.userId !== note.replyUserId && note.reply?.user?.isSuspended) return false;
 
-					return parentFilter(note);
+					return parentFilter(note, populated);
 				};
 			}
 
@@ -190,7 +190,7 @@ export class FanoutTimelineEndpointService {
 		return await ps.dbFallback(ps.untilId, ps.sinceId, ps.limit);
 	}
 
-	private async getAndFilterFromDb(noteIds: string[], noteFilter: (note: MiNote) => boolean, idCompare: (a: string, b: string) => number): Promise<MiNote[]> {
+	private async getAndFilterFromDb(noteIds: string[], noteFilter: (note: MiNote, populated: PopulatedNote) => boolean, idCompare: (a: string, b: string) => number): Promise<MiNote[]> {
 		const query = this.notesRepository.createQueryBuilder('note')
 			.where('note.id IN (:...noteIds)', { noteIds: noteIds })
 			.leftJoinAndSelect('note.reply', 'reply')
@@ -198,52 +198,78 @@ export class FanoutTimelineEndpointService {
 			.leftJoinAndSelect('note.channel', 'channel')
 
 			// Needed for populated note
-			.leftJoinAndSelect('renote.renote', 'renoteRenote')
 			.leftJoinAndSelect('renote.reply', 'renoteReply')
 		;
 
 		const notes = await query.getMany();
 
-		// Manually populate user/instance since it's cacheable and avoids many joins.
-		// These fields *must* be populated or NoteVisibilityService won't work right!
-		await this.populateUsers(notes);
-
-		return notes
-			.filter(noteFilter)
-			.sort((a, b) => idCompare(a.id, b.id));
+		const populatedNotes = await this.populateNotes(notes);
+		return populatedNotes
+			.filter(({ note, populated }) => noteFilter(note, populated))
+			.sort((a, b) => idCompare(a.id, b.id))
+			.map(({ note }) => note);
 	}
 
-	private async populateUsers(notes: MiNote[]): Promise<void> {
-		// Enumerate users and instances
+	/**
+	 * Given a sample of notes to return, populates the relations from cache and generates a NotePopulationData hint object.
+	 * This is messy and kinda gross, but it allows us to use the synchronous checkNoteVisibility from within the filter callbacks.
+	 */
+	private async populateNotes(notes: MiNote[]): Promise<{ id: string, note: MiNote, populated: PopulatedNote }[]> {
+		// Manually populate user/instance since it's cacheable and avoids many joins.
+		// These fields *must* be populated or NoteVisibilityService won't work right!
+		const populationData = await this.populateUsers(notes);
+
+		// This is async, but it should never await because we populate above.
+		return await Promise.all(notes.map(async note => ({
+			id: note.id,
+			note: note,
+			populated: await this.noteVisibilityService.populateNote(note, populationData),
+		})));
+	}
+
+	/**
+	 * This does two things:
+	 * 1. Populates the user/instance relations of every note in the object graph.
+	 * 2. Returns fetched note/user/instance maps for use as hint data for NoteVisibilityService.
+	 */
+	private async populateUsers(notes: MiNote[]): Promise<NotePopulationData> {
+		// Enumerate all related data
+		const allNotes = new Map<string, MiNote>();
 		const usersToFetch = new Set<string>();
 		const instancesToFetch = new Set<string>();
+
 		for (const note of notes) {
+			// note
+			allNotes.set(note.id, note);
 			usersToFetch.add(note.userId);
 			if (note.userHost) {
 				instancesToFetch.add(note.userHost);
 			}
+
+			// note.reply
 			if (note.reply) {
+				allNotes.set(note.reply.id, note.reply);
 				usersToFetch.add(note.reply.userId);
 				if (note.reply.userHost) {
 					instancesToFetch.add(note.reply.userHost);
 				}
 			}
+
+			// note.renote
 			if (note.renote) {
+				allNotes.set(note.renote.id, note.renote);
 				usersToFetch.add(note.renote.userId);
 				if (note.renote.userHost) {
 					instancesToFetch.add(note.renote.userHost);
 				}
-				if (note.renote.reply) {
-					usersToFetch.add(note.renote.reply.userId);
-					if (note.renote.reply.userHost) {
-						instancesToFetch.add(note.renote.reply.userHost);
-					}
-				}
-				if (note.renote.renote) {
-					usersToFetch.add(note.renote.renote.userId);
-					if (note.renote.renote.userHost) {
-						instancesToFetch.add(note.renote.renote.userHost);
-					}
+			}
+
+			// note.renote.reply
+			if (note.renote?.reply) {
+				allNotes.set(note.renote.reply.id, note.renote.reply);
+				usersToFetch.add(note.renote.reply.userId);
+				if (note.renote.reply.userHost) {
+					instancesToFetch.add(note.renote.reply.userHost);
 				}
 			}
 		}
@@ -271,10 +297,10 @@ export class FanoutTimelineEndpointService {
 				if (note.renote.reply) {
 					note.renote.reply.user = users.get(note.renote.reply.userId) ?? null;
 				}
-				if (note.renote.renote) {
-					note.renote.renote.user = users.get(note.renote.renote.userId) ?? null;
-				}
 			}
 		}
+
+		// Optimization: return our accumulated data to avoid duplicate lookups later
+		return { users, instances, notes: allNotes };
 	}
 }
diff --git a/packages/backend/src/core/NoteVisibilityService.ts b/packages/backend/src/core/NoteVisibilityService.ts
index ed18671c37..0285847cf5 100644
--- a/packages/backend/src/core/NoteVisibilityService.ts
+++ b/packages/backend/src/core/NoteVisibilityService.ts
@@ -8,11 +8,11 @@ import { CacheService } from '@/core/CacheService.js';
 import type { MiNote } from '@/models/Note.js';
 import type { MiUser } from '@/models/User.js';
 import { bindThis } from '@/decorators.js';
-import { Packed } from '@/misc/json-schema.js';
+import type { Packed } from '@/misc/json-schema.js';
 import { IdService } from '@/core/IdService.js';
 import { awaitAll } from '@/misc/prelude/await-all.js';
 import { FederatedInstanceService } from '@/core/FederatedInstanceService.js';
-import type { MiFollowing, NotesRepository } from '@/models/_.js';
+import type { MiFollowing, MiInstance, NotesRepository } from '@/models/_.js';
 import { DI } from '@/di-symbols.js';
 
 /**
@@ -69,15 +69,15 @@ export class NoteVisibilityService {
 			user = await this.cacheService.findUserById(user);
 		}
 
-		const populatedNote = await this.populateNote(note);
+		const populatedNote = await this.populateNote(note, opts?.hint);
 		const populatedData = await this.populateData(user, opts?.hint ?? {});
 
 		return this.checkNoteVisibility(populatedNote, user, { filters: opts?.filters, data: populatedData });
 	}
 
-	// TODO pass in notes hint
-	private async populateNote(note: MiNote | Packed<'Note'>, diveReply = true, diveRenote = true): Promise<PopulatedNote> {
-		const userPromise = this.getNoteUser(note);
+	@bindThis
+	public async populateNote(note: MiNote | Packed<'Note'>, hint?: NotePopulationData, diveReply = true, diveRenote = true): Promise<PopulatedNote> {
+		const userPromise = this.getNoteUser(note, hint);
 
 		// noinspection ES6MissingAwait
 		return await awaitAll({
@@ -90,9 +90,9 @@ export class NoteVisibilityService {
 			userHost: userPromise.then(u => u.host),
 			user: userPromise,
 			renoteId: note.renoteId ?? null,
-			renote: diveRenote ? this.getNoteRenote(note) : null,
+			renote: diveRenote ? this.getNoteRenote(note, hint) : null,
 			replyId: note.replyId ?? null,
-			reply: diveReply ? this.getNoteReply(note) : null,
+			reply: diveReply ? this.getNoteReply(note, hint) : null,
 			hasPoll: 'hasPoll' in note ? note.hasPoll : (note.poll != null),
 			mentions: note.mentions ?? [],
 			visibleUserIds: note.visibleUserIds ?? [],
@@ -103,9 +103,18 @@ export class NoteVisibilityService {
 		});
 	}
 
-	private async getNoteUser(note: MiNote | Packed<'Note'>): Promise<PopulatedUser> {
-		const user = note.user ?? await this.cacheService.findUserById(note.userId);
-		const instance = user.instance ?? (user.host ? await this.federatedInstanceService.fetchOrRegister(user.host) : null);
+	private async getNoteUser(note: MiNote | Packed<'Note'>, hint?: NotePopulationData): Promise<PopulatedUser> {
+		const user = note.user
+			?? hint?.users?.get(note.userId)
+			?? await this.cacheService.findUserById(note.userId);
+
+		const instance = user.host
+			? (
+				user.instance
+				?? hint?.instances?.get(user.host)
+				?? await this.federatedInstanceService.fetchOrRegister(user.host)
+			) : null;
+
 		return {
 			...user,
 			makeNotesHiddenBefore: user.makeNotesHiddenBefore ?? null,
@@ -118,23 +127,27 @@ export class NoteVisibilityService {
 		};
 	}
 
-	private async getNoteRenote(note: MiNote | Packed<'Note'>): Promise<PopulatedNote | null> {
+	private async getNoteRenote(note: MiNote | Packed<'Note'>, hint?: NotePopulationData): Promise<PopulatedNote | null> {
 		if (!note.renoteId) return null;
 
-		const renote = note.renote ?? await this.notesRepository.findOneByOrFail({ id: note.renoteId });
+		const renote = note.renote
+			?? hint?.notes?.get(note.renoteId)
+			?? await this.notesRepository.findOneByOrFail({ id: note.renoteId });
 
 		// Renote needs to include the reply!
 		// This will dive one more time before landing in getNoteReply, which terminates recursion.
 		// Based on the logic in NoteEntityService.pack()
-		return await this.populateNote(renote, true, false);
+		return await this.populateNote(renote, hint, true, false);
 	}
 
-	private async getNoteReply(note: MiNote | Packed<'Note'>): Promise<PopulatedNote | null> {
+	private async getNoteReply(note: MiNote | Packed<'Note'>, hint?: NotePopulationData): Promise<PopulatedNote | null> {
 		if (!note.replyId) return null;
 
-		const reply = note.reply ?? await this.notesRepository.findOneByOrFail({ id: note.replyId });
+		const reply = note.reply
+			?? hint?.notes?.get(note.replyId)
+			?? await this.notesRepository.findOneByOrFail({ id: note.replyId });
 
-		return await this.populateNote(reply, false, false);
+		return await this.populateNote(reply, hint, false, false);
 	}
 
 	@bindThis
@@ -261,11 +274,11 @@ export class NoteVisibilityService {
 
 	// Based on NoteEntityService.treatVisibility
 	@bindThis
-	public syncVisibility(note: PopulatedNote): void {
+	public syncVisibility(note: PopulatedNote | Packed<'Note'>): void {
 		// Make followers-only
 		if (note.user.makeNotesFollowersOnlyBefore && note.visibility !== 'specified' && note.visibility !== 'followers') {
 			const followersOnlyBefore = note.user.makeNotesFollowersOnlyBefore * 1000;
-			const createdAt = note.createdAt.valueOf();
+			const createdAt = new Date(note.createdAt).valueOf();
 
 			// I don't understand this logic, but I tried to break it out for readability
 			const followersOnlyOpt1 = followersOnlyBefore <= 0 && (Date.now() - createdAt > 0 - followersOnlyBefore);
@@ -388,7 +401,7 @@ export class NoteVisibilityService {
 	}
 }
 
-export interface NoteVisibilityData {
+export interface NoteVisibilityData extends NotePopulationData {
 	userBlockers: Set<string> | null;
 	userFollowings: Map<string, Omit<MiFollowing, 'isFollowerHibernated'>> | null;
 	userMutedThreads: Set<string> | null;
@@ -398,21 +411,16 @@ export interface NoteVisibilityData {
 	userMutedInstances: Set<string> | null;
 }
 
+export interface NotePopulationData {
+	notes?: Map<string, MiNote>;
+	users?: Map<string, MiUser>;
+	instances?: Map<string, MiInstance>;
+}
+
 // This represents the *requesting* user!
 export type PopulatedMe = Pick<MiUser, 'id' | 'host'> | null | undefined;
 
-// type PopulatedNote = Flatten<PopulatedObjectNote>;
-// type PopulatedNote = Flatten<Packed<'Note'>, MiNote> & {
-// 	user: PopulatedUser,
-// 	renote?: PopulatedNote | null,
-// 	reply?: PopulatedNote | null,
-// };
-// type PopulatedUser = Flatten<Packed<'UserLite'>, MiUser> & {
-// 	instance?: PopulatedInstance | null,
-// };
-// type PopulatedInstance = Flatten<Packed<'UserLite'>['instance'], MiInstance>;
-
-interface PopulatedNote {
+export interface PopulatedNote {
 	id: string;
 	threadId: string;
 	userId: string;
diff --git a/packages/backend/src/core/entities/NoteEntityService.ts b/packages/backend/src/core/entities/NoteEntityService.ts
index b3313abe08..4e7ac59f41 100644
--- a/packages/backend/src/core/entities/NoteEntityService.ts
+++ b/packages/backend/src/core/entities/NoteEntityService.ts
@@ -19,6 +19,7 @@ import { ReactionsBufferingService } from '@/core/ReactionsBufferingService.js';
 import { QueryService } from '@/core/QueryService.js';
 import type { Config } from '@/config.js';
 import { NoteVisibilityService } from '@/core/NoteVisibilityService.js';
+import type { PopulatedNote } from '@/core/NoteVisibilityService.js';
 import type { NoteVisibilityData } from '@/core/NoteVisibilityService.js';
 import type { OnModuleInit } from '@nestjs/common';
 import type { CacheService } from '../CacheService.js';
@@ -150,7 +151,7 @@ export class NoteEntityService implements OnModuleInit {
 		const data = await this.noteVisibilityService.populateData(me, hint);
 
 		for (const note of notes) {
-			this.hideNote(note, me, data);
+			await this.hideNoteAsync(note, me, data);
 		}
 	}
 
@@ -163,97 +164,6 @@ export class NoteEntityService implements OnModuleInit {
 		}
 	}
 
-	@bindThis
-	public hideNote(packedNote: Packed<'Note'>, me: Pick<MiUser, 'id' | 'host'> | null, data: NoteVisibilityData): void {
-		// Implementation moved to NoteVisibilityService
-		/*
-		if (meId === packedNote.userId) return;
-
-		// TODO: isVisibleForMe を使うようにしても良さそう(型違うけど)
-		let hide = false;
-
-		if (packedNote.user.requireSigninToViewContents && meId == null) {
-			hide = true;
-		}
-
-		if (!hide) {
-			const hiddenBefore = packedNote.user.makeNotesHiddenBefore;
-			if ((hiddenBefore != null)
-				&& (
-					(hiddenBefore <= 0 && (Date.now() - new Date(packedNote.createdAt).getTime() > 0 - (hiddenBefore * 1000)))
-					|| (hiddenBefore > 0 && (new Date(packedNote.createdAt).getTime() < hiddenBefore * 1000))
-				)
-			) {
-				hide = true;
-			}
-		}
-
-		// visibility が specified かつ自分が指定されていなかったら非表示
-		if (!hide) {
-			if (packedNote.visibility === 'specified') {
-				if (meId == null) {
-					hide = true;
-				} else if (meId === packedNote.userId) {
-					hide = false;
-				} else {
-					// 指定されているかどうか
-					const specified = packedNote.visibleUserIds!.some(id => meId === id);
-
-					if (!specified) {
-						hide = true;
-					}
-				}
-			}
-		}
-
-		// visibility が followers かつ自分が投稿者のフォロワーでなかったら非表示
-		if (!hide) {
-			if (packedNote.visibility === 'followers') {
-				if (meId == null) {
-					hide = true;
-				} else if (meId === packedNote.userId) {
-					hide = false;
-				} else if (packedNote.reply && (meId === packedNote.reply.userId)) {
-					// 自分の投稿に対するリプライ
-					hide = false;
-				} else if (packedNote.mentions && packedNote.mentions.some(id => meId === id)) {
-					// 自分へのメンション
-					hide = false;
-				} else if (packedNote.renote && (meId === packedNote.renote.userId)) {
-					hide = false;
-				} else {
-					const isFollowing = hint?.myFollowing
-						? hint.myFollowing.has(packedNote.userId)
-						: (await this.cacheService.userFollowingsCache.fetch(meId)).has(packedNote.userId);
-
-					hide = !isFollowing;
-				}
-			}
-		}
-
-		// If this is a pure renote (boost), then we should *also* check the boosted note's visibility.
-		// Otherwise we can have empty notes on the timeline, which is not good.
-		// Notes are packed in depth-first order, so we can safely grab the "isHidden" property to avoid duplicated checks.
-		// This is pulled out to ensure that we check both the renote *and* the boosted note.
-		if (packedNote.renote?.isHidden && isPackedPureRenote(packedNote)) {
-			hide = true;
-		}
-
-		if (!hide && meId && packedNote.userId !== meId) {
-			const blockers = hint?.myBlockers ?? await this.cacheService.userBlockedCache.fetch(meId);
-			const isBlocked = blockers.has(packedNote.userId);
-
-			if (isBlocked) hide = true;
-		}
-		*/
-
-		const hide = this.noteVisibilityService.checkNoteVisibility(packedNote, me, { data }).redact;
-
-		if (hide) {
-			this.redactNoteContents(packedNote);
-		}
-	}
-
 	private redactNoteContents(packedNote: Packed<'Note'>) {
 		{
 			packedNote.visibleUserIds = undefined;

From 1eb20ded644da84de4ca4a0ccd7198336d796714 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Thu, 18 Sep 2025 19:30:27 -0400
Subject: [PATCH 108/110] fix unrelated type error in e2e/clips.ts

---
 packages/backend/test/e2e/clips.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/backend/test/e2e/clips.ts b/packages/backend/test/e2e/clips.ts
index 570cc61c4b..4c2a5ecfdc 100644
--- a/packages/backend/test/e2e/clips.ts
+++ b/packages/backend/test/e2e/clips.ts
@@ -695,7 +695,7 @@ describe('クリップ', () => {
 			}) as any as void;
 		};
 
-		const notes = async (parameters: Misskey.entities.ClipsNotesRequest, request: Partial<ApiRequest<'clips/notes'>> = {}): Promise<Misskey.entities.Note[]> => {
+		const notes = async (parameters: Misskey.entities.ClipsNotesRequest, request: Partial<ApiRequest<'clips/notes'>> = {}) => {
 			return successfulApiCall({
 				endpoint: 'clips/notes',
 				parameters,

From e68e0266a487430fe7085311d287fafc8fde5262 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Thu, 18 Sep 2025 22:08:33 -0400
Subject: [PATCH 109/110] fix user's DMs not showing up in their own home
 timeline when Fanout Timeline is enabled

---
 packages/backend/src/core/NoteCreateService.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/backend/src/core/NoteCreateService.ts b/packages/backend/src/core/NoteCreateService.ts
index d23eb520cf..ea74d3a84e 100644
--- a/packages/backend/src/core/NoteCreateService.ts
+++ b/packages/backend/src/core/NoteCreateService.ts
@@ -988,7 +988,7 @@ export class NoteCreateService implements OnApplicationShutdown {
 
 			// 自分自身のHTL
 			if (note.userHost == null) {
-				if (note.visibility !== 'specified' || !note.visibleUserIds.some(v => v === user.id)) {
+				if (note.visibility !== 'specified' || !note.visibleUserIds.some(v => v === user.id) || note.userId === user.id) {
 					this.fanoutTimelineService.push(`homeTimeline:${user.id}`, note.id, this.meta.perUserHomeTimelineCacheMax, r);
 					if (note.fileIds.length > 0) {
 						this.fanoutTimelineService.push(`homeTimelineWithFiles:${user.id}`, note.id, this.meta.perUserHomeTimelineCacheMax / 2, r);

From 0e6caa625cdafeb3710a306382524ea409956316 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Fri, 19 Sep 2025 12:01:36 -0400
Subject: [PATCH 110/110] fix cw-note erasing parts of the note

---
 packages/backend/src/core/NoteEditService.ts  |  2 +-
 .../src/server/api/endpoints/admin/cw-note.ts | 62 ++++++++++++++++---
 2 files changed, 55 insertions(+), 9 deletions(-)

diff --git a/packages/backend/src/core/NoteEditService.ts b/packages/backend/src/core/NoteEditService.ts
index 6062e464ba..9e8bb8b4fd 100644
--- a/packages/backend/src/core/NoteEditService.ts
+++ b/packages/backend/src/core/NoteEditService.ts
@@ -118,7 +118,7 @@ type MinimumUser = {
 	uri: MiUser['uri'];
 };
 
-type Option = {
+export type Option = {
 	createdAt?: Date | null;
 	name?: string | null;
 	text?: string | null;
diff --git a/packages/backend/src/server/api/endpoints/admin/cw-note.ts b/packages/backend/src/server/api/endpoints/admin/cw-note.ts
index a549f57fb3..ba2240b8b2 100644
--- a/packages/backend/src/server/api/endpoints/admin/cw-note.ts
+++ b/packages/backend/src/server/api/endpoints/admin/cw-note.ts
@@ -4,11 +4,14 @@
  */
 
 import { Inject, Injectable } from '@nestjs/common';
+import { In } from 'typeorm';
 import { Endpoint } from '@/server/api/endpoint-base.js';
-import type { MiNote, MiUser, NotesRepository } from '@/models/_.js';
+import type { ChannelsRepository, DriveFilesRepository, MiNote, NotesRepository } from '@/models/_.js';
 import { DI } from '@/di-symbols.js';
 import { ModerationLogService } from '@/core/ModerationLogService.js';
-import { NoteEditService } from '@/core/NoteEditService.js';
+import { NoteEditService, Option } from '@/core/NoteEditService.js';
+import { CacheService } from '@/core/CacheService.js';
+import { awaitAll } from '@/misc/prelude/await-all.js';
 
 export const meta = {
 	tags: ['admin'],
@@ -35,14 +38,22 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 		@Inject(DI.notesRepository)
 		private readonly notesRepository: NotesRepository,
 
+		@Inject(DI.driveFilesRepository)
+		private readonly driveFilesRepository: DriveFilesRepository,
+
+		@Inject(DI.channelsRepository)
+		private readonly channelsRepository: ChannelsRepository,
+
 		private readonly noteEditService: NoteEditService,
 		private readonly moderationLogService: ModerationLogService,
+		private readonly cacheService: CacheService,
 	) {
 		super(meta, paramDef, async (ps, me) => {
 			const note = await this.notesRepository.findOneOrFail({
 				where: { id: ps.noteId },
-				relations: { user: true },
-			}) as MiNote & { user: MiUser };
+				relations: { reply: true, renote: true, channel: true },
+			});
+			const user = await this.cacheService.findUserById(note.userId);
 
 			// Collapse empty strings to null
 			const newCW = ps.cw?.trim() || null;
@@ -51,16 +62,51 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 			// Skip if there's nothing to do
 			if (oldCW === newCW) return;
 
-			await this.noteEditService.edit(note.user, note.id, { mandatoryCW: newCW });
+			// TODO remove this after merging hazelnoot/fix-note-edit-logic.
+			//		Until then, we have to ensure that everything is populated just like it would be from notes/edit.ts.
+			//		Otherwise forcing a CW will erase everything else in the note.
+			//		After merging remove all the "createUpdate" stuff and just pass "{ mandatoryCW: newCW }" into noteEditService.edit().
+			const update = await this.createUpdate(note, newCW);
+			await this.noteEditService.edit(user, note.id, update);
 
 			await this.moderationLogService.log(me, 'setMandatoryCWForNote', {
 				newCW,
 				oldCW,
 				noteId: note.id,
-				noteUserId: note.user.id,
-				noteUserUsername: note.user.username,
-				noteUserHost: note.user.host,
+				noteUserId: user.id,
+				noteUserUsername: user.username,
+				noteUserHost: user.host,
 			});
 		});
 	}
+
+	// Note: user must be fetched with reply, renote, and channel relations populated
+	private async createUpdate(note: MiNote, newCW: string | null) {
+		// This is based on the call to NoteEditService.edit from notes/edit endpoint.
+		// noinspection ES6MissingAwait
+		return await awaitAll<Option>({
+			// Preserve these from original note
+			files: note.fileIds.length > 0
+				? this.driveFilesRepository.findBy({ id: In(note.fileIds) }) : null,
+			poll: undefined,
+			text: undefined,
+			cw: undefined,
+			reply: note.reply
+				?? (note.replyId ? this.notesRepository.findOneByOrFail({ id: note.replyId }) : null),
+			renote: note.renote
+				?? (note.renoteId ? this.notesRepository.findOneByOrFail({ id: note.renoteId }) : null),
+			localOnly: note.localOnly,
+			reactionAcceptance: note.reactionAcceptance,
+			visibility: note.visibility,
+			visibleUsers: note.visibleUserIds.length > 0
+				? this.cacheService.getUsers(note.visibleUserIds).then(us => Array.from(us.values())) : null,
+			channel: note.channel ?? (note.channelId ? this.channelsRepository.findOneByOrFail({ id: note.channelId }) : null),
+			apMentions: undefined,
+			apHashtags: undefined,
+			apEmojis: undefined,
+
+			// But override the mandatory CW!
+			mandatoryCW: newCW,
+		});
+	}
 }