From a23410d64322e2ce61ed55fab553d3f9627f2dfc Mon Sep 17 00:00:00 2001 From: DIYgod Date: Thu, 25 Jan 2024 20:15:27 +0800 Subject: [PATCH] refactor: clear logic --- src/lib/expand-unit.ts | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/lib/expand-unit.ts b/src/lib/expand-unit.ts index 60ec8d6c..8802ae9c 100644 --- a/src/lib/expand-unit.ts +++ b/src/lib/expand-unit.ts @@ -118,25 +118,22 @@ export const expandCrossbellNote = async ({ expandedNote.metadata.content.contentHTML = rendered.toHTML() } } - expandedNote.metadata.content.cover = - expandedNote.metadata?.content?.attachments?.find( - (attachment) => attachment.name === "cover", - )?.address || (disableAutofill ? "" : renderedMetadata?.images?.[0]) - expandedNote.metadata.content.images = [] - - const cover = expandedNote.metadata?.content?.attachments?.find( + const attachmentsCover = expandedNote.metadata?.content?.attachments?.find( (attachment) => attachment.name === "cover", )?.address - if (cover) { - expandedNote.metadata.content.images.push(cover) - } - const attachmentsImages = expandedNote.metadata?.content?.attachments ?.filter( (attachment) => attachment.name === "image" && attachment.address, ) .map((attachment) => attachment.address!) + + expandedNote.metadata.content.images = [] + + if (attachmentsCover) { + expandedNote.metadata.content.images.push(attachmentsCover) + } + expandedNote.metadata.content.images = expandedNote.metadata.content.images.concat(attachmentsImages || []) @@ -149,6 +146,9 @@ export const expandCrossbellNote = async ({ ...new Set(expandedNote.metadata.content.images), ] + expandedNote.metadata.content.cover = + attachmentsCover || (disableAutofill ? "" : renderedMetadata?.images?.[0]) + if (useImageDimensions) { try { const imageDimensions = await (