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

Fix regex hard mutes

This commit is contained in:
naskya 2023-05-05 12:36:17 +09:00
parent ba1e96a020
commit 95f04a1c3c
No known key found for this signature in database
GPG Key ID: 164DFF24E2D40139
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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