public-offering
/
cal.pub0.org
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update CalendarService.ts (#3060)

pull/3065/head
m4tze 2022-06-15 14:52:24 +02:00 committed by GitHub
parent 8cfc91df95
commit 3e777dfaeb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packages/lib/CalendarService.ts
View File

@ -284,8 +284,14 @@ export default abstract class BaseCalendarService implements Calendar {
}
}
if (!currentEvent) return;
// as pointed out in https://datatracker.ietf.org/doc/html/rfc4791#section-9.6.5
// recurring events are always in utc
// do not mix up caldav and icalendar! For the recurring events here, the timezone
// provided is relevant, not as pointed out in https://datatracker.ietf.org/doc/html/rfc4791#section-9.6.5
// where recurring events are always in utc (in caldav!). Thus, apply the time zone here.
if (vtimezone) {
const zone = new ICAL.Timezone(vtimezone);
currentEvent.startDate = currentEvent.startDate.convertToZone(zone);
currentEvent.endDate = currentEvent.endDate.convertToZone(zone);
}
currentStart = dayjs(currentEvent.startDate.toJSDate());
if (currentStart.isBetween(start, end) === true) {