diff --git a/routes/_components/status/Status.html b/routes/_components/status/Status.html index 4f0eb90..1e3ff31 100644 --- a/routes/_components/status/Status.html +++ b/routes/_components/status/Status.html @@ -21,7 +21,7 @@ {#if !showContent} {/if} - {#if showContent || contentPreloaded} + {#if content && (showContent || contentPreloaded)} {/if} {#if showMedia } @@ -223,6 +223,7 @@ timelineType !== 'search' && 'status-in-timeline', isStatusInOwnThread && 'status-in-own-thread' )), + content: ({ originalStatus }) => originalStatus.content || '', showContent: ({ spoilerText, spoilerShown }) => !spoilerText || spoilerShown, params: ({ notification, notificationId, status, statusId, timelineType, account, accountId, uuid, isStatusInNotification, isStatusInOwnThread, diff --git a/routes/_components/status/StatusContent.html b/routes/_components/status/StatusContent.html index 1cd5e6c..ae2c03d 100644 --- a/routes/_components/status/StatusContent.html +++ b/routes/_components/status/StatusContent.html @@ -79,13 +79,13 @@ shown && 'shown' ) }, - content: ({ originalStatus }) => originalStatus.content, + content: ({ originalStatus }) => (originalStatus.content || ''), emojis: ({ originalStatus }) => originalStatus.emojis, massagedContent: ({ content, emojis, $autoplayGifs }) => { content = emojifyText(content, emojis, $autoplayGifs) // GNU Social and Pleroma don't add

tags - if (!content.startsWith('

')) { + if (content && !content.startsWith('

')) { content = `

${content}

` } return content