Compare commits

..

No commits in common. "ab1862db2d80b9eea68b6371f2c465a57dfb577f" and "0140fa5efe887f76c9a05e37d45db2fe529fb9a5" have entirely different histories.

6 changed files with 59 additions and 16 deletions

63
Cargo.lock generated
View File

@ -2432,7 +2432,7 @@ dependencies = [
"base64 0.21.7",
"byteorder",
"flate2",
"nom",
"nom 7.1.3",
"num-traits",
]
@ -2914,6 +2914,19 @@ dependencies = [
"thiserror 1.0.69",
]
[[package]]
name = "icalendar"
version = "0.17.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9e69a1b52143a7fc94b55d008e8ab30506ebc93774ddb2752ee44266378fc5d6"
dependencies = [
"chrono",
"iso8601",
"nom 8.0.0",
"nom-language",
"uuid",
]
[[package]]
name = "icu_collections"
version = "2.0.0"
@ -3153,6 +3166,15 @@ version = "1.70.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
[[package]]
name = "iso8601"
version = "0.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e1082f0c48f143442a1ac6122f67e360ceee130b967af4d50996e5154a45df46"
dependencies = [
"nom 8.0.0",
]
[[package]]
name = "itertools"
version = "0.14.0"
@ -3229,7 +3251,7 @@ dependencies = [
[[package]]
name = "letterbox-notmuch"
version = "0.17.38"
version = "0.17.37"
dependencies = [
"itertools",
"log",
@ -3244,7 +3266,7 @@ dependencies = [
[[package]]
name = "letterbox-procmail2notmuch"
version = "0.17.38"
version = "0.17.37"
dependencies = [
"anyhow",
"clap",
@ -3257,7 +3279,7 @@ dependencies = [
[[package]]
name = "letterbox-server"
version = "0.17.38"
version = "0.17.37"
dependencies = [
"ammonia",
"anyhow",
@ -3280,8 +3302,9 @@ dependencies = [
"html-escape",
"html2text",
"ical",
"letterbox-notmuch 0.17.38",
"letterbox-shared 0.17.38",
"icalendar",
"letterbox-notmuch 0.17.37",
"letterbox-shared 0.17.37",
"linkify",
"lol_html",
"mailparse",
@ -3322,10 +3345,10 @@ dependencies = [
[[package]]
name = "letterbox-shared"
version = "0.17.38"
version = "0.17.37"
dependencies = [
"build-info",
"letterbox-notmuch 0.17.38",
"letterbox-notmuch 0.17.37",
"regex",
"serde",
"sqlx",
@ -3335,7 +3358,7 @@ dependencies = [
[[package]]
name = "letterbox-web"
version = "0.17.38"
version = "0.17.37"
dependencies = [
"build-info",
"build-info-build",
@ -3347,7 +3370,7 @@ dependencies = [
"graphql_client",
"human_format",
"itertools",
"letterbox-shared 0.17.38",
"letterbox-shared 0.17.37",
"log",
"seed",
"seed_hooks",
@ -3934,6 +3957,24 @@ dependencies = [
"minimal-lexical",
]
[[package]]
name = "nom"
version = "8.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "df9761775871bdef83bee530e60050f7e54b1105350d6884eb0fb4f46c2f9405"
dependencies = [
"memchr",
]
[[package]]
name = "nom-language"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2de2bc5b451bfedaef92c90b8939a8fff5770bdcc1fafd6239d086aab8fa6b29"
dependencies = [
"nom 8.0.0",
]
[[package]]
name = "nu-ansi-term"
version = "0.46.0"
@ -6328,7 +6369,7 @@ version = "0.24.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e810cdeeebca57fc3f7bfec5f85fdbea9031b2ac9b990eb5ff49b371d52bbe6a"
dependencies = [
"nom",
"nom 7.1.3",
"serde",
"serde_json",
]

View File

@ -8,7 +8,7 @@ authors = ["Bill Thiede <git@xinu.tv>"]
edition = "2021"
license = "UNLICENSED"
publish = ["xinu"]
version = "0.17.38"
version = "0.17.37"
repository = "https://git.z.xinu.tv/wathiede/letterbox"
[profile.dev]

View File

@ -31,9 +31,10 @@ flate2 = "1.1.2"
futures = "0.3.31"
headers = "0.4.0"
html-escape = "0.2.13"
icalendar = "0.17.1"
ical = "0.10"
letterbox-notmuch = { path = "../notmuch", version = "0.17.38", registry = "xinu" }
letterbox-shared = { path = "../shared", version = "0.17.38", registry = "xinu" }
letterbox-notmuch = { path = "../notmuch", version = "0.17.37", registry = "xinu" }
letterbox-shared = { path = "../shared", version = "0.17.37", registry = "xinu" }
linkify = "0.10.0"
lol_html = "2.3.0"
mailparse = "0.16.1"

View File

@ -1838,6 +1838,7 @@ pub fn render_ical_summary(ical_data: &str) -> Result<String, ServerError> {
Ok(summary_parts.join("<hr>"))
}
fn parse_ical_datetime_tz(dt: &str, tz: Tz) -> Option<chrono::DateTime<Tz>> {
let dt = dt.split(':').last().unwrap_or(dt);
if let Ok(ndt) = chrono::NaiveDateTime::parse_from_str(dt, "%Y%m%dT%H%M%SZ") {

View File

@ -12,7 +12,7 @@ version.workspace = true
[dependencies]
build-info = "0.0.41"
letterbox-notmuch = { path = "../notmuch", version = "0.17.38", registry = "xinu" }
letterbox-notmuch = { path = "../notmuch", version = "0.17.37", registry = "xinu" }
regex = "1.11.1"
serde = { version = "1.0.219", features = ["derive"] }
sqlx = "0.8.5"

View File

@ -33,7 +33,7 @@ wasm-bindgen = "=0.2.100"
uuid = { version = "1.16.0", features = [
"js",
] } # direct dep to set js feature, prevents Rng issues
letterbox-shared = { path = "../shared/", version = "0.17.38", registry = "xinu" }
letterbox-shared = { path = "../shared/", version = "0.17.37", registry = "xinu" }
seed_hooks = { version = "0.4.1", registry = "xinu" }
strum_macros = "0.27.1"
gloo-console = "0.3.0"