chore: Release

This reverts commit 1411961e36.

Cargo.toml

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

server/Cargo.toml

@@ -18,7 +18,7 @@ async-graphql = { version = "7", features = ["log"] }
 async-graphql-rocket = "7"
 async-trait = "0.1.81"
 build-info = "0.0.40"
-cacher = { version = "0.1.0", registry = "xinu" }
+cacher = { version = "0.2.0", registry = "xinu" }
 chrono = "0.4.39"
 clap = { version = "4.5.23", features = ["derive"] }
 css-inline = "0.14.0"
@@ -30,7 +30,6 @@ lol_html = "2.0.0"
 mailparse = "0.16.0"
 maplit = "1.0.2"
 memmap = "0.7.0"
-opentelemetry = "0.28.0"
 regex = "1.11.1"
 reqwest = { version = "0.12.7", features = ["blocking"] }
 rocket = { version = "0.5.0-rc.2", features = ["json"] }
@@ -39,7 +38,7 @@ scraper = "0.23.0"
 serde = { version = "1.0.147", features = ["derive"] }
 serde_json = "1.0.87"
 sqlx = { version = "0.8.2", features = ["postgres", "runtime-tokio", "time"] }
-tantivy = { version = "0.22.0", optional = true }
+tantivy = { version = "0.24.0", optional = true }
 thiserror = "2.0.0"
 tokio = "1.26.0"
 tracing = "0.1.41"
@@ -48,8 +47,8 @@ urlencoding = "2.1.3"
 #xtracing = { path = "../../xtracing" }
 #xtracing = { git = "http://git-private.h.xinu.tv/wathiede/xtracing.git" }
 xtracing = { version = "0.3.0", registry = "xinu" }
-letterbox-notmuch = { version = "0.10.0", path = "../notmuch", registry = "xinu" }
-letterbox-shared = { version = "0.10.0", path = "../shared", registry = "xinu" }
+letterbox-notmuch = { version = "0.10.13", path = "../notmuch", registry = "xinu" }
+letterbox-shared = { version = "0.10.13", path = "../shared", registry = "xinu" }
 
 [build-dependencies]
 build-info-build = "0.0.40"

server/migrations/20250330175930_update-nzfinder-link.sql

@@ -0,0 +1,20 @@
+-- Bad examples:
+ -- https://nzbfinder.ws/getnzb/d2c3e5a08abadd985dccc6a574122892030b6a9a.nzb&i=95972&r=b55082d289937c050dedc203c9653850
+--  https://nzbfinder.ws/getnzb?id=45add174-7da4-4445-bf2b-a67dbbfc07fe.nzb&r=b55082d289937c050dedc203c9653850
+--  https://nzbfinder.ws/api/v1/getnzb?id=82486020-c192-4fa0-a7e7-798d7d72e973.nzb&r=b55082d289937c050dedc203c9653850
+UPDATE nzb_posts
+SET link = 
+regexp_replace(
+    regexp_replace(
+        regexp_replace(
+            link,
+            'https://nzbfinder.ws/getnzb/',
+            'https://nzbfinder.ws/api/v1/getnzb?id='
+            ),
+        'https://nzbfinder.ws/getnzb',
+        'https://nzbfinder.ws/api/v1/getnzb'
+        ),
+    '&r=',
+    '&apikey='
+    ) 
+;

server/src/lib.rs

