chore: Release

This reverts commit 1411961e36.

.gitea/workflows/rust.yml

@@ -1,4 +1,4 @@
-on: [push, pull_request]
+on: [push]
 
 name: Continuous integration
 

Cargo.toml

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

Justfile

@@ -1,3 +1,6 @@
+export CARGO_INCREMENTAL := "0"
+export RUSTFLAGS := "-D warnings"
+
 default:
     @echo "Run: just patch|minor|major"
 

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.1", path = "../notmuch", registry = "xinu" }
-letterbox-shared = { version = "0.9.1", path = "../shared", registry = "xinu" }
+letterbox-notmuch = { version = "0.10.1", path = "../notmuch", registry = "xinu" }
+letterbox-shared = { version = "0.10.1", path = "../shared", registry = "xinu" }
 
 [build-dependencies]
-build-info-build = "0.0.39"
+build-info-build = "0.0.40"
 
 [features]
 #default = [ "tantivy" ]

server/src/graphql.rs

@@ -331,10 +331,15 @@ impl QueryRoot {
             notmuch_results.len(),
         );
 
-        let results: Vec<_> = newsreader_results
+        let mut results: Vec<_> = newsreader_results
             .into_iter()
             .chain(notmuch_results)
             .collect();
+        // The leading '-' is to reverse sort
+        results.sort_by_key(|item| match item {
+            ThreadSummaryCursor::Newsreader(_, ts) => -ts.timestamp,
+            ThreadSummaryCursor::Notmuch(_, ts) => -ts.timestamp,
+        });
         let ids = results
             .into_iter()
             .map(|r| match r {

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.1", path = "../notmuch", registry = "xinu" }
+build-info = "0.0.40"
+letterbox-notmuch = { version = "0.10.1", 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,14 +28,15 @@ 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.1", path = "../shared", registry = "xinu" }
-letterbox-notmuch = { version = "0.9.1", path = "../notmuch", registry = "xinu" }
+letterbox-shared = { version = "0.10.1", path = "../shared", registry = "xinu" }
+letterbox-notmuch = { version = "0.10.1", path = "../notmuch", registry = "xinu" }
 seed_hooks = { version = "0.4.0", registry = "xinu" }
+strum_macros = "0.27.1"
 
 [package.metadata.wasm-pack.profile.release]
 wasm-opt = ['-Os']
@@ -49,4 +50,6 @@ features = [
   "MediaQueryList",
   "Navigator",
   "Window",
+  "History",
+  "ScrollRestoration",
 ]

web/src/main.rs

@@ -18,6 +18,9 @@ fn main() {
     #[cfg(debug_assertions)]
     console_error_panic_hook::set_once();
 
+    #[cfg(debug_assertions)]
+    let lvl = Level::Debug;
+    #[cfg(not(debug_assertions))]
     let lvl = Level::Info;
     console_log::init_with_level(lvl).expect("failed to initialize console logging");
     // Mount the `app` to the element with the `id` "app".

web/src/state.rs

@@ -29,16 +29,21 @@ 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 {
-        orders.notify(subs::UrlRequested::new(url));
+        orders.request_url(url);
     };
-    orders.stream(streams::window_event(Ev::Resize, |_| Msg::OnResize));
     // TODO(wathiede): only do this while viewing the index? Or maybe add a new message that force
     // 'notmuch new' on the server periodically?
     orders.stream(streams::interval(30_000, || Msg::RefreshStart));
-    orders.subscribe(on_url_changed);
+    orders.subscribe(Msg::OnUrlChanged);
     orders.stream(streams::window_event(Ev::Scroll, |_| Msg::WindowScrolled));
 
     build_info::build_info!(fn bi);
@@ -54,18 +59,22 @@ pub fn init(url: Url, orders: &mut impl Orders<Msg>) -> Model {
             server: None,
         },
         catchup: None,
+        last_url: Url::current(),
     }
 }
 
-fn on_url_changed(uc: subs::UrlChanged) -> Msg {
-    let mut url = uc.0;
+fn on_url_changed(old: &Url, mut new: Url) -> Msg {
+    let did_change = *old != new;
+    let mut messages = Vec::new();
+    if did_change {
+        messages.push(Msg::ScrollToTop)
+    }
     info!(
-        "url changed '{}', history {}",
-        url,
+        "url changed\nold '{old}'\nnew '{new}', history {}",
         history().length().unwrap_or(0)
     );
-    let hpp = url.remaining_hash_path_parts();
-    match hpp.as_slice() {
+    let hpp = new.remaining_hash_path_parts();
+    let msg = match hpp.as_slice() {
         ["t", tid] => Msg::ShowThreadRequest {
             thread_id: tid.to_string(),
         },
@@ -102,11 +111,14 @@ fn on_url_changed(uc: subs::UrlChanged) -> Msg {
                 last: None,
             }
         }
-    }
+    };
+    messages.push(msg);
+    Msg::MultiMsg(messages)
 }
 
 // `update` describes how to handle each `Msg`.
 pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg>) {
+    debug!("update({})", msg);
     match msg {
         Msg::Noop => {}
         Msg::RefreshStart => {
@@ -132,7 +144,7 @@ pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg>) {
             orders.perform_cmd(async move { Msg::Refresh });
         }
         Msg::Refresh => {
-            orders.perform_cmd(async move { on_url_changed(subs::UrlChanged(Url::current())) });
+            orders.request_url(Url::current());
         }
         Msg::Reload => {
             window()
@@ -140,7 +152,10 @@ pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg>) {
                 .reload()
                 .expect("failed to reload window");
         }
-        Msg::OnResize => (),
+        Msg::OnUrlChanged(new_url) => {
+            orders.send_msg(on_url_changed(&model.last_url, new_url.0.clone()));
+            model.last_url = new_url.0;
+        }
 
         Msg::NextPage => {
             match &model.context {
@@ -182,10 +197,7 @@ pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg>) {
             };
         }
         Msg::GoToSearchResults => {
-            let url = urls::search(&model.query, 0);
-            info!("GoToSearchResults Start");
-            orders.request_url(url);
-            info!("GoToSearchResults End");
+            orders.send_msg(Msg::SearchQuery(model.query.clone()));
         }
 
         Msg::UpdateQuery(query) => model.query = query,
@@ -280,12 +292,16 @@ pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg>) {
                 )
             });
         }
