commit: c44f0a9bde08c50598207494b121ae4bdf1f0fb1
parent: 423e1b3b125f346864f12b591faf259abc922930
Author: Shpuld Shpludson <shp@cock.li>
Date: Thu, 7 Mar 2019 05:06:43 +0000
Merge branch 'fix/fetch-activities-by-last-id' into 'develop'
#406 Fetch activities by last id
See merge request pleroma/pleroma-fe!621
Diffstat:
2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/src/modules/statuses.js b/src/modules/statuses.js
@@ -10,6 +10,7 @@ const emptyTl = (userId = 0) => ({
visibleStatusesObject: {},
newStatusCount: 0,
maxId: 0,
+ minId: 0,
minVisibleId: 0,
loading: false,
followers: [],
@@ -117,11 +118,16 @@ const addNewStatuses = (state, { statuses, showImmediately = false, timeline, us
const timelineObject = state.timelines[timeline]
const maxNew = statuses.length > 0 ? maxBy(statuses, 'id').id : 0
- const older = timeline && maxNew < timelineObject.maxId
+ const minNew = statuses.length > 0 ? minBy(statuses, 'id').id : 0
+ const newer = timeline && maxNew > timelineObject.maxId && statuses.length > 0
+ const older = timeline && (minNew < timelineObject.minId || timelineObject.minId === 0) && statuses.length > 0
- if (timeline && !noIdUpdate && statuses.length > 0 && !older) {
+ if (!noIdUpdate && newer) {
timelineObject.maxId = maxNew
}
+ if (!noIdUpdate && older) {
+ timelineObject.minId = minNew
+ }
// This makes sure that user timeline won't get data meant for other
// user. I.e. opening different user profiles makes request which could
@@ -255,12 +261,9 @@ const addNewStatuses = (state, { statuses, showImmediately = false, timeline, us
processor(status)
})
- // Keep the visible statuses sorted
+ // Keep the visible statuses sorted
if (timeline) {
sortTimeline(timelineObject)
- if ((older || timelineObject.minVisibleId <= 0) && statuses.length > 0) {
- timelineObject.minVisibleId = minBy(statuses, 'id').id
- }
}
}
diff --git a/src/services/timeline_fetcher/timeline_fetcher.service.js b/src/services/timeline_fetcher/timeline_fetcher.service.js
@@ -21,7 +21,7 @@ const fetchAndUpdate = ({store, credentials, timeline = 'friends', older = false
const timelineData = rootState.statuses.timelines[camelCase(timeline)]
if (older) {
- args['until'] = until || timelineData.minVisibleId
+ args['until'] = until || timelineData.minId
} else {
args['since'] = timelineData.maxId
}