fix: consider hard mutes in antennas

This commit is contained in:
naskya 2023-10-17 07:34:19 +09:00
parent 93769b79b1
commit ae637ec85b
No known key found for this signature in database
GPG key ID: 164DFF24E2D40139
2 changed files with 18 additions and 8 deletions

View file

@ -1,11 +1,12 @@
import type { Antenna } from "@/models/entities/antenna.js";
import type { Note } from "@/models/entities/note.js";
import type { User } from "@/models/entities/user.js";
import { Blockings } from "@/models/index.js";
import { Blockings, UserProfiles } from "@/models/index.js";
import { getFullApAccount } from "./convert-host.js";
import * as Acct from "@/misc/acct.js";
import type { Packed } from "./schema.js";
import { Cache } from "./cache.js";
import { getWordHardMute } from "./check-word-mute.js";
const blockingCache = new Cache<User["id"][]>("blocking", 60 * 5);
@ -16,6 +17,10 @@ export async function checkHitAntenna(
): Promise<boolean> {
if (note.visibility === "specified") return false;
if (note.visibility === "home") return false;
if (!antenna.withReplies && note.replyId != null) return false;
if (antenna.withFile) {
if (note.fileIds && note.fileIds.length === 0) return false;
}
// アンテナ作成者がノート作成者にブロックされていたらスキップ
const blockings = await blockingCache.fetch(noteUser.id, () =>
@ -25,8 +30,6 @@ export async function checkHitAntenna(
);
if (blockings.some((blocking) => blocking === antenna.userId)) return false;
if (!antenna.withReplies && note.replyId != null) return false;
if (antenna.src === "users") {
const accts = antenna.users.map((x) => {
const { username, host } = Acct.parse(x);
@ -85,9 +88,16 @@ export async function checkHitAntenna(
if (matched) return false;
}
if (antenna.withFile) {
if (note.fileIds && note.fileIds.length === 0) return false;
}
if (
await getWordHardMute(
note,
antenna.userId,
(
await UserProfiles.findOneBy({ userId: antenna.userId })
)?.mutedWords,
)
)
return false;
// TODO: eval expression

View file

@ -57,9 +57,9 @@ function checkWordMute(
export async function getWordHardMute(
note: NoteLike,
meId: string | null | undefined,
mutedWords: Array<string | string[]>,
mutedWords?: Array<string | string[]>,
): Promise<boolean> {
if (note.userId === meId) return false;
if (note.userId === meId || mutedWords == null) return false;
if (mutedWords.length > 0) {
return (