diff options
author | Thibaut Girka <thib@sitedethib.com> | 2020-07-22 13:38:17 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2020-07-22 13:38:17 +0200 |
commit | b9f351d8455f672137a34ea0ea0b1050fba3464b (patch) | |
tree | 4a2dd275ddecf46760ccb8140fac5f6cb21ac766 /app/javascript/mastodon/actions/compose.js | |
parent | 801e546ecc1efb4103232d8265229eb455a8dd5b (diff) | |
parent | 5d9acc0ce41aa0274fef2dd321a8fad1fb0665ea (diff) |
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.
Diffstat (limited to 'app/javascript/mastodon/actions/compose.js')
-rw-r--r-- | app/javascript/mastodon/actions/compose.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/javascript/mastodon/actions/compose.js b/app/javascript/mastodon/actions/compose.js index 601a2913c..6ef12f7b9 100644 --- a/app/javascript/mastodon/actions/compose.js +++ b/app/javascript/mastodon/actions/compose.js @@ -163,7 +163,6 @@ export function submitCompose(routerHistory) { // To make the app more responsive, immediately push the status // into the columns - const insertIfOnline = timelineId => { const timeline = getState().getIn(['timelines', timelineId]); @@ -181,6 +180,7 @@ export function submitCompose(routerHistory) { if (!response.data.local_only) { insertIfOnline('public'); } + insertIfOnline(`account:${response.data.account.id}`); } }).catch(function (error) { dispatch(submitComposeFail(error)); |