parent
1aeb57fb57
commit
f732bd44ab
|
@ -21,7 +21,7 @@
|
|||
{#if !showContent}
|
||||
<StatusMentions {...params} />
|
||||
{/if}
|
||||
{#if showContent || contentPreloaded}
|
||||
{#if content && (showContent || contentPreloaded)}
|
||||
<StatusContent {...params} shown={showContent}/>
|
||||
{/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,
|
||||
|
|
|
@ -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 <p> tags
|
||||
if (!content.startsWith('<p>')) {
|
||||
if (content && !content.startsWith('<p>')) {
|
||||
content = `<p>${content}</p>`
|
||||
}
|
||||
return content
|
||||
|
|
Loading…
Reference in a new issue