From b2d43040b1f7111cb180f6798eea266c1c85166f Mon Sep 17 00:00:00 2001 From: Hazelnoot Date: Sat, 15 Feb 2025 11:49:33 -0500 Subject: factor out shared "compute-merged-cw" routine --- packages/frontend-embed/src/components/EmNoteDetailed.vue | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'packages/frontend-embed/src/components/EmNoteDetailed.vue') diff --git a/packages/frontend-embed/src/components/EmNoteDetailed.vue b/packages/frontend-embed/src/components/EmNoteDetailed.vue index 10a58feaef..0961b36e35 100644 --- a/packages/frontend-embed/src/components/EmNoteDetailed.vue +++ b/packages/frontend-embed/src/components/EmNoteDetailed.vue @@ -130,7 +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 { computeMergedCw } from '@@/js/compute-merged-cw.js'; import I18n from '@/components/I18n.vue'; import EmMediaList from '@/components/EmMediaList.vue'; import EmNoteSub from '@/components/EmNoteSub.vue'; @@ -177,13 +177,7 @@ 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; -}); +const mergedCW = computed(() => computeMergedCw(appearNote.value));