diff options
| author | taichan <40626578+tai-cha@users.noreply.github.com> | 2025-02-01 13:48:18 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-02-01 04:48:18 +0000 |
| commit | 28490f3a5892ee7ca7587be579e83829689d34ce (patch) | |
| tree | e30e5fb1030ccec3984c9aaba9782f2c8c06c6b1 | |
| parent | refactor(frontend): definePropsを別途インポートしている箇所を... (diff) | |
| download | misskey-28490f3a5892ee7ca7587be579e83829689d34ce.tar.gz misskey-28490f3a5892ee7ca7587be579e83829689d34ce.tar.bz2 misskey-28490f3a5892ee7ca7587be579e83829689d34ce.zip | |
Fix(frontend): ワードミュートがnullの時にもセンシティブミュートが行われるように (#15364)
* Fix(frontend): ワードミュートがnullの時にもセンシティブミュートが行われるように
* Add ChangeLog
| -rw-r--r-- | CHANGELOG.md | 2 | ||||
| -rw-r--r-- | packages/frontend/src/components/MkNote.vue | 16 |
2 files changed, 9 insertions, 9 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 08dec985af..07f392782f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ - ### Client -- +- Fix: 一部環境でセンシティブなファイルを含むノートの非表示が効かない問題 ### Server - Fix: 個別お知らせページのmetaタグ出力の条件が間違っていたのを修正 diff --git a/packages/frontend/src/components/MkNote.vue b/packages/frontend/src/components/MkNote.vue index 52d0485743..a23ff9b48e 100644 --- a/packages/frontend/src/components/MkNote.vue +++ b/packages/frontend/src/components/MkNote.vue @@ -304,16 +304,16 @@ function checkMute(noteToCheck: Misskey.entities.Note, mutedWords: Array<string function checkMute(noteToCheck: Misskey.entities.Note, mutedWords: Array<string | string[]> | undefined | null, checkOnly: false): Array<string | string[]> | false | 'sensitiveMute'; */ function checkMute(noteToCheck: Misskey.entities.Note, mutedWords: Array<string | string[]> | undefined | null, checkOnly = false): Array<string | string[]> | false | 'sensitiveMute' { - if (mutedWords == null) return false; + if (mutedWords != null) { + const result = checkWordMute(noteToCheck, $i, mutedWords); + if (Array.isArray(result)) return result; - const result = checkWordMute(noteToCheck, $i, mutedWords); - if (Array.isArray(result)) return result; + const replyResult = noteToCheck.reply && checkWordMute(noteToCheck.reply, $i, mutedWords); + if (Array.isArray(replyResult)) return replyResult; - const replyResult = noteToCheck.reply && checkWordMute(noteToCheck.reply, $i, mutedWords); - if (Array.isArray(replyResult)) return replyResult; - - const renoteResult = noteToCheck.renote && checkWordMute(noteToCheck.renote, $i, mutedWords); - if (Array.isArray(renoteResult)) return renoteResult; + const renoteResult = noteToCheck.renote && checkWordMute(noteToCheck.renote, $i, mutedWords); + if (Array.isArray(renoteResult)) return renoteResult; + } if (checkOnly) return false; |