From ce3947ac4cb8f3cc4354ae9fddf2ef17202a88a1 Mon Sep 17 00:00:00 2001 From: Bailey Pumfleet Date: Tue, 8 Feb 2022 14:56:49 +0000 Subject: [PATCH] Fetch only CalDAV calendars via TSDav (#1727) Co-authored-by: Peer Richelsen --- .../calendar/services/BaseCalendarService.ts | 28 ++++++++++--------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/lib/integrations/calendar/services/BaseCalendarService.ts b/lib/integrations/calendar/services/BaseCalendarService.ts index 11a3292b..56b289d9 100644 --- a/lib/integrations/calendar/services/BaseCalendarService.ts +++ b/lib/integrations/calendar/services/BaseCalendarService.ts @@ -191,19 +191,21 @@ export default abstract class BaseCalendarService implements Calendar { ): Promise { const objects = ( await Promise.all( - selectedCalendars.map((sc) => - fetchCalendarObjects({ - calendar: { - url: sc.externalId, - }, - headers: this.headers, - expand: true, - timeRange: { - start: new Date(dateFrom).toISOString(), - end: new Date(dateTo).toISOString(), - }, - }) - ) + selectedCalendars + .filter((sc) => sc.integration === "caldav_calendar") + .map((sc) => + fetchCalendarObjects({ + calendar: { + url: sc.externalId, + }, + headers: this.headers, + expand: true, + timeRange: { + start: new Date(dateFrom).toISOString(), + end: new Date(dateTo).toISOString(), + }, + }) + ) ) ).flat();