From fc1736618b4e1a9f178c0ae287754c6ac1244b08 Mon Sep 17 00:00:00 2001
From: shpuld <shp@cock.li>
Date: Tue, 21 Nov 2017 16:12:47 +0200
Subject: [PATCH] attempt to recognize when holes in timeline for various
 reasons, clear timeline and fetch older when showing new to get rid of holes

---
 src/components/timeline/timeline.js             | 17 +++++++++++++++--
 src/components/timeline/timeline.vue            |  2 +-
 src/modules/statuses.js                         |  7 +++++++
 src/services/api/api.service.js                 |  2 ++
 .../timeline_fetcher.service.js                 |  8 ++++++--
 5 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/src/components/timeline/timeline.js b/src/components/timeline/timeline.js
index be0aefc1f3..9ef8406b7a 100644
--- a/src/components/timeline/timeline.js
+++ b/src/components/timeline/timeline.js
@@ -29,6 +29,13 @@ const Timeline = {
     },
     newStatusCount () {
       return this.timeline.newStatusCount
+    },
+    newStatusCountStr () {
+      if (this.timeline.flushMarker) {
+        return ''
+      } else {
+        return ` (${this.newStatusCount})`
+      }
     }
   },
   components: {
@@ -64,8 +71,14 @@ const Timeline = {
   },
   methods: {
     showNewStatuses () {
-      this.$store.commit('showNewStatuses', { timeline: this.timelineName })
-      this.paused = false
+      if (this.timeline.flushMarker) {
+        this.$store.commit('clearTimeline', { timeline: this.timelineName })
+        this.$store.commit('queueFlush', { timeline: this.timelineName, id: 0 })
+        this.fetchOlderStatuses()
+      } else {
+        this.$store.commit('showNewStatuses', { timeline: this.timelineName })
+        this.paused = false
+      }
     },
     fetchOlderStatuses () {
       const store = this.$store
diff --git a/src/components/timeline/timeline.vue b/src/components/timeline/timeline.vue
index 0e2ed92c42..365c823634 100644
--- a/src/components/timeline/timeline.vue
+++ b/src/components/timeline/timeline.vue
@@ -5,7 +5,7 @@
         {{title}}
       </div>
       <button @click.prevent="showNewStatuses" class="base05 base02-background loadmore-button" v-if="timeline.newStatusCount > 0 && !timelineError">
-        {{$t('timeline.show_new')}} ({{timeline.newStatusCount}})
+        {{$t('timeline.show_new')}}{{timeline.newStatusMsg}}
       </button>
       <div @click.prevent class="base06 error  loadmore-text" v-if="timelineError">
         {{$t('timeline.error_fetching')}}
diff --git a/src/modules/statuses.js b/src/modules/statuses.js
index d954b02378..82a7eda176 100644
--- a/src/modules/statuses.js
+++ b/src/modules/statuses.js
@@ -9,6 +9,7 @@ export const defaultState = {
   notifications: [],
   favorites: new Set(),
   error: false,
+  flushMarker: 0,
   timelines: {
     mentions: {
       statuses: [],
@@ -422,6 +423,9 @@ export const mutations = {
     each(notifications, (notification) => {
       notification.seen = true
     })
+  },
+  queueFlush (state, { timeline, id }) {
+    state.timelines[timeline].flushMarker = id
   }
 }
 
@@ -458,6 +462,9 @@ const statuses = {
       // Optimistic retweeting...
       commit('setRetweeted', { status, value: true })
       apiService.retweet({ id: status.id, credentials: rootState.users.currentUser.credentials })
+    },
+    queueFlush ({ rootState, commit }, { timeline, id }) {
+      commit('queueFlush', { timeline, id })
     }
   },
   mutations
diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js
index 5de0a457b9..fa95b870b4 100644
--- a/src/services/api/api.service.js
+++ b/src/services/api/api.service.js
@@ -281,6 +281,8 @@ const fetchTimeline = ({timeline, credentials, since = false, until = false, use
     url += `/${tag}.json`
   }
 
+  params.push(['count', 20])
+
   const queryString = map(params, (param) => `${param[0]}=${param[1]}`).join('&')
   url += `?${queryString}`
 
diff --git a/src/services/timeline_fetcher/timeline_fetcher.service.js b/src/services/timeline_fetcher/timeline_fetcher.service.js
index 6b76eb5466..a02d67d034 100644
--- a/src/services/timeline_fetcher/timeline_fetcher.service.js
+++ b/src/services/timeline_fetcher/timeline_fetcher.service.js
@@ -29,8 +29,12 @@ const fetchAndUpdate = ({store, credentials, timeline = 'friends', older = false
   args['tag'] = tag
 
   return apiService.fetchTimeline(args)
-    .then((statuses) => update({store, statuses, timeline, showImmediately}),
-      () => store.dispatch('setError', { value: true }))
+    .then((statuses) => {
+      if (!older && statuses.length >= 20) {
+        store.dispatch('queueFlush', { timeline: timeline, id: timelineData.maxId })
+      }
+      update({store, statuses, timeline, showImmediately})
+    }, () => store.dispatch('setError', { value: true }))
 }
 
 const startFetching = ({timeline = 'friends', credentials, store, userId = false, tag = false}) => {