diff --git a/packages/backend/src/misc/check-word-mute.ts b/packages/backend/src/misc/check-word-mute.ts index 8874a4a05..08ec97751 100644 --- a/packages/backend/src/misc/check-word-mute.ts +++ b/packages/backend/src/misc/check-word-mute.ts @@ -5,6 +5,7 @@ import type { User } from "@/models/entities/user.js"; type NoteLike = { userId: Note["userId"]; text: Note["text"]; + files: Note["files"]; cw?: Note["cw"]; }; @@ -18,7 +19,7 @@ function checkWordMute( ): boolean { if (note == null) return false; - const text = ((note.cw ?? "") + " " + (note.text ?? "")).trim(); + const text = `${note.cw ?? ""} ${note.text ?? ""} ${note.files.map((f) => f.comment ?? "").join(" ")}`.trim(); if (text === "") return false; for (const mutePattern of mutedWords) { diff --git a/packages/client/src/scripts/check-word-mute.ts b/packages/client/src/scripts/check-word-mute.ts index 3237a2c87..de0414a36 100644 --- a/packages/client/src/scripts/check-word-mute.ts +++ b/packages/client/src/scripts/check-word-mute.ts @@ -10,7 +10,7 @@ function checkWordMute( note: NoteLike, mutedWords: Array, ): Muted { - const text = ((note.cw ?? "") + " " + (note.text ?? "")).trim(); + const text = `${note.cw ?? ""} ${note.text ?? ""} ${note.files.map((f) => f.comment ?? "").join(" ")}`.trim(); if (text === "") return NotMuted; let result = { muted: false, matched: [] };