From 075e5a1c7ae2a78033187c7a9601852f4be14637 Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Thu, 4 May 2023 13:17:37 +0900
Subject: [PATCH 01/20] Refactor hard word mutes

---
 packages/backend/src/misc/check-word-mute.ts  | 94 +++++++++----------
 .../src/server/api/stream/channels/antenna.ts |  7 ++
 .../src/server/api/stream/channels/channel.ts |  7 ++
 .../api/stream/channels/global-timeline.ts    |  2 +-
 .../api/stream/channels/home-timeline.ts      |  2 +-
 .../api/stream/channels/hybrid-timeline.ts    |  2 +-
 .../api/stream/channels/local-timeline.ts     |  2 +-
 .../stream/channels/recommended-timeline.ts   |  2 +-
 .../server/api/stream/channels/user-list.ts   |  7 ++
 packages/backend/src/services/note/create.ts  |  2 +-
 10 files changed, 72 insertions(+), 55 deletions(-)

diff --git a/packages/backend/src/misc/check-word-mute.ts b/packages/backend/src/misc/check-word-mute.ts
index 53193d851a..a411e46cc8 100644
--- a/packages/backend/src/misc/check-word-mute.ts
+++ b/packages/backend/src/misc/check-word-mute.ts
@@ -12,67 +12,63 @@ type UserLike = {
 	id: User["id"];
 };
 
