From 242f7b9076cf968b9f869195dc4c7240a19cc490 Mon Sep 17 00:00:00 2001
From: Lennart <18233294+lennart-k@users.noreply.github.com>
Date: Thu, 18 Sep 2025 20:38:54 +0200
Subject: [PATCH] calendar export: Fix overrides

---
 crates/caldav/src/calendar/methods/get.rs | 27 +++++++++++++++++------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/crates/caldav/src/calendar/methods/get.rs b/crates/caldav/src/calendar/methods/get.rs
index ca1cce2..5a31c2f 100644
--- a/crates/caldav/src/calendar/methods/get.rs
+++ b/crates/caldav/src/calendar/methods/get.rs
@@ -68,19 +68,32 @@ pub async fn route_get<C: CalendarStore, S: SubscriptionStore>(
     for object in &objects {
         vtimezones.extend(object.get_vtimezones());
         match object.get_data() {
-            CalendarObjectComponent::Event(EventObject {
-                event,
-                timezones: object_timezones,
-                ..
-            }) => {
+            CalendarObjectComponent::Event(
+                EventObject {
+                    event,
+                    timezones: object_timezones,
+                    ..
+                },
+                overrides,
+            ) => {
                 timezones.extend(object_timezones);
                 ical_calendar_builder = ical_calendar_builder.add_event(event.clone());
+                for _override in overrides {
+                    ical_calendar_builder =
+                        ical_calendar_builder.add_event(_override.event.clone());
+                }
             }
-            CalendarObjectComponent::Todo(TodoObject(todo)) => {
+            CalendarObjectComponent::Todo(TodoObject(todo), overrides) => {
                 ical_calendar_builder = ical_calendar_builder.add_todo(todo.clone());
+                for _override in overrides {
+                    ical_calendar_builder = ical_calendar_builder.add_todo(_override.0.clone());
+                }
             }
-            CalendarObjectComponent::Journal(JournalObject(journal)) => {
+            CalendarObjectComponent::Journal(JournalObject(journal), overrides) => {
                 ical_calendar_builder = ical_calendar_builder.add_journal(journal.clone());
+                for _override in overrides {
+                    ical_calendar_builder = ical_calendar_builder.add_journal(_override.0.clone());
+                }
             }
         }
     }