HoovesSocial/hippofish
2
0
Fork 0
Code Issues 3 Pull requests 1 Projects Releases Packages Wiki Activity Actions

Merge pull request 'fix: check alt text on word mutes' (#10149) from naskya/calckey:fix/alt-text-mutes into develop

Browse source 
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10149
This commit is contained in:
Kainoa Kanter 2023-05-18 15:08:38 +00:00
commit b5b8a7c7ef
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
packages/backend/src/misc/check-word-mute.ts
View file

@ -5,6 +5,7 @@ import type { User } from "@/models/entities/user.js";
type NoteLike = { type NoteLike = {
userId: Note["userId"]; userId: Note["userId"];
text: Note["text"]; text: Note["text"];
files: Note["files"];
cw?: Note["cw"]; cw?: Note["cw"];
}; };
@ -18,7 +19,9 @@ function checkWordMute(
): boolean { ): boolean {
if (note == null) return false; if (note == null) return false;
const text = ((note.cw ?? "") + " " + (note.text ?? "")).trim(); const text = `${note.cw ?? ""} ${note.text ?? ""} ${note.files
.map((f) => f.comment ?? "")
.join(" ")}`.trim();
if (text === "") return false; if (text === "") return false;
for (const mutePattern of mutedWords) { for (const mutePattern of mutedWords) {

4
packages/client/src/scripts/check-word-mute.ts
View file

@ -10,7 +10,9 @@ function checkWordMute(
note: NoteLike, note: NoteLike,
mutedWords: Array<string | string[]>, mutedWords: Array<string | string[]>,
): Muted { ): Muted {
const text = ((note.cw ?? "") + " " + (note.text ?? "")).trim(); const text = `${note.cw ?? ""} ${note.text ?? ""} ${note.files
.map((f) => f.comment ?? "")
.join(" ")}`.trim();
if (text === "") return NotMuted; if (text === "") return NotMuted;
let result = { muted: false, matched: [] }; let result = { muted: false, matched: [] };