fix(calendar): recurring events not working (#4265)

packages/integrations/src/nextcloud/nextcloud.integration.ts

@@ -1,4 +1,7 @@
 import type { Agent } from "https";
+import dayjs from "dayjs";
+import timezone from "dayjs/plugin/timezone";
+import utc from "dayjs/plugin/utc";
 import type { RequestInit as NodeFetchRequestInit } from "node-fetch";
 import * as ical from "node-ical";
 import { DAVClient } from "tsdav";
@@ -14,6 +17,9 @@ import type { TestingResult } from "../base/test-connection/test-connection-serv
 import type { ICalendarIntegration } from "../interfaces/calendar/calendar-integration";
 import type { CalendarEvent } from "../interfaces/calendar/calendar-types";
 
+dayjs.extend(utc);
+dayjs.extend(timezone);
+
 @HandleIntegrationErrors([integrationTsdavHttpErrorHandler])
 export class NextcloudIntegration extends Integration implements ICalendarIntegration {
   protected async testingAsync(input: IntegrationTestingInput): Promise<TestingResult> {
@@ -41,7 +47,8 @@ export class NextcloudIntegration extends Integration implements ICalendarIntegr
       )
     ).flat();
 
-    return calendarEvents.map((event): CalendarEvent => {
+    return calendarEvents
+      .map((event) => {
         // @ts-expect-error the typescript definitions for this package are wrong
         // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
         const icalData = ical.default.parseICS(event.data) as ical.CalendarResponse;
@@ -53,27 +60,35 @@ export class NextcloudIntegration extends Integration implements ICalendarIntegr
 
         logger.debug(`Converting VEVENT event to ${event.etag} from Nextcloud: ${JSON.stringify(veventObject)}`);
 
-      const date = veventObject.start;
-
         const eventUrlWithoutHost = new URL(event.url).pathname;
-      const dateInMillis = veventObject.start.valueOf();
+        const eventSlug = Buffer.from(eventUrlWithoutHost).toString("base64url");
 
-      const url = this.url(
+        const startDates = veventObject.rrule ? veventObject.rrule.between(start, end) : [veventObject.start];
-        `/apps/calendar/timeGridWeek/now/edit/sidebar/${Buffer.from(eventUrlWithoutHost).toString("base64url")}/${dateInMillis / 1000}`,
+
-      );
+        const durationMs = veventObject.end.getTime() - veventObject.start.getTime();
+
+        return startDates.map((startDate) => {
+          const timezoneOffsetMinutes = veventObject.rrule?.origOptions.tzid
+            ? dayjs(startDate).tz(veventObject.rrule.origOptions.tzid).utcOffset()
+            : 0;
+          const utcStartDate = new Date(startDate.getTime() - timezoneOffsetMinutes * 60 * 1000);
+          const endDate = new Date(utcStartDate.getTime() + durationMs);
+          const dateInMillis = utcStartDate.valueOf();
 
           return {
             title: veventObject.summary,
             subTitle: null,
             description: veventObject.description,
-        startDate: date,
+            startDate: utcStartDate,
-        endDate: veventObject.end,
+            endDate,
             image: null,
             location: veventObject.location || null,
             indicatorColor: "#ff8600",
             links: [
               {
-            href: url.toString(),
+                href: this.url(
+                  `/apps/calendar/timeGridWeek/now/edit/sidebar/${eventSlug}/${dateInMillis / 1000}`,
+                ).toString(),
                 name: "Nextcloud",
                 logo: "/images/apps/nextcloud.svg",
                 color: undefined,
@@ -82,6 +97,8 @@ export class NextcloudIntegration extends Integration implements ICalendarIntegr
             ],
           };
         });
+      })
+      .flat();
   }
 
   private async createCalendarClientAsync(agent?: Agent) {