Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- `app/javascript/mastodon/actions/compose.js`:
  Not a “real” conflict, but change too close to a change we made to
  fix the vanilla WebUI locally pushing authored local-only toots in the
  public TL view.

diff --cc app/controllers/api/v1/statuses_controller.rb
Simple merge

diff --cc app/controllers/application_controller.rb
Simple merge

diff --cc app/javascript/mastodon/actions/compose.js
index 601a2913c14ae31cd06cc0101b53085e4081f19e,030922520264f05e02f9df155d3f3c11bd0c10b1..6ef12f7b993a3e98e9b67f00a9f44061152c98b6
--- 1/app/javascript/mastodon/actions/compose.js
--- 2/app/javascript/mastodon/actions/compose.js
+++ b/app/javascript/mastodon/actions/compose.js
@@@ -178,9 -177,8 +177,10 @@@ export function submitCompose(routerHis
  
        if (response.data.in_reply_to_id === null && response.data.visibility === 'public') {
          insertIfOnline('community');
 -        insertIfOnline('public');
 +        if (!response.data.local_only) {
 +          insertIfOnline('public');
 +        }
+         insertIfOnline(`account:${response.data.account.id}`);
        }
      }).catch(function (error) {
        dispatch(submitComposeFail(error));

diff --cc app/javascript/mastodon/locales/defaultMessages.json
Simple merge

diff --cc app/javascript/mastodon/locales/en.json
Simple merge

diff --cc app/javascript/mastodon/locales/pl.json
Simple merge

diff --cc app/lib/feed_manager.rb
Simple merge

diff --cc app/models/media_attachment.rb
Simple merge

diff --cc package.json
Simple merge

diff --cc spec/lib/feed_manager_spec.rb
Simple merge

diff --cc yarn.lock
Simple merge