mastofe

commit: 0b888acfd4ffddd29f25c878373e9b9f5ec6c0ab
parent: 238de58e652c99c331d0bdf8e4791abace02fb0e
Author: ThibG <thib@sitedethib.com>
Date:   Fri, 19 Jan 2018 21:48:00 +0100

Do not throw away statuses obtained via websocket when API request finishes (#6302)


Diffstat:
M
app/javascript/mastodon/reducers/timelines.js
2
+-

1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/javascript/mastodon/reducers/timelines.js b/app/javascript/mastodon/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);
   }));
 };