Cargo.toml

@@ -8,7 +8,7 @@ authors = ["Bill Thiede <git@xinu.tv>"]
 edition = "2021"
 license = "UNLICENSED"
 publish = ["xinu"]
-version = "0.17.55"
+version = "0.17.43"
 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", registry = "xinu" }
+letterbox-notmuch = { version = "0.17.9", registry = "xinu" }
-letterbox-shared = { version = "0.17", registry = "xinu" }
+letterbox-shared = { version = "0.17.9", 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/.sqlx/query-3d271b404f06497a5dcde68cf6bf07291d70fa56058ea736ac24e91d33050c04.json

@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "SELECT\n    p.id,\n    link,\n    clean_summary\nFROM\n    post AS p\nINNER JOIN feed AS f ON p.site = f.slug -- necessary to weed out nzb posts\nWHERE\n    search_summary IS NULL\n    -- TODO remove AND link ~ '^<'\nORDER BY\n    ROW_NUMBER() OVER (PARTITION BY site ORDER BY date DESC)\nLIMIT 1000;\n",
+  "query": "SELECT\n    p.id,\n    link,\n    clean_summary\nFROM\n    post AS p\nINNER JOIN feed AS f ON p.site = f.slug -- necessary to weed out nzb posts\nWHERE\n    search_summary IS NULL\n    -- TODO remove AND link ~ '^<'\nORDER BY\n    ROW_NUMBER() OVER (PARTITION BY site ORDER BY date DESC)\nLIMIT 100;\n",
   "describe": {
     "columns": [
       {
@@ -28,5 +28,5 @@
       true
     ]
   },
-  "hash": "cf369e3d5547f400cb54004dd03783ef6998a000aec91c50a79405dcf1c53b17"
+  "hash": "3d271b404f06497a5dcde68cf6bf07291d70fa56058ea736ac24e91d33050c04"
 }

server/.sqlx/query-77f79f981a9736d18ffd4b87d3aec34d6a048162154a3aba833370c58a860795.json

@@ -1,14 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "DELETE FROM snooze WHERE id = $1",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Int4"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "77f79f981a9736d18ffd4b87d3aec34d6a048162154a3aba833370c58a860795"
-}

server/.sqlx/query-c8383663124a5cc5912b54553f18f7064d33087ebfdf3c0c1c43cbe6d3577084.json

@@ -1,26 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\nSELECT id, message_id\nFROM snooze\nWHERE wake < NOW();\n    ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "id",
-        "type_info": "Int4"
-      },
-      {
-        "ordinal": 1,
-        "name": "message_id",
-        "type_info": "Text"
-      }
-    ],
-    "parameters": {
-      "Left": []
-    },
-    "nullable": [
-      false,
-      false
-    ]
-  },
-  "hash": "c8383663124a5cc5912b54553f18f7064d33087ebfdf3c0c1c43cbe6d3577084"
-}

server/.sqlx/query-effd0d0d91e6ad84546f7177f1fd39d4fad736b471eb5e55fd5ac74f7adff664.json

@@ -1,15 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n        INSERT INTO snooze (message_id, wake)\n        VALUES ($1, $2)\n        ON CONFLICT (message_id) DO UPDATE\n        SET wake = $2\n    ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Text",
-        "Timestamptz"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "effd0d0d91e6ad84546f7177f1fd39d4fad736b471eb5e55fd5ac74f7adff664"
-}

server/Cargo.toml

@@ -13,27 +13,27 @@ version.workspace = true
 
 [dependencies]
 chrono-tz = "0.10"
-html2text = "0.16"
+html2text = "0.15"
 ammonia = "4.1.0"
 anyhow = "1.0.98"
 askama = { version = "0.14.0", features = ["derive"] }
-async-graphql = { version = "7", features = ["log", "chrono"] }
+async-graphql = { version = "7", features = ["log"] }
 async-graphql-axum = "7.0.16"
 async-trait = "0.1.88"
 axum = { version = "0.8.3", features = ["ws"] }
 axum-macros = "0.5.0"
-build-info = "0.0.42"
+build-info = "0.0.41"
 cacher = { version = "0.2.0", registry = "xinu" }
 chrono = "0.4.40"
 clap = { version = "4.5.37", features = ["derive"] }
-css-inline = "0.18.0"
+css-inline = "0.17.0"
 flate2 = "1.1.2"
 futures = "0.3.31"
 headers = "0.4.0"
 html-escape = "0.2.13"
 ical = "0.11"
-letterbox-notmuch = { path = "../notmuch", version = "0.17", registry = "xinu" }
+letterbox-notmuch = { path = "../notmuch", version = "0.17.43", registry = "xinu" }
-letterbox-shared = { path = "../shared", version = "0.17", registry = "xinu" }
+letterbox-shared = { path = "../shared", version = "0.17.43", registry = "xinu" }
 linkify = "0.10.0"
 lol_html = "2.3.0"
 mailparse = "0.16.1"
@@ -42,10 +42,10 @@ memmap = "0.7.0"
 quick-xml = { version = "0.38.1", features = ["serialize"] }
 regex = "1.11.1"
 reqwest = { version = "0.12.15", features = ["blocking"] }
-scraper = "0.25.0"
+scraper = "0.24.0"
 serde = { version = "1.0.219", features = ["derive"] }
 serde_json = "1.0.140"
-sqlx = { version = "0.8.5", features = ["postgres", "runtime-tokio", "chrono"] }
+sqlx = { version = "0.8.5", features = ["postgres", "runtime-tokio", "time"] }
 tantivy = { version = "0.25.0", optional = true }
 thiserror = "2.0.12"
 tokio = "1.44.2"
@@ -56,11 +56,11 @@ urlencoding = "2.1.3"
 #xtracing = { git = "http://git-private.h.xinu.tv/wathiede/xtracing.git" }
 #xtracing = { path = "../../xtracing" }
 xtracing = { version = "0.3.2", registry = "xinu" }
-zip = "6.0.0"
+zip = "4.3.0"
 
 
 [build-dependencies]
-build-info-build = "0.0.42"
+build-info-build = "0.0.41"
 
 [features]
 #default = [ "tantivy" ]

server/migrations/20250630023836_snooze.down.sql

@@ -1,2 +0,0 @@
--- Add down migration script here
-DROP TABLE IF EXISTS snooze;

server/migrations/20250630023836_snooze.up.sql

@@ -1,6 +0,0 @@
--- Add up migration script here
-CREATE TABLE IF NOT EXISTS snooze (
-    id integer NOT NULL GENERATED ALWAYS AS IDENTITY,
-    message_id text NOT NULL UNIQUE,
-    wake timestamptz NOT NULL
-);

server/sql/need-search-summary.sql

@@ -10,4 +10,4 @@ WHERE
     -- TODO remove AND link ~ '^<'
 ORDER BY
     ROW_NUMBER() OVER (PARTITION BY site ORDER BY date DESC)
-LIMIT 1000;
+LIMIT 100;

server/src/email_extract.rs

@@ -17,11 +17,9 @@ use crate::{
 const APPLICATION_GZIP: &'static str = "application/gzip";
 
 const APPLICATION_ZIP: &'static str = "application/zip";
-const APPLICATION_TLSRPT_GZIP: &'static str = "application/tlsrpt+gzip";
 const IMAGE_JPEG: &'static str = "image/jpeg";
 const IMAGE_PJPEG: &'static str = "image/pjpeg";
 const IMAGE_PNG: &'static str = "image/png";
-const MESSAGE_DELIVERY_STATUS: &'static str = "message/delivery-status";
 const MESSAGE_RFC822: &'static str = "message/rfc822";
 const MULTIPART_ALTERNATIVE: &'static str = "multipart/alternative";
 const MULTIPART_MIXED: &'static str = "multipart/mixed";
@@ -643,15 +641,19 @@ pub fn extract_gzip(m: &ParsedMail) -> Result<(Body, Option<String>), ServerErro
     Ok((extract_unhandled(m)?, None))
 }
 
-pub fn extract_report(m: &ParsedMail, part_addr: &mut Vec<String>) -> Result<Body, ServerError> {
+pub fn extract_report(m: &ParsedMail, _part_addr: &mut Vec<String>) -> Result<Body, ServerError> {
-    let mut parts = Vec::new();
+    let mut html_part = None;
-
+    let mut tlsrpt_part = None;
-    for (idx, sp) in m.subparts.iter().enumerate() {
-        part_addr.push(idx.to_string());
 
+    for sp in &m.subparts {
         match sp.ctype.mimetype.as_str() {
-            APPLICATION_TLSRPT_GZIP => {
+            TEXT_HTML => html_part = Some(sp.get_body()?),
-                let gz_bytes = sp.get_body_raw()?;
+            "application/tlsrpt+gzip" => tlsrpt_part = Some(sp.get_body_raw()?),
+            _ => {} // Ignore other parts for now
+        }
+    }
+
+    let tlsrpt_summary_html = if let Some(gz_bytes) = tlsrpt_part {
         let mut decoder = flate2::read::GzDecoder::new(&gz_bytes[..]);
         let mut buffer = Vec::new();
         if decoder.read_to_end(&mut buffer).is_ok() {
@@ -664,9 +666,7 @@ pub fn extract_report(m: &ParsedMail, part_addr: &mut Vec<String>) -> Result<Bod
                                 start_datetime: tlsrpt.date_range.start_datetime,
                                 end_datetime: tlsrpt.date_range.end_datetime,
                             },
-                                    contact_info: tlsrpt
+                            contact_info: tlsrpt.contact_info.unwrap_or_else(|| "".to_string()),
-                                        .contact_info
-                                        .unwrap_or_else(|| "".to_string()),
                             report_id: tlsrpt.report_id,
                             policies: tlsrpt
                                 .policies
@@ -682,20 +682,16 @@ pub fn extract_report(m: &ParsedMail, part_addr: &mut Vec<String>) -> Result<Bod
                                             .unwrap_or_else(|| Vec::new())
                                             .into_iter()
                                             .map(|mx| match mx {
-                                                        MxHost::String(s) => {
+                                                MxHost::String(s) => FormattedTlsRptMxHost {
-                                                            FormattedTlsRptMxHost {
                                                     hostname: s,
                                                     failure_count: 0,
                                                     result_type: "".to_string(),
-                                                            }
+                                                },
-                                                        }
+                                                MxHost::Object(o) => FormattedTlsRptMxHost {
-                                                        MxHost::Object(o) => {
-                                                            FormattedTlsRptMxHost {
                                                     hostname: o.hostname,
                                                     failure_count: o.failure_count,
                                                     result_type: o.result_type,
-                                                            }
+                                                },
-                                                        }
                                             })
                                             .collect(),
                                     },
@@ -715,8 +711,7 @@ pub fn extract_report(m: &ParsedMail, part_addr: &mut Vec<String>) -> Result<Bod
                                             receiving_mx_hostname: detail
                                                 .receiving_mx_hostname
                                                 .unwrap_or_else(|| "".to_string()),
-                                                    failed_session_count: detail
+                                            failed_session_count: detail.failed_session_count,
-                                                        .failed_session_count,
                                             additional_info: detail
                                                 .additional_info
                                                 .unwrap_or_else(|| "".to_string()),
@@ -731,98 +726,30 @@ pub fn extract_report(m: &ParsedMail, part_addr: &mut Vec<String>) -> Result<Bod
                         let template = TlsReportTemplate {
                             report: &formatted_tlsrpt,
                         };
-                                let html = template.render().unwrap_or_else(|e| format!("<div class=\"tlsrpt-error\">Failed to render TLS report template: {}</div>", e));
+                        template.render().unwrap_or_else(|e| format!("<div class=\"tlsrpt-error\">Failed to render TLS report template: {}</div>", e))
-                                parts.push(Body::html(html));
                     }
-                            Err(e) => {
+                    Err(e) => format!(
-                                let html = format!(
                         "<div class=\"tlsrpt-error\">Failed to parse TLS report JSON: {}</div>",
                         e
-                                );
+                    ),
-                                parts.push(Body::html(html));
-                            }
                 }
             } else {
-                        let html = format!("<div class=\"tlsrpt-error\">Failed to convert decompressed data to UTF-8.</div>");
+                format!("<div class=\"tlsrpt-error\">Failed to convert decompressed data to UTF-8.</div>")
-                        parts.push(Body::html(html));
             }
         } else {
-                    let html =
+            format!("<div class=\"tlsrpt-error\">Failed to decompressed data.</div>")
-                        format!("<div class=\"tlsrpt-error\">Failed to decompress data.</div>");
-                    parts.push(Body::html(html));
-                }
-            }
-            MESSAGE_RFC822 => {
-                parts.push(extract_rfc822(&sp, part_addr)?);
-            }
-            TEXT_HTML => {
-                let body = sp.get_body()?;
-                parts.push(Body::html(body));
-            }
-            MESSAGE_DELIVERY_STATUS => {
-                let body = extract_delivery_status(sp)?;
-                parts.push(body);
-            }
-            TEXT_PLAIN => {
-                let body = sp.get_body()?;
-                parts.push(Body::text(body));
-            }
-            _ => {
-                // For any other content type, try to extract the body using the general extract_body function
-                match extract_body(sp, part_addr) {
-                    Ok(body) => parts.push(body),
-                    Err(_) => {
-                        // If extraction fails, create an unhandled content type body
-                        let msg = format!(
-                            "Unhandled report subpart content type: {}\n{}",
-                            sp.ctype.mimetype,
-                            sp.get_body()
-                                .unwrap_or_else(|_| "Failed to get body".to_string())
-                        );
-                        parts.push(Body::UnhandledContentType(UnhandledContentType {
-                            text: msg,
-                            content_tree: render_content_type_tree(sp),
-                        }));
-                    }
-                }
-            }
         }
