version 0.11.7

update dependencies
2025-12-29 08:19:06 +00:00 · 2025-12-28 19:27:27 +01:00 · 2025-12-28 19:24:00 +01:00
31 changed files with 1123 additions and 310 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -393,9 +393,9 @@ dependencies = [

 [[package]]
 name = "axum-core"
-version = "0.5.5"
+version = "0.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59446ce19cd142f8833f856eb31f3eb097812d1479ab224f54d72428ca21ea22"
+checksum = "08c78f31d7b1291f7ee735c1c6780ccde7785daae9a9206026862dab7d8792d1"
 dependencies = [
 "bytes",
 "futures-core",
@@ -412,9 +412,9 @@ dependencies = [

 [[package]]
 name = "axum-extra"
-version = "0.12.3"
+version = "0.12.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6dfbd6109d91702d55fc56df06aae7ed85c465a7a451db6c0e54a4b9ca5983d1"
+checksum = "fef252edff26ddba56bbcdf2ee3307b8129acb86f5749b68990c168a6fcc9c76"
 dependencies = [
 "axum",
 "axum-core",
@@ -563,9 +563,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"

 [[package]]
 name = "cc"
-version = "1.2.50"
+version = "1.2.51"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f50d563227a1c37cc0a263f64eca3334388c01c5e4c4861a9def205c614383c"
+checksum = "7a0aeaff4ff1a90589618835a598e545176939b97874f7abc7851caa0618f203"
 dependencies = [
 "find-msvc-tools",
 "shlex",
@@ -1231,9 +1231,9 @@ dependencies = [

 [[package]]
 name = "find-msvc-tools"
-version = "0.1.5"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a3076410a55c90011c298b04d0cfa770b00fa04e1e3c97d3f6c9de105a03844"
+checksum = "645cbb3a84e60b7531617d5ae4e57f7e27308f6445f5abf653209ea76dec8dff"

 [[package]]
 name = "flume"
@@ -1761,6 +1761,7 @@ dependencies = [
 [[package]]
 name = "ical"
 version = "0.11.0"
+source = "git+https://github.com/lennart-k/ical-rs#5cce57a90a60a28845b1da5df34643663ec63da1"
 dependencies = [
 "chrono",
 "chrono-tz",
@@ -1973,9 +1974,9 @@ dependencies = [

 [[package]]
 name = "itoa"
-version = "1.0.16"
+version = "1.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ee5b5339afb4c41626dde77b7a611bd4f2c202b897852b4bcf5d03eddc61010"
+checksum = "92ecc6618181def0457392ccd0ee51198e065e016d1d527a7ac1b6dc7c1f09d2"

 [[package]]
 name = "js-sys"
@@ -2019,13 +2020,13 @@ checksum = "f9fbbcab51052fe104eb5e5d351cf728d30a5be1fe14d9be8a3b097481fb97de"

 [[package]]
 name = "libredox"
-version = "0.1.11"
+version = "0.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df15f6eac291ed1cf25865b1ee60399f57e7c227e7f51bdbd4c5270396a9ed50"
+checksum = "3d0b95e02c851351f877147b7deea7b1afb1df71b63aa5f8270716e0c5720616"
 dependencies = [
 "bitflags",
 "libc",
- "redox_syscall 0.6.0",
+ "redox_syscall 0.7.0",
 ]

 [[package]]
@@ -2093,9 +2094,9 @@ checksum = "47e1ffaa40ddd1f3ed91f717a33c8c0ee23fff369e3aa8772b9605cc1d22f4c3"

 [[package]]
 name = "matchit"
-version = "0.9.0"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ea5f97102eb9e54ab99fb70bb175589073f554bdadfb74d9bd656482ea73e2a"
+checksum = "b3eede3bdf92f3b4f9dc04072a9ce5ab557d5ec9038773bf9ffcd5588b3cc05b"

 [[package]]
 name = "matchit-serde"
@@ -2103,7 +2104,7 @@ version = "0.1.0"
 source = "git+https://github.com/lennart-k/matchit-serde?rev=e18e65d7#e18e65d75cb20ab5f6a193c84a87ee2db8e6ae0b"
 dependencies = [
 "derive_more",
- "matchit 0.9.0",
+ "matchit 0.9.1",
 "percent-encoding",
 "serde",
 "thiserror 2.0.17",
@@ -2770,9 +2771,9 @@ dependencies = [

 [[package]]
 name = "proc-macro2"
-version = "1.0.103"
+version = "1.0.104"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ee95bc4ef87b8d5ba32e8b7714ccc834865276eab0aed5c9958d00ec45f49e8"
+checksum = "9695f8df41bb4f3d222c95a67532365f569318332d03d5f3f67f37b20e6ebdf0"
 dependencies = [
 "unicode-ident",
 ]
@@ -2982,9 +2983,9 @@ dependencies = [

 [[package]]
 name = "redox_syscall"
-version = "0.6.0"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec96166dafa0886eb81fe1c0a388bece180fbef2135f97c1e2cf8302e74b43b5"
+checksum = "49f3fe0889e69e2ae9e41f4d6c4c0181701d00e4697b356fb1f74173a5e0ee27"
 dependencies = [
 "bitflags",
 ]
@@ -3046,9 +3047,9 @@ checksum = "ba39f3699c378cd8970968dcbff9c43159ea4cfbd88d43c00b22f2ef10a435d2"

 [[package]]
 name = "reqwest"
-version = "0.12.26"
+version = "0.12.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b4c14b2d9afca6a60277086b0cc6a6ae0b568f6f7916c943a8cdc79f8be240f"
+checksum = "eddd3ca559203180a307f12d114c268abf583f59b03cb906fd0b3ff8646c1147"
 dependencies = [
 "base64 0.22.1",
 "bytes",
@@ -3262,7 +3263,7 @@ dependencies = [

 [[package]]
 name = "rustical"
-version = "0.11.6"
+version = "0.11.7"
 dependencies = [
 "anyhow",
 "argon2",
@@ -3307,7 +3308,7 @@ dependencies = [

 [[package]]
 name = "rustical_caldav"
-version = "0.11.6"
+version = "0.11.7"
 dependencies = [
 "async-std",
 "async-trait",
@@ -3349,7 +3350,7 @@ dependencies = [

 [[package]]
 name = "rustical_carddav"
-version = "0.11.6"
+version = "0.11.7"
 dependencies = [
 "async-trait",
 "axum",
@@ -3382,7 +3383,7 @@ dependencies = [

 [[package]]
 name = "rustical_dav"
-version = "0.11.6"
+version = "0.11.7"
 dependencies = [
 "async-trait",
 "axum",
@@ -3394,7 +3395,7 @@ dependencies = [
 "ical",
 "itertools 0.14.0",
 "log",
- "matchit 0.9.0",
+ "matchit 0.9.1",
 "matchit-serde",
 "quick-xml",
 "rustical_xml",
@@ -3408,7 +3409,7 @@ dependencies = [

 [[package]]
 name = "rustical_dav_push"
-version = "0.11.6"
+version = "0.11.7"
 dependencies = [
 "async-trait",
 "axum",
@@ -3433,7 +3434,7 @@ dependencies = [

 [[package]]
 name = "rustical_frontend"
-version = "0.11.6"
+version = "0.11.7"
 dependencies = [
 "askama",
 "askama_web",
@@ -3469,7 +3470,7 @@ dependencies = [

 [[package]]
 name = "rustical_ical"
-version = "0.11.6"
+version = "0.11.7"
 dependencies = [
 "axum",
 "chrono",
@@ -3486,7 +3487,7 @@ dependencies = [

 [[package]]
 name = "rustical_oidc"
-version = "0.11.6"
+version = "0.11.7"
 dependencies = [
 "async-trait",
 "axum",
@@ -3502,7 +3503,7 @@ dependencies = [

 [[package]]
 name = "rustical_store"
-version = "0.11.6"
+version = "0.11.7"
 dependencies = [
 "anyhow",
 "async-trait",
@@ -3535,13 +3536,12 @@ dependencies = [

 [[package]]
 name = "rustical_store_sqlite"
-version = "0.11.6"
+version = "0.11.7"
 dependencies = [
 "async-trait",
 "chrono",
 "criterion",
 "derive_more",
- "ical",
 "password-auth",
 "password-hash",
 "pbkdf2",
@@ -3559,7 +3559,7 @@ dependencies = [

 [[package]]
 name = "rustical_xml"
-version = "0.11.6"
+version = "0.11.7"
 dependencies = [
 "quick-xml",
 "thiserror 2.0.17",
@@ -3568,9 +3568,9 @@ dependencies = [

 [[package]]
 name = "rustix"
-version = "1.1.2"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd15f8a2c5551a84d56efdc1cd049089e409ac19a3072d5037a17fd70719ff3e"
+checksum = "146c9e247ccc180c1f61615433868c99f3de3ae256a30a43b49f67c2d9171f34"
 dependencies = [
 "bitflags",
 "errno",
@@ -3622,9 +3622,9 @@ checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"

 [[package]]
 name = "ryu"
-version = "1.0.21"
+version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62049b2877bf12821e8f9ad256ee38fdc31db7387ec2d3b3f403024de2034aea"
+checksum = "a50f4cf475b65d88e057964e0e9bb1f0aa9bbb2036dc65c64596b42932536984"

 [[package]]
 name = "same-file"
@@ -3649,9 +3649,9 @@ dependencies = [

 [[package]]
 name = "schemars"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9558e172d4e8533736ba97870c4b2cd63f84b382a3d6eb063da41b91cce17289"
+checksum = "54e910108742c57a770f492731f99be216a52fadd361b06c8fb59d74ccc267d2"
 dependencies = [
 "dyn-clone",
 "ref-cast",
@@ -3727,15 +3727,15 @@ dependencies = [

 [[package]]
 name = "serde_json"
-version = "1.0.146"
+version = "1.0.148"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "217ca874ae0207aac254aa02c957ded05585a90892cc8d87f9e5fa49669dadd8"
+checksum = "3084b546a1dd6289475996f182a22aba973866ea8e8b02c51d9f46b1336a22da"
 dependencies = [
 "itoa",
 "memchr",
- "ryu",
 "serde",
 "serde_core",
+ "zmij",
 ]

 [[package]]
@@ -3800,7 +3800,7 @@ dependencies = [
 "indexmap 1.9.3",
 "indexmap 2.12.1",
 "schemars 0.9.0",
- "schemars 1.1.0",
+ "schemars 1.2.0",
 "serde_core",
 "serde_json",
 "serde_with_macros",
@@ -3858,10 +3858,11 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"

 [[package]]
 name = "signal-hook-registry"
-version = "1.4.7"
+version = "1.4.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7664a098b8e616bdfcc2dc0e9ac44eb231eedf41db4e9fe95d8d32ec728dedad"
+checksum = "c4db69cba1110affc0e9f7bcd48bbf87b3f4fc7c61fc9155afd4c469eb3d6c1b"
 dependencies = [
+ "errno",
 "libc",
 ]

@@ -4232,9 +4233,9 @@ dependencies = [

 [[package]]
 name = "tempfile"
-version = "3.23.0"
+version = "3.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d31c77bdf42a745371d260a26ca7163f1e0924b64afa0b688e61b5a9fa02f16"
+checksum = "655da9c7eb6305c55742045d5a8d2037996d61d8de95806335c7c86ce0f82e9c"
 dependencies = [
 "fastrand",
 "getrandom 0.3.4",
@@ -5381,7 +5382,7 @@ checksum = "9edde0db4769d2dc68579893f2306b26c6ecfbe0ef499b013d731b7b9247e0b9"

 [[package]]
 name = "xml_derive"
-version = "0.11.6"
+version = "0.11.7"
 dependencies = [
 "darling 0.23.0",
 "heck",
@@ -5499,3 +5500,9 @@ dependencies = [
 "quote",
 "syn 2.0.111",
 ]
+
+[[package]]
+name = "zmij"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f5858cd3a46fff31e77adea2935e357e3a2538d870741617bfb7c943e218fee6"
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -2,7 +2,7 @@
 members = ["crates/*"]

 [workspace.package]
-version = "0.11.6"
+version = "0.11.7"
 rust-version = "1.91"
 edition = "2024"
 description = "A CalDAV server"
@@ -107,12 +107,9 @@ strum = "0.27"
 strum_macros = "0.27"
 serde_json = { version = "1.0", features = ["raw_value"] }
 sqlx-sqlite = { version = "0.8", features = ["bundled"] }
-ical = { path = "../ical-rs/", features = [
+ical = { git = "https://github.com/lennart-k/ical-rs", features = [
  "chrono-tz",
 ] }
-# ical = { git = "https://github.com/lennart-k/ical-rs", features = [
-#   "chrono-tz",
-# ] }
 toml = "0.9"
 tower = "0.5"
 tower-http = { version = "0.6", features = [
--- a/crates/caldav/src/calendar/methods/get.rs
+++ b/crates/caldav/src/calendar/methods/get.rs
@@ -6,10 +6,10 @@ use axum::{extract::Path, response::Response};
 use headers::{ContentType, HeaderMapExt};
 use http::{HeaderValue, Method, StatusCode, header};
 use ical::builder::calendar::IcalCalendarBuilder;
-use ical::component::CalendarInnerData;
 use ical::generator::Emitter;
 use ical::property::Property;
 use percent_encoding::{CONTROLS, utf8_percent_encode};
+use rustical_ical::{CalendarObjectComponent, EventObject};
 use rustical_store::{CalendarStore, SubscriptionStore, auth::Principal};
 use std::collections::HashMap;
 use std::str::FromStr;
@@ -61,22 +61,22 @@ pub async fn route_get<C: CalendarStore, S: SubscriptionStore>(
        });
    }

-    for (_object_id, object) in &objects {
-        vtimezones.extend(object.get_inner().get_vtimezones());
-        match object.get_inner().get_inner() {
-            CalendarInnerData::Event(main, overrides) => {
+    for object in &objects {
+        vtimezones.extend(object.get_vtimezones());
+        match object.get_data() {
+            CalendarObjectComponent::Event(EventObject { event, .. }, overrides) => {
                ical_calendar_builder = ical_calendar_builder
-                    .add_event(main.clone())
-                    .add_events(overrides.iter().cloned());
+                    .add_event(event.clone())
+                    .add_events(overrides.iter().map(|ev| ev.event.clone()));
            }
-            CalendarInnerData::Todo(main, overrides) => {
+            CalendarObjectComponent::Todo(todo, overrides) => {
                ical_calendar_builder = ical_calendar_builder
-                    .add_todo(main.clone())
+                    .add_todo(todo.clone())
                    .add_todos(overrides.iter().cloned());
            }
-            CalendarInnerData::Journal(main, overrides) => {
+            CalendarObjectComponent::Journal(journal, overrides) => {
                ical_calendar_builder = ical_calendar_builder
-                    .add_journal(main.clone())
+                    .add_journal(journal.clone())
                    .add_journals(overrides.iter().cloned());
            }
        }
--- a/crates/caldav/src/calendar/methods/import.rs
+++ b/crates/caldav/src/calendar/methods/import.rs
@@ -82,10 +82,7 @@ pub async fn route_import<C: CalendarStore, S: SubscriptionStore>(
    let objects = expanded_cals
        .into_iter()
        .map(|cal| cal.generate())
-        .map(|ics| {
-            CalendarObject::from_ics(ics)
-                .map(|object| (object.get_inner().get_uid().to_owned(), object))
-        })
+        .map(|ics| CalendarObject::from_ics(ics, None))
        .collect::<Result<Vec<_>, _>>()?;
    let new_cal = Calendar {
        principal,
--- a/crates/caldav/src/calendar/methods/report/calendar_multiget.rs
+++ b/crates/caldav/src/calendar/methods/report/calendar_multiget.rs
@@ -21,7 +21,7 @@ pub async fn get_objects_calendar_multiget<C: CalendarStore>(
    principal: &str,
    cal_id: &str,
    store: &C,
-) -> Result<(Vec<(String, CalendarObject)>, Vec<String>), Error> {
+) -> Result<(Vec<CalendarObject>, Vec<String>), Error> {
    let mut result = vec![];
    let mut not_found = vec![];

@@ -32,7 +32,7 @@ pub async fn get_objects_calendar_multiget<C: CalendarStore>(
            let filename = filename.trim_start_matches('/');
            if let Some(object_id) = filename.strip_suffix(".ics") {
                match store.get_object(principal, cal_id, object_id, false).await {
-                    Ok(object) => result.push((object_id.to_owned(), object)),
+                    Ok(object) => result.push(object),
                    Err(rustical_store::Error::NotFound) => not_found.push(href.to_string()),
                    Err(err) => return Err(err.into()),
                }
--- a/crates/caldav/src/calendar/methods/report/calendar_query/comp_filter.rs
+++ b/crates/caldav/src/calendar/methods/report/calendar_query/comp_filter.rs
@@ -2,8 +2,8 @@ use crate::calendar::methods::report::calendar_query::{
    TimeRangeElement,
    prop_filter::{PropFilterElement, PropFilterable},
 };
-use ical::{component::IcalCalendarObject, parser::ical::component::IcalTimeZone};
-use rustical_ical::{CalendarObject, CalendarObjectType};
+use ical::parser::ical::component::IcalTimeZone;
+use rustical_ical::{CalendarObject, CalendarObjectComponent, CalendarObjectType};
 use rustical_xml::XmlDeserialize;

 #[derive(XmlDeserialize, Clone, Debug, PartialEq)]
@@ -80,11 +80,10 @@ impl CompFilterable for CalendarObject {

    fn match_subcomponents(&self, comp_filter: &CompFilterElement) -> bool {
        let mut matches = self
-            .get_inner()
            .get_vtimezones()
            .values()
            .map(|tz| tz.matches(comp_filter))
-            .chain([self.matches(comp_filter)]);
+            .chain([self.get_data().matches(comp_filter)]);

        if comp_filter.is_not_defined.is_some() {
            matches.all(|x| x)
@@ -108,7 +107,7 @@ impl CompFilterable for IcalTimeZone {
    }
 }

-impl CompFilterable for IcalCalendarObject {
+impl CompFilterable for CalendarObjectComponent {
    fn get_comp_name(&self) -> &'static str {
        CalendarObjectType::from(self).as_str()
    }
@@ -121,7 +120,7 @@ impl CompFilterable for IcalCalendarObject {
            return false;
        }
        if let Some(end) = &time_range.end
-            && let Some(first_occurence) = self.get_dtstart().unwrap_or(None)
+            && let Some(first_occurence) = self.get_first_occurence().unwrap_or(None)
            && **end < first_occurence.utc()
        {
            return false;
@@ -167,7 +166,7 @@ END:VCALENDAR";

    #[test]
    fn test_comp_filter_matching() {
-        let object = CalendarObject::from_ics(ICS.to_string()).unwrap();
+        let object = CalendarObject::from_ics(ICS.to_string(), None).unwrap();

        let comp_filter = CompFilterElement {
            is_not_defined: Some(()),
@@ -257,7 +256,7 @@ END:VCALENDAR";
    }
    #[test]
    fn test_comp_filter_time_range() {
-        let object = CalendarObject::from_ics(ICS.to_string()).unwrap();
+        let object = CalendarObject::from_ics(ICS.to_string(), None).unwrap();

        let comp_filter = CompFilterElement {
            is_not_defined: None,
@@ -312,7 +311,7 @@ END:VCALENDAR";

    #[test]
    fn test_match_timezone() {
-        let object = CalendarObject::from_ics(ICS.to_string()).unwrap();
+        let object = CalendarObject::from_ics(ICS.to_string(), None).unwrap();

        let comp_filter = CompFilterElement {
            is_not_defined: None,
--- a/crates/caldav/src/calendar/methods/report/calendar_query/mod.rs
+++ b/crates/caldav/src/calendar/methods/report/calendar_query/mod.rs
@@ -16,12 +16,12 @@ pub async fn get_objects_calendar_query<C: CalendarStore>(
    principal: &str,
    cal_id: &str,
    store: &C,
-) -> Result<Vec<(String, CalendarObject)>, Error> {
+) -> Result<Vec<CalendarObject>, Error> {
    let mut objects = store
        .calendar_query(principal, cal_id, cal_query.into())
        .await?;
    if let Some(filter) = &cal_query.filter {
-        objects.retain(|(_, object)| filter.matches(object));
+        objects.retain(|object| filter.matches(object));
    }
    Ok(objects)
 }
--- a/crates/caldav/src/calendar/methods/report/calendar_query/prop_filter.rs
+++ b/crates/caldav/src/calendar/methods/report/calendar_query/prop_filter.rs
@@ -1,16 +1,14 @@
 use super::{ParamFilterElement, TimeRangeElement};
 use ical::{
-    component::{CalendarInnerData, IcalCalendarObject},
    generator::{IcalCalendar, IcalEvent},
    parser::{
        Component,
        ical::component::{IcalJournal, IcalTimeZone, IcalTodo},
    },
    property::Property,
-    types::CalDateTime,
 };
 use rustical_dav::xml::TextMatchElement;
-use rustical_ical::{CalendarObject, UtcDateTime};
+use rustical_ical::{CalDateTime, CalendarObject, CalendarObjectComponent, UtcDateTime};
 use rustical_xml::XmlDeserialize;
 use std::collections::HashMap;

@@ -81,7 +79,7 @@ pub trait PropFilterable {

 impl PropFilterable for CalendarObject {
    fn get_property(&self, name: &str) -> Option<&Property> {
-        self.get_property(name)
+        Self::get_property(self, name)
    }
 }

@@ -115,12 +113,12 @@ impl PropFilterable for IcalTimeZone {
    }
 }

-impl PropFilterable for IcalCalendarObject {
+impl PropFilterable for CalendarObjectComponent {
    fn get_property(&self, name: &str) -> Option<&Property> {
-        match self.get_inner() {
-            CalendarInnerData::Event(event, _) => PropFilterable::get_property(event, name),
-            CalendarInnerData::Todo(todo, _) => PropFilterable::get_property(todo, name),
-            CalendarInnerData::Journal(journal, _) => PropFilterable::get_property(journal, name),
+        match self {
+            Self::Event(event, _) => PropFilterable::get_property(&event.event, name),
+            Self::Todo(todo, _) => PropFilterable::get_property(todo, name),
+            Self::Journal(journal, _) => PropFilterable::get_property(journal, name),
        }
    }
 }
--- a/crates/caldav/src/calendar/methods/report/mod.rs
+++ b/crates/caldav/src/calendar/methods/report/mod.rs
@@ -51,7 +51,7 @@ impl ReportRequest {
 }

 fn objects_response(
-    objects: Vec<(String, CalendarObject)>,
+    objects: Vec<CalendarObject>,
    not_found: Vec<String>,
    path: &str,
    principal: &str,
@@ -60,12 +60,11 @@ fn objects_response(
    prop: &PropfindType<CalendarObjectPropWrapperName>,
 ) -> Result<MultistatusElement<CalendarObjectPropWrapper, String>, Error> {
    let mut responses = Vec::new();
-    for (object_id, object) in objects {
-        let path = format!("{}/{}.ics", path, &object_id);
+    for object in objects {
+        let path = format!("{}/{}.ics", path, object.get_id());
        responses.push(
            CalendarObjectResource {
                object,
-                object_id,
                principal: principal.to_owned(),
            }
            .propfind(&path, prop, None, puri, user)?,
--- a/crates/caldav/src/calendar/methods/report/sync_collection.rs
+++ b/crates/caldav/src/calendar/methods/report/sync_collection.rs
@@ -32,12 +32,11 @@ pub async fn handle_sync_collection<C: CalendarStore>(
        .await?;

    let mut responses = Vec::new();
-    for (object_id, object) in new_objects {
-        let path = format!("{}/{}.ics", path, &object_id);
+    for object in new_objects {
+        let path = format!("{}/{}.ics", path, object.get_id());
        responses.push(
            CalendarObjectResource {
                object,
-                object_id,
                principal: principal.to_owned(),
            }
            .propfind(&path, &sync_collection.prop, None, puri, user)?,
--- a/crates/caldav/src/calendar/resource.rs
+++ b/crates/caldav/src/calendar/resource.rs
@@ -4,7 +4,6 @@ use crate::calendar::prop::{ReportMethod, SupportedCollationSet};
 use chrono::{DateTime, Utc};
 use derive_more::derive::{From, Into};
 use ical::IcalParser;
-use ical::types::CalDateTime;
 use rustical_dav::extensions::{
    CommonPropertiesExtension, CommonPropertiesProp, SyncTokenExtension, SyncTokenExtensionProp,
 };
@@ -12,6 +11,7 @@ use rustical_dav::privileges::UserPrivilegeSet;
 use rustical_dav::resource::{PrincipalUri, Resource, ResourceName};
 use rustical_dav::xml::{HrefElement, Resourcetype, ResourcetypeInner, SupportedReportSet};
 use rustical_dav_push::{DavPushExtension, DavPushExtensionProp};
+use rustical_ical::CalDateTime;
 use rustical_store::Calendar;
 use rustical_store::auth::Principal;
 use rustical_xml::{EnumVariants, PropName};
--- a/crates/caldav/src/calendar/service.rs
+++ b/crates/caldav/src/calendar/service.rs
@@ -78,10 +78,9 @@ impl<C: CalendarStore, S: SubscriptionStore> ResourceService for CalendarResourc
            .get_objects(principal, cal_id)
            .await?
            .into_iter()
-            .map(|(object_id, object)| CalendarObjectResource {
+            .map(|object| CalendarObjectResource {
                object,
                principal: principal.to_owned(),
-                object_id,
            })
            .collect())
    }
--- a/crates/caldav/src/calendar_object/methods.rs
+++ b/crates/caldav/src/calendar_object/methods.rs
@@ -78,12 +78,12 @@ pub async fn put_event<C: CalendarStore>(
        true
    };

-    let Ok(object) = CalendarObject::from_ics(body.clone()) else {
+    let Ok(object) = CalendarObject::from_ics(body.clone(), Some(object_id)) else {
        debug!("invalid calendar data:\n{body}");
        return Err(Error::PreconditionFailed(Precondition::ValidCalendarData));
    };
    cal_store
-        .put_object(principal, calendar_id, (object_id, object), overwrite)
+        .put_object(principal, calendar_id, object, overwrite)
        .await?;

    Ok(StatusCode::CREATED.into_response())
--- a/crates/caldav/src/calendar_object/resource.rs
+++ b/crates/caldav/src/calendar_object/resource.rs
@@ -4,7 +4,6 @@ use super::prop::{
 };
 use crate::Error;
 use derive_more::derive::{From, Into};
-use ical::generator::Emitter;
 use rustical_dav::{
    extensions::CommonPropertiesExtension,
    privileges::UserPrivilegeSet,
@@ -17,13 +16,12 @@ use rustical_store::auth::Principal;
 #[derive(Clone, From, Into)]
 pub struct CalendarObjectResource {
    pub object: CalendarObject,
-    pub object_id: String,
    pub principal: String,
 }

 impl ResourceName for CalendarObjectResource {
    fn get_name(&self) -> String {
-        format!("{}.ics", self.object_id)
+        format!("{}.ics", self.object.get_id())
    }
 }

@@ -54,14 +52,10 @@ impl Resource for CalendarObjectResource {
                    }
                    CalendarObjectPropName::CalendarData(CalendarData { expand, .. }) => {
                        CalendarObjectProp::CalendarData(if let Some(expand) = expand.as_ref() {
-                            self.object
-                                .get_inner()
-                                .expand_recurrence(
-                                    Some(expand.start.to_utc()),
-                                    Some(expand.end.to_utc()),
-                                )
-                                .map_err(rustical_ical::Error::ParserError)?
-                                .generate()
+                            self.object.expand_recurrence(
+                                Some(expand.start.to_utc()),
+                                Some(expand.end.to_utc()),
+                            )?
                        } else {
                            self.object.get_ics().to_owned()
                        })
--- a/crates/caldav/src/calendar_object/service.rs
+++ b/crates/caldav/src/calendar_object/service.rs
@@ -67,7 +67,6 @@ impl<C: CalendarStore> ResourceService for CalendarObjectResourceService<C> {
        Ok(CalendarObjectResource {
            object,
            principal: principal.to_owned(),
-            object_id: object_id.to_owned(),
        })
    }

--- a/crates/ical/src/address_object.rs
+++ b/crates/ical/src/address_object.rs
@@ -1,3 +1,4 @@
+use crate::{CalDateTime, LOCAL_DATE};
 use crate::{CalendarObject, Error};
 use chrono::Datelike;
 use ical::generator::Emitter;
@@ -5,9 +6,8 @@ use ical::parser::{
    Component,
    vcard::{self, component::VcardContact},
 };
-use ical::types::CalDate;
 use sha2::{Digest, Sha256};
-use std::io::BufReader;
+use std::{collections::HashMap, io::BufReader};

 #[derive(Debug, Clone)]
 pub struct AddressObject {
@@ -64,15 +64,15 @@ impl AddressObject {
    }

    #[must_use]
-    pub fn get_anniversary(&self) -> Option<(CalDate, bool)> {
+    pub fn get_anniversary(&self) -> Option<(CalDateTime, bool)> {
        let prop = self.vcard.get_property("ANNIVERSARY")?.value.as_deref()?;
-        CalDate::parse_vcard(prop).ok()
+        CalDateTime::parse_vcard(prop).ok()
    }

    #[must_use]
-    pub fn get_birthday(&self) -> Option<(CalDate, bool)> {
+    pub fn get_birthday(&self) -> Option<(CalDateTime, bool)> {
        let prop = self.vcard.get_property("BDAY")?.value.as_deref()?;
-        CalDate::parse_vcard(prop).ok()
+        CalDateTime::parse_vcard(prop).ok()
    }

    #[must_use]
@@ -87,14 +87,19 @@ impl AddressObject {
                let Some(fullname) = self.get_full_name() else {
                    return Ok(None);
                };
+                let anniversary = anniversary.date();
                let year = contains_year.then_some(anniversary.year());
-                let anniversary_start = anniversary.format();
-                let anniversary_end = anniversary.succ_opt().unwrap_or(anniversary).format();
+                let anniversary_start = anniversary.format(LOCAL_DATE);
+                let anniversary_end = anniversary
+                    .succ_opt()
+                    .unwrap_or(anniversary)
+                    .format(LOCAL_DATE);
                let uid = format!("{}-anniversary", self.get_id());

                let year_suffix = year.map(|year| format!(" ({year})")).unwrap_or_default();
-                Some(CalendarObject::from_ics(format!(
-                    r"BEGIN:VCALENDAR
+                Some(CalendarObject::from_ics(
+                    format!(
+                        r"BEGIN:VCALENDAR
 VERSION:2.0
 CALSCALE:GREGORIAN
 PRODID:-//github.com/lennart-k/rustical birthday calendar//EN
@@ -112,7 +117,9 @@ DESCRIPTION:💍 {fullname}{year_suffix}
 END:VALARM
 END:VEVENT
 END:VCALENDAR",
-                ))?)
+                    ),
+                    None,
+                )?)
            } else {
                None
            },
@@ -125,14 +132,16 @@ END:VCALENDAR",
                let Some(fullname) = self.get_full_name() else {
                    return Ok(None);
                };
+                let birthday = birthday.date();
                let year = contains_year.then_some(birthday.year());
-                let birthday_start = birthday.format();
-                let birthday_end = birthday.succ_opt().unwrap_or(birthday).format();
+                let birthday_start = birthday.format(LOCAL_DATE);
+                let birthday_end = birthday.succ_opt().unwrap_or(birthday).format(LOCAL_DATE);
                let uid = format!("{}-birthday", self.get_id());

                let year_suffix = year.map(|year| format!(" ({year})")).unwrap_or_default();
-                Some(CalendarObject::from_ics(format!(
-                    r"BEGIN:VCALENDAR
+                Some(CalendarObject::from_ics(
+                    format!(
+                        r"BEGIN:VCALENDAR
 VERSION:2.0
 CALSCALE:GREGORIAN
 PRODID:-//github.com/lennart-k/rustical birthday calendar//EN
@@ -150,7 +159,9 @@ DESCRIPTION:🎂 {fullname}{year_suffix}
 END:VALARM
 END:VEVENT
 END:VCALENDAR",
-                ))?)
+                    ),
+                    None,
+                )?)
            } else {
                None
            },
@@ -158,13 +169,13 @@ END:VCALENDAR",
    }

    /// Get significant dates associated with this address object
-    pub fn get_significant_dates(&self) -> Result<Vec<(String, CalendarObject)>, Error> {
-        let mut out = vec![];
+    pub fn get_significant_dates(&self) -> Result<HashMap<&'static str, CalendarObject>, Error> {
+        let mut out = HashMap::new();
        if let Some(birthday) = self.get_birthday_object()? {
-            out.push((birthday.get_inner().get_uid().to_owned(), birthday));
+            out.insert("birthday", birthday);
        }
        if let Some(anniversary) = self.get_anniversary_object()? {
-            out.push((anniversary.get_inner().get_uid().to_owned(), anniversary));
+            out.insert("anniversary", anniversary);
        }
        Ok(out)
    }
--- a/crates/ical/src/error.rs
+++ b/crates/ical/src/error.rs
@@ -1,5 +1,6 @@
 use axum::{http::StatusCode, response::IntoResponse};
-use ical::types::CalDateTimeError;
+
+use crate::CalDateTimeError;

 #[derive(Debug, thiserror::Error, PartialEq, Eq)]
 pub enum Error {
--- a/crates/ical/src/icalendar/event.rs
+++ b/crates/ical/src/icalendar/event.rs
@@ -20,6 +20,22 @@ impl EventObject {
        self.event.get_uid()
    }

+    pub fn get_dtstart(&self) -> Result<Option<CalDateTime>, Error> {
+        if let Some(dtstart) = self.event.get_dtstart() {
+            Ok(Some(CalDateTime::parse_prop(dtstart, &self.timezones)?))
+        } else {
+            Ok(None)
+        }
+    }
+
+    pub fn get_dtend(&self) -> Result<Option<CalDateTime>, Error> {
+        if let Some(dtend) = self.event.get_dtend() {
+            Ok(Some(CalDateTime::parse_prop(dtend, &self.timezones)?))
+        } else {
+            Ok(None)
+        }
+    }
+
    pub fn get_last_occurence(&self) -> Result<Option<CalDateTime>, Error> {
        if self.event.get_rrule().is_some() {
            // TODO: understand recurrence rules
@@ -35,6 +51,134 @@ impl EventObject {
        let first_occurence = self.get_dtstart()?;
        Ok(first_occurence.map(|first_occurence| first_occurence + duration))
    }
+
+    pub fn recurrence_ruleset(&self) -> Result<Option<rrule::RRuleSet>, Error> {
+        let dtstart: DateTime<rrule::Tz> = if let Some(dtstart) = self.get_dtstart()? {
+            if let Some(dtend) = self.get_dtend()? {
+                // DTSTART and DTEND MUST have the same timezone
+                assert_eq!(dtstart.timezone(), dtend.timezone());
+            }
+
+            dtstart
+                .as_datetime()
+                .with_timezone(&dtstart.timezone().into())
+        } else {
+            return Ok(None);
+        };
+
+        let mut rrule_set = RRuleSet::new(dtstart);
+
+        for prop in &self.event.properties {
+            rrule_set = match prop.name.as_str() {
+                "RRULE" => {
+                    let rrule = RRule::from_str(prop.value.as_ref().ok_or_else(|| {
+                        Error::RRuleError(rrule::ParseError::MissingDateGenerationRules.into())
+                    })?)?
+                    .validate(dtstart)
+                    .unwrap();
+                    rrule_set.rrule(rrule)
+                }
+                "RDATE" => {
+                    let rdate = CalDateTime::parse_prop(prop, &self.timezones)?.into();
+                    rrule_set.rdate(rdate)
+                }
+                "EXDATE" => {
+                    let exdate = CalDateTime::parse_prop(prop, &self.timezones)?.into();
+                    rrule_set.exdate(exdate)
+                }
+                _ => rrule_set,
+            }
+        }
+
+        Ok(Some(rrule_set))
+    }
+
+    pub fn expand_recurrence(
+        &self,
+        start: Option<DateTime<Utc>>,
+        end: Option<DateTime<Utc>>,
+        overrides: &[Self],
+    ) -> Result<Vec<IcalEvent>, Error> {
+        let Some(mut rrule_set) = self.recurrence_ruleset()? else {
+            return Ok(vec![self.event.clone()]);
+        };
+
+        if let Some(start) = start {
+            rrule_set = rrule_set.after(start.with_timezone(&rrule::Tz::UTC));
+        }
+        if let Some(end) = end {
+            rrule_set = rrule_set.before(end.with_timezone(&rrule::Tz::UTC));
+        }
+        let mut events = vec![];
+        let dates = rrule_set.all(2048).dates;
+        let dtstart = self.get_dtstart()?.expect("We must have a DTSTART here");
+        let computed_duration = self
+            .get_dtend()?
+            .map(|dtend| dtend.as_datetime().into_owned() - dtstart.as_datetime().as_ref());
+
+        'recurrence: for date in dates {
+            let date = CalDateTime::from(date);
+            let dateformat = if dtstart.is_date() {
+                date.format_date()
+            } else {
+                date.format()
+            };
+
+            for ev_override in overrides {
+                if let Some(override_id) = &ev_override
+                    .event
+                    .get_recurrence_id()
+                    .as_ref()
+                    .expect("overrides have a recurrence id")
+                    .value
+                    && override_id == &dateformat
+                {
+                    // We have an override for this occurence
+                    //
+                    events.push(ev_override.event.clone());
+                    continue 'recurrence;
+                }
+            }
+
+            let mut ev = self.event.clone().mutable();
+            ev.remove_property("RRULE");
+            ev.remove_property("RDATE");
+            ev.remove_property("EXDATE");
+            ev.remove_property("EXRULE");
+            let dtstart_prop = ev
+                .get_property("DTSTART")
+                .expect("We must have a DTSTART here")
+                .clone();
+            ev.remove_property("DTSTART");
+            ev.remove_property("DTEND");
+
+            ev.set_property(Property {
+                name: "RECURRENCE-ID".to_string(),
+                value: Some(dateformat.clone()),
+                params: vec![],
+            });
+            ev.set_property(Property {
+                name: "DTSTART".to_string(),
+                value: Some(dateformat),
+                params: dtstart_prop.params.clone(),
+            });
+            if let Some(duration) = computed_duration {
+                let dtend = date + duration;
+                let dtendformat = if dtstart.is_date() {
+                    dtend.format_date()
+                } else {
+                    dtend.format()
+                };
+                ev.set_property(Property {
+                    name: "DTEND".to_string(),
+                    value: Some(dtendformat),
+                    params: dtstart_prop.params,
+                });
+            }
+            events.push(ev.verify()?);
+        }
+        Ok(events)
+    }
 }

 #[cfg(test)]
--- a/crates/ical/src/icalendar/mod.rs
+++ b/crates/ical/src/icalendar/mod.rs
@@ -1,5 +1,5 @@
+mod event;
 mod object;
-mod object_type;

+pub use event::*;
 pub use object::*;
-pub use object_type::*;
--- a/crates/ical/src/icalendar/object.rs
+++ b/crates/ical/src/icalendar/object.rs
@@ -1,20 +1,195 @@
-use crate::CalendarObjectType;
+use super::EventObject;
+use crate::CalDateTime;
 use crate::Error;
-use ical::component::IcalCalendarObject;
-use ical::parser::Component;
+use chrono::DateTime;
+use chrono::Utc;
+use derive_more::Display;
+use ical::generator::{Emitter, IcalCalendar};
+use ical::parser::ical::component::IcalJournal;
+use ical::parser::ical::component::IcalTimeZone;
+use ical::parser::ical::component::IcalTodo;
 use ical::property::Property;
+use serde::Deserialize;
+use serde::Serialize;
 use sha2::{Digest, Sha256};
-use std::io::BufReader;
+use std::{collections::HashMap, io::BufReader};
+
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq, Display)]
+// specified in https://datatracker.ietf.org/doc/html/rfc5545#section-3.6
+pub enum CalendarObjectType {
+    #[serde(rename = "VEVENT")]
+    Event = 0,
+    #[serde(rename = "VTODO")]
+    Todo = 1,
+    #[serde(rename = "VJOURNAL")]
+    Journal = 2,
+}
+
+impl CalendarObjectType {
+    #[must_use]
+    pub const fn as_str(&self) -> &'static str {
+        match self {
+            Self::Event => "VEVENT",
+            Self::Todo => "VTODO",
+            Self::Journal => "VJOURNAL",
+        }
+    }
+}
+
+impl rustical_xml::ValueSerialize for CalendarObjectType {
+    fn serialize(&self) -> String {
+        self.as_str().to_owned()
+    }
+}
+
+impl rustical_xml::ValueDeserialize for CalendarObjectType {
+    fn deserialize(val: &str) -> std::result::Result<Self, rustical_xml::XmlError> {
+        match <String as rustical_xml::ValueDeserialize>::deserialize(val)?.as_str() {
+            "VEVENT" => Ok(Self::Event),
+            "VTODO" => Ok(Self::Todo),
+            "VJOURNAL" => Ok(Self::Journal),
+            _ => Err(rustical_xml::XmlError::InvalidValue(
+                rustical_xml::ParseValueError::Other(format!(
+                    "Invalid value '{val}', must be VEVENT, VTODO, or VJOURNAL"
+                )),
+            )),
+        }
+    }
+}
+
+#[derive(Debug, Clone)]
+pub enum CalendarObjectComponent {
+    Event(EventObject, Vec<EventObject>),
+    Todo(IcalTodo, Vec<IcalTodo>),
+    Journal(IcalJournal, Vec<IcalJournal>),
+}
+
+impl CalendarObjectComponent {
+    #[must_use]
+    pub fn get_uid(&self) -> &str {
+        match &self {
+            // We've made sure before that the first component exists and all components share the
+            // same UID
+            Self::Todo(todo, _) => todo.get_uid(),
+            Self::Event(event, _) => event.event.get_uid(),
+            Self::Journal(journal, _) => journal.get_uid(),
+        }
+    }
+}
+
+impl From<&CalendarObjectComponent> for CalendarObjectType {
+    fn from(value: &CalendarObjectComponent) -> Self {
+        match value {
+            CalendarObjectComponent::Event(..) => Self::Event,
+            CalendarObjectComponent::Todo(..) => Self::Todo,
+            CalendarObjectComponent::Journal(..) => Self::Journal,
+        }
+    }
+}
+
+impl CalendarObjectComponent {
+    fn from_events(mut events: Vec<EventObject>) -> Result<Self, Error> {
+        let main_event = events
+            .extract_if(.., |event| event.event.get_recurrence_id().is_none())
+            .next()
+            .expect("there must be one main event");
+        let overrides = events;
+        for event in &overrides {
+            if event.get_uid() != main_event.get_uid() {
+                return Err(Error::InvalidData(
+                    "Calendar object contains multiple UIDs".to_owned(),
+                ));
+            }
+            if event.event.get_recurrence_id().is_none() {
+                return Err(Error::InvalidData(
+                    "Calendar object can only contain one main component".to_owned(),
+                ));
+            }
+        }
+        Ok(Self::Event(main_event, overrides))
+    }
+    fn from_todos(mut todos: Vec<IcalTodo>) -> Result<Self, Error> {
+        let main_todo = todos
+            .extract_if(.., |todo| todo.get_recurrence_id().is_none())
+            .next()
+            .expect("there must be one main event");
+        let overrides = todos;
+        for todo in &overrides {
+            if todo.get_uid() != main_todo.get_uid() {
+                return Err(Error::InvalidData(
+                    "Calendar object contains multiple UIDs".to_owned(),
+                ));
+            }
+            if todo.get_recurrence_id().is_none() {
+                return Err(Error::InvalidData(
+                    "Calendar object can only contain one main component".to_owned(),
+                ));
+            }
+        }
+        Ok(Self::Todo(main_todo, overrides))
+    }
+    fn from_journals(mut journals: Vec<IcalJournal>) -> Result<Self, Error> {
+        let main_journal = journals
+            .extract_if(.., |journal| journal.get_recurrence_id().is_none())
+            .next()
+            .expect("there must be one main event");
+        let overrides = journals;
+        for journal in &overrides {
+            if journal.get_uid() != main_journal.get_uid() {
+                return Err(Error::InvalidData(
+                    "Calendar object contains multiple UIDs".to_owned(),
+                ));
+            }
+            if journal.get_recurrence_id().is_none() {
+                return Err(Error::InvalidData(
+                    "Calendar object can only contain one main component".to_owned(),
+                ));
+            }
+        }
+        Ok(Self::Journal(main_journal, overrides))
+    }
+
+    pub fn get_first_occurence(&self) -> Result<Option<CalDateTime>, Error> {
+        match &self {
+            Self::Event(main_event, overrides) => Ok(overrides
+                .iter()
+                .chain(std::iter::once(main_event))
+                .map(super::event::EventObject::get_dtstart)
+                .collect::<Result<Vec<_>, _>>()?
+                .into_iter()
+                .flatten()
+                .min()),
+            _ => Ok(None),
+        }
+    }
+
+    pub fn get_last_occurence(&self) -> Result<Option<CalDateTime>, Error> {
+        match &self {
+            Self::Event(main_event, overrides) => Ok(overrides
+                .iter()
+                .chain(std::iter::once(main_event))
+                .map(super::event::EventObject::get_last_occurence)
+                .collect::<Result<Vec<_>, _>>()?
+                .into_iter()
+                .flatten()
+                .max()),
+            _ => Ok(None),
+        }
+    }
+}

 #[derive(Debug, Clone)]
 pub struct CalendarObject {
+    data: CalendarObjectComponent,
+    properties: Vec<Property>,
+    id: String,
    ics: String,
-    inner: IcalCalendarObject,
+    vtimezones: HashMap<String, IcalTimeZone>,
 }

 impl CalendarObject {
-    pub fn from_ics(ics: String) -> Result<Self, Error> {
-        let mut parser = ical::IcalObjectParser::new(BufReader::new(ics.as_bytes()));
+    pub fn from_ics(ics: String, id: Option<String>) -> Result<Self, Error> {
+        let mut parser = ical::IcalParser::new(BufReader::new(ics.as_bytes()));
        let cal = parser.next().ok_or(Error::MissingCalendar)??;
        if parser.next().is_some() {
            return Err(Error::InvalidData(
@@ -22,18 +197,85 @@ impl CalendarObject {
            ));
        }

-        Ok(Self { ics, inner: cal })
+        if u8::from(!cal.events.is_empty())
+            + u8::from(!cal.todos.is_empty())
+            + u8::from(!cal.journals.is_empty())
+            + u8::from(!cal.free_busys.is_empty())
+            != 1
+        {
+            // https://datatracker.ietf.org/doc/html/rfc4791#section-4.1
+            return Err(Error::InvalidData(
+                "iCalendar object must have exactly one component type".to_owned(),
+            ));
+        }
+
+        let timezones: HashMap<String, Option<chrono_tz::Tz>> = cal
+            .timezones
+            .clone()
+            .into_iter()
+            .map(|timezone| (timezone.get_tzid().to_owned(), (&timezone).try_into().ok()))
+            .collect();
+
+        let vtimezones = cal
+            .timezones
+            .clone()
+            .into_iter()
+            .map(|timezone| (timezone.get_tzid().to_owned(), timezone))
+            .collect();
+
+        let data = if !cal.events.is_empty() {
+            CalendarObjectComponent::from_events(
+                cal.events
+                    .into_iter()
+                    .map(|event| EventObject {
+                        event,
+                        timezones: timezones.clone(),
+                    })
+                    .collect(),
+            )?
+        } else if !cal.todos.is_empty() {
+            CalendarObjectComponent::from_todos(cal.todos)?
+        } else if !cal.journals.is_empty() {
+            CalendarObjectComponent::from_journals(cal.journals)?
+        } else {
+            return Err(Error::InvalidData(
+                "iCalendar component type not supported :(".to_owned(),
+            ));
+        };
+
+        Ok(Self {
+            id: id.unwrap_or_else(|| data.get_uid().to_owned()),
+            data,
+            properties: cal.properties,
+            ics,
+            vtimezones,
+        })
    }

    #[must_use]
-    pub const fn get_inner(&self) -> &IcalCalendarObject {
-        &self.inner
+    pub const fn get_vtimezones(&self) -> &HashMap<String, IcalTimeZone> {
+        &self.vtimezones
+    }
+
+    #[must_use]
+    pub const fn get_data(&self) -> &CalendarObjectComponent {
+        &self.data
+    }
+
+    #[must_use]
+    pub fn get_uid(&self) -> &str {
+        self.data.get_uid()
+    }
+
+    #[must_use]
+    pub fn get_id(&self) -> &str {
+        &self.id
    }

    #[must_use]
    pub fn get_etag(&self) -> String {
        let mut hasher = Sha256::new();
-        hasher.update(self.inner.get_uid());
+        hasher.update(self.get_uid());
        hasher.update(self.get_ics());
        format!("\"{:x}\"", hasher.finalize())
    }
@@ -43,13 +285,47 @@ impl CalendarObject {
        &self.ics
    }

+    #[must_use]
+    pub fn get_component_name(&self) -> &str {
+        self.get_object_type().as_str()
+    }
+
    #[must_use]
    pub fn get_object_type(&self) -> CalendarObjectType {
-        (&self.inner).into()
+        (&self.data).into()
+    }
+
+    pub fn get_first_occurence(&self) -> Result<Option<CalDateTime>, Error> {
+        self.data.get_first_occurence()
+    }
+
+    pub fn get_last_occurence(&self) -> Result<Option<CalDateTime>, Error> {
+        self.data.get_last_occurence()
+    }
+
+    pub fn expand_recurrence(
+        &self,
+        start: Option<DateTime<Utc>>,
+        end: Option<DateTime<Utc>>,
+    ) -> Result<String, Error> {
+        // Only events can be expanded
+        match &self.data {
+            CalendarObjectComponent::Event(main_event, overrides) => {
+                let cal = IcalCalendar {
+                    properties: self.properties.clone(),
+                    events: main_event.expand_recurrence(start, end, overrides)?,
+                    ..Default::default()
+                };
+                Ok(cal.generate())
+            }
+            _ => Ok(self.get_ics().to_string()),
+        }
    }

    #[must_use]
    pub fn get_property(&self, name: &str) -> Option<&Property> {
-        self.inner.get_property(name)
+        self.properties
+            .iter()
+            .find(|property| property.name == name)
    }
 }
--- a/crates/ical/src/icalendar/object_type.rs
+++ b/crates/ical/src/icalendar/object_type.rs
@@ -1,56 +0,0 @@
-use derive_more::Display;
-use ical::component::{CalendarInnerData, IcalCalendarObject};
-use serde::{Deserialize, Serialize};
-
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq, Display)]
-// specified in https://datatracker.ietf.org/doc/html/rfc5545#section-3.6
-pub enum CalendarObjectType {
-    #[serde(rename = "VEVENT")]
-    Event = 0,
-    #[serde(rename = "VTODO")]
-    Todo = 1,
-    #[serde(rename = "VJOURNAL")]
-    Journal = 2,
-}
-
-impl CalendarObjectType {
-    #[must_use]
-    pub const fn as_str(&self) -> &'static str {
-        match self {
-            Self::Event => "VEVENT",
-            Self::Todo => "VTODO",
-            Self::Journal => "VJOURNAL",
-        }
-    }
-}
-
-impl From<&IcalCalendarObject> for CalendarObjectType {
-    fn from(value: &IcalCalendarObject) -> Self {
-        match value.get_inner() {
-            CalendarInnerData::Event(..) => Self::Event,
-            CalendarInnerData::Todo(..) => Self::Todo,
-            CalendarInnerData::Journal(..) => Self::Journal,
-        }
-    }
-}
-
-impl rustical_xml::ValueSerialize for CalendarObjectType {
-    fn serialize(&self) -> String {
-        self.as_str().to_owned()
-    }
-}
-
-impl rustical_xml::ValueDeserialize for CalendarObjectType {
-    fn deserialize(val: &str) -> std::result::Result<Self, rustical_xml::XmlError> {
-        match <String as rustical_xml::ValueDeserialize>::deserialize(val)?.as_str() {
-            "VEVENT" => Ok(Self::Event),
-            "VTODO" => Ok(Self::Todo),
-            "VJOURNAL" => Ok(Self::Journal),
-            _ => Err(rustical_xml::XmlError::InvalidValue(
-                rustical_xml::ParseValueError::Other(format!(
-                    "Invalid value '{val}', must be VEVENT, VTODO, or VJOURNAL"
-                )),
-            )),
-        }
-    }
-}
--- a/crates/ical/src/lib.rs
+++ b/crates/ical/src/lib.rs
@@ -1,7 +1,9 @@
 #![warn(clippy::all, clippy::pedantic, clippy::nursery)]
 #![allow(clippy::missing_errors_doc, clippy::missing_panics_doc)]
 mod timestamp;
+mod timezone;
 pub use timestamp::*;
+pub use timezone::*;

 mod icalendar;
 pub use icalendar::*;
--- a/crates/ical/src/timestamp.rs
+++ b/crates/ical/src/timestamp.rs
@@ -1,8 +1,35 @@
-use chrono::{DateTime, NaiveDateTime, Utc};
+use super::timezone::ICalTimezone;
+use chrono::{DateTime, Datelike, Duration, Local, NaiveDate, NaiveDateTime, NaiveTime, Utc};
+use chrono_tz::Tz;
 use derive_more::derive::Deref;
+use ical::property::Property;
 use rustical_xml::{ValueDeserialize, ValueSerialize};
+use std::{borrow::Cow, collections::HashMap, ops::Add, sync::LazyLock};

+static RE_VCARD_DATE_MM_DD: LazyLock<regex::Regex> =
+    LazyLock::new(|| regex::Regex::new(r"^--(?<m>\d{2})(?<d>\d{2})$").unwrap());
+
+const LOCAL_DATE_TIME: &str = "%Y%m%dT%H%M%S";
 const UTC_DATE_TIME: &str = "%Y%m%dT%H%M%SZ";
+pub const LOCAL_DATE: &str = "%Y%m%d";
+
+#[derive(Debug, thiserror::Error, PartialEq, Eq)]
+pub enum CalDateTimeError {
+    #[error(
+        "Timezone has X-LIC-LOCATION property to specify a timezone from the Olson database, however its value {0} is invalid"
+    )]
+    InvalidOlson(String),
+    #[error("TZID {0} does not refer to a valid timezone")]
+    InvalidTZID(String),
+    #[error("Timestamp doesn't exist because of gap in local time")]
+    LocalTimeGap,
+    #[error("Datetime string {0} has an invalid format")]
+    InvalidDatetimeFormat(String),
+    #[error("Could not parse datetime {0}")]
+    ParseError(String),
+    #[error("Duration string {0} has an invalid format")]
+    InvalidDurationFormat(String),
+}

 #[derive(Debug, Clone, Deref, PartialEq, Eq, Hash)]
 pub struct UtcDateTime(pub DateTime<Utc>);
@@ -27,3 +54,367 @@ impl ValueSerialize for UtcDateTime {
        format!("{}", self.0.format(UTC_DATE_TIME))
    }
 }
+
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub enum CalDateTime {
+    // Form 1, example: 19980118T230000 -> Local
+    // Form 2, example: 19980119T070000Z -> UTC
+    // Form 3, example: TZID=America/New_York:19980119T020000 -> Olson
+    // https://en.wikipedia.org/wiki/Tz_database
+    DateTime(DateTime<ICalTimezone>),
+    Date(NaiveDate, ICalTimezone),
+}
+
+impl From<CalDateTime> for DateTime<rrule::Tz> {
+    fn from(value: CalDateTime) -> Self {
+        value
+            .as_datetime()
+            .into_owned()
+            .with_timezone(&value.timezone().into())
+    }
+}
+
+impl From<DateTime<rrule::Tz>> for CalDateTime {
+    fn from(value: DateTime<rrule::Tz>) -> Self {
+        Self::DateTime(value.with_timezone(&value.timezone().into()))
+    }
+}
+
+impl PartialOrd for CalDateTime {
+    fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
+        Some(self.cmp(other))
+    }
+}
+
+impl Ord for CalDateTime {
+    fn cmp(&self, other: &Self) -> std::cmp::Ordering {
+        match (&self, &other) {
+            (Self::DateTime(a), Self::DateTime(b)) => a.cmp(b),
+            (Self::DateTime(a), Self::Date(..)) => a.cmp(&other.as_datetime()),
+            (Self::Date(..), Self::DateTime(b)) => self.as_datetime().as_ref().cmp(b),
+            (Self::Date(..), Self::Date(..)) => self.as_datetime().cmp(&other.as_datetime()),
+        }
+    }
+}
+
+impl From<DateTime<Local>> for CalDateTime {
+    fn from(value: DateTime<Local>) -> Self {
+        Self::DateTime(value.with_timezone(&ICalTimezone::Local))
+    }
+}
+
+impl From<DateTime<Utc>> for CalDateTime {
+    fn from(value: DateTime<Utc>) -> Self {
+        Self::DateTime(value.with_timezone(&ICalTimezone::Olson(chrono_tz::UTC)))
+    }
+}
+
+impl Add<Duration> for CalDateTime {
+    type Output = Self;
+
+    fn add(self, duration: Duration) -> Self::Output {
+        match self {
+            Self::DateTime(datetime) => Self::DateTime(datetime + duration),
+            Self::Date(date, tz) => Self::DateTime(
+                date.and_time(NaiveTime::default())
+                    .and_local_timezone(tz)
+                    .earliest()
+                    .expect("Local timezone has constant offset")
+                    + duration,
+            ),
+        }
+    }
+}
+
+impl CalDateTime {
+    pub fn parse_prop(
+        prop: &Property,
+        timezones: &HashMap<String, Option<chrono_tz::Tz>>,
+    ) -> Result<Self, CalDateTimeError> {
+        let prop_value = prop
+            .value
+            .as_ref()
+            .ok_or_else(|| CalDateTimeError::InvalidDatetimeFormat("empty property".into()))?;
+
+        let timezone = if let Some(tzid) = prop.get_param("TZID") {
+            if let Some(timezone) = timezones.get(tzid) {
+                timezone.to_owned()
+            } else {
+                // TZID refers to timezone that does not exist
+                return Err(CalDateTimeError::InvalidTZID(tzid.to_string()));
+            }
+        } else {
+            // No explicit timezone specified.
+            // This is valid and will be localtime or UTC depending on the value
+            // We will stick to this default as documented in https://github.com/lennart-k/rustical/issues/102
+            None
+        };
+
+        Self::parse(prop_value, timezone)
+    }
+
+    #[must_use]
+    pub fn format(&self) -> String {
+        match self {
+            Self::DateTime(datetime) => match datetime.timezone() {
+                ICalTimezone::Olson(chrono_tz::UTC) => datetime.format(UTC_DATE_TIME).to_string(),
+                _ => datetime.format(LOCAL_DATE_TIME).to_string(),
+            },
+            Self::Date(date, _) => date.format(LOCAL_DATE).to_string(),
+        }
+    }
+
+    #[must_use]
+    pub fn format_date(&self) -> String {
+        match self {
+            Self::DateTime(datetime) => datetime.format(LOCAL_DATE).to_string(),
+            Self::Date(date, _) => date.format(LOCAL_DATE).to_string(),
+        }
+    }
+
+    #[must_use]
+    pub fn date(&self) -> NaiveDate {
+        match self {
+            Self::DateTime(datetime) => datetime.date_naive(),
+            Self::Date(date, _) => date.to_owned(),
+        }
+    }
+
+    #[must_use]
+    pub const fn is_date(&self) -> bool {
+        matches!(&self, Self::Date(_, _))
+    }
+
+    #[must_use]
+    pub fn as_datetime(&self) -> Cow<'_, DateTime<ICalTimezone>> {
+        match self {
+            Self::DateTime(datetime) => Cow::Borrowed(datetime),
+            Self::Date(date, tz) => Cow::Owned(
+                date.and_time(NaiveTime::default())
+                    .and_local_timezone(tz.to_owned())
+                    .earliest()
+                    .expect("Midnight always exists"),
+            ),
+        }
+    }
+
+    pub fn parse(value: &str, timezone: Option<Tz>) -> Result<Self, CalDateTimeError> {
+        if let Ok(datetime) = NaiveDateTime::parse_from_str(value, LOCAL_DATE_TIME) {
+            if let Some(timezone) = timezone {
+                return Ok(Self::DateTime(
+                    datetime
+                        .and_local_timezone(timezone.into())
+                        .earliest()
+                        .ok_or(CalDateTimeError::LocalTimeGap)?,
+                ));
+            }
+            return Ok(Self::DateTime(
+                datetime
+                    .and_local_timezone(ICalTimezone::Local)
+                    .earliest()
+                    .ok_or(CalDateTimeError::LocalTimeGap)?,
+            ));
+        }
+
+        if let Ok(datetime) = NaiveDateTime::parse_from_str(value, UTC_DATE_TIME) {
+            return Ok(datetime.and_utc().into());
+        }
+        let timezone = timezone.map_or(ICalTimezone::Local, ICalTimezone::Olson);
+        if let Ok(date) = NaiveDate::parse_from_str(value, LOCAL_DATE) {
+            return Ok(Self::Date(date, timezone));
+        }
+
+        if let Ok(date) = NaiveDate::parse_from_str(value, "%Y-%m-%d") {
+            return Ok(Self::Date(date, timezone));
+        }
+        if let Ok(date) = NaiveDate::parse_from_str(value, "%Y%m%d") {
+            return Ok(Self::Date(date, timezone));
+        }
+
+        Err(CalDateTimeError::InvalidDatetimeFormat(value.to_string()))
+    }
+
+    // Also returns whether the date contains a year
+    pub fn parse_vcard(value: &str) -> Result<(Self, bool), CalDateTimeError> {
+        if let Ok(datetime) = Self::parse(value, None) {
+            return Ok((datetime, true));
+        }
+
+        if let Some(captures) = RE_VCARD_DATE_MM_DD.captures(value) {
+            // Because 1972 is a leap year
+            let year = 1972;
+            // Cannot fail because of the regex
+            let month = captures.name("m").unwrap().as_str().parse().ok().unwrap();
+            let day = captures.name("d").unwrap().as_str().parse().ok().unwrap();
+
+            return Ok((
+                Self::Date(
+                    NaiveDate::from_ymd_opt(year, month, day)
+                        .ok_or_else(|| CalDateTimeError::ParseError(value.to_string()))?,
+                    ICalTimezone::Local,
+                ),
+                false,
+            ));
+        }
+        Err(CalDateTimeError::InvalidDatetimeFormat(value.to_string()))
+    }
+
+    #[must_use]
+    pub fn utc(&self) -> DateTime<Utc> {
+        self.as_datetime().to_utc()
+    }
+
+    #[must_use]
+    pub fn timezone(&self) -> ICalTimezone {
+        match &self {
+            Self::DateTime(datetime) => datetime.timezone(),
+            Self::Date(_, tz) => tz.to_owned(),
+        }
+    }
+}
+
+impl From<CalDateTime> for DateTime<Utc> {
+    fn from(value: CalDateTime) -> Self {
+        value.utc()
+    }
+}
+
+impl Datelike for CalDateTime {
+    fn year(&self) -> i32 {
+        match &self {
+            Self::DateTime(datetime) => datetime.year(),
+            Self::Date(date, _) => date.year(),
+        }
+    }
+    fn month(&self) -> u32 {
+        match &self {
+            Self::DateTime(datetime) => datetime.month(),
+            Self::Date(date, _) => date.month(),
+        }
+    }
+
+    fn month0(&self) -> u32 {
+        match &self {
+            Self::DateTime(datetime) => datetime.month0(),
+            Self::Date(date, _) => date.month0(),
+        }
+    }
+    fn day(&self) -> u32 {
+        match &self {
+            Self::DateTime(datetime) => datetime.day(),
+            Self::Date(date, _) => date.day(),
+        }
+    }
+    fn day0(&self) -> u32 {
+        match &self {
+            Self::DateTime(datetime) => datetime.day0(),
+            Self::Date(date, _) => date.day0(),
+        }
+    }
+    fn ordinal(&self) -> u32 {
+        match &self {
+            Self::DateTime(datetime) => datetime.ordinal(),
+            Self::Date(date, _) => date.ordinal(),
+        }
+    }
+    fn ordinal0(&self) -> u32 {
+        match &self {
+            Self::DateTime(datetime) => datetime.ordinal0(),
+            Self::Date(date, _) => date.ordinal0(),
+        }
+    }
+    fn weekday(&self) -> chrono::Weekday {
+        match &self {
+            Self::DateTime(datetime) => datetime.weekday(),
+            Self::Date(date, _) => date.weekday(),
+        }
+    }
+    fn iso_week(&self) -> chrono::IsoWeek {
+        match &self {
+            Self::DateTime(datetime) => datetime.iso_week(),
+            Self::Date(date, _) => date.iso_week(),
+        }
+    }
+    fn with_year(&self, year: i32) -> Option<Self> {
+        match &self {
+            Self::DateTime(datetime) => Some(Self::DateTime(datetime.with_year(year)?)),
+            Self::Date(date, tz) => Some(Self::Date(date.with_year(year)?, tz.to_owned())),
+        }
+    }
+    fn with_month(&self, month: u32) -> Option<Self> {
+        match &self {
+            Self::DateTime(datetime) => Some(Self::DateTime(datetime.with_month(month)?)),
+            Self::Date(date, tz) => Some(Self::Date(date.with_month(month)?, tz.to_owned())),
+        }
+    }
+    fn with_month0(&self, month0: u32) -> Option<Self> {
+        match &self {
+            Self::DateTime(datetime) => Some(Self::DateTime(datetime.with_month0(month0)?)),
+            Self::Date(date, tz) => Some(Self::Date(date.with_month0(month0)?, tz.to_owned())),
+        }
+    }
+    fn with_day(&self, day: u32) -> Option<Self> {
+        match &self {
+            Self::DateTime(datetime) => Some(Self::DateTime(datetime.with_day(day)?)),
+            Self::Date(date, tz) => Some(Self::Date(date.with_day(day)?, tz.to_owned())),
+        }
+    }
+    fn with_day0(&self, day0: u32) -> Option<Self> {
+        match &self {
+            Self::DateTime(datetime) => Some(Self::DateTime(datetime.with_day0(day0)?)),
+            Self::Date(date, tz) => Some(Self::Date(date.with_day0(day0)?, tz.to_owned())),
+        }
+    }
+    fn with_ordinal(&self, ordinal: u32) -> Option<Self> {
+        match &self {
+            Self::DateTime(datetime) => Some(Self::DateTime(datetime.with_ordinal(ordinal)?)),
+            Self::Date(date, tz) => Some(Self::Date(date.with_ordinal(ordinal)?, tz.to_owned())),
+        }
+    }
+    fn with_ordinal0(&self, ordinal0: u32) -> Option<Self> {
+        match &self {
+            Self::DateTime(datetime) => Some(Self::DateTime(datetime.with_ordinal0(ordinal0)?)),
+            Self::Date(date, tz) => Some(Self::Date(date.with_ordinal0(ordinal0)?, tz.to_owned())),
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use crate::CalDateTime;
+    use chrono::NaiveDate;
+
+    #[test]
+    fn test_vcard_date() {
+        assert_eq!(
+            CalDateTime::parse_vcard("19850412").unwrap(),
+            (
+                CalDateTime::Date(
+                    NaiveDate::from_ymd_opt(1985, 4, 12).unwrap(),
+                    crate::ICalTimezone::Local
+                ),
+                true
+            )
+        );
+        assert_eq!(
+            CalDateTime::parse_vcard("1985-04-12").unwrap(),
+            (
+                CalDateTime::Date(
+                    NaiveDate::from_ymd_opt(1985, 4, 12).unwrap(),
+                    crate::ICalTimezone::Local
+                ),
+                true
+            )
+        );
+        assert_eq!(
+            CalDateTime::parse_vcard("--0412").unwrap(),
+            (
+                CalDateTime::Date(
+                    NaiveDate::from_ymd_opt(1972, 4, 12).unwrap(),
+                    crate::ICalTimezone::Local
+                ),
+                false
+            )
+        );
+    }
+}
--- a/crates/ical/src/timezone.rs
+++ b/crates/ical/src/timezone.rs
@@ -0,0 +1,92 @@
+use chrono::{Local, NaiveDate, NaiveDateTime, TimeZone};
+use chrono_tz::Tz;
+use derive_more::{Display, From};
+
+#[derive(Debug, Clone, From, PartialEq, Eq)]
+pub enum ICalTimezone {
+    Local,
+    Olson(Tz),
+}
+
+impl From<ICalTimezone> for rrule::Tz {
+    fn from(value: ICalTimezone) -> Self {
+        match value {
+            ICalTimezone::Local => Self::LOCAL,
+            ICalTimezone::Olson(tz) => Self::Tz(tz),
+        }
+    }
+}
+
+impl From<rrule::Tz> for ICalTimezone {
+    fn from(value: rrule::Tz) -> Self {
+        match value {
+            rrule::Tz::Local(_) => Self::Local,
+            rrule::Tz::Tz(tz) => Self::Olson(tz),
+        }
+    }
+}
+
+#[derive(Debug, Clone, PartialEq, Eq, Display)]
+pub enum CalTimezoneOffset {
+    Local(chrono::FixedOffset),
+    Olson(chrono_tz::TzOffset),
+}
+
+impl chrono::Offset for CalTimezoneOffset {
+    fn fix(&self) -> chrono::FixedOffset {
+        match self {
+            Self::Local(local) => local.fix(),
+            Self::Olson(olson) => olson.fix(),
+        }
+    }
+}
+
+impl TimeZone for ICalTimezone {
+    type Offset = CalTimezoneOffset;
+
+    fn from_offset(offset: &Self::Offset) -> Self {
+        match offset {
+            CalTimezoneOffset::Local(_) => Self::Local,
+            CalTimezoneOffset::Olson(offset) => Self::Olson(Tz::from_offset(offset)),
+        }
+    }
+
+    fn offset_from_local_date(&self, local: &NaiveDate) -> chrono::MappedLocalTime<Self::Offset> {
+        match self {
+            Self::Local => Local
+                .offset_from_local_date(local)
+                .map(CalTimezoneOffset::Local),
+            Self::Olson(tz) => tz
+                .offset_from_local_date(local)
+                .map(CalTimezoneOffset::Olson),
+        }
+    }
+
+    fn offset_from_local_datetime(
+        &self,
+        local: &NaiveDateTime,
+    ) -> chrono::MappedLocalTime<Self::Offset> {
+        match self {
+            Self::Local => Local
+                .offset_from_local_datetime(local)
+                .map(CalTimezoneOffset::Local),
+            Self::Olson(tz) => tz
+                .offset_from_local_datetime(local)
+                .map(CalTimezoneOffset::Olson),
+        }
+    }
+
+    fn offset_from_utc_datetime(&self, utc: &NaiveDateTime) -> Self::Offset {
+        match self {
+            Self::Local => CalTimezoneOffset::Local(Local.offset_from_utc_datetime(utc)),
+            Self::Olson(tz) => CalTimezoneOffset::Olson(tz.offset_from_utc_datetime(utc)),
+        }
+    }
+
+    fn offset_from_utc_date(&self, utc: &NaiveDate) -> Self::Offset {
+        match self {
+            Self::Local => CalTimezoneOffset::Local(Local.offset_from_utc_date(utc)),
+            Self::Olson(tz) => CalTimezoneOffset::Olson(tz.offset_from_utc_date(utc)),
+        }
+    }
+}
--- a/crates/ical/tests/test_cal_object.rs
+++ b/crates/ical/tests/test_cal_object.rs
@@ -25,6 +25,6 @@ END:VCALENDAR

 #[test]
 fn parse_calendar_object() {
-    let object = CalendarObject::from_ics(MULTI_VEVENT.to_string()).unwrap();
-    object.get_inner().expand_recurrence(None, None).unwrap();
+    let object = CalendarObject::from_ics(MULTI_VEVENT.to_string(), None).unwrap();
+    object.expand_recurrence(None, None).unwrap();
 }
--- a/crates/store/src/calendar_store.rs
+++ b/crates/store/src/calendar_store.rs
@@ -37,7 +37,7 @@ pub trait CalendarStore: Send + Sync + 'static {
    async fn import_calendar(
        &self,
        calendar: Calendar,
-        objects: Vec<(String, CalendarObject)>,
+        objects: Vec<CalendarObject>,
        merge_existing: bool,
    ) -> Result<(), Error>;

@@ -46,7 +46,7 @@ pub trait CalendarStore: Send + Sync + 'static {
        principal: &str,
        cal_id: &str,
        synctoken: i64,
-    ) -> Result<(Vec<(String, CalendarObject)>, Vec<String>, i64), Error>;
+    ) -> Result<(Vec<CalendarObject>, Vec<String>, i64), Error>;

    /// Since the <calendar-query> rules are rather complex this function
    /// is only meant to do some prefiltering
@@ -55,7 +55,7 @@ pub trait CalendarStore: Send + Sync + 'static {
        principal: &str,
        cal_id: &str,
        _query: CalendarQuery,
-    ) -> Result<Vec<(String, CalendarObject)>, Error> {
+    ) -> Result<Vec<CalendarObject>, Error> {
        self.get_objects(principal, cal_id).await
    }

@@ -69,7 +69,7 @@ pub trait CalendarStore: Send + Sync + 'static {
        &self,
        principal: &str,
        cal_id: &str,
-    ) -> Result<Vec<(String, CalendarObject)>, Error>;
+    ) -> Result<Vec<CalendarObject>, Error>;
    async fn get_object(
        &self,
        principal: &str,
@@ -81,14 +81,14 @@ pub trait CalendarStore: Send + Sync + 'static {
        &self,
        principal: String,
        cal_id: String,
-        objects: Vec<(String, CalendarObject)>,
+        objects: Vec<CalendarObject>,
        overwrite: bool,
    ) -> Result<(), Error>;
    async fn put_object(
        &self,
        principal: String,
        cal_id: String,
-        object: (String, CalendarObject),
+        object: CalendarObject,
        overwrite: bool,
    ) -> Result<(), Error> {
        self.put_objects(principal, cal_id, vec![object], overwrite)
--- a/crates/store/src/combined_calendar_store.rs
+++ b/crates/store/src/combined_calendar_store.rs
@@ -1,6 +1,5 @@
 use crate::CalendarStore;
 use async_trait::async_trait;
-use rustical_ical::CalendarObject;
 use std::{collections::HashMap, sync::Arc};

 pub trait PrefixedCalendarStore: CalendarStore {
@@ -89,7 +88,7 @@ impl CalendarStore for CombinedCalendarStore {
        principal: &str,
        cal_id: &str,
        synctoken: i64,
-    ) -> Result<(Vec<(String, CalendarObject)>, Vec<String>, i64), crate::Error> {
+    ) -> Result<(Vec<rustical_ical::CalendarObject>, Vec<String>, i64), crate::Error> {
        self.store_for_id(cal_id)
            .sync_changes(principal, cal_id, synctoken)
            .await
@@ -98,7 +97,7 @@ impl CalendarStore for CombinedCalendarStore {
    async fn import_calendar(
        &self,
        calendar: crate::Calendar,
-        objects: Vec<(String, CalendarObject)>,
+        objects: Vec<rustical_ical::CalendarObject>,
        merge_existing: bool,
    ) -> Result<(), crate::Error> {
        self.store_for_id(&calendar.id)
@@ -111,7 +110,7 @@ impl CalendarStore for CombinedCalendarStore {
        principal: &str,
        cal_id: &str,
        query: crate::calendar_store::CalendarQuery,
-    ) -> Result<Vec<(String, CalendarObject)>, crate::Error> {
+    ) -> Result<Vec<rustical_ical::CalendarObject>, crate::Error> {
        self.store_for_id(cal_id)
            .calendar_query(principal, cal_id, query)
            .await
@@ -142,7 +141,7 @@ impl CalendarStore for CombinedCalendarStore {
        &self,
        principal: &str,
        cal_id: &str,
-    ) -> Result<Vec<(String, CalendarObject)>, crate::Error> {
+    ) -> Result<Vec<rustical_ical::CalendarObject>, crate::Error> {
        self.store_for_id(cal_id)
            .get_objects(principal, cal_id)
            .await
@@ -152,7 +151,7 @@ impl CalendarStore for CombinedCalendarStore {
        &self,
        principal: String,
        cal_id: String,
-        objects: Vec<(String, CalendarObject)>,
+        objects: Vec<rustical_ical::CalendarObject>,
        overwrite: bool,
    ) -> Result<(), crate::Error> {
        self.store_for_id(&cal_id)
--- a/crates/store_sqlite/Cargo.toml
+++ b/crates/store_sqlite/Cargo.toml
@@ -36,4 +36,3 @@ pbkdf2.workspace = true
 rustical_ical.workspace = true
 rstest = { workspace = true, optional = true }
 sha2.workspace = true
-ical.workspace = true
--- a/crates/store_sqlite/benches/insert_calendar_object.rs
+++ b/crates/store_sqlite/benches/insert_calendar_object.rs
@@ -34,14 +34,10 @@ fn benchmark(c: &mut Criterion) {
        cal_store
    });

-    let object = CalendarObject::from_ics(include_str!("ical_event.ics").to_owned()).unwrap();
+    let object = CalendarObject::from_ics(include_str!("ical_event.ics").to_owned(), None).unwrap();

    let batch_size = 1000;
-    let objects: Vec<_> = std::iter::repeat_n(
-        (object.get_inner().get_uid().to_owned(), object.clone()),
-        batch_size,
-    )
-    .collect();
+    let objects: Vec<_> = std::iter::repeat_n(object.clone(), batch_size).collect();

    c.bench_function("put_batch", |b| {
        b.to_async(&runtime).iter(async || {
@@ -58,12 +54,7 @@ fn benchmark(c: &mut Criterion) {
            // yeet
            for _ in 0..1000 {
                cal_store
-                    .put_object(
-                        "user".to_owned(),
-                        "okwow".to_owned(),
-                        (object.get_inner().get_uid().to_owned(), object.clone()),
-                        true,
-                    )
+                    .put_object("user".to_owned(), "okwow".to_owned(), object.clone(), true)
                    .await
                    .unwrap();
            }
--- a/crates/store_sqlite/src/addressbook_store/birthday_calendar.rs
+++ b/crates/store_sqlite/src/addressbook_store/birthday_calendar.rs
@@ -8,6 +8,7 @@ use rustical_store::{
 };
 use sha2::{Digest, Sha256};
 use sqlx::{Executor, Sqlite};
+use std::collections::HashMap;
 use tracing::instrument;

 pub const BIRTHDAYS_PREFIX: &str = "_birthdays_";
@@ -311,7 +312,7 @@ impl CalendarStore for SqliteAddressbookStore {
    async fn import_calendar(
        &self,
        _calendar: Calendar,
-        _objects: Vec<(String, CalendarObject)>,
+        _objects: Vec<CalendarObject>,
        _merge_existing: bool,
    ) -> Result<(), Error> {
        Err(Error::ReadOnly)
@@ -323,19 +324,17 @@ impl CalendarStore for SqliteAddressbookStore {
        principal: &str,
        cal_id: &str,
        synctoken: i64,
-    ) -> Result<(Vec<(String, CalendarObject)>, Vec<String>, i64), Error> {
+    ) -> Result<(Vec<CalendarObject>, Vec<String>, i64), Error> {
        let cal_id = cal_id
            .strip_prefix(BIRTHDAYS_PREFIX)
            .ok_or(Error::NotFound)?;
        let (objects, deleted_objects, new_synctoken) =
            AddressbookStore::sync_changes(self, principal, cal_id, synctoken).await?;
-        let objects = objects
+        let objects: Result<Vec<Option<CalendarObject>>, rustical_ical::Error> = objects
            .iter()
-            .map(AddressObject::get_significant_dates)
-            .collect::<Result<Vec<_>, _>>()?
-            .into_iter()
-            .flatten()
+            .map(AddressObject::get_birthday_object)
            .collect();
+        let objects = objects?.into_iter().flatten().collect();

        Ok((objects, deleted_objects, new_synctoken))
    }
@@ -357,18 +356,22 @@ impl CalendarStore for SqliteAddressbookStore {
        &self,
        principal: &str,
        cal_id: &str,
-    ) -> Result<Vec<(String, CalendarObject)>, Error> {
+    ) -> Result<Vec<CalendarObject>, Error> {
        let cal_id = cal_id
            .strip_prefix(BIRTHDAYS_PREFIX)
            .ok_or(Error::NotFound)?;
-        Ok(AddressbookStore::get_objects(self, principal, cal_id)
-            .await?
-            .iter()
-            .map(AddressObject::get_significant_dates)
-            .collect::<Result<Vec<_>, _>>()?
+        let objects: Result<Vec<HashMap<&'static str, CalendarObject>>, rustical_ical::Error> =
+            AddressbookStore::get_objects(self, principal, cal_id)
+                .await?
+                .iter()
+                .map(AddressObject::get_significant_dates)
+                .collect();
+        let objects = objects?
            .into_iter()
-            .flatten()
-            .collect())
+            .flat_map(HashMap::into_values)
+            .collect();
+
+        Ok(objects)
    }

    #[instrument]
@@ -383,14 +386,11 @@ impl CalendarStore for SqliteAddressbookStore {
            .strip_prefix(BIRTHDAYS_PREFIX)
            .ok_or(Error::NotFound)?;
        let (addressobject_id, date_type) = object_id.rsplit_once('-').ok_or(Error::NotFound)?;
-        let addr_object =
-            AddressbookStore::get_object(self, principal, cal_id, addressobject_id, show_deleted)
-                .await?;
-        match date_type {
-            "birthday" => addr_object.get_birthday_object()?.ok_or(Error::NotFound),
-            "anniversary" => addr_object.get_anniversary_object()?.ok_or(Error::NotFound),
-            _ => Err(Error::NotFound),
-        }
+        AddressbookStore::get_object(self, principal, cal_id, addressobject_id, show_deleted)
+            .await?
+            .get_significant_dates()?
+            .remove(date_type)
+            .ok_or(Error::NotFound)
    }

    #[instrument]
@@ -398,7 +398,7 @@ impl CalendarStore for SqliteAddressbookStore {
        &self,
        _principal: String,
        _cal_id: String,
-        _objects: Vec<(String, CalendarObject)>,
+        _objects: Vec<CalendarObject>,
        _overwrite: bool,
    ) -> Result<(), Error> {
        Err(Error::ReadOnly)
--- a/crates/store_sqlite/src/calendar_store.rs
+++ b/crates/store_sqlite/src/calendar_store.rs
@@ -3,8 +3,7 @@ use crate::BEGIN_IMMEDIATE;
 use async_trait::async_trait;
 use chrono::TimeDelta;
 use derive_more::derive::Constructor;
-use ical::types::CalDateOrDateTime;
-use rustical_ical::{CalendarObject, CalendarObjectType};
+use rustical_ical::{CalDateTime, CalendarObject, CalendarObjectType};
 use rustical_store::calendar_store::CalendarQuery;
 use rustical_store::synctoken::format_synctoken;
 use rustical_store::{Calendar, CalendarMetadata, CalendarStore, CollectionMetadata, Error};
@@ -21,27 +20,17 @@ struct CalendarObjectRow {
    uid: String,
 }

-impl TryFrom<CalendarObjectRow> for (String, CalendarObject) {
-    type Error = rustical_store::Error;
-
-    fn try_from(value: CalendarObjectRow) -> Result<Self, Self::Error> {
-        let object_id = value.id.clone();
-
-        Ok((object_id, value.try_into()?))
-    }
-}
-
 impl TryFrom<CalendarObjectRow> for CalendarObject {
    type Error = rustical_store::Error;

    fn try_from(value: CalendarObjectRow) -> Result<Self, Self::Error> {
-        let object = Self::from_ics(value.ics)?;
-        if object.get_inner().get_uid() != value.uid {
+        let object = Self::from_ics(value.ics, Some(value.id))?;
+        if object.get_uid() != value.uid {
            return Err(rustical_store::Error::IcalError(
                rustical_ical::Error::InvalidData(format!(
                    "uid={} and UID={} don't match",
                    value.uid,
-                    object.get_inner().get_uid()
+                    object.get_uid()
                )),
            ));
        }
@@ -389,7 +378,7 @@ impl SqliteCalendarStore {
        executor: E,
        principal: &str,
        cal_id: &str,
-    ) -> Result<Vec<(String, CalendarObject)>, Error> {
+    ) -> Result<Vec<CalendarObject>, Error> {
        sqlx::query_as!(
            CalendarObjectRow,
            "SELECT id, uid, ics FROM calendarobjects WHERE principal = ? AND cal_id = ? AND deleted_at IS NULL",
@@ -399,7 +388,7 @@ impl SqliteCalendarStore {
        .fetch_all(executor)
        .await.map_err(crate::Error::from)?
        .into_iter()
-        .map(TryInto::try_into)
+        .map(std::convert::TryInto::try_into)
        .collect()
    }

@@ -408,7 +397,7 @@ impl SqliteCalendarStore {
        principal: &str,
        cal_id: &str,
        query: CalendarQuery,
-    ) -> Result<Vec<(String, CalendarObject)>, Error> {
+    ) -> Result<Vec<CalendarObject>, Error> {
        // We extend our query interval by one day in each direction since we really don't want to
        // miss any objects because of timezone differences
        // I've previously tried NaiveDate::MIN,MAX, but it seems like sqlite cannot handle these
@@ -433,7 +422,7 @@ impl SqliteCalendarStore {
        .await
        .map_err(crate::Error::from)?
        .into_iter()
-        .map(TryInto::try_into)
+        .map(std::convert::TryInto::try_into)
        .collect()
    }

@@ -463,26 +452,23 @@ impl SqliteCalendarStore {
        executor: E,
        principal: &str,
        cal_id: &str,
-        object_id: &str,
        object: &CalendarObject,
        overwrite: bool,
    ) -> Result<(), Error> {
-        let (uid, ics) = (object.get_inner().get_uid(), object.get_ics());
+        let (object_id, uid, ics) = (object.get_id(), object.get_uid(), object.get_ics());

        let first_occurence = object
-            .get_inner()
-            .get_dtstart()
+            .get_first_occurence()
            .ok()
            .flatten()
            .as_ref()
-            .map(CalDateOrDateTime::date_floor);
+            .map(CalDateTime::date);
        let last_occurence = object
-            .get_inner()
            .get_last_occurence()
            .ok()
            .flatten()
            .as_ref()
-            .map(CalDateOrDateTime::date_ceil);
+            .map(CalDateTime::date);
        let etag = object.get_etag();
        let object_type = object.get_object_type() as u8;

@@ -574,7 +560,7 @@ impl SqliteCalendarStore {
        principal: &str,
        cal_id: &str,
        synctoken: i64,
-    ) -> Result<(Vec<(String, CalendarObject)>, Vec<String>, i64), Error> {
+    ) -> Result<(Vec<CalendarObject>, Vec<String>, i64), Error> {
        struct Row {
            object_id: String,
            synctoken: i64,
@@ -601,7 +587,7 @@ impl SqliteCalendarStore {

        for Row { object_id, .. } in changes {
            match Self::_get_object(&mut *conn, principal, cal_id, &object_id, false).await {
-                Ok(object) => objects.push((object_id, object)),
+                Ok(object) => objects.push(object),
                Err(rustical_store::Error::NotFound) => deleted_objects.push(object_id),
                Err(err) => return Err(err),
            }
@@ -686,7 +672,7 @@ impl CalendarStore for SqliteCalendarStore {
    async fn import_calendar(
        &self,
        calendar: Calendar,
-        objects: Vec<(String, CalendarObject)>,
+        objects: Vec<CalendarObject>,
        merge_existing: bool,
    ) -> Result<(), Error> {
        let mut tx = self
@@ -709,23 +695,15 @@ impl CalendarStore for SqliteCalendarStore {
        }

        let mut sync_token = None;
-        for (object_id, object) in objects {
-            Self::_put_object(
-                &mut *tx,
-                &calendar.principal,
-                &calendar.id,
-                &object_id,
-                &object,
-                false,
-            )
-            .await?;
+        for object in objects {
+            Self::_put_object(&mut *tx, &calendar.principal, &calendar.id, &object, false).await?;

            sync_token = Some(
                Self::log_object_operation(
                    &mut tx,
                    &calendar.principal,
                    &calendar.id,
-                    &object_id,
+                    object.get_id(),
                    ChangeOperation::Add,
                )
                .await?,
@@ -751,7 +729,7 @@ impl CalendarStore for SqliteCalendarStore {
        principal: &str,
        cal_id: &str,
        query: CalendarQuery,
-    ) -> Result<Vec<(String, CalendarObject)>, Error> {
+    ) -> Result<Vec<CalendarObject>, Error> {
        Self::_calendar_query(&self.db, principal, cal_id, query).await
    }

@@ -782,7 +760,7 @@ impl CalendarStore for SqliteCalendarStore {
        &self,
        principal: &str,
        cal_id: &str,
-    ) -> Result<Vec<(String, CalendarObject)>, Error> {
+    ) -> Result<Vec<CalendarObject>, Error> {
        Self::_get_objects(&self.db, principal, cal_id).await
    }

@@ -802,7 +780,7 @@ impl CalendarStore for SqliteCalendarStore {
        &self,
        principal: String,
        cal_id: String,
-        objects: Vec<(String, CalendarObject)>,
+        objects: Vec<CalendarObject>,
        overwrite: bool,
    ) -> Result<(), Error> {
        let mut tx = self
@@ -818,21 +796,18 @@ impl CalendarStore for SqliteCalendarStore {
        }

        let mut sync_token = None;
-        for (object_id, object) in objects {
+        for object in objects {
            sync_token = Some(
                Self::log_object_operation(
                    &mut tx,
                    &principal,
                    &cal_id,
-                    &object_id,
+                    object.get_id(),
                    ChangeOperation::Add,
                )
                .await?,
            );
-            Self::_put_object(
-                &mut *tx, &principal, &cal_id, &object_id, &object, overwrite,
-            )
-            .await?;
+            Self::_put_object(&mut *tx, &principal, &cal_id, &object, overwrite).await?;
        }

        tx.commit().await.map_err(crate::Error::from)?;
@@ -910,7 +885,7 @@ impl CalendarStore for SqliteCalendarStore {
        principal: &str,
        cal_id: &str,
        synctoken: i64,
-    ) -> Result<(Vec<(String, CalendarObject)>, Vec<String>, i64), Error> {
+    ) -> Result<(Vec<CalendarObject>, Vec<String>, i64), Error> {
        Self::_sync_changes(&self.db, principal, cal_id, synctoken).await
    }
Author	SHA1	Message	Date
Lennart	c29400a799	version 0.11.7	2025-12-28 19:27:27 +01:00
Lennart	047552a726	update dependencies	2025-12-28 19:24:00 +01:00