1 files changed, 50 insertions, 6 deletions

diff --git a/src/chat.rs b/src/chat.rs
index 6785b06..29e2641 100644
--- a/src/chat.rs
+++ b/src/chat.rs
@@ -5,26 +5,70 @@ use jid::BareJID;
 use reactive_stores::ArcStore;
 use leptos::prelude::*;
 
-use crate::{state_store::{StateListener, StateStore}, user::MacawUser};
+use crate::{state_store::{StateListener, StateStore}, user::{ArcMacawUser, MacawUser}};
 
-#[derive(Clone)]
+#[derive(Clone, Copy)]
 pub struct MacawChat {
-    pub chat: StateListener<BareJID, ArcStore<Chat>>,
+    pub chat: ArenaItem<StateListener<BareJID, ArcStore<Chat>>>,
     pub user: MacawUser,
     // user: StateListener<BareJID, ArcStore<User>>,
 }
 
 impl MacawChat {
+    pub fn get(&self) -> ArcStore<Chat> {
+        self.try_get_value().unwrap().get()
+    }
+}
+
+impl Deref for MacawChat {
+    type Target = ArenaItem<StateListener<BareJID, ArcStore<Chat>>>;
+
+    fn deref(&self) -> &Self::Target {
+        &self.chat
+    }
+}
+
+impl DerefMut for MacawChat {
+    fn deref_mut(&mut self) -> &mut Self::Target {
+        &mut self.chat
+    }
+}
+
+impl From<ArcMacawChat> for MacawChat {
+    fn from(value: ArcMacawChat) -> Self {
+        Self {
+            chat: ArenaItem::new_with_storage(value.chat),
+            user: value.user.into(),
+        }
+    }
+}
+
+impl From<MacawChat> for ArcMacawChat {
+    fn from(value: MacawChat) -> Self {
+        Self {
+            chat: value.chat.try_get_value().unwrap(),
+            user: value.user.into(),
+        }
+    }
+}
+
+#[derive(Clone)]
+pub struct ArcMacawChat {
+    pub chat: StateListener<BareJID, ArcStore<Chat>>,
+    pub user: ArcMacawUser,
+}
+
+impl ArcMacawChat {
     pub fn got_chat_and_user(chat: Chat, user: User) -> Self {
         let chat_state_store: StateStore<BareJID, ArcStore<Chat>> =
             use_context().expect("no chat state store");
         let chat = chat_state_store.store(chat.correspondent.clone(), ArcStore::new(chat));
-        let user = MacawUser::got_user(user);
+        let user = ArcMacawUser::got_user(user);
         Self { chat, user }
     }
 }
 
-impl Deref for MacawChat {
+impl Deref for ArcMacawChat {
     type Target = StateListener<BareJID, ArcStore<Chat>>;
 
     fn deref(&self) -> &Self::Target {
@@ -32,7 +76,7 @@ impl Deref for MacawChat {
     }
 }
 
-impl DerefMut for MacawChat {
+impl DerefMut for ArcMacawChat {
     fn deref_mut(&mut self) -> &mut Self::Target {
         &mut self.chat
     }