From ab654372e4d3766c8df17623a6de8922fc2a1960 Mon Sep 17 00:00:00 2001
From: cel 🌸 <cel@bunny.garden>
Date: Mon, 2 Jun 2025 19:50:45 +0100
Subject: feat: make `MacawUser`, `MacawChat` and `MacawMessage`
 arena-allocated

---
 src/user.rs | 49 +++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 45 insertions(+), 4 deletions(-)

(limited to 'src/user.rs')

diff --git a/src/user.rs b/src/user.rs
index f55c0dd..e62ebea 100644
--- a/src/user.rs
+++ b/src/user.rs
@@ -7,12 +7,53 @@ use leptos::prelude::*;
 
 use crate::{client::Client, roster::{Roster, RosterStoreFields}, state_store::{StateListener, StateStore}};
 
-#[derive(Clone)]
+#[derive(Clone, Copy)]
 pub struct MacawUser {
-    pub user: StateListener<BareJID, ArcStore<User>>,
+    pub user: ArenaItem<ArcMacawUser>,
+    // TODO: just store avatar src in user
+    // pub avatar: String,
 }
 
 impl MacawUser {
+    pub fn get(&self) -> ArcStore<User> {
+        self.try_get_value().unwrap().get()
+    }
+}
+
+impl Deref for MacawUser {
+    type Target = ArenaItem<ArcMacawUser>;
+
+    fn deref(&self) -> &Self::Target {
+        &self.user
+    }
+}
+
+impl DerefMut for MacawUser {
+    fn deref_mut(&mut self) -> &mut Self::Target {
+        &mut self.user
+    }
+}
+
+impl From<ArcMacawUser> for MacawUser {
+    fn from(value: ArcMacawUser) -> Self {
+        Self {
+            user: ArenaItem::new_with_storage(value),
+        }
+    }
+}
+
+impl From<MacawUser> for ArcMacawUser {
+    fn from(value: MacawUser) -> Self {
+        value.user.try_get_value().unwrap()
+    }
+}
+
+#[derive(Clone)]
+pub struct ArcMacawUser {
+    pub user: StateListener<BareJID, ArcStore<User>>,
+}
+
+impl ArcMacawUser {
     pub fn got_user(user: User) -> Self {
         
         let user_state_store: StateStore<BareJID, ArcStore<User>> =
@@ -22,7 +63,7 @@ impl MacawUser {
     }
 }
 
-impl Deref for MacawUser {
+impl Deref for ArcMacawUser {
     type Target = StateListener<BareJID, ArcStore<User>>;
 
     fn deref(&self) -> &Self::Target {
@@ -30,7 +71,7 @@ impl Deref for MacawUser {
     }
 }
 
-impl DerefMut for MacawUser {
+impl DerefMut for ArcMacawUser {
     fn deref_mut(&mut self) -> &mut Self::Target {
         &mut self.user
     }
-- 
cgit