diff options
| author | anatawa12 <anatawa12@icloud.com> | 2023-11-23 18:56:20 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-23 18:56:20 +0900 |
| commit | 864827f788cd1671a4db2ebc159c1c8ab031b7ad (patch) | |
| tree | 689fa67a1f438cc3410446cd893397d91c2d6725 /packages/frontend/src/components/MkNote.vue | |
| parent | 絵文字のオートコンプリート強化の対応 (#12365) (diff) | |
| download | misskey-864827f788cd1671a4db2ebc159c1c8ab031b7ad.tar.gz misskey-864827f788cd1671a4db2ebc159c1c8ab031b7ad.tar.bz2 misskey-864827f788cd1671a4db2ebc159c1c8ab031b7ad.zip | |
Hard mute (#12376)
* feat(backend,misskey-js): hard mute storage in backend
* fix(backend,misskey-js): mute word record type
* chore(frontend): generalize XWordMute
* feat(frontend): configure hard mute
* feat(frontend): hard mute notes on the timelines
* lint(backend,frontend): fix lint failure
* chore(misskey-js): update api.md
* fix(backend): test failure
* chore(frontend): check word mute for reply
* chore: limit hard mute count
Diffstat (limited to 'packages/frontend/src/components/MkNote.vue')
| -rw-r--r-- | packages/frontend/src/components/MkNote.vue | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/packages/frontend/src/components/MkNote.vue b/packages/frontend/src/components/MkNote.vue index e300ef88a5..6349df2e30 100644 --- a/packages/frontend/src/components/MkNote.vue +++ b/packages/frontend/src/components/MkNote.vue @@ -5,7 +5,7 @@ SPDX-License-Identifier: AGPL-3.0-only <template> <div - v-if="!muted" + v-if="!hardMuted && !muted" v-show="!isDeleted" ref="el" v-hotkey="keymap" @@ -133,7 +133,7 @@ SPDX-License-Identifier: AGPL-3.0-only </div> </article> </div> -<div v-else :class="$style.muted" @click="muted = false"> +<div v-else-if="!hardMuted" :class="$style.muted" @click="muted = false"> <I18n :src="i18n.ts.userSaysSomething" tag="small"> <template #name> <MkA v-user-preview="appearNote.userId" :to="userPage(appearNote.user)"> @@ -183,6 +183,7 @@ const props = withDefaults(defineProps<{ note: Misskey.entities.Note; pinned?: boolean; mock?: boolean; + withHardMute?: boolean; }>(), { mock: false, }); @@ -239,13 +240,23 @@ const urls = $computed(() => parsed ? extractUrlFromMfm(parsed) : null); const isLong = shouldCollapsed(appearNote, urls ?? []); const collapsed = ref(appearNote.cw == null && isLong); const isDeleted = ref(false); -const muted = ref($i ? checkWordMute(appearNote, $i, $i.mutedWords) : false); +const muted = ref(checkMute(appearNote, $i?.mutedWords)); +const hardMuted = ref(props.withHardMute && checkMute(appearNote, $i?.hardMutedWords)); const translation = ref<any>(null); const translating = ref(false); const showTicker = (defaultStore.state.instanceTicker === 'always') || (defaultStore.state.instanceTicker === 'remote' && appearNote.user.instance); const canRenote = computed(() => ['public', 'home'].includes(appearNote.visibility) || (appearNote.visibility === 'followers' && appearNote.userId === $i.id)); let renoteCollapsed = $ref(defaultStore.state.collapseRenotes && isRenote && (($i && ($i.id === note.userId || $i.id === appearNote.userId)) || (appearNote.myReaction != null))); +function checkMute(note: Misskey.entities.Note, mutedWords: Array<string | string[]> | undefined | null): boolean { + if (mutedWords == null) return false; + + if (checkWordMute(note, $i, mutedWords)) return true; + if (note.reply && checkWordMute(note.reply, $i, mutedWords)) return true; + if (note.renote && checkWordMute(note.renote, $i, mutedWords)) return true; + return false; +} + const keymap = { 'r': () => reply(true), 'e|a|plus': () => react(true), |