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

Merge pull request 'fix: TypeError in word mutes' (#10168) from naskya/calckey:fix/alt-text-mutes-undefined into develop 

Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10168
This commit is contained in:
Kainoa Kanter 2023-05-20 23:41:47 +00:00
parent 3146749a30 813fb25d72
commit 7dfb4ff3d4
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,7 +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"]; files?: Note["files"];
cw?: Note["cw"]; cw?: Note["cw"];
}; };
@ -19,9 +19,11 @@ function checkWordMute(
): boolean { ): boolean {
if (note == null) return false; if (note == null) return false;
const text = `${note.cw ?? ""} ${note.text ?? ""} ${note.files let text = `${note.cw ?? ""} ${note.text ?? ""}`;
.map((f) => f.comment ?? "") if (note.files != null)
.join(" ")}`.trim(); text += ` ${note.files.map((f) => f.comment ?? "").join(" ")}`;
text = text.trim();
if (text === "") return false; if (text === "") return false;
for (const mutePattern of mutedWords) { for (const mutePattern of mutedWords) {

8
packages/client/src/scripts/check-word-mute.ts
View File

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