From: ThibG <thib@sitedethib.com>
Date: Fri, 19 Jan 2018 20:48:00 +0000 (+0100)
Subject: Do not throw away statuses obtained via websocket when API request finishes (#6302)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=0b888acfd4ffddd29f25c878373e9b9f5ec6c0ab;p=mastodon.git

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

diff --git a/app/javascript/mastodon/reducers/timelines.js b/app/javascript/mastodon/reducers/timelines.js
index 7b7b5470f..9a10bcc59 100644
--- 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);
   }));
 };