chore: Release

Cargo.lock

@@ -239,7 +239,7 @@ dependencies = [
  "futures-timer",
  "futures-util",
  "handlebars",
- "http 1.3.1",
+ "http 1.4.0",
  "indexmap 2.12.1",
  "log",
  "mime",
@@ -402,7 +402,7 @@ dependencies = [
  "axum-core 0.4.5",
  "bytes 1.11.0",
  "futures-util",
- "http 1.3.1",
+ "http 1.4.0",
  "http-body 1.0.1",
  "http-body-util",
  "itoa 1.0.15",
@@ -430,7 +430,7 @@ dependencies = [
  "bytes 1.11.0",
  "form_urlencoded",
  "futures-util",
- "http 1.3.1",
+ "http 1.4.0",
  "http-body 1.0.1",
  "http-body-util",
  "hyper 1.8.1",
@@ -464,7 +464,7 @@ dependencies = [
  "async-trait",
  "bytes 1.11.0",
  "futures-util",
- "http 1.3.1",
+ "http 1.4.0",
  "http-body 1.0.1",
  "http-body-util",
  "mime",
@@ -483,7 +483,7 @@ checksum = "59446ce19cd142f8833f856eb31f3eb097812d1479ab224f54d72428ca21ea22"
 dependencies = [
  "bytes 1.11.0",
  "futures-core",
- "http 1.3.1",
+ "http 1.4.0",
  "http-body 1.0.1",
  "http-body-util",
  "mime",
@@ -1130,9 +1130,9 @@ dependencies = [
 
 [[package]]
 name = "crc"
-version = "3.3.0"
+version = "3.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9710d3b3739c2e349eb44fe848ad0b7c8cb1e42bd87ee49371df2f7acaf3e675"
+checksum = "5eb8a2a1cd12ab0d987a5d5e825195d372001a4094a0376319d5a0ad71c1ba0d"
 dependencies = [
  "crc-catalog",
 ]
@@ -1679,7 +1679,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
 dependencies = [
  "libc",
- "windows-sys 0.59.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -2105,7 +2105,7 @@ dependencies = [
  "futures-core",
  "futures-sink",
  "gloo-utils 0.2.0",
- "http 1.3.1",
+ "http 1.4.0",
  "js-sys",
  "pin-project",
  "serde",
@@ -2272,7 +2272,7 @@ dependencies = [
  "fnv",
  "futures-core",
  "futures-sink",
- "http 1.3.1",
+ "http 1.4.0",
  "indexmap 2.12.1",
  "slab",
  "tokio 1.48.0",
@@ -2368,7 +2368,7 @@ dependencies = [
  "base64 0.22.1",
  "bytes 1.11.0",
  "headers-core",
- "http 1.3.1",
+ "http 1.4.0",
  "httpdate",
  "mime",
  "sha1",
@@ -2380,7 +2380,7 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "54b4a22553d4242c49fddb9ba998a99962b5cc6f22cb5a3482bec22522403ce4"
 dependencies = [
- "http 1.3.1",
+ "http 1.4.0",
 ]
 
 [[package]]
@@ -2526,12 +2526,11 @@ dependencies = [
 
 [[package]]
 name = "http"
-version = "1.3.1"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4a85d31aea989eead29a3aaf9e1115a180df8282431156e533de47660892565"
+checksum = "e3ba2a386d7f85a81f119ad7498ebe444d2e22c2af0b86b069416ace48b3311a"
 dependencies = [
  "bytes 1.11.0",
- "fnv",
  "itoa 1.0.15",
 ]
 
@@ -2565,7 +2564,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184"
 dependencies = [
  "bytes 1.11.0",
- "http 1.3.1",
+ "http 1.4.0",
 ]
 
 [[package]]
@@ -2576,7 +2575,7 @@ checksum = "b021d93e26becf5dc7e1b75b1bed1fd93124b374ceb73f43d4d4eafec896a64a"
 dependencies = [
  "bytes 1.11.0",
  "futures-core",
- "http 1.3.1",
+ "http 1.4.0",
  "http-body 1.0.1",
  "pin-project-lite",
 ]
@@ -2670,7 +2669,7 @@ dependencies = [
  "futures-channel",
  "futures-core",
  "h2 0.4.12",
- "http 1.3.1",
+ "http 1.4.0",
  "http-body 1.0.1",
  "httparse",
  "httpdate",
@@ -2688,7 +2687,7 @@ version = "0.27.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e3c93eb611681b207e1fe55d5a71ecf91572ec8a6705cdb6857f7d8d5242cf58"
 dependencies = [
- "http 1.3.1",
+ "http 1.4.0",
  "hyper 1.8.1",
  "hyper-util",
  "rustls",
@@ -2765,7 +2764,7 @@ dependencies = [
  "futures-channel",
  "futures-core",
  "futures-util",
- "http 1.3.1",
+ "http 1.4.0",
  "http-body 1.0.1",
  "hyper 1.8.1",
  "ipnet",
@@ -3109,6 +3108,20 @@ dependencies = [
 [[package]]
 name = "letterbox-notmuch"
 version = "0.17.49"
+source = "sparse+https://git.z.xinu.tv/api/packages/wathiede/cargo/"
+checksum = "00a17f171a147d558fc56242e9440731dbf037c24a4e9db7bd2a434c3a294b56"
+dependencies = [
+ "log",
+ "mailparse",
+ "serde",
+ "serde_json",
+ "thiserror 2.0.17",
+ "tracing",
+]
+
+[[package]]
+name = "letterbox-notmuch"
+version = "0.17.53"
 dependencies = [
  "itertools",
  "log",
@@ -3121,28 +3134,14 @@ dependencies = [
  "tracing",
 ]
 
-[[package]]
-name = "letterbox-notmuch"
-version = "0.17.49"
-source = "sparse+https://git.z.xinu.tv/api/packages/wathiede/cargo/"
-checksum = "00a17f171a147d558fc56242e9440731dbf037c24a4e9db7bd2a434c3a294b56"
-dependencies = [
- "log",
- "mailparse",
- "serde",
- "serde_json",
- "thiserror 2.0.17",
- "tracing",
-]
-
 [[package]]
 name = "letterbox-procmail2notmuch"
-version = "0.17.49"
+version = "0.17.53"
 dependencies = [
  "anyhow",
  "clap",
- "letterbox-notmuch 0.17.49 (sparse+https://git.z.xinu.tv/api/packages/wathiede/cargo/)",
+ "letterbox-notmuch 0.17.49",
- "letterbox-shared 0.17.49 (sparse+https://git.z.xinu.tv/api/packages/wathiede/cargo/)",
+ "letterbox-shared 0.17.49",
  "serde",
  "sqlx",
  "tokio 1.48.0",
@@ -3150,7 +3149,7 @@ dependencies = [
 
 [[package]]
 name = "letterbox-server"
-version = "0.17.49"
+version = "0.17.53"
 dependencies = [
  "ammonia",
  "anyhow",
@@ -3173,8 +3172,8 @@ dependencies = [
  "html-escape",
  "html2text",
  "ical",
- "letterbox-notmuch 0.17.49",
+ "letterbox-notmuch 0.17.53",
- "letterbox-shared 0.17.49",
+ "letterbox-shared 0.17.53",
  "linkify",
  "lol_html",
  "mailparse",
@@ -3201,6 +3200,8 @@ dependencies = [
 [[package]]
 name = "letterbox-shared"
 version = "0.17.49"
+source = "sparse+https://git.z.xinu.tv/api/packages/wathiede/cargo/"
+checksum = "aa71e36a33239a05140bac4e5ca366b79e1d6244ffc9b8e5a81f45271b54daaf"
 dependencies = [
  "build-info",
  "letterbox-notmuch 0.17.49",
@@ -3213,12 +3214,10 @@ dependencies = [
 
 [[package]]
 name = "letterbox-shared"
-version = "0.17.49"
+version = "0.17.53"
-source = "sparse+https://git.z.xinu.tv/api/packages/wathiede/cargo/"
-checksum = "aa71e36a33239a05140bac4e5ca366b79e1d6244ffc9b8e5a81f45271b54daaf"
 dependencies = [
  "build-info",
- "letterbox-notmuch 0.17.49 (sparse+https://git.z.xinu.tv/api/packages/wathiede/cargo/)",
+ "letterbox-notmuch 0.17.53",
  "regex",
  "serde",
  "sqlx",
@@ -3228,7 +3227,7 @@ dependencies = [
 
 [[package]]
 name = "letterbox-web"
-version = "0.17.49"
+version = "0.17.53"
 dependencies = [
  "build-info",
  "build-info-build",
@@ -3240,7 +3239,7 @@ dependencies = [
  "graphql_client",
  "human_format",
  "itertools",
- "letterbox-shared 0.17.49",
+ "letterbox-shared 0.17.53",
  "log",
  "seed",
  "seed_hooks",
@@ -3703,7 +3702,7 @@ dependencies = [
  "bytes 1.11.0",
  "encoding_rs",
  "futures-util",
- "http 1.3.1",
+ "http 1.4.0",
  "httparse",
  "memchr",
  "mime",
@@ -3779,7 +3778,7 @@ version = "0.50.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5"
 dependencies = [
- "windows-sys 0.59.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -3950,7 +3949,7 @@ checksum = "46d7ab32b827b5b495bd90fa95a6cb65ccc293555dcc3199ae2937d2d237c8ed"
 dependencies = [
  "async-trait",
  "bytes 1.11.0",
- "http 1.3.1",
+ "http 1.4.0",
  "opentelemetry",
  "reqwest",
  "tracing",
@@ -3963,7 +3962,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d899720fe06916ccba71c01d04ecd77312734e2de3467fd30d9d580c8ce85656"
 dependencies = [
  "futures-core",
- "http 1.3.1",
+ "http 1.4.0",
  "opentelemetry",
  "opentelemetry-http",
  "opentelemetry-proto",
@@ -4562,7 +4561,7 @@ dependencies = [
  "once_cell",
  "socket2 0.6.1",
  "tracing",
- "windows-sys 0.59.0",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -4792,7 +4791,7 @@ dependencies = [
  "futures-core",
  "futures-util",
  "h2 0.4.12",
- "http 1.3.1",
+ "http 1.4.0",
  "http-body 1.0.1",
  "http-body-util",
  "hyper 1.8.1",
@@ -5079,7 +5078,7 @@ dependencies = [
  "errno",
  "libc",
  "linux-raw-sys",
- "windows-sys 0.59.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -6149,7 +6148,7 @@ dependencies = [
  "getrandom 0.3.4",
  "once_cell",
  "rustix",
- "windows-sys 0.59.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -6635,7 +6634,7 @@ dependencies = [
  "base64 0.22.1",
  "bytes 1.11.0",
  "h2 0.4.12",
- "http 1.3.1",
+ "http 1.4.0",
  "http-body 1.0.1",
  "http-body-util",
  "hyper 1.8.1",
@@ -6724,7 +6723,7 @@ dependencies = [
  "bitflags 2.10.0",
  "bytes 1.11.0",
  "futures-util",
- "http 1.3.1",
+ "http 1.4.0",
  "http-body 1.0.1",
  "iri-string",
  "pin-project-lite",
@@ -6748,9 +6747,9 @@ checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
 
 [[package]]
 name = "tracing"
-version = "0.1.42"
+version = "0.1.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8eb41cbdb933e23b7929f47bb577710643157d7602ef3a2ebd3902b13ac5eda6"
+checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0"
 dependencies = [
  "log",
  "pin-project-lite",
@@ -6760,12 +6759,12 @@ dependencies = [
 
 [[package]]
 name = "tracing-appender"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3566e8ce28cc0a3fe42519fc80e6b4c943cc4c8cef275620eb8dac2d3d4e06cf"
+checksum = "786d480bce6247ab75f005b14ae1624ad978d3029d9113f0a22fa1ac773faeaf"
 dependencies = [
  "crossbeam-channel",
- "thiserror 1.0.69",
+ "thiserror 2.0.17",
  "time 0.3.44",
  "tracing-subscriber",
 ]
@@ -6852,7 +6851,7 @@ checksum = "8628dcc84e5a09eb3d8423d6cb682965dea9133204e8fb3efee74c2a0c259442"
 dependencies = [
  "bytes 1.11.0",
  "data-encoding",
- "http 1.3.1",
+ "http 1.4.0",
  "httparse",
  "log",
  "rand 0.9.2",
@@ -7552,9 +7551,9 @@ checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650"
 
 [[package]]
 name = "winnow"
-version = "0.7.13"
+version = "0.7.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21a0236b59786fed61e2a80582dd500fe61f18b5dca67a4a067d0bc9039339cf"
+checksum = "5a5364e9d77fcdeeaa6062ced926ee3381faa2ee02d3eb83a5c27a8825540829"
 dependencies = [
  "memchr",
 ]
@@ -7642,18 +7641,18 @@ dependencies = [
 
 [[package]]
 name = "zerocopy"
-version = "0.8.28"
+version = "0.8.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43fa6694ed34d6e57407afbccdeecfa268c470a7d2a5b0cf49ce9fcc345afb90"
+checksum = "4ea879c944afe8a2b25fef16bb4ba234f47c694565e97383b36f3a878219065c"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.8.28"
+version = "0.8.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c640b22cd9817fae95be82f0d2f90b11f7605f6c319d16705c459b27ac2cbc26"
+checksum = "cf955aa904d6040f70dc8e9384444cb1030aed272ba3cb09bbc4ab9e7c1f34f5"
 dependencies = [
  "proc-macro2",
  "quote",

Cargo.toml

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

procmail2notmuch/Cargo.toml

@@ -13,8 +13,8 @@ version.workspace = true
 [dependencies]
 anyhow = "1.0.98"
 clap = { version = "4.5.37", features = ["derive", "env"] }
-letterbox-notmuch = { version = "0.17.9", registry = "xinu" }
+letterbox-notmuch = { version = "0.17", registry = "xinu" }
-letterbox-shared = { version = "0.17.9", registry = "xinu" }
+letterbox-shared = { version = "0.17", registry = "xinu" }
 serde = { version = "1.0.219", features = ["derive"] }
 sqlx = { version = "0.8.5", features = ["postgres", "runtime-tokio"] }
 tokio = { version = "1.44.2", features = ["rt", "macros", "rt-multi-thread"] }

server/Cargo.toml

@@ -32,8 +32,8 @@ futures = "0.3.31"
 headers = "0.4.0"
 html-escape = "0.2.13"
 ical = "0.11"
-letterbox-notmuch = { path = "../notmuch", version = "0.17.49", registry = "xinu" }
+letterbox-notmuch = { path = "../notmuch", version = "0.17", registry = "xinu" }
-letterbox-shared = { path = "../shared", version = "0.17.49", registry = "xinu" }
+letterbox-shared = { path = "../shared", version = "0.17", registry = "xinu" }
 linkify = "0.10.0"
 lol_html = "2.3.0"
 mailparse = "0.16.1"

shared/Cargo.toml

@@ -12,7 +12,7 @@ version.workspace = true
 
 [dependencies]
 build-info = "0.0.42"
-letterbox-notmuch = { path = "../notmuch", version = "0.17.49", registry = "xinu" }
+letterbox-notmuch = { path = "../notmuch", version = "0.17", 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.49", registry = "xinu" }
+letterbox-shared = { path = "../shared/", version = "0.17", registry = "xinu" }
 seed_hooks = { version = "0.4.1", registry = "xinu" }
 strum_macros = "0.27.1"
 gloo-console = "0.3.0"

web/src/state.rs

@@ -291,6 +291,7 @@ pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg>) {
             first,
             last,
         } => {
+            model.refreshing_state = RefreshingState::Loading;
             let (after, before, first, last) = match (after.as_ref(), before.as_ref(), first, last)
             {
                 // If no pagination set, set reasonable defaults
@@ -316,25 +317,32 @@ pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg>) {
             });
         }
         Msg::FrontPageResult(Err(e)) => {
-            error!("error FrontPageResult: {e:?}");
+            let msg = format!("error FrontPageResult: {e:?}");
+            error!("{msg}");
+            model.refreshing_state = RefreshingState::Error(msg);
         }
         Msg::FrontPageResult(Ok(graphql_client::Response {
             data: None,
             errors: None,
             ..
         })) => {
-            error!("FrontPageResult no data or errors, should not happen");
+            let msg = format!("FrontPageResult no data or errors, should not happen");
+            error!("{msg}");
+            model.refreshing_state = RefreshingState::Error(msg);
         }
         Msg::FrontPageResult(Ok(graphql_client::Response {
             data: None,
             errors: Some(e),
             ..
         })) => {
-            error!("FrontPageResult error: {e:?}");
+            let msg = format!("FrontPageResult error: {e:?}");
+            error!("{msg}");
+            model.refreshing_state = RefreshingState::Error(msg);
         }
         Msg::FrontPageResult(Ok(graphql_client::Response {
             data: Some(data), ..
         })) => {
+            model.refreshing_state = RefreshingState::None;
             model.tags = Some(
                 data.tags
                     .into_iter()
@@ -374,6 +382,7 @@ pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg>) {
         }
 
         Msg::ShowThreadRequest { thread_id } => {
+            model.refreshing_state = RefreshingState::Loading;
             orders.skip().perform_cmd(async move {
                 Msg::ShowThreadResult(
                     send_graphql(graphql::ShowThreadQuery::build_query(
@@ -386,6 +395,7 @@ pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg>) {
         Msg::ShowThreadResult(Ok(graphql_client::Response {
             data: Some(data), ..
         })) => {
+            model.refreshing_state = RefreshingState::None;
             model.tags = Some(
                 data.tags
                     .into_iter()
@@ -425,9 +435,12 @@ pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg>) {
             orders.send_msg(Msg::WindowScrolled);
         }
         Msg::ShowThreadResult(bad) => {
-            error!("show_thread_query error: {bad:#?}");
+            let msg = format!("show_thread_query error: {bad:#?}");
+            error!("{msg}");
+            model.refreshing_state = RefreshingState::Error(msg);
         }
         Msg::CatchupRequest { query } => {
+            model.refreshing_state = RefreshingState::Loading;
             orders.perform_cmd(async move {
                 Msg::CatchupResult(
                     send_graphql::<_, graphql::catchup_query::ResponseData>(
@@ -442,6 +455,7 @@ pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg>) {
         Msg::CatchupResult(Ok(graphql_client::Response {
             data: Some(data), ..
         })) => {
+            model.refreshing_state = RefreshingState::None;
             let items = data.catchup;
             if items.is_empty() {
                 orders.send_msg(Msg::GoToSearchResults);
@@ -457,7 +471,9 @@ pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg>) {
             }
         }
         Msg::CatchupResult(bad) => {
-            error!("catchup_query error: {bad:#?}");
+            let msg = format!("catchup_query error: {bad:#?}");
+            error!("{msg}");
+            model.refreshing_state = RefreshingState::Error(msg);
         }
         Msg::SelectionSetNone => {
             if let Context::SearchResult {

web/src/view/mod.rs

@@ -78,13 +78,16 @@ mod tw_classes {
 }
 
 pub fn view(model: &Model) -> Node<Msg> {
+    let is_loading = match model.refreshing_state {
+        RefreshingState::Loading => true,
+        _ => false,
+    };
     match &model.context {
         Context::None => normal_view(
             div![h1!["Loading"]],
             &model.versions,
             &model.query,
             &model.refreshing_state,
-            model.read_completion_ratio,
             &model.tags,
         ),
         Context::ThreadResult {
@@ -93,17 +96,23 @@ pub fn view(model: &Model) -> Node<Msg> {
         } => {
             if let Some(catchup) = &model.catchup {
                 catchup_view(
-                    thread(thread_data, open_messages, &model.content_el, true),
+                    thread(thread_data, open_messages, &model.content_el, true, 0.),
                     &catchup.items,
+                    is_loading,
                     model.read_completion_ratio,
                 )
             } else {
                 normal_view(
-                    thread(thread_data, open_messages, &model.content_el, false),
+                    thread(
+                        thread_data,
+                        open_messages,
+                        &model.content_el,
+                        false,
+                        model.read_completion_ratio,
+                    ),
                     &model.versions,
                     &model.query,
                     &model.refreshing_state,
-                    model.read_completion_ratio,
                     &model.tags,
                 )
             }
@@ -114,17 +123,17 @@ pub fn view(model: &Model) -> Node<Msg> {
         } => {
             if let Some(catchup) = &model.catchup {
                 catchup_view(
-                    news_post(post, &model.content_el, true),
+                    news_post(post, &model.content_el, true, model.read_completion_ratio),
                     &catchup.items,
-                    model.read_completion_ratio,
+                    is_loading,
+                    0.,
                 )
             } else {
                 normal_view(
-                    news_post(post, &model.content_el, false),
+                    news_post(post, &model.content_el, false, model.read_completion_ratio),
                     &model.versions,
                     &model.query,
                     &model.refreshing_state,
-                    model.read_completion_ratio,
                     &model.tags,
                 )
             }
@@ -140,7 +149,6 @@ pub fn view(model: &Model) -> Node<Msg> {
             &model.versions,
             &model.query,
             &model.refreshing_state,
-            model.read_completion_ratio,
             &model.tags,
         ),
     }
@@ -151,7 +159,6 @@ fn normal_view(
     versions: &Version,
     query: &str,
     refreshing_state: &RefreshingState,
-    read_completion_ratio: f64,
     tags: &Option<Vec<Tag>>,
 ) -> Node<Msg> {
     div![
@@ -178,13 +185,13 @@ fn normal_view(
             content,
             view_header(query, refreshing_state, false),
         ],
-        reading_progress(read_completion_ratio),
     ]
 }
 
 fn catchup_view(
     content: Node<Msg>,
     items: &[CatchupItem],
+    is_loading: bool,
     read_completion_ratio: f64,
 ) -> Node<Msg> {
     div![
@@ -201,13 +208,34 @@ fn catchup_view(
                 "bg-black/50",
             ],
             div![
-                C!["absolute", "top-0", "right-4", "text-gray-500", "p-4"],
+                C!["absolute", "top-0", "left-4", "text-green-200", "p-4"],
-                span![i![C!["fas", "fa-x"]]],
+                IF!(is_loading=>span![i![C!["animate-spin", "fas", "fa-spinner"]]])
-                ev(Ev::Click, move |_| Msg::CatchupExit)
             ],
             h1![
                 C!["text-center"],
                 format!("{} left ", items.iter().filter(|i| !i.seen).count(),)
+            ],
+            div![
+                C!["absolute", "top-0", "right-4", "text-gray-500", "p-4"],
+                span![i![C!["fas", "fa-x"]]],
+                ev(Ev::Click, move |_| Msg::CatchupExit)
+            ],
+            div![
+                C![
+                    "absolute",
+                    "left-0",
+                    "right-0",
+                    "bottom-0",
+                    "w-full",
+                    "h-1",
+                    "bg-gray-200"
+                ],
+                div![
+                    C!["h-1", "bg-green-500"],
+                    style! {
+                        St::Width => format!("{}%", read_completion_ratio*100.)
+                    }
+                ]
             ]
         ],
         div![C!["mt-12", "mb-20"], content],
@@ -247,7 +275,6 @@ fn catchup_view(
                 ev(Ev::Click, |_| Msg::CatchupMarkAsRead)
             ]
         ],
-        reading_progress(read_completion_ratio)
     ]
 }
 
@@ -1148,6 +1175,7 @@ fn thread(
     open_messages: &HashSet<String>,
     content_el: &ElRef<HtmlElement>,
     catchup_mode: bool,
+    read_completion_ratio: f64,
 ) -> Node<Msg> {
     // TODO(wathiede): show per-message subject if it changes significantly from top-level subject
     let subject = if thread.subject.is_empty() {
@@ -1232,7 +1260,8 @@ fn thread(
             el_ref(content_el),
             messages,
             IF!(!catchup_mode => click_to_top())
-        ]
+        ],
+        reading_progress(read_completion_ratio)
     ]
 }
 
@@ -1476,6 +1505,7 @@ fn news_post(
     post: &ShowThreadQueryThreadOnNewsPost,
     content_el: &ElRef<HtmlElement>,
     catchup_mode: bool,
+    read_completion_ratio: f64,
 ) -> Node<Msg> {
     let subject = &post.title;
     set_title(subject);
@@ -1563,6 +1593,7 @@ fn news_post(
             ]
         ],
         IF!(!catchup_mode => click_to_top()),
+        reading_progress(read_completion_ratio)
     ]
 }
 fn render_news_post_header(post: &ShowThreadQueryThreadOnNewsPost) -> Node<Msg> {