-export type Muted = {
-	muted: boolean;
-	matched: string[];
-};
-
-const NotMuted = { muted: false, matched: [] };
-
-function escapeRegExp(x: string) {
+function escapeRegExp(x: string): string {
 	return x.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"); // $& means the whole matched string
 }
 
+function checkWordMute(note: NoteLike): boolean {
+	if (note == null) return false;
+
+	const text = ((note.cw ?? "") + " " + (note.text ?? "")).trim();
+	if (text === "") return false;
+
+	for (const mutePattern of mutedWords) {
+		let mute: RE2;
+		let matched: string[];
+		if (Array.isArray(mutePattern)) {
+			matched = mutePattern.filter((keyword) => keyword !== "");
+
+			if (matched.length === 0) {
+				continue;
+			}
+			mute = new RE2(
+				`\\b${matched.map(escapeRegExp).join("\\b.*\\b")}\\b`,
+				"g",
+			);
+		} else {
+			const regexp = mutePattern.match(/^\/(.+)\/(.*)$/);
+			// This should never happen due to input sanitisation.
+			if (!regexp) {
+				console.warn(`Found invalid regex in word mutes: ${mutePattern}`);
+				continue;
+			}
+			mute = new RE2(regexp[1], regexp[2]);
+			matched = [mutePattern];
+		}
+
+		try {
+			if (mute.test(text)) return true;
+		} catch (err) {
+			// This should never happen due to input sanitisation.
+		}
+	}
+
+	return notMuted;
+}
+
 export async function getWordMute(
 	note: NoteLike,
 	me: UserLike | null | undefined,
 	mutedWords: Array<string | string[]>,
-): Promise<Muted> {
+): Promise<boolean> {
 	// 自分自身
 	if (me && note.userId === me.id) {
-		return NotMuted;
+		return false;
 	}
 
 	if (mutedWords.length > 0) {
-		const text = ((note.cw ?? "") + "\n" + (note.text ?? "")).trim();
-
-		if (text === "") {
-			return NotMuted;
-		}
-
-		for (const mutePattern of mutedWords) {
-			let mute: RE2;
-			let matched: string[];
-			if (Array.isArray(mutePattern)) {
-				matched = mutePattern.filter((keyword) => keyword !== "");
-
-				if (matched.length === 0) {
-					continue;
-				}
-				mute = new RE2(
-					`\\b${matched.map(escapeRegExp).join("\\b.*\\b")}\\b`,
-					"g",
-				);
-			} else {
-				const regexp = mutePattern.match(/^\/(.+)\/(.*)$/);
-				// This should never happen due to input sanitisation.
-				if (!regexp) {
-					console.warn(`Found invalid regex in word mutes: ${mutePattern}`);
-					continue;
-				}
-				mute = new RE2(regexp[1], regexp[2]);
-				matched = [mutePattern];
-			}
-
-			try {
-				if (mute.test(text)) {
-					return { muted: true, matched };
-				}
-			} catch (err) {
-				// This should never happen due to input sanitisation.
-			}
-		}
+		return checkWordMute(note) || checkWordMute(reply) || checkWordMute(renote)
 	}
 
-	return NotMuted;
+	return false;
 }
diff --git a/packages/backend/src/server/api/stream/channels/antenna.ts b/packages/backend/src/server/api/stream/channels/antenna.ts
index 050a8d1019..65e1eb9879 100644
--- a/packages/backend/src/server/api/stream/channels/antenna.ts
+++ b/packages/backend/src/server/api/stream/channels/antenna.ts
@@ -1,6 +1,7 @@
 import Channel from "../channel.js";
 import { Notes } from "@/models/index.js";
 import { isUserRelated } from "@/misc/is-user-related.js";
+import { getWordMute } from "@/misc/check-word-mute.js";
 import type { StreamMessages } from "../types.js";
 import { IdentifiableError } from "@/misc/identifiable-error.js";
 
@@ -37,6 +38,12 @@ export default class extends Channel {
 				if (note.renote && !note.text && isUserRelated(note, this.renoteMuting))
 					return;
 
+				if (
+					this.userProfile &&
+					(await getWordMute(note, this.user, this.userProfile.mutedWords))
+				)
+					return;
+
 				this.connection.cacheNote(note);
 
 				this.send("note", note);
diff --git a/packages/backend/src/server/api/stream/channels/channel.ts b/packages/backend/src/server/api/stream/channels/channel.ts
index d046579f42..3b242bb2a4 100644
--- a/packages/backend/src/server/api/stream/channels/channel.ts
+++ b/packages/backend/src/server/api/stream/channels/channel.ts
@@ -1,6 +1,7 @@
 import Channel from "../channel.js";
 import { Users } from "@/models/index.js";
 import { isUserRelated } from "@/misc/is-user-related.js";
+import { getWordMute } from "@/misc/check-word-mute.js";
 import type { User } from "@/models/entities/user.js";
 import type { StreamMessages } from "../types.js";
 import type { Packed } from "@/misc/schema.js";
@@ -39,6 +40,12 @@ export default class extends Channel {
 		if (note.renote && !note.text && isUserRelated(note, this.renoteMuting))
 			return;
 
+		if (
+			this.userProfile &&
+			(await getWordMute(note, this.user, this.userProfile.mutedWords))
+		)
+			return;
+
 		this.connection.cacheNote(note);
 
 		this.send("note", note);
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 aa3844c7e3..fb5c458b41 100644
--- a/packages/backend/src/server/api/stream/channels/global-timeline.ts
+++ b/packages/backend/src/server/api/stream/channels/global-timeline.ts
@@ -66,7 +66,7 @@ export default class extends Channel {
 		// そのためレコードが存在するかのチェックでは不十分なので、改めてgetWordMuteを呼んでいる
 		if (
 			this.userProfile &&
-			(await getWordMute(note, this.user, this.userProfile.mutedWords)).muted
+			(await getWordMute(note, this.user, this.userProfile.mutedWords))
 		)
 			return;
 
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 fa4a8a3901..70b2f387e1 100644
--- a/packages/backend/src/server/api/stream/channels/home-timeline.ts
+++ b/packages/backend/src/server/api/stream/channels/home-timeline.ts
@@ -64,7 +64,7 @@ export default class extends Channel {
 		// そのためレコードが存在するかのチェックでは不十分なので、改めてgetWordMuteを呼んでいる
 		if (
 			this.userProfile &&
-			(await getWordMute(note, this.user, this.userProfile.mutedWords)).muted
+			(await getWordMute(note, this.user, this.userProfile.mutedWords))
 		)
 			return;
 
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 557bb96827..423fb461f3 100644
--- a/packages/backend/src/server/api/stream/channels/hybrid-timeline.ts
+++ b/packages/backend/src/server/api/stream/channels/hybrid-timeline.ts
@@ -81,7 +81,7 @@ export default class extends Channel {
 		// そのためレコードが存在するかのチェックでは不十分なので、改めてgetWordMuteを呼んでいる
 		if (
 			this.userProfile &&
-			(await getWordMute(note, this.user, this.userProfile.mutedWords)).muted
+			(await getWordMute(note, this.user, this.userProfile.mutedWords))
 		)
 			return;
 
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 dc3aab8d7d..94901661b6 100644
--- a/packages/backend/src/server/api/stream/channels/local-timeline.ts
+++ b/packages/backend/src/server/api/stream/channels/local-timeline.ts
@@ -58,7 +58,7 @@ export default class extends Channel {
 		// そのためレコードが存在するかのチェックでは不十分なので、改めてgetWordMuteを呼んでいる
 		if (
 			this.userProfile &&
-			(await getWordMute(note, this.user, this.userProfile.mutedWords)).muted
+			(await getWordMute(note, this.user, this.userProfile.mutedWords))
 		)
 			return;
 
diff --git a/packages/backend/src/server/api/stream/channels/recommended-timeline.ts b/packages/backend/src/server/api/stream/channels/recommended-timeline.ts
index 6baec77442..7eee22c325 100644
--- a/packages/backend/src/server/api/stream/channels/recommended-timeline.ts
+++ b/packages/backend/src/server/api/stream/channels/recommended-timeline.ts
@@ -79,7 +79,7 @@ export default class extends Channel {
 		// そのためレコードが存在するかのチェックでは不十分なので、改めてgetWordMuteを呼んでいる
 		if (
 			this.userProfile &&
-			(await getWordMute(note, this.user, this.userProfile.mutedWords)).muted
+			(await getWordMute(note, this.user, this.userProfile.mutedWords))
 		)
 			return;
 
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 105c45955c..2183351e1a 100644
--- a/packages/backend/src/server/api/stream/channels/user-list.ts
+++ b/packages/backend/src/server/api/stream/channels/user-list.ts
@@ -2,6 +2,7 @@ import Channel from "../channel.js";
 import { UserListJoinings, UserLists } from "@/models/index.js";
 import type { User } from "@/models/entities/user.js";
 import { isUserRelated } from "@/misc/is-user-related.js";
+import { getWordMute } from "@/misc/check-word-mute.js";
 import type { Packed } from "@/misc/schema.js";
 
 export default class extends Channel {
@@ -59,6 +60,12 @@ export default class extends Channel {
 		if (note.renote && !note.text && isUserRelated(note, this.renoteMuting))
 			return;
 
+		if (
+			this.userProfile &&
+			(await getWordMute(note, this.user, this.userProfile.mutedWords))
+		)
+			return;
+
 		this.send("note", note);
 	}
 
diff --git a/packages/backend/src/services/note/create.ts b/packages/backend/src/services/note/create.ts
index f1164c9c6e..7c9746b73a 100644
--- a/packages/backend/src/services/note/create.ts
+++ b/packages/backend/src/services/note/create.ts
@@ -356,7 +356,7 @@ export default async (
 				for (const u of us) {
 					getWordMute(note, { id: u.userId }, u.mutedWords).then(
 						(shouldMute) => {
-							if (shouldMute.muted) {
+							if (shouldMute) {
 								MutedNotes.insert({
 									id: genId(),
 									userId: u.userId,

From cdd876ba03852c318f8599215a4860854d7a82ea Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Thu, 4 May 2023 14:13:13 +0900
Subject: [PATCH 02/20] Refactor soft word mutes

---
 locales/en-US.yml                             |  3 +
 locales/ja-JP.yml                             |  3 +
 packages/client/src/components/MkNote.vue     | 16 +++-
 .../client/src/components/MkNoteDetailed.vue  | 16 +++-
 packages/client/src/components/MkNoteSub.vue  | 40 +++++++++
 .../client/src/scripts/check-word-mute.ts     | 84 ++++++++++++-------
 6 files changed, 128 insertions(+), 34 deletions(-)

diff --git a/locales/en-US.yml b/locales/en-US.yml
index 4acb0fc5b1..89c0a08e66 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -663,6 +663,9 @@ regexpErrorDescription: "An error occurred in the regular expression on line {li
 instanceMute: "Instance Mutes"
 userSaysSomething: "{name} said something"
 userSaysSomethingReason: "{name} said {reason}"
+userSaysSomethingReasonReply: "{name} replied to a post containing {reason}"
+userSaysSomethingReasonRenote: "{name} boosted a post containing {reason}"
+userSaysSomethingReasonQuote: "{name} quoted a post containing {reason}"
 makeActive: "Activate"
 display: "Display"
 copy: "Copy"
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 8ae43cdb9b..cb01fb564b 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -619,6 +619,9 @@ regexpErrorDescription: "{tab}ワードミュートの{line}行目の正規表
 instanceMute: "インスタンスミュート"
 userSaysSomething: "{name}が何かを言いました"
 userSaysSomethingReason: "{name}が{reason}と言いました"
+userSaysSomethingReasonReply: "{name}が{reason}を含む投稿に返信しました"
+userSaysSomethingReasonRenote: "{name}が{reason}を含む投稿をブーストしました"
+userSaysSomethingReasonQuote: "{name}が{reason}を含む投稿を引用しました"
 makeActive: "アクティブにする"
 display: "表示"
 copy: "コピー"
diff --git a/packages/client/src/components/MkNote.vue b/packages/client/src/components/MkNote.vue
index 7e3fd6be55..67eab29c73 100644
--- a/packages/client/src/components/MkNote.vue
+++ b/packages/client/src/components/MkNote.vue
@@ -198,7 +198,7 @@
 		</article>
 	</div>
 	<div v-else class="muted" @click="muted.muted = false">
-		<I18n :src="i18n.ts.userSaysSomethingReason" tag="small">
+		<I18n :src="softMuteReasonI18nSrc(muted.what)" tag="small">
 			<template #name>
 				<MkA
 					v-user-preview="appearNote.userId"
@@ -261,6 +261,20 @@ const inChannel = inject("inChannel", null);
 
 let note = $ref(deepClone(props.note));
 
+const softMuteReasonI18nSrc = (what?: string) => {
+	if (what === "note")
+		return i18n.ts.userSaysSomethingReason;
+	if (what === "reply")
+		return i18n.ts.userSaysSomethingReasonReply;
+	if (what === "renote")
+		return i18n.ts.userSaysSomethingReasonRenote;
+	if (what === "quote")
+		return i18n.ts.userSaysSomethingReasonQuote;
+
+	// I don't think here is reachable, but just in case
+	return i18n.ts.userSaysSomething;
+}
+
 // plugin
 if (noteViewInterruptors.length > 0) {
 	onMounted(async () => {
diff --git a/packages/client/src/components/MkNoteDetailed.vue b/packages/client/src/components/MkNoteDetailed.vue
index de9cfd0bcf..5c4d365789 100644
--- a/packages/client/src/components/MkNoteDetailed.vue
+++ b/packages/client/src/components/MkNoteDetailed.vue
@@ -39,7 +39,7 @@
 		/>
 	</div>
 	<div v-else class="_panel muted" @click="muted.muted = false">
-		<I18n :src="i18n.ts.userSaysSomethingReason" tag="small">
+		<I18n :src="softMuteReasonI18nSrc(muted.what)" tag="small">
 			<template #name>
 				<MkA
 					v-user-preview="appearNote.userId"
@@ -110,6 +110,20 @@ const inChannel = inject("inChannel", null);
 
 let note = $ref(deepClone(props.note));
 
+const softMuteReasonI18nSrc = (what?: string) => {
+	if (what === "note")
+		return i18n.ts.userSaysSomethingReason;
+	if (what === "reply")
+		return i18n.ts.userSaysSomethingReasonReply;
+	if (what === "renote")
+		return i18n.ts.userSaysSomethingReasonRenote;
+	if (what === "quote")
+		return i18n.ts.userSaysSomethingReasonQuote;
+
+	// I don't think here is reachable, but just in case
+	return i18n.ts.userSaysSomething;
+}
+
 const enableEmojiReactions = defaultStore.state.enableEmojiReactions;
 
 // plugin
diff --git a/packages/client/src/components/MkNoteSub.vue b/packages/client/src/components/MkNoteSub.vue
index a0b70ff1f5..c68f0a7360 100644
--- a/packages/client/src/components/MkNoteSub.vue
+++ b/packages/client/src/components/MkNoteSub.vue
@@ -1,5 +1,6 @@
 <template>
 	<div
+		v-if="!muted.muted || muted.what === 'reply'"
 		ref="el"
 		v-size="{ max: [450, 500] }"
 		class="wrpstxzv"
@@ -161,6 +162,22 @@
 			</div>
 		</template>
 	</div>
+	<div v-else class="muted" @click="muted.muted = false">
+		<I18n :src="softMuteReasonI18nSrc(muted.what)" tag="small">
+			<template #name>
+				<MkA
+					v-user-preview="appearNote.userId"
+					class="name"
+					:to="userPage(appearNote.user)"
+				>
+					<MkUserName :user="appearNote.user" />
+				</MkA>
+			</template>
+			<template #reason>
+				<b class="_blur_text">{{ muted.matched.join(", ") }}</b>
+			</template>
+		</I18n>
+	</div>
 </template>
 
 <script lang="ts" setup>
@@ -176,10 +193,12 @@ import XRenoteButton from "@/components/MkRenoteButton.vue";
 import XQuoteButton from "@/components/MkQuoteButton.vue";
 import { pleaseLogin } from "@/scripts/please-login";
 import { getNoteMenu } from "@/scripts/get-note-menu";
+import { getWordMute } from "@/scripts/check-word-mute";
 import { notePage } from "@/filters/note";
 import { useRouter } from "@/router";
 import * as os from "@/os";
 import { reactionPicker } from "@/scripts/reaction-picker";
+import { $i } from "@/account";
 import { i18n } from "@/i18n";
 import { deepClone } from "@/scripts/clone";
 import { useNoteCapture } from "@/scripts/use-note-capture";
@@ -206,6 +225,20 @@ const props = withDefaults(
 
 let note = $ref(deepClone(props.note));
 
+const softMuteReasonI18nSrc = (what?: string) => {
+	if (what === "note")
+		return i18n.ts.userSaysSomethingReason;
+	if (what === "reply")
+		return i18n.ts.userSaysSomethingReasonReply;
+	if (what === "renote")
+		return i18n.ts.userSaysSomethingReasonRenote;
+	if (what === "quote")
+		return i18n.ts.userSaysSomethingReasonQuote;
+
+	// I don't think here is reachable, but just in case
+	return i18n.ts.userSaysSomething;
+}
+
 const isRenote =
 	note.renote != null &&
 	note.text == null &&
@@ -222,6 +255,7 @@ let appearNote = $computed(() =>
 	isRenote ? (note.renote as misskey.entities.Note) : note
 );
 const isDeleted = ref(false);
+const muted = ref(getWordMute(appearNote, $i, defaultStore.state.mutedWords));
 const translation = ref(null);
 const translating = ref(false);
 const replies: misskey.entities.Note[] =
@@ -617,4 +651,10 @@ function noteClick(e) {
 		}
 	}
 }
+
+.muted {
+	padding: 8px;
+	text-align: center;
+	opacity: 0.7;
+}
 </style>
diff --git a/packages/client/src/scripts/check-word-mute.ts b/packages/client/src/scripts/check-word-mute.ts
index a189a6d3a4..f5d0ac86f7 100644
--- a/packages/client/src/scripts/check-word-mute.ts
+++ b/packages/client/src/scripts/check-word-mute.ts
@@ -1,6 +1,7 @@
 export type Muted = {
 	muted: boolean;
 	matched: string[];
+	what?: string;  // "note" || "reply" || "renote" || "quote"
 };
 
 const NotMuted = { muted: false, matched: [] };
@@ -9,6 +10,42 @@ function escapeRegExp(x: string) {
 	return x.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"); // $& means the whole matched string
 }
 
+function checkWordMute(note: NoteLike): Muted {
+	const text = ((note.cw ?? "") + " " + (note.text ?? "")).trim();
+	if (text === "") return NotMuted;
+
+	for (const mutePattern of mutedWords) {
+		let mute: RegExp;
+		let matched: string[];
+		if (Array.isArray(mutePattern)) {
+			matched = mutePattern.filter((keyword) => keyword !== "");
+			if (matched.length === 0) {
+				continue;
+			}
+			mute = new RegExp(
+				`\\b${matched.map(escapeRegExp).join("\\b.*\\b")}\\b`,
+				"g",
+			);
+		} else {
+			const regexp = mutePattern.match(/^\/(.+)\/(.*)$/);
+			// This should never happen due to input sanitisation.
+			if (!regexp) {
+				console.warn(`Found invalid regex in word mutes: ${mutePattern}`);
+				continue;
+			}
+			mute = new RegExp(regexp[1], regexp[2]);
+			matched = [mutePattern];
+		}
+		try {
+			if (mute.test(text)) {
+				return { muted: true, matched };
+			}
+		} catch (err) {
+			// This should never happen due to input sanitisation.
+		}
+	}
+}
+
 export function getWordMute(
 	note: Record<string, any>,
 	me: Record<string, any> | null | undefined,
@@ -20,42 +57,25 @@ export function getWordMute(
 	}
 
 	if (mutedWords.length > 0) {
-		const text = ((note.cw ?? "") + "\n" + (note.text ?? "")).trim();
-
-		if (text === "") {
-			return NotMuted;
+		let noteMuted = checkWordMute(note);
+		if (noteMuted.muted) {
+			noteMuted.what = "note";
+			return noteMuted;
 		}
 
-		for (const mutePattern of mutedWords) {
-			let mute: RegExp;
-			let matched: string[];
-			if (Array.isArray(mutePattern)) {
-				matched = mutePattern.filter((keyword) => keyword !== "");
-
-				if (matched.length === 0) {
-					continue;
-				}
-				mute = new RegExp(
-					`\\b${matched.map(escapeRegExp).join("\\b.*\\b")}\\b`,
-					"g",
-				);
-			} else {
-				const regexp = mutePattern.match(/^\/(.+)\/(.*)$/);
-				// This should never happen due to input sanitisation.
-				if (!regexp) {
-					console.warn(`Found invalid regex in word mutes: ${mutePattern}`);
-					continue;
-				}
-				mute = new RegExp(regexp[1], regexp[2]);
-				matched = [mutePattern];
+		if (note.reply) {
+			let replyMuted = checkWordMute(note.reply);
+			if (replyMuted.muted) {
+				replyMuted.what = "reply";
+				return replyMuted;
 			}
+		}
 
-			try {
-				if (mute.test(text)) {
-					return { muted: true, matched };
-				}
-			} catch (err) {
-				// This should never happen due to input sanitisation.
+		if (note.renote) {
+			let renoteMuted = checkWordMute(note.renote);
+			if (renoteMuted.muted) {
+				renoteMuted.what = (note.text == null ? "renote" : "quote");
+				return renoteMuted;
 			}
 		}
 	}

From d9553e73af5a64a4a32e1be35bc146ca6bd7f682 Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Thu, 4 May 2023 14:20:06 +0900
Subject: [PATCH 03/20] Differentiate soft mutes and hard mutes

---
 packages/backend/src/misc/check-word-mute.ts                | 2 +-
 packages/backend/src/server/api/stream/channels/antenna.ts  | 4 ++--
 packages/backend/src/server/api/stream/channels/channel.ts  | 4 ++--
 .../src/server/api/stream/channels/global-timeline.ts       | 6 +++---
 .../backend/src/server/api/stream/channels/home-timeline.ts | 6 +++---
 .../src/server/api/stream/channels/hybrid-timeline.ts       | 6 +++---
 .../src/server/api/stream/channels/local-timeline.ts        | 6 +++---
 .../src/server/api/stream/channels/recommended-timeline.ts  | 6 +++---
 .../backend/src/server/api/stream/channels/user-list.ts     | 4 ++--
 packages/backend/src/services/note/create.ts                | 4 ++--
 packages/client/src/components/MkNote.vue                   | 4 ++--
 packages/client/src/components/MkNoteDetailed.vue           | 4 ++--
 packages/client/src/components/MkNoteSub.vue                | 4 ++--
 packages/client/src/scripts/check-word-mute.ts              | 2 +-
 14 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/packages/backend/src/misc/check-word-mute.ts b/packages/backend/src/misc/check-word-mute.ts
index a411e46cc8..7d36d8f7d9 100644
--- a/packages/backend/src/misc/check-word-mute.ts
+++ b/packages/backend/src/misc/check-word-mute.ts
@@ -56,7 +56,7 @@ function checkWordMute(note: NoteLike): boolean {
 	return notMuted;
 }
 
-export async function getWordMute(
+export async function getWordHardMute(
 	note: NoteLike,
 	me: UserLike | null | undefined,
 	mutedWords: Array<string | string[]>,
diff --git a/packages/backend/src/server/api/stream/channels/antenna.ts b/packages/backend/src/server/api/stream/channels/antenna.ts
index 65e1eb9879..e110c852b7 100644
--- a/packages/backend/src/server/api/stream/channels/antenna.ts
+++ b/packages/backend/src/server/api/stream/channels/antenna.ts
@@ -1,7 +1,7 @@
 import Channel from "../channel.js";
 import { Notes } from "@/models/index.js";
 import { isUserRelated } from "@/misc/is-user-related.js";
-import { getWordMute } from "@/misc/check-word-mute.js";
+import { getWordHardMute } from "@/misc/check-word-mute.js";
 import type { StreamMessages } from "../types.js";
 import { IdentifiableError } from "@/misc/identifiable-error.js";
 
@@ -40,7 +40,7 @@ export default class extends Channel {
 
 				if (
 					this.userProfile &&
-					(await getWordMute(note, this.user, this.userProfile.mutedWords))
+					(await getWordHardMute(note, this.user, this.userProfile.mutedWords))
 				)
 					return;
 
diff --git a/packages/backend/src/server/api/stream/channels/channel.ts b/packages/backend/src/server/api/stream/channels/channel.ts
index 3b242bb2a4..f5c5a170d9 100644
--- a/packages/backend/src/server/api/stream/channels/channel.ts
+++ b/packages/backend/src/server/api/stream/channels/channel.ts
@@ -1,7 +1,7 @@
 import Channel from "../channel.js";
 import { Users } from "@/models/index.js";
 import { isUserRelated } from "@/misc/is-user-related.js";
-import { getWordMute } from "@/misc/check-word-mute.js";
+import { getWordHardMute } from "@/misc/check-word-mute.js";
 import type { User } from "@/models/entities/user.js";
 import type { StreamMessages } from "../types.js";
 import type { Packed } from "@/misc/schema.js";
@@ -42,7 +42,7 @@ export default class extends Channel {
 
 		if (
 			this.userProfile &&
-			(await getWordMute(note, this.user, this.userProfile.mutedWords))
+			(await getWordHardMute(note, this.user, this.userProfile.mutedWords))
 		)
 			return;
 
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 fb5c458b41..07ac380265 100644
--- a/packages/backend/src/server/api/stream/channels/global-timeline.ts
+++ b/packages/backend/src/server/api/stream/channels/global-timeline.ts
@@ -1,6 +1,6 @@
 import Channel from "../channel.js";
 import { fetchMeta } from "@/misc/fetch-meta.js";
-import { getWordMute } from "@/misc/check-word-mute.js";
+import { getWordHardMute } from "@/misc/check-word-mute.js";
 import { isInstanceMuted } from "@/misc/is-instance-muted.js";
 import { isUserRelated } from "@/misc/is-user-related.js";
 import type { Packed } from "@/misc/schema.js";
@@ -63,10 +63,10 @@ export default class extends Channel {
 		// TODO: 将来的には、単にMutedNoteテーブルにレコードがあるかどうかで判定したい(以下の理由により難しそうではある)
 		// 現状では、ワードミュートにおけるMutedNoteレコードの追加処理はストリーミングに流す処理と並列で行われるため、
 		// レコードが追加されるNoteでも追加されるより先にここのストリーミングの処理に到達することが起こる。
-		// そのためレコードが存在するかのチェックでは不十分なので、改めてgetWordMuteを呼んでいる
+		// そのためレコードが存在するかのチェックでは不十分なので、改めてgetWordHardMuteを呼んでいる
 		if (
 			this.userProfile &&
-			(await getWordMute(note, this.user, this.userProfile.mutedWords))
+			(await getWordHardMute(note, this.user, this.userProfile.mutedWords))
 		)
 			return;
 
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 70b2f387e1..bb79d158ce 100644
--- a/packages/backend/src/server/api/stream/channels/home-timeline.ts
+++ b/packages/backend/src/server/api/stream/channels/home-timeline.ts
@@ -1,5 +1,5 @@
 import Channel from "../channel.js";
-import { getWordMute } from "@/misc/check-word-mute.js";
+import { getWordHardMute } from "@/misc/check-word-mute.js";
 import { isUserRelated } from "@/misc/is-user-related.js";
 import { isInstanceMuted } from "@/misc/is-instance-muted.js";
 import type { Packed } from "@/misc/schema.js";
@@ -61,10 +61,10 @@ export default class extends Channel {
 		// TODO: 将来的には、単にMutedNoteテーブルにレコードがあるかどうかで判定したい(以下の理由により難しそうではある)
 		// 現状では、ワードミュートにおけるMutedNoteレコードの追加処理はストリーミングに流す処理と並列で行われるため、
 		// レコードが追加されるNoteでも追加されるより先にここのストリーミングの処理に到達することが起こる。
-		// そのためレコードが存在するかのチェックでは不十分なので、改めてgetWordMuteを呼んでいる
+		// そのためレコードが存在するかのチェックでは不十分なので、改めてgetWordHardMuteを呼んでいる
 		if (
 			this.userProfile &&
-			(await getWordMute(note, this.user, this.userProfile.mutedWords))
+			(await getWordHardMute(note, this.user, this.userProfile.mutedWords))
 		)
 			return;
 
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 423fb461f3..c73eb4f700 100644
--- a/packages/backend/src/server/api/stream/channels/hybrid-timeline.ts
+++ b/packages/backend/src/server/api/stream/channels/hybrid-timeline.ts
@@ -1,6 +1,6 @@
 import Channel from "../channel.js";
 import { fetchMeta } from "@/misc/fetch-meta.js";
-import { getWordMute } from "@/misc/check-word-mute.js";
+import { getWordHardMute } from "@/misc/check-word-mute.js";
 import { isUserRelated } from "@/misc/is-user-related.js";
 import { isInstanceMuted } from "@/misc/is-instance-muted.js";
 import type { Packed } from "@/misc/schema.js";
@@ -78,10 +78,10 @@ export default class extends Channel {
 		// TODO: 将来的には、単にMutedNoteテーブルにレコードがあるかどうかで判定したい(以下の理由により難しそうではある)
 		// 現状では、ワードミュートにおけるMutedNoteレコードの追加処理はストリーミングに流す処理と並列で行われるため、
 		// レコードが追加されるNoteでも追加されるより先にここのストリーミングの処理に到達することが起こる。
-		// そのためレコードが存在するかのチェックでは不十分なので、改めてgetWordMuteを呼んでいる
+		// そのためレコードが存在するかのチェックでは不十分なので、改めてgetWordHardMuteを呼んでいる
 		if (
 			this.userProfile &&
-			(await getWordMute(note, this.user, this.userProfile.mutedWords))
+			(await getWordHardMute(note, this.user, this.userProfile.mutedWords))
 		)
 			return;
 
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 94901661b6..19bf43be22 100644
--- a/packages/backend/src/server/api/stream/channels/local-timeline.ts
+++ b/packages/backend/src/server/api/stream/channels/local-timeline.ts
@@ -1,6 +1,6 @@
 import Channel from "../channel.js";
 import { fetchMeta } from "@/misc/fetch-meta.js";
-import { getWordMute } from "@/misc/check-word-mute.js";
+import { getWordHardMute } from "@/misc/check-word-mute.js";
 import { isUserRelated } from "@/misc/is-user-related.js";
 import type { Packed } from "@/misc/schema.js";
 
@@ -55,10 +55,10 @@ export default class extends Channel {
 		// TODO: 将来的には、単にMutedNoteテーブルにレコードがあるかどうかで判定したい(以下の理由により難しそうではある)
 		// 現状では、ワードミュートにおけるMutedNoteレコードの追加処理はストリーミングに流す処理と並列で行われるため、
 		// レコードが追加されるNoteでも追加されるより先にここのストリーミングの処理に到達することが起こる。
-		// そのためレコードが存在するかのチェックでは不十分なので、改めてgetWordMuteを呼んでいる
+		// そのためレコードが存在するかのチェックでは不十分なので、改めてgetWordHardMuteを呼んでいる
 		if (
 			this.userProfile &&
-			(await getWordMute(note, this.user, this.userProfile.mutedWords))
+			(await getWordHardMute(note, this.user, this.userProfile.mutedWords))
 		)
 			return;
 
diff --git a/packages/backend/src/server/api/stream/channels/recommended-timeline.ts b/packages/backend/src/server/api/stream/channels/recommended-timeline.ts
index 7eee22c325..cc30a85a37 100644
--- a/packages/backend/src/server/api/stream/channels/recommended-timeline.ts
+++ b/packages/backend/src/server/api/stream/channels/recommended-timeline.ts
@@ -1,6 +1,6 @@
 import Channel from "../channel.js";
 import { fetchMeta } from "@/misc/fetch-meta.js";
-import { getWordMute } from "@/misc/check-word-mute.js";
+import { getWordHardMute } from "@/misc/check-word-mute.js";
 import { isUserRelated } from "@/misc/is-user-related.js";
 import { isInstanceMuted } from "@/misc/is-instance-muted.js";
 import type { Packed } from "@/misc/schema.js";
@@ -76,10 +76,10 @@ export default class extends Channel {
 		// TODO: 将来的には、単にMutedNoteテーブルにレコードがあるかどうかで判定したい(以下の理由により難しそうではある)
 		// 現状では、ワードミュートにおけるMutedNoteレコードの追加処理はストリーミングに流す処理と並列で行われるため、
 		// レコードが追加されるNoteでも追加されるより先にここのストリーミングの処理に到達することが起こる。
-		// そのためレコードが存在するかのチェックでは不十分なので、改めてgetWordMuteを呼んでいる
+		// そのためレコードが存在するかのチェックでは不十分なので、改めてgetWordHardMuteを呼んでいる
 		if (
 			this.userProfile &&
-			(await getWordMute(note, this.user, this.userProfile.mutedWords))
+			(await getWordHardMute(note, this.user, this.userProfile.mutedWords))
 		)
 			return;
 
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 2183351e1a..c9b658c5c7 100644
--- a/packages/backend/src/server/api/stream/channels/user-list.ts
+++ b/packages/backend/src/server/api/stream/channels/user-list.ts
@@ -2,7 +2,7 @@ import Channel from "../channel.js";
 import { UserListJoinings, UserLists } from "@/models/index.js";
 import type { User } from "@/models/entities/user.js";
 import { isUserRelated } from "@/misc/is-user-related.js";
-import { getWordMute } from "@/misc/check-word-mute.js";
+import { getWordHardMute } from "@/misc/check-word-mute.js";
 import type { Packed } from "@/misc/schema.js";
 
 export default class extends Channel {
@@ -62,7 +62,7 @@ export default class extends Channel {
 
 		if (
 			this.userProfile &&
-			(await getWordMute(note, this.user, this.userProfile.mutedWords))
+			(await getWordHardMute(note, this.user, this.userProfile.mutedWords))
 		)
 			return;
 
diff --git a/packages/backend/src/services/note/create.ts b/packages/backend/src/services/note/create.ts
index 7c9746b73a..d37f81ac9c 100644
--- a/packages/backend/src/services/note/create.ts
+++ b/packages/backend/src/services/note/create.ts
@@ -53,7 +53,7 @@ import { Poll } from "@/models/entities/poll.js";
 import { createNotification } from "../create-notification.js";
 import { isDuplicateKeyValueError } from "@/misc/is-duplicate-key-value-error.js";
 import { checkHitAntenna } from "@/misc/check-hit-antenna.js";
-import { getWordMute } from "@/misc/check-word-mute.js";
+import { getWordHardMute } from "@/misc/check-word-mute.js";
 import { addNoteToAntenna } from "../add-note-to-antenna.js";
 import { countSameRenotes } from "@/misc/count-same-renotes.js";
 import { deliverToRelays } from "../relay.js";
@@ -354,7 +354,7 @@ export default async (
 			)
 			.then((us) => {
 				for (const u of us) {
-					getWordMute(note, { id: u.userId }, u.mutedWords).then(
+					getWordHardMute(note, { id: u.userId }, u.mutedWords).then(
 						(shouldMute) => {
 							if (shouldMute) {
 								MutedNotes.insert({
diff --git a/packages/client/src/components/MkNote.vue b/packages/client/src/components/MkNote.vue
index 67eab29c73..6361cad54c 100644
--- a/packages/client/src/components/MkNote.vue
+++ b/packages/client/src/components/MkNote.vue
@@ -236,7 +236,7 @@ import MkUrlPreview from "@/components/MkUrlPreview.vue";
 import MkVisibility from "@/components/MkVisibility.vue";
 import { pleaseLogin } from "@/scripts/please-login";
 import { focusPrev, focusNext } from "@/scripts/focus";
-import { getWordMute } from "@/scripts/check-word-mute";
+import { getWordSoftMute } from "@/scripts/check-word-mute";
 import { useRouter } from "@/router";
 import { userPage } from "@/filters/user";
 import * as os from "@/os";
@@ -305,7 +305,7 @@ let appearNote = $computed(() =>
 const isMyRenote = $i && $i.id === note.userId;
 const showContent = ref(false);
 const isDeleted = ref(false);
-const muted = ref(getWordMute(appearNote, $i, defaultStore.state.mutedWords));
+const muted = ref(getWordSoftMute(appearNote, $i, defaultStore.state.mutedWords));
 const translation = ref(null);
 const translating = ref(false);
 const enableEmojiReactions = defaultStore.state.enableEmojiReactions;
diff --git a/packages/client/src/components/MkNoteDetailed.vue b/packages/client/src/components/MkNoteDetailed.vue
index 5c4d365789..d18f49094d 100644
--- a/packages/client/src/components/MkNoteDetailed.vue
+++ b/packages/client/src/components/MkNoteDetailed.vue
@@ -83,7 +83,7 @@ import MkUrlPreview from "@/components/MkUrlPreview.vue";
 import MkInstanceTicker from "@/components/MkInstanceTicker.vue";
 import MkVisibility from "@/components/MkVisibility.vue";
 import { pleaseLogin } from "@/scripts/please-login";
-import { getWordMute } from "@/scripts/check-word-mute";
+import { getWordSoftMute } from "@/scripts/check-word-mute";
 import { userPage } from "@/filters/user";
 import { notePage } from "@/filters/note";
 import { useRouter } from "@/router";
@@ -156,7 +156,7 @@ let appearNote = $computed(() =>
 const isMyRenote = $i && $i.id === note.userId;
 const showContent = ref(false);
 const isDeleted = ref(false);
-const muted = ref(getWordMute(appearNote, $i, defaultStore.state.mutedWords));
+const muted = ref(getWordSoftMute(appearNote, $i, defaultStore.state.mutedWords));
 const translation = ref(null);
 const translating = ref(false);
 const urls = appearNote.text
diff --git a/packages/client/src/components/MkNoteSub.vue b/packages/client/src/components/MkNoteSub.vue
index c68f0a7360..28885c05ab 100644
--- a/packages/client/src/components/MkNoteSub.vue
+++ b/packages/client/src/components/MkNoteSub.vue
@@ -193,7 +193,7 @@ import XRenoteButton from "@/components/MkRenoteButton.vue";
 import XQuoteButton from "@/components/MkQuoteButton.vue";
 import { pleaseLogin } from "@/scripts/please-login";
 import { getNoteMenu } from "@/scripts/get-note-menu";
-import { getWordMute } from "@/scripts/check-word-mute";
+import { getWordSoftMute } from "@/scripts/check-word-mute";
 import { notePage } from "@/filters/note";
 import { useRouter } from "@/router";
 import * as os from "@/os";
@@ -255,7 +255,7 @@ let appearNote = $computed(() =>
 	isRenote ? (note.renote as misskey.entities.Note) : note
 );
 const isDeleted = ref(false);
-const muted = ref(getWordMute(appearNote, $i, defaultStore.state.mutedWords));
+const muted = ref(getWordSoftMute(appearNote, $i, defaultStore.state.mutedWords));
 const translation = ref(null);
 const translating = ref(false);
 const replies: misskey.entities.Note[] =
diff --git a/packages/client/src/scripts/check-word-mute.ts b/packages/client/src/scripts/check-word-mute.ts
index f5d0ac86f7..d2cd643249 100644
--- a/packages/client/src/scripts/check-word-mute.ts
+++ b/packages/client/src/scripts/check-word-mute.ts
@@ -46,7 +46,7 @@ function checkWordMute(note: NoteLike): Muted {
 	}
 }
 
-export function getWordMute(
+export function getWordSoftMute(
 	note: Record<string, any>,
 	me: Record<string, any> | null | undefined,
 	mutedWords: Array<string | string[]>,

From ebfd07628e722a1f3e1713899d3313a63ba2fd34 Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Thu, 4 May 2023 14:41:18 +0900
Subject: [PATCH 04/20] format

---
 packages/backend/src/misc/check-word-mute.ts   |  2 +-
 packages/client/src/components/MkNote.vue      | 18 ++++++++----------
 .../client/src/components/MkNoteDetailed.vue   | 18 ++++++++----------
 packages/client/src/components/MkNoteSub.vue   | 18 ++++++++----------
 .../client/src/components/MkVisibility.vue     |  4 ++--
 packages/client/src/scripts/check-word-mute.ts |  4 ++--
 6 files changed, 29 insertions(+), 35 deletions(-)

diff --git a/packages/backend/src/misc/check-word-mute.ts b/packages/backend/src/misc/check-word-mute.ts
index 7d36d8f7d9..472a2fcbe7 100644
--- a/packages/backend/src/misc/check-word-mute.ts
+++ b/packages/backend/src/misc/check-word-mute.ts
@@ -67,7 +67,7 @@ export async function getWordHardMute(
 	}
 
 	if (mutedWords.length > 0) {
-		return checkWordMute(note) || checkWordMute(reply) || checkWordMute(renote)
+		return checkWordMute(note) || checkWordMute(reply) || checkWordMute(renote);
 	}
 
 	return false;
diff --git a/packages/client/src/components/MkNote.vue b/packages/client/src/components/MkNote.vue
index 7a72a250a0..c1ab3bf7a3 100644
--- a/packages/client/src/components/MkNote.vue
+++ b/packages/client/src/components/MkNote.vue
@@ -262,18 +262,14 @@ const inChannel = inject("inChannel", null);
 let note = $ref(deepClone(props.note));
 
 const softMuteReasonI18nSrc = (what?: string) => {
-	if (what === "note")
-		return i18n.ts.userSaysSomethingReason;
-	if (what === "reply")
-		return i18n.ts.userSaysSomethingReasonReply;
-	if (what === "renote")
-		return i18n.ts.userSaysSomethingReasonRenote;
-	if (what === "quote")
-		return i18n.ts.userSaysSomethingReasonQuote;
+	if (what === "note") return i18n.ts.userSaysSomethingReason;
+	if (what === "reply") return i18n.ts.userSaysSomethingReasonReply;
+	if (what === "renote") return i18n.ts.userSaysSomethingReasonRenote;
+	if (what === "quote") return i18n.ts.userSaysSomethingReasonQuote;
 
 	// I don't think here is reachable, but just in case
 	return i18n.ts.userSaysSomething;
-}
+};
 
 // plugin
 if (noteViewInterruptors.length > 0) {
@@ -305,7 +301,9 @@ let appearNote = $computed(() =>
 const isMyRenote = $i && $i.id === note.userId;
 const showContent = ref(false);
 const isDeleted = ref(false);
-const muted = ref(getWordSoftMute(appearNote, $i, defaultStore.state.mutedWords));
+const muted = ref(
+	getWordSoftMute(appearNote, $i, defaultStore.state.mutedWords)
+);
 const translation = ref(null);
 const translating = ref(false);
 const enableEmojiReactions = defaultStore.state.enableEmojiReactions;
diff --git a/packages/client/src/components/MkNoteDetailed.vue b/packages/client/src/components/MkNoteDetailed.vue
index 652d762508..84dc4c083c 100644
--- a/packages/client/src/components/MkNoteDetailed.vue
+++ b/packages/client/src/components/MkNoteDetailed.vue
@@ -111,18 +111,14 @@ const inChannel = inject("inChannel", null);
 let note = $ref(deepClone(props.note));
 
 const softMuteReasonI18nSrc = (what?: string) => {
-	if (what === "note")
-		return i18n.ts.userSaysSomethingReason;
-	if (what === "reply")
-		return i18n.ts.userSaysSomethingReasonReply;
-	if (what === "renote")
-		return i18n.ts.userSaysSomethingReasonRenote;
-	if (what === "quote")
-		return i18n.ts.userSaysSomethingReasonQuote;
+	if (what === "note") return i18n.ts.userSaysSomethingReason;
+	if (what === "reply") return i18n.ts.userSaysSomethingReasonReply;
+	if (what === "renote") return i18n.ts.userSaysSomethingReasonRenote;
+	if (what === "quote") return i18n.ts.userSaysSomethingReasonQuote;
 
 	// I don't think here is reachable, but just in case
 	return i18n.ts.userSaysSomething;
-}
+};
 
 const enableEmojiReactions = defaultStore.state.enableEmojiReactions;
 
@@ -156,7 +152,9 @@ let appearNote = $computed(() =>
 const isMyRenote = $i && $i.id === note.userId;
 const showContent = ref(false);
 const isDeleted = ref(false);
-const muted = ref(getWordSoftMute(appearNote, $i, defaultStore.state.mutedWords));
+const muted = ref(
+	getWordSoftMute(appearNote, $i, defaultStore.state.mutedWords)
+);
 const translation = ref(null);
 const translating = ref(false);
 const urls = appearNote.text
diff --git a/packages/client/src/components/MkNoteSub.vue b/packages/client/src/components/MkNoteSub.vue
index 1d761405b3..74ffcf8c86 100644
--- a/packages/client/src/components/MkNoteSub.vue
+++ b/packages/client/src/components/MkNoteSub.vue
@@ -226,18 +226,14 @@ const props = withDefaults(
 let note = $ref(deepClone(props.note));
 
 const softMuteReasonI18nSrc = (what?: string) => {
-	if (what === "note")
-		return i18n.ts.userSaysSomethingReason;
-	if (what === "reply")
-		return i18n.ts.userSaysSomethingReasonReply;
-	if (what === "renote")
-		return i18n.ts.userSaysSomethingReasonRenote;
-	if (what === "quote")
-		return i18n.ts.userSaysSomethingReasonQuote;
+	if (what === "note") return i18n.ts.userSaysSomethingReason;
+	if (what === "reply") return i18n.ts.userSaysSomethingReasonReply;
+	if (what === "renote") return i18n.ts.userSaysSomethingReasonRenote;
+	if (what === "quote") return i18n.ts.userSaysSomethingReasonQuote;
 
 	// I don't think here is reachable, but just in case
 	return i18n.ts.userSaysSomething;
-}
+};
 
 const isRenote =
 	note.renote != null &&
@@ -255,7 +251,9 @@ let appearNote = $computed(() =>
 	isRenote ? (note.renote as misskey.entities.Note) : note
 );
 const isDeleted = ref(false);
-const muted = ref(getWordSoftMute(appearNote, $i, defaultStore.state.mutedWords));
+const muted = ref(
+	getWordSoftMute(appearNote, $i, defaultStore.state.mutedWords)
+);
 const translation = ref(null);
 const translating = ref(false);
 const replies: misskey.entities.Note[] =
diff --git a/packages/client/src/components/MkVisibility.vue b/packages/client/src/components/MkVisibility.vue
index faf06668c2..c5922ba00c 100644
--- a/packages/client/src/components/MkVisibility.vue
+++ b/packages/client/src/components/MkVisibility.vue
@@ -1,6 +1,6 @@
 <template>
 	<span v-if="note.visibility !== 'public'" :class="$style.visibility">
-		<i 
+		<i
 			v-if="note.visibility === 'home'"
 			class="ph-house ph-bold ph-lg"
 			v-tooltip="i18n.ts._visibility.home"
@@ -17,7 +17,7 @@
 		></i>
 	</span>
 	<span v-if="note.localOnly" :class="$style.localOnly"
-		><i 
+		><i
 			class="ph-hand-fist ph-bold ph-lg"
 			v-tooltip="i18n.ts._visibility.localOnly"
 		></i
diff --git a/packages/client/src/scripts/check-word-mute.ts b/packages/client/src/scripts/check-word-mute.ts
index d2cd643249..dccbada36b 100644
--- a/packages/client/src/scripts/check-word-mute.ts
+++ b/packages/client/src/scripts/check-word-mute.ts
@@ -1,7 +1,7 @@
 export type Muted = {
 	muted: boolean;
 	matched: string[];
-	what?: string;  // "note" || "reply" || "renote" || "quote"
+	what?: string; // "note" || "reply" || "renote" || "quote"
 };
 
 const NotMuted = { muted: false, matched: [] };
@@ -74,7 +74,7 @@ export function getWordSoftMute(
 		if (note.renote) {
 			let renoteMuted = checkWordMute(note.renote);
 			if (renoteMuted.muted) {
-				renoteMuted.what = (note.text == null ? "renote" : "quote");
+				renoteMuted.what = note.text == null ? "renote" : "quote";
 				return renoteMuted;
 			}
 		}

From fc3296d64fe74193901916ca74b9e665f3e01bc2 Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Fri, 5 May 2023 05:17:16 +0900
Subject: [PATCH 05/20] Fix missing arguments

---
 packages/backend/src/misc/check-word-mute.ts   | 11 +++++++++--
 packages/client/src/scripts/check-word-mute.ts | 11 +++++++----
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/packages/backend/src/misc/check-word-mute.ts b/packages/backend/src/misc/check-word-mute.ts
index 472a2fcbe7..df5348b02c 100644
--- a/packages/backend/src/misc/check-word-mute.ts
+++ b/packages/backend/src/misc/check-word-mute.ts
@@ -16,7 +16,10 @@ function escapeRegExp(x: string): string {
 	return x.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"); // $& means the whole matched string
 }
 
-function checkWordMute(note: NoteLike): boolean {
+function checkWordMute(
+	note: NoteLike,
+	mutedWords: Array<string | string[]>,
+): boolean {
 	if (note == null) return false;
 
 	const text = ((note.cw ?? "") + " " + (note.text ?? "")).trim();
@@ -67,7 +70,11 @@ export async function getWordHardMute(
 	}
 
 	if (mutedWords.length > 0) {
-		return checkWordMute(note) || checkWordMute(reply) || checkWordMute(renote);
+		return (
+			checkWordMute(note, mutedWords) ||
+			checkWordMute(reply, mutedWords) ||
+			checkWordMute(renote, mutedWords)
+		);
 	}
 
 	return false;
diff --git a/packages/client/src/scripts/check-word-mute.ts b/packages/client/src/scripts/check-word-mute.ts
index dccbada36b..da44006392 100644
--- a/packages/client/src/scripts/check-word-mute.ts
+++ b/packages/client/src/scripts/check-word-mute.ts
@@ -10,7 +10,10 @@ function escapeRegExp(x: string) {
 	return x.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"); // $& means the whole matched string
 }
 
-function checkWordMute(note: NoteLike): Muted {
+function checkWordMute(
+	note: NoteLike,
+	mutedWords: Array<string | string[]>,
+): Muted {
 	const text = ((note.cw ?? "") + " " + (note.text ?? "")).trim();
 	if (text === "") return NotMuted;
 
@@ -57,14 +60,14 @@ export function getWordSoftMute(
 	}
 
 	if (mutedWords.length > 0) {
-		let noteMuted = checkWordMute(note);
+		let noteMuted = checkWordMute(note, mutedWords);
 		if (noteMuted.muted) {
 			noteMuted.what = "note";
 			return noteMuted;
 		}
 
 		if (note.reply) {
-			let replyMuted = checkWordMute(note.reply);
+			let replyMuted = checkWordMute(note.reply, mutedWords);
 			if (replyMuted.muted) {
 				replyMuted.what = "reply";
 				return replyMuted;
@@ -72,7 +75,7 @@ export function getWordSoftMute(
 		}
 
 		if (note.renote) {
-			let renoteMuted = checkWordMute(note.renote);
+			let renoteMuted = checkWordMute(note.renote, mutedWords);
 			if (renoteMuted.muted) {
 				renoteMuted.what = note.text == null ? "renote" : "quote";
 				return renoteMuted;

From e46cac02e3ab58f27690fcbf2f34969ce1d2a63a Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Fri, 5 May 2023 05:22:32 +0900
Subject: [PATCH 06/20] Fix missing return, typo

---
 packages/backend/src/misc/check-word-mute.ts   | 2 +-
 packages/client/src/scripts/check-word-mute.ts | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/backend/src/misc/check-word-mute.ts b/packages/backend/src/misc/check-word-mute.ts
index df5348b02c..950d1e3dd9 100644
--- a/packages/backend/src/misc/check-word-mute.ts
+++ b/packages/backend/src/misc/check-word-mute.ts
@@ -56,7 +56,7 @@ function checkWordMute(
 		}
 	}
 
-	return notMuted;
+	return NotMuted;
 }
 
 export async function getWordHardMute(
diff --git a/packages/client/src/scripts/check-word-mute.ts b/packages/client/src/scripts/check-word-mute.ts
index da44006392..c04bde9e67 100644
--- a/packages/client/src/scripts/check-word-mute.ts
+++ b/packages/client/src/scripts/check-word-mute.ts
@@ -47,6 +47,8 @@ function checkWordMute(
 			// This should never happen due to input sanitisation.
 		}
 	}
+
+	return NotMuted;
 }
 
 export function getWordSoftMute(

From ffea68ad8d8c35b445a5dfaab4eeebe276a5e001 Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Fri, 5 May 2023 05:26:59 +0900
Subject: [PATCH 07/20] I was confused

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

diff --git a/packages/backend/src/misc/check-word-mute.ts b/packages/backend/src/misc/check-word-mute.ts
index 950d1e3dd9..042dc1abbe 100644
--- a/packages/backend/src/misc/check-word-mute.ts
+++ b/packages/backend/src/misc/check-word-mute.ts
@@ -56,7 +56,7 @@ function checkWordMute(
 		}
 	}
 
-	return NotMuted;
+	return false;
 }
 
 export async function getWordHardMute(

From 711373521230d04517520906570ad161ef990b0d Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Fri, 5 May 2023 05:48:31 +0900
Subject: [PATCH 08/20] Use original (Misskey's) implementation for hard mutes
 as muted reason isn't needed

---
 packages/backend/src/misc/check-word-mute.ts | 39 ++++++++------------
 1 file changed, 15 insertions(+), 24 deletions(-)

diff --git a/packages/backend/src/misc/check-word-mute.ts b/packages/backend/src/misc/check-word-mute.ts
index 042dc1abbe..d28e446ccf 100644
--- a/packages/backend/src/misc/check-word-mute.ts
+++ b/packages/backend/src/misc/check-word-mute.ts
@@ -25,38 +25,29 @@ function checkWordMute(
 	const text = ((note.cw ?? "") + " " + (note.text ?? "")).trim();
 	if (text === "") return false;
 
-	for (const mutePattern of mutedWords) {
-		let mute: RE2;
-		let matched: string[];
-		if (Array.isArray(mutePattern)) {
-			matched = mutePattern.filter((keyword) => keyword !== "");
-
-			if (matched.length === 0) {
-				continue;
-			}
-			mute = new RE2(
-				`\\b${matched.map(escapeRegExp).join("\\b.*\\b")}\\b`,
-				"g",
-			);
+	const matched = mutedWords.some(filter => {
+		if (Array.isArray(filter)) {
+			return filter.every(keyword => text.includes(keyword));
 		} else {
-			const regexp = mutePattern.match(/^\/(.+)\/(.*)$/);
+			// represents RegExp
+			const regexp = filter.match(/^\/(.+)\/(.*)$/);
+
 			// This should never happen due to input sanitisation.
 			if (!regexp) {
 				console.warn(`Found invalid regex in word mutes: ${mutePattern}`);
-				continue;
+				return false;
 			}
-			mute = new RE2(regexp[1], regexp[2]);
-			matched = [mutePattern];
-		}
 
-		try {
-			if (mute.test(text)) return true;
-		} catch (err) {
-			// This should never happen due to input sanitisation.
+			try {
+				return new RE2(regexp[1], regexp[2]).test(text);
+			} catch (err) {
+				// This should never happen due to input sanitisation.
+				return false;
+			}
 		}
-	}
+	});
 
-	return false;
+	return matched;
 }
 
 export async function getWordHardMute(

From 3b3da4276383517f45ab3949f780fa5236115e11 Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Fri, 5 May 2023 06:16:23 +0900
Subject: [PATCH 09/20] clean up

---
 packages/backend/src/misc/check-word-mute.ts | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/packages/backend/src/misc/check-word-mute.ts b/packages/backend/src/misc/check-word-mute.ts
index d28e446ccf..5d0cd581fa 100644
--- a/packages/backend/src/misc/check-word-mute.ts
+++ b/packages/backend/src/misc/check-word-mute.ts
@@ -12,10 +12,6 @@ type UserLike = {
 	id: User["id"];
 };
 
-function escapeRegExp(x: string): string {
-	return x.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"); // $& means the whole matched string
-}
-
 function checkWordMute(
 	note: NoteLike,
 	mutedWords: Array<string | string[]>,
@@ -34,7 +30,7 @@ function checkWordMute(
 
 			// This should never happen due to input sanitisation.
 			if (!regexp) {
-				console.warn(`Found invalid regex in word mutes: ${mutePattern}`);
+				console.warn(`Found invalid regex in word mutes: ${filter}`);
 				return false;
 			}
 
@@ -63,8 +59,8 @@ export async function getWordHardMute(
 	if (mutedWords.length > 0) {
 		return (
 			checkWordMute(note, mutedWords) ||
-			checkWordMute(reply, mutedWords) ||
-			checkWordMute(renote, mutedWords)
+			checkWordMute(note.reply, mutedWords) ||
+			checkWordMute(note.renote, mutedWords)
 		);
 	}
 

From edf47d390bb5f463ad59e748e430fe448bbcd238 Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Fri, 5 May 2023 07:47:03 +0900
Subject: [PATCH 10/20] Fix channel bug

---
 packages/backend/src/misc/check-word-mute.ts               | 4 ++--
 packages/backend/src/server/api/stream/channels/channel.ts | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/backend/src/misc/check-word-mute.ts b/packages/backend/src/misc/check-word-mute.ts
index 5d0cd581fa..b1d2e1bffe 100644
--- a/packages/backend/src/misc/check-word-mute.ts
+++ b/packages/backend/src/misc/check-word-mute.ts
@@ -21,9 +21,9 @@ function checkWordMute(
 	const text = ((note.cw ?? "") + " " + (note.text ?? "")).trim();
 	if (text === "") return false;
 
-	const matched = mutedWords.some(filter => {
+	const matched = mutedWords.some((filter) => {
 		if (Array.isArray(filter)) {
-			return filter.every(keyword => text.includes(keyword));
+			return filter.every((keyword) => text.includes(keyword));
 		} else {
 			// represents RegExp
 			const regexp = filter.match(/^\/(.+)\/(.*)$/);
diff --git a/packages/backend/src/server/api/stream/channels/channel.ts b/packages/backend/src/server/api/stream/channels/channel.ts
index f5c5a170d9..a9608c2948 100644
--- a/packages/backend/src/server/api/stream/channels/channel.ts
+++ b/packages/backend/src/server/api/stream/channels/channel.ts
@@ -16,7 +16,7 @@ export default class extends Channel {
 
 	constructor(id: string, connection: Channel["connection"]) {
 		super(id, connection);
-		this.onNote = this.onNote.bind(this);
+		this.onNote = this.withPackedNote(this.onNote.bind(this));
 		this.emitTypers = this.emitTypers.bind(this);
 	}
 

From 8bfe67c031bdcbdce5aa4ec40ed41082d2c46723 Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Fri, 5 May 2023 08:14:16 +0900
Subject: [PATCH 11/20] Fix missing import

---
 packages/client/src/components/MkNoteSub.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/client/src/components/MkNoteSub.vue b/packages/client/src/components/MkNoteSub.vue
index 74ffcf8c86..89aca59e0f 100644
--- a/packages/client/src/components/MkNoteSub.vue
+++ b/packages/client/src/components/MkNoteSub.vue
@@ -196,6 +196,7 @@ import { getNoteMenu } from "@/scripts/get-note-menu";
 import { getWordSoftMute } from "@/scripts/check-word-mute";
 import { notePage } from "@/filters/note";
 import { useRouter } from "@/router";
+import { userPage } from "@/filters/user";
 import * as os from "@/os";
 import { reactionPicker } from "@/scripts/reaction-picker";
 import { $i } from "@/account";

From c713563a2e76560db54ce5efe32ce58f21d4c41c Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Fri, 5 May 2023 08:17:45 +0900
Subject: [PATCH 12/20] Boosts should be prioritized

---
 packages/client/src/scripts/check-word-mute.ts | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/client/src/scripts/check-word-mute.ts b/packages/client/src/scripts/check-word-mute.ts
index c04bde9e67..5ff7f24e1b 100644
--- a/packages/client/src/scripts/check-word-mute.ts
+++ b/packages/client/src/scripts/check-word-mute.ts
@@ -68,14 +68,6 @@ export function getWordSoftMute(
 			return noteMuted;
 		}
 
-		if (note.reply) {
-			let replyMuted = checkWordMute(note.reply, mutedWords);
-			if (replyMuted.muted) {
-				replyMuted.what = "reply";
-				return replyMuted;
-			}
-		}
-
 		if (note.renote) {
 			let renoteMuted = checkWordMute(note.renote, mutedWords);
 			if (renoteMuted.muted) {
@@ -83,6 +75,14 @@ export function getWordSoftMute(
 				return renoteMuted;
 			}
 		}
+
+		if (note.reply) {
+			let replyMuted = checkWordMute(note.reply, mutedWords);
+			if (replyMuted.muted) {
+				replyMuted.what = "reply";
+				return replyMuted;
+			}
+		}
 	}
 
 	return NotMuted;

From 1601676d5525fb484e35af2ca3ada99a8bb7866d Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Fri, 5 May 2023 09:46:47 +0900
Subject: [PATCH 13/20] Show the correct username

---
 packages/client/src/components/MkNote.vue     | 26 ++++++++++++++-----
 .../client/src/components/MkNoteDetailed.vue  | 26 ++++++++++++++-----
 packages/client/src/components/MkNoteSub.vue  | 26 ++++++++++++++-----
 3 files changed, 60 insertions(+), 18 deletions(-)

diff --git a/packages/client/src/components/MkNote.vue b/packages/client/src/components/MkNote.vue
index c1ab3bf7a3..20b3982db3 100644
--- a/packages/client/src/components/MkNote.vue
+++ b/packages/client/src/components/MkNote.vue
@@ -201,11 +201,27 @@
 		<I18n :src="softMuteReasonI18nSrc(muted.what)" tag="small">
 			<template #name>
 				<MkA
-					v-user-preview="appearNote.userId"
+					v-user-preview="
+						['renote', 'quote'].includes(muted.what)
+							? note.userId
+							: appearNote.userId
+					"
 					class="name"
-					:to="userPage(appearNote.user)"
+					:to="
+						userPage(
+							['renote', 'quote'].includes(muted.what)
+								? note.user
+								: appearNote.user
+						)
+					"
 				>
-					<MkUserName :user="appearNote.user" />
+					<MkUserName
+						:user="
+							['renote', 'quote'].includes(muted.what)
+								? note.user
+								: appearNote.user
+						"
+					/>
 				</MkA>
 			</template>
 			<template #reason>
@@ -301,9 +317,7 @@ let appearNote = $computed(() =>
 const isMyRenote = $i && $i.id === note.userId;
 const showContent = ref(false);
 const isDeleted = ref(false);
-const muted = ref(
-	getWordSoftMute(appearNote, $i, defaultStore.state.mutedWords)
-);
+const muted = ref(getWordSoftMute(note, $i, defaultStore.state.mutedWords));
 const translation = ref(null);
 const translating = ref(false);
 const enableEmojiReactions = defaultStore.state.enableEmojiReactions;
diff --git a/packages/client/src/components/MkNoteDetailed.vue b/packages/client/src/components/MkNoteDetailed.vue
index 84dc4c083c..1618300930 100644
--- a/packages/client/src/components/MkNoteDetailed.vue
+++ b/packages/client/src/components/MkNoteDetailed.vue
@@ -42,11 +42,27 @@
 		<I18n :src="softMuteReasonI18nSrc(muted.what)" tag="small">
 			<template #name>
 				<MkA
-					v-user-preview="appearNote.userId"
+					v-user-preview="
+						['renote', 'quote'].includes(muted.what)
+							? note.userId
+							: appearNote.userId
+					"
 					class="name"
-					:to="userPage(appearNote.user)"
+					:to="
+						userPage(
+							['renote', 'quote'].includes(muted.what)
+								? note.user
+								: appearNote.user
+						)
+					"
 				>
-					<MkUserName :user="appearNote.user" />
+					<MkUserName
+						:user="
+							['renote', 'quote'].includes(muted.what)
+								? note.user
+								: appearNote.user
+						"
+					/>
 				</MkA>
 			</template>
 			<template #reason>
@@ -152,9 +168,7 @@ let appearNote = $computed(() =>
 const isMyRenote = $i && $i.id === note.userId;
 const showContent = ref(false);
 const isDeleted = ref(false);
-const muted = ref(
-	getWordSoftMute(appearNote, $i, defaultStore.state.mutedWords)
-);
+const muted = ref(getWordSoftMute(note, $i, defaultStore.state.mutedWords));
 const translation = ref(null);
 const translating = ref(false);
 const urls = appearNote.text
diff --git a/packages/client/src/components/MkNoteSub.vue b/packages/client/src/components/MkNoteSub.vue
index 89aca59e0f..29416f378a 100644
--- a/packages/client/src/components/MkNoteSub.vue
+++ b/packages/client/src/components/MkNoteSub.vue
@@ -166,11 +166,27 @@
 		<I18n :src="softMuteReasonI18nSrc(muted.what)" tag="small">
 			<template #name>
 				<MkA
-					v-user-preview="appearNote.userId"
+					v-user-preview="
+						['renote', 'quote'].includes(muted.what)
+							? note.userId
+							: appearNote.userId
+					"
 					class="name"
-					:to="userPage(appearNote.user)"
+					:to="
+						userPage(
+							['renote', 'quote'].includes(muted.what)
+								? note.user
+								: appearNote.user
+						)
+					"
 				>
-					<MkUserName :user="appearNote.user" />
+					<MkUserName
+						:user="
+							['renote', 'quote'].includes(muted.what)
+								? note.user
+								: appearNote.user
+						"
+					/>
 				</MkA>
 			</template>
 			<template #reason>
@@ -252,9 +268,7 @@ let appearNote = $computed(() =>
 	isRenote ? (note.renote as misskey.entities.Note) : note
 );
 const isDeleted = ref(false);
-const muted = ref(
-	getWordSoftMute(appearNote, $i, defaultStore.state.mutedWords)
-);
+const muted = ref(getWordSoftMute(note, $i, defaultStore.state.mutedWords));
 const translation = ref(null);
 const translating = ref(false);
 const replies: misskey.entities.Note[] =

From d1ab75beedee55d619c5c396cd46cbae698d580e Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Fri, 5 May 2023 10:38:56 +0900
Subject: [PATCH 14/20] Fix dirty duplicated code

---
 packages/client/src/components/MkNote.vue     | 22 +++----------------
 .../client/src/components/MkNoteDetailed.vue  | 22 +++----------------
 packages/client/src/components/MkNoteSub.vue  | 22 +++----------------
 3 files changed, 9 insertions(+), 57 deletions(-)

diff --git a/packages/client/src/components/MkNote.vue b/packages/client/src/components/MkNote.vue
index 20b3982db3..08bd27fc00 100644
--- a/packages/client/src/components/MkNote.vue
+++ b/packages/client/src/components/MkNote.vue
@@ -201,27 +201,11 @@
 		<I18n :src="softMuteReasonI18nSrc(muted.what)" tag="small">
 			<template #name>
 				<MkA
-					v-user-preview="
-						['renote', 'quote'].includes(muted.what)
-							? note.userId
-							: appearNote.userId
-					"
+					v-user-preview="note.userId"
 					class="name"
-					:to="
-						userPage(
-							['renote', 'quote'].includes(muted.what)
-								? note.user
-								: appearNote.user
-						)
-					"
+					:to="userPage(note.user)"
 				>
-					<MkUserName
-						:user="
-							['renote', 'quote'].includes(muted.what)
-								? note.user
-								: appearNote.user
-						"
-					/>
+					<MkUserName :user="note.user" />
 				</MkA>
 			</template>
 			<template #reason>
diff --git a/packages/client/src/components/MkNoteDetailed.vue b/packages/client/src/components/MkNoteDetailed.vue
index 1618300930..69799adb6c 100644
--- a/packages/client/src/components/MkNoteDetailed.vue
+++ b/packages/client/src/components/MkNoteDetailed.vue
@@ -42,27 +42,11 @@
 		<I18n :src="softMuteReasonI18nSrc(muted.what)" tag="small">
 			<template #name>
 				<MkA
-					v-user-preview="
-						['renote', 'quote'].includes(muted.what)
-							? note.userId
-							: appearNote.userId
-					"
+					v-user-preview="note.userId"
 					class="name"
-					:to="
-						userPage(
-							['renote', 'quote'].includes(muted.what)
-								? note.user
-								: appearNote.user
-						)
-					"
+					:to="userPage(note.user)"
 				>
-					<MkUserName
-						:user="
-							['renote', 'quote'].includes(muted.what)
-								? note.user
-								: appearNote.user
-						"
-					/>
+					<MkUserName :user="note.user" />
 				</MkA>
 			</template>
 			<template #reason>
diff --git a/packages/client/src/components/MkNoteSub.vue b/packages/client/src/components/MkNoteSub.vue
index 29416f378a..9a239f94e3 100644
--- a/packages/client/src/components/MkNoteSub.vue
+++ b/packages/client/src/components/MkNoteSub.vue
@@ -166,27 +166,11 @@
 		<I18n :src="softMuteReasonI18nSrc(muted.what)" tag="small">
 			<template #name>
 				<MkA
-					v-user-preview="
-						['renote', 'quote'].includes(muted.what)
-							? note.userId
-							: appearNote.userId
-					"
+					v-user-preview="note.userId"
 					class="name"
-					:to="
-						userPage(
-							['renote', 'quote'].includes(muted.what)
-								? note.user
-								: appearNote.user
-						)
-					"
+					:to="userPage(note.user)"
 				>
-					<MkUserName
-						:user="
-							['renote', 'quote'].includes(muted.what)
-								? note.user
-								: appearNote.user
-						"
-					/>
+					<MkUserName :user="note.user" />
 				</MkA>
 			</template>
 			<template #reason>

From ba1e96a020b4298916ab9af9c4f80c9cb57e33d7 Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Fri, 5 May 2023 12:23:44 +0900
Subject: [PATCH 15/20] Fix non-ASCII word soft mutes

---
 .../client/src/scripts/check-word-mute.ts     | 45 ++++++++++---------
 1 file changed, 23 insertions(+), 22 deletions(-)

diff --git a/packages/client/src/scripts/check-word-mute.ts b/packages/client/src/scripts/check-word-mute.ts
index 5ff7f24e1b..3237a2c875 100644
--- a/packages/client/src/scripts/check-word-mute.ts
+++ b/packages/client/src/scripts/check-word-mute.ts
@@ -6,10 +6,6 @@ export type Muted = {
 
 const NotMuted = { muted: false, matched: [] };
 
-function escapeRegExp(x: string) {
-	return x.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"); // $& means the whole matched string
-}
-
 function checkWordMute(
 	note: NoteLike,
 	mutedWords: Array<string | string[]>,
@@ -17,38 +13,43 @@ function checkWordMute(
 	const text = ((note.cw ?? "") + " " + (note.text ?? "")).trim();
 	if (text === "") return NotMuted;
 
+	let result = { muted: false, matched: [] };
+
 	for (const mutePattern of mutedWords) {
-		let mute: RegExp;
-		let matched: string[];
 		if (Array.isArray(mutePattern)) {
-			matched = mutePattern.filter((keyword) => keyword !== "");
-			if (matched.length === 0) {
-				continue;
+			// Clean up
+			const keywords = mutePattern.filter((keyword) => keyword !== "");
+
+			if (
+				keywords.length > 0 &&
+				keywords.every((keyword) => text.includes(keyword))
+			) {
+				result.muted = true;
+				result.matched.push(...keywords);
 			}
-			mute = new RegExp(
-				`\\b${matched.map(escapeRegExp).join("\\b.*\\b")}\\b`,
-				"g",
-			);
 		} else {
+			// represents RegExp
 			const regexp = mutePattern.match(/^\/(.+)\/(.*)$/);
+
 			// This should never happen due to input sanitisation.
 			if (!regexp) {
 				console.warn(`Found invalid regex in word mutes: ${mutePattern}`);
 				continue;
 			}
-			mute = new RegExp(regexp[1], regexp[2]);
-			matched = [mutePattern];
-		}
-		try {
-			if (mute.test(text)) {
-				return { muted: true, matched };
+
+			try {
+				if (new RegExp(regexp[1], regexp[2]).test(text)) {
+					result.muted = true;
+					result.matched.push(mutePattern);
+				}
+			} catch (err) {
+				// This should never happen due to input sanitisation.
 			}
-		} catch (err) {
-			// This should never happen due to input sanitisation.
 		}
 	}
 
-	return NotMuted;
+	result.matched = [...new Set(result.matched)];
+	return result;
 }
 
 export function getWordSoftMute(

From 95f04a1c3cc03f3efac261920164de2a85ecfcd1 Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Fri, 5 May 2023 12:36:17 +0900
Subject: [PATCH 16/20] Fix regex hard mutes

---
 packages/backend/src/misc/check-word-mute.ts | 26 ++++++++++++--------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/packages/backend/src/misc/check-word-mute.ts b/packages/backend/src/misc/check-word-mute.ts
index b1d2e1bffe..c561c7e0fb 100644
--- a/packages/backend/src/misc/check-word-mute.ts
+++ b/packages/backend/src/misc/check-word-mute.ts
@@ -21,29 +21,35 @@ function checkWordMute(
 	const text = ((note.cw ?? "") + " " + (note.text ?? "")).trim();
 	if (text === "") return false;
 
-	const matched = mutedWords.some((filter) => {
-		if (Array.isArray(filter)) {
-			return filter.every((keyword) => text.includes(keyword));
+	for (const mutePattern of mutedWords) {
+		if (Array.isArray(mutePattern)) {
+			// Clean up
+			const keywords = mutePattern.filter((keyword) => keyword !== "");
+
+			if (
+				keywords.length > 0 &&
+				keywords.every((keyword) => text.includes(keyword))
+			)
+				return true;
 		} else {
 			// represents RegExp
-			const regexp = filter.match(/^\/(.+)\/(.*)$/);
+			const regexp = mutePattern.match(/^\/(.+)\/(.*)$/);
 
 			// This should never happen due to input sanitisation.
 			if (!regexp) {
-				console.warn(`Found invalid regex in word mutes: ${filter}`);
-				return false;
+				console.warn(`Found invalid regex in word mutes: ${mutePattern}`);
+				continue;
 			}
 
 			try {
-				return new RE2(regexp[1], regexp[2]).test(text);
+				if (new RegExp(regexp[1], regexp[2]).test(text)) return true;
 			} catch (err) {
 				// This should never happen due to input sanitisation.
-				return false;
 			}
 		}
-	});
+	}
 
-	return matched;
+	return false;
 }
 
 export async function getWordHardMute(

From 86dc71b201dded1c9d791838ecda7fcdd0a41268 Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Fri, 5 May 2023 12:49:34 +0900
Subject: [PATCH 17/20] oops

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

diff --git a/packages/backend/src/misc/check-word-mute.ts b/packages/backend/src/misc/check-word-mute.ts
index c561c7e0fb..8874a4a051 100644
--- a/packages/backend/src/misc/check-word-mute.ts
+++ b/packages/backend/src/misc/check-word-mute.ts
@@ -42,7 +42,7 @@ function checkWordMute(
 			}
 
 			try {
-				if (new RegExp(regexp[1], regexp[2]).test(text)) return true;
+				if (new RE2(regexp[1], regexp[2]).test(text)) return true;
 			} catch (err) {
 				// This should never happen due to input sanitisation.
 			}

From 52f521941c5153a5f4bcde9eb60314462040677b Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Fri, 5 May 2023 15:32:47 +0900
Subject: [PATCH 18/20] I believe I finally solved the boost hard mute issue
 (took 3 hours)

---
 packages/backend/src/services/note/create.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/backend/src/services/note/create.ts b/packages/backend/src/services/note/create.ts
index ece1c96088..f2ccdca226 100644
--- a/packages/backend/src/services/note/create.ts
+++ b/packages/backend/src/services/note/create.ts
@@ -355,7 +355,7 @@ export default async (
 			)
 			.then((us) => {
 				for (const u of us) {
-					getWordHardMute(note, { id: u.userId }, u.mutedWords).then(
+					getWordHardMute(data, { id: u.userId }, u.mutedWords).then(
 						(shouldMute) => {
 							if (shouldMute) {
 								MutedNotes.insert({

From db273318b895820a8b418acba55b985cb16812ed Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Fri, 5 May 2023 16:58:42 +0900
Subject: [PATCH 19/20] Remove the code snippets which didn't work

---
 packages/backend/src/server/api/stream/channels/antenna.ts | 7 -------
 packages/backend/src/server/api/stream/channels/channel.ts | 7 -------
 .../backend/src/server/api/stream/channels/user-list.ts    | 7 -------
 3 files changed, 21 deletions(-)

diff --git a/packages/backend/src/server/api/stream/channels/antenna.ts b/packages/backend/src/server/api/stream/channels/antenna.ts
index e110c852b7..050a8d1019 100644
--- a/packages/backend/src/server/api/stream/channels/antenna.ts
+++ b/packages/backend/src/server/api/stream/channels/antenna.ts
@@ -1,7 +1,6 @@
 import Channel from "../channel.js";
 import { Notes } from "@/models/index.js";
 import { isUserRelated } from "@/misc/is-user-related.js";
-import { getWordHardMute } from "@/misc/check-word-mute.js";
 import type { StreamMessages } from "../types.js";
 import { IdentifiableError } from "@/misc/identifiable-error.js";
 
@@ -38,12 +37,6 @@ export default class extends Channel {
 				if (note.renote && !note.text && isUserRelated(note, this.renoteMuting))
 					return;
 
-				if (
-					this.userProfile &&
-					(await getWordHardMute(note, this.user, this.userProfile.mutedWords))
-				)
-					return;
-
 				this.connection.cacheNote(note);
 
 				this.send("note", note);
diff --git a/packages/backend/src/server/api/stream/channels/channel.ts b/packages/backend/src/server/api/stream/channels/channel.ts
index a9608c2948..dc291c5153 100644
--- a/packages/backend/src/server/api/stream/channels/channel.ts
+++ b/packages/backend/src/server/api/stream/channels/channel.ts
@@ -1,7 +1,6 @@
 import Channel from "../channel.js";
 import { Users } from "@/models/index.js";
 import { isUserRelated } from "@/misc/is-user-related.js";
-import { getWordHardMute } from "@/misc/check-word-mute.js";
 import type { User } from "@/models/entities/user.js";
 import type { StreamMessages } from "../types.js";
 import type { Packed } from "@/misc/schema.js";
@@ -40,12 +39,6 @@ export default class extends Channel {
 		if (note.renote && !note.text && isUserRelated(note, this.renoteMuting))
 			return;
 
-		if (
-			this.userProfile &&
-			(await getWordHardMute(note, this.user, this.userProfile.mutedWords))
-		)
-			return;
-
 		this.connection.cacheNote(note);
 
 		this.send("note", note);
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 c9b658c5c7..105c45955c 100644
--- a/packages/backend/src/server/api/stream/channels/user-list.ts
+++ b/packages/backend/src/server/api/stream/channels/user-list.ts
@@ -2,7 +2,6 @@ import Channel from "../channel.js";
 import { UserListJoinings, UserLists } from "@/models/index.js";
 import type { User } from "@/models/entities/user.js";
 import { isUserRelated } from "@/misc/is-user-related.js";
-import { getWordHardMute } from "@/misc/check-word-mute.js";
 import type { Packed } from "@/misc/schema.js";
 
 export default class extends Channel {
@@ -60,12 +59,6 @@ export default class extends Channel {
 		if (note.renote && !note.text && isUserRelated(note, this.renoteMuting))
 			return;
 
-		if (
-			this.userProfile &&
-			(await getWordHardMute(note, this.user, this.userProfile.mutedWords))
-		)
-			return;
-
 		this.send("note", note);
 	}
 

From e253fc11d08b066b4e6cd89d45f16791e0021c0c Mon Sep 17 00:00:00 2001
From: jolupa <jolupameister@gmail.com>
Date: Fri, 5 May 2023 17:40:02 +0000
Subject: [PATCH 20/20] chore: Translated using Weblate (Catalan)

Currently translated at 100.0% (1744 of 1744 strings)

Translation: Calckey/locales
Translate-URL: https://hosted.weblate.org/projects/calckey/locales/ca/
---
 locales/ca-ES.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/locales/ca-ES.yml b/locales/ca-ES.yml
index eed5653ded..b6f890d35c 100644
--- a/locales/ca-ES.yml
+++ b/locales/ca-ES.yml
@@ -1311,7 +1311,7 @@ switchAccount: Canvia de compte
 enabled: Activat
 configure: Configurar
 noBotProtectionWarning: La protecció contra bots no està configurada.
-ads: Anuncis
+ads: Publicitat
 ratio: Ràtio
 global: Global
 sent: Enviat
@@ -1710,7 +1710,7 @@ sendPushNotificationReadMessage: Suprimeix les notificacions push un cop s'hagin
 sendPushNotificationReadMessageCaption: Es mostrarà una notificació amb el text "{emptyPushNotificationMessage}"
   durant un breu temps. Això pot augmentar l'ús de la bateria del vostre dispositiu,
   si escau.
-showAds: Mostrar anuncis
+showAds: Mostrar publicitat
 enterSendsMessage: Pren retorn al formulari del missatge per enviar (quant no s'activa
   es Ctrl + Return)
 customMOTD: MOTD personalitzat (missatges de la pantalla de benvinguda)