summaryrefslogtreecommitdiff
path: root/src/client/app/common/scripts
diff options
context:
space:
mode:
authorSatsuki Yanagi <17376330+u1-liquid@users.noreply.github.com>2019-05-05 09:27:55 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2019-05-05 09:27:55 +0900
commit5fb0a995dd2d9cf65ed93fca78502f42a7c3e22d (patch)
treeba41be9daaf91435ff4429667a6bbcbe094a39c5 /src/client/app/common/scripts
parentログアウトの処理と外部サービス連携Viewがセッションク... (diff)
downloadsharkey-5fb0a995dd2d9cf65ed93fca78502f42a7c3e22d.tar.gz
sharkey-5fb0a995dd2d9cf65ed93fca78502f42a7c3e22d.tar.bz2
sharkey-5fb0a995dd2d9cf65ed93fca78502f42a7c3e22d.zip
様々な修正 (#4859)
Typo, Redundant code, Syntax error の修正
Diffstat (limited to 'src/client/app/common/scripts')
-rw-r--r--src/client/app/common/scripts/should-mute-note.ts6
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))
);
}