1 files changed, 43 insertions, 10 deletions

diff --git a/filamento/src/logic/local_only.rs b/filamento/src/logic/local_only.rs
index 3f6fe8d..dc94d2c 100644
--- a/filamento/src/logic/local_only.rs
+++ b/filamento/src/logic/local_only.rs
@@ -4,44 +4,77 @@ use uuid::Uuid;
 use crate::{
     chat::{Chat, Message},
     error::DatabaseError,
+    files::FileStore,
     user::User,
 };
 
 use super::ClientLogic;
 
-pub async fn handle_get_chats(logic: &ClientLogic) -> Result<Vec<Chat>, DatabaseError> {
+pub async fn handle_get_chats<Fs: FileStore + Clone>(
+    logic: &ClientLogic<Fs>,
+) -> Result<Vec<Chat>, DatabaseError> {
     Ok(logic.db().read_chats().await?)
 }
 
-pub async fn handle_get_chats_ordered(logic: &ClientLogic) -> Result<Vec<Chat>, DatabaseError> {
+pub async fn handle_get_chats_ordered<Fs: FileStore + Clone>(
+    logic: &ClientLogic<Fs>,
+) -> Result<Vec<Chat>, DatabaseError> {
     Ok(logic.db().read_chats_ordered().await?)
 }
 
-pub async fn handle_get_chats_ordered_with_latest_messages(
-    logic: &ClientLogic,
+pub async fn handle_get_chats_ordered_with_latest_messages<Fs: FileStore + Clone>(
+    logic: &ClientLogic<Fs>,
 ) -> Result<Vec<(Chat, Message)>, DatabaseError> {
     Ok(logic.db().read_chats_ordered_with_latest_messages().await?)
 }
 
-pub async fn handle_get_chat(logic: &ClientLogic, jid: JID) -> Result<Chat, DatabaseError> {
+pub async fn handle_get_chats_ordered_with_latest_messages_and_users<Fs: FileStore + Clone>(
+    logic: &ClientLogic<Fs>,
+) -> Result<Vec<((Chat, User), (Message, User))>, DatabaseError> {
+    Ok(logic
+        .db()
+        .read_chats_ordered_with_latest_messages_and_users()
+        .await?)
+}
+
+pub async fn handle_get_chat<Fs: FileStore + Clone>(
+    logic: &ClientLogic<Fs>,
+    jid: JID,
+) -> Result<Chat, DatabaseError> {
     Ok(logic.db().read_chat(jid).await?)
 }
 
-pub async fn handle_get_messages(
-    logic: &ClientLogic,
+pub async fn handle_get_messages<Fs: FileStore + Clone>(
+    logic: &ClientLogic<Fs>,
     jid: JID,
 ) -> Result<Vec<Message>, DatabaseError> {
     Ok(logic.db().read_message_history(jid).await?)
 }
 
-pub async fn handle_delete_chat(logic: &ClientLogic, jid: JID) -> Result<(), DatabaseError> {
+pub async fn handle_get_messages_with_users<Fs: FileStore + Clone>(
+    logic: &ClientLogic<Fs>,
+    jid: JID,
+) -> Result<Vec<(Message, User)>, DatabaseError> {
+    Ok(logic.db().read_message_history_with_users(jid).await?)
+}
+
+pub async fn handle_delete_chat<Fs: FileStore + Clone>(
+    logic: &ClientLogic<Fs>,
+    jid: JID,
+) -> Result<(), DatabaseError> {
     Ok(logic.db().delete_chat(jid).await?)
 }
 
-pub async fn handle_delete_messaage(logic: &ClientLogic, uuid: Uuid) -> Result<(), DatabaseError> {
+pub async fn handle_delete_messaage<Fs: FileStore + Clone>(
+    logic: &ClientLogic<Fs>,
+    uuid: Uuid,
+) -> Result<(), DatabaseError> {
     Ok(logic.db().delete_message(uuid).await?)
 }
 
-pub async fn handle_get_user(logic: &ClientLogic, jid: JID) -> Result<User, DatabaseError> {
+pub async fn handle_get_user<Fs: FileStore + Clone>(
+    logic: &ClientLogic<Fs>,
+    jid: JID,
+) -> Result<User, DatabaseError> {
     Ok(logic.db().read_user(jid).await?)
 }