version 0.8.1

update ical dependency
outsource some more ical logic to ical-rs fork
2025-12-13 20:32:48 +00:00 · 2025-07-26 17:37:44 +02:00 · 2025-07-26 17:37:25 +02:00 · 2025-07-26 13:32:28 +02:00 · 2025-07-25 23:26:57 +02:00 · 2025-07-25 23:01:51 +02:00
32 changed files with 305 additions and 443 deletions
--- a/.sqlx/query-27ac68a4eea40c1cac663cad034028cf6c373354b29e3a5290c18f58101913cd.json
+++ b/.sqlx/query-27ac68a4eea40c1cac663cad034028cf6c373354b29e3a5290c18f58101913cd.json
@@ -1,6 +1,6 @@
 {
  "db_name": "SQLite",
-  "query": "SELECT *\n                FROM calendars\n                WHERE principal = ? AND deleted_at IS NOT NULL",
+  "query": "SELECT principal, id, displayname, \"order\", description, color, timezone_id, deleted_at, synctoken, subscription_url, push_topic, comp_event, comp_todo, comp_journal\n                FROM calendars\n                WHERE principal = ? AND deleted_at IS NOT NULL",
  "describe": {
    "columns": [
      {
@@ -14,68 +14,63 @@
        "type_info": "Text"
      },
      {
-        "name": "synctoken",
+        "name": "displayname",
        "ordinal": 2,
-        "type_info": "Integer"
+        "type_info": "Text"
      },
      {
-        "name": "displayname",
+        "name": "order",
        "ordinal": 3,
-        "type_info": "Text"
+        "type_info": "Integer"
      },
      {
        "name": "description",
        "ordinal": 4,
        "type_info": "Text"
      },
-      {
-        "name": "order",
-        "ordinal": 5,
-        "type_info": "Integer"
-      },
      {
        "name": "color",
-        "ordinal": 6,
-        "type_info": "Text"
-      },
-      {
-        "name": "timezone",
-        "ordinal": 7,
+        "ordinal": 5,
        "type_info": "Text"
      },
      {
        "name": "timezone_id",
-        "ordinal": 8,
+        "ordinal": 6,
        "type_info": "Text"
      },
      {
        "name": "deleted_at",
-        "ordinal": 9,
+        "ordinal": 7,
        "type_info": "Datetime"
      },
+      {
+        "name": "synctoken",
+        "ordinal": 8,
+        "type_info": "Integer"
+      },
      {
        "name": "subscription_url",
-        "ordinal": 10,
+        "ordinal": 9,
        "type_info": "Text"
      },
      {
        "name": "push_topic",
-        "ordinal": 11,
+        "ordinal": 10,
        "type_info": "Text"
      },
      {
        "name": "comp_event",
-        "ordinal": 12,
+        "ordinal": 11,
        "type_info": "Bool"
      },
      {
        "name": "comp_todo",
-        "ordinal": 13,
+        "ordinal": 12,
        "type_info": "Bool"
      },
      {
        "name": "comp_journal",
-        "ordinal": 14,
+        "ordinal": 13,
        "type_info": "Bool"
      }
    ],
@@ -85,14 +80,13 @@
    "nullable": [
      false,
      false,
-      false,
-      true,
      true,
      false,
      true,
      true,
      true,
      true,
+      false,
      true,
      false,
      false,
@@ -100,5 +94,5 @@
      false
    ]
  },
-  "hash": "cce62f7829bd688cd8c7928b587bc31f0e50865c214b1df113350bea2c254237"
+  "hash": "27ac68a4eea40c1cac663cad034028cf6c373354b29e3a5290c18f58101913cd"
 }
--- a/.sqlx/query-46ae176a06e314492f661c28436d6370883052c854da43475d7ced60cf8326e3.json
+++ b/.sqlx/query-46ae176a06e314492f661c28436d6370883052c854da43475d7ced60cf8326e3.json
@@ -0,0 +1,12 @@
+{
+  "db_name": "SQLite",
+  "query": "UPDATE calendars SET principal = ?, id = ?, displayname = ?, description = ?, \"order\" = ?, color = ?, timezone_id = ?, push_topic = ?, comp_event = ?, comp_todo = ?, comp_journal = ?\n                WHERE (principal, id) = (?, ?)",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 13
+    },
+    "nullable": []
+  },
+  "hash": "46ae176a06e314492f661c28436d6370883052c854da43475d7ced60cf8326e3"
+}
--- a/.sqlx/query-5132ee8198f155242aa332a10019c48ec334884bcf7841c8aa03fd5eb11351d9.json
+++ b/.sqlx/query-5132ee8198f155242aa332a10019c48ec334884bcf7841c8aa03fd5eb11351d9.json
@@ -1,12 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "INSERT INTO calendars (principal, id, displayname, description, \"order\", color, subscription_url, timezone, timezone_id, push_topic, comp_event, comp_todo, comp_journal)\n                VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 13
-    },
-    "nullable": []
-  },
-  "hash": "5132ee8198f155242aa332a10019c48ec334884bcf7841c8aa03fd5eb11351d9"
-}
--- a/.sqlx/query-60b940ff493e7c0fcb2ffe8ae97172c6444525ffeec21b194bd7443d11d06113.json
+++ b/.sqlx/query-60b940ff493e7c0fcb2ffe8ae97172c6444525ffeec21b194bd7443d11d06113.json
@@ -0,0 +1,12 @@
+{
+  "db_name": "SQLite",
+  "query": "INSERT INTO calendars (principal, id, displayname, description, \"order\", color, subscription_url, timezone_id, push_topic, comp_event, comp_todo, comp_journal)\n                VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 12
+    },
+    "nullable": []
+  },
+  "hash": "60b940ff493e7c0fcb2ffe8ae97172c6444525ffeec21b194bd7443d11d06113"
+}
--- a/.sqlx/query-bb2fa030f2e7c7afdb38c5c54cb31de5293be332d86cf643977d479999542553.json
+++ b/.sqlx/query-bb2fa030f2e7c7afdb38c5c54cb31de5293be332d86cf643977d479999542553.json
@@ -39,43 +39,38 @@
        "type_info": "Text"
      },
      {
-        "name": "timezone",
+        "name": "timezone_id",
        "ordinal": 7,
        "type_info": "Text"
      },
-      {
-        "name": "timezone_id",
-        "ordinal": 8,
-        "type_info": "Text"
-      },
      {
        "name": "deleted_at",
-        "ordinal": 9,
+        "ordinal": 8,
        "type_info": "Datetime"
      },
      {
        "name": "subscription_url",
-        "ordinal": 10,
+        "ordinal": 9,
        "type_info": "Text"
      },
      {
        "name": "push_topic",
-        "ordinal": 11,
+        "ordinal": 10,
        "type_info": "Text"
      },
      {
        "name": "comp_event",
-        "ordinal": 12,
+        "ordinal": 11,
        "type_info": "Bool"
      },
      {
        "name": "comp_todo",
-        "ordinal": 13,
+        "ordinal": 12,
        "type_info": "Bool"
      },
      {
        "name": "comp_journal",
-        "ordinal": 14,
+        "ordinal": 13,
        "type_info": "Bool"
      }
    ],
@@ -93,7 +88,6 @@
      true,
      true,
      true,
-      true,
      false,
      false,
      false,
--- a/.sqlx/query-cedfb82b38fdd0c7681b9873b1008abee4a2f4ca16abad1b837f256d0bf416b1.json
+++ b/.sqlx/query-cedfb82b38fdd0c7681b9873b1008abee4a2f4ca16abad1b837f256d0bf416b1.json
@@ -39,43 +39,38 @@
        "type_info": "Text"
      },
      {
-        "name": "timezone",
+        "name": "timezone_id",
        "ordinal": 7,
        "type_info": "Text"
      },
