diff options
author | Thibaut Girka <thib@sitedethib.com> | 2018-01-19 21:59:12 +0100 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2018-01-19 21:59:12 +0100 |
commit | 1619efd73545cfb758c8269921316eed82f45054 (patch) | |
tree | 8b3263765452c04bb8ee8a253ee8758def61d2d8 /app/javascript/flavours | |
parent | 26ecee79bfd4cb4f97a91e57e7a8b3fb7de3d82a (diff) |
Do not discard statuses obtained via websocket when API request finishes
This backports 0b888acfd4ffddd29f25c878373e9b9f5ec6c0ab
Diffstat (limited to 'app/javascript/flavours')
-rw-r--r-- | app/javascript/flavours/glitch/reducers/timelines.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/javascript/flavours/glitch/reducers/timelines.js b/app/javascript/flavours/glitch/reducers/timelines.js index 4c62d8df3..c4ae2bc97 100644 --- a/app/javascript/flavours/glitch/reducers/timelines.js +++ b/app/javascript/flavours/glitch/reducers/timelines.js @@ -40,7 +40,7 @@ const normalizeTimeline = (state, timeline, statuses, next, isPartial) => { mMap.set('loaded', true); mMap.set('isLoading', false); if (!hadNext) mMap.set('next', next); - mMap.set('items', wasLoaded ? ids.concat(oldIds) : ids); + mMap.set('items', wasLoaded ? ids.concat(oldIds) : oldIds.concat(ids)); mMap.set('isPartial', isPartial); })); }; |