diff options
| author | Hazelnoot <acomputerdog@gmail.com> | 2025-02-15 11:49:33 -0500 |
|---|---|---|
| committer | Hazelnoot <acomputerdog@gmail.com> | 2025-02-16 19:20:42 -0500 |
| commit | b2d43040b1f7111cb180f6798eea266c1c85166f (patch) | |
| tree | e128c9355f73071822b1827077b529695238ae8d /packages/frontend/src/components/SkNoteSimple.vue | |
| parent | document "special character" as zero-width space in activitypub unit tests (diff) | |
| download | sharkey-b2d43040b1f7111cb180f6798eea266c1c85166f.tar.gz sharkey-b2d43040b1f7111cb180f6798eea266c1c85166f.tar.bz2 sharkey-b2d43040b1f7111cb180f6798eea266c1c85166f.zip | |
factor out shared "compute-merged-cw" routine
Diffstat (limited to 'packages/frontend/src/components/SkNoteSimple.vue')
| -rw-r--r-- | packages/frontend/src/components/SkNoteSimple.vue | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/packages/frontend/src/components/SkNoteSimple.vue b/packages/frontend/src/components/SkNoteSimple.vue index f30fb82926..71a5bd4df8 100644 --- a/packages/frontend/src/components/SkNoteSimple.vue +++ b/packages/frontend/src/components/SkNoteSimple.vue @@ -24,7 +24,7 @@ SPDX-License-Identifier: AGPL-3.0-only <script lang="ts" setup> import { watch, ref, computed } from 'vue'; import * as Misskey from 'misskey-js'; -import { appendContentWarning } from '@@/js/append-content-warning.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'; @@ -38,13 +38,7 @@ const props = defineProps<{ let showContent = ref(defaultStore.state.uncollapseCW); -const mergedCW = computed(() => { - let cw = props.note.cw; - if (props.note.user.mandatoryCW) { - cw = appendContentWarning(cw, props.note.user.mandatoryCW); - } - return cw; -}); +const mergedCW = computed(() => computeMergedCw(props.note)); watch(() => props.expandAllCws, (expandAllCws) => { if (expandAllCws !== showContent.value) showContent.value = expandAllCws; |