1 files changed, 36 insertions, 8 deletions

diff --git a/src/user.rs b/src/user.rs
index f55c0dd..d92ba4f 100644
--- a/src/user.rs
+++ b/src/user.rs
@@ -2,28 +2,46 @@ use std::ops::{Deref, DerefMut};
 
 use filamento::user::{User, UserStoreFields};
 use jid::BareJID;
+use leptos_fetch::QueryClient;
 use reactive_stores::{ArcStore, Store};
 use leptos::prelude::*;
 
-use crate::{client::Client, roster::{Roster, RosterStoreFields}, state_store::{StateListener, StateStore}};
+use crate::{client::Client, roster::{Roster, RosterStoreFields}};
+
+async fn get_user(jid: BareJID) -> ArcStore<User> {
+    let client: Client = use_context().expect("no client in context");
+    ArcStore::new(client.get_user(jid).await.unwrap())
+}
 
 #[derive(Clone)]
 pub struct MacawUser {
-    pub user: StateListener<BareJID, ArcStore<User>>,
+    pub user: ArcStore<User>,
 }
 
 impl MacawUser {
     pub fn got_user(user: User) -> Self {
-        
-        let user_state_store: StateStore<BareJID, ArcStore<User>> =
-            use_context().expect("no user state store");
-        let user = user_state_store.store(user.jid.clone(), ArcStore::new(user));
-        Self { user }
+        // let avatar = fetch_avatar(&user);
+        // user.avatar = avatar;
+        let query_client: QueryClient = expect_context();
+
+        let jid = user.jid.clone();
+        let user_store = query_client.subscribe_value_local(get_user, move || jid.clone());
+        if let Some(user_store) = user_store.get() {
+            user_store.set(user);
+            Self { user: user_store }
+        } else {
+            let jid = user.jid.clone();
+            let user_store = ArcStore::new(user);
+            query_client.set_query_local(get_user, jid, user_store.clone());
+            Self {
+                user: user_store,
+            }
+        }
     }
 }
 
 impl Deref for MacawUser {
-    type Target = StateListener<BareJID, ArcStore<User>>;
+    type Target = ArcStore<User>;
 
     fn deref(&self) -> &Self::Target {
         &self.user
@@ -38,6 +56,15 @@ impl DerefMut for MacawUser {
 
 pub const NO_AVATAR: &str = "/assets/no-avatar.png";
 
+pub async fn fetch_avatar(user: &User) -> Option<String> {
+    if let Some(avatar) = &user.avatar {
+        let client = use_context::<Client>().expect("client not in context");
+        client.file_store.get_src(avatar).await
+    } else {
+        None
+    }
+}
+
 pub async fn get_avatar(user: Store<User>) -> String {
     if let Some(avatar) = &user.read().avatar {
         let client = use_context::<Client>().expect("client not in context");
@@ -46,6 +73,7 @@ pub async fn get_avatar(user: Store<User>) -> String {
         } else {
             NO_AVATAR.to_string()
         }
+        // avatar.clone()
         // TODO: enable avatar fetching
         // format!("/files/{}", avatar)
     } else {