openclaw/oikos
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

fix(calendar): expand recurring multi-day events and support YEARLY frequency

Browse Source 
Root causes:
1. parseRRule did not strip the "RRULE:" prefix stored by the ICS parser,
   causing all recurrence rules from CalDAV sync to silently fail parsing
2. YEARLY frequency (used by birthday events) was not supported
3. expandRecurringEvents filtered instances only by start date, missing
   multi-day events that start before the view window but span into it
4. All-day recurring instances got datetime end values instead of date-only

Fixes #5 (follow-up from @tschig)

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
Ulas
2026-04-03 12:47:18 +02:00
parent 261dae5990
commit 678c896862
4 changed files with 44 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/services/recurrence.js
+13 -2
View File
@@ -17,8 +17,10 @@ const DAY_MAP = { MO: 1, TU: 2, WE: 3, TH: 4, FR: 5, SA: 6, SU: 0 };
*/
function parseRRule(rule) {
if (!rule) return null;
// Strip "RRULE:" prefix if present (ICS stores rules as "RRULE:FREQ=...")
const raw = rule.startsWith('RRULE:') ? rule.slice(6) : rule;
const parts = {};
for (const segment of rule.split(';')) {
for (const segment of raw.split(';')) {
const eq = segment.indexOf('=');
if (eq === -1) continue;
parts[segment.slice(0, eq).toUpperCase()] = segment.slice(eq + 1);
@@ -31,7 +33,7 @@ function parseRRule(rule) {
.filter((d) => d !== undefined);
const until = parts.UNTIL ? parseUntilDate(parts.UNTIL) : null;
if (!['DAILY', 'WEEKLY', 'MONTHLY'].includes(freq)) return null;
if (!['DAILY', 'WEEKLY', 'MONTHLY', 'YEARLY'].includes(freq)) return null;
return { freq, interval, byday, until };
}
@@ -88,6 +90,15 @@ function nextOccurrence(baseDateStr, rrule) {
// Monatsüberlauf korrigieren (z.B. 31. März + 1 Monat → 30. April)
const lastDay = new Date(Date.UTC(next.getUTCFullYear(), next.getUTCMonth() + 1, 0)).getUTCDate();
next.setUTCDate(Math.min(targetDay, lastDay));
} else if (freq === 'YEARLY') {
const targetMonth = base.getUTCMonth();
const targetDay = base.getUTCDate();
next.setUTCFullYear(next.getUTCFullYear() + interval);
// Feb 29 in non-leap year → Feb 28
next.setUTCMonth(targetMonth);
const lastDay = new Date(Date.UTC(next.getUTCFullYear(), targetMonth + 1, 0)).getUTCDate();
next.setUTCDate(Math.min(targetDay, lastDay));
}
// UNTIL-Grenze prüfen