mirrors
/
mastodon
mirror of https://github.com/mastodon/mastodon.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix potential duplicates in timelines when using slow mode

pull/22125/head
Claire 2022-12-07 14:13:21 +01:00
parent b59fb28e90
commit 65ad87ce4d
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/javascript/mastodon/reducers/timelines.js
View File

@ -182,11 +182,21 @@ const reconnectTimeline = (state, usePendingItems) => {
});
};
const mergePendingItems = (state, timeline) => {
return state.update(timeline, initialTimeline, map =>
map.update('items', (list) => {
const oldItems = list.take(40);
const newItems = ImmutableOrderedSet(map.get('pendingItems'));
newItems.subtract(oldItems);
return newItems.toList().concat(oldItems);
}).set('pendingItems', ImmutableList()).set('unread', 0)
);
};
export default function timelines(state = initialState, action) {
switch(action.type) {
case TIMELINE_LOAD_PENDING:
return state.update(action.timeline, initialTimeline, map =>
map.update('items', list => map.get('pendingItems').concat(list.take(40))).set('pendingItems', ImmutableList()).set('unread', 0));
return mergePendingItems(state, action.timeline);
case TIMELINE_EXPAND_REQUEST:
return state.update(action.timeline, initialTimeline, map => map.set('isLoading', true));
case TIMELINE_EXPAND_FAIL: