From 1c1526c065228edfcc8785be96f081c7bd4a8fba Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Mon, 24 Aug 2026 15:01:59 +0300 Subject: [PATCH] clear up queueFlush nonsense --- .../quick_filter_settings/quick_filter_settings.js | 2 +- src/components/settings_modal/tabs/clutter_tab.js | 2 +- src/components/settings_modal/tabs/filtering_tab.js | 2 +- src/components/timeline/timeline.js | 9 ++++----- src/stores/fetchers/timeline_fetcher.js | 2 +- src/stores/timelines.js | 12 ++++++------ 6 files changed, 14 insertions(+), 15 deletions(-) diff --git a/src/components/quick_filter_settings/quick_filter_settings.js b/src/components/quick_filter_settings/quick_filter_settings.js index 089cb1d26..482524eb6 100644 --- a/src/components/quick_filter_settings/quick_filter_settings.js +++ b/src/components/quick_filter_settings/quick_filter_settings.js @@ -28,7 +28,7 @@ const QuickFilterSettings = { path: 'replyVisibility', value: visibility, }) - useStatusesStore().queueFlushAll() + useStatusesStore().requireReloadAll() }, openTab(tab) { useInterfaceStore().openSettingsModalTab(tab) diff --git a/src/components/settings_modal/tabs/clutter_tab.js b/src/components/settings_modal/tabs/clutter_tab.js index a3f6e77a5..18300231c 100644 --- a/src/components/settings_modal/tabs/clutter_tab.js +++ b/src/components/settings_modal/tabs/clutter_tab.js @@ -36,7 +36,7 @@ const ClutterTab = { // Updating nested properties watch: { replyVisibility() { - useStatusesStore().queueFlushAll() + useStatusesStore().requireReloadAll() }, }, } diff --git a/src/components/settings_modal/tabs/filtering_tab.js b/src/components/settings_modal/tabs/filtering_tab.js index 9d49eca81..fbc7b8902 100644 --- a/src/components/settings_modal/tabs/filtering_tab.js +++ b/src/components/settings_modal/tabs/filtering_tab.js @@ -266,7 +266,7 @@ const FilteringTab = { // Updating nested properties watch: { replyVisibility() { - useStatusesStore().queueFlushAll() + useStatusesStore().requireReloadAll() }, muteFiltersObject() { this.muteFiltersDraftObject = cloneDeep( diff --git a/src/components/timeline/timeline.js b/src/components/timeline/timeline.js index a76438ad0..19b34b21e 100644 --- a/src/components/timeline/timeline.js +++ b/src/components/timeline/timeline.js @@ -63,17 +63,17 @@ const Timeline = { return this.timeline.newStatusCount }, showLoadButton() { - return this.timeline.newStatusCount > 0 || this.timeline.flushMarker !== 0 + return this.timeline.newStatusCount > 0 || this.timeline.reloadNeeded }, loadButtonString() { - if (this.timeline.flushMarker !== 0) { + if (this.timeline.reloadNeeded) { return this.$t('timeline.reload') } else { return `${this.$t('timeline.show_new')} (${this.newStatusCount})` } }, mobileLoadButtonString() { - if (this.timeline.flushMarker !== 0) { + if (this.timeline.reloadNeeded) { return '+' } else { return this.newStatusCount > 99 ? '∞' : this.newStatusCount @@ -167,9 +167,8 @@ const Timeline = { if (e.key === '.') this.showNewStatuses() }, showNewStatuses() { - if (this.timeline.flushMarker !== 0) { + if (this.timeline.reloadNeeded) { useTimelinesStore().clearTimeline(this.timelineRef.name) - useTimelinesStore().queueFlush(this.timelineRef.name, '') this.fetchOlderStatuses() } else { this.blockClicksTemporarily() diff --git a/src/stores/fetchers/timeline_fetcher.js b/src/stores/fetchers/timeline_fetcher.js index 25e6e895f..bc8664dbd 100644 --- a/src/stores/fetchers/timeline_fetcher.js +++ b/src/stores/fetchers/timeline_fetcher.js @@ -50,7 +50,7 @@ const timelineFetcher = (timeline, argument, credentials) => { return fetchTimeline(args) .then(({ data: statuses, pagination, timestamp }) => { if (!older && statuses.length >= 20 && numStatusesBeforeFetch > 0) { - useTimelinesStore().queueFlush(timeline.name, timeline.maxId) + useTimelinesStore().requireReload(timeline.name) } if (older && statuses.length === 0) { diff --git a/src/stores/timelines.js b/src/stores/timelines.js index ded412d4b..6840a28f5 100644 --- a/src/stores/timelines.js +++ b/src/stores/timelines.js @@ -16,7 +16,7 @@ const emptyTl = (name, argument = null) => { maxId: '', minId: '', streaming: false, - flushMarker: 0, + reloadNeeded: false, fetcher: null, socket: null, } @@ -158,7 +158,7 @@ export const useTimelinesStore = defineStore('timelines', { timeline.newStatusCount = 0 timeline.maxId = '' timeline.minId = '' - timeline.flushMarker = 0 + timeline.reloadNeeded = false }, activatePersistents() { TIMELINES.forEach((name) => { @@ -295,12 +295,12 @@ export const useTimelinesStore = defineStore('timelines', { syncOrder(timeline) { timeline.order = timeline.order.filter((id) => timeline.statusIds.has(id)) }, - queueFlush(timeline, id) { - this[timeline].flushMarker = id + requireReload(timeline, id) { + this[timeline].reloadNeeded = true }, - queueFlushAll() { + requireReloadAll() { Object.keys(this).forEach((timeline) => { - this[timeline].flushMarker = this[timeline].maxId + this[timeline].reloadNeeded = true }) },