1 files changed, 24 insertions, 0 deletions
diff --git a/filamento/src/db.rs b/filamento/src/db.rs
index d94293d..cf21325 100644
--- a/filamento/src/db.rs
+++ b/filamento/src/db.rs
@@ -669,6 +669,30 @@ impl Db {
         Ok(messages)
     }
 
+    pub(crate) async fn read_message_history_with_users(
+        &self,
+        chat: JID,
+    ) -> Result<Vec<(Message, User)>, Error> {
+        let chat_id = self.read_chat_id(chat).await?;
+        #[derive(sqlx::FromRow)]
+        pub struct Row {
+            #[sqlx(flatten)]
+            user: User,
+            #[sqlx(flatten)]
+            message: Message,
+        }
+        let messages: Vec<Row> =
+            sqlx::query_as("select * from messages join users on jid = from_jid where chat_id = ? order by timestamp asc")
+                .bind(chat_id)
+                .fetch_all(&self.db)
+                .await?;
+        let messages = messages
+            .into_iter()
+            .map(|row| (row.message, row.user))
+            .collect();
+        Ok(messages)
+    }
+
     pub(crate) async fn read_cached_status(&self) -> Result<Online, Error> {
         let online: Online = sqlx::query_as("select * from cached_status where id = 0")
             .fetch_one(&self.db)