diff options
Diffstat (limited to 'packages/frontend/src/components/SkNoteSimple.vue')
| -rw-r--r-- | packages/frontend/src/components/SkNoteSimple.vue | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/packages/frontend/src/components/SkNoteSimple.vue b/packages/frontend/src/components/SkNoteSimple.vue index b9895305f2..71a5bd4df8 100644 --- a/packages/frontend/src/components/SkNoteSimple.vue +++ b/packages/frontend/src/components/SkNoteSimple.vue @@ -9,11 +9,11 @@ SPDX-License-Identifier: AGPL-3.0-only <div :class="$style.main"> <MkNoteHeader :class="$style.header" :classic="true" :note="note" :mini="true"/> <div> - <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'" :emojiUrls="note.emojis"/> + <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'" :emojiUrls="note.emojis"/> <MkCwButton v-model="showContent" :text="note.text" :files="note.files" :poll="note.poll" @click.stop/> </p> - <div v-show="note.cw == null || showContent"> + <div v-show="mergedCW == null || showContent"> <MkSubNoteContent :hideFiles="hideFiles" :class="$style.text" :note="note" :expandAllCws="props.expandAllCws"/> </div> </div> @@ -22,8 +22,9 @@ SPDX-License-Identifier: AGPL-3.0-only </template> <script lang="ts" setup> -import { watch, ref } from 'vue'; +import { watch, ref, computed } from 'vue'; import * as Misskey from 'misskey-js'; +import { computeMergedCw } from '@@/js/compute-merged-cw.js'; import MkNoteHeader from '@/components/MkNoteHeader.vue'; import MkSubNoteContent from '@/components/MkSubNoteContent.vue'; import MkCwButton from '@/components/MkCwButton.vue'; @@ -37,6 +38,8 @@ const props = defineProps<{ let showContent = ref(defaultStore.state.uncollapseCW); +const mergedCW = computed(() => computeMergedCw(props.note)); + watch(() => props.expandAllCws, (expandAllCws) => { if (expandAllCws !== showContent.value) showContent.value = expandAllCws; }); |