remove unused

Cargo.lock

@@ -459,12 +459,6 @@ dependencies = [
  "system-deps",
 ]
 
-[[package]]
-name = "capnp"
-version = "0.17.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95e65021d89250bbfe7c2791789ced2c4bdc21b0e8bb59c64f3fd6145a5fd678"
-
 [[package]]
 name = "capnp"
 version = "0.18.13"
@@ -480,7 +474,7 @@ version = "0.18.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b8697b857f5b014ff378f02817426d3b6fb90a69f32e330fe010f24fe10cf8f1"
 dependencies = [
- "capnp 0.18.13",
+ "capnp",
  "futures",
 ]
 
@@ -490,20 +484,11 @@ version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "94b87a9e0f74600628e227d39b79ef8652c558a408999ac46ba22b19dbad0010"
 dependencies = [
- "capnp 0.18.13",
+ "capnp",
  "capnp-futures",
  "futures",
 ]
 
-[[package]]
-name = "capnpc"
-version = "0.17.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbbc3763fb3e6635188e9cc51ee11a26f8777c553ca377430818dbebaaf6042b"
-dependencies = [
- "capnp 0.17.2",
-]
-
 [[package]]
 name = "cbc"
 version = "0.1.2"
@@ -1922,7 +1907,7 @@ dependencies = [
  "anyhow",
  "ashpd",
  "async-channel",
- "capnp 0.18.13",
+ "capnp",
  "capnp-rpc",
  "chrono",
  "futures",
@@ -1948,7 +1933,6 @@ dependencies = [
  "anyhow",
  "async-channel",
  "async-trait",
- "capnpc",
  "clap",
  "futures",
  "http",

ntfy-daemon/Cargo.toml

@@ -5,10 +5,6 @@ edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
-
-[build-dependencies]
-capnpc = "0.17.2"
-
 [dependencies]
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"

ntfy-daemon/README.md

@@ -1,5 +1 @@
 # ntfy-daemon
-
-Rust crate providing a capnp-rpc interface to multiple ntfy servers.
-Connections to the same server are multiplexed over http2.
-Messages are received and stored in a sqlite database for persistance.

ntfy-daemon/src/listener.rs

@@ -1,29 +1,20 @@
-use std::cell::RefCell;
 use std::sync::Arc;
-use std::thread::JoinHandle;
 use std::time::Duration;
 
 use futures::{StreamExt, TryStreamExt};
 use serde::{Deserialize, Serialize};
 use tokio::io::AsyncBufReadExt;
-use tokio::spawn;
+use tokio::task::{self, spawn_local, LocalSet};
-use tokio::sync::RwLock;
-use tokio::task::{self, spawn_local, AbortHandle, LocalSet};
 use tokio::{
     select,
-    sync::{mpsc, oneshot, watch},
+    sync::{mpsc, oneshot},
 };
 use tokio_stream::wrappers::LinesStream;
 use tracing::{debug, error, info};
 
-use crate::credentials::{Credential, Credentials};
+use crate::credentials::Credentials;
-use crate::http_client::{HttpClient, NullableClient};
+use crate::http_client::HttpClient;
-use crate::output_tracker::OutputTracker;
+use crate::{models, Error};
-use crate::{models, Error, SharedEnv};
-use tokio::time::timeout;
-
-const CONNECT_TIMEOUT: std::time::Duration = std::time::Duration::from_secs(15);
-const TIMEOUT: std::time::Duration = std::time::Duration::from_secs(240); // 4 minutes
 
 #[derive(Clone, Debug, Serialize, Deserialize)]
 #[serde(tag = "event")]
@@ -246,8 +237,6 @@ pub struct ListenerHandle {
     pub events: async_channel::Receiver<ListenerEvent>,
     pub config: ListenerConfig,
     pub commands: mpsc::Sender<ListenerCommand>,
-    join_handle: Arc<Option<task::JoinHandle<()>>>,
-    listener_actor: Arc<RwLock<Option<ListenerActor>>>,
 }
 
 impl ListenerHandle {
@@ -275,8 +264,6 @@ impl ListenerHandle {
             events: event_rx,
             config,
             commands: commands_tx,
-            listener_actor: Arc::new(RwLock::new(None)),
-            join_handle: Arc::new(None),
         }
     }
 
@@ -296,7 +283,8 @@ mod tests {
     use models::Subscription;
     use serde_json::json;
     use task::LocalSet;
-    use tokio_stream::wrappers::WatchStream;
+
+    use crate::http_client::NullableClient;
 
     use super::*;
 
@@ -323,7 +311,7 @@ mod tests {
                     since: 0,
                 };
 
-                let mut listener = ListenerHandle::new(config.clone());
+                let listener = ListenerHandle::new(config.clone());
                 let items: Vec<_> = listener.events.take(3).collect().await;
 
                 dbg!(&items);
@@ -369,7 +357,7 @@ mod tests {
                     since: 0,
                 };
 
-                let mut listener = ListenerHandle::new(config.clone());
+                let listener = ListenerHandle::new(config.clone());
                 let items: Vec<_> = listener.events.take(3).collect().await;
 
                 dbg!(&items);
@@ -400,7 +388,7 @@ mod tests {
                 since: 0,
             };
 
-            let mut listener = ListenerHandle::new(config.clone());
+            let listener = ListenerHandle::new(config.clone());
 
             // assert_event_matches!(listener, ListenerEvent::Connected { .. },);
         });

ntfy-daemon/src/subscription.rs

@@ -1,11 +1,8 @@
 use crate::listener::{ListenerEvent, ListenerHandle};
-use crate::message_repo::Db;
+use crate::models::{self, ReceivedMessage};
-use crate::models::{self, NotificationProxy, ReceivedMessage};
+use crate::{Error, SharedEnv};
-use crate::{Error, ServerEvent, SharedEnv};
-use std::future::Future;
-use std::sync::Arc;
 use tokio::select;
-use tokio::sync::{broadcast, mpsc, oneshot, watch, RwLock};
+use tokio::sync::{broadcast, mpsc, oneshot};
 use tokio::task::spawn_local;
 use tracing::{error, info, warn};
 
@@ -165,7 +162,7 @@ impl SubscriptionActor {
                             if let Ok(_) = res {
                                 self.model = new_model;
                             }
-                            resp_tx.send(res.map_err(|e| e.into()));
+                            let _ = resp_tx.send(res.map_err(|e| e.into()));
                         }
                         SubscriptionCommand::Publish {msg, resp_tx} => {
                             let _ = resp_tx.send(self.publish(msg).await);

src/application.rs

@@ -1,16 +1,10 @@
 use std::cell::Cell;
-use std::path::Path;
-use std::path::PathBuf;
 use std::pin::Pin;
 use std::rc::Rc;
 
 use adw::prelude::*;
 use adw::subclass::prelude::*;
-use capnp_rpc::{rpc_twoparty_capnp, twoparty, RpcSystem};
 use futures::stream::Stream;
-use futures::AsyncReadExt;
-use gio::SocketClient;
-use gio::UnixSocketAddress;
 use gtk::{gdk, gio, glib};
 use ntfy_daemon::models;
 use ntfy_daemon::NtfyHandle;

src/subscription.rs

@@ -3,14 +3,11 @@ use std::rc::Rc;
 
 use adw::prelude::*;
 use capnp::capability::Promise;
-use capnp_rpc::pry;
-use futures::join;
 use glib::subclass::prelude::*;
 use glib::Properties;
-use gtk::glib::MainContext;
 use gtk::{gio, glib};
 use ntfy_daemon::{models, ConnectionState, ListenerEvent};
-use tracing::{debug, error, instrument};
+use tracing::{error, instrument};
 
 #[repr(u16)]
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
@@ -141,8 +138,6 @@ impl Subscription {
     }
 
     fn load(&self) -> Promise<(), capnp::Error> {
-        let imp = self.imp();
-
         let this = self.clone();
         Promise::from_future(async move {
             let remote_subscription = this.imp().client.get().unwrap();
@@ -222,7 +217,7 @@ impl Subscription {
                     .display_name((imp.display_name.borrow().to_string()))
                     .muted(imp.muted.get())
                     .build()
-                    .map_err(|e| anyhow::anyhow!("invalid subscription data"))?,
+                    .map_err(|e| anyhow::anyhow!("invalid subscription data {:?}", e))?,
             )
             .await?;
         Ok(())

src/widgets/window.rs

@@ -1,10 +1,8 @@
 use std::cell::Cell;
 use std::cell::OnceCell;
-use std::rc::Rc;
 
 use adw::prelude::*;
 use adw::subclass::prelude::*;
-use futures::prelude::*;
 use gtk::{gio, glib};
 use ntfy_daemon::models;
 use ntfy_daemon::NtfyHandle;