1 files changed, 65 insertions, 5 deletions

diff --git a/filamento/src/lib.rs b/filamento/src/lib.rs
index 7946241..14b0cae 100644
--- a/filamento/src/lib.rs
+++ b/filamento/src/lib.rs
@@ -52,6 +52,8 @@ pub mod user;
 pub enum Command<Fs: FileStore> {
     /// get the roster. if offline, retreive cached version from database. should be stored in application memory
     GetRoster(oneshot::Sender<Result<Vec<Contact>, RosterError>>),
+    /// get the roster. if offline, retreive cached version from database. should be stored in application memory. includes user associated with each contact
+    GetRosterWithUsers(oneshot::Sender<Result<Vec<(Contact, User)>, RosterError>>),
     /// get all chats. chat will include 10 messages in their message Vec (enough for chat previews)
     // TODO: paging and filtering
     GetChats(oneshot::Sender<Result<Vec<Chat>, DatabaseError>>),
@@ -59,11 +61,21 @@ pub enum Command<Fs: FileStore> {
     GetChatsOrdered(oneshot::Sender<Result<Vec<Chat>, DatabaseError>>),
     // TODO: paging and filtering
     GetChatsOrderedWithLatestMessages(oneshot::Sender<Result<Vec<(Chat, Message)>, DatabaseError>>),
+    // TODO: paging and filtering, nullabillity for latest message
+    GetChatsOrderedWithLatestMessagesAndUsers(
+        oneshot::Sender<Result<Vec<((Chat, User), (Message, User))>, DatabaseError>>,
+    ),
     /// get a specific chat by jid
     GetChat(JID, oneshot::Sender<Result<Chat, DatabaseError>>),
     /// get message history for chat (does appropriate mam things)
     // TODO: paging and filtering
     GetMessages(JID, oneshot::Sender<Result<Vec<Message>, DatabaseError>>),
+    /// get message history for chat (does appropriate mam things)
+    // TODO: paging and filtering
+    GetMessagesWithUsers(
+        JID,
+        oneshot::Sender<Result<Vec<(Message, User)>, DatabaseError>>,
+    ),
     /// delete a chat from your chat history, along with all the corresponding messages
     DeleteChat(JID, oneshot::Sender<Result<(), DatabaseError>>),
     /// delete a message from your chat history
@@ -150,13 +162,10 @@ pub enum Command<Fs: FileStore> {
 
 #[derive(Debug, Clone)]
 pub enum UpdateMessage {
-    Online(Online, Vec<Contact>),
+    Online(Online, Vec<(Contact, User)>),
     Offline(Offline),
-    /// received roster from jabber server (replace full app roster state with this)
-    /// is this needed?
-    FullRoster(Vec<Contact>),
     /// (only update app roster state, don't replace)
-    RosterUpdate(Contact),
+    RosterUpdate(Contact, User),
     RosterDelete(JID),
     /// presences should be stored with users in the ui, not contacts, as presences can be received from anyone
     Presence {
@@ -167,10 +176,12 @@ pub enum UpdateMessage {
     // MessageDispatched(Uuid),
     Message {
         to: JID,
+        from: User,
         message: Message,
     },
     MessageDelivery {
         id: Uuid,
+        chat: JID,
         delivery: Delivery,
     },
     SubscriptionRequest(jid::JID),
@@ -276,6 +287,22 @@ impl<Fs: FileStore> Client<Fs> {
         Ok(roster)
     }
 
+    pub async fn get_roster_with_users(
+        &self,
+    ) -> Result<Vec<(Contact, User)>, CommandError<RosterError>> {
+        let (send, recv) = oneshot::channel();
+        self.send(CoreClientCommand::Command(Command::GetRosterWithUsers(
+            send,
+        )))
+        .await
+        .map_err(|e| CommandError::Actor(Into::<ActorError>::into(e)))?;
+        let roster = timeout(self.timeout, recv)
+            .await
+            .map_err(|e| CommandError::Actor(Into::<ActorError>::into(e)))?
+            .map_err(|e| CommandError::Actor(Into::<ActorError>::into(e)))??;
+        Ok(roster)
+    }
+
     pub async fn get_chats(&self) -> Result<Vec<Chat>, CommandError<DatabaseError>> {
         let (send, recv) = oneshot::channel();
         self.send(CoreClientCommand::Command(Command::GetChats(send)))
@@ -316,6 +343,22 @@ impl<Fs: FileStore> Client<Fs> {
         Ok(chats)
     }
 
+    pub async fn get_chats_ordered_with_latest_messages_and_users(
+        &self,
+    ) -> Result<Vec<((Chat, User), (Message, User))>, CommandError<DatabaseError>> {
+        let (send, recv) = oneshot::channel();
+        self.send(CoreClientCommand::Command(
+            Command::GetChatsOrderedWithLatestMessagesAndUsers(send),
+        ))
+        .await
+        .map_err(|e| CommandError::Actor(Into::<ActorError>::into(e)))?;
+        let chats = timeout(self.timeout, recv)
+            .await
+            .map_err(|e| CommandError::Actor(Into::<ActorError>::into(e)))?
+            .map_err(|e| CommandError::Actor(Into::<ActorError>::into(e)))??;
+        Ok(chats)
+    }
+
     pub async fn get_chat(&self, jid: JID) -> Result<Chat, CommandError<DatabaseError>> {
         let (send, recv) = oneshot::channel();
         self.send(CoreClientCommand::Command(Command::GetChat(jid, send)))
@@ -343,6 +386,23 @@ impl<Fs: FileStore> Client<Fs> {
         Ok(messages)
     }
 
+    pub async fn get_messages_with_users(
+        &self,
+        jid: JID,
+    ) -> Result<Vec<(Message, User)>, CommandError<DatabaseError>> {
+        let (send, recv) = oneshot::channel();
+        self.send(CoreClientCommand::Command(Command::GetMessagesWithUsers(
+            jid, send,
+        )))
+        .await
+        .map_err(|e| CommandError::Actor(Into::<ActorError>::into(e)))?;
+        let messages = timeout(self.timeout, recv)
+            .await
+            .map_err(|e| CommandError::Actor(Into::<ActorError>::into(e)))?
+            .map_err(|e| CommandError::Actor(Into::<ActorError>::into(e)))??;
+        Ok(messages)
+    }
+
     pub async fn delete_chat(&self, jid: JID) -> Result<(), CommandError<DatabaseError>> {
         let (send, recv) = oneshot::channel();
         self.send(CoreClientCommand::Command(Command::DeleteChat(jid, send)))