Skip to content

fix(calendar): update to node-ical 0.23.1 and fix full-day recurrence lookup #4013

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 3 commits into from
Jan 12, 2026
Merged

fix(calendar): update to node-ical 0.23.1 and fix full-day recurrence lookup #4013

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a885904
refactor(calendar): clean up dead code after node-ical 0.23.0 upgrade
KristjanESPERANTO Jan 11, 2026
eb9bf24
chore: update node-ical
KristjanESPERANTO Jan 11, 2026
b486466
fix(calendar): correct recurrence lookup for full-day events in easte…
KristjanESPERANTO Jan 11, 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
12 changes: 6 additions & 6 deletions modules/default/calendar/calendarfetcherutils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,6 @@ const CalendarFetcherUtils = {
const searchFromDate = pastLocalMoment.clone().subtract(Math.max(durationInMs, oneDayInMs), "milliseconds").toDate();
const searchToDate = futureLocalMoment.clone().add(1, "days").toDate();

// For all-day events, extend "until" to end of day to include the final occurrence
if (isFullDayEvent && rule.options?.until) {
rule.options.until = moment(rule.options.until).endOf("day").toDate();
}

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

// Convert dates to moments in the event's timezone.
Expand Down Expand Up @@ -313,7 +308,12 @@ const CalendarFetcherUtils = {
let recurringEventStartMoment = startMoment.clone().tz(CalendarFetcherUtils.getLocalTimezone());
let recurringEventEndMoment = recurringEventStartMoment.clone().add(durationMs, "ms");

const dateKey = recurringEventStartMoment.tz("UTC").format("YYYY-MM-DD");
// For full-day events, use local date components to match node-ical's getDateKey behavior
// For timed events, use UTC to match ISO string slice
const isFullDay = CalendarFetcherUtils.isFullDayEvent(event);
const dateKey = isFullDay
? recurringEventStartMoment.format("YYYY-MM-DD")
: recurringEventStartMoment.tz("UTC").format("YYYY-MM-DD");

// Check for overrides
if (curEvent.recurrences !== undefined) {
Expand Down
20 changes: 10 additions & 10 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
"ipaddr.js": "^2.3.0",
"moment": "^2.30.1",
"moment-timezone": "^0.6.0",
"node-ical": "^0.23.0",
"node-ical": "^0.23.1",
"nunjucks": "^3.2.4",
"pm2": "^6.0.14",
"socket.io": "^4.8.3",
Expand Down