about summary refs log tree commit diff
path: root/app
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2018-01-19 21:48:00 +0100
committerEugen Rochko <eugen@zeonfederated.com>2018-01-19 21:48:00 +0100
commit0b888acfd4ffddd29f25c878373e9b9f5ec6c0ab (patch)
tree047a1dad9152302e38c70fc0b81886cf12d893d7 /app
parent238de58e652c99c331d0bdf8e4791abace02fb0e (diff)
Do not throw away statuses obtained via websocket when API request finishes (#6302)
Diffstat (limited to 'app')
-rw-r--r--app/javascript/mastodon/reducers/timelines.js2
1 files changed, 1 insertions, 1 deletions
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);
   }));
 };