fix: put reactive calls in reactive contexts to update avatar on avatar updateHEADmain

8 files changed, 61 insertions, 55 deletions

diff --git a/src/components/chat_header.rs b/src/components/chat_header.rs
index ab33d2b..51906aa 100644
--- a/src/components/chat_header.rs
+++ b/src/components/chat_header.rs
@@ -11,7 +11,12 @@ pub fn ChatViewHeader(chat: MacawChat) -> impl IntoView {
 
     view! {
         <div class="chat-view-header panel">
-            <AvatarWithPresence user=chat.user.get().into() />
+            {move || {
+                let user = chat.user.get().into();
+                view! {
+                    <AvatarWithPresence user />
+                }
+            }}
             <div class="user-info">
                 <h2 class="name">{name}</h2>
                 <h3>{jid}</h3>
diff --git a/src/components/chats_list/chats_list_item.rs b/src/components/chats_list/chats_list_item.rs
index d1da727..98e014e 100644
--- a/src/components/chats_list/chats_list_item.rs
+++ b/src/components/chats_list/chats_list_item.rs
@@ -53,7 +53,12 @@ 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.get().into() />
+            {move || {
+                let user = chat.user.get().into();
+                view! {
+                    <AvatarWithPresence user />
+                }
+            }}
             <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 5deccdd..f55c5f7 100644
--- a/src/components/message.rs
+++ b/src/components/message.rs
@@ -8,11 +8,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.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);
+    let avatar = LocalResource::new(move || get_avatar(message.user.get().into()));
+    let name = move || get_name(message.user.get().into(), false);
 
     // TODO: chrono-humanize?
     // TODO: if final, show delivery not only on hover.
@@ -28,23 +25,23 @@ pub fn Message(message: MacawMessage, major: bool, r#final: bool) -> impl IntoVi
                 <div class="middle">
                     <div class="message-info">
                         <div class="message-user-name">{name}</div>
-                        <div class="message-timestamp">{move || message_message.timestamp().read().format("%H:%M").to_string()}</div>
+                        <div class="message-timestamp">{move || message.get().timestamp().read().format("%H:%M").to_string()}</div>
                     </div>
                     <div class="message-text">
-                        {move || message_message.body().read().body.clone()}
+                        {move || message.get().body().read().body.clone()}
                     </div>
                 </div>
-                <div class="right message-delivery">{move || message_message.delivery().get().map(|delivery| view! { <Delivery class:light=true delivery /> } ) }</div>
+                <div class="right message-delivery">{move || message.get().delivery().get().map(|delivery| view! { <Delivery class:light=true delivery /> } ) }</div>
             </div>
         }.into_any()
     } else {
         view! {
             <div class:final=r#final class="chat-message minor">
                 <div class="left message-timestamp">
-                    {move || message_message.timestamp().read().format("%H:%M").to_string()}
+                    {move || message.get().timestamp().read().format("%H:%M").to_string()}
                 </div>
-                <div class="middle message-text">{move || message_message.body().read().body.clone()}</div>
-                <div class="right message-delivery">{move || message_message.delivery().get().map(|delivery| view! { <Delivery delivery /> } ) }</div>
+                <div class="middle message-text">{move || message.get().body().read().body.clone()}</div>
+                <div class="right message-delivery">{move || message.get().delivery().get().map(|delivery| view! { <Delivery delivery /> } ) }</div>
             </div>
         }.into_any()
     }
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(),
                 );
