diff --git a/Cargo.lock b/Cargo.lock index 6a4b4e7..051f108 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -567,9 +567,9 @@ checksum = "b35204fbdc0b3f4446b89fc1ac2cf84a8a68971995d0bf2e925ec7cd960f9cb3" [[package]] name = "caldata" -version = "0.13.1" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5549ae654c8e80ff922297ad06c49be64668cf947cb6ce45a2069985d21a2135" +checksum = "f36de4a8034d98c95e7fe874b828272d823cfbd68e9571fe7bf6c419e852cbe2" dependencies = [ "chrono", "chrono-tz", diff --git a/Cargo.toml b/Cargo.toml index a8efaef..fee4376 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -107,7 +107,7 @@ strum = "0.27" strum_macros = "0.27" serde_json = { version = "1.0", features = ["raw_value"] } sqlx-sqlite = { version = "0.8", features = ["bundled"] } -caldata = { version = "0.13.0", features = ["chrono-tz", "vtimezones-rs"] } +caldata = { version = "0.14.0", features = ["chrono-tz", "vtimezones-rs"] } toml = "0.9" tower = "0.5" tower-http = { version = "0.6", features = [ diff --git a/crates/caldav/src/calendar/methods/import.rs b/crates/caldav/src/calendar/methods/import.rs index f40881a..33ffd63 100644 --- a/crates/caldav/src/calendar/methods/import.rs +++ b/crates/caldav/src/calendar/methods/import.rs @@ -4,8 +4,8 @@ use axum::{ extract::{Path, State}, response::{IntoResponse, Response}, }; -use caldata::IcalParser; use caldata::component::{Component, ComponentMut}; +use caldata::{IcalParser, parser::ParserOptions}; use http::StatusCode; use rustical_dav::header::Overwrite; use rustical_ical::CalendarObjectType; @@ -50,7 +50,7 @@ pub async fn route_import( cal.remove_property("X-WR-CALDESC"); cal.remove_property("X-WR-CALCOLOR"); cal.remove_property("X-WR-TIMEZONE"); - let cal = cal.build(None).unwrap(); + let cal = cal.build(&ParserOptions::default(), None).unwrap(); // Make sure timezone is valid if let Some(timezone_id) = timezone_id.as_ref() { diff --git a/crates/carddav/src/addressbook/methods/import.rs b/crates/carddav/src/addressbook/methods/import.rs index dd311e1..4b7eb76 100644 --- a/crates/carddav/src/addressbook/methods/import.rs +++ b/crates/carddav/src/addressbook/methods/import.rs @@ -7,7 +7,7 @@ use axum::{ use caldata::{ VcardParser, component::{Component, ComponentMut}, - parser::ContentLine, + parser::{ContentLine, ParserOptions}, }; use http::StatusCode; use rustical_store::{Addressbook, AddressbookStore, SubscriptionStore, auth::Principal}; @@ -37,7 +37,7 @@ pub async fn route_import( value: Some(uuid::Uuid::new_v4().to_string()), params: vec![].into(), }); - card = card_mut.build(None).unwrap(); + card = card_mut.build(&ParserOptions::default(), None).unwrap(); } // TODO: Make nicer let uid = card.get_uid().unwrap(); diff --git a/crates/ical/src/address_object.rs b/crates/ical/src/address_object.rs index 586da51..2ee571b 100644 --- a/crates/ical/src/address_object.rs +++ b/crates/ical/src/address_object.rs @@ -6,7 +6,7 @@ use caldata::{ IcalEventBuilder, VcardContact, }, generator::Emitter, - parser::ContentLine, + parser::{ContentLine, ParserOptions}, property::{ Calscale, IcalCALSCALEProperty, IcalDTENDProperty, IcalDTSTAMPProperty, IcalDTSTARTProperty, IcalPRODIDProperty, IcalRRULEProperty, IcalSUMMARYProperty, @@ -136,7 +136,7 @@ impl AddressObject { inner: Some(CalendarInnerDataBuilder::Event(vec![event])), vtimezones: BTreeMap::default(), } - .build(None)? + .build(&ParserOptions::default(), None)? .into(), )) }