monorail
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #339 from ThibG/glitch-soc/features/timeline-tweaks 

Do not discard statuses obtained via websocket when API request finishes
This commit is contained in:
David Yip 2018-01-19 15:17:20 -06:00 committed by GitHub
parent 26ecee79bf 1619efd735
commit b8c6656ce9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/javascript/flavours/glitch/reducers/timelines.js
View File

@ -40,7 +40,7 @@ const normalizeTimeline = (state, timeline, statuses, next, isPartial) => {
mMap.set('loaded', true); mMap.set('loaded', true);
mMap.set('isLoading', false); mMap.set('isLoading', false);
if (!hadNext) mMap.set('next', next); 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); mMap.set('isPartial', isPartial);
})); }));
}; };