From: Thibaut Girka <thib@sitedethib.com>
Date: Wed, 22 Jul 2020 11:38:17 +0000 (+0200)
Subject: Merge branch 'master' into glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=b9f351d8455f672137a34ea0ea0b1050fba3464b;p=mastodon.git

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.
---

b9f351d8455f672137a34ea0ea0b1050fba3464b
diff --cc app/javascript/mastodon/actions/compose.js
index 601a2913c,030922520..6ef12f7b9
--- a/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));