Karl/homepage
1
0
Fork 0
mirror of https://github.com/karl0ss/homepage.git synced 2025-05-05 15:03:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Enhancement: better handle recurring events poorly handled by ical library (#4807)

Browse Source
This commit is contained in:
shamoon 2025-02-20 11:29:43 -08:00 committed by GitHub
parent 0fd4ac17cd
commit 1dd5a9e1b0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/widgets/calendar/integrations/ical.jsx
View File

@ -51,9 +51,10 @@ export default function Integration({ config, params, setEvents, hideErrors, tim
title = `${config.name}: ${title}`; title = `${config.name}: ${title}`;
} }
// 'dtend' is null for all-day events
const { dtstart, dtend = { value: 0 } } = event;
const eventToAdd = (date, i, type) => { const eventToAdd = (date, i, type) => {
// 'dtend' is null for all-day events
const { dtstart, dtend = { value: 0 } } = event;
const days = dtend.value === 0 ? 1 : (dtend.value - dtstart.value) / (1000 * 60 * 60 * 24); const days = dtend.value === 0 ? 1 : (dtend.value - dtstart.value) / (1000 * 60 * 60 * 24);
const eventDate = timezone ? DateTime.fromJSDate(date, { zone: timezone }) : DateTime.fromJSDate(date); const eventDate = timezone ? DateTime.fromJSDate(date, { zone: timezone }) : DateTime.fromJSDate(date);
@ -72,7 +73,13 @@ export default function Integration({ config, params, setEvents, hideErrors, tim
} }
}; };
const recurrenceOptions = event?.recurrenceRule?.origOptions; let recurrenceOptions = event?.recurrenceRule?.origOptions;
// RRuleSet does not have dtstart, add it manually
if (event?.recurrenceRule && event.recurrenceRule.rrules && event.recurrenceRule.rrules()?.[0]?.origOptions) {
recurrenceOptions = event.recurrenceRule.rrules()[0].origOptions;
recurrenceOptions.dtstart = dtstart.value;
}
if (recurrenceOptions && Object.keys(recurrenceOptions).length !== 0) { if (recurrenceOptions && Object.keys(recurrenceOptions).length !== 0) {
try { try {
const rule = new RRule(recurrenceOptions); const rule = new RRule(recurrenceOptions);