matty/ncd-fe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Timelines: determine status order in expandNormalizedTimeline

Browse Source
This commit is contained in:
Alex Gleason
2021-07-08 15:16:31 -05:00
parent 1a3a6e2eb5
commit dd6746c3d7
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/soapbox/reducers/timelines.js
View File

@ -43,7 +43,7 @@ const getStatusIds = (statuses = ImmutableList()) => (
); );
const mergeStatusIds = (oldIds = ImmutableOrderedSet(), newIds = ImmutableOrderedSet()) => ( const mergeStatusIds = (oldIds = ImmutableOrderedSet(), newIds = ImmutableOrderedSet()) => (
newIds.first() > oldIds.first() ? newIds.union(oldIds) : oldIds.union(newIds) newIds.union(oldIds)
); );
const addStatusId = (oldIds = ImmutableOrderedSet(), newId) => ( const addStatusId = (oldIds = ImmutableOrderedSet(), newId) => (
@ -75,7 +75,13 @@ const expandNormalizedTimeline = (state, timelineId, statuses, next, isPartial,
} }
if (!newIds.isEmpty()) { if (!newIds.isEmpty()) {
timeline.update('items', ImmutableOrderedSet(), oldIds => mergeStatusIds(oldIds, newIds)); timeline.update('items', ImmutableOrderedSet(), oldIds => {
if (newIds.first() > oldIds.first()) {
return mergeStatusIds(oldIds, newIds);
} else {
return mergeStatusIds(newIds, oldIds);
}
});
} }
})); }));
}; };