-      {
-        "name": "timezone_id",
-        "ordinal": 8,
-        "type_info": "Text"
-      },
      {
        "name": "deleted_at",
-        "ordinal": 9,
+        "ordinal": 8,
        "type_info": "Datetime"
      },
      {
        "name": "subscription_url",
-        "ordinal": 10,
+        "ordinal": 9,
        "type_info": "Text"
      },
      {
        "name": "push_topic",
-        "ordinal": 11,
+        "ordinal": 10,
        "type_info": "Text"
      },
      {
        "name": "comp_event",
-        "ordinal": 12,
+        "ordinal": 11,
        "type_info": "Bool"
      },
      {
        "name": "comp_todo",
-        "ordinal": 13,
+        "ordinal": 12,
        "type_info": "Bool"
      },
      {
        "name": "comp_journal",
-        "ordinal": 14,
+        "ordinal": 13,
        "type_info": "Bool"
      }
    ],
@@ -93,7 +88,6 @@
      true,
      true,
      true,
-      true,
      false,
      false,
      false,
--- a/.sqlx/query-d65c9c40606e59dd816a51b9b9ac60fd2ff81aaa358fcc038134e9a68ba45ad7.json
+++ b/.sqlx/query-d65c9c40606e59dd816a51b9b9ac60fd2ff81aaa358fcc038134e9a68ba45ad7.json
@@ -1,12 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "UPDATE calendars SET principal = ?, id = ?, displayname = ?, description = ?, \"order\" = ?, color = ?, timezone = ?, timezone_id = ?, push_topic = ?, comp_event = ?, comp_todo = ?, comp_journal = ?\n                WHERE (principal, id) = (?, ?)",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 14
-    },
-    "nullable": []
-  },
-  "hash": "d65c9c40606e59dd816a51b9b9ac60fd2ff81aaa358fcc038134e9a68ba45ad7"
-}
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1598,11 +1598,14 @@ dependencies = [
 [[package]]
 name = "ical"
 version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b7cab7543a8b7729a19e2c04309f902861293dcdae6558dfbeb634454d279f6"
+source = "git+https://github.com/lennart-k/ical-rs#cee8e09a907ce336ac7e03397c5d81d0fb0d9faf"
 dependencies = [
+ "chrono",
+ "chrono-tz",
+ "lazy_static",
+ "regex",
 "serde",
- "thiserror 1.0.69",
+ "thiserror 2.0.12",
 ]

 [[package]]
@@ -2727,9 +2730,9 @@ dependencies = [

 [[package]]
 name = "redox_syscall"
-version = "0.5.15"
+version = "0.5.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e8af0dde094006011e6a740d4879319439489813bd0bcdc7d821beaeeff48ec"
+checksum = "7251471db004e509f4e75a62cca9435365b5ec7bcdff530d612ac7c87c44a792"
 dependencies = [
 "bitflags",
 ]
@@ -3023,7 +3026,7 @@ dependencies = [

 [[package]]
 name = "rustical"
-version = "0.7.0"
+version = "0.8.1"
 dependencies = [
 "anyhow",
 "argon2",
@@ -3066,7 +3069,7 @@ dependencies = [

 [[package]]
 name = "rustical_caldav"
-version = "0.7.0"
+version = "0.8.1"
 dependencies = [
 "async-std",
 "async-trait",
@@ -3105,7 +3108,7 @@ dependencies = [

 [[package]]
 name = "rustical_carddav"
-version = "0.7.0"
+version = "0.8.1"
 dependencies = [
 "async-trait",
 "axum",
@@ -3137,7 +3140,7 @@ dependencies = [

 [[package]]
 name = "rustical_dav"
-version = "0.7.0"
+version = "0.8.1"
 dependencies = [
 "async-trait",
 "axum",
@@ -3162,7 +3165,7 @@ dependencies = [

 [[package]]
 name = "rustical_dav_push"
-version = "0.7.0"
+version = "0.8.1"
 dependencies = [
 "async-trait",
 "axum",
@@ -3187,7 +3190,7 @@ dependencies = [

 [[package]]
 name = "rustical_frontend"
-version = "0.7.0"
+version = "0.8.1"
 dependencies = [
 "askama",
 "askama_web",
@@ -3220,7 +3223,7 @@ dependencies = [

 [[package]]
 name = "rustical_ical"
-version = "0.7.0"
+version = "0.8.1"
 dependencies = [
 "axum",
 "chrono",
@@ -3238,7 +3241,7 @@ dependencies = [

 [[package]]
 name = "rustical_oidc"
-version = "0.7.0"
+version = "0.8.1"
 dependencies = [
 "async-trait",
 "axum",
@@ -3253,7 +3256,7 @@ dependencies = [

 [[package]]
 name = "rustical_store"
-version = "0.7.0"
+version = "0.8.1"
 dependencies = [
 "anyhow",
 "async-trait",
@@ -3282,11 +3285,12 @@ dependencies = [
 "tower",
 "tower-sessions",
 "tracing",
+ "vtimezones-rs",
 ]

 [[package]]
 name = "rustical_store_sqlite"
-version = "0.7.0"
+version = "0.8.1"
 dependencies = [
 "async-trait",
 "chrono",
@@ -3307,7 +3311,7 @@ dependencies = [

 [[package]]
 name = "rustical_xml"
-version = "0.7.0"
+version = "0.8.1"
 dependencies = [
 "quick-xml",
 "thiserror 2.0.12",
@@ -4064,9 +4068,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"

 [[package]]
 name = "tokio"
-version = "1.46.1"
+version = "1.47.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0cc3a2344dafbe23a245241fe8b09735b521110d30fcefbbd5feb1797ca35d17"
+checksum = "43864ed400b6043a4757a25c7a64a8efde741aed79a056a2fb348a406701bb35"
 dependencies = [
 "backtrace",
 "bytes",
@@ -4077,10 +4081,10 @@ dependencies = [
 "pin-project-lite",
 "signal-hook-registry",
 "slab",
- "socket2 0.5.10",
+ "socket2 0.6.0",
 "tokio-macros",
 "tracing",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]

 [[package]]
@@ -4568,10 +4572,11 @@ checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"

 [[package]]
 name = "vtimezones-rs"
-version = "0.1.2"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "317410bb7aefbce6c154d65ed7db4daba20756d121dd1f221941b72286c9a03c"
+checksum = "f6728de8767c8dea44f41b88115a205ed23adc3302e1b4342be59d922934dae5"
 dependencies = [
+ "glob",
 "phf",
 "phf_codegen",
 ]
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -2,7 +2,7 @@
 members = ["crates/*"]

 [workspace.package]
-version = "0.7.0"
+version = "0.8.1"
 edition = "2024"
 description = "A CalDAV server"
 repository = "https://github.com/lennart-k/rustical"
@@ -95,7 +95,11 @@ strum = "0.27"
 strum_macros = "0.27"
 serde_json = { version = "1.0", features = ["raw_value"] }
 sqlx-sqlite = { version = "0.8", features = ["bundled"] }
-ical = { version = "0.11", features = ["generator", "serde"] }
+ical = { git = "https://github.com/lennart-k/ical-rs", features = [
+  "generator",
+  "serde",
+  "chrono-tz",
+] }
 toml = "0.9"
 tower = "0.5"
 tower-http = { version = "0.6", features = [
@@ -135,7 +139,7 @@ reqwest = { version = "0.12", features = [
 openidconnect = "4.0"
 clap = { version = "4.5", features = ["derive", "env"] }
 matchit-serde = { git = "https://github.com/lennart-k/matchit-serde", rev = "f0591d13" }
-vtimezones-rs = "0.1"
+vtimezones-rs = "0.2"
 ece = { version = "2.3", default-features = false, features = [
  "backend-openssl",
 ] }
--- a/crates/caldav/src/calendar/methods/get.rs
+++ b/crates/caldav/src/calendar/methods/get.rs
@@ -63,7 +63,6 @@ pub async fn route_get<C: CalendarStore, S: SubscriptionStore>(
            params: None,
        });
    }
-    let mut ical_calendar = ical_calendar_builder.build();

    for object in &objects {
        match object.get_data() {
@@ -73,17 +72,21 @@ pub async fn route_get<C: CalendarStore, S: SubscriptionStore>(
                ..
            }) => {
                timezones.extend(object_timezones);
-                ical_calendar.events.push(event.clone());
+                ical_calendar_builder = ical_calendar_builder.add_event(event.clone());
            }
-            CalendarObjectComponent::Todo(TodoObject { todo, .. }) => {
-                ical_calendar.todos.push(todo.clone());
+            CalendarObjectComponent::Todo(TodoObject(todo)) => {
+                ical_calendar_builder = ical_calendar_builder.add_todo(todo.clone());
            }
-            CalendarObjectComponent::Journal(JournalObject { journal, .. }) => {
-                ical_calendar.journals.push(journal.clone());
+            CalendarObjectComponent::Journal(JournalObject(journal)) => {
+                ical_calendar_builder = ical_calendar_builder.add_journal(journal.clone());
            }
        }
    }

+    let ical_calendar = ical_calendar_builder
+        .build()
+        .map_err(|parser_error| Error::IcalError(parser_error.into()))?;
+
    let mut resp = Response::builder().status(StatusCode::OK);
    let hdrs = resp.headers_mut().unwrap();
    hdrs.typed_insert(ContentType::from_str("text/calendar").unwrap());
--- a/crates/caldav/src/calendar/methods/mkcalendar.rs
+++ b/crates/caldav/src/calendar/methods/mkcalendar.rs
@@ -4,6 +4,7 @@ use crate::calendar::prop::SupportedCalendarComponentSet;
 use axum::extract::{Path, State};
 use axum::response::{IntoResponse, Response};
 use http::{Method, StatusCode};
+use ical::IcalParser;
 use rustical_dav::xml::HrefElement;
 use rustical_ical::CalendarObjectType;
 use rustical_store::auth::Principal;
@@ -82,26 +83,38 @@ pub async fn route_mkcalendar<C: CalendarStore, S: SubscriptionStore>(
        request.displayname = None
    }

-    let mut timezone = request.calendar_timezone;
-    if let Some(tzid) = request.calendar_timezone_id.as_ref() {
-        // Validate timezone id and set timezone accordingly
-        timezone = Some(
-            vtimezones_rs::VTIMEZONES
-                .get(tzid)
-                .ok_or(rustical_dav::Error::BadRequest(format!(
-                    "Invalid timezone-id: {tzid}"
-                )))?
-                .to_string(),
-        );
-    }
+    let timezone_id = if let Some(tzid) = request.calendar_timezone_id {
+        Some(tzid)
+    } else if let Some(tz) = request.calendar_timezone {
+        // TODO: Proper error (calendar-timezone precondition)
+        let calendar = IcalParser::new(tz.as_bytes())
+            .next()
+            .ok_or(rustical_dav::Error::BadRequest(
+                "No timezone data provided".to_owned(),
+            ))?
+            .map_err(|_| rustical_dav::Error::BadRequest("No timezone data provided".to_owned()))?;
+
+        let timezone = calendar
+            .timezones
+            .first()
+            .ok_or(rustical_dav::Error::BadRequest(
+                "No timezone data provided".to_owned(),
+            ))?;
+        let timezone: chrono_tz::Tz = timezone
+            .try_into()
+            .map_err(|_| rustical_dav::Error::BadRequest("No timezone data provided".to_owned()))?;
+
+        Some(timezone.name().to_owned())
+    } else {
+        None
+    };

    let calendar = Calendar {
        id: cal_id.to_owned(),
        principal: principal.to_owned(),
        order: request.calendar_order.unwrap_or(0),
        displayname: request.displayname,
-        timezone,
-        timezone_id: request.calendar_timezone_id,
+        timezone_id,
        color: request.calendar_color,
        description: request.calendar_description,
        deleted_at: None,
--- a/crates/caldav/src/calendar/resource.rs
+++ b/crates/caldav/src/calendar/resource.rs
@@ -3,6 +3,7 @@ use crate::Error;
 use crate::calendar::prop::ReportMethod;
 use chrono::{DateTime, Utc};
 use derive_more::derive::{From, Into};
+use ical::IcalParser;
 use rustical_dav::extensions::{
    CommonPropertiesExtension, CommonPropertiesProp, SyncTokenExtension, SyncTokenExtensionProp,
 };
@@ -132,7 +133,9 @@ impl Resource for CalendarResource {
                    CalendarProp::CalendarDescription(self.cal.description.clone())
                }
                CalendarPropName::CalendarTimezone => {
-                    CalendarProp::CalendarTimezone(self.cal.timezone.clone())
+                    CalendarProp::CalendarTimezone(self.cal.timezone_id.as_ref().and_then(|tzid| {
+                        vtimezones_rs::VTIMEZONES.get(tzid).map(|tz| tz.to_string())
+                    }))
                }
                // chrono_tz uses the IANA database
                CalendarPropName::TimezoneServiceSet => CalendarProp::TimezoneServiceSet(
@@ -191,23 +194,42 @@ impl Resource for CalendarResource {
                    Ok(())
                }
                CalendarProp::CalendarTimezone(timezone) => {
-                    // TODO: Ensure that timezone-id is also updated
-                    // We probably want to prohibit non-IANA timezones
-                    self.cal.timezone = timezone;
+                    if let Some(tz) = timezone {
+                        // TODO: Proper error (calendar-timezone precondition)
+                        let calendar = IcalParser::new(tz.as_bytes())
+                            .next()
+                            .ok_or(rustical_dav::Error::BadRequest(
+                                "No timezone data provided".to_owned(),
+                            ))?
+                            .map_err(|_| {
+                                rustical_dav::Error::BadRequest(
+                                    "No timezone data provided".to_owned(),
+                                )
+                            })?;
+
+                        let timezone =
+                            calendar
+                                .timezones
+                                .first()
+                                .ok_or(rustical_dav::Error::BadRequest(
+                                    "No timezone data provided".to_owned(),
+                                ))?;
+                        let timezone: chrono_tz::Tz = timezone.try_into().map_err(|_| {
+                            rustical_dav::Error::BadRequest("No timezone data provided".to_owned())
+                        })?;
+
+                        self.cal.timezone_id = Some(timezone.name().to_owned());
+                    }
                    Ok(())
                }
                CalendarProp::TimezoneServiceSet(_) => Err(rustical_dav::Error::PropReadOnly),
                CalendarProp::CalendarTimezoneId(timezone_id) => {
                    if let Some(tzid) = &timezone_id {
-                        // Validate timezone id and set timezone accordingly
-                        self.cal.timezone = Some(
-                            vtimezones_rs::VTIMEZONES
-                                .get(tzid)
-                                .ok_or(rustical_dav::Error::BadRequest(format!(
-                                    "Invalid timezone-id: {tzid}"
-                                )))?
-                                .to_string(),
-                        );
+                        if !vtimezones_rs::VTIMEZONES.contains_key(tzid) {
+                            return Err(rustical_dav::Error::BadRequest(format!(
+                                "Invalid timezone-id: {tzid}"
+                            )));
+                        }
                    }
                    self.cal.timezone_id = timezone_id;
                    Ok(())
@@ -248,15 +270,11 @@ impl Resource for CalendarResource {
                    self.cal.description = None;
                    Ok(())
                }
-                CalendarPropName::CalendarTimezone => {
-                    self.cal.timezone = None;
-                    Ok(())
-                }
-                CalendarPropName::TimezoneServiceSet => Err(rustical_dav::Error::PropReadOnly),
-                CalendarPropName::CalendarTimezoneId => {
+                CalendarPropName::CalendarTimezone | CalendarPropName::CalendarTimezoneId => {
                    self.cal.timezone_id = None;
                    Ok(())
                }
+                CalendarPropName::TimezoneServiceSet => Err(rustical_dav::Error::PropReadOnly),
                CalendarPropName::CalendarOrder => {
                    self.cal.order = 0;
                    Ok(())
--- a/crates/caldav/src/calendar_object/methods.rs
+++ b/crates/caldav/src/calendar_object/methods.rs
@@ -78,12 +78,13 @@ pub async fn put_event<C: CalendarStore>(
        true
    };

-    let object = match CalendarObject::from_ics(object_id, body) {
+    let object = match CalendarObject::from_ics(body) {
        Ok(obj) => obj,
        Err(_) => {
            return Err(Error::PreconditionFailed(Precondition::ValidCalendarData));
        }
    };
+    assert_eq!(object.get_id(), object_id);
    cal_store
        .put_object(principal, calendar_id, object, overwrite)
        .await?;
--- a/crates/frontend/js-components/lib/edit-calendar-form.ts
+++ b/crates/frontend/js-components/lib/edit-calendar-form.ts
@@ -117,6 +117,7 @@ export class EditCalendarForm extends LitElement {
        </set>
        <remove>
          <prop>
+            ${!this.timezone_id ? `<CAL:calendar-timezone-id />` : ''}
            ${!this.description ? '<CAL:calendar-description />' : ''}
            ${!this.color ? '<ICAL:calendar-color />' : ''}
          </prop>
--- a/crates/frontend/public/assets/js/edit-calendar-form.mjs
+++ b/crates/frontend/public/assets/js/edit-calendar-form.mjs
@@ -107,6 +107,7 @@ let EditCalendarForm = class extends i {
        </set>
        <remove>
          <prop>
+            ${!this.timezone_id ? `<CAL:calendar-timezone-id />` : ""}
            ${!this.description ? "<CAL:calendar-description />" : ""}
            ${!this.color ? "<ICAL:calendar-color />" : ""}
          </prop>
--- a/crates/frontend/public/templates/pages/calendar.html
+++ b/crates/frontend/public/templates/pages/calendar.html
@@ -25,7 +25,7 @@
 {% if let Some(timezone_id) = calendar.timezone_id %}
 <p>{{ timezone_id }}</p>
 {% endif %}
-{% if let Some(timezone) = calendar.timezone %}
+{% if let Some(timezone) = calendar.get_vtimezone() %}
 <textarea rows="16" readonly>{{ timezone }}</textarea>
 {% endif %}

--- a/crates/ical/src/address_object.rs
+++ b/crates/ical/src/address_object.rs
@@ -95,10 +95,8 @@ impl AddressObject {
                let uid = format!("{}-anniversary", self.get_id());

                let year_suffix = year.map(|year| format!(" ({year})")).unwrap_or_default();
-                Some(CalendarObject::from_ics(
-                    uid.clone(),
-                    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
@@ -116,8 +114,7 @@ DESCRIPTION:💍 {fullname}{year_suffix}
 END:VALARM
 END:VEVENT
 END:VCALENDAR"#,
-                    ),
-                )?)
+                ))?)
            } else {
                None
            },
@@ -139,10 +136,8 @@ END:VCALENDAR"#,
                let uid = format!("{}-birthday", self.get_id());

                let year_suffix = year.map(|year| format!(" ({year})")).unwrap_or_default();
-                Some(CalendarObject::from_ics(
-                    uid.clone(),
-                    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
@@ -160,8 +155,7 @@ DESCRIPTION:🎂 {fullname}{year_suffix}
 END:VALARM
 END:VEVENT
 END:VCALENDAR"#,
-                    ),
-                )?)
+                ))?)
            } else {
                None
            },
--- a/crates/ical/src/duration.rs
+++ b/crates/ical/src/duration.rs
@@ -1,53 +0,0 @@
-use crate::CalDateTimeError;
-use chrono::Duration;
-use lazy_static::lazy_static;
-
-lazy_static! {
-    static ref RE_DURATION: regex::Regex = regex::Regex::new(r"^(?<sign>[+-])?P((?P<W>\d+)W)?((?P<D>\d+)D)?(T((?P<H>\d+)H)?((?P<M>\d+)M)?((?P<S>\d+)S)?)?$").unwrap();
-}
-
-pub fn parse_duration(string: &str) -> Result<Duration, CalDateTimeError> {
-    let captures = RE_DURATION
-        .captures(string)
-        .ok_or(CalDateTimeError::InvalidDurationFormat(string.to_string()))?;
-
-    let mut duration = Duration::zero();
-    if let Some(weeks) = captures.name("W") {
-        duration += Duration::weeks(weeks.as_str().parse().unwrap());
-    }
-    if let Some(days) = captures.name("D") {
-        duration += Duration::days(days.as_str().parse().unwrap());
-    }
-    if let Some(hours) = captures.name("H") {
-        duration += Duration::hours(hours.as_str().parse().unwrap());
-    }
-    if let Some(minutes) = captures.name("M") {
-        duration += Duration::minutes(minutes.as_str().parse().unwrap());
-    }
-    if let Some(seconds) = captures.name("S") {
-        duration += Duration::seconds(seconds.as_str().parse().unwrap());
-    }
-    if let Some(sign) = captures.name("sign") {
-        if sign.as_str() == "-" {
-            duration = -duration;
-        }
-    }
-
-    Ok(duration)
-}
-
-#[cfg(test)]
-mod tests {
-    use chrono::Duration;
-
-    use crate::parse_duration;
-
-    #[test]
-    fn test_parse_duration() {
-        assert_eq!(parse_duration("P12W").unwrap(), Duration::weeks(12));
-        assert_eq!(parse_duration("P12D").unwrap(), Duration::days(12));
-        assert_eq!(parse_duration("PT12H").unwrap(), Duration::hours(12));
-        assert_eq!(parse_duration("PT12M").unwrap(), Duration::minutes(12));
-        assert_eq!(parse_duration("PT12S").unwrap(), Duration::seconds(12));
-    }
-}
--- a/crates/ical/src/icalendar/event.rs
+++ b/crates/ical/src/icalendar/event.rs
@@ -1,24 +1,22 @@
+use crate::CalDateTime;
 use crate::Error;
-use crate::{CalDateTime, ComponentMut, parse_duration};
 use chrono::{DateTime, Duration, Utc};
-use ical::{
-    generator::IcalEvent,
-    parser::{Component, ical::component::IcalTimeZone},
-    property::Property,
-};
+use ical::parser::ComponentMut;
+use ical::{generator::IcalEvent, parser::Component, property::Property};
 use rrule::{RRule, RRuleSet};
 use std::{collections::HashMap, str::FromStr};

-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, Default)]
 pub struct EventObject {
    pub event: IcalEvent,
-    pub timezones: HashMap<String, IcalTimeZone>,
-    pub(crate) ics: String,
+    // If a timezone is None that means that in the VCALENDAR object there's a timezone defined
+    // with that name but its not from the Olson DB
+    pub timezones: HashMap<String, Option<chrono_tz::Tz>>,
 }

 impl EventObject {
    pub fn get_dtstart(&self) -> Result<Option<CalDateTime>, Error> {
-        if let Some(dtstart) = self.event.get_property("DTSTART") {
+        if let Some(dtstart) = self.event.get_dtstart() {
            Ok(Some(CalDateTime::parse_prop(dtstart, &self.timezones)?))
        } else {
            Ok(None)
@@ -26,7 +24,7 @@ impl EventObject {
    }

    pub fn get_dtend(&self) -> Result<Option<CalDateTime>, Error> {
-        if let Some(dtend) = self.event.get_property("DTEND") {
+        if let Some(dtend) = self.event.get_dtend() {
            Ok(Some(CalDateTime::parse_prop(dtend, &self.timezones)?))
        } else {
            Ok(None)
@@ -34,33 +32,21 @@ impl EventObject {
    }

    pub fn get_last_occurence(&self) -> Result<Option<CalDateTime>, Error> {
-        if let Some(_rrule) = self.event.get_property("RRULE") {
+        if self.event.get_rrule().is_some() {
            // TODO: understand recurrence rules
            return Ok(None);
        }

-        if let Some(dtend) = self.event.get_property("DTEND") {
-            return Ok(Some(CalDateTime::parse_prop(dtend, &self.timezones)?));
+        if let Some(dtend) = self.get_dtend()? {
+            return Ok(Some(dtend));
        };

-        let duration = self.get_duration()?.unwrap_or(Duration::days(1));
+        let duration = self.event.get_duration().unwrap_or(Duration::days(1));

        let first_occurence = self.get_dtstart()?;
        Ok(first_occurence.map(|first_occurence| first_occurence + duration))
    }

-    pub fn get_duration(&self) -> Result<Option<Duration>, Error> {
-        if let Some(Property {
-            value: Some(duration),
-            ..
-        }) = self.event.get_property("DURATION")
-        {
-            Ok(Some(parse_duration(duration)?))
-        } else {
-            Ok(None)
-        }
-    }
-
    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()? {
@@ -128,7 +114,7 @@ impl EventObject {
                } else {
                    date.format()
                };
-                let mut ev = self.event.clone();
+                let mut ev = self.event.clone().mutable();
                ev.remove_property("RRULE");
                ev.remove_property("RDATE");
                ev.remove_property("EXDATE");
@@ -163,7 +149,7 @@ impl EventObject {
                        params: dtstart_prop.params,
                    });
                }
-                events.push(ev);
+                events.push(ev.verify()?);
            }
            Ok(events)
        } else {
@@ -242,11 +228,7 @@ END:VEVENT\r\n",

    #[test]
    fn test_expand_recurrence() {
-        let event = CalendarObject::from_ics(
-            "318ec6503573d9576818daf93dac07317058d95c".to_string(),
-            ICS.to_string(),
-        )
-        .unwrap();
+        let event = CalendarObject::from_ics(ICS.to_string()).unwrap();
        let event = event.event().unwrap();

        let events: Vec<String> = event
--- a/crates/ical/src/icalendar/journal.rs
+++ b/crates/ical/src/icalendar/journal.rs
@@ -1,7 +1,5 @@
+use derive_more::From;
 use ical::parser::ical::component::IcalJournal;

-#[derive(Debug, Clone)]
-pub struct JournalObject {
-    pub journal: IcalJournal,
-    pub(crate) ics: String,
-}
+#[derive(Debug, Clone, From)]
+pub struct JournalObject(pub IcalJournal);
--- a/crates/ical/src/icalendar/object.rs
+++ b/crates/ical/src/icalendar/object.rs
@@ -4,10 +4,8 @@ use crate::Error;
 use chrono::DateTime;
 use chrono::Utc;
 use derive_more::Display;
-use ical::{
-    generator::{Emitter, IcalCalendar},
-    parser::{Component, ical::component::IcalTimeZone},
-};
+use ical::generator::{Emitter, IcalCalendar};
+use ical::property::Property;
 use serde::Serialize;
 use sha2::{Digest, Sha256};
 use std::{collections::HashMap, io::BufReader};
@@ -47,8 +45,7 @@ impl rustical_xml::ValueDeserialize for CalendarObjectType {
            "VJOURNAL" => Ok(Self::Journal),
            _ => Err(rustical_xml::XmlError::InvalidValue(
                rustical_xml::ParseValueError::Other(format!(
-                    "Invalid value '{}', must be VEVENT, VTODO, or VJOURNAL",
-                    val
+                    "Invalid value '{val}', must be VEVENT, VTODO, or VJOURNAL"
                )),
            )),
        }
@@ -62,15 +59,21 @@ pub enum CalendarObjectComponent {
    Journal(JournalObject),
 }

-#[derive(Debug, Clone)]
-pub struct CalendarObject {
-    id: String,
+impl Default for CalendarObjectComponent {
+    fn default() -> Self {
+        Self::Event(EventObject::default())
+    }
+}
+
+#[derive(Debug, Clone, Default)]
+pub struct CalendarObject<const VERIFIED: bool = true> {
    data: CalendarObjectComponent,
-    cal: IcalCalendar,
+    properties: Vec<Property>,
+    ics: String,
 }

 impl CalendarObject {
-    pub fn from_ics(object_id: String, ics: String) -> Result<Self, Error> {
+    pub fn from_ics(ics: 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() {
@@ -91,52 +94,30 @@ impl CalendarObject {
            ));
        }

-        let timezones: HashMap<String, IcalTimeZone> = cal
+        let timezones: HashMap<String, Option<chrono_tz::Tz>> = cal
            .timezones
            .clone()
            .into_iter()
-            .filter_map(|timezone| {
-                let timezone_prop = timezone.get_property("TZID")?.to_owned();
-                let tzid = timezone_prop.value?;
-                Some((tzid, timezone))
-            })
+            .map(|timezone| (timezone.get_tzid().to_owned(), (&timezone).try_into().ok()))
            .collect();

-        if let Some(event) = cal.events.first() {
-            return Ok(CalendarObject {
-                id: object_id,
-                cal: cal.clone(),
-                data: CalendarObjectComponent::Event(EventObject {
-                    event: event.clone(),
-                    timezones,
-                    ics,
-                }),
-            });
-        }
-        if let Some(todo) = cal.todos.first() {
-            return Ok(CalendarObject {
-                id: object_id,
-                cal: cal.clone(),
-                data: CalendarObjectComponent::Todo(TodoObject {
-                    todo: todo.clone(),
-                    ics,
-                }),
-            });
-        }
-        if let Some(journal) = cal.journals.first() {
-            return Ok(CalendarObject {
-                id: object_id,
-                cal: cal.clone(),
-                data: CalendarObjectComponent::Journal(JournalObject {
-                    journal: journal.clone(),
-                    ics,
-                }),
-            });
-        }
+        let data = if let Some(event) = cal.events.into_iter().next() {
+            CalendarObjectComponent::Event(EventObject { event, timezones })
+        } else if let Some(todo) = cal.todos.into_iter().next() {
+            CalendarObjectComponent::Todo(todo.into())
+        } else if let Some(journal) = cal.journals.into_iter().next() {
+            CalendarObjectComponent::Journal(journal.into())
+        } else {
+            return Err(Error::InvalidData(
+                "iCalendar component type not supported :(".to_owned(),
+            ));
+        };

-        Err(Error::InvalidData(
-            "iCalendar component type not supported :(".to_owned(),
-        ))
+        Ok(Self {
+            data,
+            properties: cal.properties,
+            ics,
+        })
    }

    pub fn get_data(&self) -> &CalendarObjectComponent {
@@ -144,29 +125,26 @@ impl CalendarObject {
    }

    pub fn get_id(&self) -> &str {
-        &self.id
+        match &self.data {
+            CalendarObjectComponent::Todo(todo) => todo.0.get_uid(),
+            CalendarObjectComponent::Event(event) => event.event.get_uid(),
+            CalendarObjectComponent::Journal(journal) => journal.0.get_uid(),
+        }
    }
+
    pub fn get_etag(&self) -> String {
        let mut hasher = Sha256::new();
-        hasher.update(&self.id);
+        hasher.update(self.get_id());
        hasher.update(self.get_ics());
        format!("\"{:x}\"", hasher.finalize())
    }

    pub fn get_ics(&self) -> &str {
-        match &self.data {
-            CalendarObjectComponent::Todo(todo) => &todo.ics,
-            CalendarObjectComponent::Event(event) => &event.ics,
-            CalendarObjectComponent::Journal(journal) => &journal.ics,
-        }
+        &self.ics
    }

    pub fn get_component_name(&self) -> &str {
-        match self.data {
-            CalendarObjectComponent::Todo(_) => "VTODO",
-            CalendarObjectComponent::Event(_) => "VEVENT",
-            CalendarObjectComponent::Journal(_) => "VJOURNAL",
-        }
+        self.get_object_type().as_str()
    }

    pub fn get_object_type(&self) -> CalendarObjectType {
@@ -206,8 +184,11 @@ impl CalendarObject {
        // Only events can be expanded
        match &self.data {
            CalendarObjectComponent::Event(event) => {
-                let mut cal = self.cal.clone();
-                cal.events = event.expand_recurrence(start, end)?;
+                let cal = IcalCalendar {
+                    properties: self.properties.clone(),
+                    events: event.expand_recurrence(start, end)?,
+                    ..Default::default()
+                };
                Ok(cal.generate())
            }
            _ => Ok(self.get_ics().to_string()),
--- a/crates/ical/src/icalendar/todo.rs
+++ b/crates/ical/src/icalendar/todo.rs
@@ -1,7 +1,5 @@
+use derive_more::From;
 use ical::parser::ical::component::IcalTodo;

-#[derive(Debug, Clone)]
-pub struct TodoObject {
-    pub todo: IcalTodo,
-    pub(crate) ics: String,
-}
+#[derive(Debug, Clone, From)]
+pub struct TodoObject(pub IcalTodo);
--- a/crates/ical/src/lib.rs
+++ b/crates/ical/src/lib.rs
@@ -1,14 +1,8 @@
-mod property_ext;
-pub use property_ext::*;
-
 mod timestamp;
 mod timezone;
 pub use timestamp::*;
 pub use timezone::*;

-mod duration;
-pub use duration::parse_duration;
-
 mod icalendar;
 pub use icalendar::*;

--- a/crates/ical/src/property_ext.rs
+++ b/crates/ical/src/property_ext.rs
@@ -1,46 +0,0 @@
-use ical::{generator::IcalEvent, property::Property};
-
-pub trait IcalProperty {
-    fn get_param(&self, name: &str) -> Option<Vec<&str>>;
-    fn get_value_type(&self) -> Option<&str>;
-    fn get_tzid(&self) -> Option<&str>;
-}
-
-impl IcalProperty for ical::property::Property {
-    fn get_param(&self, name: &str) -> Option<Vec<&str>> {
-        self.params
-            .as_ref()?
-            .iter()
-            .find(|(key, _)| name == key)
-            .map(|(_, value)| value.iter().map(String::as_str).collect())
-    }
-
-    fn get_value_type(&self) -> Option<&str> {
-        self.get_param("VALUE")
-            .and_then(|params| params.into_iter().next())
-    }
-
-    fn get_tzid(&self) -> Option<&str> {
-        self.get_param("TZID")
-            .and_then(|params| params.into_iter().next())
-    }
-}
-
-pub trait ComponentMut {
-    fn remove_property(&mut self, name: &str);
-    fn set_property(&mut self, prop: Property);
-    fn push_property(&mut self, prop: Property);
-}
-
-impl ComponentMut for IcalEvent {
-    fn remove_property(&mut self, name: &str) {
-        self.properties.retain(|prop| prop.name != name);
-    }
-    fn set_property(&mut self, prop: Property) {
-        self.remove_property(&prop.name);
-        self.push_property(prop);
-    }
-    fn push_property(&mut self, prop: Property) {
-        self.properties.push(prop);
-    }
-}
--- a/crates/ical/src/timestamp.rs
+++ b/crates/ical/src/timestamp.rs
@@ -1,12 +1,8 @@
-use super::timezone::CalTimezone;
-use crate::IcalProperty;
+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::{
-    parser::{Component, ical::component::IcalTimeZone},
-    property::Property,
-};
+use ical::property::Property;
 use lazy_static::lazy_static;
 use rustical_xml::{ValueDeserialize, ValueSerialize};
 use std::{borrow::Cow, collections::HashMap, ops::Add};
@@ -68,8 +64,8 @@ pub enum CalDateTime {
    // Form 2, example: 19980119T070000Z -> UTC
    // Form 3, example: TZID=America/New_York:19980119T020000 -> Olson
    // https://en.wikipedia.org/wiki/Tz_database
-    DateTime(DateTime<CalTimezone>),
-    Date(NaiveDate, CalTimezone),
+    DateTime(DateTime<ICalTimezone>),
+    Date(NaiveDate, ICalTimezone),
 }

 impl From<CalDateTime> for DateTime<rrule::Tz> {
@@ -106,13 +102,13 @@ impl Ord for CalDateTime {

 impl From<DateTime<Local>> for CalDateTime {
    fn from(value: DateTime<Local>) -> Self {
-        CalDateTime::DateTime(value.with_timezone(&CalTimezone::Local))
+        CalDateTime::DateTime(value.with_timezone(&ICalTimezone::Local))
    }
 }

 impl From<DateTime<Utc>> for CalDateTime {
    fn from(value: DateTime<Utc>) -> Self {
-        CalDateTime::DateTime(value.with_timezone(&CalTimezone::Utc))
+        CalDateTime::DateTime(value.with_timezone(&ICalTimezone::Olson(chrono_tz::UTC)))
    }
 }

@@ -136,7 +132,7 @@ impl Add<Duration> for CalDateTime {
 impl CalDateTime {
    pub fn parse_prop(
        prop: &Property,
-        timezones: &HashMap<String, IcalTimeZone>,
+        timezones: &HashMap<String, Option<chrono_tz::Tz>>,
    ) -> Result<Self, CalDateTimeError> {
        let prop_value = prop
            .value
@@ -145,28 +141,9 @@ impl CalDateTime {
                "empty property".to_owned(),
            ))?;

-        // Use the TZID parameter from the property
-        let timezone = if let Some(tzid) = prop.get_tzid() {
+        let timezone = if let Some(tzid) = prop.get_param("TZID") {
            if let Some(timezone) = timezones.get(tzid) {
-                // X-LIC-LOCATION is often used to refer to a standardised timezone from the Olson
-                // database
-                if let Some(olson_name) = timezone
-                    .get_property("X-LIC-LOCATION")
-                    .map(|prop| prop.value.to_owned())
-                    .unwrap_or_default()
-                {
-                    if let Ok(tz) = olson_name.parse::<Tz>() {
-                        Some(tz)
-                    } else {
-                        return Err(CalDateTimeError::InvalidOlson(olson_name));
-                    }
-                } else {
-                    // If the TZID matches a name from the Olson database (e.g. Europe/Berlin) we
-                    // guess that we can just use it
-                    tzid.parse::<Tz>().ok()
-                    // TODO: If None: Too bad, we need to manually parse it
-                    // For now it's just treated as localtime
-                }
+                timezone.to_owned()
            } else {
                // TZID refers to timezone that does not exist
                return Err(CalDateTimeError::InvalidTZID(tzid.to_string()));
@@ -183,7 +160,7 @@ impl CalDateTime {
    pub fn format(&self) -> String {
        match self {
            Self::DateTime(datetime) => match datetime.timezone() {
-                CalTimezone::Utc => datetime.format(UTC_DATE_TIME).to_string(),
+                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(),
@@ -208,7 +185,7 @@ impl CalDateTime {
        matches!(&self, Self::Date(_, _))
    }

-    pub fn as_datetime(&self) -> Cow<'_, DateTime<CalTimezone>> {
+    pub fn as_datetime(&self) -> Cow<'_, DateTime<ICalTimezone>> {
        match self {
            Self::DateTime(datetime) => Cow::Borrowed(datetime),
            Self::Date(date, tz) => Cow::Owned(
@@ -232,7 +209,7 @@ impl CalDateTime {
            }
            return Ok(CalDateTime::DateTime(
                datetime
-                    .and_local_timezone(CalTimezone::Local)
+                    .and_local_timezone(ICalTimezone::Local)
                    .earliest()
                    .ok_or(CalDateTimeError::LocalTimeGap)?,
            ));
@@ -242,8 +219,8 @@ impl CalDateTime {
            return Ok(datetime.and_utc().into());
        }
        let timezone = timezone
-            .map(CalTimezone::Olson)
-            .unwrap_or(CalTimezone::Local);
+            .map(ICalTimezone::Olson)
+            .unwrap_or(ICalTimezone::Local);
        if let Ok(date) = NaiveDate::parse_from_str(value, LOCAL_DATE) {
            return Ok(CalDateTime::Date(date, timezone));
        }
@@ -275,7 +252,7 @@ impl CalDateTime {
                CalDateTime::Date(
                    NaiveDate::from_ymd_opt(year, month, day)
                        .ok_or(CalDateTimeError::ParseError(value.to_string()))?,
-                    CalTimezone::Local,
+                    ICalTimezone::Local,
                ),
                false,
            ));
@@ -287,7 +264,7 @@ impl CalDateTime {
        self.as_datetime().to_utc()
    }

-    pub fn timezone(&self) -> CalTimezone {
+    pub fn timezone(&self) -> ICalTimezone {
        match &self {
            CalDateTime::DateTime(datetime) => datetime.timezone(),
            CalDateTime::Date(_, tz) => tz.to_owned(),
@@ -423,7 +400,7 @@ mod tests {
            (
                CalDateTime::Date(
                    NaiveDate::from_ymd_opt(1985, 4, 12).unwrap(),
-                    crate::CalTimezone::Local
+                    crate::ICalTimezone::Local
                ),
                true
            )
@@ -433,7 +410,7 @@ mod tests {
            (
                CalDateTime::Date(
                    NaiveDate::from_ymd_opt(1985, 4, 12).unwrap(),
-                    crate::CalTimezone::Local
+                    crate::ICalTimezone::Local
                ),
                true
            )
@@ -443,7 +420,7 @@ mod tests {
            (
                CalDateTime::Date(
                    NaiveDate::from_ymd_opt(1972, 4, 12).unwrap(),
-                    crate::CalTimezone::Local
+                    crate::ICalTimezone::Local
                ),
                false
            )
--- a/crates/ical/src/timezone.rs
+++ b/crates/ical/src/timezone.rs
@@ -1,29 +1,26 @@
-use chrono::{Local, NaiveDate, NaiveDateTime, TimeZone, Utc};
+use chrono::{Local, NaiveDate, NaiveDateTime, TimeZone};
 use chrono_tz::Tz;
 use derive_more::{Display, From};

 #[derive(Debug, Clone, From, PartialEq, Eq)]
-pub enum CalTimezone {
+pub enum ICalTimezone {
    Local,
-    Utc,
    Olson(Tz),
 }

-impl From<CalTimezone> for rrule::Tz {
-    fn from(value: CalTimezone) -> Self {
+impl From<ICalTimezone> for rrule::Tz {
+    fn from(value: ICalTimezone) -> Self {
        match value {
-            CalTimezone::Local => Self::LOCAL,
-            CalTimezone::Utc => Self::UTC,
-            CalTimezone::Olson(tz) => Self::Tz(tz),
+            ICalTimezone::Local => Self::LOCAL,
+            ICalTimezone::Olson(tz) => Self::Tz(tz),
        }
    }
 }

-impl From<rrule::Tz> for CalTimezone {
+impl From<rrule::Tz> for ICalTimezone {
    fn from(value: rrule::Tz) -> Self {
        match value {
            rrule::Tz::Local(_) => Self::Local,
-            rrule::Tz::Tz(chrono_tz::UTC) => Self::Utc,
            rrule::Tz::Tz(tz) => Self::Olson(tz),
        }
    }
@@ -32,7 +29,6 @@ impl From<rrule::Tz> for CalTimezone {
 #[derive(Debug, Clone, PartialEq, Display)]
 pub enum CalTimezoneOffset {
    Local(chrono::FixedOffset),
-    Utc(chrono::Utc),
    Olson(chrono_tz::TzOffset),
 }

@@ -40,19 +36,17 @@ impl chrono::Offset for CalTimezoneOffset {
    fn fix(&self) -> chrono::FixedOffset {
        match self {
            Self::Local(local) => local.fix(),
-            Self::Utc(utc) => utc.fix(),
            Self::Olson(olson) => olson.fix(),
        }
    }
 }

-impl TimeZone for CalTimezone {
+impl TimeZone for ICalTimezone {
    type Offset = CalTimezoneOffset;

    fn from_offset(offset: &Self::Offset) -> Self {
        match offset {
            CalTimezoneOffset::Local(_) => Self::Local,
-            CalTimezoneOffset::Utc(_) => Self::Utc,
            CalTimezoneOffset::Olson(offset) => Self::Olson(Tz::from_offset(offset)),
        }
    }
@@ -62,9 +56,6 @@ impl TimeZone for CalTimezone {
            Self::Local => Local
                .offset_from_local_date(local)
                .map(CalTimezoneOffset::Local),
-            Self::Utc => Utc
-                .offset_from_local_date(local)
-                .map(CalTimezoneOffset::Utc),
            Self::Olson(tz) => tz
                .offset_from_local_date(local)
                .map(CalTimezoneOffset::Olson),
@@ -79,9 +70,6 @@ impl TimeZone for CalTimezone {
            Self::Local => Local
                .offset_from_local_datetime(local)
                .map(CalTimezoneOffset::Local),
-            Self::Utc => Utc
-                .offset_from_local_datetime(local)
-                .map(CalTimezoneOffset::Utc),
            Self::Olson(tz) => tz
                .offset_from_local_datetime(local)
                .map(CalTimezoneOffset::Olson),
@@ -91,7 +79,6 @@ impl TimeZone for CalTimezone {
    fn offset_from_utc_datetime(&self, utc: &NaiveDateTime) -> Self::Offset {
        match self {
            Self::Local => CalTimezoneOffset::Local(Local.offset_from_utc_datetime(utc)),
-            Self::Utc => CalTimezoneOffset::Utc(Utc.offset_from_utc_datetime(utc)),
            Self::Olson(tz) => CalTimezoneOffset::Olson(tz.offset_from_utc_datetime(utc)),
        }
    }
@@ -99,7 +86,6 @@ impl TimeZone for CalTimezone {
    fn offset_from_utc_date(&self, utc: &NaiveDate) -> Self::Offset {
        match self {
            Self::Local => CalTimezoneOffset::Local(Local.offset_from_utc_date(utc)),
-            Self::Utc => CalTimezoneOffset::Utc(Utc.offset_from_utc_date(utc)),
            Self::Olson(tz) => CalTimezoneOffset::Olson(tz.offset_from_utc_date(utc)),
        }
    }
--- a/crates/store/Cargo.toml
+++ b/crates/store/Cargo.toml
@@ -32,6 +32,7 @@ headers.workspace = true
 tower.workspace = true
 futures-core.workspace = true
 tower-sessions.workspace = true
+vtimezones-rs.workspace = true

 [dev-dependencies]
 rstest = { workspace = true }
--- a/crates/store/src/calendar.rs
+++ b/crates/store/src/calendar.rs
@@ -1,3 +1,5 @@
+use std::str::FromStr;
+
 use crate::synctoken::format_synctoken;
 use chrono::NaiveDateTime;
 use rustical_ical::CalendarObjectType;
@@ -11,7 +13,6 @@ pub struct Calendar {
    pub order: i64,
    pub description: Option<String>,
    pub color: Option<String>,
-    pub timezone: Option<String>,
    pub timezone_id: Option<String>,
    pub deleted_at: Option<NaiveDateTime>,
    pub synctoken: i64,
@@ -24,4 +25,16 @@ impl Calendar {
    pub fn format_synctoken(&self) -> String {
        format_synctoken(self.synctoken)
    }
+
+    pub fn get_timezone(&self) -> Option<chrono_tz::Tz> {
+        self.timezone_id
+            .as_ref()
+            .and_then(|tzid| chrono_tz::Tz::from_str(tzid).ok())
+    }
+
+    pub fn get_vtimezone(&self) -> Option<&'static str> {
+        self.timezone_id
+            .as_ref()
+            .and_then(|tzid| vtimezones_rs::VTIMEZONES.get(tzid).cloned())
+    }
 }
--- a/crates/store/src/contact_birthday_store.rs
+++ b/crates/store/src/contact_birthday_store.rs
@@ -20,7 +20,6 @@ fn birthday_calendar(addressbook: Addressbook) -> Calendar {
        order: 0,
        description: None,
        color: None,
-        timezone: None,
        timezone_id: None,
        deleted_at: addressbook.deleted_at,
        synctoken: addressbook.synctoken,
--- a/crates/store_sqlite/migrations/20250725225640_drop_calendar_timezone.down.sql
+++ b/crates/store_sqlite/migrations/20250725225640_drop_calendar_timezone.down.sql
@@ -0,0 +1 @@
+ALTER TABLE calendars ADD COLUMN timezone TEXT;
--- a/crates/store_sqlite/migrations/20250725225640_drop_calendar_timezone.up.sql
+++ b/crates/store_sqlite/migrations/20250725225640_drop_calendar_timezone.up.sql
@@ -0,0 +1,3 @@
+-- We don't want to save timezones as ics anymore
+-- but instead just rely on the TZDB identifier
+ALTER TABLE calendars DROP COLUMN timezone;
--- a/crates/store_sqlite/src/calendar_store.rs
+++ b/crates/store_sqlite/src/calendar_store.rs
@@ -22,7 +22,17 @@ impl TryFrom<CalendarObjectRow> for CalendarObject {
    type Error = rustical_store::Error;

    fn try_from(value: CalendarObjectRow) -> Result<Self, Self::Error> {
-        Ok(CalendarObject::from_ics(value.id, value.ics)?)
+        let object = CalendarObject::from_ics(value.ics)?;
+        if object.get_id() != value.id {
+            return Err(rustical_store::Error::IcalError(
+                rustical_ical::Error::InvalidData(format!(
+                    "object_id={} and UID={} don't match",
+                    object.get_id(),
+                    value.id
+                )),
+            ));
+        }
+        Ok(object)
    }
 }

@@ -34,7 +44,6 @@ struct CalendarRow {
    order: i64,
    description: Option<String>,
    color: Option<String>,
-    timezone: Option<String>,
    timezone_id: Option<String>,
    deleted_at: Option<NaiveDateTime>,
    synctoken: i64,
@@ -64,7 +73,6 @@ impl From<CalendarRow> for Calendar {
            order: value.order,
            description: value.description,
            color: value.color,
-            timezone: value.timezone,
            timezone_id: value.timezone_id,
            deleted_at: value.deleted_at,
            synctoken: value.synctoken,
@@ -127,7 +135,7 @@ impl SqliteCalendarStore {
    ) -> Result<Vec<Calendar>, Error> {
        let cals = sqlx::query_as!(
            CalendarRow,
-            r#"SELECT *
+            r#"SELECT principal, id, displayname, "order", description, color, timezone_id, deleted_at, synctoken, subscription_url, push_topic, comp_event, comp_todo, comp_journal
                FROM calendars
                WHERE principal = ? AND deleted_at IS NOT NULL"#,
            principal
@@ -147,8 +155,8 @@ impl SqliteCalendarStore {
        let comp_journal = calendar.components.contains(&CalendarObjectType::Journal);

        sqlx::query!(
-            r#"INSERT INTO calendars (principal, id, displayname, description, "order", color, subscription_url, timezone, timezone_id, push_topic, comp_event, comp_todo, comp_journal)
-                VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"#,
+            r#"INSERT INTO calendars (principal, id, displayname, description, "order", color, subscription_url, timezone_id, push_topic, comp_event, comp_todo, comp_journal)
+                VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"#,
            calendar.principal,
            calendar.id,
            calendar.displayname,
@@ -156,7 +164,6 @@ impl SqliteCalendarStore {
            calendar.order,
            calendar.color,
            calendar.subscription_url,
-            calendar.timezone,
            calendar.timezone_id,
            calendar.push_topic,
            comp_event, comp_todo, comp_journal
@@ -178,7 +185,7 @@ impl SqliteCalendarStore {
        let comp_journal = calendar.components.contains(&CalendarObjectType::Journal);

        let result = sqlx::query!(
-            r#"UPDATE calendars SET principal = ?, id = ?, displayname = ?, description = ?, "order" = ?, color = ?, timezone = ?, timezone_id = ?, push_topic = ?, comp_event = ?, comp_todo = ?, comp_journal = ?
+            r#"UPDATE calendars SET principal = ?, id = ?, displayname = ?, description = ?, "order" = ?, color = ?, timezone_id = ?, push_topic = ?, comp_event = ?, comp_todo = ?, comp_journal = ?
                WHERE (principal, id) = (?, ?)"#,
            calendar.principal,
            calendar.id,
@@ -186,7 +193,6 @@ impl SqliteCalendarStore {
            calendar.description,
            calendar.order,
            calendar.color,
-            calendar.timezone,
            calendar.timezone_id,
            calendar.push_topic,
            comp_event, comp_todo, comp_journal,
Author	SHA1	Message	Date
Lennart	a42004501b	version 0.8.1	2025-07-26 17:37:44 +02:00
Lennart	89ce14ee86	update ical dependency	2025-07-26 17:37:25 +02:00
Lennart	7fc64d219c	outsource some more ical logic to ical-rs fork	2025-07-26 13:32:28 +02:00
Lennart	03294ec106	version 0.8.0	2025-07-25 23:26:57 +02:00
Lennart	a22235d976	sqlite_store: Drop timezone column in favour of timezone_id	2025-07-25 23:01:51 +02:00
Lennart	1ba9a97b3f	update .sqlx queries	2025-07-25 22:52:26 +02:00
Lennart	51036ec6d5	Update vtimezone-rs to fix missing timezones	2025-07-25 22:51:35 +02:00
Lennart	e1a10338e0	Calendar data model: Switch to only saving timezone id	2025-07-25 22:32:01 +02:00
Lennart	918f27e8c2	frontend: Fix timezone removal	2025-07-25 22:30:52 +02:00
Lennart	dd34dd23d1	ical: Work on calendar object data structure	2025-07-25 21:44:57 +02:00
Lennart	9910e4ee31	Remove duplicate UTC implementation from CalTimezone	2025-07-25 19:06:23 +02:00
Lennart	c22469dea6	update ical dependency	2025-07-25 18:38:21 +02:00
Lennart	f2899aec6b	Move to own ical-rs fork and refactor timezone-related stuff	2025-07-25 18:22:06 +02:00
Lennart K	f9380ca7e4	clippy appeasement	2025-07-24 11:46:28 +02:00
				`@@ -0,0 +1 @@`
				`ALTER TABLE calendars ADD COLUMN timezone TEXT;`