fix(deps): update all non-major dependencies

Cargo.toml

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

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-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,11 +13,11 @@ 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"] }
@@ -26,14 +26,14 @@ build-info = "0.0.42"
 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.48", registry = "xinu" }
+letterbox-notmuch = { path = "../notmuch", version = "0.17.44", registry = "xinu" }
-letterbox-shared = { path = "../shared", version = "0.17.48", registry = "xinu" }
+letterbox-shared = { path = "../shared", version = "0.17.44", registry = "xinu" }
 linkify = "0.10.0"
 lol_html = "2.3.0"
 mailparse = "0.16.1"
@@ -45,7 +45,7 @@ reqwest = { version = "0.12.15", features = ["blocking"] }
 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"

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,186 +641,115 @@ 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()?),
-                let mut decoder = flate2::read::GzDecoder::new(&gz_bytes[..]);
+            _ => {} // Ignore other parts for now
-                let mut buffer = Vec::new();
+        }
-                if decoder.read_to_end(&mut buffer).is_ok() {
+    }
-                    if let Ok(json_str) = String::from_utf8(buffer) {
+
-                        match serde_json::from_str::<TlsRpt>(&json_str) {
+    let tlsrpt_summary_html = if let Some(gz_bytes) = tlsrpt_part {
-                            Ok(tlsrpt) => {
+        let mut decoder = flate2::read::GzDecoder::new(&gz_bytes[..]);
-                                let formatted_tlsrpt = FormattedTlsRpt {
+        let mut buffer = Vec::new();
-                                    organization_name: tlsrpt.organization_name,
+        if decoder.read_to_end(&mut buffer).is_ok() {
-                                    date_range: FormattedTlsRptDateRange {
+            if let Ok(json_str) = String::from_utf8(buffer) {
-                                        start_datetime: tlsrpt.date_range.start_datetime,
+                match serde_json::from_str::<TlsRpt>(&json_str) {
-                                        end_datetime: tlsrpt.date_range.end_datetime,
+                    Ok(tlsrpt) => {
+                        let formatted_tlsrpt = FormattedTlsRpt {
+                            organization_name: tlsrpt.organization_name,
+                            date_range: FormattedTlsRptDateRange {
+                                start_datetime: tlsrpt.date_range.start_datetime,
+                                end_datetime: tlsrpt.date_range.end_datetime,
+                            },
+                            contact_info: tlsrpt.contact_info.unwrap_or_else(|| "".to_string()),
+                            report_id: tlsrpt.report_id,
+                            policies: tlsrpt
+                                .policies
+                                .into_iter()
+                                .map(|policy| FormattedTlsRptPolicy {
+                                    policy: FormattedTlsRptPolicyDetails {
+                                        policy_type: policy.policy.policy_type,
+                                        policy_string: policy.policy.policy_string,
+                                        policy_domain: policy.policy.policy_domain,
+                                        mx_host: policy
+                                            .policy
+                                            .mx_host
+                                            .unwrap_or_else(|| Vec::new())
+                                            .into_iter()
+                                            .map(|mx| match mx {
+                                                MxHost::String(s) => FormattedTlsRptMxHost {
+                                                    hostname: s,
+                                                    failure_count: 0,
+                                                    result_type: "".to_string(),
+                                                },
+                                                MxHost::Object(o) => FormattedTlsRptMxHost {
+                                                    hostname: o.hostname,
+                                                    failure_count: o.failure_count,
+                                                    result_type: o.result_type,
+                                                },
+                                            })
+                                            .collect(),
                                     },
-                                    contact_info: tlsrpt
+                                    summary: policy.summary,
-                                        .contact_info
+                                    failure_details: policy
-                                        .unwrap_or_else(|| "".to_string()),
+                                        .failure_details
-                                    report_id: tlsrpt.report_id,
+                                        .unwrap_or_else(|| Vec::new())
-                                    policies: tlsrpt
-                                        .policies
                                         .into_iter()
-                                        .map(|policy| FormattedTlsRptPolicy {
+                                        .map(|detail| FormattedTlsRptFailureDetails {
-                                            policy: FormattedTlsRptPolicyDetails {
+                                            result_type: detail.result_type,
-                                                policy_type: policy.policy.policy_type,
+                                            sending_mta_ip: detail
-                                                policy_string: policy.policy.policy_string,
+                                                .sending_mta_ip
-                                                policy_domain: policy.policy.policy_domain,
+                                                .unwrap_or_else(|| "".to_string()),
-                                                mx_host: policy
+                                            receiving_ip: detail
-                                                    .policy
+                                                .receiving_ip
-                                                    .mx_host
+                                                .unwrap_or_else(|| "".to_string()),
-                                                    .unwrap_or_else(|| Vec::new())
+                                            receiving_mx_hostname: detail
-                                                    .into_iter()
+                                                .receiving_mx_hostname
-                                                    .map(|mx| match mx {
+                                                .unwrap_or_else(|| "".to_string()),
-                                                        MxHost::String(s) => {
+                                            failed_session_count: detail.failed_session_count,
-                                                            FormattedTlsRptMxHost {
+                                            additional_info: detail
-                                                                hostname: s,
+                                                .additional_info
-                                                                failure_count: 0,
+                                                .unwrap_or_else(|| "".to_string()),
-                                                                result_type: "".to_string(),
+                                            failure_reason_code: detail
-                                                            }
+                                                .failure_reason_code
-                                                        }
+                                                .unwrap_or_else(|| "".to_string()),
-                                                        MxHost::Object(o) => {
-                                                            FormattedTlsRptMxHost {
-                                                                hostname: o.hostname,
-                                                                failure_count: o.failure_count,
-                                                                result_type: o.result_type,
-                                                            }
-                                                        }
-                                                    })
-                                                    .collect(),
-                                            },
-                                            summary: policy.summary,
-                                            failure_details: policy
-                                                .failure_details
-                                                .unwrap_or_else(|| Vec::new())
-                                                .into_iter()
-                                                .map(|detail| FormattedTlsRptFailureDetails {
-                                                    result_type: detail.result_type,
-                                                    sending_mta_ip: detail
-                                                        .sending_mta_ip
-                                                        .unwrap_or_else(|| "".to_string()),
-                                                    receiving_ip: detail
-                                                        .receiving_ip
-                                                        .unwrap_or_else(|| "".to_string()),
-                                                    receiving_mx_hostname: detail
-                                                        .receiving_mx_hostname
-                                                        .unwrap_or_else(|| "".to_string()),
-                                                    failed_session_count: detail
-                                                        .failed_session_count,
-                                                    additional_info: detail
-                                                        .additional_info
-                                                        .unwrap_or_else(|| "".to_string()),
-                                                    failure_reason_code: detail
-                                                        .failure_reason_code
-                                                        .unwrap_or_else(|| "".to_string()),
-                                                })
-                                                .collect(),
                                         })
                                         .collect(),
-                                };
+                                })
-                                let template = TlsReportTemplate {
+                                .collect(),
-                                    report: &formatted_tlsrpt,
+                        };
-                                };
+                        let template = TlsReportTemplate {
-                                let html = template.render().unwrap_or_else(|e| format!("<div class=\"tlsrpt-error\">Failed to render TLS report template: {}</div>", e));
+                            report: &formatted_tlsrpt,
-                                parts.push(Body::html(html));
+                        };
-                            }
+                        template.render().unwrap_or_else(|e| format!("<div class=\"tlsrpt-error\">Failed to render TLS report template: {}</div>", e))
-                            Err(e) => {
-                                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>");
-                        parts.push(Body::html(html));
-                    }
-                } else {
-                    let html =
-                        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),
-                        }));
                     }
+                    Err(e) => format!(
+                        "<div class=\"tlsrpt-error\">Failed to parse TLS report JSON: {}</div>",
+                        e
+                    ),
                 }
+            } else {
+                format!("<div class=\"tlsrpt-error\">Failed to convert decompressed data to UTF-8.</div>")
             }
+        } else {
+            format!("<div class=\"tlsrpt-error\">Failed to decompressed data.</div>")
         }
+    } 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> {

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> {
@@ -685,7 +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?;
 
         #[cfg(feature = "tantivy")]
         {

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());
     }

shared/Cargo.toml

@@ -12,7 +12,7 @@ version.workspace = true
 
 [dependencies]
 build-info = "0.0.42"
-letterbox-notmuch = { path = "../notmuch", version = "0.17.48", registry = "xinu" }
+letterbox-notmuch = { path = "../notmuch", version = "0.17.44", 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.48", registry = "xinu" }
+letterbox-shared = { path = "../shared/", version = "0.17.44", 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,
@@ -837,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

@@ -727,19 +727,15 @@ 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![
+                from_detail.as_ref().map(|addr| attrs! {
-                    C!["font-semibold", "text-sm", "flex-1"],
+                    At::Title => addr
-                    from_detail.as_ref().map(|addr| attrs! {
+                }),
-                        At::Title => addr
+                &from,
-                    }),
+                " ",
-                    &from,
+                from_detail.as_ref().map(|text| copy_text_widget(&text))
-                    " ",
-                    from_detail.as_ref().map(|text| copy_text_widget(&text))
-                ],
-                snooze_buttons(msg.timestamp, &id),
             ],
             IF!(!msg.to.is_empty() =>div![
                 C!["text-xs"],
@@ -1375,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
                 },
@@ -1598,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![
@@ -1699,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))
-                    }
-                })
-            ])
-        ),
-    ]
-}