1 files changed, 35 insertions, 5 deletions
diff --git a/filamento/src/logic/local_only.rs b/filamento/src/logic/local_only.rs
index cabbef4..7f3a2e6 100644
--- a/filamento/src/logic/local_only.rs
+++ b/filamento/src/logic/local_only.rs
@@ -1,4 +1,4 @@
-use jid::JID;
+use jid::{BareJID, JID};
 use uuid::Uuid;
 
 use crate::{
@@ -28,23 +28,53 @@ pub async fn handle_get_chats_ordered_with_latest_messages<Fs: FileStore + Clone
     Ok(logic.db().read_chats_ordered_with_latest_messages().await?)
 }
 
+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,
+    jid: BareJID,
 ) -> Result<Chat, DatabaseError> {
     Ok(logic.db().read_chat(jid).await?)
 }
 
+pub async fn handle_get_chat_and_user<Fs: FileStore + Clone>(
+    logic: &ClientLogic<Fs>,
+    jid: BareJID,
+) -> Result<(Chat, User), DatabaseError> {
+    Ok(logic.db().read_chat_and_user(jid).await?)
+}
+
+pub async fn handle_get_message<Fs: FileStore + Clone>(
+    logic: &ClientLogic<Fs>,
+    id: Uuid,
+) -> Result<Message, DatabaseError> {
+    Ok(logic.db().read_message(id).await?)
+}
+
 pub async fn handle_get_messages<Fs: FileStore + Clone>(
     logic: &ClientLogic<Fs>,
-    jid: JID,
+    jid: BareJID,
 ) -> Result<Vec<Message>, DatabaseError> {
     Ok(logic.db().read_message_history(jid).await?)
 }
 
+pub async fn handle_get_messages_with_users<Fs: FileStore + Clone>(
+    logic: &ClientLogic<Fs>,
+    jid: BareJID,
+) -> 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,
+    jid: BareJID,
 ) -> Result<(), DatabaseError> {
     Ok(logic.db().delete_chat(jid).await?)
 }
@@ -58,7 +88,7 @@ pub async fn handle_delete_messaage<Fs: FileStore + Clone>(
 
 pub async fn handle_get_user<Fs: FileStore + Clone>(
     logic: &ClientLogic<Fs>,
-    jid: JID,
+    jid: BareJID,
 ) -> Result<User, DatabaseError> {
     Ok(logic.db().read_user(jid).await?)
 }