diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2018-11-11 21:17:51 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2018-11-11 21:17:51 +0900 |
| commit | 71d42f64dc840e744e757cb5edae32276d83a7f4 (patch) | |
| tree | 32ccae355b74a00cf47066a862961d8cb33fd642 /src/client/app/common | |
| parent | [Client] Fix i18n (diff) | |
| download | misskey-71d42f64dc840e744e757cb5edae32276d83a7f4.tar.gz misskey-71d42f64dc840e744e757cb5edae32276d83a7f4.tar.bz2 misskey-71d42f64dc840e744e757cb5edae32276d83a7f4.zip | |
[Client] Implement word mute
Closes #1739
Diffstat (limited to 'src/client/app/common')
| -rw-r--r-- | src/client/app/common/scripts/note-mixin.ts | 8 | ||||
| -rw-r--r-- | src/client/app/common/scripts/should-mute-note.ts | 28 | ||||
| -rw-r--r-- | src/client/app/common/views/components/mute-and-block.vue | 27 |
3 files changed, 61 insertions, 2 deletions
diff --git a/src/client/app/common/scripts/note-mixin.ts b/src/client/app/common/scripts/note-mixin.ts index dd5098f4cd..9f1a4c6eea 100644 --- a/src/client/app/common/scripts/note-mixin.ts +++ b/src/client/app/common/scripts/note-mixin.ts @@ -1,5 +1,6 @@ import parse from '../../../../mfm/parse'; import { sum } from '../../../../prelude/array'; +import shouldMuteNote from './should-mute-note'; import MkNoteMenu from '../views/components/note-menu.vue'; import MkReactionPicker from '../views/components/reaction-picker.vue'; import Ok from '../views/components/ok.vue'; @@ -22,7 +23,8 @@ type Opts = { export default (opts: Opts = {}) => ({ data() { return { - showContent: false + showContent: false, + hideThisNote: false }; }, @@ -86,6 +88,10 @@ export default (opts: Opts = {}) => ({ } }, + created() { + this.hideThisNote = shouldMuteNote(this.$store.state.i, this.$store.state.settings, this.appearNote); + }, + methods: { reply(viaKeyboard = false) { this.$root.$post({ diff --git a/src/client/app/common/scripts/should-mute-note.ts b/src/client/app/common/scripts/should-mute-note.ts new file mode 100644 index 0000000000..a849135763 --- /dev/null +++ b/src/client/app/common/scripts/should-mute-note.ts @@ -0,0 +1,28 @@ +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; + + if (settings.showMyRenotes === false) { + if (isMyNote && isPureRenote) { + return true; + } + } + + if (settings.showRenotedMyNotes === false) { + if (isPureRenote && (note.renote.userId == me.id)) { + return true; + } + } + + if (settings.showLocalRenotes === false) { + if (isPureRenote && (note.renote.user.host == null)) { + return true; + } + } + + if (!isMyNote && note.text && settings.mutedWords.some(q => !q.some(word => !note.text.includes(word)))) { + return true; + } + + return false; +} 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 3ed02e644c..fdeaa97eb4 100644 --- a/src/client/app/common/views/components/mute-and-block.vue +++ b/src/client/app/common/views/components/mute-and-block.vue @@ -21,6 +21,14 @@ </div> </div> </section> + + <section> + <header>{{ $t('word-mute') }}</header> + <ui-textarea v-model="mutedWords"> + {{ $t('muted-words') }}<span slot="desc">{{ $t('muted-words-description') }}</span> + </ui-textarea> + <ui-button @click="save">{{ $t('save') }}</ui-button> + </section> </ui-card> </template> @@ -30,16 +38,27 @@ import i18n from '../../../i18n'; export default Vue.extend({ i18n: i18n('common/views/components/mute-and-block.vue'), + data() { return { muteFetching: true, blockFetching: true, mute: [], - block: [] + block: [], + mutedWords: '' }; }, + computed: { + _mutedWords: { + get() { return this.$store.state.settings.mutedWords; }, + set(value) { this.$store.dispatch('settings/set', { key: 'mutedWords', value }); } + }, + }, + mounted() { + this.mutedWords = this._mutedWords.map(words => words.join(' ')).join('\n'); + this.$root.api('mute/list').then(mute => { this.mute = mute.map(x => x.mutee); this.muteFetching = false; @@ -49,6 +68,12 @@ export default Vue.extend({ this.block = blocking.map(x => x.blockee); this.blockFetching = false; }); + }, + + methods: { + save() { + this._mutedWords = this.mutedWords.split('\n').map(line => line.split(' ')); + } } }); </script> |