diff --git a/app/javascript/mastodon/components/status_content.jsx b/app/javascript/mastodon/components/status_content.jsx index 1497fd474..5439c88ae 100644 --- a/app/javascript/mastodon/components/status_content.jsx +++ b/app/javascript/mastodon/components/status_content.jsx @@ -231,6 +231,7 @@ class StatusContent extends PureComponent { const { status, intl, statusContent } = this.props; const renderReadMore = this.props.onClick && status.get('collapsed'); + const renderReadArticle = status.get('activity_pub_type') === 'Article' && status.get('collapsed') && !this.props.onClick; const contentLocale = intl.locale.replace(/[_-].*/, ''); const targetLanguages = this.props.languages?.get(status.get('language') || 'und'); const renderTranslate = this.props.onTranslate && this.props.identity.signedIn && ['public', 'unlisted'].includes(status.get('visibility')) && status.get('search_index').trim().length > 0 && targetLanguages?.includes(contentLocale); @@ -248,7 +249,7 @@ class StatusContent extends PureComponent { ); - const readArticleButton = ( + const readArticleButton = renderReadArticle && ( @@ -277,12 +278,16 @@ class StatusContent extends PureComponent { ); } else { return ( -
-
+ <> +
+
- {poll} - {translateButton} -
+ {poll} + {translateButton} +
+ + {readArticleButton} + ); } }