diff --git a/packages/frontend-embed/src/components/EmNote.vue b/packages/frontend-embed/src/components/EmNote.vue index a918ae8db4..bf96c557ea 100644 --- a/packages/frontend-embed/src/components/EmNote.vue +++ b/packages/frontend-embed/src/components/EmNote.vue @@ -109,7 +109,7 @@ import * as mfm from '@transfem-org/sfm-js'; import * as Misskey from 'misskey-js'; import { shouldCollapsed } from '@@/js/collapsed.js'; import { url } from '@@/js/config.js'; -import { appendContentWarning } from '@@/js/append-content-warning.js'; +import { computeMergedCw } from '@@/js/compute-merged-cw.js'; import I18n from '@/components/I18n.vue'; import EmNoteSub from '@/components/EmNoteSub.vue'; import EmNoteHeader from '@/components/EmNoteHeader.vue'; @@ -156,13 +156,7 @@ const isLong = shouldCollapsed(appearNote.value, []); const collapsed = ref(appearNote.value.cw == null && isLong); const isDeleted = ref(false); -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));