chore: Release

Cargo.toml

@@ -8,7 +8,7 @@ authors = ["Bill Thiede <git@xinu.tv>"]
 edition = "2021"
 license = "UNLICENSED"
 publish = ["xinu"]
-version = "0.10.9"
+version = "0.12.1"
 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"
@@ -38,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"
@@ -47,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.9", path = "../notmuch", registry = "xinu" }
-letterbox-shared = { version = "0.10.9", path = "../shared", registry = "xinu" }
+letterbox-notmuch = { version = "0.12.1", path = "../notmuch", registry = "xinu" }
+letterbox-shared = { version = "0.12.1", path = "../shared", registry = "xinu" }
 
 [build-dependencies]
 build-info-build = "0.0.40"

server/src/lib.rs

@@ -441,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();
@@ -913,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.9", path = "../notmuch", registry = "xinu" }
+letterbox-notmuch = { version = "0.12.1", 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.9", path = "../shared", registry = "xinu" }
-letterbox-notmuch = { version = "0.10.9", path = "../notmuch", registry = "xinu" }
+letterbox-shared = { version = "0.12.1", path = "../shared", registry = "xinu" }
+letterbox-notmuch = { version = "0.12.1", path = "../notmuch", registry = "xinu" }
 seed_hooks = { version = "0.4.0", registry = "xinu" }
 strum_macros = "0.27.1"
 

web/src/state.rs

@@ -616,9 +616,6 @@ pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg>) {
             orders.send_msg(Msg::CatchupRequest { query });
         }
         Msg::CatchupKeepUnread => {
-            if let Some(thread_id) = current_thread_id(&model.context) {
-                orders.send_msg(Msg::SetUnread(thread_id, true));
-            };
             orders.send_msg(Msg::CatchupNext);
         }
         Msg::CatchupMarkAsRead => {
@@ -633,7 +630,15 @@ pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg>) {
                 orders.send_msg(Msg::GoToSearchResults);
                 return;
             };
