Revert "Fix: Update recurrence processing to use date range instead of sorted days"

This reverts commit f13a488.

Author: muness

src/icalUtils.ts

@@ -42,12 +42,11 @@ function isExcluded(recurrenceDate: moment.Moment, exdateArray: moment.Moment[])
   return exdateArray.some(exDate => exDate.isSame(recurrenceDate, 'day'));
 }
 
-function processRecurrenceOverrides(event: any, range: Date[], excludedDates: moment.Moment[], matchingEvents: any[]) {
+function processRecurrenceOverrides(event: any, sortedDaysToMatch: string[], excludedDates: moment.Moment[], matchingEvents: any[]) {
   for (const date in event.recurrences) {
     const recurrence = event.recurrences[date];
     const recurrenceMoment = moment(date).startOf('day');
 
-
     // Skip canceled overrides
     if (recurrence.status && recurrence.status.toUpperCase() === "CANCELLED") {
       console.debug(`Skipping canceled recurrence override: ${recurrence.summary} on ${date}`);
@@ -57,18 +56,20 @@ function processRecurrenceOverrides(event: any, range: Date[], excludedDates: mo
     recurrence.recurrent = true;
 
     // Check if this override matches the dayToMatch
-    if (moment(recurrence.start).isBetween(range.first(), range.last(), "day")) {
+    if (moment(recurrence.start).isBetween(sortedDaysToMatch.first(), sortedDaysToMatch.last(), "day", "[]")) {
       console.debug(`Adding recurring event with override: ${recurrence.summary} on ${recurrenceMoment.format('YYYY-MM-DD')}`);
       recurrence.eventType = "recurring override";
       matchingEvents.push(recurrence);
     }
   }
 }
 
-function processRecurringRules(event: any, range: Date[], excludedDates: moment.Moment[], matchingEvents: any[]) {
+function processRecurringRules(event: any, sortedDaysToMatch: string[], excludedDates: moment.Moment[], matchingEvents: any[]) {
+  const localStartOfRange = moment(sortedDaysToMatch.first()).subtract(1, 'day').startOf('day').toDate();
+  const localEndOfRange = moment(sortedDaysToMatch.last()).add(1, 'day').endOf('day').toDate();
 
   // Get recurrence dates within the range
-  const recurrenceDates = event.rrule.between(range.first(), range.last(), true);
+  const recurrenceDates = event.rrule.between(localStartOfRange, localEndOfRange, true);
 
   recurrenceDates.forEach(recurrenceDate => {
     const recurrenceMoment = tz(recurrenceDate, event.rrule.origOptions.tzid || 'UTC');
@@ -86,8 +87,11 @@ function processRecurringRules(event: any, range: Date[], excludedDates: moment.
     delete clonedEvent.rrule;
     clonedEvent.recurrent = true;
 
-    if (moment(clonedEvent.start).isBetween(range.first(), range.last(), 'day')) {
+    if (moment(clonedEvent.start).isBetween(sortedDaysToMatch.first(), sortedDaysToMatch.last(), 'day', '[]')) {
       console.debug(`Adding recurring event: ${clonedEvent.summary} ${clonedEvent.start} - ${clonedEvent.end}`);
+      console.debug("Excluded dates:", excludedDates.map(date => date.format('YYYY-MM-DD')));
+
+      console.debug(clonedEvent);
       clonedEvent.eventType = "recurring";
       matchingEvents.push(clonedEvent);
     }
@@ -100,13 +104,7 @@ function shouldIncludeOngoing(event: any, dayToMatch: string): boolean {
 
 export function filterMatchingEvents(icsArray: any[], daysToMatch: string[], showOngoing: boolean) {
   const sortedDaysToMatch = [...daysToMatch].sort();
-
-  const localStartOfRange = moment(sortedDaysToMatch.first()).startOf('day').toDate();
-  const localEndOfRange = moment(sortedDaysToMatch.last()).endOf('day').toDate();
-  const range = [localStartOfRange, localEndOfRange];
-
   return icsArray.reduce((matchingEvents, event) => {
-
     // Skip canceled parent events
     if (event.status && event.status.toUpperCase() === "CANCELLED") {
       console.debug(`Skipping canceled event: ${event.summary}`);
@@ -130,17 +128,16 @@ export function filterMatchingEvents(icsArray: any[], daysToMatch: string[], sho
 
     // Process recurrence overrides to populate matching events and excluded dates
     if (event.recurrences) {
-      processRecurrenceOverrides(event, range, excludedDates, matchingEvents);
+      processRecurrenceOverrides(event, sortedDaysToMatch, excludedDates, matchingEvents);
     }
 
     // Process recurring rules, skipping overridden dates
     if (event.rrule) {
-      processRecurringRules(event, range, excludedDates, matchingEvents)
+      processRecurringRules(event, sortedDaysToMatch, excludedDates, matchingEvents)
     }
 
-
     // Process non-recurring events
-    if (!event.recurrences && !event.rrule && moment(event.start).isBetween(range.first(), range.last())) {
+    if (!event.recurrences && !event.rrule && moment(event.start).isBetween(sortedDaysToMatch.first(), sortedDaysToMatch.last(), "day", "[]")) {
       console.debug("Adding one-off event:", {
         summary: event.summary,
         start: event.start,
@@ -162,8 +159,8 @@ export function filterMatchingEvents(icsArray: any[], daysToMatch: string[], sho
 }
 
 export function parseIcs(ics: string) {
-  let data = ical.parseICS(ics);
-  let vevents = [];
+  var data = ical.parseICS(ics);
+  var vevents = [];
 
   for (let i in data) {
     if (data[i].type != "VEVENT")