1 files changed, 18 insertions, 9 deletions

diff --git a/filamento/src/logic/mod.rs b/filamento/src/logic/mod.rs
index 1ddd7d3..5e05dac 100644
--- a/filamento/src/logic/mod.rs
+++ b/filamento/src/logic/mod.rs
@@ -4,12 +4,13 @@ use jid::JID;
 use lampada::{Connected, Logic, error::ReadError};
 use stanza::client::Stanza;
 use tokio::sync::{Mutex, mpsc, oneshot};
-use tracing::{error, info, warn};
+use tracing::{error, info};
 
 use crate::{
     Client, Command, UpdateMessage,
     db::Db,
     error::{Error, IqRequestError, ResponseError},
+    files::FileStore,
 };
 
 mod abort;
@@ -22,12 +23,13 @@ mod online;
 mod process_stanza;
 
 #[derive(Clone)]
-pub struct ClientLogic {
-    client: Client,
+pub struct ClientLogic<Fs: FileStore> {
+    client: Client<Fs>,
     bare_jid: JID,
     db: Db,
     pending: Pending,
     update_sender: mpsc::Sender<UpdateMessage>,
+    file_store: Fs,
 }
 
 #[derive(Clone)]
@@ -75,12 +77,13 @@ impl Pending {
     }
 }
 
-impl ClientLogic {
+impl<Fs: FileStore> ClientLogic<Fs> {
     pub fn new(
-        client: Client,
+        client: Client<Fs>,
         bare_jid: JID,
         db: Db,
         update_sender: mpsc::Sender<UpdateMessage>,
+        file_store: Fs,
     ) -> Self {
         Self {
             db,
@@ -88,10 +91,11 @@ impl ClientLogic {
             update_sender,
             client,
             bare_jid,
+            file_store,
         }
     }
 
-    pub fn client(&self) -> &Client {
+    pub fn client(&self) -> &Client<Fs> {
         &self.client
     }
 
@@ -103,6 +107,10 @@ impl ClientLogic {
         &self.pending
     }
 
+    pub fn file_store(&self) -> &Fs {
+        &self.file_store
+    }
+
     pub fn update_sender(&self) -> &mpsc::Sender<UpdateMessage> {
         &self.update_sender
     }
@@ -113,13 +121,14 @@ impl ClientLogic {
         self.update_sender().send(update).await;
     }
 
-    pub async fn handle_error(&self, e: Error) {
+    // TODO: delete this
+    pub async fn handle_error(&self, e: Error<Fs>) {
         error!("{}", e);
     }
 }
 
-impl Logic for ClientLogic {
-    type Cmd = Command;
+impl<Fs: FileStore + Clone + Send + Sync> Logic for ClientLogic<Fs> {
+    type Cmd = Command<Fs>;
 
     // pub async fn handle_stream_error(self, error) {}
     // stanza errors (recoverable)