From 8348a36f24fcc9b01584a8fb2d895db95de82283 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Tue, 13 May 2025 22:58:24 -0400
Subject: [PATCH] cleanup, simplify, and merge duplicate word mute
 implementations

---
 .../src/components/SkFollowingFeedEntry.vue   | 23 +++++----
 .../src/components/SkFollowingRecentNotes.vue |  3 +-
 .../frontend/src/components/SkMutedNote.vue   |  5 +-
 .../frontend/src/components/SkPatternTest.vue |  4 +-
 .../frontend/src/utility/check-word-mute.ts   | 47 ++++++++++---------
 .../src/utility/following-feed-utils.ts       | 34 --------------
 6 files changed, 44 insertions(+), 72 deletions(-)

diff --git a/packages/frontend/src/components/SkFollowingFeedEntry.vue b/packages/frontend/src/components/SkFollowingFeedEntry.vue
index 80d15225f4..b71777e032 100644
--- a/packages/frontend/src/components/SkFollowingFeedEntry.vue
+++ b/packages/frontend/src/components/SkFollowingFeedEntry.vue
@@ -4,7 +4,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 -->
 
 <template>
-<div :class="$style.root" @click="$emit('select', note.user)">
+<div v-if="!hardMuted" :class="$style.root" @click="$emit('select', note.user)">
 	<div :class="$style.avatar">
 		<MkAvatar :class="$style.icon" :user="note.user" indictor/>
 	</div>
@@ -18,36 +18,39 @@ SPDX-License-Identifier: AGPL-3.0-only
 			</MkA>
 		</header>
 		<div>
-			<div v-if="mutedWords" :class="[$style.text, $style.muted]">
-				<template v-if="prefer.s.showSoftWordMutedWord">{{ i18n.tsx.userSaysSomethingAbout({ name: i18n.ts.user, word: mutedWords}) }}</template>
-				<template v-else>{{ i18n.ts.postFiltered }}</template>
+			<div v-if="muted" :class="[$style.text, $style.muted]">
+				<SkMutedNote :muted="muted" :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"/>
 		</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>
 </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 { i18n } from '@/i18n.js';
-import { getSoftMutedWords } from '@/utility/following-feed-utils';
-import { prefer } from '@/preferences';
+import { checkMutes } from '@/utility/check-word-mute';
+import SkMutedNote from '@/components/SkMutedNote.vue';
 
 const props = defineProps<{
 	note: Misskey.entities.Note,
 }>();
 
-const mutedWords = computed(() => getSoftMutedWords(props.note));
-
 defineEmits<{
 	(event: 'select', user: Misskey.entities.UserLite): void
 }>();
 
+// eslint-disable-next-line vue/no-setup-props-reactivity-loss
+const { muted, hardMuted } = checkMutes(props.note);
 </script>
 
 <style lang="scss" module>
diff --git a/packages/frontend/src/components/SkFollowingRecentNotes.vue b/packages/frontend/src/components/SkFollowingRecentNotes.vue
index b8a7b2213f..3eb2ac8572 100644
--- a/packages/frontend/src/components/SkFollowingRecentNotes.vue
+++ b/packages/frontend/src/components/SkFollowingRecentNotes.vue
@@ -15,7 +15,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 
 		<template #default="{ items: notes }">
 			<MkDateSeparatedList v-slot="{ item: note }" :items="notes" :class="$style.panel" :noGap="true">
-				<SkFollowingFeedEntry v-if="!getHardMutedWords(note)" :note="note" :class="props.selectedUserId == note.userId && $style.selected" @select="u => selectUser(u.id)"/>
+				<SkFollowingFeedEntry :note="note" :class="props.selectedUserId == note.userId && $style.selected" @select="u => selectUser(u.id)"/>
 			</MkDateSeparatedList>
 		</template>
 	</MkPagination>
@@ -26,7 +26,6 @@ SPDX-License-Identifier: AGPL-3.0-only
 import { computed, shallowRef } from 'vue';
 import type { Paging } from '@/components/MkPagination.vue';
 import type { FollowingFeedTab } from '@/types/following-feed.js';
-import { getHardMutedWords } from '@/utility/following-feed-utils.js';
 import { infoImageUrl } from '@/instance.js';
 import { i18n } from '@/i18n.js';
 import MkDateSeparatedList from '@/components/MkDateSeparatedList.vue';
diff --git a/packages/frontend/src/components/SkMutedNote.vue b/packages/frontend/src/components/SkMutedNote.vue
index 4336a3abdc..3c072fab3f 100644
--- a/packages/frontend/src/components/SkMutedNote.vue
+++ b/packages/frontend/src/components/SkMutedNote.vue
@@ -31,13 +31,12 @@ import { i18n } from '@/i18n.js';
 import { prefer } from '@/preferences.js';
 
 const props = defineProps<{
-	muted: false | 'sensitiveMute' | (string | string[])[];
+	muted: false | 'sensitiveMute' | string[];
 	note: Misskey.entities.Note;
-
 }>();
 
 const mutedWords = computed(() => Array.isArray(props.muted)
-	? props.muted.map(words => Array.isArray(words) ? words.join() : words).join(' ')
+	? props.muted.join(', ')
 	: props.muted);
 </script>
 
diff --git a/packages/frontend/src/components/SkPatternTest.vue b/packages/frontend/src/components/SkPatternTest.vue
index 2ed2b3fdc3..fe82c1df2f 100644
--- a/packages/frontend/src/components/SkPatternTest.vue
+++ b/packages/frontend/src/components/SkPatternTest.vue
@@ -12,7 +12,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 			<template #caption>{{ i18n.ts.wordMuteTestDescription }}</template>
 		</MkTextarea>
 		<div><MkButton :disabled="!testWords" @click="testWordMutes">{{ i18n.ts.wordMuteTestTest }}</MkButton></div>
