Merge branch 'fix/word-mutes' of https://codeberg.org/naskya/calckey into fix/word-mutes

This commit is contained in:
naskya 2023-05-05 09:47:17 +09:00
commit 1baf760c4c
No known key found for this signature in database
GPG key ID: 164DFF24E2D40139

View file

@ -68,14 +68,6 @@ export function getWordSoftMute(
return noteMuted;
}
if (note.reply) {
let replyMuted = checkWordMute(note.reply, mutedWords);
if (replyMuted.muted) {
replyMuted.what = "reply";
return replyMuted;
}
}
if (note.renote) {
let renoteMuted = checkWordMute(note.renote, mutedWords);
if (renoteMuted.muted) {
@ -83,6 +75,14 @@ export function getWordSoftMute(
return renoteMuted;
}
}
if (note.reply) {
let replyMuted = checkWordMute(note.reply, mutedWords);
if (replyMuted.muted) {
replyMuted.what = "reply";
return replyMuted;
}
}
}
return NotMuted;