diff options
| author | Aya Morisawa <AyaMorisawa4869@gmail.com> | 2018-12-29 19:09:42 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-29 19:09:42 +0900 |
| commit | 2e8ea3441371f7c5bfd508b08f771b8dab0a7eda (patch) | |
| tree | 9c96437d3687f400c3babdd2e176a0d681133051 /src/client/app/common/scripts/should-mute-note.ts | |
| parent | Update eslint requirement from 5.8.0 to 5.11.1 (diff) | |
| parent | Update loader-utils requirement from 1.1.0 to 1.2.3 (#3793) (diff) | |
| download | misskey-2e8ea3441371f7c5bfd508b08f771b8dab0a7eda.tar.gz misskey-2e8ea3441371f7c5bfd508b08f771b8dab0a7eda.tar.bz2 misskey-2e8ea3441371f7c5bfd508b08f771b8dab0a7eda.zip | |
Merge branch 'develop' into dependabot/npm_and_yarn/eslint-5.11.1
Diffstat (limited to 'src/client/app/common/scripts/should-mute-note.ts')
| -rw-r--r-- | src/client/app/common/scripts/should-mute-note.ts | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/src/client/app/common/scripts/should-mute-note.ts b/src/client/app/common/scripts/should-mute-note.ts index 4eab76421d..8a6430b1df 100644 --- a/src/client/app/common/scripts/should-mute-note.ts +++ b/src/client/app/common/scripts/should-mute-note.ts @@ -2,8 +2,17 @@ export default function(me, settings, note) { const isMyNote = note.userId == me.id; const isPureRenote = note.renoteId != null && note.text == null && note.fileIds.length == 0 && note.poll == null; - return settings.showMyRenotes === false && isMyNote && isPureRenote || - settings.showRenotedMyNotes === false && isPureRenote && note.renote.userId == me.id || - settings.showLocalRenotes === false && isPureRenote && note.renote.user.host == null || - !isMyNote && note.text && settings.mutedWords.some(q => q.length > 0 && !q.some(word => !note.text.includes(word))); + const includesMutedWords = (text: string) => + text + ? settings.mutedWords.some(q => q.length > 0 && !q.some(word => !text.includes(word))) + : false; + + 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) || + (!isMyNote && includesMutedWords(note.text)) + ); } |