fix(deps): update all non-major dependencies

Cargo.lock

@@ -969,28 +969,6 @@ dependencies = [
  "windows-link",
 ]
 
-[[package]]
-name = "chrono-tz"
-version = "0.8.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d59ae0466b83e838b81a54256c39d5d7c20b9d7daa10510a242d9b75abd5936e"
-dependencies = [
- "chrono",
- "chrono-tz-build",
- "phf 0.11.3",
-]
-
-[[package]]
-name = "chrono-tz-build"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "433e39f13c9a060046954e0592a8d0a4bcb1040125cbf91cb8ee58964cfb350f"
-dependencies = [
- "parse-zoneinfo",
- "phf 0.11.3",
- "phf_codegen 0.11.3",
-]
-
 [[package]]
 name = "cipher"
 version = "0.4.4"
@@ -1003,9 +981,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.44"
+version = "4.5.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c1f056bae57e3e54c3375c41ff79619ddd13460a17d7438712bd0d83fda4ff8"
+checksum = "1fc0e74a703892159f5ae7d3aac52c8e6c392f5ae5f359c70b5881d60aaac318"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -1025,9 +1003,9 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.5.41"
+version = "4.5.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef4f52386a59ca4c860f7393bcf8abd8dfd91ecccc0f774635ff68e92eeef491"
+checksum = "14cb31bb0a7d536caef2639baa7fad459e15c3144efefa6dbd1c84562c4739f6"
 dependencies = [
  "heck 0.5.0",
  "proc-macro2",
@@ -1386,7 +1364,7 @@ dependencies = [
  "cssparser-macros",
  "dtoa-short",
  "itoa 1.0.15",
- "phf 0.11.3",
+ "phf",
  "smallvec 1.15.1",
 ]
 
@@ -1399,7 +1377,7 @@ dependencies = [
  "cssparser-macros",
  "dtoa-short",
  "itoa 1.0.15",
- "phf 0.11.3",
+ "phf",
  "smallvec 1.15.1",
 ]
 
@@ -2075,7 +2053,7 @@ version = "0.2.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cba6ae63eb948698e300f645f87c70f76630d505f23b8907cf1e193ee85048c1"
 dependencies = [
- "unicode-width 0.2.1",
+ "unicode-width",
 ]
 
 [[package]]
@@ -2540,33 +2518,6 @@ dependencies = [
  "utf8-width",
 ]
 
-[[package]]
-name = "html2text"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74cda84f06c1cc83476f79ae8e2e892b626bdadafcb227baec54c918cadc18a0"
-dependencies = [
- "html5ever 0.26.0",
- "markup5ever 0.11.0",
- "tendril",
- "unicode-width 0.1.14",
- "xml5ever",
-]
-
-[[package]]
-name = "html5ever"
-version = "0.26.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bea68cab48b8459f17cf1c944c67ddc572d272d9f2b274140f223ecb1da4a3b7"
-dependencies = [
- "log",
- "mac",
- "markup5ever 0.11.0",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "html5ever"
 version = "0.29.1"
@@ -2905,15 +2856,6 @@ dependencies = [
  "cc",
 ]
 
-[[package]]
-name = "ical"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4bad4eb99ee34e58a1e642114eded65b4ea5ea3c1584971a1afc12a3b927670"
-dependencies = [
- "thiserror 1.0.69",
-]
-
 [[package]]
 name = "icu_collections"
 version = "2.0.0"
@@ -3229,7 +3171,7 @@ dependencies = [
 
 [[package]]
 name = "letterbox-notmuch"
-version = "0.17.38"
+version = "0.17.29"
 dependencies = [
  "itertools",
  "log",
@@ -3244,7 +3186,7 @@ dependencies = [
 
 [[package]]
 name = "letterbox-procmail2notmuch"
-version = "0.17.38"
+version = "0.17.29"
 dependencies = [
  "anyhow",
  "clap",
@@ -3257,7 +3199,7 @@ dependencies = [
 
 [[package]]
 name = "letterbox-server"
-version = "0.17.38"
+version = "0.17.29"
 dependencies = [
  "ammonia",
  "anyhow",
@@ -3271,17 +3213,14 @@ dependencies = [
  "build-info-build",
  "cacher",
  "chrono",
- "chrono-tz",
  "clap",
  "css-inline",
  "flate2",
  "futures 0.3.31",
  "headers",
  "html-escape",
- "html2text",
+ "letterbox-notmuch 0.17.29",
- "ical",
+ "letterbox-shared 0.17.29",
- "letterbox-notmuch 0.17.38",
- "letterbox-shared 0.17.38",
  "linkify",
  "lol_html",
  "mailparse",
@@ -3322,10 +3261,10 @@ dependencies = [
 
 [[package]]
 name = "letterbox-shared"
-version = "0.17.38"
+version = "0.17.29"
 dependencies = [
  "build-info",
- "letterbox-notmuch 0.17.38",
+ "letterbox-notmuch 0.17.29",
  "regex",
  "serde",
  "sqlx",
@@ -3335,7 +3274,7 @@ dependencies = [
 
 [[package]]
 name = "letterbox-web"
-version = "0.17.38"
+version = "0.17.29"
 dependencies = [
  "build-info",
  "build-info-build",
@@ -3347,7 +3286,7 @@ dependencies = [
  "graphql_client",
  "human_format",
  "itertools",
- "letterbox-shared 0.17.38",
+ "letterbox-shared 0.17.29",
  "log",
  "seed",
  "seed_hooks",
@@ -3582,20 +3521,6 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d"
 
-[[package]]
-name = "markup5ever"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a2629bb1404f3d34c2e921f21fd34ba00b206124c81f65c50b43b6aaefeb016"
-dependencies = [
- "log",
- "phf 0.10.1",
- "phf_codegen 0.10.0",
- "string_cache",
- "string_cache_codegen",
- "tendril",
-]
-
 [[package]]
 name = "markup5ever"
 version = "0.14.1"
@@ -3603,8 +3528,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c7a7213d12e1864c0f002f52c2923d4556935a43dec5e71355c2760e0f6e7a18"
 dependencies = [
  "log",
- "phf 0.11.3",
+ "phf",
- "phf_codegen 0.11.3",
+ "phf_codegen",
  "string_cache",
  "string_cache_codegen",
  "tendril",
@@ -4302,15 +4227,6 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
-[[package]]
-name = "parse-zoneinfo"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f2a05b18d44e2957b88f96ba460715e295bc1d7510468a2f3d3b44535d26c24"
-dependencies = [
- "regex",
-]
-
 [[package]]
 name = "paste"
 version = "1.0.15"
@@ -4386,15 +4302,6 @@ dependencies = [
  "sha2 0.10.9",
 ]
 
-[[package]]
-name = "phf"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259"
-dependencies = [
- "phf_shared 0.10.0",
-]
-
 [[package]]
 name = "phf"
 version = "0.11.3"
@@ -4402,17 +4309,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1fd6780a80ae0c52cc120a26a1a42c1ae51b247a253e4e06113d23d2c2edd078"
 dependencies = [
  "phf_macros",
- "phf_shared 0.11.3",
+ "phf_shared",
-]
-
-[[package]]
-name = "phf_codegen"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fb1c3a8bc4dd4e5cfce29b44ffc14bedd2ee294559a294e2a4d4c9e9a6a13cd"
-dependencies = [
- "phf_generator 0.10.0",
- "phf_shared 0.10.0",
 ]
 
 [[package]]
@@ -4421,18 +4318,8 @@ version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "aef8048c789fa5e851558d709946d6d79a8ff88c0440c587967f8e94bfb1216a"
 dependencies = [
- "phf_generator 0.11.3",
+ "phf_generator",
- "phf_shared 0.11.3",
+ "phf_shared",
-]
-
-[[package]]
-name = "phf_generator"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6"
-dependencies = [
- "phf_shared 0.10.0",
- "rand 0.8.5",
 ]
 
 [[package]]
@@ -4441,7 +4328,7 @@ version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3c80231409c20246a13fddb31776fb942c38553c51e871f8cbd687a4cfb5843d"
 dependencies = [
- "phf_shared 0.11.3",
+ "phf_shared",
  "rand 0.8.5",
 ]
 
@@ -4451,29 +4338,20 @@ version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f84ac04429c13a7ff43785d75ad27569f2951ce0ffd30a3321230db2fc727216"
 dependencies = [
- "phf_generator 0.11.3",
+ "phf_generator",
- "phf_shared 0.11.3",
+ "phf_shared",
  "proc-macro2",
  "quote",
  "syn 2.0.104",
 ]
 
-[[package]]
-name = "phf_shared"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096"
-dependencies = [
- "siphasher 0.3.11",
-]
-
 [[package]]
 name = "phf_shared"
 version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "67eabc2ef2a60eb7faa00097bd1ffdb5bd28e62bf39990626a582201b7a754e5"
 dependencies = [
- "siphasher 1.0.1",
+ "siphasher",
 ]
 
 [[package]]
@@ -4983,9 +4861,9 @@ checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
 
 [[package]]
 name = "reqwest"
-version = "0.12.22"
+version = "0.12.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbc931937e6ca3a06e3b6c0aa7841849b160a90351d6ab467a8b9b9959767531"
+checksum = "d429f34c8092b2d42c7c93cec323bb4adeb7c67698f70839adec842ec10c7ceb"
 dependencies = [
  "base64 0.22.1",
  "bytes 1.10.1",
@@ -5505,8 +5383,8 @@ dependencies = [
  "fxhash",
  "log",
  "new_debug_unreachable",
- "phf 0.11.3",
+ "phf",
- "phf_codegen 0.11.3",
+ "phf_codegen",
  "precomputed-hash",
  "servo_arc",
  "smallvec 1.15.1",
@@ -5524,8 +5402,8 @@ dependencies = [
  "fxhash",
  "log",
  "new_debug_unreachable",
- "phf 0.11.3",
+ "phf",
- "phf_codegen 0.11.3",
+ "phf_codegen",
  "precomputed-hash",
  "servo_arc",
  "smallvec 1.15.1",
@@ -5758,12 +5636,6 @@ version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"
 
-[[package]]
-name = "siphasher"
-version = "0.3.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d"
-
 [[package]]
 name = "siphasher"
 version = "1.0.1"
@@ -6072,7 +5944,7 @@ checksum = "bf776ba3fa74f83bf4b63c3dcbbf82173db2632ed8452cb2d891d33f459de70f"
 dependencies = [
  "new_debug_unreachable",
  "parking_lot 0.12.4",
- "phf_shared 0.11.3",
+ "phf_shared",
  "precomputed-hash",
  "serde",
 ]
@@ -6083,8 +5955,8 @@ version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c711928715f1fe0fe509c53b43e993a9a557babc2d0a3567d0a3006f1ac931a0"
 dependencies = [
- "phf_generator 0.11.3",
+ "phf_generator",
- "phf_shared 0.11.3",
+ "phf_shared",
  "proc-macro2",
  "quote",
 ]
@@ -7154,12 +7026,6 @@ version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e70f2a8b45122e719eb623c01822704c4e0907e7e426a05927e1a1cfff5b75d0"
 
-[[package]]
-name = "unicode-width"
-version = "0.1.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
-
 [[package]]
 name = "unicode-width"
 version = "0.2.1"
@@ -7464,8 +7330,8 @@ version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "57ffde1dc01240bdf9992e3205668b235e59421fd085e8a317ed98da0178d414"
 dependencies = [
- "phf 0.11.3",
+ "phf",
- "phf_codegen 0.11.3",
+ "phf_codegen",
  "string_cache",
  "string_cache_codegen",
 ]
@@ -7524,7 +7390,7 @@ version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
 dependencies = [
- "windows-sys 0.59.0",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -7865,17 +7731,6 @@ version = "0.8.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6fd8403733700263c6eb89f192880191f1b83e332f7a20371ddcf421c4a337c7"
 
-[[package]]
-name = "xml5ever"
-version = "0.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4034e1d05af98b51ad7214527730626f019682d797ba38b51689212118d8e650"
-dependencies = [
- "log",
- "mac",
- "markup5ever 0.11.0",
-]
-
 [[package]]
 name = "xtracing"
 version = "0.3.2"

Cargo.toml

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

server/.sqlx/query-126e16a4675e8d79f330b235f9e1b8614ab1e1526e4e69691c5ebc70d54a42ef.json

@@ -0,0 +1,22 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\nSELECT\n  url\nFROM email_photo ep\nJOIN email_address ea\nON ep.id = ea.email_photo_id\nWHERE\n  address = $1\n    ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "url",
+        "type_info": "Text"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text"
+      ]
+    },
+    "nullable": [
+      false
+    ]
+  },
+  "hash": "126e16a4675e8d79f330b235f9e1b8614ab1e1526e4e69691c5ebc70d54a42ef"
+}

server/.sqlx/query-6c5b0a96f45f78795732ea428cc01b4eab28b7150aa37387e7439a6b0b58e88c.json

@@ -0,0 +1,20 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n        SELECT rule as \"rule: Json<Rule>\"\n        FROM email_rule\n        ORDER BY sort_order\n        ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "rule: Json<Rule>",
+        "type_info": "Jsonb"
+      }
+    ],
+    "parameters": {
+      "Left": []
+    },
+    "nullable": [
+      false
+    ]
+  },
+  "hash": "6c5b0a96f45f78795732ea428cc01b4eab28b7150aa37387e7439a6b0b58e88c"
+}

server/Cargo.toml

@@ -12,8 +12,6 @@ version.workspace = true
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-chrono-tz = "0.8"
-html2text = "0.6"
 ammonia = "4.1.0"
 anyhow = "1.0.98"
 askama = { version = "0.14.0", features = ["derive"] }
@@ -31,9 +29,8 @@ flate2 = "1.1.2"
 futures = "0.3.31"
 headers = "0.4.0"
 html-escape = "0.2.13"
-ical = "0.10"
+letterbox-notmuch = { path = "../notmuch", version = "0.17.29", registry = "xinu" }
-letterbox-notmuch = { path = "../notmuch", version = "0.17.38", registry = "xinu" }
+letterbox-shared = { path = "../shared", version = "0.17.29", registry = "xinu" }
-letterbox-shared = { path = "../shared", version = "0.17.38", registry = "xinu" }
 linkify = "0.10.0"
 lol_html = "2.3.0"
 mailparse = "0.16.1"
@@ -58,7 +55,6 @@ urlencoding = "2.1.3"
 xtracing = { version = "0.3.2", registry = "xinu" }
 zip = "4.3.0"
 
-
 [build-dependencies]
 build-info-build = "0.0.41"
 

server/sql/label_unprocessed.sql

@@ -1 +0,0 @@
-SELECT rule as "rule: Json<Rule>" FROM email_rule ORDER BY sort_order

server/sql/photo_url_for_email_address.sql

@@ -1 +0,0 @@
-SELECT url FROM email_photo ep JOIN email_address ea ON ep.id = ea.email_photo_id WHERE address = $1

server/src/bin/letterbox-server.rs

@@ -119,10 +119,9 @@ async fn download_attachment(
     } else {
         format!("id:{}", id)
     };
-    info!("download attachment message id '{mid}' idx '{idx}'");
+    info!("download attachment {mid} {idx}");
     let idx: Vec<_> = idx
         .split('.')
-        .filter(|s| !s.is_empty())
         .map(|s| s.parse().expect("not a usize"))
         .collect();
     let attachment = attachment_bytes(&nm, &mid, &idx)?;

server/src/error.rs

@@ -41,8 +41,4 @@ pub enum ServerError {
     InfaillibleError(#[from] Infallible),
     #[error("askama error: {0}")]
     AskamaError(#[from] askama::Error),
-    #[error("xml error: {0}")]
-    XmlError(#[from] quick_xml::Error),
-    #[error("xml encoding error: {0}")]
-    XmlEncodingError(#[from] quick_xml::encoding::EncodingError),
 }

server/src/graphql.rs

@@ -237,24 +237,6 @@ impl Body {
             content_tree: "".to_string(),
         })
     }
-
-    pub fn to_html(&self) -> Option<String> {
-        match self {
-            Body::Html(h) => Some(h.html.clone()),
-            Body::PlainText(p) => Some(format!("<pre>{}</pre>", html_escape::encode_text(&p.text))),
-            Body::UnhandledContentType(u) => {
-                Some(format!("<pre>{}</pre>", html_escape::encode_text(&u.text)))
-            }
-        }
-    }
-
-    pub fn to_html_content_tree(&self) -> Option<String> {
-        match self {
-            Body::Html(h) => Some(h.content_tree.clone()),
-            Body::PlainText(p) => Some(p.content_tree.clone()),
-            Body::UnhandledContentType(u) => Some(u.content_tree.clone()),
-        }
-    }
 }
 
 #[derive(Debug, SimpleObject)]

server/src/lib.rs

@@ -1,5 +1,4 @@
 pub mod config;
-pub mod email_extract;
 pub mod error;
 pub mod graphql;
 pub mod newsreader;

server/src/templates.rs

@@ -0,0 +1,7 @@
+use askama::Template;
+
+#[derive(Template)]
+#[template(path = "dmarc_report.html")]
+pub struct DmarcReportTemplate<'a> {
+    pub feedback: &'a crate::nm::Feedback,
+}

server/templates/dmarc_report.html

@@ -40,9 +40,6 @@
                     <th style="border:1px solid #bbb;padding:4px 8px;">Source IP</th>
                     <th style="border:1px solid #bbb;padding:4px 8px;">Count</th>
                     <th style="border:1px solid #bbb;padding:4px 8px;">Header From</th>
-                    {% if report.has_envelope_to %}
-                    <th style="border:1px solid #bbb;padding:4px 8px;">Envelope To</th>
-                    {% endif %}
                     <th style="border:1px solid #bbb;padding:4px 8px;">Disposition</th>
                     <th style="border:1px solid #bbb;padding:4px 8px;">DKIM</th>
                     <th style="border:1px solid #bbb;padding:4px 8px;">SPF</th>
@@ -55,9 +52,6 @@
                         <td style="border:1px solid #bbb;padding:4px 8px;">{{ rec.source_ip }}</td>
                         <td style="border:1px solid #bbb;padding:4px 8px;">{{ rec.count }}</td>
                         <td style="border:1px solid #bbb;padding:4px 8px;">{{ rec.header_from }}</td>
-                        {% if report.has_envelope_to %}
-                        <td style="border:1px solid #bbb;padding:4px 8px;">{{ rec.envelope_to }}</td>
-                        {% endif %}
                         <td style="border:1px solid #bbb;padding:4px 8px;">{{ rec.disposition }}</td>
                         <td style="border:1px solid #bbb;padding:4px 8px;">{{ rec.dkim }}</td>
                         <td style="border:1px solid #bbb;padding:4px 8px;">{{ rec.spf }}</td>
@@ -80,10 +74,6 @@
                                         </span><br>
                                     {% endfor %}
 
-                            {% for reason in rec.reason %}
-                                <span style="white-space:nowrap;">Reason: {{ reason }}</span><br>
-                            {% endfor %}
-
                             {% endif %}
                         </td>
                     </tr>

server/templates/ical_summary.html

@@ -1,108 +0,0 @@
-<style>
-    .ical-flex {
-        display: flex;
-        flex-direction: row;
-        flex-wrap: wrap;
-        align-items: stretch;
-        gap: 0.5em;
-        max-width: 700px;
-        width: 100%;
-    }
-
-    .ical-flex .summary-block {
-        flex: 1 1 0%;
-    }
-
-    .ical-flex .calendar-block {
-        flex: none;
-        margin-left: auto;
-    }
-
-    @media (max-width: 599px) {
-        .ical-flex {
-            flex-direction: column;
-        }
-
-        .ical-flex>div.summary-block {
-            margin-bottom: 0.5em;
-            margin-left: 0;
-        }
-
-        .ical-flex>div.calendar-block {
-            margin-left: 0;
-        }
-    }
-</style>
-<div class="ical-flex">
-    <div class="summary-block"
-        style="background:#f7f7f7; border-radius:8px; box-shadow:0 2px 8px #bbb; padding:16px 18px; margin:0 0 8px 0; min-width:220px; max-width:700px; font-size:15px; color:#222;">
-        <div
-            style="display: flex; flex-direction: row; flex-wrap: wrap; align-items: flex-start; gap: 0.5em; width: 100%;">
-            <div style="flex: 1 1 220px; min-width: 180px;">
-                <div style="font-size:17px; font-weight:bold; margin-bottom:8px; color:#333;"><b>Summary:</b> {{ summary
-                    }}</div>
-                <div style="margin-bottom:4px;"><b>Start:</b> {{ local_fmt_start }}</div>
-                <div style="margin-bottom:4px;"><b>End:</b> {{ local_fmt_end }}</div>
-                {% if !organizer_cn.is_empty() %}
-                <div style="margin-bottom:4px;"><b>Organizer:</b> {{ organizer_cn }}</div>
-                {% elif !organizer.is_empty() %}
-                <div style="margin-bottom:4px;"><b>Organizer:</b> {{ organizer }}</div>
-                {% endif %}
-            </div>
-            {% if all_days.len() > 0 %}
-            <div class="calendar-block" style="flex: none; margin-left: auto; min-width: 180px;">
-                <table class="ical-month"
-                    style="border-collapse:collapse; min-width:220px; background:#fff; box-shadow:0 2px 8px #bbb; font-size:14px; margin:0;">
-                    <caption
-                        style="caption-side:top; text-align:center; font-weight:bold; font-size:16px; padding-bottom:8px 0;">
-                        {{ caption }}</caption>
-                    <thead>
-                        <tr>
-                            {% for wd in ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"] %}
-                            <th
-                                style="padding:4px 6px; border-bottom:1px solid #ccc; color:#666; font-weight:600; background:#f7f7f7">
-                                {{ wd }}</th>
-                            {% endfor %}
-                        </tr>
-                    </thead>
-                    <tbody>
-                        {% for week in all_days|batch(7) %}
-                        <tr>
-                            {% for day in week %}
-                            {% if event_days.contains(day) && today.is_some() && today.unwrap() == day %}
-                            <td
-                                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
-                                style="background:#ffd700; color:#222; font-weight:bold; border:1px solid #aaa; border-radius:4px; text-align:center;">
-                                {{ day.day() }}
-                            </td>
-                            {% elif today.is_some() && today.unwrap() == day %}
-                            <td
-                                style="border:2px solid #2196f3; border-radius:4px; text-align:center; background:#e3f2fd; color:#222; box-shadow:0 0 0 2px #2196f3;">
-                                {{ day.day() }}
-                            </td>
-                            {% else %}
-                            <td style="border:1px solid #eee; text-align:center;background:#f7f7f7;color:#bbb;">
-                                {{ day.day() }}
-                            </td>
-                            {% endif %}
-                            {% endfor %}
-                        </tr>
-                        {% endfor %}
-                    </tbody>
-                </table>
-            </div>
-            {% endif %}
-        </div>
-    </div>
-</div>
-{% if !description_paragraphs.is_empty() %}
-<div style="max-width:700px; width:100%;">
-    {% for p in description_paragraphs %}
-    <p style="margin: 0 0 8px 0; color:#444;">{{ p }}</p>
-    {% endfor %}
-</div>
-{% endif %}

server/templates/tls_report.html

@@ -1,48 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-    <title>TLS Report</title>
-</head>
-
-<body>
-    <h3>TLS Report Summary:</h3>
-    <p>Organization: {{ report.organization_name }}</p>
-    <p>Date Range: {{ report.date_range.start_datetime }} to {{ report.date_range.end_datetime }}</p>
-    <p>Contact: {{ report.contact_info }}</p>
-    <p>Report ID: {{ report.report_id }}</p>
-
-    <h4><b>Policies:</b></h4>
-    {% for policy in report.policies %}
-    <h5><b>Policy Domain:</b> {{ policy.policy.policy_domain }}</h5>
-    <ul>
-        <li><b>Policy Type:</b> {{ policy.policy.policy_type }}</li>
-        <li><b>Policy String:</b> {{ policy.policy.policy_string | join(", ") }}</li>
-        <li><b>Successful Sessions:</b> {{ policy.summary.total_successful_session_count }}</li>
-        <li><b>Failed Sessions:</b> {{ policy.summary.total_failure_session_count }}</li>
-    </ul>
-
-    <ul>
-        {% for mx_host in policy.policy.mx_host %}
-        <li><b>Hostname:</b> {{ mx_host.hostname }}, <b>Failures:</b> {{ mx_host.failure_count }}, <b>Result:</b> {{
-            mx_host.result_type }}</li>
-        {% endfor %}
-    </ul>
-
-    <ul>
-        {% for detail in policy.failure_details %}
-        <li><b>Result:</b> {{ detail.result_type }}, <b>Sending IP:</b> {{ detail.sending_mta_ip }}, <b>Failed
-                Sessions:</b> {{ detail.failed_session_count }}
-            {% if detail.failure_reason_code != "" %}
-            (<b>Reason:</b> {{ detail.failure_reason_code }})
-            {% endif %}
-        </li>
-        (<b>Receiving IP:</b> {{ detail.receiving_ip }})
-        (<b>Receiving MX:</b> {{ detail.receiving_mx_hostname }})
-        (<b>Additional Info:</b> {{ detail.additional_info }})
-        {% endfor %}
-    </ul>
-    {% endfor %}
-</body>
-
-</html>

server/testdata/dmarc-example-no-envelope-to.xml

@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<feedback>
-    <version>1.0</version>
-    <report_metadata>
-        <org_name>google.com</org_name>
-        <email>noreply-dmarc-support@google.com</email>
-        <extra_contact_info>https://support.google.com/a/answer/2466580</extra_contact_info>
-        <report_id>5142106658860834914</report_id>
-        <date_range>
-            <begin>1755302400</begin>
-            <end>1755388799</end>
-        </date_range>
-    </report_metadata>
-    <policy_published>
-        <domain>xinu.tv</domain>
-        <adkim>s</adkim>
-        <aspf>s</aspf>
-        <p>quarantine</p>
-        <sp>reject</sp>
-        <pct>100</pct>
-        <np>reject</np>
-    </policy_published>
-    <record>
-        <row>
-            <source_ip>74.207.253.222</source_ip>
-            <count>1</count>
-            <policy_evaluated>
-                <disposition>none</disposition>
-                <dkim>pass</dkim>
-                <spf>pass</spf>
-            </policy_evaluated>
-        </row>
-        <identifiers>
-            <header_from>xinu.tv</header_from>
-        </identifiers>
-        <auth_results>
-            <dkim>
-                <domain>xinu.tv</domain>
-                <result>pass</result>
-                <selector>mail</selector>
-            </dkim>
-            <spf>
-                <domain>xinu.tv</domain>
-                <result>pass</result>
-            </spf>
-        </auth_results>
-    </record>
-</feedback>

server/testdata/dmarc-example.xml

@@ -1,78 +0,0 @@
-<?xml version="1.0"?>
-<feedback xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <version>1.0</version>
-    <report_metadata>
-        <org_name>Outlook.com</org_name>
-        <email>dmarcreport@microsoft.com</email>
-        <report_id>e6c5a2ce6e074d7d8cd041a0d6f32a3d</report_id>
-        <date_range>
-            <begin>1755302400</begin>
-            <end>1755388800</end>
-        </date_range>
-    </report_metadata>
-    <policy_published>
-        <domain>xinu.tv</domain>
-        <adkim>s</adkim>
-        <aspf>s</aspf>
-        <p>quarantine</p>
-        <sp>reject</sp>
-        <pct>100</pct>
-        <fo>1</fo>
-    </policy_published>
-    <record>
-        <row>
-            <source_ip>74.207.253.222</source_ip>
-            <count>1</count>
-            <policy_evaluated>
-                <disposition>none</disposition>
-                <dkim>pass</dkim>
-                <spf>pass</spf>
-            </policy_evaluated>
-        </row>
-        <identifiers>
-            <envelope_to>msn.com</envelope_to>
-            <envelope_from>xinu.tv</envelope_from>
-            <header_from>xinu.tv</header_from>
-        </identifiers>
-        <auth_results>
-            <dkim>
-                <domain>xinu.tv</domain>
-                <selector>mail</selector>
-                <result>pass</result>
-            </dkim>
-            <spf>
-                <domain>xinu.tv</domain>
-                <scope>mfrom</scope>
-                <result>pass</result>
-            </spf>
-        </auth_results>
-    </record>
-    <record>
-        <row>
-            <source_ip>74.207.253.222</source_ip>
-            <count>1</count>
-            <policy_evaluated>
-                <disposition>none</disposition>
-                <dkim>pass</dkim>
-                <spf>pass</spf>
-            </policy_evaluated>
-        </row>
-        <identifiers>
-            <envelope_to>hotmail.com</envelope_to>
-            <envelope_from>xinu.tv</envelope_from>
-            <header_from>xinu.tv</header_from>
-        </identifiers>
-        <auth_results>
-            <dkim>
-                <domain>xinu.tv</domain>
-                <selector>mail</selector>
-                <result>pass</result>
-            </dkim>
-            <spf>
-                <domain>xinu.tv</domain>
-                <scope>mfrom</scope>
-                <result>pass</result>
-            </spf>
-        </auth_results>
-    </record>
-</feedback>

server/testdata/google-calendar-example.eml

@@ -1,169 +0,0 @@
-Return-Path: <couchmoney+caf_=gmail=xinu.tv@gmail.com>
-Delivered-To: bill@xinu.tv
-Received: from phx.xinu.tv [74.207.253.222]
-	by nixos-01.h.xinu.tv with IMAP (fetchmail-6.4.39)
-	for <wathiede@localhost> (single-drop); Mon, 02 Jun 2025 07:06:34 -0700 (PDT)
-Received: from phx.xinu.tv
-	by phx.xinu.tv with LMTP
-	id qDo+FuqvPWh51xIAJR8clQ
-	(envelope-from <couchmoney+caf_=gmail=xinu.tv@gmail.com>)
-	for <bill@xinu.tv>; Mon, 02 Jun 2025 07:06:34 -0700
-X-Original-To: gmail@xinu.tv
-Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2a00:1450:4864:20::130; helo=mail-lf1-x130.google.com; envelope-from=couchmoney+caf_=gmail=xinu.tv@gmail.com; receiver=xinu.tv 
-Authentication-Results: phx.xinu.tv;
-	dkim=pass (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.a=rsa-sha256 header.s=20230601 header.b=zT2yUtVH;
-	dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=nmJW8N67
-Received: from mail-lf1-x130.google.com (mail-lf1-x130.google.com [IPv6:2a00:1450:4864:20::130])
-	by phx.xinu.tv (Postfix) with ESMTPS id 912AC80034
-	for <gmail@xinu.tv>; Mon, 02 Jun 2025 07:06:32 -0700 (PDT)
-Received: by mail-lf1-x130.google.com with SMTP id 2adb3069b0e04-54e7967cf67so5267078e87.0
-        for <gmail@xinu.tv>; Mon, 02 Jun 2025 07:06:32 -0700 (PDT)
-ARC-Seal: i=2; a=rsa-sha256; t=1748873190; cv=pass;
-        d=google.com; s=arc-20240605;
-        b=W3s0wT+CV1W21AldY9lfxPlKRbc7XMoorEnilNq5iGjlw18vDM6eFPb+btqaGAPOPe
-         CMyGeinsFPuql+S7u6HgjZcf9ZFH71sKoFoQytm30hAXB76GO06qi1jRW6o0miuGt/j/
-         bb8qWAiAsGr34mHIbE5fBdkNOGcqW85oI78GolLqpROgn/42boEYxiGAQjybPtO4L84J
-         wP2RBkHiQQGXUjL6b02tozCji1w2XdfYqtW8RteUs1pqYdXl4GUilMLt5C0d2bhSGksS
-         3tMTFjuycbaj+F6QFCkQfEsHx/I7GjuD4mToLcYpzrNnmZZUidAoKuh+uin0cEVvnQ1j
-         V8aA==
-ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605;
-        h=to:from:subject:date:message-id:auto-submitted:sender:reply-to
-         :mime-version:dkim-signature:dkim-signature:delivered-to;
-        bh=dgRmOj3aABlB3SNw+xxlI8L9ugJFZ1WMJrtLw/W8tnA=;
-        fh=5zy5Gi9ngAea7dC9ZKKPh/BZlFmotJq74g9KHrEIwaE=;
-        b=QTAjqit0gYnuGa1lbO9RUXOVpyutliNo+tG6irWFsjGhnvMkis2KdLb6saYPnLCG7F
-         rSRXvw0HwuaJfXAV3XvIT0pxTg3PXYnc8kt/F8OtG+LiakJbMV1soj8OJ+5lZPKFmvna
-         i2T5mJjEknZsc9qWYmaAEVqIg71jhPH5CjJyehNhsIJ1/O9CH4VF8L0yv9KUMAA4tzog
-         LfI+SpOE2z/wYuMDxi2Ld3FgaVCQgkMM2Tlys8P0DjCaewWeaZFmZKIEEZUbKWbrivTa
-         RSO+Us+9yrt8hDdJuvtf9eXsGvuZtdj/2APRts/0cd7SFAQqRd0DnhGIHoXR74YVHaqi
-         U7IQ==;
-        darn=xinu.tv
-ARC-Authentication-Results: i=2; mx.google.com;
-       dkim=pass header.i=@google.com header.s=20230601 header.b=zT2yUtVH;
-       dkim=pass header.i=@gmail.com header.s=20230601 header.b=nmJW8N67;
-       spf=pass (google.com: domain of tconvertino@gmail.com designates 209.85.220.73 as permitted sender) smtp.mailfrom=tconvertino@gmail.com;
-       dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com;
-       dara=pass header.i=@gmail.com
-X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
-        d=1e100.net; s=20230601; t=1748873190; x=1749477990;
-        h=to:from:subject:date:message-id:auto-submitted:sender:reply-to
-         :mime-version:dkim-signature:dkim-signature:delivered-to
-         :x-forwarded-for:x-forwarded-to:x-gm-message-state:from:to:cc
-         :subject:date:message-id:reply-to;
-        bh=dgRmOj3aABlB3SNw+xxlI8L9ugJFZ1WMJrtLw/W8tnA=;
-        b=dBjp6JdmFUj0jKPDo9r2/xvfVSvxKaF15UYwYU7itdM18qpCnrgQdHMP2ST7EQBxou
-         58yZfVjrx84gg9phedpVSg4SaBaPIhXsLuUeVQZtPd7J3WYiH4+OGcecjV+cD0dG0TUi
-         o/FbZULNl3REysvoAj+AwUL/ny2FnNU4PIhkeSq+d6iNztkexIKLS8qWqHosenPlVX+E
-         Z7OGQZpK6m1LB5UbCsaODQq5wbNIxlOxqTP1rCHe/hHk53ljiNegzaOS31mVvp1n8/g1
-         pWIZltyZORs0zi6U9+mNd9ZbaeQjHqBrcb2bsTxCD+u0DBuF2RjLguS/feaB25TG8LAg
-         szYg==
-X-Forwarded-Encrypted: i=2; AJvYcCXfGRAIDqrPsT1vzTMSiuMrlTj/DbRrr+8w7X+iLRH2XK/n8MZhV3UaT0Zia6c6jMrf3s3eHA==@xinu.tv
-X-Gm-Message-State: AOJu0YxOQEmNiUg4NKf4NM1BgQMqTJaFM6txPnL6u74ff1dZvoSgTC4d
-	TtJJqfdHsajxloSGDsSPqIQ/M/Se/sfymEExFQxDXYA/XasA6+sdye/Ihl9QekGJK9jet1VtQ3r
-	dcg89xnFcxezg3ji6xH8jnSULlp350K9K7LR0LfTQqg6e/BEKEF8XDaNgmJC+RQ==
-X-Received: by 2002:a05:6512:2246:b0:553:35bb:f7b7 with SMTP id 2adb3069b0e04-55342f92776mr2472199e87.32.1748873190333;
-        Mon, 02 Jun 2025 07:06:30 -0700 (PDT)
-X-Forwarded-To: gmail@xinu.tv
-X-Forwarded-For: couchmoney@gmail.com gmail@xinu.tv
-Delivered-To: couchmoney@gmail.com
-Received: by 2002:ab3:7457:0:b0:2b1:14e:dc2b with SMTP id g23csp2818972lti;
-        Mon, 2 Jun 2025 07:06:29 -0700 (PDT)
-X-Received: by 2002:a05:6602:6a8b:b0:86c:f898:74b8 with SMTP id ca18e2360f4ac-86d0521552emr1082401939f.10.1748873188734;
-        Mon, 02 Jun 2025 07:06:28 -0700 (PDT)
-ARC-Seal: i=1; a=rsa-sha256; t=1748873188; cv=none;
-        d=google.com; s=arc-20240605;
-        b=d2PNXrTE3VYjml3FmbC5rBW6XnsyuyVO3lPyM6VoVKFcvZ7a8tDRB+sh1ibo0D5Nvg
-         3i/Qon0RV401WFb9NQf5P048wpj19G8bOGPZUKMioBZcSxkr1RwH/GW6GBvGS+d+iqbW
-         43KWc6Px7RGOEeYfp8D88CuJ/5kMcsLMfDV1FRHo6T+chVY6c9fQkHjRreSGQcFXglt5
-         yaCpFKkAODO7rSHl2OW2kQ6eGgR0tUjb95+jdZXoU0GS3119CBYK9n9UhNaeXHIk/Zyy
-         f08r4Ce/m3Y6ISr4ovXxDeYNpeeUN1HT3XVyCVQJHjfWrHypKTiOt4q6yBhCgOgZTXJq
-         pL5A==;
-ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605;
-        h=to:from:subject:date:message-id:auto-submitted:sender:reply-to
-         :mime-version:dkim-signature:dkim-signature;
-        bh=dgRmOj3aABlB3SNw+xxlI8L9ugJFZ1WMJrtLw/W8tnA=;
-        fh=mbzrMIWIgWMC0ni1xEx+ViW4J0RLAdLdPT2cX81nTlk=;
-        b=YiMakYeE05UctWy9sW90/a3l1Hk1pAPv0+fpk5vmWrADcMwwI8cHVqBp+Nxds5psWa
-         a/zrw9UlxV4HgjLUP+ella/pK8XxK+sitKg0IhPOntwKbq1KfTNheufh4HtWj5yWedHE
-         sO/dVs6z/EW/gWrfBK/3JMgsnz3HrHmaoJ6caCaGI6t5jHxEXI+eJc5zILY+n0MdivkX
-         tJOo0L1s/k6MAdyLr4/IVqpxdhXbUPq44twCBNheHd8T5w1DC9ZXcr54X79fW8Vzbm8/
-         A++H3gnZRGtOayRySYQl04LFLk4YsisdhsKuaJV+WKYCW58wQqJT04mrVkx+m96qr1q0
-         BQtw==;
-        dara=google.com
-ARC-Authentication-Results: i=1; mx.google.com;
-       dkim=pass header.i=@google.com header.s=20230601 header.b=zT2yUtVH;
-       dkim=pass header.i=@gmail.com header.s=20230601 header.b=nmJW8N67;
-       spf=pass (google.com: domain of tconvertino@gmail.com designates 209.85.220.73 as permitted sender) smtp.mailfrom=tconvertino@gmail.com;
-       dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com;
-       dara=pass header.i=@gmail.com
-Received: from mail-sor-f73.google.com (mail-sor-f73.google.com. [209.85.220.73])
-        by mx.google.com with SMTPS id ca18e2360f4ac-86d0213d491sor465078439f.8.2025.06.02.07.06.28
-        for <couchmoney@gmail.com>
-        (Google Transport Security);
-        Mon, 02 Jun 2025 07:06:28 -0700 (PDT)
-Received-SPF: pass (google.com: domain of tconvertino@gmail.com designates 209.85.220.73 as permitted sender) client-ip=209.85.220.73;
-Authentication-Results: mx.google.com;
-       dkim=pass header.i=@google.com header.s=20230601 header.b=zT2yUtVH;
-       dkim=pass header.i=@gmail.com header.s=20230601 header.b=nmJW8N67;
-       spf=pass (google.com: domain of tconvertino@gmail.com designates 209.85.220.73 as permitted sender) smtp.mailfrom=tconvertino@gmail.com;
-       dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com;
-       dara=pass header.i=@gmail.com
-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
-        d=google.com; s=20230601; t=1748873188; x=1749477988; dara=google.com;
-        h=to:from:subject:date:message-id:auto-submitted:sender:reply-to
-         :mime-version:from:to:cc:subject:date:message-id:reply-to;
-        bh=dgRmOj3aABlB3SNw+xxlI8L9ugJFZ1WMJrtLw/W8tnA=;
-        b=zT2yUtVHhNy5fFiy6YKzfYCQPlCnufAEoWmbvjvj7mFNYUlLJHZ5FUeNnDs06Z1icR
-         bSVtejKixrz4hjFh9KeKvV9EQNGU7UFgySwqdy6szm+sHZQj+iJAXy85A1QaL6+0Swup
-         2y8QsjVJ96uugM0SaAYZqe+lmLBk6zFWqkg0U37vgwOupAcNsNBd7tos7cxO5eK6Aops
-         FJjr9JAD+ddX03ngH9zfnvlNV/+qbmiP6Hs8OmaJtZof2GLucpHgqUpIdolCh7F72v4p
-         DibO4RShI/IQCw9ejZxhRPBPWQwIdOYLjD/sDunX63M4NCS/63jZfhwqsAVgtmN/cUGq
-         spHQ==
-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
-        d=gmail.com; s=20230601; t=1748873188; x=1749477988; dara=google.com;
-        h=to:from:subject:date:message-id:auto-submitted:sender:reply-to
-         :mime-version:from:to:cc:subject:date:message-id:reply-to;
-        bh=dgRmOj3aABlB3SNw+xxlI8L9ugJFZ1WMJrtLw/W8tnA=;
-        b=nmJW8N67IylgMNprzzf/IC7V2r7xeY0+8Bl0KcAak6Xly+IhVv3nyccvgdKsp+8Ccd
-         NcikfVOtCsE3gTqviReUbTAKy7PyClAbBTEHC0Ne71549BN+v8zX64RpGDFJGX5pJMG5
-         r0Ak88nxzjWkvDLhlnHmWdt/NggdQEI6T7oP4VZo0f0/Ym7g1WJhSItfdIhSRDNzK3ed
-         WPRXUIb1sW3+N0My4Os6L4IA9kdRk5z0qpQxtsIL9N0dzv4q18q6eH3KfTzVPr59PsYT
-         uSgkWoLQZdfA70MMlIRU5CnGbVDRH4TO/ib433vIblOmtLTkQ4EaOTzncbs0tovVes4z
-         evsQ==
-X-Google-Smtp-Source: AGHT+IETNpLvkLm7t8VAdDcEcVtxFCttPh/uVZhoQCRlhUNlx9bmg67olJiD9EOND8g0z43NnM8iK4FxezZondExIawx
-MIME-Version: 1.0
-X-Received: by 2002:a05:6602:4183:b0:864:4a1b:dfc5 with SMTP id
- ca18e2360f4ac-86d052154eamr1431889339f.9.1748873188195; Mon, 02 Jun 2025
- 07:06:28 -0700 (PDT)
-Reply-To: tconvertino@gmail.com
-Sender: Google Calendar <calendar-notification@google.com>
-Auto-Submitted: auto-generated
-Message-ID: <calendar-093be1c9-5d94-4994-8bc5-7daa1cfae47b@google.com>
-Date: Mon, 02 Jun 2025 14:06:28 +0000
-Subject: New event: Tamara and Scout in Alaska @ Tue Jun 24 - Mon Jun 30, 2025 (tconvertino@gmail.com)
-From: tconvertino@gmail.com
-To: couchmoney@gmail.com
-Content-Type: multipart/alternative; boundary="00000000000023c70606369745e9"
-
---00000000000023c70606369745e9
-Content-Type: text/plain; charset="UTF-8"; format=flowed; delsp=yes
-Content-Transfer-Encoding: base64
-
-VGFtYXJhIGFuZCBTY291dCBpbiBBbGFza2ENClR1ZXNkYXkgSnVuIDI0IOKAkyBNb25kYXkgSnVu
-IDMwLCAyMDI1DQoNCg0KDQpPcmdhbml6ZXINCnRjb252ZXJ0aW5vQGdtYWlsLmNvbQ0KdGNvbnZl
-cnRpbm9AZ21haWwuY29tDQoNCn5+Ly9+fg0KSW52aXRhdGlvbiBmcm9tIEdvb2dsZSBDYWxlbmRh
-cjogaHR0cHM6Ly9jYWxlbmRhci5nb29nbGUuY29tL2NhbGVuZGFyLw0KDQpZb3UgYXJlIHJlY2Vp
-dmluZyB0aGlzIGVtYWlsIGJlY2F1c2UgeW91IGFyZSBzdWJzY3JpYmVkIHRvIGNhbGVuZGFyICAN
-Cm5vdGlmaWNhdGlvbnMuIFRvIHN0b3AgcmVjZWl2aW5nIHRoZXNlIGVtYWlscywgZ28gdG8gIA0K
-aHR0cHM6Ly9jYWxlbmRhci5nb29nbGUuY29tL2NhbGVuZGFyL3Ivc2V0dGluZ3MsIHNlbGVjdCB0
-aGlzIGNhbGVuZGFyLCBhbmQgIA0KY2hhbmdlICJPdGhlciBub3RpZmljYXRpb25zIi4NCg0KRm9y
-d2FyZGluZyB0aGlzIGludml0YXRpb24gY291bGQgYWxsb3cgYW55IHJlY2lwaWVudCB0byBzZW5k
-IGEgcmVzcG9uc2UgdG8gIA0KdGhlIG9yZ2FuaXplciwgYmUgYWRkZWQgdG8gdGhlIGd1ZXN0IGxp
-c3QsIGludml0ZSBvdGhlcnMgcmVnYXJkbGVzcyBvZiAgDQp0aGVpciBvd24gaW52aXRhdGlvbiBz
-dGF0dXMsIG9yIG1vZGlmeSB5b3VyIFJTVlAuDQoNCkxlYXJuIG1vcmUgaHR0cHM6Ly9zdXBwb3J0
-Lmdvb2dsZS5jb20vY2FsZW5kYXIvYW5zd2VyLzM3MTM1I2ZvcndhcmRpbmcNCg==
---00000000000023c70606369745e9
-Content-Type: text/html; charset="UTF-8"
-Content-Transfer-Encoding: quoted-printable
-
-<!doctype html><html xmlns=3D"http://www.w3.org/1999/xhtml" xmlns:v=3D"urn:="...truncated for brevity...

server/testdata/ical-example-1.ics

@@ -1,57 +0,0 @@
-BEGIN:VCALENDAR
-METHOD:REQUEST
-PRODID:Microsoft Exchange Server 2010
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Pacific Standard Time
-BEGIN:STANDARD
-DTSTART:16010101T020000
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0800
-RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=1SU;BYMONTH=11
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:16010101T020000
-TZOFFSETFROM:-0800
-TZOFFSETTO:-0700
-RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=2SU;BYMONTH=3
-END:DAYLIGHT
-END:VTIMEZONE
-BEGIN:VEVENT
-ORGANIZER;CN=Bill Thiede:mailto:wthiede@nvidia.com
-ATTENDEE;ROLE=REQ-PARTICIPANT;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=Bill:mailt
- o:couchmoney@gmail.com
-DESCRIPTION;LANGUAGE=en-US:\n
-UID:040000008200E00074C5B7101A82E00800000000A1458AEA8E4DDB01000000000000000
- 010000000988BC323BE65A8458B718B5EF8FE8152
-SUMMARY;LANGUAGE=en-US:dentist night guard 
-DTSTART;TZID=Pacific Standard Time:20250108T080000
-DTEND;TZID=Pacific Standard Time:20250108T090000
-CLASS:PUBLIC
-PRIORITY:5
-DTSTAMP:20241213T184408Z
-TRANSP:OPAQUE
-STATUS:CONFIRMED
-SEQUENCE:0
-LOCATION;LANGUAGE=en-US:
-X-MICROSOFT-CDO-APPT-SEQUENCE:0
-X-MICROSOFT-CDO-OWNERAPPTID:2123132523
-X-MICROSOFT-CDO-BUSYSTATUS:TENTATIVE
-X-MICROSOFT-CDO-INTENDEDSTATUS:BUSY
-X-MICROSOFT-CDO-ALLDAYEVENT:FALSE
-X-MICROSOFT-CDO-IMPORTANCE:1
-X-MICROSOFT-CDO-INSTTYPE:0
-X-MICROSOFT-ONLINEMEETINGEXTERNALLINK:
-X-MICROSOFT-ONLINEMEETINGCONFLINK:
-X-MICROSOFT-DONOTFORWARDMEETING:FALSE
-X-MICROSOFT-DISALLOW-COUNTER:FALSE
-X-MICROSOFT-REQUESTEDATTENDANCEMODE:DEFAULT
-X-MICROSOFT-ISRESPONSEREQUESTED:TRUE
-X-MICROSOFT-LOCATIONS:[]
-BEGIN:VALARM
-DESCRIPTION:REMINDER
-TRIGGER;RELATED=START:-PT5M
-ACTION:DISPLAY
-END:VALARM
-END:VEVENT
-END:VCALENDAR

server/testdata/ical-example-2.ics

@@ -1,30 +0,0 @@
-BEGIN:VCALENDAR
-PRODID:-//Google Inc//Google Calendar 70.9054//EN
-VERSION:2.0
-CALSCALE:GREGORIAN
-METHOD:REPLY
-X-GOOGLE-CALID:g66m0feuqsao8l1c767pvvcg4k@group.calendar.google.com
-BEGIN:VEVENT
-DTSTART:20250813T010000Z
-DTEND:20250813T030000Z
-DTSTAMP:20250801T022550Z
-ORGANIZER;CN=Family:mailto:g66m0feuqsao8l1c767pvvcg4k@group.calendar.google
- .com
-UID:6os3ap346th6ab9nckp30b9kc8sm2bb160q3gb9l6lgm6or160rjee1mco@google.com
-ATTENDEE;CUTYPE=INDIVIDUAL;ROLE=REQ-PARTICIPANT;PARTSTAT=ACCEPTED;CN=superm
- atute@gmail.com;X-NUM-GUESTS=0:mailto:supermatute@gmail.com
-X-GOOGLE-CONFERENCE:https://meet.google.com/dcu-hykx-vym
-CREATED:20250801T015712Z
-DESCRIPTION:-::~:~::~:~:~:~:~:~:~:~:~:~:~:~:~:~:~:~:~:~:~:~:~:~:~:~:~:~:~:~
- :~:~:~:~:~:~:~:~::~:~::-\nJoin with Google Meet: https://meet.google.com/dc
- u-hykx-vym\n\nLearn more about Meet at: https://support.google.com/a/users/
- answer/9282720\n\nPlease do not edit this section.\n-::~:~::~:~:~:~:~:~:~:~
- :~:~:~:~:~:~:~:~:~:~:~:~:~:~:~:~:~:~:~:~:~:~:~:~:~:~:~:~::~:~::-
-LAST-MODIFIED:20250801T022549Z
-LOCATION:
-SEQUENCE:0
-STATUS:CONFIRMED
-SUMMARY:[tenative] dinner w/ amatute
-TRANSP:OPAQUE
-END:VEVENT
-END:VCALENDAR

server/testdata/ical-multiday.ics

@@ -1,9 +0,0 @@
-BEGIN:VCALENDAR
-VERSION:2.0
-BEGIN:VEVENT
-SUMMARY:Multi-day Event
-DTSTART;VALUE=DATE:20250828
-DTEND;VALUE=DATE:20250831
-DESCRIPTION:This event spans multiple days.
-END:VEVENT
-END:VCALENDAR

server/testdata/ical-straddle-real.ics

@@ -1,36 +0,0 @@
-BEGIN:VCALENDAR
-PRODID:-//Google Inc//Google Calendar 70.9054//EN
-VERSION:2.0
-CALSCALE:GREGORIAN
-METHOD:REQUEST
-BEGIN:VEVENT
-DTSTART;VALUE=DATE:20250830
-DTEND;VALUE=DATE:20250902
-DTSTAMP:20250819T183713Z
-ORGANIZER;CN=Bill Thiede:mailto:couchmoney@gmail.com
-UID:37kplskaimjnhdnt8r5ui9pv7f@google.com
-ATTENDEE;CUTYPE=INDIVIDUAL;ROLE=REQ-PARTICIPANT;PARTSTAT=NEEDS-ACTION;RSVP=
- TRUE;CN=bill@xinu.tv;X-NUM-GUESTS=0:mailto:bill@xinu.tv
-ATTENDEE;CUTYPE=INDIVIDUAL;ROLE=REQ-PARTICIPANT;PARTSTAT=ACCEPTED;RSVP=TRUE
- ;CN=Bill Thiede;X-NUM-GUESTS=0:mailto:couchmoney@gmail.com
-X-MICROSOFT-CDO-OWNERAPPTID:1427505964
-CREATED:20250819T183709Z
-DESCRIPTION:
-LAST-MODIFIED:20250819T183709Z
-LOCATION:
-SEQUENCE:0
-STATUS:CONFIRMED
-SUMMARY:Test Straddle Month
-TRANSP:TRANSPARENT
-BEGIN:VALARM
-ACTION:DISPLAY
-DESCRIPTION:This is an event reminder
-TRIGGER:-P0DT0H30M0S
-END:VALARM
-BEGIN:VALARM
-ACTION:DISPLAY
-DESCRIPTION:This is an event reminder
-TRIGGER:-P0DT7H30M0S
-END:VALARM
-END:VEVENT
-END:VCALENDAR

server/testdata/ical-straddle.ics

@@ -1,9 +0,0 @@
-BEGIN:VCALENDAR
-VERSION:2.0
-BEGIN:VEVENT
-SUMMARY:Straddle Month Event
-DTSTART;VALUE=DATE:20250830
-DTEND;VALUE=DATE:20250903
-DESCRIPTION:This event straddles two months.
-END:VEVENT
-END:VCALENDAR

shared/Cargo.toml

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

web/src/view/mod.rs

@@ -901,22 +901,13 @@ fn render_closed_header(msg: &ShowThreadQueryThreadOnEmailThreadMessages) -> Nod
         .collect();
     let show_x_original_to = !*to_xinu.borrow() && msg.x_original_to.is_some();
     let show_delivered_to = !*to_xinu.borrow() && !show_x_original_to && msg.delivered_to.is_some();
-    let common_style = C!["text-sm", "pr-2", "text-gray-500"];
     div![
-        C!["flex", "bg-neutral-800"],
+        C!["flex", "p-4", "bg-neutral-800"],
-        div![C!["self-center"], avatar],
+        div![avatar],
         div![
-            C![
+            C!["px-4", "mr-auto"],
-                "mx-2",
+            span![
-                "flex-1",
+                C!["font-semibold", "text-sm"],
-                "flex",
-                "flex-nowrap",
-                "items-center",
-                "truncate",
-            ],
-            div![
-                C!["font-semibold", "text-white"],
-                &common_style,
                 from_detail.as_ref().map(|addr| attrs! {
                     At::Title => addr
                 }),
@@ -924,7 +915,7 @@ fn render_closed_header(msg: &ShowThreadQueryThreadOnEmailThreadMessages) -> Nod
             ],
             " ",
             IF!(!msg.to.is_empty() => div![
-                &common_style,
+                C!["text-xs"],
                 span![
                     C!["font-semibold"],
                     "To: "
@@ -935,7 +926,7 @@ fn render_closed_header(msg: &ShowThreadQueryThreadOnEmailThreadMessages) -> Nod
                 " "
             ]),
             IF!(!msg.cc.is_empty() => div![
-                &common_style,
+                C!["text-xs", "max-w-full", "overflow-clip", "text-ellipsis"],
                 span![
                     C!["font-semibold"],
                     "CC: "
@@ -943,7 +934,7 @@ fn render_closed_header(msg: &ShowThreadQueryThreadOnEmailThreadMessages) -> Nod
                 cc_addrs
             ]),
             IF!(show_x_original_to => div![
-                &common_style,
+                C!["text-xs"],
                 span![
                     C!["font-semibold"],
                     "Original To: "
@@ -962,7 +953,7 @@ fn render_closed_header(msg: &ShowThreadQueryThreadOnEmailThreadMessages) -> Nod
                 ]
             ]),
             IF!(show_delivered_to => div![
-                &common_style,
+                C!["text-xs"],
                 span![
                     C!["font-semibold"],
                     "Delivered To: "
@@ -981,25 +972,27 @@ fn render_closed_header(msg: &ShowThreadQueryThreadOnEmailThreadMessages) -> Nod
                 ]
             ]),
         ],
-        msg.timestamp.map(|ts| div![
+        span![
-            C!["text-xs", "text-nowrap", "justify-self-end", "self-center"],
+            C!["text-right"],
-            human_age(ts)
+            msg.timestamp
-        ]),
+                .map(|ts| div![C!["text-xs", "text-nowrap"], human_age(ts)]),
-        div![
+            div![
-            i![C![
+                C!["p-2"],
-                "m-2",
+                i![C![
-                "read-status",
+                    "mx-4",
-                "far",
+                    "read-status",
-                if is_unread {
+                    "far",
-                    "fa-envelope"
+                    if is_unread {
-                } else {
+                        "fa-envelope"
-                    "fa-envelope-open"
+                    } else {
-                },
+                        "fa-envelope-open"
-            ]],
+                    },
-            ev(Ev::Click, move |e| {
+                ]],
-                e.stop_propagation();
+                ev(Ev::Click, move |e| {
-                Msg::SetUnread(id, !is_unread)
+                    e.stop_propagation();
-            })
+                    Msg::SetUnread(id, !is_unread)
+                })
+            ],
         ]
     ]
 }
@@ -1014,7 +1007,7 @@ fn message_render(msg: &ShowThreadQueryThreadOnEmailThreadMessages, open: bool)
     };
     let from = from.map(|f| f.replace('.', "-").replace('@', "-"));
     div![
-        C!["pb-1"],
+        C!["lg:mb-4"],
         div![
             if open {
                 render_open_header(&msg)