@@ -318,13 +318,16 @@ impl<'c> Transformer for SlurpContents<'c> {
         } else {
             let resp = reqwest::get(link.as_str()).await?;
             let status = resp.status();
-            if status.is_server_error() || retryable_status.contains(&status) {
-                return Err(TransformError::RetryableHttpStatusError(
-                    status,
-                    link.to_string(),
-                ));
+            if status.is_server_error() {
+                error!("status error for {link}: {status}");
+                return Ok(html.to_string());
+            }
+            if retryable_status.contains(&status) {
+                error!("retryable error for {link}: {status}");
+                return Ok(html.to_string());
             }
             if !status.is_success() {
+                error!("unsuccessful for {link}: {status}");
                 return Ok(html.to_string());
             }
             let body = resp.text().await?;
@@ -438,6 +441,38 @@ pub fn sanitize_html(
         }
     };
     let mut element_content_handlers = vec![
+        // Remove width and height attributes on elements
+        element!("[width],[height]", |el| {
+            println!("width or height {el:?}");
+            el.remove_attribute("width");
+            el.remove_attribute("height");
+            Ok(())
+        }),
+        // Remove width and height values from inline styles
+        element!("[style]", |el| {
+            println!("style {el:?}");
+            let style = el.get_attribute("style").unwrap();
+            let style = style
+                .split(";")
+                .filter(|s| {
+                    println!("s {s}");
+                    let Some((k, _)) = s.split_once(':') else {
+                        return true;
+                    };
+                    match k {
+                        "width" | "max-width" | "min-width" | "height" | "max-height"
+                        | "min-height" => false,
+                        _ => true,
+                    }
+                })
+                .collect::<Vec<_>>()
+                .join(";");
+            println!("style: {style}");
+            if let Err(e) = el.set_attribute("style", &style) {
+                error!("Failed to set style attribute: {e}");
+            }
+            Ok(())
+        }),
         // Open links in new tab
         element!("a[href]", |el| {
             el.set_attribute("target", "_blank").unwrap();
@@ -910,3 +945,21 @@ async fn clean_title(title: &str) -> Result<String, ServerError> {
     }
     Ok(title)
 }
+
+#[cfg(test)]
+mod tests {
+    use super::{SanitizeHtml, Transformer};
+
+    #[tokio::test]
+    async fn strip_sizes() -> Result<(), Box<dyn std::error::Error>> {
+        let ss = SanitizeHtml {
+            cid_prefix: "",
+            base_url: &None,
+        };
+        let input = r#"<p width=16 height=16 style="color:blue;width:16px;height:16px;">This el has width and height attributes and inline styles</p>"#;
+        let want = r#"<p style="color:blue;">This el has width and height attributes and inline styles</p>"#;
+        let got = ss.transform(&None, input).await?;
+        assert_eq!(got, want);
+        Ok(())
+    }
+}

shared/Cargo.toml

@@ -12,5 +12,5 @@ version.workspace = true
 
 [dependencies]
 build-info = "0.0.40"
-letterbox-notmuch = { version = "0.10.0", path = "../notmuch", registry = "xinu" }
+letterbox-notmuch = { version = "0.10.13", path = "../notmuch", registry = "xinu" }
 serde = { version = "1.0.147", features = ["derive"] }

web/Cargo.toml

@@ -33,8 +33,8 @@ wasm-bindgen = "=0.2.100"
 uuid = { version = "1.13.1", features = [
   "js",
 ] } # direct dep to set js feature, prevents Rng issues
-letterbox-shared = { version = "0.10.0", path = "../shared", registry = "xinu" }
-letterbox-notmuch = { version = "0.10.0", path = "../notmuch", registry = "xinu" }
+letterbox-shared = { version = "0.10.13", path = "../shared", registry = "xinu" }
+letterbox-notmuch = { version = "0.10.13", path = "../notmuch", registry = "xinu" }
 seed_hooks = { version = "0.4.0", registry = "xinu" }
 strum_macros = "0.27.1"
 

web/src/state.rs

@@ -118,7 +118,7 @@ fn on_url_changed(old: &Url, mut new: Url) -> Msg {
 
 // `update` describes how to handle each `Msg`.
 pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg>) {
-    debug!("update({})", msg);
+    info!("update({})", msg);
     match msg {
         Msg::Noop => {}
         Msg::RefreshStart => {
@@ -293,7 +293,6 @@ pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg>) {
             });
         }
         Msg::FrontPageResult(Err(e)) => {
-            orders.send_msg(Msg::Reload);
             error!("error FrontPageResult: {e:?}");
         }
         Msg::FrontPageResult(Ok(graphql_client::Response {
@@ -301,7 +300,6 @@ pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg>) {
             errors: None,
             ..
         })) => {
-            orders.send_msg(Msg::Reload);
             error!("FrontPageResult no data or errors, should not happen");
         }
         Msg::FrontPageResult(Ok(graphql_client::Response {
@@ -309,7 +307,6 @@ pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg>) {
             errors: Some(e),
             ..
         })) => {
-            orders.send_msg(Msg::Reload);
             error!("FrontPageResult error: {e:?}");
         }
         Msg::FrontPageResult(Ok(graphql_client::Response {
@@ -405,7 +402,6 @@ pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg>) {
             orders.send_msg(Msg::WindowScrolled);
         }
         Msg::ShowThreadResult(bad) => {
-            orders.send_msg(Msg::Reload);
             error!("show_thread_query error: {bad:#?}");
         }
         Msg::CatchupRequest { query } => {
@@ -438,7 +434,6 @@ pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg>) {
             }
         }
         Msg::CatchupResult(bad) => {
-            orders.send_msg(Msg::Reload);
             error!("catchup_query error: {bad:#?}");
         }
         Msg::SelectionSetNone => {
@@ -599,12 +594,12 @@ pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg>) {
             model.read_completion_ratio = ratio;
         }
         Msg::UpdateServerVersion(version) => {
-            if version != model.versions.client {
+            // Only git versions contain dash, don't autoreload there
+            if !version.contains('-') && version != model.versions.client {
                 warn!(
                     "Server ({}) and client ({}) version mismatch, reloading",
                     version, model.versions.client
                 );
-                #[cfg(not(debug_assertions))]
                 orders.send_msg(Msg::Reload);
             }
             model.versions.server = Some(version);

web/src/view/mod.rs

@@ -210,10 +210,7 @@ fn catchup_view(
                 format!("{} left ", items.iter().filter(|i| !i.seen).count(),)
             ]
         ],
-        div![
-            C!["mt-12", "mb-20", "w-4xl", "flex", "justify-center", "grow"],
-            content
-        ],
+        div![C!["mt-12", "mb-20"], content],
         div![
             C![
                 "fixed",
@@ -276,6 +273,13 @@ fn search_results(
             tags.remove(idx);
         };
         let is_unread = unread_idx.is_some();
+        let mut title_break = None;
+        const TITLE_LENGTH_WRAP_LIMIT: usize = 40;
+        for w in r.subject.split_whitespace() {
+            if w.len() > TITLE_LENGTH_WRAP_LIMIT {
+                title_break = Some(C!["break-all", "text-pretty"]);
+            }
+        }
         div![
             C![
                 "flex",
@@ -318,7 +322,7 @@ fn search_results(
                 attrs! {
                     At::Href => urls::thread(&tid)
                 },
-                div![&r.subject],
+                div![title_break, &r.subject],
                 span![C!["text-xs"], pretty_authors(&r.authors)],
                 div![
                     C!["flex", "flex-wrap", "justify-between"],
@@ -937,6 +941,13 @@ fn render_closed_header(msg: &ShowThreadQueryThreadOnEmailThreadMessages) -> Nod
 
 fn message_render(msg: &ShowThreadQueryThreadOnEmailThreadMessages, open: bool) -> Node<Msg> {
     let expand_id = msg.id.clone();
+    let from = match &msg.from {
+        Some(ShowThreadQueryThreadOnEmailThreadMessagesFrom {
+            addr: Some(addr), ..
+        }) => Some(addr.to_string()),
+        _ => None,
+    };
+    let from = from.map(|f| f.replace('.', "-").replace('@', "-"));
     div![
         C!["lg:mb-4"],
         div![
@@ -956,7 +967,7 @@ fn message_render(msg: &ShowThreadQueryThreadOnEmailThreadMessages, open: bool)
         ],
         IF!(open =>
         div![
-            C!["bg-white", "text-black", "p-4", "min-w-full", "w-0","overflow-x-auto"],
+            C!["bg-white", "text-black", "p-4", "min-w-full", "w-0","overflow-x-auto", from],
             match &msg.body {
                 ShowThreadQueryThreadOnEmailThreadMessagesBody::UnhandledContentType(
                     ShowThreadQueryThreadOnEmailThreadMessagesBodyOnUnhandledContentType { contents ,content_tree},
@@ -1093,11 +1104,18 @@ fn thread(
     let unread_thread_id = thread.thread_id.clone();
     let spam_add_thread_id = thread.thread_id.clone();
     let spam_unread_thread_id = thread.thread_id.clone();
+    let mut title_break = None;
+    const TITLE_LENGTH_WRAP_LIMIT: usize = 40;
+    for w in subject.split_whitespace() {
+        if w.len() > TITLE_LENGTH_WRAP_LIMIT {
+            title_break = Some(C!["break-all", "text-pretty"]);
+        }
+    }
     div![
         C!["lg:p-4", "max-w-4xl"],
         div![
             C!["p-4", "lg:p-0"],
-            h3![C!["text-xl"], subject],
+            h3![C!["text-xl"], title_break, subject],
             span![removable_tags_chiclet(&thread.thread_id, &tags)],
             IF!(!catchup_mode => div![
                 C!["pt-4", "gap-2", "flex", "justify-around"],
@@ -1393,11 +1411,18 @@ fn news_post(
         ]
     }
 
+    let mut title_break = None;
+    const TITLE_LENGTH_WRAP_LIMIT: usize = 40;
+    for w in subject.split_whitespace() {
+        if w.len() > TITLE_LENGTH_WRAP_LIMIT {
+            title_break = Some(C!["break-all", "text-pretty"]);
+        }
+    }
     div![
         C!["lg:p-4", "max-w-4xl"],
         div![
             C!["p-4", "lg:p-0"],
-            h3![C!["text-xl"], subject],
+            h3![C!["text-xl"], title_break, subject],
             span![tag(format!("News/{}", post.slug))],
             IF!(!catchup_mode => div![
                 C!["pt-4", "gap-2", "flex", "justify-around"],

web/static/overrides.css

@@ -1,18 +1,18 @@
 html {
-    background-color: black;
+  background-color: black;
 }
 
 .mail-thread a,
 .news-post a {
-    color: var(--color-link) !important;
-    text-decoration: underline;
+  color: var(--color-link) !important;
+  text-decoration: underline;
 }
 
 .mail-thread br,
 .news-post br {
-    display: block;
-    margin-top: 1em;
-    content: " ";
+  display: block;
+  margin-top: 1em;
+  content: " ";
 }
 
 .mail-thread h1,
@@ -23,47 +23,62 @@ html {
 .news-post h2,
 .news-post h3,
 .news-post h4 {
-    margin-top: 1em !important;
-    margin-bottom: 1em !important;
+  margin-top: 1em !important;
+  margin-bottom: 1em !important;
 }
 
 .mail-thread p,
 .news-post p {
-    margin-bottom: 1em;
+  margin-bottom: 1em;
 }
 
 .mail-thread pre,
+.news-post pre {
+  font-family: monospace;
+  background-color: #eee !important;
+  padding: 0.5em;
+  white-space: break-spaces;
+}
+
 .mail-thread code,
-.news-post pre,
 .news-post code {
-    font-family: monospace;
-    background-color: #eee !important;
-    padding: 0.5em !important;
+  font-family: monospace;
+  white-space: break-spaces;
+  background-color: #eee !important;
 }
 
 .mail-thread blockquote {
-    padding-left: 1em;
-    border-left: 2px solid #ddd;
+  padding-left: 1em;
+  border-left: 2px solid #ddd;
 }
 
 .mail-thread ol,
 .mail-thread ul {
-    margin-left: 2em;
+  margin-left: 2em;
+}
+
+.mail-thread .noreply-news-bloomberg-com a {
+  background-color: initial !important;
+}
+
+.mail-thread .noreply-news-bloomberg-com h2 {
+  margin: 0 !important;
+  padding: 0 !important;
 }
 
 /* Hackaday figures have unreadable black on dark grey */
 .news-post figcaption.wp-caption-text {
-    background-color: initial !important;
+  background-color: initial !important;
 }
 
 .news-post.site-nautilus .article-ad,
 .news-post.site-nautilus .primis-ad {
-    display: none !important;
+  display: none !important;
 }
 
 .news-post.site-slashdot .story-byline {
-    display: block !important;
-    height: initial !important;
-    overflow: auto !important;
-    position: static !important;
-}
+  display: block !important;
+  height: initial !important;
+  overflow: auto !important;
+  position: static !important;
+}