aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorlambda <pleromagit@rogerbraun.net>2019-01-30 17:51:12 +0000
committerlambda <pleromagit@rogerbraun.net>2019-01-30 17:51:12 +0000
commitb1facdf7ad54436c2afde7c28c917cda87a5b7e3 (patch)
tree1051cf56040600cdf950c7a5f446d2606d8c8c82 /src
parent1717e700469cb6331e2905c7af0d384cf78a1188 (diff)
parent89bfc41174e1da8275e01c0280eec5ed7197b4d1 (diff)
Merge branch 'fix/timeline-too-eager-flush' into 'develop'
Fix #290 Add a better check for fresh TL flushing Closes #290 See merge request pleroma/pleroma-fe!494
Diffstat (limited to 'src')
-rw-r--r--src/services/timeline_fetcher/timeline_fetcher.service.js4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/services/timeline_fetcher/timeline_fetcher.service.js b/src/services/timeline_fetcher/timeline_fetcher.service.js
index 08d91b5a..64f8f468 100644
--- a/src/services/timeline_fetcher/timeline_fetcher.service.js
+++ b/src/services/timeline_fetcher/timeline_fetcher.service.js
@@ -29,9 +29,11 @@ const fetchAndUpdate = ({store, credentials, timeline = 'friends', older = false
args['userId'] = userId
args['tag'] = tag
+ const numStatusesBeforeFetch = timelineData.statuses.length
+
return apiService.fetchTimeline(args)
.then((statuses) => {
- if (!older && statuses.length >= 20 && !timelineData.loading && timelineData.statuses.length) {
+ if (!older && statuses.length >= 20 && !timelineData.loading && numStatusesBeforeFetch > 0) {
store.dispatch('queueFlush', { timeline: timeline, id: timelineData.maxId })
}
update({store, statuses, timeline, showImmediately, userId})