feat: make `MacawUser`, `MacawChat` and `MacawMessage` arena-allocated

17 files changed, 264 insertions, 114 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
     }
diff --git a/src/components/chat_header.rs b/src/components/chat_header.rs
index 208e7f6..ab33d2b 100644
--- a/src/components/chat_header.rs
+++ b/src/components/chat_header.rs
@@ -6,13 +6,12 @@ use crate::{chat::MacawChat, components::avatar::AvatarWithPresence, user::get_n
 
 #[component]
 pub fn ChatViewHeader(chat: MacawChat) -> impl IntoView {
-    let chat_user = <ArcStore<filamento::user::User> as Clone>::clone(&chat.user).into();
-    let name = move || get_name(chat_user, true);
-    let jid = move || chat_user.jid().read().to_string();
+    let name = move || get_name(chat.user.get().into(), true);
+    let jid = move || chat.user.get().jid().read().to_string();
 
     view! {
         <div class="chat-view-header panel">
-            <AvatarWithPresence user=chat_user />
+            <AvatarWithPresence user=chat.user.get().into() />
             <div class="user-info">
                 <h2 class="name">{name}</h2>
                 <h3>{jid}</h3>
diff --git a/src/components/chats_list.rs b/src/components/chats_list.rs
index b8cf34c..a5ecc9b 100644
--- a/src/components/chats_list.rs
+++ b/src/components/chats_list.rs
@@ -4,7 +4,7 @@ use jid::BareJID;
 use leptos::prelude::*;
 use tracing::debug;
 
-use crate::{chat::MacawChat, client::Client, components::{icon::IconComponent, new_chat::NewChatWidget, overlay::Overlay}, icon::Icon, message::MacawMessage, message_subscriptions::MessageSubscriptions};
+use crate::{chat::{ArcMacawChat, MacawChat}, client::Client, components::{icon::IconComponent, new_chat::NewChatWidget, overlay::Overlay}, icon::Icon, message::{ArcMacawMessage, MacawMessage}, message_subscriptions::MessageSubscriptions};
 
 mod chats_list_item;
 
@@ -26,8 +26,8 @@ pub fn ChatsList() -> impl IntoView {
                         (
                             chat.correspondent.clone(),
                             (
-                                MacawChat::got_chat_and_user(chat, chat_user),
-                                MacawMessage::got_message_and_user(message, message_user),
+                                ArcMacawChat::got_chat_and_user(chat, chat_user),
+                                ArcMacawMessage::got_message_and_user(message, message_user),
                             ),
                         )
                     })
@@ -55,7 +55,7 @@ pub fn ChatsList() -> impl IntoView {
             if let Some((chat, _latest_message)) = chats.shift_remove(&to) {
                 // TODO: check if new message is actually latest message
                 debug!("chat existed");
-                debug!("new message: {}", new_message.message.read().body.body);
+                debug!("new message: {}", new_message.message.get().read().body.body);
                 chats.insert_before(0, to, (chat.clone(), new_message));
                 debug!("done setting");
             } else {
@@ -64,7 +64,7 @@ pub fn ChatsList() -> impl IntoView {
                 let chat = client.get_chat(to.clone()).await.unwrap();
                 let user = client.get_user(to.clone()).await.unwrap();
                 debug!("before got chat");
-                let chat = MacawChat::got_chat_and_user(chat, user);
+                let chat = ArcMacawChat::got_chat_and_user(chat, user);
                 debug!("after got chat");
                 chats.insert_before(0, to, (chat, new_message));
                 debug!("done setting");
@@ -73,7 +73,7 @@ pub fn ChatsList() -> impl IntoView {
         debug!("set the new message");
     });
     on_cleanup(move || {
-        if let Some(sub_id) = sub_id.get() {
+        if let Some(sub_id) = sub_id.get_untracked() {
             new_messages_signal.write().unsubscribe_all(sub_id);
         }
     });
@@ -99,8 +99,8 @@ pub fn ChatsList() -> impl IntoView {
                 </div>
             </div>
             <div class="chats-list-chats">
-                <For each=move || chats.get() key=|chat| chat.1.1.message.read().id let(chat)>
-                    <ChatsListItem chat=chat.1.0 message=chat.1.1 />
+                <For each=move || chats.get() key=|chat| chat.1.1.message.get().read().id let(chat)>
+                    <ChatsListItem chat=chat.1.0.into() message=chat.1.1.into() />
                 </For>
             </div>
         </div>
diff --git a/src/components/chats_list/chats_list_item.rs b/src/components/chats_list/chats_list_item.rs
index 191f163..d1da727 100644
--- a/src/components/chats_list/chats_list_item.rs
+++ b/src/components/chats_list/chats_list_item.rs
@@ -10,33 +10,30 @@ use crate::{chat::MacawChat, components::{avatar::AvatarWithPresence, sidebar::O
 
 #[component]
 pub fn ChatsListItem(chat: MacawChat, message: MacawMessage) -> impl IntoView {
-    let chat_chat: Store<Chat> = <ArcStore<Chat> as Clone>::clone(&chat.chat).into();
-    let chat_user: Store<User> =
-        <ArcStore<filamento::user::User> as Clone>::clone(&chat.user).into();
-    let message_message: Store<Message> = <ArcStore<Message> as Clone>::clone(&message.message).into();
-    let name = move || get_name(chat_user, true);
+    let name = move || get_name(chat.user.get().into(), true);
 
     // TODO: store fine-grained reactivity
-    let latest_message_body = move || message_message.body().get().body;
+    let latest_message_body = move || message.get().body().get().body;
     let open_chats: Store<OpenChatsPanel> =
         use_context().expect("no open chats panel store in context");
 
     let open_chat = move |_| {
         debug!("opening chat");
-        open_chats.update(|open_chats| open_chats.open(chat.clone()));
+        open_chats.update(|open_chats| open_chats.open(chat.into()));
+        // open_chats.update(|open_chats| open_chats.open(chat.chat.try_get_value().unwrap().get().clone()));
     };
 
     let open = move || {
         if let Some(open_chat) = &*open_chats.chat_view().read() {
             debug!("got open chat: {:?}", open_chat);
-            if *open_chat == *chat_chat.correspondent().read() {
+            if *open_chat == *chat.get().correspondent().read() {
                 return Open::Focused;
             }
         }
         if let Some(_backgrounded_chat) = open_chats
             .chats()
             .read()
-            .get(chat_chat.correspondent().read().deref())
+            .get(chat.get().correspondent().read().deref())
         {
             return Open::Open;
         }
@@ -45,7 +42,7 @@ pub fn ChatsListItem(chat: MacawChat, message: MacawMessage) -> impl IntoView {
     let focused = move || open().is_focused();
     let open = move || open().is_open();
 
-    let date = move || message_message.timestamp().read().naive_local();
+    let date = move || message.get().timestamp().read().naive_local();
     let now = move || Local::now().naive_local();
     let timeinfo = move || if date().date() == now().date() {
         // TODO: localisation/config
@@ -56,7 +53,7 @@ pub fn ChatsListItem(chat: MacawChat, message: MacawMessage) -> impl IntoView {
 
     view! {
         <div class="chats-list-item" class:open=move || open() class:focused=move || focused() on:click=open_chat>
-            <AvatarWithPresence user=chat_user />
+            <AvatarWithPresence user=chat.user.get().into() />
             <div class="item-info">
                 <div class="main-info"><p class="name">{name}</p><p class="timestamp">{timeinfo}</p></div>
                 <div class="sub-info"><p class="message-preview">{latest_message_body}</p><p><!-- "TODO: delivery or unread state" --></p></div>
diff --git a/src/components/message.rs b/src/components/message.rs
index 2ae2ef0..5deccdd 100644
--- a/src/components/message.rs
+++ b/src/components/message.rs
@@ -9,8 +9,8 @@ use super::icon::Delivery;
 #[component]
 pub fn Message(message: MacawMessage, major: bool, r#final: bool) -> impl IntoView {
     let message_message: Store<filamento::chat::Message> =
-        <ArcStore<filamento::chat::Message> as Clone>::clone(&message.message).into();
-    let message_user = <ArcStore<filamento::user::User> as Clone>::clone(&message.user).into();
+        <ArcStore<filamento::chat::Message> as Clone>::clone(&message.get()).into();
+    let message_user = <ArcStore<filamento::user::User> as Clone>::clone(&message.user.get()).into();
     let avatar = LocalResource::new(move || get_avatar(message_user));
     let name = move || get_name(message_user, false);
 
diff --git a/src/components/message_history_buffer.rs b/src/components/message_history_buffer.rs
index 36439a8..ecdba5b 100644
--- a/src/components/message_history_buffer.rs
+++ b/src/components/message_history_buffer.rs
@@ -7,15 +7,15 @@ use reactive_stores::{ArcStore, Store};
 use tracing::{debug, error};
 use uuid::Uuid;
 
-use crate::{chat::MacawChat, client::Client, components::message::Message, message::MacawMessage, message_subscriptions::MessageSubscriptions};
+use crate::{chat::MacawChat, client::Client, components::message::Message, message::{ArcMacawMessage, MacawMessage}, message_subscriptions::MessageSubscriptions};
 
 #[component]
 pub fn MessageHistoryBuffer(chat: MacawChat) -> impl IntoView {
     let (messages, set_messages) = arc_signal(IndexMap::new());
     let chat_chat: Store<Chat> =
-        <ArcStore<filamento::chat::Chat> as Clone>::clone(&chat.chat).into();
+        <ArcStore<filamento::chat::Chat> as Clone>::clone(&chat.get()).into();
     let chat_user: Store<User> =
-        <ArcStore<filamento::user::User> as Clone>::clone(&chat.user).into();
+        <ArcStore<filamento::user::User> as Clone>::clone(&chat.user.get()).into();
 
     let load_set_messages = set_messages.clone();
     let load_messages = LocalResource::new(move || {
@@ -33,7 +33,7 @@ pub fn MessageHistoryBuffer(chat: MacawChat) -> impl IntoView {
                         .map(|(message, message_user)| {
                             (
                                 message.id,
-                                MacawMessage::got_message_and_user(message, message_user),
+                                ArcMacawMessage::got_message_and_user(message, message_user),
                             )
                         })
                         .collect::<IndexMap<Uuid, _>>();
@@ -63,16 +63,16 @@ pub fn MessageHistoryBuffer(chat: MacawChat) -> impl IntoView {
                 debug!("got new message in let message buffer");
                 let mut messages = load_new_messages_set.write();
                 if let Some((_, last)) = messages.last() {
-                    if *<ArcStore<filamento::chat::Message> as Clone>::clone(&last.message)
+                    if *<ArcStore<filamento::chat::Message> as Clone>::clone(&last.message.get())
                         .timestamp()
                         .read()
-                        < *<ArcStore<filamento::chat::Message> as Clone>::clone(&new_message.message)
+                        < *<ArcStore<filamento::chat::Message> as Clone>::clone(&new_message.message.get())
                             .timestamp()
                             .read()
                     {
                         messages.insert(
                             <ArcStore<filamento::chat::Message> as Clone>::clone(
-                                &new_message.message,
+                                &new_message.message.get(),
                             )
                             .id()
                             .get(),
@@ -81,12 +81,12 @@ pub fn MessageHistoryBuffer(chat: MacawChat) -> impl IntoView {
                         debug!("set the new message in message buffer");
                     } else {
                         let index = match messages.binary_search_by(|_, value| {
-                            <ArcStore<filamento::chat::Message> as Clone>::clone(&value.message)
+                            <ArcStore<filamento::chat::Message> as Clone>::clone(&value.message.get())
                                 .timestamp()
                                 .read()
                                 .cmp(
                                     &<ArcStore<filamento::chat::Message> as Clone>::clone(
-                                        &new_message.message,
+                                        &new_message.message.get(),
                                     )
                                     .timestamp()
                                     .read(),
@@ -99,7 +99,7 @@ pub fn MessageHistoryBuffer(chat: MacawChat) -> impl IntoView {
                             // TODO: check if this logic is correct
                             index,
                             <ArcStore<filamento::chat::Message> as Clone>::clone(
-                                &new_message.message,
+                                &new_message.message.get(),
                             )
                             .id()
                             .get(),
@@ -109,7 +109,7 @@ pub fn MessageHistoryBuffer(chat: MacawChat) -> impl IntoView {
                     }
                 } else {
                     messages.insert(
-                        <ArcStore<filamento::chat::Message> as Clone>::clone(&new_message.message)
+                        <ArcStore<filamento::chat::Message> as Clone>::clone(&new_message.message.get())
                             .id()
                             .get(),
                         new_message,
@@ -120,10 +120,10 @@ pub fn MessageHistoryBuffer(chat: MacawChat) -> impl IntoView {
         }
     });
     on_cleanup(move || {
-        if let Some(sub_id) = sub_id.get() {
+        if let Some(sub_id) = sub_id.get_untracked() {
             new_messages_signal
                 .write()
-                .unsubscribe_chat(sub_id, chat_chat.correspondent().get());
+                .unsubscribe_chat(sub_id, chat_chat.correspondent().get_untracked());
         }
     });
 
@@ -135,7 +135,7 @@ pub fn MessageHistoryBuffer(chat: MacawChat) -> impl IntoView {
             .into_iter()
             .map(|(id, message)| {
                 let message_timestamp =
-                    <ArcStore<filamento::chat::Message> as Clone>::clone(&message.message)
+                    <ArcStore<filamento::chat::Message> as Clone>::clone(&message.message.get())
                         .timestamp()
                         .read()
                         .naive_local();
@@ -143,7 +143,7 @@ pub fn MessageHistoryBuffer(chat: MacawChat) -> impl IntoView {
                 // if message_timestamp.date() > last_timestamp.date() {
                 //     messages_view = messages_view.push(date(message_timestamp.date()));
                 // }
-                let major = if last_user.as_ref() != Some(&message.message.read().from)
+                let major = if last_user.as_ref() != Some(&message.message.get().read().from)
                     || message_timestamp - last_timestamp > TimeDelta::minutes(3)
                 {
                     true
@@ -151,7 +151,7 @@ pub fn MessageHistoryBuffer(chat: MacawChat) -> impl IntoView {
                     false
                 };
                 last_user = Some(
-                    <ArcStore<filamento::chat::Message> as Clone>::clone(&message.message)
+                    <ArcStore<filamento::chat::Message> as Clone>::clone(&message.message.get())
                         .from()
                         .get(),
                 );
@@ -168,7 +168,7 @@ pub fn MessageHistoryBuffer(chat: MacawChat) -> impl IntoView {
     view! {
         <div class="messages-buffer">
             <For each=each key=|message| (message.0, message.1.1, message.1.2) let(message)>
-                <Message message=message.1.0 major=message.1.1 r#final=message.1.2 />
+                <Message message=message.1.0.into() major=message.1.1 r#final=message.1.2 />
             </For>
         </div>
     }
diff --git a/src/components/new_chat.rs b/src/components/new_chat.rs
index 8047afb..b706ca9 100644
--- a/src/components/new_chat.rs
+++ b/src/components/new_chat.rs
@@ -6,7 +6,7 @@ use leptos::{html::Input, prelude::*};
 use reactive_stores::{ArcStore, Store};
 use thiserror::Error;
 
-use crate::{chat::MacawChat, client::Client, open_chats::OpenChatsPanel, state_store::StateStore, user::MacawUser};
+use crate::{chat::{ArcMacawChat, MacawChat}, client::Client, open_chats::OpenChatsPanel, state_store::StateStore, user::{ArcMacawUser, MacawUser}};
 
 #[derive(Clone, Debug, Error)]
 pub enum NewChatError {
@@ -78,9 +78,9 @@ pub fn NewChatWidget(set_open_new_chat: WriteSignal<bool>) -> impl IntoView {
             let chat = {
                 // let user = MacawUser::got_user(user);
                 let user = user_state_store.store(user.jid.clone(), ArcStore::new(user));
-                let user = MacawUser { user };
+                let user = ArcMacawUser { user };
                 let chat = chat_state_store.store(chat.correspondent.clone(), ArcStore::new(chat));
-                MacawChat { chat, user }
+                ArcMacawChat { chat, user }
             };
             open_chats.update(|open_chats| open_chats.open(chat.clone()));
             set_open_new_chat.set(false);
diff --git a/src/components/personal_status.rs b/src/components/personal_status.rs
index f830a1b..8439756 100644
--- a/src/components/personal_status.rs
+++ b/src/components/personal_status.rs
@@ -11,13 +11,12 @@ pub fn PersonalStatus() -> impl IntoView {
 
     let (open, set_open) = signal(false);
     move || if let Some(user) = user.get() {
-        let user: Store<User> = <ArcStore<filamento::user::User> as Clone>::clone(&(*user.user)).into();
         view! {
             <div class="dock-item" class:focused=move || *open.read()  on:click=move |_| {
                 debug!("set open to true");
                 set_open.update(|state| *state = !*state)
             }>
-                <AvatarWithPresence user=user />
+                <AvatarWithPresence user=user.get().into() />
                 <div class="dock-pill"></div>
             </div>
             {move || {
@@ -26,7 +25,7 @@ pub fn PersonalStatus() -> impl IntoView {
                 if open {
                 view! {
                     <Overlay set_open>
-                        <PersonalStatusMenu user set_open/>
+                        <PersonalStatusMenu user=user.get().into() set_open/>
                     </Overlay>
                 }.into_any()
             } else {
diff --git a/src/components/roster_list/roster_list_item.rs b/src/components/roster_list/roster_list_item.rs
index 46ac1cc..9ebc26a 100644
--- a/src/components/roster_list/roster_list_item.rs
+++ b/src/components/roster_list/roster_list_item.rs
@@ -5,13 +5,13 @@ use leptos::prelude::*;
 use reactive_stores::{ArcStore, Store};
 use tracing::debug;
 
-use crate::{chat::MacawChat, components::{avatar::AvatarWithPresence, sidebar::Open}, contact::MacawContact, open_chats::{OpenChatsPanel, OpenChatsPanelStoreFields}, user::get_name};
+use crate::{chat::{ArcMacawChat, MacawChat}, components::{avatar::AvatarWithPresence, sidebar::Open}, contact::MacawContact, open_chats::{OpenChatsPanel, OpenChatsPanelStoreFields}, user::get_name};
 
 #[component]
 pub fn RosterListItem(contact: MacawContact) -> impl IntoView {
     let contact_contact: Store<Contact> = contact.contact;
     let contact_user: Store<User> =
-        <ArcStore<filamento::user::User> as Clone>::clone(&contact.user).into();
+        <ArcStore<filamento::user::User> as Clone>::clone(&contact.user.get()).into();
     let name = move || get_name(contact_user, false);
 
     let open_chats: Store<OpenChatsPanel> =
@@ -23,11 +23,11 @@ pub fn RosterListItem(contact: MacawContact) -> impl IntoView {
         correspondent: contact_user.jid().get(),
         have_chatted: false,
     };
-    let chat = MacawChat::got_chat_and_user(chat, contact_user.get());
+    let chat = ArcMacawChat::got_chat_and_user(chat, contact_user.get());
 
     let open_chat = move |_| {
         debug!("opening chat");
-        open_chats.update(|open_chats| open_chats.open(chat.clone()));
+        open_chats.update(|open_chats| open_chats.open(Clone::clone(&chat)));
     };
 
     let open = move || {
diff --git a/src/contact.rs b/src/contact.rs
index e9ab21f..9adec16 100644
--- a/src/contact.rs
+++ b/src/contact.rs
@@ -3,23 +3,52 @@ use std::ops::{Deref, DerefMut};
 use filamento::{roster::Contact, user::User};
 use reactive_stores::Store;
 
-use crate::user::MacawUser;
+use crate::user::{ArcMacawUser, MacawUser};
 
-#[derive(Clone)]
+#[derive(Clone, Copy)]
 pub struct MacawContact {
     pub contact: Store<Contact>,
     pub user: MacawUser,
 }
 
-impl MacawContact {
+impl Deref for MacawContact {
+    type Target = Store<Contact>;
+
+    fn deref(&self) -> &Self::Target {
+        &self.contact
+    }
+}
+
+impl DerefMut for MacawContact {
+    fn deref_mut(&mut self) -> &mut Self::Target {
+        &mut self.contact
+    }
+}
+
+impl From<ArcMacawContact> for MacawContact {
+    fn from(value: ArcMacawContact) -> Self {
+        Self {
+            contact: value.contact,
+            user: value.user.into(),
+        }
+    }
+}
+
+#[derive(Clone)]
+pub struct ArcMacawContact {
+    pub contact: Store<Contact>,
+    pub user: ArcMacawUser,
+}
+
+impl ArcMacawContact {
     pub fn got_contact_and_user(contact: Contact, user: User) -> Self {
         let contact = Store::new(contact);
-        let user = MacawUser::got_user(user);
+        let user = ArcMacawUser::got_user(user);
         Self { contact, user }
     }
 }
 
-impl Deref for MacawContact {
+impl Deref for ArcMacawContact {
     type Target = Store<Contact>;
 
     fn deref(&self) -> &Self::Target {
@@ -27,7 +56,7 @@ impl Deref for MacawContact {
     }
 }
 
-impl DerefMut for MacawContact {
+impl DerefMut for ArcMacawContact {
     fn deref_mut(&mut self) -> &mut Self::Target {
         &mut self.contact
     }
diff --git a/src/message.rs b/src/message.rs
index e5caed1..878085e 100644
--- a/src/message.rs
+++ b/src/message.rs
@@ -5,25 +5,60 @@ use reactive_stores::ArcStore;
 use uuid::Uuid;
 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 MacawMessage {
-    pub message: StateListener<Uuid, ArcStore<Message>>,
+    pub message: ArenaItem<StateListener<Uuid, ArcStore<Message>>>,
     pub user: MacawUser,
 }
 
 impl MacawMessage {
+    pub fn get(&self) -> ArcStore<Message> {
+        self.try_get_value().unwrap().get()
+    }
+}
+
+impl Deref for MacawMessage {
+    type Target = ArenaItem<StateListener<Uuid, ArcStore<Message>>>;
+
+    fn deref(&self) -> &Self::Target {
+        &self.message
+    }
+}
+
+impl DerefMut for MacawMessage {
+    fn deref_mut(&mut self) -> &mut Self::Target {
+        &mut self.message
+    }
+}
+
+impl From<ArcMacawMessage> for MacawMessage {
+    fn from(value: ArcMacawMessage) -> Self {
+        Self {
+            message: ArenaItem::new_with_storage(value.message),
+            user: value.user.into(),
+        }
+    }
+}
+
+#[derive(Clone)]
+pub struct ArcMacawMessage {
+    pub message: StateListener<Uuid, ArcStore<Message>>,
+    pub user: ArcMacawUser,
+}
+
+impl ArcMacawMessage {
     pub fn got_message_and_user(message: Message, user: User) -> Self {
         let message_state_store: StateStore<Uuid, ArcStore<Message>> =
             use_context().expect("no message state store");
         let message = message_state_store.store(message.id, ArcStore::new(message));
-        let user = MacawUser::got_user(user);
+        let user = ArcMacawUser::got_user(user);
         Self { message, user }
     }
 }
 
-impl Deref for MacawMessage {
+impl Deref for ArcMacawMessage {
     type Target = StateListener<Uuid, ArcStore<Message>>;
 
     fn deref(&self) -> &Self::Target {
@@ -31,7 +66,7 @@ impl Deref for MacawMessage {
     }
 }
 
-impl DerefMut for MacawMessage {
+impl DerefMut for ArcMacawMessage {
     fn deref_mut(&mut self) -> &mut Self::Target {
         &mut self.message
     }
diff --git a/src/message_subscriptions.rs b/src/message_subscriptions.rs
index 5b1d276..17d924f 100644
--- a/src/message_subscriptions.rs
+++ b/src/message_subscriptions.rs
@@ -4,11 +4,11 @@ use jid::BareJID;
 use tokio::sync::mpsc::{self, Receiver};
 use uuid::Uuid;
 
-use crate::message::MacawMessage;
+use crate::message::{ArcMacawMessage, MacawMessage};
 
 pub struct MessageSubscriptions {
-    all: HashMap<Uuid, mpsc::Sender<(BareJID, MacawMessage)>>,
-    subset: HashMap<BareJID, HashMap<Uuid, mpsc::Sender<MacawMessage>>>,
+    all: HashMap<Uuid, mpsc::Sender<(BareJID, ArcMacawMessage)>>,
+    subset: HashMap<BareJID, HashMap<Uuid, mpsc::Sender<ArcMacawMessage>>>,
 }
 
 impl MessageSubscriptions {
@@ -19,7 +19,7 @@ impl MessageSubscriptions {
         }
     }
 
-    pub async fn broadcast(&mut self, to: BareJID, message: MacawMessage) {
+    pub async fn broadcast(&mut self, to: BareJID, message: ArcMacawMessage) {
         // subscriptions to all
         let mut removals = Vec::new();
         for (id, sender) in &self.all {
@@ -54,14 +54,14 @@ impl MessageSubscriptions {
         }
     }
 
-    pub fn subscribe_all(&mut self) -> (Uuid, Receiver<(BareJID, MacawMessage)>) {
+    pub fn subscribe_all(&mut self) -> (Uuid, Receiver<(BareJID, ArcMacawMessage)>) {
         let (send, recv) = mpsc::channel(10);
         let id = Uuid::new_v4();
         self.all.insert(id, send);
         (id, recv)
     }
 
-    pub fn subscribe_chat(&mut self, chat: BareJID) -> (Uuid, Receiver<MacawMessage>) {
+    pub fn subscribe_chat(&mut self, chat: BareJID) -> (Uuid, Receiver<ArcMacawMessage>) {
         let (send, recv) = mpsc::channel(10);
         let id = Uuid::new_v4();
         if let Some(chat_subscribers) = self.subset.get_mut(&chat) {
diff --git a/src/open_chats.rs b/src/open_chats.rs
index ed89537..6d08c5d 100644
--- a/src/open_chats.rs
+++ b/src/open_chats.rs
@@ -5,20 +5,20 @@ use reactive_stores::{ArcStore, Store};
 use tracing::debug;
 use leptos::prelude::*;
 
-use crate::chat::MacawChat;
+use crate::chat::{ArcMacawChat, MacawChat};
 
 #[derive(Store, Default)]
 pub struct OpenChatsPanel {
     // jid must be a chat in the chats map
     chat_view: Option<BareJID>,
     #[store(key: BareJID = |(jid, _)| jid.clone())]
-    chats: IndexMap<BareJID, MacawChat>,
+    chats: IndexMap<BareJID, ArcMacawChat>,
 }
 
-pub fn open_chat(open_chats: Store<OpenChatsPanel>, chat: MacawChat) {
+pub fn open_chat(open_chats: Store<OpenChatsPanel>, chat: ArcMacawChat) {
     if let Some(jid) = &*open_chats.chat_view().read() {
         if let Some((index, _jid, entry)) = open_chats.chats().write().shift_remove_full(jid) {
-            let new_jid = <ArcStore<filamento::chat::Chat> as Clone>::clone(&chat.chat)
+            let new_jid = chat.get()
                 .correspondent()
                 .read()
                 .clone();
@@ -28,7 +28,7 @@ pub fn open_chat(open_chats: Store<OpenChatsPanel>, chat: MacawChat) {
                 .insert_before(index, new_jid.clone(), chat);
             *open_chats.chat_view().write() = Some(new_jid);
         } else {
-            let new_jid = <ArcStore<filamento::chat::Chat> as Clone>::clone(&chat.chat)
+            let new_jid = chat.get()
                 .correspondent()
                 .read()
                 .clone();
@@ -36,7 +36,7 @@ pub fn open_chat(open_chats: Store<OpenChatsPanel>, chat: MacawChat) {
             *open_chats.chat_view().write() = Some(new_jid);
         }
     } else {
-        let new_jid = <ArcStore<filamento::chat::Chat> as Clone>::clone(&chat.chat)
+        let new_jid = chat.get()
             .correspondent()
             .read()
             .clone();
@@ -46,18 +46,18 @@ pub fn open_chat(open_chats: Store<OpenChatsPanel>, chat: MacawChat) {
 }
 
 impl OpenChatsPanel {
-    pub fn open(&mut self, chat: MacawChat) {
+    pub fn open(&mut self, chat: ArcMacawChat) {
         if let Some(jid) = &mut self.chat_view {
             debug!("a chat was already open");
             if let Some((index, _jid, entry)) = self.chats.shift_remove_full(jid) {
-                let new_jid = <ArcStore<filamento::chat::Chat> as Clone>::clone(&chat.chat)
+                let new_jid = chat.get()
                     .correspondent()
                     .read()
                     .clone();
                 self.chats.insert_before(index, new_jid.clone(), chat);
                 *&mut self.chat_view = Some(new_jid);
             } else {
-                let new_jid = <ArcStore<filamento::chat::Chat> as Clone>::clone(&chat.chat)
+                let new_jid = chat.get()
                     .correspondent()
                     .read()
                     .clone();
@@ -65,7 +65,7 @@ impl OpenChatsPanel {
                 *&mut self.chat_view = Some(new_jid);
             }
         } else {
-            let new_jid = <ArcStore<filamento::chat::Chat> as Clone>::clone(&chat.chat)
+            let new_jid = chat.get()
                 .correspondent()
                 .read()
                 .clone();
diff --git a/src/state_store.rs b/src/state_store.rs
index 2536cda..8d80b3f 100644
--- a/src/state_store.rs
+++ b/src/state_store.rs
@@ -6,7 +6,7 @@ use leptos::prelude::*;
 // V has to be an arc signal
 #[derive(Debug)]
 pub struct ArcStateStore<K, V> {
-    store: Arc<RwLock<HashMap<K, (V, usize)>>>,
+    store: Arc<RwLock<HashMap<K, (ArcRwSignal<V>, usize)>>>,
 }
 
 impl<K, V> PartialEq for ArcStateStore<K, V> {
@@ -115,18 +115,26 @@ where
             let store = self.inner.try_get_value().unwrap();
             let mut store = store.store.write().unwrap();
             if let Some((v, count)) = store.get_mut(&key) {
-                *v = value.clone();
+                v.set(value);
                 *count += 1;
+                StateListener {
+                    value: v.clone(),
+                    cleaner: StateCleaner {
+                        key,
+                        state_store: self.clone(),
+                    },
+                }
             } else {
-                store.insert(key.clone(), (value.clone(), 1));
+                let v = ArcRwSignal::new(value);
+                store.insert(key.clone(), (v.clone(), 1));
+                StateListener {
+                    value: v.into(),
+                    cleaner: StateCleaner {
+                        key,
+                        state_store: self.clone(),
+                    },
+                }
             }
-        };
-        StateListener {
-            value,
-            cleaner: StateCleaner {
-                key,
-                state_store: self.clone(),
-            },
         }
     }
 }
@@ -140,7 +148,7 @@ where
         let store = self.inner.try_get_value().unwrap();
         let mut store = store.store.write().unwrap();
         if let Some((v, _)) = store.get_mut(key) {
-            *v = value;
+            v.set(value)
         }
     }
 
@@ -148,7 +156,7 @@ where
         let store = self.inner.try_get_value().unwrap();
         let mut store = store.store.write().unwrap();
         if let Some((v, _)) = store.get_mut(key) {
-            modify(v);
+            v.update(|v| modify(v));
         }
     }
 
@@ -171,7 +179,7 @@ where
     K: Eq + std::hash::Hash + 'static + std::marker::Send + std::marker::Sync,
     V: 'static + std::marker::Send + std::marker::Sync,
 {
-    value: V,
+    value: ArcRwSignal<V>,
     cleaner: StateCleaner<K, V>,
 }
 
@@ -180,7 +188,7 @@ impl<
     V: std::marker::Send + std::marker::Sync,
 > Deref for StateListener<K, V>
 {
-    type Target = V;
+    type Target = ArcRwSignal<V>;
 
     fn deref(&self) -> &Self::Target {
         &self.value
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
     }
diff --git a/src/views/macaw.rs b/src/views/macaw.rs
index 18e0ad3..1b7051f 100644
--- a/src/views/macaw.rs
+++ b/src/views/macaw.rs
@@ -10,7 +10,7 @@ use tokio::sync::mpsc::Receiver;
 use tracing::debug;
 use uuid::Uuid;
 
-use crate::{client::Client, components::sidebar::Sidebar, contact::MacawContact, message::MacawMessage, message_subscriptions::MessageSubscriptions, open_chats::OpenChatsPanel, roster::{Roster, RosterStoreFields}, state_store::StateStore, user::MacawUser, user_presences::{Presences, UserPresences}};
+use crate::{client::Client, components::sidebar::Sidebar, contact::{ArcMacawContact, MacawContact}, message::{ArcMacawMessage, MacawMessage}, message_subscriptions::MessageSubscriptions, open_chats::OpenChatsPanel, roster::{Roster, RosterStoreFields}, state_store::StateStore, user::{ArcMacawUser, MacawUser}, user_presences::{Presences, UserPresences}};
 
 use super::AppState;
 
@@ -49,11 +49,11 @@ pub fn Macaw(
     let user_presences = Store::new(UserPresences::new());
     provide_context(user_presences);
 
-    let client_user = LocalResource::new(move || {
+    let client_user: LocalResource<MacawUser> = LocalResource::new(move || {
         async move {
             let client = use_context::<Client>().expect("client not in context");
             let user = client.get_user((*client.jid).clone()).await.unwrap();
-            MacawUser::got_user(user)
+            ArcMacawUser::got_user(user).into()
         }
     });
     provide_context(client_user);
@@ -74,7 +74,7 @@ pub fn Macaw(
                         .map(|(contact, user)| {
                             (
                                 contact.user_jid.clone(),
-                                MacawContact::got_contact_and_user(contact, user),
+                                ArcMacawContact::got_contact_and_user(contact, user).into(),
                             )
                         })
                         .collect();
@@ -90,7 +90,7 @@ pub fn Macaw(
                             macaw_contact.set(contact);
                         } else {
                             let jid = contact.user_jid.clone();
-                            let contact = MacawContact::got_contact_and_user(contact, user);
+                            let contact = ArcMacawContact::got_contact_and_user(contact, user).into();
                             roster.insert(jid, contact);
                         }
                     });
@@ -116,7 +116,7 @@ pub fn Macaw(
                 }
                 UpdateMessage::Message { to, from, message } => {
                     debug!("before got message");
-                    let new_message = MacawMessage::got_message_and_user(message, from);
+                    let new_message = ArcMacawMessage::got_message_and_user(message, from);
                     debug!("after got message");
                     spawn_local(async move {
                         message_subscriptions
diff --git a/src/views/macaw/open_chats_panel.rs b/src/views/macaw/open_chats_panel.rs
index 062c786..ddc9ec9 100644
--- a/src/views/macaw/open_chats_panel.rs
+++ b/src/views/macaw/open_chats_panel.rs
@@ -36,7 +36,7 @@ pub fn OpenChatsPanelView() -> impl IntoView {
             {move || {
                 if let Some(open_chat) = open_chats.chat_view().get() {
                     if let Some(open_chat) = open_chats.chats().read().get(&open_chat) {
-                        view! { <OpenChatView chat=open_chat.clone() /> }.into_any()
+                        view! { <OpenChatView chat=open_chat.clone().into() /> }.into_any()
                     } else {
                         view! {}.into_any()
                     }
@@ -57,9 +57,7 @@ mod open_chat {
 
     #[component]
     pub fn OpenChatView(chat: MacawChat) -> impl IntoView {
-        let chat_chat: Store<Chat> =
-            <ArcStore<filamento::chat::Chat> as Clone>::clone(&chat.chat).into();
-        let chat_jid = move || chat_chat.correspondent().get();
+        let chat_jid = move || chat.chat.try_get_value().unwrap().get().correspondent().get();
 
         view! {
             <div class="open-chat-view">