From 99a4553923bb8cbc798b1720e0f2124584868411 Mon Sep 17 00:00:00 2001
From: anatawa12 <anatawa12@icloud.com>
Date: Wed, 17 Dec 2025 00:06:38 +0900
Subject: [PATCH 1/7] feat: collapse sensitive channel notes

---
 CHANGELOG.md                                      |  2 +-
 locales/ja-JP.yml                                 |  2 ++
 packages/frontend/src/components/MkNote.vue       | 15 +++++++++++++--
 packages/frontend/src/pages/channel.vue           |  5 ++++-
 packages/frontend/src/pages/notifications.vue     |  5 ++++-
 .../frontend/src/pages/settings/preferences.vue   |  9 +++++++++
 packages/frontend/src/pages/timeline.vue          |  3 +++
 packages/frontend/src/preferences/def.ts          |  3 +++
 packages/frontend/src/ui/deck/channel-column.vue  |  5 ++++-
 .../frontend/src/ui/deck/notifications-column.vue |  5 ++++-
 packages/frontend/src/ui/deck/tl-column.vue       |  5 ++++-
 packages/i18n/src/autogen/locale.ts               |  8 ++++++++
 12 files changed, 59 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5bb2dfc165..18f09976fd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,7 +10,7 @@ v2025.12.0で行われた「configの`trustProxy`のデフォルト値を`false`
 
 ### Client
 - Fix: バージョン表記のないPlayが正しく動作しない問題を修正
-
+- Enhance: センシティブチャンネルの投稿が多くの場所で畳まれるようにになりました
 
 ## 2025.12.1
 
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 8e4a52b68d..664bb89178 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -839,6 +839,7 @@ emailNotification: "メール通知"
 publish: "公開"
 inChannelSearch: "チャンネル内検索"
 useReactionPickerForContextMenu: "右クリックでリアクションピッカーを開く"
+collapseSensitiveChannel: "ほとんどのタイムラインでセンシティブチャンネルの投稿を隠す"
 typingUsers: "{users}が入力中"
 jumpToSpecifiedDate: "特定の日付にジャンプ"
 showingPastTimeline: "過去のタイムラインを表示しています"
@@ -1281,6 +1282,7 @@ backToTitle: "タイトルへ"
 hemisphere: "お住まいの地域"
 withSensitive: "センシティブなファイルを含むノートを表示"
 userSaysSomethingSensitive: "{name}のセンシティブなファイルを含む投稿"
+userSaysSomethingInSensitiveChannel: "{name}のセンシティブチャンネルでの投稿"
 enableHorizontalSwipe: "スワイプしてタブを切り替える"
 loading: "読み込み中"
 surrender: "やめる"
diff --git a/packages/frontend/src/components/MkNote.vue b/packages/frontend/src/components/MkNote.vue
index a7299d2961..a7c28ea4c9 100644
--- a/packages/frontend/src/components/MkNote.vue
+++ b/packages/frontend/src/components/MkNote.vue
@@ -169,6 +169,13 @@ SPDX-License-Identifier: AGPL-3.0-only
 			</MkA>
 		</template>
 	</I18n>
+	<I18n v-else-if="muted === 'sensitiveChannel'" :src="i18n.ts.userSaysSomethingInSensitiveChannel" tag="small">
+		<template #name>
+			<MkA v-user-preview="appearNote.userId" :to="userPage(appearNote.user)">
+				<MkUserName :user="appearNote.user"/>
+			</MkA>
+		</template>
+	</I18n>
 	<I18n v-else-if="showSoftWordMutedWord !== true" :src="i18n.ts.userSaysSomething" tag="small">
 		<template #name>
 			<MkA v-user-preview="appearNote.userId" :to="userPage(appearNote.user)">
@@ -261,6 +268,9 @@ const emit = defineEmits<{
 	(ev: 'removeReaction', emoji: string): void;
 }>();
 
+// for some timelines, like home timeline which only shows the following channels,
+// we never collapse sensitive channel notes so we allow inject to override the preference
+const collapseSensitiveChannel: boolean = inject<boolean | undefined>('collapseSensitiveChannel', undefined) ?? prefer.s.collapseSensitiveChannel;
 const inTimeline = inject<boolean>('inTimeline', false);
 const tl_withSensitive = inject<Ref<boolean>>('tl_withSensitive', ref(true));
 const inChannel = inject('inChannel', null);