-		<div v-if="testMatches == null">{{ i18n.ts.wordMuteTestNoResults}}</div>
+		<div v-if="testMatches == null">{{ i18n.ts.wordMuteTestNoResults }}</div>
 		<div v-else-if="testMatches === ''">{{ i18n.ts.wordMuteTestNoMatch }}</div>
 		<div v-else>{{ i18n.tsx.wordMuteTestMatch({ words: testMatches }) }}</div>
 	</div>
@@ -44,7 +44,7 @@ function testWordMutes() {
 	try {
 		const mutes = parseMutes(props.mutedWords);
 		const matches = checkWordMute(testWords.value, null, mutes);
-		testMatches.value = matches ? matches.flat(2).join(', ') : '';
+		testMatches.value = matches ? 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 dc36ea1906..03fe95ae3a 100644
--- a/packages/frontend/src/utility/check-word-mute.ts
+++ b/packages/frontend/src/utility/check-word-mute.ts
@@ -13,34 +13,39 @@ export function checkMutes(noteToCheck: Misskey.entities.Note, withHardMute = fa
 	return { muted, hardMuted };
 }
 
-/* Overload FunctionにLintが対応していないのでコメントアウト
-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';
-*/
-export function checkMute(noteToCheck: Misskey.entities.Note, mutedWords: Array<string | string[]> | undefined | null, checkOnly = false): Array<string | string[]> | false | 'sensitiveMute' {
-	if (mutedWords != null) {
-		const result = checkWordMute(noteToCheck, $i, mutedWords);
-		if (Array.isArray(result)) return result;
+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);
 
-		const replyResult = noteToCheck.reply && checkWordMute(noteToCheck.reply, $i, mutedWords);
-		if (Array.isArray(replyResult)) return replyResult;
-
-		const renoteResult = noteToCheck.renote && checkWordMute(noteToCheck.renote, $i, mutedWords);
-		if (Array.isArray(renoteResult)) return renoteResult;
+		// Only continue to sensitiveMute if we don't match any *actual* mutes
+		if (result) {
+			return result;
+		}
 	}
 
-	if (checkOnly) return false;
-
-	const inTimeline = inject<boolean>('inTimeline', false);
-	const tl_withSensitive = inject<Ref<boolean> | null>('tl_withSensitive', null);
-	if (inTimeline && tl_withSensitive?.value === false && noteToCheck.files?.some((v) => v.isSensitive)) {
-		return 'sensitiveMute';
+	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';
+		}
 	}
 
 	return false;
 }
 
-export function checkWordMute(note: string | Misskey.entities.Note, me: Misskey.entities.UserLite | null | undefined, mutedWords: Array<string | string[]>): Array<string | string[]> | false {
+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;
+
 	// 自分自身
 	if (me && typeof(note) === 'object' && (note.userId === me.id)) return false;
 
@@ -79,7 +84,7 @@ export function checkWordMute(note: string | Misskey.entities.Note, me: Misskey.
 		}, new Set<string>());
 
 		// Nested arrays are intentional, otherwise the note components will join with space (" ") and it's confusing.
-		if (matched.size > 0) return [[Array.from(matched).join(', ')]];
+		if (matched.size > 0) return Array.from(matched);
 	}
 
 	return false;
diff --git a/packages/frontend/src/utility/following-feed-utils.ts b/packages/frontend/src/utility/following-feed-utils.ts
index 4573f3dd7a..99335f89bd 100644
--- a/packages/frontend/src/utility/following-feed-utils.ts
+++ b/packages/frontend/src/utility/following-feed-utils.ts
@@ -4,7 +4,6 @@
  */
 
 import { computed } from 'vue';
-import * as Misskey from 'misskey-js';
 import type { Ref, WritableComputedRef } from 'vue';
 import type { PageHeaderItem } from '@/types/page-header.js';
 import type { MenuItem } from '@/types/menu.js';
@@ -14,8 +13,6 @@ import { i18n } from '@/i18n.js';
 import { popupMenu } from '@/os.js';
 import { prefer } from '@/preferences.js';
 import { followingTab, followersTab, mutualsTab, defaultFollowingFeedState } from '@/types/following-feed.js';
-import { $i } from '@/i';
-import { checkWordMute } from '@/utility/check-word-mute';
 
 export function followingTabName(tab: FollowingFeedTab): string;
 export function followingTabName(tab: FollowingFeedTab | null | undefined): null;
@@ -153,34 +150,3 @@ function createDefaultStorage(): Ref<StorageInterface> {
 	}));
 }
 
-export function getSoftMutedWords(note: Misskey.entities.Note): string | null {
-	return getMutedWords(note, $i?.mutedWords);
-}
-
-export function getHardMutedWords(note: Misskey.entities.Note): string | null {
-	return getMutedWords(note, $i?.hardMutedWords);
-}
-
-// Match the typing used by Misskey
-type Mutes = (string | string[])[] | null | undefined;
-
-// Adapted from MkNote.ts
-function getMutedWords(note: Misskey.entities.Note, mutes: Mutes): string | null {
-	return checkMute(note, mutes)
-		?? checkMute(note.reply, mutes)
-		?? checkMute(note.renote, mutes);
-}
-
-// Adapted from check-word-mute.ts
-function checkMute(note: Misskey.entities.Note | undefined | null, mutes: Mutes): string | null {
-	if (!note) {
-		return null;
-	}
-
-	if (!mutes || mutes.length < 1) {
-		return null;
-	}
-
-	const mutedWords = checkWordMute(note, $i, mutes);
-	return mutedWords ? mutedWords.flat(2).join(', ') : null;
-}