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-embed/src/components/EmNote.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-embed/src/components/EmNote.vue')
| -rw-r--r-- | packages/frontend-embed/src/components/EmNote.vue | 10 |
1 files changed, 2 insertions, 8 deletions
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)); </script> <style lang="scss" module> |