-            let Some(idx) = catchup.items.iter().position(|i| !i.seen) else {
+            let Some(thread_id) = current_thread_id(&model.context) else {
+                return;
+            };
+            let Some(idx) = catchup
+                .items
+                .iter()
+                .inspect(|i| info!("i {i:?} thread_id {thread_id}"))
+                .position(|i| i.id == thread_id)
+            else {
                 // All items have been seen
                 orders.send_msg(Msg::CatchupExit);
                 orders.send_msg(Msg::GoToSearchResults);
@@ -726,6 +731,7 @@ pub struct Catchup {
     pub items: Vec<CatchupItem>,
 }
 
+#[derive(Debug)]
 pub struct CatchupItem {
     pub id: String,
     pub seen: bool,
@@ -759,6 +765,7 @@ pub enum Msg {
     NextPage,
     PreviousPage,
     GoToSearchResults,
+
     UpdateQuery(String),
     SearchQuery(String),
 

web/src/view/mod.rs

@@ -12,7 +12,7 @@ use web_sys::{HtmlElement, HtmlInputElement};
 use crate::{
     api::urls,
     graphql::{front_page_query::*, show_thread_query::*},
-    state::{unread_query, CatchupItem, Context, Model, Msg, RefreshingState, Tag, Version},
+    state::{CatchupItem, Context, Model, Msg, RefreshingState, Tag, Version},
 };
 
 // TODO(wathiede): create a QueryString enum that wraps single and multiple message ids and thread
@@ -273,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",
@@ -315,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"],
@@ -461,38 +468,42 @@ fn search_toolbar(
     if let Some(tri) = tri.get() {
         tri.set_indeterminate(indeterminate);
     }
+    let catchup = div![button![
+        tw_classes::button(),
+        attrs! {At::Title => "Catch up"},
+        span![i![C!["far", "fa-eye"]]],
+        span![C!["pl-2", "hidden", "md:inline"], "Catch-up"],
+        ev(Ev::Click, |_| Msg::CatchupStart)
+    ]];
+    let tristate_input = div![
+        C!["flex", "items-center", "mr-4"],
+        input![
+            &tri,
+            C![&tw_classes::CHECKBOX],
+            attrs! {
+                At::Type=>"checkbox",
+            },
+            IF!(all_selected=>attrs!{At::Checked=>true})
+        ],
+        ev(Ev::Input, move |_| {
+            if all_selected {
+                Msg::SelectionSetNone
+            } else {
+                Msg::SelectionSetAll
+            }
+        }),
+    ];
     nav![
         C!["py-4", "flex", "w-full", "justify-between"],
         div![
             C!["gap-2", "flex", IF!(show_bulk_edit => "hidden")],
-            div![button![
-                tw_classes::button(),
-                attrs! {At::Title => "Mark as read"},
-                span![i![C!["far", "fa-eye"]]],
-                span![C!["pl-2", "hidden", "md:inline"], "Catch-up"],
-                ev(Ev::Click, |_| Msg::CatchupStart)
-            ]],
+            &tristate_input,
+            &catchup
         ],
         div![
             C!["gap-2", "flex", IF!(!show_bulk_edit => "hidden")],
-            div![
-                C!["flex", "items-center", "mr-4"],
-                input![
-                    tri,
-                    C![&tw_classes::CHECKBOX],
-                    attrs! {
-                        At::Type=>"checkbox",
-                        At::Checked=>all_selected,
-                    }
-                ],
-                ev(Ev::Input, move |_| {
-                    if all_selected {
-                        Msg::SelectionSetNone
-                    } else {
-                        Msg::SelectionSetAll
-                    }
-                }),
-            ],
+            &tristate_input,
+            &catchup,
             div![
                 button![
                     tw_classes::button(),
@@ -1097,11 +1108,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"],
@@ -1194,47 +1212,68 @@ fn view_header(
     let query = Url::decode_uri_component(query).unwrap_or("".to_string());
 
     nav![
-        C!["flex", "px-4", "pt-4", "overflow-hidden"],
-        a![
-            C![IF![is_error => "bg-red-500"], "rounded-r-none"],
-            tw_classes::button(),
-            span![i![C![
-                "fa-solid",
-                "fa-arrow-rotate-right",
-                IF![is_loading => "animate-spin"],
-            ]]],
-            ev(Ev::Click, |_| Msg::RefreshStart),
+        C!["flex", "flex-col"],
+        div![
+            C!["flex-auto", "flex"],
+            button![
+                C![IF![is_error => "bg-red-500"], "rounded-none"],
+                tw_classes::button(),
+                span![i![C![
+                    "fa-solid",
+                    "fa-arrow-rotate-right",
+                    IF![is_loading => "animate-spin"],
+                ]]],
+                ev(Ev::Click, |_| Msg::RefreshStart),
+            ],
+            button![
+                tw_classes::button(),
+                C!["grow", "rounded-none"],
+                "All",
+                ev(Ev::Click, |_| Msg::SearchQuery(String::new())),
+            ],
+            button![
+                tw_classes::button(),
+                C!["grow", "rounded-none"],
+                span![i![C!["far", "fa-envelope"]]],
+                " Unread",
+                ev(Ev::Click, |_| Msg::SearchQuery("is:unread".to_string())),
+            ],
+            button![
+                tw_classes::button(),
+                C!["grow", "rounded-none"],
+                span![i![C!["far", "fa-envelope"]]],
+                " News",
+                ev(Ev::Click, |_| Msg::SearchQuery(
+                    "is:unread is:news".to_string()
+                )),
+            ],
+            button![
+                tw_classes::button(),
+                C!["grow", "rounded-none"],
+                span![i![C!["far", "fa-envelope"]]],
+                " Mail",
+                ev(Ev::Click, |_| Msg::SearchQuery(
+                    "is:unread is:mail".to_string()
+                )),
+            ],
         ],
-        a![
-            tw_classes::button(),
-            C!["px-4", "rounded-none"],
-            attrs! {
-                At::Href => urls::search(unread_query(), 0)
-            },
-            "Unread",
-        ],
-        a![
-            tw_classes::button(),
-            C!["px-4", "rounded-none"],
-            attrs! {
-                At::Href => urls::search("", 0)
-            },
-            "All",
-        ],
-        input![
-            C!["grow", "pl-2", "text-black", "rounded-r"],
-            attrs! {
-                At::Placeholder => "Search";
-                At::AutoFocus => auto_focus_search.as_at_value();
-                At::Value => query,
-            },
-            input_ev(Ev::Input, |q| Msg::UpdateQuery(q)),
-            // Send search on enter.
-            keyboard_ev(Ev::KeyUp, move |e| if e.key_code() == 0x0d {
-                Msg::SearchQuery(query)
-            } else {
-                Msg::Noop
-            }),
+        div![
+            C!["flex-auto", "flex"],
+            input![
+                C!["grow", "text-black", "p-2", "focus-visible:outline-0"],
+                attrs! {
+                    At::Placeholder => "Search";
+                    At::AutoFocus => auto_focus_search.as_at_value();
+                    At::Value => query,
+                },
+                input_ev(Ev::Input, |q| Msg::UpdateQuery(q)),
+                // Send search on enter.
+                keyboard_ev(Ev::KeyUp, move |e| if e.key_code() == 0x0d {
+                    Msg::SearchQuery(query)
+                } else {
+                    Msg::Noop
+                }),
+            ]
         ]
     ]
 }
@@ -1397,11 +1436,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"],
@@ -1534,12 +1580,12 @@ fn render_news_post_header(post: &ShowThreadQueryThreadOnNewsPost) -> Node<Msg>
                 } else {
                     "fa-envelope-open"
                 },
-            ]]
-        ],
-        ev(Ev::Click, move |e| {
-            e.stop_propagation();
-            Msg::SetUnread(id, !is_unread)
-        })
+            ]],
+            ev(Ev::Click, move |e| {
+                e.stop_propagation();
+                Msg::SetUnread(id, !is_unread)
+            })
+        ]
     ]
 }
 fn reading_progress(ratio: f64) -> Node<Msg> {

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,61 +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;
+  font-family: monospace;
+  background-color: #eee !important;
+  padding: 0.5em;
+  white-space: break-spaces;
 }
 
 .mail-thread code,
 .news-post code {
-    font-family: monospace;
-    white-space: break-spaces;
+  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 img.logo-image {
-    width: initial !important;
-    max-width: 100% !important;
+.mail-thread .noreply-news-bloomberg-com a {
+  background-color: initial !important;
 }
+
 .mail-thread .noreply-news-bloomberg-com h2 {
-    margin: 0 !important;
-    padding: 0 !important;
+  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;
 }