1 files changed, 15 insertions, 24 deletions

diff --git a/src/components/message_history_buffer.rs b/src/components/message_history_buffer.rs
index ecdba5b..4f4561c 100644
--- a/src/components/message_history_buffer.rs
+++ b/src/components/message_history_buffer.rs
@@ -12,10 +12,6 @@ use crate::{chat::MacawChat, client::Client, components::message::Message, messa
 #[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.get()).into();
-    let chat_user: Store<User> =
-        <ArcStore<filamento::user::User> as Clone>::clone(&chat.user.get()).into();
 
     let load_set_messages = set_messages.clone();
     let load_messages = LocalResource::new(move || {
@@ -23,7 +19,7 @@ pub fn MessageHistoryBuffer(chat: MacawChat) -> impl IntoView {
         async move {
             let client = use_context::<Client>().expect("client not in context");
             let messages = client
-                .get_messages_with_users(chat_chat.correspondent().get())
+                .get_messages_with_users(chat.get().correspondent().get())
                 .await
                 .map_err(|e| e.to_string());
             match messages {
@@ -57,23 +53,21 @@ pub fn MessageHistoryBuffer(chat: MacawChat) -> impl IntoView {
             load_messages.await;
             let (sub_id, mut new_messages) = new_messages_signal
                 .write()
-                .subscribe_chat(chat_chat.correspondent().get());
+                .subscribe_chat(chat.get().correspondent().get());
             set_sub_id.set(Some(sub_id));
             while let Some(new_message) = new_messages.recv().await {
                 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.get())
+                    if *last.get()
                         .timestamp()
                         .read()
-                        < *<ArcStore<filamento::chat::Message> as Clone>::clone(&new_message.message.get())
+                        < *new_message.get()
                             .timestamp()
                             .read()
                     {
                         messages.insert(
-                            <ArcStore<filamento::chat::Message> as Clone>::clone(
-                                &new_message.message.get(),
-                            )
+                            new_message.get()
                             .id()
                             .get(),
                             new_message,
@@ -81,13 +75,11 @@ 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.get())
+                            value.get()
                                 .timestamp()
                                 .read()
                                 .cmp(
-                                    &<ArcStore<filamento::chat::Message> as Clone>::clone(
-                                        &new_message.message.get(),
-                                    )
+                                    &new_message.get()
                                     .timestamp()
                                     .read(),
                                 )
@@ -98,18 +90,17 @@ pub fn MessageHistoryBuffer(chat: MacawChat) -> impl IntoView {
                         messages.insert_before(
                             // TODO: check if this logic is correct
                             index,
-                            <ArcStore<filamento::chat::Message> as Clone>::clone(
-                                &new_message.message.get(),
-                            )
-                            .id()
-                            .get(),
+                            
+                            new_message.get()
+                                .id()
+                                .get(),
                             new_message,
                         );
                         debug!("set the new message in message buffer");
                     }
                 } else {
                     messages.insert(
-                        <ArcStore<filamento::chat::Message> as Clone>::clone(&new_message.message.get())
+                        new_message.get()
                             .id()
                             .get(),
                         new_message,
@@ -123,7 +114,7 @@ pub fn MessageHistoryBuffer(chat: MacawChat) -> impl IntoView {
         if let Some(sub_id) = sub_id.get_untracked() {
             new_messages_signal
                 .write()
-                .unsubscribe_chat(sub_id, chat_chat.correspondent().get_untracked());
+                .unsubscribe_chat(sub_id, chat.get().correspondent().get_untracked());
         }
     });
 
@@ -135,7 +126,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.get())
+                    message.message.get()
                         .timestamp()
                         .read()
                         .naive_local();
@@ -151,7 +142,7 @@ pub fn MessageHistoryBuffer(chat: MacawChat) -> impl IntoView {
                     false
                 };
                 last_user = Some(
-                    <ArcStore<filamento::chat::Message> as Clone>::clone(&message.message.get())
+                    message.get()
                         .from()
                         .get(),
                 );