chore: Release

Cargo.lock

@@ -3156,7 +3156,7 @@ dependencies = [
 
 [[package]]
 name = "letterbox-notmuch"
-version = "0.17.47"
+version = "0.17.49"
 dependencies = [
  "itertools",
  "log",
@@ -3171,7 +3171,7 @@ dependencies = [
 
 [[package]]
 name = "letterbox-procmail2notmuch"
-version = "0.17.47"
+version = "0.17.49"
 dependencies = [
  "anyhow",
  "clap",
@@ -3184,7 +3184,7 @@ dependencies = [
 
 [[package]]
 name = "letterbox-server"
-version = "0.17.47"
+version = "0.17.49"
 dependencies = [
  "ammonia",
  "anyhow",
@@ -3207,8 +3207,8 @@ dependencies = [
  "html-escape",
  "html2text",
  "ical",
- "letterbox-notmuch 0.17.47",
+ "letterbox-notmuch 0.17.49",
- "letterbox-shared 0.17.47",
+ "letterbox-shared 0.17.49",
  "linkify",
  "lol_html",
  "mailparse",
@@ -3249,10 +3249,10 @@ dependencies = [
 
 [[package]]
 name = "letterbox-shared"
-version = "0.17.47"
+version = "0.17.49"
 dependencies = [
  "build-info 0.0.42",
- "letterbox-notmuch 0.17.47",
+ "letterbox-notmuch 0.17.49",
  "regex",
  "serde",
  "sqlx",
@@ -3262,7 +3262,7 @@ dependencies = [
 
 [[package]]
 name = "letterbox-web"
-version = "0.17.47"
+version = "0.17.49"
 dependencies = [
  "build-info 0.0.42",
  "build-info-build",
@@ -3274,7 +3274,7 @@ dependencies = [
  "graphql_client",
  "human_format",
  "itertools",
- "letterbox-shared 0.17.47",
+ "letterbox-shared 0.17.49",
  "log",
  "seed",
  "seed_hooks",

Cargo.toml

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

server/.sqlx/query-77f79f981a9736d18ffd4b87d3aec34d6a048162154a3aba833370c58a860795.json

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

server/.sqlx/query-c8383663124a5cc5912b54553f18f7064d33087ebfdf3c0c1c43cbe6d3577084.json

@@ -0,0 +1,26 @@
+{
+  "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/Cargo.toml

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

server/src/graphql.rs

@@ -676,6 +676,18 @@ 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>();
@@ -687,6 +699,9 @@ impl MutationRoot {
         // Process email labels
         label_unprocessed(&nm, &pool, false, Some(1000), "tag:unprocessed").await?;
 
+        // Look for snoozed messages and mark unread
+        wakeup(&nm, &pool).await?;
+
         #[cfg(feature = "tantivy")]
         {
             let tantivy = ctx.data_unchecked::<TantivyConnection>();
@@ -707,6 +722,33 @@ 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,

shared/Cargo.toml

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

web/src/view/mod.rs

@@ -739,7 +739,7 @@ fn render_open_header(msg: &ShowThreadQueryThreadOnEmailThreadMessages) -> Node<
                     " ",
                     from_detail.as_ref().map(|text| copy_text_widget(&text))
                 ],
-                snooze_buttons(&id),
+                snooze_buttons(msg.timestamp, &id),
             ],
             IF!(!msg.to.is_empty() =>div![
                 C!["text-xs"],
@@ -1375,7 +1375,7 @@ pub fn view_tags(tags: &Option<Vec<Tag>>) -> Node<Msg> {
                 },
             ],
             a![
-                C!["grow", "truncate"],
+                C![indent_cls, "grow", "truncate"],
                 attrs! {
                     At::Href => href
                 },
@@ -1603,7 +1603,7 @@ fn render_news_post_header(post: &ShowThreadQueryThreadOnNewsPost) -> Node<Msg>
                 div![
                     C!["flex"],
                     div![C!["font-semibold", "text-sm", "flex-1"], from],
-                    snooze_buttons(&id),
+                    snooze_buttons(Some(post.timestamp), &id),
                 ],
                 div![
                     C!["flex", "gap-2", "pt-2", "text-sm"],
@@ -1700,7 +1700,7 @@ fn click_to_top() -> Node<Msg> {
     ]
 }
 
-fn snooze_buttons(id: &str) -> Node<Msg> {
+fn snooze_buttons(timestamp: Option<i64>, id: &str) -> Node<Msg> {
     div![
         span![C!["px-2"], "⏰"],
         button![
@@ -1727,17 +1727,19 @@ fn snooze_buttons(id: &str) -> Node<Msg> {
                 }
             })
         ],
-        button![
+        timestamp.map(
-            tw_classes::button(),
+            |ts| chrono::DateTime::from_timestamp(ts, 0).map(|ts| button![
-            C!["rounded-l-none"],
+                tw_classes::button(),
-            "6m",
+                C!["rounded-l-none"],
-            ev(Ev::Click, {
+                "+6m",
-                let id = id.to_string();
+                ev(Ev::Click, {
-                move |e| {
+                    let id = id.to_string();
-                    e.stop_propagation();
+                    move |e| {
-                    Msg::Snooze(id, Utc::now() + chrono::Days::new(180))
+                        e.stop_propagation();
-                }
+                        Msg::Snooze(id, ts + chrono::Days::new(180))
-            })
+                    }
-        ],
+                })
+            ])
+        ),
     ]
 }