Merge branch 'renovate/zip-5.x'

Cargo.lock

@@ -3168,7 +3168,7 @@ dependencies = [
 
 [[package]]
 name = "letterbox-notmuch"
-version = "0.17.43"
+version = "0.17.44"
 dependencies = [
  "itertools",
  "log",
@@ -3183,7 +3183,7 @@ dependencies = [
 
 [[package]]
 name = "letterbox-procmail2notmuch"
-version = "0.17.43"
+version = "0.17.44"
 dependencies = [
  "anyhow",
  "clap",
@@ -3196,7 +3196,7 @@ dependencies = [
 
 [[package]]
 name = "letterbox-server"
-version = "0.17.43"
+version = "0.17.44"
 dependencies = [
  "ammonia",
  "anyhow",
@@ -3219,8 +3219,8 @@ dependencies = [
  "html-escape",
  "html2text",
  "ical",
- "letterbox-notmuch 0.17.43",
+ "letterbox-notmuch 0.17.44",
- "letterbox-shared 0.17.43",
+ "letterbox-shared 0.17.44",
  "linkify",
  "lol_html",
  "mailparse",
@@ -3261,10 +3261,10 @@ dependencies = [
 
 [[package]]
 name = "letterbox-shared"
-version = "0.17.43"
+version = "0.17.44"
 dependencies = [
  "build-info",
- "letterbox-notmuch 0.17.43",
+ "letterbox-notmuch 0.17.44",
  "regex",
  "serde",
  "sqlx",
@@ -3274,7 +3274,7 @@ dependencies = [
 
 [[package]]
 name = "letterbox-web"
-version = "0.17.43"
+version = "0.17.44"
 dependencies = [
  "build-info",
  "build-info-build",
@@ -3286,7 +3286,7 @@ dependencies = [
  "graphql_client",
  "human_format",
  "itertools",
- "letterbox-shared 0.17.43",
+ "letterbox-shared 0.17.44",
  "log",
  "seed",
  "seed_hooks",
@@ -3331,26 +3331,6 @@ dependencies = [
  "pkg-config",
 ]
 
-[[package]]
-name = "liblzma"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10bf66f4598dc77ff96677c8e763655494f00ff9c1cf79e2eb5bb07bc31f807d"
-dependencies = [
- "liblzma-sys",
-]
-
-[[package]]
-name = "liblzma-sys"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01b9596486f6d60c3bbe644c0e1be1aa6ccc472ad630fe8927b456973d7cb736"
-dependencies = [
- "cc",
- "libc",
- "pkg-config",
-]
-
 [[package]]
 name = "libm"
 version = "0.2.15"
@@ -3493,6 +3473,16 @@ version = "0.11.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "08ab2867e3eeeca90e844d1940eab391c9dc5228783db2ed999acbc0a9ed375a"
 
+[[package]]
+name = "lzma-rust2"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c60a23ffb90d527e23192f1246b14746e2f7f071cb84476dd879071696c18a4a"
+dependencies = [
+ "crc",
+ "sha2 0.10.9",
+]
+
 [[package]]
 name = "mac"
 version = "0.1.1"
@@ -5379,10 +5369,11 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
 
 [[package]]
 name = "serde"
-version = "1.0.219"
+version = "1.0.222"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6"
+checksum = "aab69e3f5be1836a1fe0aca0b286e5a5b38f262d6c9e8acd2247818751fcc8fb"
 dependencies = [
+ "serde_core",
  "serde_derive",
 ]
 
@@ -5419,10 +5410,19 @@ dependencies = [
 ]
 
 [[package]]
-name = "serde_derive"
+name = "serde_core"
-version = "1.0.219"
+version = "1.0.222"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
+checksum = "3f8ebec5eea07db7df9342aa712db2138f019d9ab3454a60a680579a6f841b80"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.222"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5f61630fe26d0ff555e6c37dc445ab2f15871c8a11ace3cf471b3195d3e4f49"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5431,14 +5431,15 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.143"
+version = "1.0.145"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d401abef1d108fbd9cbaebc3e46611f4b1021f714a0597a71f41ee463f5f4a5a"
+checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c"
 dependencies = [
  "itoa 1.0.15",
  "memchr",
  "ryu",
  "serde",
+ "serde_core",
 ]
 
 [[package]]
@@ -7837,9 +7838,9 @@ dependencies = [
 
 [[package]]
 name = "zip"
-version = "4.6.1"
+version = "5.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "caa8cd6af31c3b31c6631b8f483848b91589021b28fffe50adada48d4f4d2ed1"
+checksum = "b9fdfa5f34b5980f2c21b3a2c68c09ade4debddc7be52c51056695effc73a08c"
 dependencies = [
  "aes",
  "arbitrary",
@@ -7851,7 +7852,7 @@ dependencies = [
  "getrandom 0.3.3",
  "hmac 0.12.1",
  "indexmap 2.11.0",
- "liblzma",
+ "lzma-rust2",
  "memchr",
  "pbkdf2",
  "ppmd-rust",

Cargo.toml

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

server/Cargo.toml

@@ -32,8 +32,8 @@ futures = "0.3.31"
 headers = "0.4.0"
 html-escape = "0.2.13"
 ical = "0.11"
-letterbox-notmuch = { path = "../notmuch", version = "0.17.43", registry = "xinu" }
+letterbox-notmuch = { path = "../notmuch", version = "0.17.44", registry = "xinu" }
-letterbox-shared = { path = "../shared", version = "0.17.43", registry = "xinu" }
+letterbox-shared = { path = "../shared", version = "0.17.44", registry = "xinu" }
 linkify = "0.10.0"
 lol_html = "2.3.0"
 mailparse = "0.16.1"
@@ -56,7 +56,7 @@ urlencoding = "2.1.3"
 #xtracing = { git = "http://git-private.h.xinu.tv/wathiede/xtracing.git" }
 #xtracing = { path = "../../xtracing" }
 xtracing = { version = "0.3.2", registry = "xinu" }
-zip = "4.3.0"
+zip = "5.0.0"
 
 
 [build-dependencies]

server/src/email_extract.rs

@@ -2157,28 +2157,28 @@ mod tests {
         let meta = extract_calendar_metadata_from_mail(&parsed, &body);
         // Assert detection as Google Calendar
         assert!(meta.is_google_calendar_event);
-        // Debug: print the rendered HTML for inspection
         let html = meta.body_html.expect("body_html");
+
+        // Print event date info for debugging
+        for part in parsed.subparts.iter() {
+            if part.ctype.mimetype == TEXT_CALENDAR {
+                if let Ok(ical) = part.get_body() {
+                    println!("ICAL data: {}", ical);
+                    if let Some(start) = ical.lines().find(|l| l.starts_with("DTSTART:")) {
+                        println!("Start date: {}", start);
+                    }
+                }
+            }
+        }
         println!("Rendered HTML: {}", html);
-        // Check that the calendar table highlights Thursday, not Friday
+
-        // Look for a table header row with days of week (allow whitespace)
+        // Look for September 11 (Thursday) being highlighted
-        let thursday_idx = html
+        // The calendar should show Sept 11 highlighted with background:#ffd700 and the correct data-event-day
-            .find(">\n                            Thu<")
+        assert!(html.contains(r#"data-event-day="2025-09-11""#));
-            .or_else(|| html.find(">Thu<"))
+        assert!(html.contains(r#"background:#ffd700"#));
-            .expect("Should have a Thursday column");
+
-        let friday_idx = html
+        // Since 1:00 AM UTC on Friday 9/12 is 6:00 PM PDT on Thursday 9/11, verify times are correct
-            .find(">\n                            Fri<")
+        assert!(html.contains("6:00 PM Thu Sep 11, 2025"));
-            .or_else(|| html.find(">Fri<"))
-            .expect("Should have a Friday column");
-        // Find the first highlighted cell (background:#ffd700)
-        let highlight_idx = html
-            .find("background:#ffd700")
-            .expect("Should highlight a day");
-        // The highlight should be closer to Thursday than Friday
-        assert!(
-            highlight_idx > thursday_idx && highlight_idx < friday_idx,
-            "Thursday should be highlighted, not Friday"
-        );
     }
     use super::*;
     #[test]

server/templates/ical_summary.html

@@ -74,13 +74,7 @@
                         {% for week in all_days|batch(7) %}
                         <tr>
                             {% for day in week %}
-                            {% if event_days.contains(day) && today.is_some() && today.unwrap() == day %}
+                            {% if event_days.contains(day) %}
-                            <td
-                                data-event-day="{{ day.format("%Y-%m-%d") }}"
-                                style="background:#ffd700; color:#222; font-weight:bold; border:2px solid #2196f3; border-radius:4px; text-align:center; box-shadow:0 0 0 2px #2196f3;">
-                                {{ day.day() }}
-                            </td>
-                            {% elif event_days.contains(day) %}
                             <td
                                 data-event-day="{{ day.format("%Y-%m-%d") }}"
                                 style="background:#ffd700; color:#222; font-weight:bold; border:1px solid #aaa; border-radius:4px; text-align:center;">

shared/Cargo.toml

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

web/Cargo.toml

@@ -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.43", registry = "xinu" }
+letterbox-shared = { path = "../shared/", version = "0.17.44", registry = "xinu" }
 seed_hooks = { version = "0.4.1", registry = "xinu" }
 strum_macros = "0.27.1"
 gloo-console = "0.3.0"