diff --git a/Cargo.lock b/Cargo.lock index f7992ebe..758030e3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -887,9 +887,9 @@ dependencies = [ [[package]] name = "calcard" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e35c8ab67ac849cc79cd5d888ceac60cd7887d64fb907f5dd29861868706305" +checksum = "64bb5cc4aa43df0df11be8fee3f375ce286876cb859ff6f58173d1619858f550" dependencies = [ "ahash", "chrono", @@ -1155,7 +1155,7 @@ dependencies = [ "base64 0.22.1", "bincode 2.0.1", "biscuit", - "calcard 0.3.1", + "calcard 0.3.2", "chrono", "compact_str", "decancer", @@ -1639,7 +1639,7 @@ checksum = "2a2330da5de22e8a3cb63252ce2abb30116bf5265e89c0e01bc17015ce30a476" name = "dav" version = "0.15.0" dependencies = [ - "calcard 0.3.1", + "calcard 0.3.2", "chrono", "common", "compact_str", @@ -1661,7 +1661,7 @@ dependencies = [ name = "dav-proto" version = "0.15.0" dependencies = [ - "calcard 0.3.1", + "calcard 0.3.2", "chrono", "compact_str", "hashify", @@ -2689,7 +2689,7 @@ name = "groupware" version = "0.15.0" dependencies = [ "ahash", - "calcard 0.3.1", + "calcard 0.3.2", "chrono", "common", "compact_str", @@ -3696,7 +3696,7 @@ dependencies = [ "aes-gcm-siv", "async-stream", "base64 0.22.1", - "calcard 0.3.1", + "calcard 0.3.2", "chrono", "common", "compact_str", @@ -3803,7 +3803,7 @@ name = "jmap_proto" version = "0.15.0" dependencies = [ "ahash", - "calcard 0.3.1", + "calcard 0.3.2", "compact_str", "hashify", "jmap-tools", @@ -4374,7 +4374,7 @@ dependencies = [ "base64 0.22.1", "bincode 1.3.3", "calcard 0.1.3", - "calcard 0.3.1", + "calcard 0.3.2", "common", "compact_str", "dav-proto", @@ -7097,7 +7097,7 @@ dependencies = [ "aes-gcm", "aes-gcm-siv", "base64 0.22.1", - "calcard 0.3.1", + "calcard 0.3.2", "chrono", "common", "compact_str", @@ -7737,7 +7737,7 @@ dependencies = [ "base64 0.22.1", "biscuit", "bytes", - "calcard 0.3.1", + "calcard 0.3.2", "chrono", "common", "compact_str", diff --git a/crates/imap-proto/src/parser/append.rs b/crates/imap-proto/src/parser/append.rs index 6f2d3309..7585ede0 100644 --- a/crates/imap-proto/src/parser/append.rs +++ b/crates/imap-proto/src/parser/append.rs @@ -249,6 +249,18 @@ mod tests { }], }, ), + ( + "A003 APPEND \"&A8g- \\\"&A9QD1APUA9gD3APcA-+\\\"\" (\\Seen) \"7-Feb-1994 22:43:04 -0800\" {1+}\r\na\r\n", + append::Arguments { + tag: "A003".into(), + mailbox_name: "ψ \"ϔϔϔϘϜϜ+\"".into(), + messages: vec![Message { + message: vec![b'a'], + flags: vec![Flag::Seen], + received_at: Some(760689784), + }], + }, + ), ] { assert_eq!( receiver diff --git a/crates/imap-proto/src/utf7.rs b/crates/imap-proto/src/utf7.rs index 578ca748..312c70fb 100644 --- a/crates/imap-proto/src/utf7.rs +++ b/crates/imap-proto/src/utf7.rs @@ -158,6 +158,7 @@ mod tests { ), ), ("Test-ąęć-Test", "Test-ąęć-Test"), + (r#"&A8g- "&A9QD1APUA9gD3APcA-+""#, "ψ \"ϔϔϔϘϜϜ+\""), ] { assert_eq!( super::utf7_decode(input).expect(input), diff --git a/crates/jmap/src/calendar_event/get.rs b/crates/jmap/src/calendar_event/get.rs index cc26d701..8fa719ab 100644 --- a/crates/jmap/src/calendar_event/get.rs +++ b/crates/jmap/src/calendar_event/get.rs @@ -33,7 +33,10 @@ use jmap_proto::{ use jmap_tools::{Key, Map, Value}; use std::{str::FromStr, sync::Arc}; use store::{ - ValueKey, ahash::{AHashMap, AHashSet}, roaring::RoaringBitmap, write::{AlignedBytes, Archive} + ValueKey, + ahash::{AHashMap, AHashSet}, + roaring::RoaringBitmap, + write::{AlignedBytes, Archive}, }; use trc::AddContext; use types::{ @@ -129,7 +132,7 @@ impl CalendarEventGet for Server { return_is_origin = true; } _ => { - if matches!(property, JSCalendarProperty::ICalComponent) { + if matches!(property, JSCalendarProperty::ICalendar) { return_converted_props = true; } diff --git a/tests/src/jmap/calendar/event.rs b/tests/src/jmap/calendar/event.rs index 18070825..9f4dc1db 100644 --- a/tests/src/jmap/calendar/event.rs +++ b/tests/src/jmap/calendar/event.rs @@ -632,7 +632,7 @@ END:VCALENDAR "timeZone": "Etc/UTC", "start": "1996-09-18T14:30:00", "status": "confirmed", - "iCalComponent": { + "iCalendar": { "convertedProperties": { "duration": { "name": "dtend" diff --git a/tests/src/jmap/contacts/contact.rs b/tests/src/jmap/contacts/contact.rs index e9877dbf..a90ba96b 100644 --- a/tests/src/jmap/contacts/contact.rs +++ b/tests/src/jmap/contacts/contact.rs @@ -624,7 +624,7 @@ fn test_jscontact_1() -> Value { "pref": true }, "features": { - "cell": true, + "mobile": true, "voice": true } }, @@ -745,7 +745,7 @@ fn test_jscontact_2() -> Value { "pref": true }, "features": { - "cell": true, + "mobile": true, "voice": true } },