diff options
| author | shpuld <shp@cock.li> | 2019-01-08 23:09:03 +0200 |
|---|---|---|
| committer | shpuld <shp@cock.li> | 2019-01-08 23:09:03 +0200 |
| commit | a8f6099be22a1eff4267c859f3954c1a22e3e793 (patch) | |
| tree | d2f6e136fb9f60ada2e0226c17f4d8a26680d898 /src | |
| parent | 76cfb15b3c76531b7c3da0261720d13004c8cfdd (diff) | |
Retain userId on clearing user timeline, don't flush when empty timeline
Diffstat (limited to 'src')
| -rw-r--r-- | src/modules/statuses.js | 2 | ||||
| -rw-r--r-- | src/services/timeline_fetcher/timeline_fetcher.service.js | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/modules/statuses.js b/src/modules/statuses.js index dccccf72..b7560f1c 100644 --- a/src/modules/statuses.js +++ b/src/modules/statuses.js @@ -346,7 +346,9 @@ export const mutations = { each(oldTimeline.visibleStatuses, (status) => { oldTimeline.visibleStatusesObject[status.id] = status }) }, clearTimeline (state, { timeline }) { + const userId = state.timelines[timeline].userId state.timelines[timeline] = emptyTl() + state.timelines[timeline].userId = userId }, setFavorited (state, { status, value }) { const newStatus = state.allStatusesObject[status.id] diff --git a/src/services/timeline_fetcher/timeline_fetcher.service.js b/src/services/timeline_fetcher/timeline_fetcher.service.js index c2a7de56..727f6c60 100644 --- a/src/services/timeline_fetcher/timeline_fetcher.service.js +++ b/src/services/timeline_fetcher/timeline_fetcher.service.js @@ -31,7 +31,7 @@ const fetchAndUpdate = ({store, credentials, timeline = 'friends', older = false return apiService.fetchTimeline(args) .then((statuses) => { - if (!older && statuses.length >= 20 && !timelineData.loading) { + if (!older && statuses.length >= 20 && !timelineData.loading && timelineData.statuses.length) { store.dispatch('queueFlush', { timeline: timeline, id: timelineData.maxId }) } update({store, statuses, timeline, showImmediately, userId}) |