+    } else {
+        "".to_string()
+    };
 
-        part_addr.pop();
+    let final_html = if let Some(html) = html_part {
-    }
+        format!("{}<hr>{} ", html, tlsrpt_summary_html)
+    } else {
+        tlsrpt_summary_html
+    };
 
-    if parts.is_empty() {
+    Ok(Body::html(final_html))
-        return Ok(Body::html(
-            "<div class=\"report-error\">No report content found</div>".to_string(),
-        ));
-    }
-
-    // Add <hr> tags between subparts for better visual separation
-    let html = parts
-        .iter()
-        .map(|p| match p {
-            Body::PlainText(PlainText { text, .. }) => {
-                format!(
-                    r#"<p class="view-part-text-plain font-mono whitespace-pre-line">{}</p>"#,
-                    linkify_html(&html_escape::encode_text(text).trim_matches('\n'))
-                )
-            }
-            Body::Html(Html { html, .. }) => html.clone(),
-            Body::UnhandledContentType(UnhandledContentType { text, .. }) => {
-                format!(
-                    r#"<p class="view-part-unhandled">{}</p>"#,
-                    linkify_html(&html_escape::encode_text(text).trim_matches('\n'))
-                )
-            }
-        })
-        .collect::<Vec<_>>()
-        .join("<hr>\n");
-
-    Ok(Body::html(html))
-}
-
-pub fn extract_delivery_status(m: &ParsedMail) -> Result<Body, ServerError> {
-    Ok(Body::text(m.get_body()?))
 }
 
 pub fn extract_unhandled(m: &ParsedMail) -> Result<Body, ServerError> {
@@ -2230,28 +2157,28 @@ mod tests {
         let meta = extract_calendar_metadata_from_mail(&parsed, &body);
         // Assert detection as Google Calendar
         assert!(meta.is_google_calendar_event);
+        // Debug: print the rendered HTML for inspection
         let html = meta.body_html.expect("body_html");
-
-        // Print event date info for debugging
-        for part in parsed.subparts.iter() {
-            if part.ctype.mimetype == TEXT_CALENDAR {
-                if let Ok(ical) = part.get_body() {
-                    println!("ICAL data: {}", ical);
-                    if let Some(start) = ical.lines().find(|l| l.starts_with("DTSTART:")) {
-                        println!("Start date: {}", start);
-                    }
-                }
-            }
-        }
         println!("Rendered HTML: {}", html);
-
+        // Check that the calendar table highlights Thursday, not Friday
-        // Look for September 11 (Thursday) being highlighted
+        // Look for a table header row with days of week (allow whitespace)
-        // The calendar should show Sept 11 highlighted with background:#ffd700 and the correct data-event-day
+        let thursday_idx = html
-        assert!(html.contains(r#"data-event-day="2025-09-11""#));
+            .find(">\n                            Thu<")
-        assert!(html.contains(r#"background:#ffd700"#));
+            .or_else(|| html.find(">Thu<"))
-
+            .expect("Should have a Thursday column");
-        // Since 1:00 AM UTC on Friday 9/12 is 6:00 PM PDT on Thursday 9/11, verify times are correct
+        let friday_idx = html
-        assert!(html.contains("6:00 PM Thu Sep 11, 2025"));
+            .find(">\n                            Fri<")
+            .or_else(|| html.find(">Fri<"))
+            .expect("Should have a Friday column");
+        // Find the first highlighted cell (background:#ffd700)
+        let highlight_idx = html
+            .find("background:#ffd700")
+            .expect("Should highlight a day");
+        // The highlight should be closer to Thursday than Friday
+        assert!(
+            highlight_idx > thursday_idx && highlight_idx < friday_idx,
+            "Thursday should be highlighted, not Friday"
+        );
     }
     use super::*;
     #[test]

server/src/graphql.rs

@@ -7,7 +7,6 @@ use async_graphql::{
     Union,
 };
 use cacher::FilesystemCacher;
-use chrono::{DateTime, Utc};
 use futures::stream;
 use letterbox_notmuch::Notmuch;
 use serde::{Deserialize, Serialize};
@@ -629,42 +628,6 @@ impl MutationRoot {
         nm.tag_remove(&tag, &query)?;
         Ok(true)
     }
-    #[instrument(skip_all, fields(query=query, wake_time=wake_time.to_string(), rid=request_id()))]
-    async fn snooze<'ctx>(
-        &self,
-        ctx: &Context<'ctx>,
-        query: String,
-        wake_time: DateTime<Utc>,
-    ) -> Result<bool, Error> {
-        info!("TODO snooze {query} until {wake_time})");
-        let pool = ctx.data_unchecked::<PgPool>();
-        sqlx::query!(
-            r#"
-        INSERT INTO snooze (message_id, wake)
-        VALUES ($1, $2)
-        ON CONFLICT (message_id) DO UPDATE
-        SET wake = $2
-    "#,
-            query,
-            wake_time
-        )
-        .execute(pool)
-        .await?;
-
-        let nm = ctx.data_unchecked::<Notmuch>();
-        let pool = ctx.data_unchecked::<PgPool>();
-        #[cfg(feature = "tantivy")]
-        let tantivy = ctx.data_unchecked::<TantivyConnection>();
-
-        let unread = false;
-        let query: Query = query.parse()?;
-        newsreader::set_read_status(pool, &query, unread).await?;
-        #[cfg(feature = "tantivy")]
-        tantivy.reindex_thread(pool, &query).await?;
-        nm::set_read_status(nm, &query, unread).await?;
-
-        Ok(true)
-    }
     /// Drop and recreate tantivy index. Warning this is slow
     #[cfg(feature = "tantivy")]
     async fn drop_and_load_index<'ctx>(&self, ctx: &Context<'ctx>) -> Result<bool, Error> {
@@ -676,18 +639,6 @@ impl MutationRoot {
 
         Ok(true)
     }
-    #[instrument(skip_all, fields(rid=request_id()))]
-    async fn label_unprocessed<'ctx>(
-        &self,
-        ctx: &Context<'ctx>,
-        limit: Option<usize>,
-    ) -> Result<bool, Error> {
-        let nm = ctx.data_unchecked::<Notmuch>();
-        let pool = ctx.data_unchecked::<PgPool>();
-        label_unprocessed(&nm, &pool, false, limit, "tag:unprocessed").await?;
-        Ok(true)
-    }
-
     #[instrument(skip_all, fields(rid=request_id()))]
     async fn refresh<'ctx>(&self, ctx: &Context<'ctx>) -> Result<bool, Error> {
         let nm = ctx.data_unchecked::<Notmuch>();
@@ -697,10 +648,7 @@ impl MutationRoot {
         newsreader::refresh(pool, cacher).await?;
 
         // Process email labels
-        label_unprocessed(&nm, &pool, false, Some(1000), "tag:unprocessed").await?;
+        label_unprocessed(&nm, &pool, false, Some(10), "tag:unprocessed").await?;
-
-        // Look for snoozed messages and mark unread
-        wakeup(&nm, &pool).await?;
 
         #[cfg(feature = "tantivy")]
         {
@@ -722,33 +670,6 @@ impl SubscriptionRoot {
 
 pub type GraphqlSchema = Schema<QueryRoot, MutationRoot, SubscriptionRoot>;
 
-#[instrument(name = "wakeup", skip_all)]
-pub async fn wakeup(nm: &Notmuch, pool: &PgPool) -> Result<(), Error> {
-    for row in sqlx::query!(
-        r#"
-SELECT id, message_id
-FROM snooze
-WHERE wake < NOW();
-    "#
-    )
-    .fetch_all(pool)
-    .await?
-    {
-        let query: Query = row.message_id.parse()?;
-        info!("need to wake {query}");
-        let unread = true;
-        newsreader::set_read_status(pool, &query, unread).await?;
-        #[cfg(feature = "tantivy")]
-        tantivy.reindex_thread(pool, &query).await?;
-        nm::set_read_status(nm, &query, unread).await?;
-
-        sqlx::query!("DELETE FROM snooze WHERE id = $1", row.id)
-            .execute(pool)
-            .await?;
-    }
-    Ok(())
-}
-
 #[instrument(skip_all, fields(query=query))]
 pub async fn compute_catchup_ids(
     nm: &Notmuch,

server/src/lib.rs

@@ -19,7 +19,6 @@ use std::{
 
 use async_trait::async_trait;
 use cacher::{Cacher, FilesystemCacher};
-use chrono::NaiveDateTime;
 use css_inline::{CSSInliner, InlineError, InlineOptions};
 pub use error::ServerError;
 use linkify::{LinkFinder, LinkKind};
@@ -31,6 +30,7 @@ use maplit::{hashmap, hashset};
 use regex::Regex;
 use reqwest::StatusCode;
 use scraper::{Html, Selector};
+use sqlx::types::time::PrimitiveDateTime;
 use thiserror::Error;
 use tracing::{debug, error, info, warn};
 use url::Url;
@@ -754,7 +754,6 @@ pub struct Query {
     pub is_notmuch: bool,
     pub is_newsreader: bool,
     pub is_tantivy: bool,
-    pub is_snoozed: bool,
     pub corpus: Option<Corpus>,
 }
 
@@ -778,9 +777,6 @@ impl fmt::Display for Query {
         if self.is_newsreader {
             write!(f, "is:news ")?;
         }
-        if self.is_snoozed {
-            write!(f, "is:snoozed ")?;
-        }
         match self.corpus {
             Some(c) => write!(f, "corpus:{c:?}")?,
             _ => (),
@@ -837,7 +833,6 @@ impl FromStr for Query {
         let mut is_notmuch = false;
         let mut is_newsreader = false;
         let mut is_tantivy = false;
-        let mut is_snoozed = false;
         let mut corpus = None;
         for word in s.split_whitespace() {
             if word == "is:unread" {
@@ -877,8 +872,6 @@ impl FromStr for Query {
                 is_newsreader = true;
             } else if word == "is:newsreader" {
                 is_newsreader = true;
-            } else if word == "is:snoozed" {
-                is_snoozed = true;
             } else {
                 remainder.push(word.to_string());
             }
@@ -897,14 +890,13 @@ impl FromStr for Query {
             is_notmuch,
             is_newsreader,
             is_tantivy,
-            is_snoozed,
             corpus,
         })
     }
 }
 pub struct ThreadSummaryRecord {
     pub site: Option<String>,
-    pub date: Option<NaiveDateTime>,
+    pub date: Option<PrimitiveDateTime>,
     pub is_read: Option<bool>,
     pub title: Option<String>,
     pub uid: String,
@@ -922,7 +914,11 @@ async fn thread_summary_from_row(r: ThreadSummaryRecord) -> ThreadSummary {
     title = clean_title(&title).await.expect("failed to clean title");
     ThreadSummary {
         thread: format!("{NEWSREADER_THREAD_PREFIX}{}", r.uid),
-        timestamp: r.date.expect("post missing date").and_utc().timestamp() as isize,
+        timestamp: r
+            .date
+            .expect("post missing date")
+            .assume_utc()
+            .unix_timestamp() as isize,
         date_relative: format!("{:?}", r.date),
         //date_relative: "TODO date_relative".to_string(),
         matched: 0,

server/src/newsreader.rs

@@ -6,7 +6,7 @@ use letterbox_shared::compute_color;
 use maplit::hashmap;
 use scraper::Selector;
 use sqlx::postgres::PgPool;
-use tracing::{error, info, instrument, warn};
+use tracing::{error, info, instrument};
 use url::Url;
 
 use crate::{
@@ -86,10 +86,6 @@ pub async fn search(
     query: &Query,
 ) -> Result<Vec<(i32, ThreadSummary)>, async_graphql::Error> {
     info!("search({after:?} {before:?} {first:?} {last:?} {query:?}");
-    if query.is_snoozed {
-        warn!("TODO implement snooze for newsreader::search");
-        return Ok(Vec::new());
-    }
     if !is_newsreader_query(query) {
         return Ok(Vec::new());
     }
@@ -215,7 +211,11 @@ pub async fn thread(
     }
     let title = clean_title(&r.title.unwrap_or("NO TITLE".to_string())).await?;
     let is_read = r.is_read.unwrap_or(false);
-    let timestamp = r.date.expect("post missing date").and_utc().timestamp();
+    let timestamp = r
+        .date
+        .expect("post missing date")
+        .assume_utc()
+        .unix_timestamp();
     Ok(Thread::News(NewsPost {
         thread_id,
         is_read,

server/src/nm.rs

@@ -64,10 +64,6 @@ pub async fn search(
     last: Option<i32>,
     query: &Query,
 ) -> Result<Vec<(i32, ThreadSummary)>, async_graphql::Error> {
-    if query.is_snoozed {
-        warn!("TODO implement snooze for nm::search");
-        return Ok(Vec::new());
-    }
     if !is_notmuch_query(query) {
         return Ok(Vec::new());
     }

server/templates/ical_summary.html

@@ -74,7 +74,13 @@
                         {% for week in all_days|batch(7) %}
                         <tr>
                             {% for day in week %}
-                            {% if event_days.contains(day) %}
+                            {% if event_days.contains(day) && today.is_some() && today.unwrap() == day %}
+                            <td
+                                data-event-day="{{ day.format("%Y-%m-%d") }}"
+                                style="background:#ffd700; color:#222; font-weight:bold; border:2px solid #2196f3; border-radius:4px; text-align:center; box-shadow:0 0 0 2px #2196f3;">
+                                {{ day.day() }}
+                            </td>
+                            {% elif event_days.contains(day) %}
                             <td
                                 data-event-day="{{ day.format("%Y-%m-%d") }}"
                                 style="background:#ffd700; color:#222; font-weight:bold; border:1px solid #aaa; border-radius:4px; text-align:center;">

shared/Cargo.toml

@@ -11,8 +11,8 @@ version.workspace = true
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-build-info = "0.0.42"
+build-info = "0.0.41"
-letterbox-notmuch = { path = "../notmuch", version = "0.17", registry = "xinu" }
+letterbox-notmuch = { path = "../notmuch", version = "0.17.43", registry = "xinu" }
 regex = "1.11.1"
 serde = { version = "1.0.219", features = ["derive"] }
 sqlx = "0.8.5"

web/Cargo.toml

@@ -9,10 +9,10 @@ repository.workspace = true
 version.workspace = true
 
 [build-dependencies]
-build-info-build = "0.0.42"
+build-info-build = "0.0.41"
 
 [dev-dependencies]
-#wasm-bindgen-test = "0.3.50"
+wasm-bindgen-test = "0.3.50"
 
 [dependencies]
 console_error_panic_hook = "0.1.7"
@@ -24,16 +24,16 @@ serde = { version = "1.0.219", features = ["derive"] }
 itertools = "0.14.0"
 serde_json = { version = "1.0.140", features = ["unbounded_depth"] }
 chrono = "0.4.40"
-graphql_client = "0.15.0"
+graphql_client = "0.14.0"
 thiserror = "2.0.12"
 gloo-net = { version = "0.6.0", features = ["json", "serde_json"] }
 human_format = "1.1.0"
-build-info = "0.0.42"
+build-info = "0.0.41"
 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", registry = "xinu" }
+letterbox-shared = { path = "../shared/", version = "0.17.43", registry = "xinu" }
 seed_hooks = { version = "0.4.1", registry = "xinu" }
 strum_macros = "0.27.1"
 gloo-console = "0.3.0"

web/graphql/schema.json

@@ -51,7 +51,7 @@
         },
         {
           "args": [],
-          "description": "Indicates that an Input Object is a OneOf Input Object (and thus requires exactly one of its field be provided)",
+          "description": "Indicates that an Input Object is a OneOf Input Object (and thus requires\n                        exactly one of its field be provided)",
           "locations": [
             "INPUT_OBJECT"
           ],
@@ -107,14 +107,12 @@
         }
       ],
       "mutationType": {
-        "name": "MutationRoot"
+        "name": "Mutation"
       },
       "queryType": {
         "name": "QueryRoot"
       },
-      "subscriptionType": {
+      "subscriptionType": null,
-        "name": "SubscriptionRoot"
-      },
       "types": [
         {
           "description": null,
@@ -316,16 +314,6 @@
           "name": "Corpus",
           "possibleTypes": null
         },
-        {
-          "description": "Implement the DateTime<Utc> scalar\n\nThe input/output is a string in RFC3339 format.",
-          "enumValues": null,
-          "fields": null,
-          "inputFields": null,
-          "interfaces": null,
-          "kind": "SCALAR",
-          "name": "DateTime",
-          "possibleTypes": null
-        },
         {
           "description": null,
           "enumValues": [
@@ -981,51 +969,6 @@
                 }
               }
             },
-            {
-              "args": [
-                {
-                  "defaultValue": null,
-                  "description": null,
-                  "name": "query",
-                  "type": {
-                    "kind": "NON_NULL",
-                    "name": null,
-                    "ofType": {
-                      "kind": "SCALAR",
-                      "name": "String",
-                      "ofType": null
-                    }
-                  }
-                },
-                {
-                  "defaultValue": null,
-                  "description": null,
-                  "name": "wakeTime",
-                  "type": {
-                    "kind": "NON_NULL",
-                    "name": null,
-                    "ofType": {
-                      "kind": "SCALAR",
-                      "name": "DateTime",
-                      "ofType": null
-                    }
-                  }
-                }
-              ],
-              "deprecationReason": null,
-              "description": null,
-              "isDeprecated": false,
-              "name": "snooze",
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "Boolean",
-                  "ofType": null
-                }
-              }
-            },
             {
               "args": [],
               "deprecationReason": null,
@@ -1046,7 +989,7 @@
           "inputFields": null,
           "interfaces": [],
           "kind": "OBJECT",
-          "name": "MutationRoot",
+          "name": "Mutation",
           "possibleTypes": null
         },
         {
@@ -1531,33 +1474,6 @@
           "name": "String",
           "possibleTypes": null
         },
-        {
-          "description": null,
-          "enumValues": null,
-          "fields": [
-            {
-              "args": [],
-              "deprecationReason": null,
-              "description": null,
-              "isDeprecated": false,
-              "name": "values",
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "Int",
-                  "ofType": null
-                }
-              }
-            }
-          ],
-          "inputFields": null,
-          "interfaces": [],
-          "kind": "OBJECT",
-          "name": "SubscriptionRoot",
-          "possibleTypes": null
-        },
         {
           "description": null,
           "enumValues": null,

web/graphql/snooze.graphql

@@ -1,4 +0,0 @@
-
-mutation SnoozeMutation($query: String!, $wakeTime: DateTime!) {
-  snooze(query: $query, wakeTime: $wakeTime)
-} 

web/graphql/update_schema.sh

@@ -1,4 +1,4 @@
 DEV_HOST=localhost
 DEV_PORT=9345
-graphql-client introspect-schema http://${DEV_HOST:?}:${DEV_PORT:?}/api/graphql/ --output schema.json
+graphql-client introspect-schema http://${DEV_HOST:?}:${DEV_PORT:?}/api/graphql --output schema.json
 git diff schema.json

web/src/graphql.rs

@@ -1,9 +1,7 @@
-use chrono::Utc;
 use gloo_net::{http::Request, Error};
 use graphql_client::GraphQLQuery;
 use serde::{de::DeserializeOwned, Serialize};
 
-type DateTime = chrono::DateTime<Utc>;
 // The paths are relative to the directory where your `Cargo.toml` is located.
 // Both json and the GraphQL schema language are supported as sources for the schema
 #[derive(GraphQLQuery)]
@@ -54,14 +52,6 @@ pub struct AddTagMutation;
 )]
 pub struct RemoveTagMutation;
 
-#[derive(GraphQLQuery)]
-#[graphql(
-    schema_path = "graphql/schema.json",
-    query_path = "graphql/snooze.graphql",
-    response_derives = "Debug"
-)]
-pub struct SnoozeMutation;
-
 #[derive(GraphQLQuery)]
 #[graphql(
     schema_path = "graphql/schema.json",

web/src/state.rs

@@ -1,6 +1,5 @@
 use std::collections::HashSet;
 
-use chrono::{DateTime, Utc};
 use graphql_client::GraphQLQuery;
 use letterbox_shared::WebsocketMessage;
 use log::{debug, error, info, warn};
@@ -260,29 +259,6 @@ pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg>) {
                 Msg::GoToSearchResults
             });
         }
-        Msg::Snooze(query, wake_time) => {
-            let is_catchup = model.catchup.is_some();
-            orders.skip().perform_cmd(async move {
-                let res: Result<
-                    graphql_client::Response<graphql::snooze_mutation::ResponseData>,
-                    gloo_net::Error,
-                > = send_graphql(graphql::SnoozeMutation::build_query(
-                    graphql::snooze_mutation::Variables {
-                        query: query.clone(),
-                        wake_time,
-                    },
-                ))
-                .await;
-                if let Err(e) = res {
-                    error!("Failed to snooze {query} until {wake_time}: {e}");
-                }
-                if is_catchup {
-                    Msg::CatchupMarkAsRead
-                } else {
-                    Msg::GoToSearchResults
-                }
-            });
-        }
 
         Msg::FrontPageRequest {
             query,
@@ -291,7 +267,6 @@ 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
@@ -317,32 +292,25 @@ pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg>) {
             });
         }
         Msg::FrontPageResult(Err(e)) => {
-            let msg = format!("error FrontPageResult: {e:?}");
+            error!("error FrontPageResult: {e:?}");
-            error!("{msg}");
-            model.refreshing_state = RefreshingState::Error(msg);
         }
         Msg::FrontPageResult(Ok(graphql_client::Response {
             data: None,
             errors: None,
             ..
         })) => {
-            let msg = format!("FrontPageResult no data or errors, should not happen");
+            error!("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),
             ..
         })) => {
-            let msg = format!("FrontPageResult error: {e:?}");
+            error!("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()
@@ -382,7 +350,6 @@ 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(
@@ -395,7 +362,6 @@ 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()
@@ -435,12 +401,9 @@ pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg>) {
             orders.send_msg(Msg::WindowScrolled);
         }
         Msg::ShowThreadResult(bad) => {
-            let msg = format!("show_thread_query error: {bad:#?}");
+            error!("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>(
@@ -455,7 +418,6 @@ 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);
@@ -471,9 +433,7 @@ pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg>) {
             }
         }
         Msg::CatchupResult(bad) => {
-            let msg = format!("catchup_query error: {bad:#?}");
+            error!("catchup_query error: {bad:#?}");
-            error!("{msg}");
-            model.refreshing_state = RefreshingState::Error(msg);
         }
         Msg::SelectionSetNone => {
             if let Context::SearchResult {
@@ -853,7 +813,6 @@ pub enum Msg {
     SetUnread(String, bool),
     AddTag(String, String),
     RemoveTag(String, String),
-    Snooze(String, DateTime<Utc>),
 
     FrontPageRequest {
         query: String,

web/src/view/mod.rs

@@ -78,16 +78,13 @@ 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 {
@@ -96,23 +93,17 @@ pub fn view(model: &Model) -> Node<Msg> {
         } => {
             if let Some(catchup) = &model.catchup {
                 catchup_view(
-                    thread(thread_data, open_messages, &model.content_el, true, 0.),
+                    thread(thread_data, open_messages, &model.content_el, true),
                     &catchup.items,
-                    is_loading,
                     model.read_completion_ratio,
                 )
             } else {
                 normal_view(
-                    thread(
+                    thread(thread_data, open_messages, &model.content_el, false),
-                        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,
                 )
             }
@@ -123,17 +114,17 @@ pub fn view(model: &Model) -> Node<Msg> {
         } => {
             if let Some(catchup) = &model.catchup {
                 catchup_view(
-                    news_post(post, &model.content_el, true, 0.),
+                    news_post(post, &model.content_el, true),
                     &catchup.items,
-                    is_loading,
                     model.read_completion_ratio,
                 )
             } else {
                 normal_view(
-                    news_post(post, &model.content_el, false, model.read_completion_ratio),
+                    news_post(post, &model.content_el, false),
                     &model.versions,
                     &model.query,
                     &model.refreshing_state,
+                    model.read_completion_ratio,
                     &model.tags,
                 )
             }
@@ -149,6 +140,7 @@ pub fn view(model: &Model) -> Node<Msg> {
             &model.versions,
             &model.query,
             &model.refreshing_state,
+            model.read_completion_ratio,
             &model.tags,
         ),
     }
@@ -159,6 +151,7 @@ fn normal_view(
     versions: &Version,
     query: &str,
     refreshing_state: &RefreshingState,
+    read_completion_ratio: f64,
     tags: &Option<Vec<Tag>>,
 ) -> Node<Msg> {
     div![
@@ -185,13 +178,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![
@@ -207,35 +200,14 @@ fn catchup_view(
                 "border-gray-500",
                 "bg-black/50",
             ],
-            div![
-                C!["absolute", "top-0", "left-4", "text-green-200", "p-4"],
-                IF!(is_loading=>span![i![C!["animate-spin", "fas", "fa-spinner"]]])
-            ],
-            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![
+            h1![
-                C![
+                C!["text-center"],
-                    "absolute",
+                format!("{} left ", items.iter().filter(|i| !i.seen).count(),)
-                    "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],
@@ -275,6 +247,7 @@ fn catchup_view(
                 ev(Ev::Click, |_| Msg::CatchupMarkAsRead)
             ]
         ],
+        reading_progress(read_completion_ratio)
     ]
 }
 
@@ -351,8 +324,8 @@ fn search_results(
                     attrs! {
                         At::Href => urls::thread(&tid)
                     },
-                    div![C!["line-clamp-2"], title_break, &r.subject],
+                    div![title_break, &r.subject],
-                    span![C!["line-clamp-2", "text-xs"], pretty_authors(&r.authors)],
+                    span![C!["text-xs"], pretty_authors(&r.authors)],
                     div![
                         C!["flex", "flex-wrap", "justify-between"],
                         span![tags_chiclet(&tags)],
@@ -754,11 +727,9 @@ fn render_open_header(msg: &ShowThreadQueryThreadOnEmailThreadMessages) -> Node<
         C!["flex", "p-4", "bg-neutral-800"],
         div![avatar],
         div![
-            C!["px-4", "flex-1"],
+            C!["px-4", "mr-auto"],
-            div![
+            span![
-                C!["flex"],
+                C!["font-semibold", "text-sm"],
-                div![
-                    C!["font-semibold", "text-sm", "flex-1"],
                 from_detail.as_ref().map(|addr| attrs! {
                     At::Title => addr
                 }),
@@ -766,8 +737,6 @@ fn render_open_header(msg: &ShowThreadQueryThreadOnEmailThreadMessages) -> Node<
                 " ",
                 from_detail.as_ref().map(|text| copy_text_widget(&text))
             ],
-                snooze_buttons(msg.timestamp, &id),
-            ],
             IF!(!msg.to.is_empty() =>div![
                 C!["text-xs"],
                 span![
@@ -1175,7 +1144,6 @@ 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() {
@@ -1260,8 +1228,7 @@ fn thread(
             el_ref(content_el),
             messages,
             IF!(!catchup_mode => click_to_top())
-        ],
+        ]
-        reading_progress(read_completion_ratio)
     ]
 }
 
@@ -1404,7 +1371,7 @@ pub fn view_tags(tags: &Option<Vec<Tag>>) -> Node<Msg> {
                 },
             ],
             a![
-                C![indent_cls, "grow", "truncate"],
+                C!["grow", "truncate"],
                 attrs! {
                     At::Href => href
                 },
@@ -1505,7 +1472,6 @@ 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);
@@ -1593,7 +1559,6 @@ fn news_post(
             ]
         ],
         IF!(!catchup_mode => click_to_top()),
-        reading_progress(read_completion_ratio)
     ]
 }
 fn render_news_post_header(post: &ShowThreadQueryThreadOnNewsPost) -> Node<Msg> {
@@ -1629,13 +1594,9 @@ fn render_news_post_header(post: &ShowThreadQueryThreadOnNewsPost) -> Node<Msg>
         C!["flex", "p-4", "bg-neutral-800"],
         div![favicon],
         div![
-            C!["px-4", "mr-auto", "flex-1"],
+            C!["px-4", "mr-auto"],
             div![
-                div![
+                div![C!["font-semibold", "text-sm"], from],
-                    C!["flex"],
-                    div![C!["font-semibold", "text-sm", "flex-1"], from],
-                    snooze_buttons(Some(post.timestamp), &id),
-                ],
                 div![
                     C!["flex", "gap-2", "pt-2", "text-sm"],
                     a![
@@ -1730,47 +1691,3 @@ fn click_to_top() -> Node<Msg> {
         ev(Ev::Click, |_| Msg::ScrollToTop)
     ]
 }
-
-fn snooze_buttons(timestamp: Option<i64>, id: &str) -> Node<Msg> {
-    div![
-        span![C!["px-2"], "⏰"],
-        button![
-            tw_classes::button(),
-            C!["rounded-r-none"],
-            "1d",
-            ev(Ev::Click, {
-                let id = id.to_string();
-                move |e| {
-                    e.stop_propagation();
-                    Msg::Snooze(id, Utc::now() + chrono::Days::new(1))
-                }
-            })
-        ],
-        button![
-            tw_classes::button(),
-            C!["rounded-none"],
-            "7d",
-            ev(Ev::Click, {
-                let id = id.to_string();
-                move |e| {
-                    e.stop_propagation();
-                    Msg::Snooze(id, Utc::now() + chrono::Days::new(7))
-                }
-            })
-        ],
-        timestamp.map(
-            |ts| chrono::DateTime::from_timestamp(ts, 0).map(|ts| button![
-                tw_classes::button(),
-                C!["rounded-l-none"],
-                "+6m",
-                ev(Ev::Click, {
-                    let id = id.to_string();
-                    move |e| {
-                        e.stop_propagation();
-                        Msg::Snooze(id, ts + chrono::Days::new(180))
-                    }
-                })
-            ])
-        ),
-    ]
-}