1 files changed, 36 insertions, 1 deletions

diff --git a/filamento/src/logic/offline.rs b/filamento/src/logic/offline.rs
index 566972c..b87484c 100644
--- a/filamento/src/logic/offline.rs
+++ b/filamento/src/logic/offline.rs
@@ -2,6 +2,7 @@ use std::process::id;
 
 use chrono::Utc;
 use lampada::error::WriteError;
+use tracing::error;
 use uuid::Uuid;
 
 use crate::{
@@ -14,6 +15,7 @@ use crate::{
     files::FileStore,
     presence::Online,
     roster::Contact,
+    user::User,
 };
 
 use super::{
@@ -21,7 +23,8 @@ use super::{
     local_only::{
         handle_delete_chat, handle_delete_messaage, handle_get_chat, handle_get_chats,
         handle_get_chats_ordered, handle_get_chats_ordered_with_latest_messages,
-        handle_get_messages, handle_get_user,
+        handle_get_chats_ordered_with_latest_messages_and_users, handle_get_messages,
+        handle_get_messages_with_users, handle_get_user,
     },
 };
 
@@ -47,6 +50,12 @@ pub async fn handle_get_roster<Fs: FileStore + Clone>(
     Ok(logic.db().read_cached_roster().await?)
 }
 
+pub async fn handle_get_roster_with_users<Fs: FileStore + Clone>(
+    logic: &ClientLogic<Fs>,
+) -> Result<Vec<(Contact, User)>, RosterError> {
+    Ok(logic.db().read_cached_roster_with_users().await?)
+}
+
 pub async fn handle_offline_result<Fs: FileStore + Clone>(
     logic: &ClientLogic<Fs>,
     command: Command<Fs>,
@@ -56,6 +65,10 @@ pub async fn handle_offline_result<Fs: FileStore + Clone>(
             let roster = handle_get_roster(logic).await;
             sender.send(roster);
         }
+        Command::GetRosterWithUsers(sender) => {
+            let roster = handle_get_roster_with_users(logic).await;
+            sender.send(roster);
+        }
         Command::GetChats(sender) => {
             let chats = handle_get_chats(logic).await;
             sender.send(chats);
@@ -68,6 +81,10 @@ pub async fn handle_offline_result<Fs: FileStore + Clone>(
             let chats = handle_get_chats_ordered_with_latest_messages(logic).await;
             sender.send(chats);
         }
+        Command::GetChatsOrderedWithLatestMessagesAndUsers(sender) => {
+            let chats = handle_get_chats_ordered_with_latest_messages_and_users(logic).await;
+            sender.send(chats);
+        }
         Command::GetChat(jid, sender) => {
             let chats = handle_get_chat(logic, jid).await;
             sender.send(chats);
@@ -76,6 +93,10 @@ pub async fn handle_offline_result<Fs: FileStore + Clone>(
             let messages = handle_get_messages(logic, jid).await;
             sender.send(messages);
         }
+        Command::GetMessagesWithUsers(jid, sender) => {
+            let messages = handle_get_messages_with_users(logic, jid).await;
+            sender.send(messages);
+        }
         Command::DeleteChat(jid, sender) => {
             let result = handle_delete_chat(logic, jid).await;
             sender.send(result);
@@ -151,11 +172,25 @@ pub async fn handle_offline_result<Fs: FileStore + Clone>(
                     .handle_error(MessageSendError::MessageHistory(e.into()).into())
                     .await;
             }
+
+            let from = match logic.db().read_user(logic.bare_jid.clone()).await {
+                Ok(u) => u,
+                Err(e) => {
+                    error!("{}", e);
+                    User {
+                        jid: logic.bare_jid.clone(),
+                        nick: None,
+                        avatar: None,
+                    }
+                }
+            };
+
             logic
                 .update_sender()
                 .send(crate::UpdateMessage::Message {
                     to: jid.as_bare(),
                     message,
+                    from,
                 })
                 .await;
         }