diff options
Diffstat (limited to 'luz/src/connection/read.rs')
| -rw-r--r-- | luz/src/connection/read.rs | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/luz/src/connection/read.rs b/luz/src/connection/read.rs index d005693..692952b 100644 --- a/luz/src/connection/read.rs +++ b/luz/src/connection/read.rs @@ -6,7 +6,6 @@ use std::{ }; use jabber::{connection::Tls, jabber_stream::bound_stream::BoundJabberReader}; -use sqlx::SqlitePool; use stanza::client::Stanza; use tokio::{ sync::{mpsc, oneshot, Mutex}, @@ -14,7 +13,7 @@ use tokio::{ }; use tracing::info; -use crate::{error::Error, UpdateMessage}; +use crate::{db::Db, error::Error, UpdateMessage}; use super::{ write::{WriteHandle, WriteMessage}, @@ -25,14 +24,14 @@ pub struct Read { control_receiver: mpsc::Receiver<ReadControl>, stream: BoundJabberReader<Tls>, on_crash: oneshot::Sender<( - SqlitePool, + Db, mpsc::Sender<UpdateMessage>, JoinSet<()>, mpsc::Sender<SupervisorCommand>, WriteHandle, Arc<Mutex<HashMap<String, oneshot::Sender<Result<Stanza, Error>>>>>, )>, - db: SqlitePool, + db: Db, update_sender: mpsc::Sender<UpdateMessage>, supervisor_control: mpsc::Sender<SupervisorCommand>, write_handle: WriteHandle, @@ -48,14 +47,14 @@ impl Read { control_receiver: mpsc::Receiver<ReadControl>, stream: BoundJabberReader<Tls>, on_crash: oneshot::Sender<( - SqlitePool, + Db, mpsc::Sender<UpdateMessage>, JoinSet<()>, mpsc::Sender<SupervisorCommand>, WriteHandle, Arc<Mutex<HashMap<String, oneshot::Sender<Result<Stanza, Error>>>>>, )>, - db: SqlitePool, + db: Db, update_sender: mpsc::Sender<UpdateMessage>, // jabber server must be able to both terminate the connection from error, and ask for data from the client (such as supported XEPs) supervisor_control: mpsc::Sender<SupervisorCommand>, @@ -167,7 +166,7 @@ impl Read { async fn handle_stanza( stanza: Stanza, update_sender: mpsc::Sender<UpdateMessage>, - db: SqlitePool, + db: Db, supervisor_control: mpsc::Sender<SupervisorCommand>, write_handle: WriteHandle, ) { @@ -178,7 +177,7 @@ pub enum ReadControl { Disconnect, Abort( oneshot::Sender<( - SqlitePool, + Db, mpsc::Sender<UpdateMessage>, JoinSet<()>, mpsc::Sender<SupervisorCommand>, @@ -211,14 +210,14 @@ impl ReadControlHandle { pub fn new( stream: BoundJabberReader<Tls>, on_crash: oneshot::Sender<( - SqlitePool, + Db, mpsc::Sender<UpdateMessage>, JoinSet<()>, mpsc::Sender<SupervisorCommand>, WriteHandle, Arc<Mutex<HashMap<String, oneshot::Sender<Result<Stanza, Error>>>>>, )>, - db: SqlitePool, + db: Db, sender: mpsc::Sender<UpdateMessage>, supervisor_control: mpsc::Sender<SupervisorCommand>, jabber_write: WriteHandle, @@ -248,14 +247,14 @@ impl ReadControlHandle { pub fn reconnect( stream: BoundJabberReader<Tls>, on_crash: oneshot::Sender<( - SqlitePool, + Db, mpsc::Sender<UpdateMessage>, JoinSet<()>, mpsc::Sender<SupervisorCommand>, WriteHandle, Arc<Mutex<HashMap<String, oneshot::Sender<Result<Stanza, Error>>>>>, )>, - db: SqlitePool, + db: Db, sender: mpsc::Sender<UpdateMessage>, supervisor_control: mpsc::Sender<SupervisorCommand>, jabber_write: WriteHandle, |