Cargo.lock

@@ -2965,7 +2965,7 @@ dependencies = [
 
 [[package]]
 name = "letterbox-notmuch"
-version = "0.9.8"
+version = "0.9.7"
 dependencies = [
  "itertools 0.14.0",
  "log",
@@ -2980,14 +2980,14 @@ dependencies = [
 
 [[package]]
 name = "letterbox-procmail2notmuch"
-version = "0.9.8"
+version = "0.9.7"
 dependencies = [
  "anyhow",
 ]
 
 [[package]]
 name = "letterbox-server"
-version = "0.9.8"
+version = "0.9.7"
 dependencies = [
  "ammonia",
  "anyhow",
@@ -3030,7 +3030,7 @@ dependencies = [
 
 [[package]]
 name = "letterbox-shared"
-version = "0.9.8"
+version = "0.9.7"
 dependencies = [
  "build-info",
  "letterbox-notmuch",
@@ -3039,7 +3039,7 @@ dependencies = [
 
 [[package]]
 name = "letterbox-web"
-version = "0.9.8"
+version = "0.9.7"
 dependencies = [
  "build-info",
  "build-info-build",

Cargo.toml

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

server/Cargo.toml

@@ -48,8 +48,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.9.8", path = "../notmuch", registry = "xinu" }
+letterbox-notmuch = { version = "0.9.7", path = "../notmuch", registry = "xinu" }
-letterbox-shared = { version = "0.9.8", path = "../shared", registry = "xinu" }
+letterbox-shared = { version = "0.9.7", path = "../shared", registry = "xinu" }
 
 [build-dependencies]
 build-info-build = "0.0.39"

shared/Cargo.toml

@@ -12,5 +12,5 @@ version.workspace = true
 
 [dependencies]
 build-info = "0.0.39"
-letterbox-notmuch = { version = "0.9.8", path = "../notmuch", registry = "xinu" }
+letterbox-notmuch = { version = "0.9.7", 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.9.8", path = "../shared", registry = "xinu" }
+letterbox-shared = { version = "0.9.7", path = "../shared", registry = "xinu" }
-letterbox-notmuch = { version = "0.9.8", path = "../notmuch", registry = "xinu" }
+letterbox-notmuch = { version = "0.9.7", path = "../notmuch", registry = "xinu" }
 seed_hooks = { version = "0.4.0", registry = "xinu" }
 strum_macros = "0.27.1"
 

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, true),
+                    thread(thread_data, open_messages, &model.content_el),
                     &catchup.items,
                     model.read_completion_ratio,
                 )
             } else {
                 normal_view(
-                    thread(thread_data, open_messages, &model.content_el, false),
+                    thread(thread_data, open_messages, &model.content_el),
                     &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, true),
+                    news_post(post, &model.content_el),
                     &catchup.items,
                     model.read_completion_ratio,
                 )
             } else {
                 normal_view(
-                    news_post(post, &model.content_el, false),
+                    news_post(post, &model.content_el),
                     &model.versions,
                     &model.query,
                     &model.refreshing_state,
@@ -199,10 +199,9 @@ fn catchup_view(
                 "border-b",
                 "border-gray-500",
                 "bg-black",
-                "opacity-50",
             ],
             div![
-                C!["absolute", "top-0", "right-4", "text-gray-500", "p-4"],
+                C!["absolute", "right-4", "text-gray-500"],
                 span![i![C!["fas", "fa-x"]]],
                 ev(Ev::Click, move |_| Msg::CatchupExit)
             ],
@@ -211,7 +210,7 @@ fn catchup_view(
                 format!("{} left ", items.iter().filter(|i| !i.seen).count(),)
             ]
         ],
-        div![C!["mt-12", "mb-20"], content],
+        div![C!["mt-12", "mb-4"], content],
         div![
             C![
                 "fixed",
@@ -225,7 +224,6 @@ fn catchup_view(
                 "border-t",
                 "border-gray-500",
                 "bg-black",
-                "opacity-50",
             ],
             button![
                 tw_classes::button(),
@@ -1056,7 +1054,6 @@ 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() {
@@ -1089,7 +1086,7 @@ fn thread(
             C!["p-4", "lg:p-0"],
             h3![C!["text-xl"], subject],
             span![removable_tags_chiclet(&thread.thread_id, &tags)],
-            IF!(!catchup_mode => div![
+            div![
                 C!["pt-4", "gap-2", "flex", "justify-around"],
                 div![
                     button![
@@ -1127,13 +1124,13 @@ fn thread(
                         Msg::GoToSearchResults
                     ])),
                 ]]
-            ]),
+            ],
         ],
         div![
             C!["lg:mt-4", "mail-thread"],
             el_ref(content_el),
             messages,
-            IF!(!catchup_mode => click_to_top())
+            click_to_top()
         ],
         /* TODO(wathiede): plumb in orignal id
         a![
@@ -1354,11 +1351,7 @@ pub fn view_tags(tags: &Option<Vec<Tag>>) -> Node<Msg> {
 }
 
 // TODO: add cathup_mode:bool and hide elements when true
-fn news_post(
+fn news_post(post: &ShowThreadQueryThreadOnNewsPost, content_el: &ElRef<HtmlElement>) -> Node<Msg> {
-    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();
@@ -1389,7 +1382,7 @@ fn news_post(
             C!["p-4", "lg:p-0"],
             h3![C!["text-xl"], subject],
             span![tag(format!("News/{}", post.slug))],
-            IF!(!catchup_mode => div![
+            div![
                 C!["pt-4", "gap-2", "flex", "justify-around"],
                 div![
                     button![
@@ -1417,7 +1410,7 @@ fn news_post(
                 ],
                 // Placeholder for symmetry with email view that has Spam button
                 div![],
-            ]),
+            ],
         ],
         div![
             C!["lg:mt-4"],
@@ -1437,11 +1430,12 @@ fn news_post(
                 raw![&post.body]
             ]
         ],
-        IF!(!catchup_mode => click_to_top()),
+        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;