about summary refs log tree commit diff
path: root/app
diff options
context:
space:
mode:
authorDavid Yip <yipdw@member.fsf.org>2018-01-19 15:17:20 -0600
committerGitHub <noreply@github.com>2018-01-19 15:17:20 -0600
commitb8c6656ce9e498f2e99d6301212bcd12e7f839df (patch)
tree8b3263765452c04bb8ee8a253ee8758def61d2d8 /app
parent26ecee79bfd4cb4f97a91e57e7a8b3fb7de3d82a (diff)
parent1619efd73545cfb758c8269921316eed82f45054 (diff)
Merge pull request #339 from ThibG/glitch-soc/features/timeline-tweaks
Do not discard statuses obtained via websocket when API request finishes
Diffstat (limited to 'app')
-rw-r--r--app/javascript/flavours/glitch/reducers/timelines.js2
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);
   }));
 };