diff --git a/src/components/roster_list/roster_list_item.rs b/src/components/roster_list/roster_list_item.rs
index 9ebc26a..842f66c 100644
--- a/src/components/roster_list/roster_list_item.rs
+++ b/src/components/roster_list/roster_list_item.rs
@@ -9,10 +9,7 @@ use crate::{chat::{ArcMacawChat, MacawChat}, components::{avatar::AvatarWithPres
 
 #[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.get()).into();
-    let name = move || get_name(contact_user, false);
+    let name = move || get_name(contact.user.get().into(), false);
 
     let open_chats: Store<OpenChatsPanel> =
         use_context().expect("no open chats panel store in context");
@@ -20,10 +17,10 @@ pub fn RosterListItem(contact: MacawContact) -> impl IntoView {
     // TODO: why can this not be in the closure?????
     // TODO: not good, as overwrites preexisting chat state with possibly incorrect one...
     let chat = Chat {
-        correspondent: contact_user.jid().get(),
+        correspondent: contact.user.get().jid().get(),
         have_chatted: false,
     };
-    let chat = ArcMacawChat::got_chat_and_user(chat, contact_user.get());
+    let chat = ArcMacawChat::got_chat_and_user(chat, contact.user.get().get());
 
     let open_chat = move |_| {
         debug!("opening chat");
@@ -33,14 +30,14 @@ pub fn RosterListItem(contact: MacawContact) -> impl IntoView {
     let open = move || {
         if let Some(open_chat) = &*open_chats.chat_view().read() {
             debug!("got open chat: {:?}", open_chat);
-            if *open_chat == *contact_user.jid().read() {
+            if *open_chat == *contact.user.get().jid().read() {
                 return Open::Focused;
             }
         }
         if let Some(_backgrounded_chat) = open_chats
             .chats()
             .read()
-            .get(contact_user.jid().read().deref())
+            .get(contact.user.get().jid().read().deref())
         {
             return Open::Open;
         }
@@ -51,10 +48,15 @@ pub fn RosterListItem(contact: MacawContact) -> impl IntoView {
 
     view! {
         <div class="roster-list-item" class:open=move || open() class:focused=move || focused() on:click=open_chat>
-            <AvatarWithPresence user=contact_user />
+            {move || {
+                let user = contact.user.get().into();
+                view! {
+                    <AvatarWithPresence user />
+                }
+            }}
             <div class="item-info">
-                <div class="main-info"><p class="name">{name}<span class="jid"> - {move || contact_contact.user_jid().read().to_string()}</span></p></div>
-                <div class="sub-info">{move || contact_contact.subscription().read().to_string()}</div>
+                <div class="main-info"><p class="name">{name}<span class="jid"> - {move || contact.user_jid().read().to_string()}</span></p></div>
+                <div class="sub-info">{move || contact.subscription().read().to_string()}</div>
             </div>
         </div>
     }
diff --git a/src/state_store.rs b/src/state_store.rs
index 8d80b3f..ac90e40 100644
--- a/src/state_store.rs
+++ b/src/state_store.rs
@@ -1,6 +1,7 @@
 use std::{collections::HashMap, ops::{Deref, DerefMut}, sync::{Arc, RwLock}};
 
 use leptos::prelude::*;
+use tracing::debug;
 
 // TODO: get rid of this
 // V has to be an arc signal
@@ -105,7 +106,7 @@ impl<K, V, S> Clone for StateStore<K, V, S> {
     }
 }
 
-impl<K: Eq + std::hash::Hash + Clone, V: Clone> StateStore<K, V>
+impl<K: Eq + std::hash::Hash + Clone + std::fmt::Debug, V: Clone + std::fmt::Debug> StateStore<K, V>
 where
     K: Send + Sync + 'static,
     V: Send + Sync + 'static,
@@ -114,7 +115,9 @@ where
         {
             let store = self.inner.try_get_value().unwrap();
             let mut store = store.store.write().unwrap();
+            debug!("store state: {:?}", store);
             if let Some((v, count)) = store.get_mut(&key) {
+                debug!("updating old value already in store");
                 v.set(value);
                 *count += 1;
                 StateListener {
@@ -127,6 +130,7 @@ where
             } else {
                 let v = ArcRwSignal::new(value);
                 store.insert(key.clone(), (v.clone(), 1));
+                debug!("inserting new value: {:?}", store);
                 StateListener {
                     value: v.into(),
                     cleaner: StateCleaner {
diff --git a/src/views/macaw.rs b/src/views/macaw.rs
index 1b7051f..328e3d2 100644
--- a/src/views/macaw.rs
+++ b/src/views/macaw.rs
@@ -102,7 +102,7 @@ pub fn Macaw(
                 }
                 UpdateMessage::Presence { from, presence } => {
                     let bare_jid = from.to_bare();
-                    if let Some(presences) = user_presences.read().user_presences.get(&bare_jid) {
+                    if let Some(presences) = user_presences.read_untracked().user_presences.get(&bare_jid) {
                         if let Some(resource) = from.resourcepart() {
                             presences.write().update_presence(resource.clone(), presence);
                         }
@@ -128,8 +128,7 @@ pub fn Macaw(
                 }
                 UpdateMessage::MessageDelivery { id, chat, delivery } => {
                     messages_store.modify(&id, |message| {
-                        <ArcStore<filamento::chat::Message> as Clone>::clone(&message)
-                            .delivery()
+                        <ArcStore<filamento::chat::Message> as Clone>::clone(&message).delivery()
                             .set(Some(delivery))
                     });
                 }
diff --git a/src/views/macaw/open_chats_panel.rs b/src/views/macaw/open_chats_panel.rs
index ddc9ec9..bdb0084 100644
--- a/src/views/macaw/open_chats_panel.rs
+++ b/src/views/macaw/open_chats_panel.rs
@@ -57,13 +57,16 @@ mod open_chat {
 
     #[component]
     pub fn OpenChatView(chat: MacawChat) -> impl IntoView {
-        let chat_jid = move || chat.chat.try_get_value().unwrap().get().correspondent().get();
-
         view! {
             <div class="open-chat-view">
                 <ChatViewHeader chat=chat.clone() />
                 <MessageHistoryBuffer chat=chat.clone() />
-                <ChatViewMessageComposer chat=chat_jid() />
+                {move || {
+                    let chat_jid = chat.get().correspondent().get();
+                    view! {
+                        <ChatViewMessageComposer chat=chat_jid />
+                    }
+                }}
             </div>
         }
     }