diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2019-05-05 20:33:44 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2019-05-05 20:33:44 +0900 |
| commit | 1092532292bb07c49102db5529c2035de1c36078 (patch) | |
| tree | c6c5855ccd42c6cfb3c429544d6490e7457c7dcf /src/client/app/common/scripts | |
| parent | Merge branch 'develop' (diff) | |
| parent | 11.11.0 (diff) | |
| download | misskey-1092532292bb07c49102db5529c2035de1c36078.tar.gz misskey-1092532292bb07c49102db5529c2035de1c36078.tar.bz2 misskey-1092532292bb07c49102db5529c2035de1c36078.zip | |
Merge branch 'develop'
Diffstat (limited to 'src/client/app/common/scripts')
| -rw-r--r-- | src/client/app/common/scripts/should-mute-note.ts | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/client/app/common/scripts/should-mute-note.ts b/src/client/app/common/scripts/should-mute-note.ts index c5f1898942..8fd7888628 100644 --- a/src/client/app/common/scripts/should-mute-note.ts +++ b/src/client/app/common/scripts/should-mute-note.ts @@ -11,9 +11,9 @@ export default function(me, settings, note) { return ( (!isMyNote && note.reply && includesMutedWords(note.reply.text)) || (!isMyNote && note.renote && includesMutedWords(note.renote.text)) || - (settings.showMyRenotes === false && isMyNote && isPureRenote) || - (settings.showRenotedMyNotes === false && isPureRenote && note.renote.userId == me.id) || - (settings.showLocalRenotes === false && isPureRenote && note.renote.user.host == null) || + (!settings.showMyRenotes && isMyNote && isPureRenote) || + (!settings.showRenotedMyNotes && isPureRenote && note.renote.userId == me.id) || + (!settings.showLocalRenotes && isPureRenote && note.renote.user.host == null) || (!isMyNote && includesMutedWords(note.text)) ); } |