-        Msg::FrontPageResult(Err(e)) => error!("error FrontPageResult: {e:?}"),
+        Msg::FrontPageResult(Err(e)) => {
+            orders.send_msg(Msg::Reload);
+            error!("error FrontPageResult: {e:?}");
+        }
         Msg::FrontPageResult(Ok(graphql_client::Response {
             data: None,
             errors: None,
             ..
         })) => {
+            orders.send_msg(Msg::Reload);
             error!("FrontPageResult no data or errors, should not happen");
         }
         Msg::FrontPageResult(Ok(graphql_client::Response {
@@ -293,6 +309,7 @@ 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 {
@@ -308,7 +325,6 @@ pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg>) {
                     })
                     .collect(),
             );
-            info!("pager {:#?}", data.search.page_info);
             let selected_threads = 'context: {
                 if let Context::SearchResult {
                     results,
@@ -389,6 +405,7 @@ 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 } => {
@@ -421,6 +438,7 @@ 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 => {
@@ -536,7 +554,12 @@ pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg>) {
                     .expect("failed to copy to clipboard");
             });
         }
+        Msg::ScrollToTop => {
+            info!("scrolling to the top");
+            web_sys::window().unwrap().scroll_to_with_x_and_y(0., 0.);
+        }
         Msg::WindowScrolled => {
+            // TODO: model.content_el doesn't go to None like it should when a DOM is recreated and the refrenced element goes away
             if let Some(el) = model.content_el.get() {
                 let ih = window()
                     .inner_height()
@@ -581,6 +604,7 @@ pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg>) {
                     "Server ({}) and client ({}) version mismatch, reloading",
                     version, model.versions.client
                 );
+                #[cfg(not(debug_assertions))]
                 orders.send_msg(Msg::Reload);
             }
             model.versions.server = Some(version);
@@ -593,6 +617,7 @@ pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg>) {
                 format!("{} is:unread", model.query)
             };
             info!("starting catchup mode w/ {}", query);
+            orders.send_msg(Msg::ScrollToTop);
             orders.send_msg(Msg::CatchupRequest { query });
         }
         Msg::CatchupKeepUnread => {
@@ -608,24 +633,30 @@ pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg>) {
             orders.send_msg(Msg::CatchupNext);
         }
         Msg::CatchupNext => {
+            orders.send_msg(Msg::ScrollToTop);
             let Some(catchup) = &mut model.catchup else {
                 orders.send_msg(Msg::GoToSearchResults);
                 return;
             };
             let Some(idx) = catchup.items.iter().position(|i| !i.seen) else {
+                // All items have been seen
+                orders.send_msg(Msg::CatchupExit);
                 orders.send_msg(Msg::GoToSearchResults);
                 return;
             };
             catchup.items[idx].seen = true;
             if idx < catchup.items.len() - 1 {
+                // Reached last item
                 orders.request_url(urls::thread(&catchup.items[idx + 1].id));
                 return;
             } else {
+                orders.send_msg(Msg::CatchupExit);
                 orders.send_msg(Msg::GoToSearchResults);
                 return;
             };
         }
         Msg::CatchupExit => {
+            orders.send_msg(Msg::ScrollToTop);
             model.catchup = None;
         }
     }
