From 9d512e70c46fa09977c6e9458c11ec3657d110ee Mon Sep 17 00:00:00 2001 From: alannnc Date: Tue, 5 Apr 2022 13:01:47 -0600 Subject: [PATCH] Fix with ical convert to zone (#2377) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Omar López Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com> --- packages/lib/CalendarService.ts | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/packages/lib/CalendarService.ts b/packages/lib/CalendarService.ts index 295eaa22..503e5b82 100644 --- a/packages/lib/CalendarService.ts +++ b/packages/lib/CalendarService.ts @@ -248,12 +248,16 @@ export default abstract class BaseCalendarService implements Calendar { const vcalendar = new ICAL.Component(jcalData); const vevent = vcalendar.getFirstSubcomponent("vevent"); const event = new ICAL.Event(vevent); - const timezoneComp = vcalendar.getFirstSubcomponent("vtimezone"); - const tzid: string = timezoneComp?.getFirstPropertyValue("tzid") ?? "UTC"; + const vtimezone = vcalendar.getFirstSubcomponent("vtimezone"); + if (vtimezone) { + const zone = new ICAL.Timezone(vtimezone); + event.startDate = event.startDate.convertToZone(zone); + event.endDate = event.endDate.convertToZone(zone); + } return { - start: dayjs.tz(event.startDate.toJSDate(), tzid).toISOString(), - end: dayjs.tz(event.endDate.toJSDate(), tzid).toISOString(), + start: dayjs(event.startDate.toJSDate()).toISOString(), + end: dayjs(event.endDate.toJSDate()).toISOString(), }; });