mirror of
https://codeberg.org/yeentown/barkey
synced 2024-12-02 04:07:26 +00:00
revert refactor and cleanup
This commit is contained in:
parent
26f8919432
commit
cf317da244
1 changed files with 26 additions and 25 deletions
|
@ -5,41 +5,42 @@
|
||||||
|
|
||||||
import type { Note, MeDetailed } from "misskey-js/entities.js";
|
import type { Note, MeDetailed } from "misskey-js/entities.js";
|
||||||
|
|
||||||
// TODO: this implementation is horribly inefficient.
|
|
||||||
// Each regex is validated (using a regex, ironically), transformed, and then parsed - for each note being checked.
|
|
||||||
// These regex objects should be cached somewhere.
|
|
||||||
|
|
||||||
export function checkWordMute(note: Note, me: MeDetailed | null | undefined, mutedWords: Array<string | string[]>): boolean {
|
export function checkWordMute(note: Note, me: MeDetailed | null | undefined, mutedWords: Array<string | string[]>): boolean {
|
||||||
// 自分自身
|
// 自分自身
|
||||||
if (me && (note.userId === me.id)) return false;
|
if (me && (note.userId === me.id)) return false;
|
||||||
|
|
||||||
if (mutedWords.length < 1) return false;
|
if (mutedWords.length > 0) {
|
||||||
|
const text = getNoteText(note);
|
||||||
|
|
||||||
const text = getNoteText(note);
|
if (text === '') return false;
|
||||||
if (text === '') return false;
|
|
||||||
|
|
||||||
return mutedWords.some(filter => {
|
const matched = mutedWords.some(filter => {
|
||||||
if (Array.isArray(filter)) {
|
if (Array.isArray(filter)) {
|
||||||
// Clean up
|
// Clean up
|
||||||
const filteredFilter = filter.filter(keyword => keyword !== '');
|
const filteredFilter = filter.filter(keyword => keyword !== '');
|
||||||
if (filteredFilter.length === 0) return false;
|
if (filteredFilter.length === 0) return false;
|
||||||
|
|
||||||
return filteredFilter.every(keyword => text.includes(keyword));
|
return filteredFilter.every(keyword => text.includes(keyword));
|
||||||
} else {
|
} else {
|
||||||
// represents RegExp
|
// represents RegExp
|
||||||
const regexp = filter.match(/^\/(.+)\/(.*)$/);
|
const regexp = filter.match(/^\/(.+)\/(.*)$/);
|
||||||
|
|
||||||
// This should never happen due to input sanitisation.
|
|
||||||
if (!regexp) return false;
|
|
||||||
|
|
||||||
try {
|
|
||||||
return new RegExp(regexp[1], regexp[2]).test(text);
|
|
||||||
} catch (err) {
|
|
||||||
// This should never happen due to input sanitisation.
|
// This should never happen due to input sanitisation.
|
||||||
return false;
|
if (!regexp) return false;
|
||||||
|
|
||||||
|
try {
|
||||||
|
return new RegExp(regexp[1], regexp[2]).test(text);
|
||||||
|
} catch (err) {
|
||||||
|
// This should never happen due to input sanitisation.
|
||||||
|
return false;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
});
|
||||||
});
|
|
||||||
|
if (matched) return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
function getNoteText(note: Note): string {
|
function getNoteText(note: Note): string {
|
||||||
|
|
Loading…
Reference in a new issue