@@ -330,9 +340,9 @@ const pleaseLoginContext = computed<OpenOnRemoteOptions>(() => ({
 /* eslint-disable no-redeclare */
 /** checkOnlyでは純粋なワードミュート結果をbooleanで返却する */
 function checkMute(noteToCheck: Misskey.entities.Note, mutedWords: Array<string | string[]> | undefined | null, checkOnly: true): boolean;
-function checkMute(noteToCheck: Misskey.entities.Note, mutedWords: Array<string | string[]> | undefined | null, checkOnly?: false): Array<string | string[]> | false | 'sensitiveMute';
+function checkMute(noteToCheck: Misskey.entities.Note, mutedWords: Array<string | string[]> | undefined | null, checkOnly?: false): Array<string | string[]> | false | 'sensitiveMute' | 'sensitiveChannel';
 
-function checkMute(noteToCheck: Misskey.entities.Note, mutedWords: Array<string | string[]> | undefined | null, checkOnly = false): Array<string | string[]> | boolean | 'sensitiveMute' {
+function checkMute(noteToCheck: Misskey.entities.Note, mutedWords: Array<string | string[]> | undefined | null, checkOnly = false): Array<string | string[]> | boolean | 'sensitiveMute' | 'sensitiveChannel' {
 	if (mutedWords != null) {
 		const result = checkWordMute(noteToCheck, $i, mutedWords);
 		if (Array.isArray(result)) {
@@ -352,6 +362,7 @@ function checkMute(noteToCheck: Misskey.entities.Note, mutedWords: Array<string
 
 	if (checkOnly) return false;
 
+	if (collapseSensitiveChannel && noteToCheck.channel?.isSensitive) return 'sensitiveChannel';
 	if (inTimeline && tl_withSensitive.value === false && noteToCheck.files?.some((v) => v.isSensitive)) {
 		return 'sensitiveMute';
 	}
diff --git a/packages/frontend/src/pages/channel.vue b/packages/frontend/src/pages/channel.vue
index 0879aa72be..22426e9cc4 100644
--- a/packages/frontend/src/pages/channel.vue
+++ b/packages/frontend/src/pages/channel.vue
@@ -71,7 +71,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 </template>
 
 <script lang="ts" setup>
-import { computed, watch, ref, markRaw, shallowRef } from 'vue';
+import { computed, watch, ref, markRaw, shallowRef, provide } from 'vue';
 import * as Misskey from 'misskey-js';
 import { url } from '@@/js/config.js';
 import { useInterval } from '@@/js/use-interval.js';
@@ -106,6 +106,9 @@ const props = defineProps<{
 	channelId: string;
 }>();
 
+// チャンネルタイムラインには目的のチャンネルしか原則表示されないので、折りたたみを無効化する
+provide('collapseSensitiveChannel', false);
+
 const tab = ref('overview');
 
 const channel = ref<Misskey.entities.Channel | null>(null);
diff --git a/packages/frontend/src/pages/notifications.vue b/packages/frontend/src/pages/notifications.vue
index 5d308e6b29..902e73cd20 100644
--- a/packages/frontend/src/pages/notifications.vue
+++ b/packages/frontend/src/pages/notifications.vue
@@ -20,7 +20,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 </template>
 
 <script lang="ts" setup>
-import { computed, markRaw, ref } from 'vue';
+import { computed, markRaw, provide, ref } from 'vue';
 import { notificationTypes } from 'misskey-js';
 import MkStreamingNotificationsTimeline from '@/components/MkStreamingNotificationsTimeline.vue';
 import MkNotesTimeline from '@/components/MkNotesTimeline.vue';
@@ -33,6 +33,9 @@ const tab = ref('all');
 const includeTypes = ref<string[] | null>(null);
 const excludeTypes = computed(() => includeTypes.value ? notificationTypes.filter(t => !includeTypes.value!.includes(t)) : null);
 
+// 通知では自分がセンシティブタイムラインにした投稿の反応が表示される可能性があるため、折りたたみを無効化する
+provide('collapseSensitiveChannel', false);
+
 const mentionsPaginator = markRaw(new Paginator('notes/mentions', {
 	limit: 10,
 }));
diff --git a/packages/frontend/src/pages/settings/preferences.vue b/packages/frontend/src/pages/settings/preferences.vue
index 972b50f8cd..50fac2a322 100644
--- a/packages/frontend/src/pages/settings/preferences.vue
+++ b/packages/frontend/src/pages/settings/preferences.vue
@@ -236,6 +236,14 @@ SPDX-License-Identifier: AGPL-3.0-only
 										</MkSwitch>
 									</MkPreferenceContainer>
 								</SearchMarker>
+
+								<SearchMarker :keywords="['collapse', 'sensitive', 'channel', 'fold']">
+									<MkPreferenceContainer k="collapseSensitiveChannel">
+										<MkSwitch v-model="collapseSensitiveChannel">
+											<template #label><SearchLabel>{{ i18n.ts.collapseSensitiveChannel }}</SearchLabel></template>
+										</MkSwitch>
+									</MkPreferenceContainer>
+								</SearchMarker>
 							</div>
 
 							<SearchMarker :keywords="['reaction', 'size', 'scale', 'display']">
@@ -871,6 +879,7 @@ const showReactionsCount = prefer.model('showReactionsCount');
 const enableQuickAddMfmFunction = prefer.model('enableQuickAddMfmFunction');
 const forceShowAds = prefer.model('forceShowAds');
 const loadRawImages = prefer.model('loadRawImages');
+const collapseSensitiveChannel = prefer.model('collapseSensitiveChannel');
 const imageNewTab = prefer.model('imageNewTab');
 const showFixedPostForm = prefer.model('showFixedPostForm');
 const showFixedPostFormInChannel = prefer.model('showFixedPostFormInChannel');
diff --git a/packages/frontend/src/pages/timeline.vue b/packages/frontend/src/pages/timeline.vue
index 89d0991bc0..03eab206c7 100644
--- a/packages/frontend/src/pages/timeline.vue
+++ b/packages/frontend/src/pages/timeline.vue
@@ -47,6 +47,9 @@ import { prefer } from '@/preferences.js';
 
 const tlComponent = useTemplateRef('tlComponent');
 
+// ホームタイムラインにはフォロー中のチャンネルしか原則表示されないので、折りたたみを無効化する
+provide('collapseSensitiveChannel', false);
+
 type TimelinePageSrc = BasicTimelineType | `list:${string}`;
 
 const srcWhenNotSignin = ref<'local' | 'global'>(isAvailableBasicTimeline('local') ? 'local' : 'global');
diff --git a/packages/frontend/src/preferences/def.ts b/packages/frontend/src/preferences/def.ts
index 8d1d33977d..b087b8cb9e 100644
--- a/packages/frontend/src/preferences/def.ts
+++ b/packages/frontend/src/preferences/def.ts
@@ -209,6 +209,9 @@ export const PREF_DEF = definePreferences({
 	nsfw: {
 		default: 'respect' as 'respect' | 'force' | 'ignore',
 	},
+	collapseSensitiveChannel: {
+		default: true,
+	},
 	highlightSensitiveMedia: {
 		default: false,
 	},
diff --git a/packages/frontend/src/ui/deck/channel-column.vue b/packages/frontend/src/ui/deck/channel-column.vue
index dd14e7019e..6a87166c4b 100644
--- a/packages/frontend/src/ui/deck/channel-column.vue
+++ b/packages/frontend/src/ui/deck/channel-column.vue
@@ -19,7 +19,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 </template>
 
 <script lang="ts" setup>
-import { onMounted, ref, shallowRef, watch, useTemplateRef } from 'vue';
+import { onMounted, ref, shallowRef, watch, useTemplateRef, provide } from 'vue';
 import * as Misskey from 'misskey-js';
 import XColumn from './column.vue';
 import type { Column } from '@/deck.js';
@@ -39,6 +39,9 @@ const props = defineProps<{
 	isStacked: boolean;
 }>();
 
+// チャンネルタイムラインには目的のチャンネルしか原則表示されないので、折りたたみを無効化する
+provide('collapseSensitiveChannel', false);
+
 const timeline = useTemplateRef('timeline');
 const channel = shallowRef<Misskey.entities.Channel>();
 const soundSetting = ref<SoundStore>(props.column.soundSetting ?? { type: null, volume: 1 });
diff --git a/packages/frontend/src/ui/deck/notifications-column.vue b/packages/frontend/src/ui/deck/notifications-column.vue
index 469e9472ab..b750fd6372 100644
--- a/packages/frontend/src/ui/deck/notifications-column.vue
+++ b/packages/frontend/src/ui/deck/notifications-column.vue
@@ -12,7 +12,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 </template>
 
 <script lang="ts" setup>
-import { defineAsyncComponent, useTemplateRef } from 'vue';
+import { defineAsyncComponent, provide, useTemplateRef } from 'vue';
 import XColumn from './column.vue';
 import type { Column } from '@/deck.js';
 import { updateColumn } from '@/deck.js';
@@ -25,6 +25,9 @@ const props = defineProps<{
 	isStacked: boolean;
 }>();
 
+// 通知では自分がセンシティブタイムラインにした投稿の反応が表示される可能性があるため、折りたたみを無効化する
+provide('collapseSensitiveChannel', false);
+
 const notificationsComponent = useTemplateRef('notificationsComponent');
 
 async function func() {
diff --git a/packages/frontend/src/ui/deck/tl-column.vue b/packages/frontend/src/ui/deck/tl-column.vue
index 0e59913c4c..171f75ebcf 100644
--- a/packages/frontend/src/ui/deck/tl-column.vue
+++ b/packages/frontend/src/ui/deck/tl-column.vue
@@ -33,7 +33,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 </template>
 
 <script lang="ts" setup>
-import { onMounted, watch, ref, useTemplateRef, computed } from 'vue';
+import { onMounted, watch, ref, useTemplateRef, computed, provide } from 'vue';
 import XColumn from './column.vue';
 import type { Column } from '@/deck.js';
 import type { MenuItem } from '@/types/menu.js';
@@ -50,6 +50,9 @@ const props = defineProps<{
 	isStacked: boolean;
 }>();
 
+// ホームタイムラインにはフォロー中のチャンネルしか原則表示されないので、折りたたみを無効化する
+provide('collapseSensitiveChannel', false);
+
 const timeline = useTemplateRef('timeline');
 
 const soundSetting = ref<SoundStore>(props.column.soundSetting ?? { type: null, volume: 1 });
diff --git a/packages/i18n/src/autogen/locale.ts b/packages/i18n/src/autogen/locale.ts
index 8f94aab555..fb5b577083 100644
--- a/packages/i18n/src/autogen/locale.ts
+++ b/packages/i18n/src/autogen/locale.ts
@@ -3368,6 +3368,10 @@ export interface Locale extends ILocale {
      * 右クリックでリアクションピッカーを開く
      */
     "useReactionPickerForContextMenu": string;
+    /**
+     * ほとんどのタイムラインでセンシティブチャンネルの投稿を隠す
+     */
+    "collapseSensitiveChannel": string;
     /**
      * {users}が入力中
      */
@@ -5136,6 +5140,10 @@ export interface Locale extends ILocale {
      * {name}のセンシティブなファイルを含む投稿
      */
     "userSaysSomethingSensitive": ParameterizedString<"name">;
+    /**
+     * {name}のセンシティブチャンネルでの投稿
+     */
+    "userSaysSomethingInSensitiveChannel": ParameterizedString<"name">;
     /**
      * スワイプしてタブを切り替える
      */

From 0a3cee85b4d0d4285ca9c0a884fae04439785ff0 Mon Sep 17 00:00:00 2001
From: anatawa12 <anatawa12@icloud.com>
Date: Wed, 17 Dec 2025 01:19:51 +0900
Subject: [PATCH 2/7] chore: collapse renotes of sensitive channel on basic
 timelines

---
 packages/frontend/src/components/MkNote.vue     | 17 +++++++++++++++--
 packages/frontend/src/di.ts                     |  1 +
 packages/frontend/src/pages/channel.vue         |  3 ++-
 packages/frontend/src/pages/notifications.vue   |  3 ++-
 packages/frontend/src/pages/timeline.vue        |  5 +++--
 .../frontend/src/ui/deck/channel-column.vue     |  3 ++-
 .../src/ui/deck/notifications-column.vue        |  3 ++-
 packages/frontend/src/ui/deck/tl-column.vue     |  5 +++--
 8 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/packages/frontend/src/components/MkNote.vue b/packages/frontend/src/components/MkNote.vue
index a7c28ea4c9..288d8cc92b 100644
--- a/packages/frontend/src/components/MkNote.vue
+++ b/packages/frontend/src/components/MkNote.vue
@@ -270,7 +270,7 @@ const emit = defineEmits<{
 
 // for some timelines, like home timeline which only shows the following channels,
 // we never collapse sensitive channel notes so we allow inject to override the preference
-const collapseSensitiveChannel: boolean = inject<boolean | undefined>('collapseSensitiveChannel', undefined) ?? prefer.s.collapseSensitiveChannel;
+const collapseSensitiveChannelContext = inject(DI.collapseSensitiveChannel, true);
 const inTimeline = inject<boolean>('inTimeline', false);
 const tl_withSensitive = inject<Ref<boolean>>('tl_withSensitive', ref(true));
 const inChannel = inject('inChannel', null);
@@ -362,7 +362,20 @@ function checkMute(noteToCheck: Misskey.entities.Note, mutedWords: Array<string
 
 	if (checkOnly) return false;
 
-	if (collapseSensitiveChannel && noteToCheck.channel?.isSensitive) return 'sensitiveChannel';
+	if (noteToCheck.channel?.isSensitive) {
+		if (prefer.s.collapseSensitiveChannel) {
+			switch (collapseSensitiveChannelContext) {
+				case true: return 'sensitiveChannel';
+				case 'renote-only':
+					if (note.channel?.id !== appearNote.channel?.id) {
+						return 'sensitiveChannel';
+					}
+					break;
+				case false:
+					break;
+			}
+		}
+	}
 	if (inTimeline && tl_withSensitive.value === false && noteToCheck.files?.some((v) => v.isSensitive)) {
 		return 'sensitiveMute';
 	}
diff --git a/packages/frontend/src/di.ts b/packages/frontend/src/di.ts
index f09782ea38..0069713f38 100644
--- a/packages/frontend/src/di.ts
+++ b/packages/frontend/src/di.ts
@@ -18,4 +18,5 @@ export const DI = {
 	mfmEmojiReactCallback: Symbol() as InjectionKey<(emoji: string) => void>,
 	inModal: Symbol() as InjectionKey<boolean>,
 	inAppSearchMarkerId: Symbol() as InjectionKey<Ref<string | null>>,
+	collapseSensitiveChannel: Symbol() as InjectionKey<boolean | 'renote-only'>,
 };
diff --git a/packages/frontend/src/pages/channel.vue b/packages/frontend/src/pages/channel.vue
index 22426e9cc4..614d0c9a4d 100644
--- a/packages/frontend/src/pages/channel.vue
+++ b/packages/frontend/src/pages/channel.vue
@@ -99,6 +99,7 @@ import { notesSearchAvailable } from '@/utility/check-permissions.js';
 import { miLocalStorage } from '@/local-storage.js';
 import { useRouter } from '@/router.js';
 import { Paginator } from '@/utility/paginator.js';
+import { DI } from '@/di';
 
 const router = useRouter();
 
@@ -107,7 +108,7 @@ const props = defineProps<{
 }>();
 
 // チャンネルタイムラインには目的のチャンネルしか原則表示されないので、折りたたみを無効化する
-provide('collapseSensitiveChannel', false);
+provide(DI.collapseSensitiveChannel, false);
 
 const tab = ref('overview');
 
diff --git a/packages/frontend/src/pages/notifications.vue b/packages/frontend/src/pages/notifications.vue
index 902e73cd20..4534869a3e 100644
--- a/packages/frontend/src/pages/notifications.vue
+++ b/packages/frontend/src/pages/notifications.vue
@@ -28,13 +28,14 @@ import * as os from '@/os.js';
 import { i18n } from '@/i18n.js';
 import { definePage } from '@/page.js';
 import { Paginator } from '@/utility/paginator.js';
+import { DI } from '@/di';
 
 const tab = ref('all');
 const includeTypes = ref<string[] | null>(null);
 const excludeTypes = computed(() => includeTypes.value ? notificationTypes.filter(t => !includeTypes.value!.includes(t)) : null);
 
 // 通知では自分がセンシティブタイムラインにした投稿の反応が表示される可能性があるため、折りたたみを無効化する
-provide('collapseSensitiveChannel', false);
+provide(DI.collapseSensitiveChannel, false);
 
 const mentionsPaginator = markRaw(new Paginator('notes/mentions', {
 	limit: 10,
diff --git a/packages/frontend/src/pages/timeline.vue b/packages/frontend/src/pages/timeline.vue
index 03eab206c7..d93f60105a 100644
--- a/packages/frontend/src/pages/timeline.vue
+++ b/packages/frontend/src/pages/timeline.vue
@@ -44,11 +44,12 @@ import { deepMerge } from '@/utility/merge.js';
 import { miLocalStorage } from '@/local-storage.js';
 import { availableBasicTimelines, hasWithReplies, isAvailableBasicTimeline, isBasicTimeline, basicTimelineIconClass } from '@/timelines.js';
 import { prefer } from '@/preferences.js';
+import { DI } from '@/di';
 
 const tlComponent = useTemplateRef('tlComponent');
 
-// ホームタイムラインにはフォロー中のチャンネルしか原則表示されないので、折りたたみを無効化する
-provide('collapseSensitiveChannel', false);
+// ホームタイムラインにはフォロー中のチャンネルし以外の場合に折りたたみを無効化する。
+provide(DI.collapseSensitiveChannel, 'renote-only');
 
 type TimelinePageSrc = BasicTimelineType | `list:${string}`;
 
diff --git a/packages/frontend/src/ui/deck/channel-column.vue b/packages/frontend/src/ui/deck/channel-column.vue
index 6a87166c4b..7c9cba000d 100644
--- a/packages/frontend/src/ui/deck/channel-column.vue
+++ b/packages/frontend/src/ui/deck/channel-column.vue
@@ -33,6 +33,7 @@ import { favoritedChannelsCache } from '@/cache.js';
 import { misskeyApi } from '@/utility/misskey-api.js';
 import { i18n } from '@/i18n.js';
 import { soundSettingsButton } from '@/ui/deck/tl-note-notification.js';
+import { DI } from '@/di';
 
 const props = defineProps<{
 	column: Column;
@@ -40,7 +41,7 @@ const props = defineProps<{
 }>();
 
 // チャンネルタイムラインには目的のチャンネルしか原則表示されないので、折りたたみを無効化する
-provide('collapseSensitiveChannel', false);
+provide(DI.collapseSensitiveChannel, false);
 
 const timeline = useTemplateRef('timeline');
 const channel = shallowRef<Misskey.entities.Channel>();
diff --git a/packages/frontend/src/ui/deck/notifications-column.vue b/packages/frontend/src/ui/deck/notifications-column.vue
index b750fd6372..077368bd4b 100644
--- a/packages/frontend/src/ui/deck/notifications-column.vue
+++ b/packages/frontend/src/ui/deck/notifications-column.vue
@@ -19,6 +19,7 @@ import { updateColumn } from '@/deck.js';
 import MkStreamingNotificationsTimeline from '@/components/MkStreamingNotificationsTimeline.vue';
 import * as os from '@/os.js';
 import { i18n } from '@/i18n.js';
+import { DI } from '@/di';
 
 const props = defineProps<{
 	column: Column;
@@ -26,7 +27,7 @@ const props = defineProps<{
 }>();
 
 // 通知では自分がセンシティブタイムラインにした投稿の反応が表示される可能性があるため、折りたたみを無効化する
-provide('collapseSensitiveChannel', false);
+provide(DI.collapseSensitiveChannel, false);
 
 const notificationsComponent = useTemplateRef('notificationsComponent');
 
diff --git a/packages/frontend/src/ui/deck/tl-column.vue b/packages/frontend/src/ui/deck/tl-column.vue
index 171f75ebcf..e48d3634b9 100644
--- a/packages/frontend/src/ui/deck/tl-column.vue
+++ b/packages/frontend/src/ui/deck/tl-column.vue
@@ -44,14 +44,15 @@ import * as os from '@/os.js';
 import { i18n } from '@/i18n.js';
 import { hasWithReplies, isAvailableBasicTimeline, basicTimelineIconClass } from '@/timelines.js';
 import { soundSettingsButton } from '@/ui/deck/tl-note-notification.js';
+import { DI } from '@/di';
 
 const props = defineProps<{
 	column: Column;
 	isStacked: boolean;
 }>();
 
-// ホームタイムラインにはフォロー中のチャンネルしか原則表示されないので、折りたたみを無効化する
-provide('collapseSensitiveChannel', false);
+// ホームタイムラインにはフォロー中のチャンネルし以外の場合に折りたたみを無効化する。
+provide(DI.collapseSensitiveChannel, 'renote-only');
 
 const timeline = useTemplateRef('timeline');
 

From 28ea454b1fda4385135b3947fa5c87c32ea3869f Mon Sep 17 00:00:00 2001
From: kakkokari-gtyih <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Wed, 17 Dec 2025 01:22:40 +0900
Subject: [PATCH 3/7] =?UTF-8?q?chore:=20=E8=A8=AD=E5=AE=9A=E9=A0=85?=
 =?UTF-8?q?=E7=9B=AE=E3=81=AE=E6=94=B9=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 locales/ja-JP.yml                                    | 3 ++-
 packages/frontend/src/pages/settings/preferences.vue | 1 +
 packages/i18n/src/autogen/locale.ts                  | 6 +++++-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 664bb89178..7ec1a87b1e 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -839,7 +839,8 @@ emailNotification: "メール通知"
 publish: "公開"
 inChannelSearch: "チャンネル内検索"
 useReactionPickerForContextMenu: "右クリックでリアクションピッカーを開く"
-collapseSensitiveChannel: "ほとんどのタイムラインでセンシティブチャンネルの投稿を隠す"
+collapseSensitiveChannel: "センシティブチャンネルの投稿を隠す"
+collapseSensitiveChannelDescription: "そのチャンネル内・通知・ホームタイムラインなど、一部の場所では引き続き表示されます。"
 typingUsers: "{users}が入力中"
 jumpToSpecifiedDate: "特定の日付にジャンプ"
 showingPastTimeline: "過去のタイムラインを表示しています"
diff --git a/packages/frontend/src/pages/settings/preferences.vue b/packages/frontend/src/pages/settings/preferences.vue
index 50fac2a322..595ee01566 100644
--- a/packages/frontend/src/pages/settings/preferences.vue
+++ b/packages/frontend/src/pages/settings/preferences.vue
@@ -241,6 +241,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 									<MkPreferenceContainer k="collapseSensitiveChannel">
 										<MkSwitch v-model="collapseSensitiveChannel">
 											<template #label><SearchLabel>{{ i18n.ts.collapseSensitiveChannel }}</SearchLabel></template>
+											<template #caption>{{ i18n.ts.collapseSensitiveChannelDescription }}</template>
 										</MkSwitch>
 									</MkPreferenceContainer>
 								</SearchMarker>
diff --git a/packages/i18n/src/autogen/locale.ts b/packages/i18n/src/autogen/locale.ts
index fb5b577083..87be397901 100644
--- a/packages/i18n/src/autogen/locale.ts
+++ b/packages/i18n/src/autogen/locale.ts
@@ -3369,9 +3369,13 @@ export interface Locale extends ILocale {
      */
     "useReactionPickerForContextMenu": string;
     /**
-     * ほとんどのタイムラインでセンシティブチャンネルの投稿を隠す
+     * センシティブチャンネルの投稿を隠す
      */
     "collapseSensitiveChannel": string;
+    /**
+     * そのチャンネル内・通知・ホームタイムラインなど、一部の場所では引き続き表示されます。
+     */
+    "collapseSensitiveChannelDescription": string;
     /**
      * {users}が入力中
      */

From 69862e84ba57dc8767acac08915b7385cb25770c Mon Sep 17 00:00:00 2001
From: anatawa12 <anatawa12@icloud.com>
Date: Wed, 17 Dec 2025 01:34:21 +0900
Subject: [PATCH 4/7] Update CHANGELOG.md

Co-authored-by: Sayamame-beans <61457993+Sayamame-beans@users.noreply.github.com>
---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 18f09976fd..0ab5d5773b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,7 +10,7 @@ v2025.12.0で行われた「configの`trustProxy`のデフォルト値を`false`
 
 ### Client
 - Fix: バージョン表記のないPlayが正しく動作しない問題を修正
-- Enhance: センシティブチャンネルの投稿が多くの場所で畳まれるようにになりました
+- Enhance: センシティブチャンネルの投稿が多くの場所で畳まれるようになりました
 
 ## 2025.12.1
 

From af75023376d7d5138c1a11f46afc69ec8f1f85fb Mon Sep 17 00:00:00 2001
From: anatawa12 <anatawa12@icloud.com>
Date: Wed, 17 Dec 2025 10:37:19 +0900
Subject: [PATCH 5/7] Update packages/frontend/src/pages/timeline.vue

Co-authored-by: Sayamame-beans <61457993+Sayamame-beans@users.noreply.github.com>
---
 packages/frontend/src/pages/timeline.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/frontend/src/pages/timeline.vue b/packages/frontend/src/pages/timeline.vue
index d93f60105a..3dc2c7d337 100644
--- a/packages/frontend/src/pages/timeline.vue
+++ b/packages/frontend/src/pages/timeline.vue
@@ -48,7 +48,7 @@ import { DI } from '@/di';
 
 const tlComponent = useTemplateRef('tlComponent');
 
-// ホームタイムラインにはフォロー中のチャンネルし以外の場合に折りたたみを無効化する。
+// ホームタイムラインにはフォロー中のチャンネル以外の場合に折りたたみを無効化する。
 provide(DI.collapseSensitiveChannel, 'renote-only');
 
 type TimelinePageSrc = BasicTimelineType | `list:${string}`;

From efeb8ef0d1900175c265974240699b514562e903 Mon Sep 17 00:00:00 2001
From: anatawa12 <anatawa12@icloud.com>
Date: Wed, 17 Dec 2025 10:38:14 +0900
Subject: [PATCH 6/7] Update CHANGELOG.md

---
 CHANGELOG.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 49d014d1bb..62a2210279 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,7 +9,6 @@ v2025.12.0で行われた「configの`trustProxy`のデフォルト値を`false`
 - 依存関係の更新
 
 ### Client
-- Fix: バージョン表記のないPlayが正しく動作しない問題を修正
 - Fix: バージョン表記のないPlayが正しく動作しない問題を修正  
   バージョン表記のないものは v0.x 系として実行されます。v1.x 系で動作させたい場合は必ずバージョン表記を含めてください。
 - Enhance: センシティブチャンネルの投稿が多くの場所で畳まれるようになりました

From 57e3fbaffb3d8977ca050ebde3ed08ff4fe38e64 Mon Sep 17 00:00:00 2001
From: anatawa12 <anatawa12@icloud.com>
Date: Wed, 17 Dec 2025 11:28:12 +0900
Subject: [PATCH 7/7] Apply suggestions from code review
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com>
---
 packages/frontend/src/pages/channel.vue                | 2 +-
 packages/frontend/src/pages/timeline.vue               | 2 +-
 packages/frontend/src/ui/deck/channel-column.vue       | 2 +-
 packages/frontend/src/ui/deck/notifications-column.vue | 2 +-
 packages/frontend/src/ui/deck/tl-column.vue            | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/frontend/src/pages/channel.vue b/packages/frontend/src/pages/channel.vue
index 614d0c9a4d..1874c1b5b1 100644
--- a/packages/frontend/src/pages/channel.vue
+++ b/packages/frontend/src/pages/channel.vue
@@ -99,7 +99,7 @@ import { notesSearchAvailable } from '@/utility/check-permissions.js';
 import { miLocalStorage } from '@/local-storage.js';
 import { useRouter } from '@/router.js';
 import { Paginator } from '@/utility/paginator.js';
-import { DI } from '@/di';
+import { DI } from '@/di.js';
 
 const router = useRouter();
 
diff --git a/packages/frontend/src/pages/timeline.vue b/packages/frontend/src/pages/timeline.vue
index 3dc2c7d337..71f05a3d78 100644
--- a/packages/frontend/src/pages/timeline.vue
+++ b/packages/frontend/src/pages/timeline.vue
@@ -44,7 +44,7 @@ import { deepMerge } from '@/utility/merge.js';
 import { miLocalStorage } from '@/local-storage.js';
 import { availableBasicTimelines, hasWithReplies, isAvailableBasicTimeline, isBasicTimeline, basicTimelineIconClass } from '@/timelines.js';
 import { prefer } from '@/preferences.js';
-import { DI } from '@/di';
+import { DI } from '@/di.js';
 
 const tlComponent = useTemplateRef('tlComponent');
 
diff --git a/packages/frontend/src/ui/deck/channel-column.vue b/packages/frontend/src/ui/deck/channel-column.vue
index 7c9cba000d..3664c44809 100644
--- a/packages/frontend/src/ui/deck/channel-column.vue
+++ b/packages/frontend/src/ui/deck/channel-column.vue
@@ -33,7 +33,7 @@ import { favoritedChannelsCache } from '@/cache.js';
 import { misskeyApi } from '@/utility/misskey-api.js';
 import { i18n } from '@/i18n.js';
 import { soundSettingsButton } from '@/ui/deck/tl-note-notification.js';
-import { DI } from '@/di';
+import { DI } from '@/di.js';
 
 const props = defineProps<{
 	column: Column;
diff --git a/packages/frontend/src/ui/deck/notifications-column.vue b/packages/frontend/src/ui/deck/notifications-column.vue
index 077368bd4b..aefe29c1d0 100644
--- a/packages/frontend/src/ui/deck/notifications-column.vue
+++ b/packages/frontend/src/ui/deck/notifications-column.vue
@@ -19,7 +19,7 @@ import { updateColumn } from '@/deck.js';
 import MkStreamingNotificationsTimeline from '@/components/MkStreamingNotificationsTimeline.vue';
 import * as os from '@/os.js';
 import { i18n } from '@/i18n.js';
-import { DI } from '@/di';
+import { DI } from '@/di.js';
 
 const props = defineProps<{
 	column: Column;
diff --git a/packages/frontend/src/ui/deck/tl-column.vue b/packages/frontend/src/ui/deck/tl-column.vue
index e48d3634b9..20cba02d96 100644
--- a/packages/frontend/src/ui/deck/tl-column.vue
+++ b/packages/frontend/src/ui/deck/tl-column.vue
@@ -44,7 +44,7 @@ import * as os from '@/os.js';
 import { i18n } from '@/i18n.js';
 import { hasWithReplies, isAvailableBasicTimeline, basicTimelineIconClass } from '@/timelines.js';
 import { soundSettingsButton } from '@/ui/deck/tl-note-notification.js';
-import { DI } from '@/di';
+import { DI } from '@/di.js';
 
 const props = defineProps<{
 	column: Column;