natty
/
calckey
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use original (Misskey's) implementation for hard mutes as muted reason isn't needed

This commit is contained in:
naskya 2023-05-05 05:48:31 +09:00
parent ffea68ad8d
commit 7113735212
No known key found for this signature in database
GPG Key ID: 164DFF24E2D40139
1 changed files with 15 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
packages/backend/src/misc/check-word-mute.ts
View File

@ -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(