diff --git a/lib/Controller/DaysController.php b/lib/Controller/DaysController.php index 69c4a39c..696e14bc 100644 --- a/lib/Controller/DaysController.php +++ b/lib/Controller/DaysController.php @@ -45,10 +45,8 @@ class DaysController extends GenericApiController $this->getTransformations(), ); - if (!$this->isMonthView()) { - // Preload some day responses - $this->preloadDays($list); - } + // Preload some day responses + $this->preloadDays($list); // Reverse response if requested. if ($this->isReverse()) { diff --git a/src/components/Timeline.vue b/src/components/Timeline.vue index 3ad58ce3..37213356 100644 --- a/src/components/Timeline.vue +++ b/src/components/Timeline.vue @@ -906,8 +906,13 @@ export default defineComponent({ // Aggregate fetch requests this.fetchDayQueue.push(dayId); - // Only single queries allowed for month vie - if (now || this.isMonthView) { + // If the queue has gotten large enough, just expire immediately + // This is to prevent a large number of requests from being queued + now ||= this.fetchDayQueue.length >= 16; + now ||= this.fetchDayQueue.reduce((sum, dayId) => sum + this.heads[dayId]?.day?.count ?? 0, 0) > 256; + + // Process immediately + if (now) { return this.fetchDayExpire(); }