@@ -659,6 +690,7 @@ pub struct Model {
     pub content_el: ElRef<HtmlElement>,
     pub versions: Version,
     pub catchup: Option<Catchup>,
+    pub last_url: Url,
 }
 
 #[derive(Debug)]
@@ -717,14 +749,15 @@ pub enum RefreshingState {
     Error(String),
 }
 // `Msg` describes the different events you can modify state with.
+#[derive(strum_macros::Display)]
 pub enum Msg {
     Noop,
     // Tell the client to refresh its state
     Refresh,
     // Tell the client to reload whole page from server
     Reload,
-    // Window has changed size
-    OnResize,
+    // TODO: add GoToUrl
+    OnUrlChanged(subs::UrlChanged),
     // Tell the server to update state
     RefreshStart,
     RefreshDone(Option<gloo_net::Error>),
@@ -777,6 +810,7 @@ pub enum Msg {
 
     CopyToClipboard(String),
 
+    ScrollToTop,
     WindowScrolled,
     SetProgress(f64),
     UpdateServerVersion(String),

web/src/view/mod.rs

@@ -4,7 +4,7 @@ use chrono::{DateTime, Datelike, Duration, Local, Utc};
 use human_format::{Formatter, Scales};
 use itertools::Itertools;
 use letterbox_shared::compute_color;
-use log::{debug, error, info};
+use log::error;
 use seed::{prelude::*, *};
 use seed_hooks::{state_access::CloneState, topo, use_state, StateAccessEventHandlers};
 use web_sys::{HtmlElement, HtmlInputElement};
@@ -21,6 +21,8 @@ use crate::{
 const MAX_RAW_MESSAGE_SIZE: usize = 100_000;
 
 mod tw_classes {
+    use seed::{prelude::*, *};
+
     pub const TAG: &[&str] = &[
         "rounded-md",
         "px-2",
@@ -37,22 +39,30 @@ mod tw_classes {
         "text-xs",
         "[text-shadow:_0_1px_0_rgb(0_0_0_/_40%)]",
     ];
-    pub const BUTTON: &[&str] = &[
-        "bg-neutral-900",
-        "rounded-md",
-        "p-2",
-        "border",
-        "border-neutral-700",
-        "text-center",
-        "text-sm",
-        "transition-all",
-        "shadow-md",
-        "hover:shadow-lg",
-        "hover:bg-neutral-700",
-        "disabled:pointer-events-none",
-        "disabled:opacity-50",
-        "disabled:shadow-none",
-    ];
+
+    // TODO: should this be a builder pattern?
+    pub fn button() -> seed::Attrs {
+        button_with_color("bg-neutral-900", "hover:bg-neutral-700")
+    }
+
+    pub fn button_with_color<T: ToClasses>(bg: T, hover: T) -> seed::Attrs {
+        C![
+            "rounded-md",
+            "p-2",
+            "border",
+            "border-neutral-700",
+            "text-center",
+            "text-sm",
+            "transition-all",
+            "shadow-md",
+            "hover:shadow-lg",
+            "disabled:pointer-events-none",
+            "disabled:opacity-50",
+            "disabled:shadow-none",
+            bg,
+            hover,
+        ]
+    }
 
     pub const CHECKBOX: &[&str] = &[
         "w-8",
@@ -83,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,
@@ -104,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,
@@ -188,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)
             ],
@@ -200,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",
@@ -213,17 +223,28 @@ fn catchup_view(
                 "p-4",
                 "border-t",
                 "border-gray-500",
-                "bg-black",
+                "bg-black/50",
             ],
             button![
-                C![&tw_classes::BUTTON],
-                "Keep unread",
-                ev(Ev::Click, move |_| Msg::CatchupKeepUnread)
+                tw_classes::button(),
+                span![i![C!["far", "fa-envelope"]]],
+                span![C!["pl-2"], "Keep unread"],
+                ev(Ev::Click, |_| Msg::CatchupKeepUnread)
             ],
             button![
-                C![&tw_classes::BUTTON, "bg-green-500"],
-                "Mark as read",
-                ev(Ev::Click, move |_| Msg::CatchupMarkAsRead)
+                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-green-700"),
+                span![i![C!["far", "fa-envelope-open"]]],
+                span![C!["pl-2"], "Mark as read"],
+                ev(Ev::Click, |_| Msg::CatchupMarkAsRead)
             ]
         ],
         reading_progress(read_completion_ratio)
@@ -445,7 +466,7 @@ fn search_toolbar(
         div![
             C!["gap-2", "flex", IF!(show_bulk_edit => "hidden")],
             div![button![
-                C![&tw_classes::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"],
@@ -474,14 +495,16 @@ fn search_toolbar(
             ],
             div![
                 button![
-                    C![&tw_classes::BUTTON, "rounded-r-none"],
+                    tw_classes::button(),
+                    C!["rounded-r-none"],
                     attrs! {At::Title => "Mark as read"},
                     span![i![C!["far", "fa-envelope-open"]]],
                     span![C!["pl-2", "hidden", "md:inline"], "Read"],
                     ev(Ev::Click, |_| Msg::SelectionMarkAsRead)
                 ],
                 button![
-                    C![&tw_classes::BUTTON, "rounded-l-none"],
+                    tw_classes::button(),
+                    C!["rounded-l-none"],
                     attrs! {At::Title => "Mark as unread"},
                     span![i![C!["far", "fa-envelope"]]],
                     span![C!["pl-2", "hidden", "md:inline"], "Unread"],
@@ -489,7 +512,8 @@ fn search_toolbar(
                 ]
             ],
             div![button![
-                C![&tw_classes::BUTTON, "text-red-500"],
+                tw_classes::button(),
+                C!["text-red-500"],
                 attrs! {At::Title => "Mark as spam"},
                 span![i![C!["far", "fa-hand"]]],
                 span![C!["pl-2", "hidden", "md:inline"], "Spam"],
@@ -503,13 +527,13 @@ fn search_toolbar(
             C!["flex", "gap-2", "items-center"],
             p![format!("{count} results")],
             button![
-                C![&tw_classes::BUTTON],
+                tw_classes::button(),
                 IF!(!pager.has_previous_page => attrs!{ At::Disabled=>true }),
                 "<",
                 IF!(pager.has_previous_page => ev(Ev::Click, |_| Msg::PreviousPage)),
             ],
             button![
-                C![&tw_classes::BUTTON],
+                tw_classes::button(),
                 IF!(!pager.has_next_page => attrs!{ At::Disabled=>true }),
                 ">",
                 IF!(pager.has_next_page => ev(Ev::Click, |_| Msg::NextPage))
@@ -1033,11 +1057,13 @@ fn render_attachements(
     ]
 }
 
+// TODO: add cathup_mode:bool and hide elements when true
 #[topo::nested]
 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() {
@@ -1065,16 +1091,17 @@ fn thread(
     let spam_add_thread_id = thread.thread_id.clone();
     let spam_unread_thread_id = thread.thread_id.clone();
     div![
-        C!["lg:p-4"],
+        C!["lg:p-4", "max-w-4xl"],
         div![
             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![
-                        C![&tw_classes::BUTTON, "rounded-r-none"],
+                        tw_classes::button(),
+                        C!["rounded-r-none"],
                         attrs! {At::Title => "Mark as read"},
                         span![i![C!["far", "fa-envelope-open"]]],
                         span![C!["pl-2"], "Read"],
@@ -1084,7 +1111,8 @@ fn thread(
                         ])),
                     ],
                     button![
-                        C![&tw_classes::BUTTON, "rounded-l-none"],
+                        tw_classes::button(),
+                        C!["rounded-l-none"],
                         attrs! {At::Title => "Mark as unread"},
                         span![i![C!["far", "fa-envelope"]]],
                         span![C!["pl-2"], "Unread"],
@@ -1095,7 +1123,8 @@ fn thread(
                     ],
                 ],
                 div![button![
-                    C![&tw_classes::BUTTON, "text-red-500"],
+                    tw_classes::button(),
+                    C!["text-red-500"],
                     attrs! {At::Title => "Spam"},
                     span![i![C!["far", "fa-hand"]]],
                     span![C!["pl-2"], "Spam"],
@@ -1105,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![
@@ -1161,7 +1190,7 @@ fn view_header(
         C!["flex", "px-4", "pt-4", "overflow-hidden"],
         a![
             C![IF![is_error => "bg-red-500"], "rounded-r-none"],
-            C![&tw_classes::BUTTON],
+            tw_classes::button(),
             span![i![C![
                 "fa-solid",
                 "fa-arrow-rotate-right",
@@ -1170,7 +1199,7 @@ fn view_header(
             ev(Ev::Click, |_| Msg::RefreshStart),
         ],
         a![
-            C![&tw_classes::BUTTON],
+            tw_classes::button(),
             C!["px-4", "rounded-none"],
             attrs! {
                 At::Href => urls::search(unread_query(), 0)
@@ -1178,7 +1207,7 @@ fn view_header(
             "Unread",
         ],
         a![
-            C![&tw_classes::BUTTON],
+            tw_classes::button(),
             C!["px-4", "rounded-none"],
             attrs! {
                 At::Href => urls::search("", 0)
@@ -1250,11 +1279,7 @@ pub fn view_tags(tags: &Option<Vec<Tag>>) -> Node<Msg> {
                 ],
                 IF!(t.unread>0 => format!("{}", t.unread))
             ],
-            ev(Ev::Click, |_| {
-                // Scroll window to the top when searching for a tag.
-                info!("scrolling to the top because you clicked a tag");
-                web_sys::window().unwrap().scroll_to_with_x_and_y(0., 0.);
-            })
+            ev(Ev::Click, |_| { Msg::ScrollToTop })
         ]
     }
     fn matches(a: &[&str], b: &[&str]) -> usize {
@@ -1334,7 +1359,13 @@ pub fn view_tags(tags: &Option<Vec<Tag>>) -> Node<Msg> {
         ]
     ]
 }
-fn news_post(post: &ShowThreadQueryThreadOnNewsPost, content_el: &ElRef<HtmlElement>) -> Node<Msg> {
+
+// TODO: add cathup_mode:bool and hide elements when true
+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();
@@ -1365,11 +1396,12 @@ 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![
-                        C![&tw_classes::BUTTON, "rounded-r-none"],
+                        tw_classes::button(),
+                        C!["rounded-r-none"],
                         attrs! {At::Title => "Mark as read"},
                         span![i![C!["far", "fa-envelope-open"]]],
                         span![C!["pl-2"], "Read"],
@@ -1379,7 +1411,8 @@ fn news_post(post: &ShowThreadQueryThreadOnNewsPost, content_el: &ElRef<HtmlElem
                         ])),
                     ],
                     button![
-                        C![&tw_classes::BUTTON, "rounded-l-none"],
+                        tw_classes::button(),
+                        C!["rounded-l-none"],
                         attrs! {At::Title => "Mark as unread"},
                         span![i![C!["far", "fa-envelope"]]],
                         span![C!["pl-2"], "Unread"],
@@ -1391,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"],
@@ -1411,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;
@@ -1454,7 +1486,7 @@ fn render_news_post_header(post: &ShowThreadQueryThreadOnNewsPost) -> Node<Msg>
                 div![
                     C!["flex", "gap-2", "pt-2", "text-sm"],
                     a![
-                        C![&tw_classes::BUTTON],
+                        tw_classes::button(),
                         attrs! {
                             At::Href => post.url,
                             At::Target => "_blank",
@@ -1463,7 +1495,7 @@ fn render_news_post_header(post: &ShowThreadQueryThreadOnNewsPost) -> Node<Msg>
                         i![C!["fas", "fa-up-right-from-square"]],
                     ],
                     a![
-                        C![&tw_classes::BUTTON],
+                        tw_classes::button(),
                         attrs! {
                             At::Href => add_archive_url,
                             At::Target => "_blank",
@@ -1472,7 +1504,7 @@ fn render_news_post_header(post: &ShowThreadQueryThreadOnNewsPost) -> Node<Msg>
                         i![C!["fas", "fa-plus"]],
                     ],
                     a![
-                        C![&tw_classes::BUTTON],
+                        tw_classes::button(),
                         attrs! {
                             At::Href => view_archive_url,
                             At::Target => "_blank",
@@ -1524,7 +1556,6 @@ fn reading_progress(ratio: f64) -> Node<Msg> {
     ]
 }
 pub fn view_versions(versions: &Version) -> Node<Msg> {
-    debug!("versions {versions:?}");
     aside![
         C!["p-2"],
         p![C!["uppercase", "font-bold"], "Versions"],
@@ -1539,11 +1570,10 @@ pub fn view_versions(versions: &Version) -> Node<Msg> {
 
 fn click_to_top() -> Node<Msg> {
     button![
-        C![&tw_classes::BUTTON, "bg-red-500", "lg:m-0", "m-4"],
+        tw_classes::button_with_color("bg-red-500", "hover:bg-neutral-700"),
+        C!["lg:m-0", "m-4"],
         span!["Top"],
         span![i![C!["fas", "fa-arrow-turn-up"]]],
-        ev(Ev::Click, |_| web_sys::window()
-            .unwrap()
-            .scroll_to_with_x_and_y(0., 0.))
+        ev(Ev::Click, |_| Msg::ScrollToTop)
     ]
 }