Do not discard statuses obtained via websocket when API request finishes

This backports 0b888acfd4
This commit is contained in:
Thibaut Girka 2018-01-19 21:59:12 +01:00
parent 477fbec714
commit 12edfead8e

View file

@ -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);
}));
};