diff options
Diffstat (limited to 'packages/frontend-embed/src/components/EmNoteSimple.vue')
| -rw-r--r-- | packages/frontend-embed/src/components/EmNoteSimple.vue | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/packages/frontend-embed/src/components/EmNoteSimple.vue b/packages/frontend-embed/src/components/EmNoteSimple.vue index 74aed4e28b..688758edb6 100644 --- a/packages/frontend-embed/src/components/EmNoteSimple.vue +++ b/packages/frontend-embed/src/components/EmNoteSimple.vue @@ -24,7 +24,7 @@ SPDX-License-Identifier: AGPL-3.0-only <script lang="ts" setup> import { computed, ref } 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 { i18n } from '@/i18n.js'; import EmAvatar from '@/components/EmAvatar.vue'; import EmNoteHeader from '@/components/EmNoteHeader.vue'; @@ -37,13 +37,7 @@ const props = defineProps<{ const showContent = ref(false); -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)); </script> <style lang="scss" module> |