Skip to content

Update node-ical and support it's rrule-temporal changes #4010

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sdetweil merged 2 commits into from
Jan 11, 2026
Merged

Update node-ical and support it's rrule-temporal changes #4010

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1918758
chore: update node-ical
KristjanESPERANTO Jan 10, 2026
7c9a90d
fix(calendar): support node-ical 0.23.0 rrule-temporal changes
KristjanESPERANTO Jan 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 4 additions & 15 deletions modules/default/calendar/calendarfetcherutils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,26 +71,15 @@ const CalendarFetcherUtils = {
rule.options.until = moment(rule.options.until).endOf("day").toDate();
}

// Clear tzid to prevent rrule.js from double-adjusting times
if (rule.options) {
rule.options.tzid = null;
}

const dates = rule.between(searchFromDate, searchToDate, true) || [];

// Convert dates to moments in the appropriate timezone
// rrule.js returns UTC dates with tzid cleared, so we interpret them in the event's original timezone
// Convert dates to moments in the event's timezone.
// Full-day events need UTC component extraction to avoid date shifts across timezone boundaries.
return dates.map((date) => {
if (isFullDayEvent) {
// For all-day events, extract UTC date components and interpret as local calendar date
// This prevents timezone offsets from shifting the date to the previous/next day
const utcYear = date.getUTCFullYear();
const utcMonth = date.getUTCMonth();
const utcDate = date.getUTCDate();
return moment.tz([utcYear, utcMonth, utcDate], eventTimezone);
return moment.tz([date.getUTCFullYear(), date.getUTCMonth(), date.getUTCDate()], eventTimezone);
}
// For timed events, preserve the time in the event's original timezone
return moment.tz(date, "UTC").tz(eventTimezone, true);
return moment.tz(date, eventTimezone);
});
},

Expand Down
Loading