diff --git a/components/status/StatusBody.vue b/components/status/StatusBody.vue index 1d797dee..951400ed 100644 --- a/components/status/StatusBody.vue +++ b/components/status/StatusBody.vue @@ -17,7 +17,7 @@ const emojisObject = useEmojisFallback(() => status.emojis) const vnode = $computed(() => { if (!status.content) return null - const vnode = contentToVNode(status.content, { + return contentToVNode(status.content, { emojis: emojisObject.value, mentions: 'mentions' in status ? status.mentions : undefined, markdown: true, @@ -25,7 +25,6 @@ const vnode = $computed(() => { status: 'id' in status ? status : undefined, inReplyToStatus: newer, }) - return vnode }) diff --git a/components/status/StatusContent.vue b/components/status/StatusContent.vue index 3ef2e3c5..0400207f 100644 --- a/components/status/StatusContent.vue +++ b/components/status/StatusContent.vue @@ -26,9 +26,11 @@ const hasSpoilerOrSensitiveMedia = $computed(() => spoilerTextPresent || (status const isSensitiveNonSpoiler = computed(() => status.sensitive && !status.spoilerText && !!status.mediaAttachments.length) const hideAllMedia = computed( () => { - return currentUser.value ? (getHideMediaByDefault(currentUser.value.account) && !!status.mediaAttachments.length) : false + return currentUser.value ? (getHideMediaByDefault(currentUser.value.account) && (!!status.mediaAttachments.length || !!status.card?.html)) : false }, ) +const embeddedMediaPreference = $(usePreferences('experimentalEmbeddedMedia')) +const allowEmbeddedMedia = $computed(() => status.card?.html && embeddedMediaPreference)