From 1858d5691886a4de8725d98389470ee5e40b3ec4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=93=E3=81=8B=E3=82=8A?=
 <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Sun, 5 Jul 2026 13:07:17 +0900
Subject: [PATCH] =?UTF-8?q?fix(frontend):=20=E3=83=AF=E3=83=BC=E3=83=89?=
 =?UTF-8?q?=E3=83=9F=E3=83=A5=E3=83=BC=E3=83=88=E3=81=AE=E5=88=A4=E5=AE=9A?=
 =?UTF-8?q?=E3=81=8C=E8=AA=A4=E3=81=A3=E3=81=A6=E3=81=84=E3=82=8B=E5=95=8F?=
 =?UTF-8?q?=E9=A1=8C=E3=82=92=E4=BF=AE=E6=AD=A3=20(#17668)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/frontend/src/components/MkNote.vue   |  6 +-
 packages/frontend/src/composables/use-note.ts | 58 ++++++++-----------
 2 files changed, 24 insertions(+), 40 deletions(-)

diff --git a/packages/frontend/src/components/MkNote.vue b/packages/frontend/src/components/MkNote.vue
index e55a496bfe..4017924fa4 100644
--- a/packages/frontend/src/components/MkNote.vue
+++ b/packages/frontend/src/components/MkNote.vue
@@ -192,25 +192,21 @@ SPDX-License-Identifier: AGPL-3.0-only
 		MkDateSeparatedList uses TransitionGroup which requires single element in the child elements
 		so MkNote create empty div instead of no elements
 	-->
-	</div>
+</div>
 </template>
 
 <script lang="ts" setup>
 import { inject, ref, useTemplateRef, provide, computed } from 'vue';
 import type { Ref } from 'vue';
 import * as Misskey from 'misskey-js';
-import { $i } from '@/i.js';
 import { useNote } from '@/composables/use-note.js';
 import { prefer } from '@/preferences.js';
 import { i18n } from '@/i18n.js';
 import { userPage } from '@/filters/user.js';
-import { noteEvents } from '@/composables/use-note-capture.js';
 import { getNoteSummary } from '@/utility/get-note-summary.js';
 import { isEnabledUrlPreview } from '@/utility/url-preview.js';
 import { focusPrev, focusNext } from '@/utility/focus.js';
-import { misskeyApi } from '@/utility/misskey-api.js';
 import number from '@/filters/number.js';
-import * as sound from '@/utility/sound.js';
 import { DI } from '@/di.js';
 import type { Keymap } from '@/utility/hotkey.js';
 
diff --git a/packages/frontend/src/composables/use-note.ts b/packages/frontend/src/composables/use-note.ts
index 0d526bbe55..fc02de5927 100644
--- a/packages/frontend/src/composables/use-note.ts
+++ b/packages/frontend/src/composables/use-note.ts
@@ -62,49 +62,37 @@ export interface UseNoteOptions {
 	currentAntenna?: Ref<Misskey.entities.Antenna | null> | null;
 }
 
-/* eslint-disable no-redeclare */
-export function calculateMuteStatus(
+export function calculateMuteStatus<
+	CheckOnly extends boolean,
+	CheckForSensitiveMedia extends boolean,
+	ReturnTypeA = CheckOnly extends true ? boolean : Array<string | string[]> | false | 'sensitiveMute',
+	ReturnTypeB = CheckForSensitiveMedia extends true ? ReturnTypeA : Exclude<ReturnTypeA, 'sensitiveMute'>,
+>(
 	noteToCheck: Misskey.entities.Note,
 	user: typeof $i,
-	inTimeline: boolean,
-	tl_withSensitive: boolean,
-	checkOnly: true,
-): boolean;
-export function calculateMuteStatus(
-	noteToCheck: Misskey.entities.Note,
-	user: typeof $i,
-	inTimeline: boolean,
-	tl_withSensitive: boolean,
-	checkOnly?: false,
-): Array<string | string[]> | false | 'sensitiveMute';
+	mutedWords: Array<string | string[]> | null,
+	checkForSensitiveMedia: CheckForSensitiveMedia,
+	checkOnly: CheckOnly = false as CheckOnly,
+): ReturnTypeB {
+	if (mutedWords != null) {
+		const result = checkWordMute(noteToCheck, user, mutedWords);
+		if (Array.isArray(result)) return checkOnly ? (result.length > 0) as ReturnTypeB : result as ReturnTypeB;
 
-export function calculateMuteStatus(
-	noteToCheck: Misskey.entities.Note,
-	user: typeof $i,
-	inTimeline: boolean,
-	tl_withSensitive: boolean,
-	checkOnly = false
-): Array<string | string[]> | boolean | 'sensitiveMute' {
-	if (user?.mutedWords != null) {
-		const result = checkWordMute(noteToCheck, user, user.mutedWords);
-		if (Array.isArray(result)) return checkOnly ? (result.length > 0) : result;
+		const replyResult = noteToCheck.reply && checkWordMute(noteToCheck.reply, user, mutedWords);
+		if (Array.isArray(replyResult)) return checkOnly ? (replyResult.length > 0) as ReturnTypeB : replyResult as ReturnTypeB;
 
-		const replyResult = noteToCheck.reply && checkWordMute(noteToCheck.reply, user, user.mutedWords);
-		if (Array.isArray(replyResult)) return checkOnly ? (replyResult.length > 0) : replyResult;
-
-		const renoteResult = noteToCheck.renote && checkWordMute(noteToCheck.renote, user, user.mutedWords);
-		if (Array.isArray(renoteResult)) return checkOnly ? (renoteResult.length > 0) : renoteResult;
+		const renoteResult = noteToCheck.renote && checkWordMute(noteToCheck.renote, user, mutedWords);
+		if (Array.isArray(renoteResult)) return checkOnly ? (renoteResult.length > 0) as ReturnTypeB : renoteResult as ReturnTypeB;
 	}
 
-	if (checkOnly) return false;
+	if (checkOnly) return false as ReturnTypeB;
 
-	if (inTimeline && tl_withSensitive === false && noteToCheck.files?.some((v) => v.isSensitive)) {
-		return 'sensitiveMute';
+	if (checkForSensitiveMedia && noteToCheck.files?.some((v) => v.isSensitive)) {
+		return 'sensitiveMute' as ReturnTypeB;
 	}
 
-	return false;
+	return false as ReturnTypeB;
 }
-/* eslint-enable no-redeclare */
 
 /** MkNote, MkNoteDetailedの共通ロジック */
 export function useNote(
@@ -157,8 +145,8 @@ export function useNote(
 	const translation = ref<Misskey.entities.NotesTranslateResponse | null>(null);
 
 	// ミュート判定
-	const muted = ref($i ? (options.inTimeline ? calculateMuteStatus(appearNote, $i, inTimeline, tl_withSensitive.value) : checkWordMute(appearNote, $i, $i.mutedWords)) : false);
-	const hardMuted = ref(props.withHardMute && $i && calculateMuteStatus(appearNote, $i, inTimeline, tl_withSensitive.value, true));
+	const muted = ref($i ? calculateMuteStatus(appearNote, $i, $i.mutedWords, inTimeline && !tl_withSensitive.value) : false);
+	const hardMuted = ref(props.withHardMute && $i ? calculateMuteStatus(appearNote, $i, $i.hardMutedWords, inTimeline && !tl_withSensitive.value, true) : false);
 
 	// 計算プロパティ (Computed)
 	const isMyRenote = computed(() => $i && ($i.id === rawNote.userId));