Cargo.lock

@@ -3034,7 +3034,7 @@ dependencies = [
 
 [[package]]
 name = "letterbox-notmuch"
-version = "0.17.5"
+version = "0.17.4"
 dependencies = [
  "itertools",
  "log",
@@ -3049,7 +3049,7 @@ dependencies = [
 
 [[package]]
 name = "letterbox-procmail2notmuch"
-version = "0.17.5"
+version = "0.17.4"
 dependencies = [
  "anyhow",
  "clap",
@@ -3062,7 +3062,7 @@ dependencies = [
 
 [[package]]
 name = "letterbox-server"
-version = "0.17.5"
+version = "0.17.4"
 dependencies = [
  "ammonia",
  "anyhow",
@@ -3121,7 +3121,7 @@ dependencies = [
 
 [[package]]
 name = "letterbox-shared"
-version = "0.17.5"
+version = "0.17.4"
 dependencies = [
  "build-info",
  "letterbox-notmuch 0.17.3",
@@ -3134,7 +3134,7 @@ dependencies = [
 
 [[package]]
 name = "letterbox-web"
-version = "0.17.5"
+version = "0.17.4"
 dependencies = [
  "build-info",
  "build-info-build",

Cargo.toml

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

server/src/bin/letterbox-server.rs

@@ -21,7 +21,7 @@ use letterbox_notmuch::Notmuch;
 use letterbox_server::tantivy::TantivyConnection;
 use letterbox_server::{
     graphql::{compute_catchup_ids, Attachment, MutationRoot, QueryRoot, SubscriptionRoot},
-    nm::{attachment_bytes, cid_attachment_bytes, label_unprocessed},
+    nm::{attachment_bytes, cid_attachment_bytes},
     ws::ConnectionTracker,
 };
 use letterbox_shared::WebsocketMessage;
@@ -29,7 +29,7 @@ use serde::Deserialize;
 use sqlx::postgres::PgPool;
 use tokio::{net::TcpListener, sync::Mutex};
 use tower_http::trace::{DefaultMakeSpan, TraceLayer};
-use tracing::{error, info};
+use tracing::info;
 
 // Make our own error that wraps `ServerError`.
 struct AppError(letterbox_server::ServerError);
@@ -176,15 +176,11 @@ async fn start_ws(
 #[derive(Debug, Deserialize)]
 struct NotificationParams {
     delay_ms: Option<u64>,
-    num_unprocessed: Option<usize>,
 }
 
 async fn send_refresh_websocket_handler(
     State(AppState {
-        nm,
+        connection_tracker, ..
-        pool,
-        connection_tracker,
-        ..
     }): State<AppState>,
     params: Query<NotificationParams>,
 ) -> impl IntoResponse {
@@ -194,15 +190,6 @@ async fn send_refresh_websocket_handler(
         info!("sleeping {delay:?}");
         tokio::time::sleep(delay).await;
     }
-    let limit = match params.num_unprocessed {
-        Some(0) => None,
-        Some(limit) => Some(limit),
-        None => Some(10),
-    };
-
-    if let Err(err) = label_unprocessed(&nm, &pool, false, limit, "tag:unprocessed").await {
-        error!("Failed to label_unprocessed: {err:?}");
-    };
     connection_tracker
         .lock()
         .await
@@ -217,33 +204,18 @@ async fn watch_new(
     conn_tracker: Arc<Mutex<ConnectionTracker>>,
     poll_time: Duration,
 ) -> Result<(), async_graphql::Error> {
-    async fn watch_new_iteration(
+    let mut old_ids = Vec::new();
-        nm: &Notmuch,
+    loop {
-        pool: &PgPool,
-        conn_tracker: Arc<Mutex<ConnectionTracker>>,
-        old_ids: &[String],
-    ) -> Result<Vec<String>, async_graphql::Error> {
         let ids = compute_catchup_ids(&nm, &pool, "is:unread").await?;
-        info!("old_ids: {} ids: {}", old_ids.len(), ids.len());
         if old_ids != ids {
-            label_unprocessed(&nm, &pool, false, Some(100), "tag:unprocessed").await?;
+            info!("old_ids: {old_ids:?}\n     ids: {ids:?}");
             conn_tracker
                 .lock()
                 .await
                 .send_message_all(WebsocketMessage::RefreshMessages)
                 .await
         }
-        Ok(ids)
+        old_ids = ids;
-    }
-    let mut old_ids = Vec::new();
-    loop {
-        old_ids = match watch_new_iteration(&nm, &pool, conn_tracker.clone(), &old_ids).await {
-            Ok(old_ids) => old_ids,
-            Err(err) => {
-                error!("watch_new_iteration failed: {err:?}");
-                continue;
-            }
-        };
         tokio::time::sleep(poll_time).await;
     }
 }
@@ -251,7 +223,6 @@ async fn watch_new(
 #[derive(Clone)]
 struct AppState {
     nm: Notmuch,
-    pool: PgPool,
     connection_tracker: Arc<Mutex<ConnectionTracker>>,
 }
 
@@ -292,7 +263,7 @@ async fn main() -> Result<(), Box<dyn Error>> {
     let connection_tracker = Arc::new(Mutex::new(ConnectionTracker::default()));
     let ct = Arc::clone(&connection_tracker);
     let poll_time = Duration::from_secs(60);
-    let _h = tokio::spawn(watch_new(nm.clone(), pool.clone(), ct, poll_time));
+    let _h = tokio::spawn(watch_new(nm.clone(), pool, ct, poll_time));
 
     let api_routes = Router::new()
         .route(
@@ -317,7 +288,6 @@ async fn main() -> Result<(), Box<dyn Error>> {
         .nest("/notification", notification_routes)
         .with_state(AppState {
             nm,
-            pool,
             connection_tracker,
         })
         .layer(

web/src/state.rs

@@ -671,7 +671,7 @@ pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg>) {
         }
         Msg::WebsocketMessage(msg) => {
             match msg {
-                WebsocketMessage::RefreshMessages => orders.send_msg(Msg::Refresh),
+                WebsocketMessage::RefreshMessages => orders.send_msg(Msg::RefreshStart),
             };
         }
     }