diff options
| author | Hazelnoot <acomputerdog@gmail.com> | 2025-02-12 14:47:17 -0500 |
|---|---|---|
| committer | Hazelnoot <acomputerdog@gmail.com> | 2025-02-16 19:20:41 -0500 |
| commit | 905b63764885b3961d1b3955032e6202682d9b8b (patch) | |
| tree | ddb2be1ff3ea5ea7f17bb607b51c6c5b54313f47 /packages/frontend-embed/src/components/EmNoteDetailed.vue | |
| parent | move `mandatoryCW` from admin-user to PackedUserLite (public field) (diff) | |
| download | sharkey-905b63764885b3961d1b3955032e6202682d9b8b.tar.gz sharkey-905b63764885b3961d1b3955032e6202682d9b8b.tar.bz2 sharkey-905b63764885b3961d1b3955032e6202682d9b8b.zip | |
append mandatory CW in all note views (Mk/Sk/Em + basic/Detailed/Simple/Sub)
Diffstat (limited to 'packages/frontend-embed/src/components/EmNoteDetailed.vue')
| -rw-r--r-- | packages/frontend-embed/src/components/EmNoteDetailed.vue | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/packages/frontend-embed/src/components/EmNoteDetailed.vue b/packages/frontend-embed/src/components/EmNoteDetailed.vue index c4ea9b4f2e..10a58feaef 100644 --- a/packages/frontend-embed/src/components/EmNoteDetailed.vue +++ b/packages/frontend-embed/src/components/EmNoteDetailed.vue @@ -58,11 +58,11 @@ SPDX-License-Identifier: AGPL-3.0-only </div> </header> <div :class="[$style.noteContent, { [$style.contentCollapsed]: collapsed }]"> - <p v-if="appearNote.cw != null" :class="$style.cw"> - <EmMfm v-if="appearNote.cw != ''" style="margin-right: 8px;" :text="appearNote.cw" :author="appearNote.user" :nyaize="'respect'" :isBlock="true"/> + <p v-if="mergedCW != null" :class="$style.cw"> + <EmMfm v-if="mergedCW != ''" style="margin-right: 8px;" :text="mergedCW" :author="appearNote.user" :nyaize="'respect'" :isBlock="true"/> <button style="display: block; width: 100%; margin: 4px 0;" class="_buttonGray _buttonRounded" @click="showContent = !showContent">{{ showContent ? i18n.ts._cw.hide : i18n.ts._cw.show }}</button> </p> - <div v-show="appearNote.cw == null || showContent"> + <div v-show="mergedCW == null || showContent"> <span v-if="appearNote.isHidden" style="opacity: 0.5">({{ i18n.ts.private }})</span> <EmA v-if="appearNote.replyId" :class="$style.noteReplyTarget" :to="`/notes/${appearNote.replyId}`"><i class="ti ti-arrow-back-up"></i></EmA> <EmMfm @@ -130,6 +130,7 @@ SPDX-License-Identifier: AGPL-3.0-only import { computed, inject, ref } from 'vue'; import * as mfm from '@transfem-org/sfm-js'; import * as Misskey from 'misskey-js'; +import { appendContentWarning } from '@@/js/append-content-warning.js'; import I18n from '@/components/I18n.vue'; import EmMediaList from '@/components/EmMediaList.vue'; import EmNoteSub from '@/components/EmNoteSub.vue'; @@ -175,6 +176,14 @@ const isDeleted = ref(false); const parsed = appearNote.value.text ? mfm.parse(appearNote.value.text) : null; const isLong = shouldCollapsed(appearNote.value, []); const collapsed = ref(appearNote.value.cw == null && isLong); + +const mergedCW = computed(() => { + let cw = appearNote.value.cw; + if (appearNote.value.user.mandatoryCW) { + cw = appendContentWarning(cw, appearNote.value.user.mandatoryCW); + } + return cw; +}); </script> <style lang="scss" module> |