nikdoof/rustical
1
1
Fork 0
mirror of https://github.com/lennart-k/rustical.git synced 2025-12-13 22:52:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

calendar export: Fix overrides

Browse Source
This commit is contained in:
Lennart
2025-09-18 20:38:54 +02:00
parent cb1356acad
commit 242f7b9076
1 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
crates/caldav/src/calendar/methods/get.rs
View File

@@ -68,19 +68,32 @@ pub async fn route_get<C: CalendarStore, S: SubscriptionStore>(
for object in &objects { for object in &objects {
vtimezones.extend(object.get_vtimezones()); vtimezones.extend(object.get_vtimezones());
match object.get_data() { match object.get_data() {
CalendarObjectComponent::Event(EventObject { CalendarObjectComponent::Event(
event, EventObject {
timezones: object_timezones, event,
.. timezones: object_timezones,
}) => { ..
},
overrides,
) => {
timezones.extend(object_timezones); timezones.extend(object_timezones);
ical_calendar_builder = ical_calendar_builder.add_event(event.clone()); 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()); 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()); 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());
}
} }
} }
} }