chore: Release

Cargo.lock

@@ -562,9 +562,9 @@ dependencies = [
 
 [[package]]
 name = "build-info"
-version = "0.0.39"
+version = "0.0.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24c8169feaff1e5d9686706c0a56a54ed0422d2df41fa1c543e53f7cea0e70d4"
+checksum = "288657edd15bfa5a7f30ca3b123c1af2c503eaf218e517fa10bc9063dbc2ad99"
 dependencies = [
  "bincode",
  "build-info-common",
@@ -573,9 +573,9 @@ dependencies = [
 
 [[package]]
 name = "build-info-build"
-version = "0.0.39"
+version = "0.0.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e73a4a2bdb1e3fae84472b5a9f806208331eb89783bf9b19819cb1d8fbc6d5ec"
+checksum = "3146483d5bc5081ec26f9c4e60232e770980d750b2802d6cc2563cded665cc73"
 dependencies = [
  "anyhow",
  "base64 0.22.1",
@@ -593,21 +593,21 @@ dependencies = [
 
 [[package]]
 name = "build-info-common"
-version = "0.0.39"
+version = "0.0.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b6fa54101dfbd88efc3981859e92c3d47c729ff54d5df73ec36505c337e5c5e"
+checksum = "8524ad59f5958f37f95e66bf6c9a8fa8440c4f56c069247c44244434cfca3eb1"
 dependencies = [
  "chrono",
- "derive_more 1.0.0",
+ "derive_more 2.0.1",
  "semver 1.0.25",
  "serde",
 ]
 
 [[package]]
 name = "build-info-proc"
-version = "0.0.39"
+version = "0.0.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c5458d2f0ed8bb88f7f6b5706460ca55fab08db16456ea03b920691b4cac163"
+checksum = "6b58fb02636d968e8327d84a5a256df9704ac27a1eda98429c35dbe50a278f69"
 dependencies = [
  "anyhow",
  "base64 0.22.1",
@@ -713,16 +713,16 @@ dependencies = [
 
 [[package]]
 name = "cargo_metadata"
-version = "0.18.1"
+version = "0.19.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037"
+checksum = "8769706aad5d996120af43197bf46ef6ad0fda35216b4505f926a365a232d924"
 dependencies = [
  "camino",
  "cargo-platform",
  "semver 1.0.25",
  "serde",
  "serde_json",
- "thiserror 1.0.69",
+ "thiserror 2.0.11",
 ]
 
 [[package]]
@@ -772,9 +772,9 @@ dependencies = [
 
 [[package]]
 name = "chrono"
-version = "0.4.39"
+version = "0.4.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e36cc9d416881d2e24f9a963be5fb1cd90966419ac844274161d10488b3e825"
+checksum = "1a7964611d71df112cb1730f2ee67324fcf4d0fc6606acbbe9bfe06df124637c"
 dependencies = [
  "android-tzdata",
  "iana-time-zone",
@@ -782,7 +782,7 @@ dependencies = [
  "num-traits",
  "serde",
  "wasm-bindgen",
- "windows-targets 0.52.6",
+ "windows-link",
 ]
 
 [[package]]
@@ -1337,18 +1337,18 @@ dependencies = [
 
 [[package]]
 name = "derive_more"
-version = "1.0.0"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a9b99b9cbbe49445b21764dc0625032a89b145a2642e67603e1c936f5458d05"
+checksum = "093242cf7570c207c83073cf82f79706fe7b8317e98620a47d5be7c3d8497678"
 dependencies = [
  "derive_more-impl",
 ]
 
 [[package]]
 name = "derive_more-impl"
-version = "1.0.0"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22"
+checksum = "bda628edc44c4bb645fbe0f758797143e4e07926f7ebf4e9bdfbd3d2ce621df3"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1927,9 +1927,9 @@ checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
 
 [[package]]
 name = "git2"
-version = "0.19.0"
+version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b903b73e45dc0c6c596f2d37eccece7c1c8bb6e4407b001096387c63d0d93724"
+checksum = "3fda788993cc341f69012feba8bf45c0ba4f3291fcc08e214b4d5a7332d88aff"
 dependencies = [
  "bitflags 2.8.0",
  "libc",
@@ -2965,7 +2965,7 @@ dependencies = [
 
 [[package]]
 name = "letterbox-notmuch"
-version = "0.9.7"
+version = "0.9.9"
 dependencies = [
  "itertools 0.14.0",
  "log",
@@ -2980,14 +2980,14 @@ dependencies = [
 
 [[package]]
 name = "letterbox-procmail2notmuch"
-version = "0.9.7"
+version = "0.9.9"
 dependencies = [
  "anyhow",
 ]
 
 [[package]]
 name = "letterbox-server"
-version = "0.9.7"
+version = "0.9.9"
 dependencies = [
  "ammonia",
  "anyhow",
@@ -3030,7 +3030,7 @@ dependencies = [
 
 [[package]]
 name = "letterbox-shared"
-version = "0.9.7"
+version = "0.9.9"
 dependencies = [
  "build-info",
  "letterbox-notmuch",
@@ -3039,7 +3039,7 @@ dependencies = [
 
 [[package]]
 name = "letterbox-web"
-version = "0.9.7"
+version = "0.9.9"
 dependencies = [
  "build-info",
  "build-info-build",
@@ -3079,9 +3079,9 @@ checksum = "875b3680cb2f8f71bdcf9a30f38d48282f5d3c95cbf9b3fa57269bb5d5c06828"
 
 [[package]]
 name = "libgit2-sys"
-version = "0.17.0+1.8.1"
+version = "0.18.0+1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10472326a8a6477c3c20a64547b0059e4b0d086869eee31e6d7da728a8eb7224"
+checksum = "e1a117465e7e1597e8febea8bb0c410f1c7fb93b1e1cddf34363f8390367ffec"
 dependencies = [
  "cc",
  "libc",
@@ -7035,9 +7035,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 
 [[package]]
 name = "uuid"
-version = "1.14.0"
+version = "1.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93d59ca99a559661b96bf898d8fce28ed87935fd2bea9f05983c1464dd6c71b1"
+checksum = "e0f540e3240398cce6128b64ba83fdbdd86129c16a3aa1a3a252efd66eb3d587"
 dependencies = [
  "getrandom 0.3.1",
  "js-sys",
@@ -7322,6 +7322,12 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
+[[package]]
+name = "windows-link"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6dccfd733ce2b1753b03b6d3c65edf020262ea35e20ccdf3e288043e6dd620e3"
+
 [[package]]
 name = "windows-registry"
 version = "0.2.0"

Cargo.toml

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

server/Cargo.toml

@@ -17,7 +17,7 @@ anyhow = "1.0.79"
 async-graphql = { version = "7", features = ["log"] }
 async-graphql-rocket = "7"
 async-trait = "0.1.81"
-build-info = "0.0.39"
+build-info = "0.0.40"
 cacher = { version = "0.1.0", registry = "xinu" }
 chrono = "0.4.39"
 clap = { version = "4.5.23", features = ["derive"] }
@@ -48,11 +48,11 @@ 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.9.7", path = "../notmuch", registry = "xinu" }
-letterbox-shared = { version = "0.9.7", path = "../shared", registry = "xinu" }
+letterbox-notmuch = { version = "0.9.9", path = "../notmuch", registry = "xinu" }
+letterbox-shared = { version = "0.9.9", path = "../shared", registry = "xinu" }
 
 [build-dependencies]
-build-info-build = "0.0.39"
+build-info-build = "0.0.40"
 
 [features]
 #default = [ "tantivy" ]

shared/Cargo.toml

@@ -11,6 +11,6 @@ version.workspace = true
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-build-info = "0.0.39"
-letterbox-notmuch = { version = "0.9.7", path = "../notmuch", registry = "xinu" }
+build-info = "0.0.40"
+letterbox-notmuch = { version = "0.9.9", path = "../notmuch", registry = "xinu" }
 serde = { version = "1.0.147", features = ["derive"] }

web/Cargo.toml

@@ -9,7 +9,7 @@ repository.workspace = true
 version.workspace = true
 
 [build-dependencies]
-build-info-build = "0.0.39"
+build-info-build = "0.0.40"
 
 [dev-dependencies]
 wasm-bindgen-test = "0.3.33"
@@ -28,13 +28,13 @@ graphql_client = "0.14.0"
 thiserror = "2.0.0"
 gloo-net = { version = "0.6.0", features = ["json", "serde_json"] }
 human_format = "1.1.0"
-build-info = "0.0.39"
+build-info = "0.0.40"
 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.9.7", path = "../shared", registry = "xinu" }
-letterbox-notmuch = { version = "0.9.7", path = "../notmuch", registry = "xinu" }
+letterbox-shared = { version = "0.9.9", path = "../shared", registry = "xinu" }
+letterbox-notmuch = { version = "0.9.9", path = "../notmuch", registry = "xinu" }
 seed_hooks = { version = "0.4.0", registry = "xinu" }
 strum_macros = "0.27.1"
 
@@ -50,4 +50,6 @@ features = [
   "MediaQueryList",
   "Navigator",
   "Window",
+  "History",
+  "ScrollRestoration",
 ]

web/src/state.rs

@@ -29,6 +29,12 @@ pub fn unread_query() -> &'static str {
 pub fn init(url: Url, orders: &mut impl Orders<Msg>) -> Model {
     let version = letterbox_shared::build_version(bi);
     info!("Build Info: {}", version);
+    // Disable restoring to scroll position when navigating
+    window()
+        .history()
+        .expect("couldn't get history")
+        .set_scroll_restoration(web_sys::ScrollRestoration::Manual)
+        .expect("failed to set scroll restoration to manual");
     if url.hash().is_none() {
         orders.request_url(urls::search(unread_query(), 0));
     } else {

web/src/view/mod.rs

@@ -93,13 +93,13 @@ pub fn view(model: &Model) -> Node<Msg> {
         } => {
             if let Some(catchup) = &model.catchup {
                 catchup_view(
-                    thread(thread_data, open_messages, &model.content_el),
+                    thread(thread_data, open_messages, &model.content_el, true),
                     &catchup.items,
                     model.read_completion_ratio,
                 )
             } else {
                 normal_view(
-                    thread(thread_data, open_messages, &model.content_el),
+                    thread(thread_data, open_messages, &model.content_el, false),
                     &model.versions,
                     &model.query,
                     &model.refreshing_state,
@@ -114,13 +114,13 @@ pub fn view(model: &Model) -> Node<Msg> {
         } => {
             if let Some(catchup) = &model.catchup {
                 catchup_view(
-                    news_post(post, &model.content_el),
+                    news_post(post, &model.content_el, true),
                     &catchup.items,
                     model.read_completion_ratio,
                 )
             } else {
                 normal_view(
-                    news_post(post, &model.content_el),
+                    news_post(post, &model.content_el, false),
                     &model.versions,
                     &model.query,
                     &model.refreshing_state,
@@ -198,10 +198,10 @@ fn catchup_view(
                 "p-4",
                 "border-b",
                 "border-gray-500",
-                "bg-black",
+                "bg-black/50",
             ],
             div![
-                C!["absolute", "right-4", "text-gray-500"],
+                C!["absolute", "top-0", "right-4", "text-gray-500", "p-4"],
                 span![i![C!["fas", "fa-x"]]],
                 ev(Ev::Click, move |_| Msg::CatchupExit)
             ],
@@ -210,7 +210,7 @@ fn catchup_view(
                 format!("{} left ", items.iter().filter(|i| !i.seen).count(),)
             ]
         ],
-        div![C!["mt-12", "mb-4"], content],
+        div![C!["mt-12", "mb-20"], content],
         div![
             C![
                 "fixed",
@@ -223,19 +223,28 @@ fn catchup_view(
                 "p-4",
                 "border-t",
                 "border-gray-500",
-                "bg-black",
+                "bg-black/50",
             ],
             button![
                 tw_classes::button(),
                 span![i![C!["far", "fa-envelope"]]],
                 span![C!["pl-2"], "Keep unread"],
-                ev(Ev::Click, move |_| Msg::CatchupKeepUnread)
+                ev(Ev::Click, |_| Msg::CatchupKeepUnread)
+            ],
+            button![
+                tw_classes::button(),
+                span![i![C!["fas", "fa-house"]]],
+                span![C!["pl-2"], "Go home"],
+                ev(Ev::Click, |_| Msg::MultiMsg(vec![
+                    Msg::CatchupExit,
+                    Msg::GoToSearchResults
+                ]))
             ],
             button![
                 tw_classes::button_with_color("bg-green-800", "hover:bg-neutral-700"),
                 span![i![C!["far", "fa-envelope-open"]]],
                 span![C!["pl-2"], "Mark as read"],
-                ev(Ev::Click, move |_| Msg::CatchupMarkAsRead)
+                ev(Ev::Click, |_| Msg::CatchupMarkAsRead)
             ]
         ],
         reading_progress(read_completion_ratio)
@@ -1054,6 +1063,7 @@ fn thread(
     thread: &ShowThreadQueryThreadOnEmailThread,
     open_messages: &HashSet<String>,
     content_el: &ElRef<HtmlElement>,
+    catchup_mode: bool,
 ) -> Node<Msg> {
     // TODO(wathiede): show per-message subject if it changes significantly from top-level subject
     let subject = if thread.subject.is_empty() {
@@ -1086,7 +1096,7 @@ fn thread(
             C!["p-4", "lg:p-0"],
             h3![C!["text-xl"], subject],
             span![removable_tags_chiclet(&thread.thread_id, &tags)],
-            div![
+            IF!(!catchup_mode => div![
                 C!["pt-4", "gap-2", "flex", "justify-around"],
                 div![
                     button![
@@ -1124,13 +1134,13 @@ fn thread(
                         Msg::GoToSearchResults
                     ])),
                 ]]
-            ],
+            ]),
         ],
         div![
             C!["lg:mt-4", "mail-thread"],
             el_ref(content_el),
             messages,
-            click_to_top()
+            IF!(!catchup_mode => click_to_top())
         ],
         /* TODO(wathiede): plumb in orignal id
         a![
@@ -1351,7 +1361,11 @@ pub fn view_tags(tags: &Option<Vec<Tag>>) -> Node<Msg> {
 }
 
 // TODO: add cathup_mode:bool and hide elements when true
-fn news_post(post: &ShowThreadQueryThreadOnNewsPost, content_el: &ElRef<HtmlElement>) -> Node<Msg> {
+fn news_post(
+    post: &ShowThreadQueryThreadOnNewsPost,
+    content_el: &ElRef<HtmlElement>,
+    catchup_mode: bool,
+) -> Node<Msg> {
     let subject = &post.title;
     set_title(subject);
     let read_thread_id = post.thread_id.clone();
@@ -1382,7 +1396,7 @@ fn news_post(post: &ShowThreadQueryThreadOnNewsPost, content_el: &ElRef<HtmlElem
             C!["p-4", "lg:p-0"],
             h3![C!["text-xl"], subject],
             span![tag(format!("News/{}", post.slug))],
-            div![
+            IF!(!catchup_mode => div![
                 C!["pt-4", "gap-2", "flex", "justify-around"],
                 div![
                     button![
@@ -1410,7 +1424,7 @@ fn news_post(post: &ShowThreadQueryThreadOnNewsPost, content_el: &ElRef<HtmlElem
                 ],
                 // Placeholder for symmetry with email view that has Spam button
                 div![],
-            ],
+            ]),
         ],
         div![
             C!["lg:mt-4"],
@@ -1430,12 +1444,11 @@ fn news_post(post: &ShowThreadQueryThreadOnNewsPost, content_el: &ElRef<HtmlElem
                 raw![&post.body]
             ]
         ],
-        click_to_top(),
+        IF!(!catchup_mode => click_to_top()),
     ]
 }
 fn render_news_post_header(post: &ShowThreadQueryThreadOnNewsPost) -> Node<Msg> {
     let from = &post.site;
-    // TODO: move avatar/favicon stuff to the server side and and come up with a solution for emails
     let id = post.thread_id.clone();
     let is_unread = !post.is_read;
     let url = &post.url;