From 2d6cb1eb732d5dd3badd4fa1bac2eb58889f8106 Mon Sep 17 00:00:00 2001 From: buschco Date: Mon, 4 Apr 2022 23:52:52 +0200 Subject: [PATCH] respect the timezone from the ical event (#2361) Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com> --- packages/lib/CalendarService.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/lib/CalendarService.ts b/packages/lib/CalendarService.ts index ff2675ae..295eaa22 100644 --- a/packages/lib/CalendarService.ts +++ b/packages/lib/CalendarService.ts @@ -248,10 +248,12 @@ 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"; return { - start: event.startDate.toJSDate().toISOString(), - end: event.endDate.toJSDate().toISOString(), + start: dayjs.tz(event.startDate.toJSDate(), tzid).toISOString(), + end: dayjs.tz(event.endDate.toJSDate(), tzid).toISOString(), }; });