Do not discard statuses obtained via websocket when API request finishes

This backports 0b888acfd4
6 years ago · 1619efd735
parent 26ecee79bf
commit 1619efd735
1 changed files with 1 additions and 1 deletions
--- 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);
  }));
 };