From 1a3c6f25a296f3d25b8ba8e5688bf23f26515108 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Mon, 12 May 2025 13:39:12 -0400
Subject: [PATCH] simplify access to showSoftWordMutedWord

---
 packages/frontend/src/components/MkNote.vue         | 3 +--
 packages/frontend/src/components/MkNoteDetailed.vue | 3 +--
 packages/frontend/src/components/MkNoteSub.vue      | 3 +--
 packages/frontend/src/components/SkNote.vue         | 3 +--
 packages/frontend/src/components/SkNoteDetailed.vue | 3 +--
 packages/frontend/src/components/SkNoteSub.vue      | 3 +--
 6 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/packages/frontend/src/components/MkNote.vue b/packages/frontend/src/components/MkNote.vue
index 679e7b7914..4ceefe300b 100644
--- a/packages/frontend/src/components/MkNote.vue
+++ b/packages/frontend/src/components/MkNote.vue
@@ -176,7 +176,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 			<MkUserName :user="appearNote.user"/>
 		</template>
 	</I18n>
-	<I18n v-else-if="showSoftWordMutedWord !== true" :src="i18n.ts.userSaysSomething" tag="small">
+	<I18n v-else-if="prefer.s.showSoftWordMutedWord" :src="i18n.ts.userSaysSomething" tag="small">
 		<template #name>
 			<MkUserName :user="appearNote.user"/>
 		</template>
@@ -329,7 +329,6 @@ const isDeleted = ref(false);
 const renoted = ref(false);
 const muted = ref(checkMute(appearNote.value, $i?.mutedWords));
 const hardMuted = ref(props.withHardMute && checkMute(appearNote.value, $i?.hardMutedWords, true));
-const showSoftWordMutedWord = computed(() => prefer.s.showSoftWordMutedWord);
 const translation = ref<Misskey.entities.NotesTranslateResponse | null>(null);
 const translating = ref(false);
 const showTicker = (prefer.s.instanceTicker === 'always') || (prefer.s.instanceTicker === 'remote' && appearNote.value.user.instance);
diff --git a/packages/frontend/src/components/MkNoteDetailed.vue b/packages/frontend/src/components/MkNoteDetailed.vue
index f702c7c422..0b3e5966dc 100644
--- a/packages/frontend/src/components/MkNoteDetailed.vue
+++ b/packages/frontend/src/components/MkNoteDetailed.vue
@@ -235,7 +235,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 			<MkUserName :user="appearNote.user"/>
 		</template>
 	</I18n>
-	<I18n v-else-if="showSoftWordMutedWord !== true" :src="i18n.ts.userSaysSomething" tag="small">
+	<I18n v-else-if="prefer.s.showSoftWordMutedWord" :src="i18n.ts.userSaysSomething" tag="small">
 		<template #name>
 			<MkA v-user-preview="appearNote.userId" :to="userPage(appearNote.user)">
 				<MkUserName :user="appearNote.user"/>
@@ -378,7 +378,6 @@ const renoteTooltip = computeRenoteTooltip(renoted);
 const inTimeline = inject<boolean>('inTimeline', false);
 const tl_withSensitive = inject<Ref<boolean>>('tl_withSensitive', ref(true));
 const muted = ref(checkMute(appearNote.value, $i?.mutedWords));
