From 3cf278bd01fc795c1ffd37c3818dd60e5b224ae8 Mon Sep 17 00:00:00 2001 From: Dermot Duffy Date: Sat, 28 Jan 2023 09:28:36 -0800 Subject: [PATCH] Media query extension should still honor time start/end. --- src/camera/manager.ts | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/camera/manager.ts b/src/camera/manager.ts index 89597178..4e992dd3 100644 --- a/src/camera/manager.ts +++ b/src/camera/manager.ts @@ -268,25 +268,22 @@ export class CameraManager { const newChunkQueries: T[] = []; // The re-constituted combined query. - const newCombinedQueries: T[] = []; + const extendedQueries: T[] = []; for (const query of queries) { const newChunkQuery = { ...query }; - const newCombinedQuery = { ...query }; if (direction === 'later') { newChunkQuery.start = getTimeFromResults('latest') ?? undefined; - newChunkQuery.end = undefined; - newCombinedQuery.end = undefined; } else if (direction === 'earlier') { newChunkQuery.end = getTimeFromResults('earliest') ?? undefined; - newChunkQuery.start = undefined; - newCombinedQuery.start = undefined; } newChunkQuery.limit = chunkSize; - newCombinedQuery.limit = (query.limit ?? 0) + chunkSize; - newCombinedQueries.push(newCombinedQuery); + extendedQueries.push({ + ...query, + limit: (query.limit ?? 0) + chunkSize, + }); newChunkQueries.push(newChunkQuery); } @@ -299,7 +296,7 @@ export class CameraManager { } return { - queries: newCombinedQueries, + queries: extendedQueries, results: this._sortMedia(results.concat(newChunkMedia)), }; }