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

1 files changed, 17 insertions, 17 deletions

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>
     }