-const showSoftWordMutedWord = computed(() => prefer.s.showSoftWordMutedWord);
 
 /* Overload FunctionにLintが対応していないのでコメントアウト
 function checkMute(noteToCheck: Misskey.entities.Note, mutedWords: Array<string | string[]> | undefined | null, checkOnly: true): boolean;
diff --git a/packages/frontend/src/components/MkNoteSub.vue b/packages/frontend/src/components/MkNoteSub.vue
index c017efa3f3..b975de85e1 100644
--- a/packages/frontend/src/components/MkNoteSub.vue
+++ b/packages/frontend/src/components/MkNoteSub.vue
@@ -78,7 +78,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 			<MkUserName :user="appearNote.user"/>
 		</template>
 	</I18n>
-	<I18n v-else-if="showSoftWordMutedWord !== true" :src="i18n.ts.userSaysSomething" tag="small">
+	<I18n v-else-if="prefer.s.showSoftWordMutedWord" :src="i18n.ts.userSaysSomething" tag="small">
 		<template #name>
 			<MkUserName :user="appearNote.user"/>
 		</template>
@@ -186,7 +186,6 @@ async function removeReply(id: Misskey.entities.Note['id']) {
 const inTimeline = inject<boolean>('inTimeline', false);
 const tl_withSensitive = inject<Ref<boolean>>('tl_withSensitive', ref(true));
 const muted = ref(checkMute(appearNote.value, $i?.mutedWords));
-const showSoftWordMutedWord = computed(() => prefer.s.showSoftWordMutedWord);
 
 /* Overload FunctionにLintが対応していないのでコメントアウト
 function checkMute(noteToCheck: Misskey.entities.Note, mutedWords: Array<string | string[]> | undefined | null, checkOnly: true): boolean;
diff --git a/packages/frontend/src/components/SkNote.vue b/packages/frontend/src/components/SkNote.vue
index 8c89cdd5a3..878c81384c 100644
--- a/packages/frontend/src/components/SkNote.vue
+++ b/packages/frontend/src/components/SkNote.vue
@@ -177,7 +177,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 			<MkUserName :user="appearNote.user"/>
 		</template>
 	</I18n>
-	<I18n v-else-if="showSoftWordMutedWord !== true" :src="i18n.ts.userSaysSomething" tag="small">
+	<I18n v-else-if="prefer.s.showSoftWordMutedWord" :src="i18n.ts.userSaysSomething" tag="small">
 		<template #name>
 			<MkUserName :user="appearNote.user"/>
 		</template>
@@ -329,7 +329,6 @@ const isDeleted = ref(false);
 const renoted = ref(false);
 const muted = ref(checkMute(appearNote.value, $i?.mutedWords));
 const hardMuted = ref(props.withHardMute && checkMute(appearNote.value, $i?.hardMutedWords, true));
-const showSoftWordMutedWord = computed(() => prefer.s.showSoftWordMutedWord);
 const translation = ref<Misskey.entities.NotesTranslateResponse | null>(null);
 const translating = ref(false);
 const showTicker = (prefer.s.instanceTicker === 'always') || (prefer.s.instanceTicker === 'remote' && appearNote.value.user.instance);
diff --git a/packages/frontend/src/components/SkNoteDetailed.vue b/packages/frontend/src/components/SkNoteDetailed.vue
index 71670c8f51..29886244ce 100644
--- a/packages/frontend/src/components/SkNoteDetailed.vue
+++ b/packages/frontend/src/components/SkNoteDetailed.vue
@@ -240,7 +240,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 			<MkUserName :user="appearNote.user"/>
 		</template>
 	</I18n>
-	<I18n v-else-if="showSoftWordMutedWord !== true" :src="i18n.ts.userSaysSomething" tag="small">
+	<I18n v-else-if="prefer.s.showSoftWordMutedWord" :src="i18n.ts.userSaysSomething" tag="small">
 		<template #name>
 			<MkA v-user-preview="appearNote.userId" :to="userPage(appearNote.user)">
 				<MkUserName :user="appearNote.user"/>
@@ -384,7 +384,6 @@ const renoteTooltip = computeRenoteTooltip(renoted);
 const inTimeline = inject<boolean>('inTimeline', false);
 const tl_withSensitive = inject<Ref<boolean>>('tl_withSensitive', ref(true));
 const muted = ref(checkMute(appearNote.value, $i?.mutedWords));
-const showSoftWordMutedWord = computed(() => prefer.s.showSoftWordMutedWord);
 
 /* Overload FunctionにLintが対応していないのでコメントアウト
 function checkMute(noteToCheck: Misskey.entities.Note, mutedWords: Array<string | string[]> | undefined | null, checkOnly: true): boolean;
diff --git a/packages/frontend/src/components/SkNoteSub.vue b/packages/frontend/src/components/SkNoteSub.vue
index 143642f64f..36bbf9b826 100644
--- a/packages/frontend/src/components/SkNoteSub.vue
+++ b/packages/frontend/src/components/SkNoteSub.vue
@@ -86,7 +86,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 			<MkUserName :user="appearNote.user"/>
 		</template>
 	</I18n>
-	<I18n v-else-if="showSoftWordMutedWord !== true" :src="i18n.ts.userSaysSomething" tag="small">
+	<I18n v-else-if="prefer.s.showSoftWordMutedWord" :src="i18n.ts.userSaysSomething" tag="small">
 		<template #name>
 			<MkUserName :user="appearNote.user"/>
 		</template>
@@ -200,7 +200,6 @@ async function removeReply(id: Misskey.entities.Note['id']) {
 const inTimeline = inject<boolean>('inTimeline', false);
 const tl_withSensitive = inject<Ref<boolean>>('tl_withSensitive', ref(true));
 const muted = ref(checkMute(appearNote.value, $i?.mutedWords));
-const showSoftWordMutedWord = computed(() => prefer.s.showSoftWordMutedWord);
 
 /* Overload FunctionにLintが対応していないのでコメントアウト
 function checkMute(noteToCheck: Misskey.entities.Note, mutedWords: Array<string | string[]> | undefined | null, checkOnly: true): boolean;