summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2018-11-29 20:09:41 +0900
committersyuilo <syuilotan@yahoo.co.jp>2018-11-29 20:09:41 +0900
commit048929181595c096d8223d1955878f18a1daf0f7 (patch)
treef72803ac0fe60d820ffccb133a2097d8b041e505 /src
parent[Client] Fix #3427 (diff)
downloadmisskey-048929181595c096d8223d1955878f18a1daf0f7.tar.gz
misskey-048929181595c096d8223d1955878f18a1daf0f7.tar.bz2
misskey-048929181595c096d8223d1955878f18a1daf0f7.zip
Refactor
Diffstat (limited to 'src')
-rw-r--r--src/client/app/common/scripts/should-mute-note.ts2
-rw-r--r--src/client/app/common/views/components/mute-and-block.vue2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/client/app/common/scripts/should-mute-note.ts b/src/client/app/common/scripts/should-mute-note.ts
index 65d25d17cb..08d7f24a71 100644
--- a/src/client/app/common/scripts/should-mute-note.ts
+++ b/src/client/app/common/scripts/should-mute-note.ts
@@ -20,7 +20,7 @@ export default function(me, settings, note) {
}
}
- if (!isMyNote && note.text && settings.mutedWords.some(q => q.length > 0 && !q.some(word => word == '' || !note.text.includes(word)))) {
+ if (!isMyNote && note.text && settings.mutedWords.some(q => q.length > 0 && !q.some(word => !note.text.includes(word)))) {
return true;
}
diff --git a/src/client/app/common/views/components/mute-and-block.vue b/src/client/app/common/views/components/mute-and-block.vue
index fdeaa97eb4..1bd99d1c43 100644
--- a/src/client/app/common/views/components/mute-and-block.vue
+++ b/src/client/app/common/views/components/mute-and-block.vue
@@ -72,7 +72,7 @@ export default Vue.extend({
methods: {
save() {
- this._mutedWords = this.mutedWords.split('\n').map(line => line.split(' '));
+ this._mutedWords = this.mutedWords.split('\n').map(line => line.split(' ').filter(x => x != ''));
}
}
});