diff options
| author | dakkar <dakkar@thenautilus.net> | 2025-02-20 10:20:49 +0000 |
|---|---|---|
| committer | dakkar <dakkar@thenautilus.net> | 2025-02-20 10:20:49 +0000 |
| commit | 534c35cca2b2492dea05b7c7b23802af5435291a (patch) | |
| tree | d3dec52a465dc2797919e03a7d2d049960a1c86e /packages/frontend/src/components/SkNoteSub.vue | |
| parent | merge: Add separate redis for rate limit (!908) (diff) | |
| parent | add `admin/cw-user` to new endpoints list (diff) | |
| download | sharkey-534c35cca2b2492dea05b7c7b23802af5435291a.tar.gz sharkey-534c35cca2b2492dea05b7c7b23802af5435291a.tar.bz2 sharkey-534c35cca2b2492dea05b7c7b23802af5435291a.zip | |
merge: Add "force content warning" setting for user moderation (resolves #905) (!876)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/876
Closes #905
Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev>
Diffstat (limited to 'packages/frontend/src/components/SkNoteSub.vue')
| -rw-r--r-- | packages/frontend/src/components/SkNoteSub.vue | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/packages/frontend/src/components/SkNoteSub.vue b/packages/frontend/src/components/SkNoteSub.vue index a3d27c9e16..060e66be16 100644 --- a/packages/frontend/src/components/SkNoteSub.vue +++ b/packages/frontend/src/components/SkNoteSub.vue @@ -19,11 +19,11 @@ SPDX-License-Identifier: AGPL-3.0-only <div :class="$style.body"> <SkNoteHeader :class="$style.header" :note="note" :classic="true" :mini="true"/> <div :class="$style.content"> - <p v-if="note.cw != null" :class="$style.cw"> - <Mfm v-if="note.cw != ''" style="margin-right: 8px;" :text="note.cw" :isBlock="true" :author="note.user" :nyaize="'respect'"/> + <p v-if="mergedCW != null" :class="$style.cw"> + <Mfm v-if="mergedCW != ''" style="margin-right: 8px;" :text="mergedCW" :isBlock="true" :author="note.user" :nyaize="'respect'"/> <MkCwButton v-model="showContent" :text="note.text" :files="note.files" :poll="note.poll"/> </p> - <div v-show="note.cw == null || showContent"> + <div v-show="mergedCW == null || showContent"> <MkSubNoteContent :class="$style.text" :note="note" :translating="translating" :translation="translation" :expandAllCws="props.expandAllCws"/> </div> </div> @@ -94,6 +94,7 @@ SPDX-License-Identifier: AGPL-3.0-only <script lang="ts" setup> import { computed, ref, shallowRef, watch } from 'vue'; import * as Misskey from 'misskey-js'; +import { computeMergedCw } from '@@/js/compute-merged-cw.js'; import SkNoteHeader from '@/components/SkNoteHeader.vue'; import MkReactionsViewer from '@/components/MkReactionsViewer.vue'; import MkSubNoteContent from '@/components/MkSubNoteContent.vue'; @@ -156,6 +157,8 @@ let appearNote = computed(() => isRenote ? props.note.renote as Misskey.entities const defaultLike = computed(() => defaultStore.state.like ? defaultStore.state.like : null); const replies = ref<Misskey.entities.Note[]>([]); +const mergedCW = computed(() => computeMergedCw(appearNote.value)); + const isRenote = ( props.note.renote != null && props.note.text == null && |