Refactor hard word mutes

This commit is contained in:
naskya 2023-05-04 13:17:37 +09:00
parent bf262b972f
commit 075e5a1c7a
No known key found for this signature in database
GPG Key ID: 164DFF24E2D40139
10 changed files with 72 additions and 55 deletions

View File

@ -12,33 +12,15 @@ 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
}
export async function getWordMute(
note: NoteLike,
me: UserLike | null | undefined,
mutedWords: Array<string | string[]>,
): Promise<Muted> {
// 自分自身
if (me && note.userId === me.id) {
return NotMuted;
}
function checkWordMute(note: NoteLike): boolean {
if (note == null) return false;
if (mutedWords.length > 0) {
const text = ((note.cw ?? "") + "\n" + (note.text ?? "")).trim();
if (text === "") {
return NotMuted;
}
const text = ((note.cw ?? "") + " " + (note.text ?? "")).trim();
if (text === "") return false;
for (const mutePattern of mutedWords) {
let mute: RE2;
@ -65,14 +47,28 @@ export async function getWordMute(
}
try {
if (mute.test(text)) {
return { muted: true, matched };
}
if (mute.test(text)) return true;
} catch (err) {
// This should never happen due to input sanitisation.
}
}
return notMuted;
}
return NotMuted;
export async function getWordMute(
note: NoteLike,
me: UserLike | null | undefined,
mutedWords: Array<string | string[]>,
): Promise<boolean> {
// 自分自身
if (me && note.userId === me.id) {
return false;
}
if (mutedWords.length > 0) {
return checkWordMute(note) || checkWordMute(reply) || checkWordMute(renote)
}
return false;
}

View File

@ -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);

View File

@ -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);

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -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);
}

View File

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