Merge tag 'v1.0.5+3.2.0' into hometown-v1.0.5+3.3.0

2021-04-22 16:37:11 -07:00
parent b43c50afa8 799bf57e68
commit 4fe7cfc4be
126 changed files with 2708 additions and 366 deletions
--- a/app/javascript/mastodon/features/status/components/detailed_status.js
+++ b/app/javascript/mastodon/features/status/components/detailed_status.js
@ -251,7 +251,7 @@ class DetailedStatus extends ImmutablePureComponent {
            <DisplayName account={status.get('account')} localDomain={this.props.domain} />
          </a>

-          <StatusContent status={status} expanded={!status.get('hidden')} onExpandedToggle={this.handleExpandedToggle} />
+          <StatusContent status={status} expanded={status.get('activity_pub_type') === 'Article' || !status.get('hidden')} onExpandedToggle={this.handleExpandedToggle} />

          {media}