database work

1 files changed, 29 insertions, 15 deletions

diff --git a/luz/src/chat.rs b/luz/src/chat.rs
index 24ad709..ff76ce1 100644
--- a/luz/src/chat.rs
+++ b/luz/src/chat.rs
@@ -1,31 +1,45 @@
 use jid::JID;
 use uuid::Uuid;
 
-use crate::{roster::Contact, user::User};
-
-#[derive(Debug)]
+#[derive(Debug, sqlx::FromRow)]
 pub struct Message {
-    id: Uuid,
-    // contains full user information
-    from: Correspondent,
-    body: Body,
+    pub id: Uuid,
+    // does not contain full user information
+    #[sqlx(rename = "from_jid")]
+    pub from: JID,
+    // TODO: originally_from
+    // TODO: message edits
+    // TODO: message timestamp
+    #[sqlx(flatten)]
+    pub body: Body,
 }
 
-#[derive(Debug)]
+// TODO: user migrations
+// pub enum Migrated {
+//     Jabber(User),
+//     Outside,
+// }
+
+#[derive(Debug, sqlx::FromRow)]
 pub struct Body {
     // TODO: rich text, other contents, threads
-    body: String,
+    pub body: String,
 }
 
+#[derive(sqlx::FromRow)]
 pub struct Chat {
-    correspondent: Correspondent,
-    message_history: Vec<Message>,
+    correspondent: JID,
+    // message history is not stored in chat, retreived separately.
+    // pub message_history: Vec<Message>,
 }
 
-#[derive(Debug)]
-pub enum Correspondent {
-    User(User),
-    Contact(Contact),
+impl Chat {
+    pub fn new(correspondent: JID) -> Self {
+        Self { correspondent }
+    }
+    pub fn correspondent(&self) -> &JID {
+        &self.correspondent
+    }
 }
 
 // TODO: group chats