♻️ Render Room avatar using the RoomMember ones, if not set

Cargo.toml

@@ -43,18 +43,19 @@ tracing-forest = "0.1.6"
 turf = "0.8.0"
 
 # Dioxus
-# dioxus-free-icons = { version = "0.8.*", features = ["ionicons", "font-awesome-solid"] }
-dioxus-free-icons = { path = "../dioxuslabs/dioxus-free-icons/packages/lib", features = ["ionicons", "font-awesome-solid"] }
-
+dioxus = { version = "0.5", default-features = false }
+dioxus-free-icons = { version = "0.8", features = ["ionicons", "font-awesome-solid"] }
 modx = "0.1.2"
 
+[patch.crates-io]
+dioxus = { git = "https://github.com/DioxusLabs/dioxus.git" }
+
 [target.'cfg(target_family = "wasm")'.dependencies]
 # Logging/tracing
 tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
 tracing-web = "0.1.3"
 # Dioxus
-# dioxus = { version = "0.5", features = ["web"] }
-dioxus = { path = "../dioxuslabs/dioxus/packages/dioxus", features = ["web"] }
+dioxus = { features = ["web"] }
 web-sys = "0.3.69"
 # Matrix
 matrix-sdk = { git = "https://github.com/matrix-org/matrix-rust-sdk.git", default-features = false, features = ["rustls-tls", "js"] }
@@ -65,8 +66,7 @@ time = "0.3.36"
 # Logging/tracing
 tracing-subscriber = { version = "0.3.18", features = ["env-filter", "time"] }
 # Dioxus
-# dioxus = { version = "0.5", features = ["desktop"] }
-dioxus = { path = "../dioxuslabs/dioxus/packages/dioxus", features = ["desktop"] }
+dioxus = { features = ["desktop"] }
 # Matrix
 matrix-sdk = { git = "https://github.com/matrix-org/matrix-rust-sdk.git", default-features = false, features = ["rustls-tls"] }
 

src/base.rs

@@ -40,7 +40,6 @@ pub async fn login(mut rx: UnboundedReceiver<bool>, session: &GlobalSignal<Sessi
                         let requester = Rc::new(requester);
 
                         dioxus::prelude::spawn(async move {
-                            // ACCOUNT.write().set_messaging_provider(requester.clone());
                             ACCOUNT.write().set_messaging_provider(requester.clone());
 
                             let _ = requester

src/domain/model/messaging_interface.rs

@@ -44,7 +44,6 @@ pub trait RoomMessagingConsumerInterface {
 #[async_trait(?Send)]
 pub trait RoomMessagingProviderInterface {
     async fn get_avatar(&self, id: &RoomId) -> anyhow::Result<Option<Avatar>>;
-    async fn get_members(&self, id: &RoomId) -> anyhow::Result<Vec<RoomMember>>;
 }
 
 #[async_trait(?Send)]
@@ -62,8 +61,8 @@ pub trait SpaceMessagingProviderInterface {}
 pub trait MemberMessagingProviderInterface {
     async fn get_avatar(
         &self,
-        room_id: &RoomId,
-        user_id: &UserId,
-        avatar_url: &Option<AvatarUrl>,
+        avatar_url: Option<AvatarUrl>,
+        room_id: RoomId,
+        user_id: UserId,
     ) -> anyhow::Result<Option<Avatar>>;
 }

src/domain/model/room.rs

@@ -7,8 +7,7 @@ use std::{
 
 use async_trait::async_trait;
 use futures::future::{join, join_all};
-use matrix_sdk::ruma::OwnedRoomId;
-use matrix_sdk::RoomState as MatrixRoomState;
+use matrix_sdk::{ruma::OwnedRoomId, RoomState as MatrixRoomState};
 use tracing::{debug, debug_span, error, instrument, trace};
 
 use super::{
@@ -80,11 +79,12 @@ impl PartialEq for Room {
 impl Room {
     pub fn new(
         id: RoomId,
-        spaces: Vec<SpaceId>,
+        // TODO: move space at the end of the list of params
         name: Option<String>,
         topic: Option<String>,
         is_direct: Option<bool>,
         state: Option<MatrixRoomState>,
+        spaces: Vec<SpaceId>,
     ) -> Self {
         Self {
             id,
@@ -94,10 +94,8 @@ impl Room {
             is_direct,
             state,
             avatar: RefCell::new(None),
-
             invitations: RefCell::new(HashMap::new()),
             members: RefCell::new(HashMap::new()),
-
             spaces,
 
             messaging_provider: None,
@@ -134,11 +132,6 @@ impl Room {
         self.topic = topic;
     }
 
-    #[allow(dead_code)]
-    pub fn is_direct(&self) -> &Option<bool> {
-        &self.is_direct
-    }
-
     #[allow(dead_code)]
     pub fn state(&self) -> &Option<MatrixRoomState> {
         &self.state
@@ -161,6 +154,29 @@ impl Room {
             store.on_invitation(invitation);
         }
     }
+
+    #[instrument(name = "Room", skip_all)]
+    fn add_member(&self, member: RoomMember) {
+        let mut members = self.members.borrow_mut();
+
+        members.insert(member.id().clone(), member.clone());
+
+        // USe the member display name to name the room if it's direct and has no name set.
+        if self.name.borrow().is_none() && members.len() == 1 {
+            if let Some(member_display_name) = member.display_name() {
+                let name = Some(member_display_name.clone());
+
+                self.name.borrow_mut().clone_from(&name);
+
+                if let Some(store) = self.store.borrow().as_ref() {
+                    store.on_new_name(name);
+                }
+            }
+        }
+
+        if let Some(store) = self.store.borrow().as_ref() {
+            store.on_new_member(member);
+        }
     }
 
     pub async fn get_avatar(&self) -> Option<Avatar> {
@@ -172,7 +188,7 @@ impl Room {
                         return Some(avatar);
                     } else {
                         debug!("The room has no avatar... let's generate one");
-                        match self.render_room_avatar_with_members().await {
+                        match self.gen_room_avatar_with_members().await {
                             Ok(avatar) => {
                                 if let Some(avatar) = avatar {
                                     return Some(avatar);
@@ -191,50 +207,42 @@ impl Room {
         self.avatar.borrow().clone()
     }
 
-    async fn render_room_avatar_with_members(&self) -> anyhow::Result<Option<Avatar>> {
-        if let Some(requester) = &self.messaging_provider {
-            match requester.get_members(&self.id).await {
-                Ok(members) => {
-                    let mut account_member = None::<&RoomMember>;
-                    let mut other_members = Vec::<&RoomMember>::new();
+    #[instrument(name = "Room", skip_all)]
+    async fn gen_room_avatar_with_members(&self) -> anyhow::Result<Option<Avatar>> {
+        let mut account_member = None::<&RoomMember>;
+        let mut other_members = Vec::<&RoomMember>::new();
 
-                    for member in &members {
-                        if member.is_account_user() {
-                            account_member = Some(member);
-                        } else {
-                            other_members.push(member);
-                        }
-                    }
-
-                    let other_avatars_futures =
-                        join_all(other_members.iter().map(|member| member.get_avatar()));
-
-                    let (other_avatars, account_avatar) = if let Some(account_member) =
-                        account_member
-                    {
-                        join(other_avatars_futures, account_member.get_avatar()).await
-                    } else {
-                        (
-                            join_all(other_members.iter().map(|member| member.get_avatar())).await,
-                            None,
-                        )
-                    };
-
-                    let other_avatars: Vec<Vec<u8>> = other_avatars.into_iter().flatten().collect();
-
-                    return Ok(Some(create_mozaik(
-                        256,
-                        256,
-                        &other_avatars,
-                        &account_avatar,
-                    )));
-                }
-                Err(err) => {
-                    error!("err={}", err);
-                }
+        let members = self.members.borrow();
+        for member in members.values() {
+            if member.is_account_user() {
+                account_member = Some(member);
+            } else {
+                other_members.push(member);
             }
         }
-        Ok(None)
+
+        let other_avatars_futures =
+            join_all(other_members.iter().map(|member| member.get_avatar()));
+
+        let (other_avatars, account_avatar) = if let Some(account_member) = account_member {
+            join(other_avatars_futures, account_member.get_avatar()).await
+        } else {
+            (
+                join_all(other_members.iter().map(|member| member.get_avatar())).await,
+                None,
+            )
+        };
+
+        let other_avatars: Vec<Vec<u8>> = other_avatars.into_iter().flatten().collect();
+
+        if account_avatar.is_some() || !other_avatars.is_empty() {
+            let _guard = debug_span!("AvatarRendering").entered();
+            Ok(Some(
+                create_mozaik(256, 256, other_avatars, account_avatar).await,
+            ))
+        } else {
+            Ok(None)
+        }
     }
 }
 
@@ -278,6 +286,10 @@ impl RoomMessagingConsumerInterface for Room {
     #[instrument(name = "Room", skip_all)]
     async fn on_new_avatar(&self, avatar: Option<Avatar>) {
         trace!("on_new_avatar");
+        self.avatar.borrow_mut().clone_from(&avatar);
+        if let Some(store) = self.store.borrow().as_ref() {
+            store.on_new_avatar(avatar);
+        }
     }
 }
 
@@ -295,6 +307,10 @@ impl RoomStoreConsumerInterface for Room {
         self.name.borrow().clone()
     }
 
+    async fn avatar(&self) -> Option<Avatar> {
+        self.get_avatar().await
+    }
+
     fn spaces(&self) -> &Vec<SpaceId> {
         &self.spaces
     }

src/domain/model/room_member.rs

@@ -4,7 +4,7 @@ use std::{
     rc::Rc,
 };
 
-use matrix_sdk::{room::RoomMember as MatrixRoomMember, ruma::OwnedRoomId};
+use matrix_sdk::ruma::OwnedMxcUri;
 use tracing::error;
 
 use super::{
@@ -13,9 +13,14 @@ use super::{
     room::RoomId,
 };
 
+pub type AvatarUrl = OwnedMxcUri;
+
 #[derive(Clone)]
 pub struct RoomMember {
     id: UserId,
+
+    display_name: Option<String>,
+    avatar_url: Option<AvatarUrl>,
     room_id: RoomId,
     is_account_user: bool,
 
@@ -26,14 +31,18 @@ pub struct RoomMember {
 }
 
 impl RoomMember {
-    fn new(
+    pub fn new(
         id: UserId,
+        display_name: Option<String>,
+        avatar_url: Option<AvatarUrl>,
         room_id: RoomId,
         is_account_user: bool,
         messaging_provider: Rc<dyn MemberMessagingProviderInterface>,
     ) -> Self {
         Self {
             id,
+            display_name,
+            avatar_url,
             room_id,
             is_account_user,
             avatar: RefCell::new(None),
@@ -41,24 +50,14 @@ impl RoomMember {
         }
     }
 
-    // TODO: Use a factory instead...
-    pub async fn from_matrix(
-        matrix_room_member: &MatrixRoomMember,
-        room_id: &OwnedRoomId,
-        messaging_provider: Rc<dyn MemberMessagingProviderInterface>,
-    ) -> Self {
-        Self::new(
-            UserId::from(matrix_room_member.user_id()),
-            room_id.clone(),
-            matrix_room_member.is_account_user(),
-            messaging_provider,
-        )
-    }
-
     pub fn id(&self) -> &UserId {
         &self.id
     }
 
+    pub fn display_name(&self) -> &Option<String> {
+        &self.display_name
+    }
+
     #[allow(dead_code)]
     pub fn room_id(&self) -> &RoomId {
         &self.room_id
@@ -71,7 +70,11 @@ impl RoomMember {
     pub async fn get_avatar(&self) -> Option<Avatar> {
         match self
             .messaging_provider
-            .get_avatar(&self.room_id, &self.id)
+            .get_avatar(
+                self.avatar_url.clone(),
+                self.room_id.clone(),
+                self.id.clone(),
+            )
             .await
         {
             Ok(avatar) => avatar,

src/infrastructure/messaging/matrix/client.rs

@@ -10,7 +10,7 @@ use matrix_sdk::{
     config::SyncSettings,
     event_handler::Ctx,
     media::{MediaFormat, MediaRequest, MediaThumbnailSize},
-    room::{ParentSpace, Room, RoomMember},
+    room::{ParentSpace, Room},
     ruma::{
         api::client::media::get_content_thumbnail::v3::Method,
         events::{
@@ -26,7 +26,7 @@ use matrix_sdk::{
         },
         uint, OwnedMxcUri, OwnedRoomId, OwnedUserId, RoomId, UserId,
     },
-    Client as MatrixClient, RoomMemberships, RoomState,
+    Client as MatrixClient, RoomState,
 };
 use tokio::sync::{
     broadcast,
@@ -702,21 +702,6 @@ impl Client {
         }
     }
 
-    async fn get_room_members(&mut self, room_id: &OwnedRoomId) -> anyhow::Result<Vec<RoomMember>> {
-        let client = self.client.as_ref().unwrap();
-
-        if let Some(room) = client.get_room(room_id) {
-            match room.members(RoomMemberships::ACTIVE).await {
-                Ok(room_members) => Ok(room_members),
-                Err(err) => Err(err.into()),
-            }
-        } else {
-            warn!("No room found with the \"{}\" id", room_id.as_str());
-            // TODO: Return an error if the room has not been found
-            Ok(vec![])
-        }
-    }
-
     // TODO: Share MediaRequest with other media requests
     async fn get_thumbnail(&self, media_url: OwnedMxcUri) -> anyhow::Result<Vec<u8>> {
         let client = self.client.as_ref().unwrap();
@@ -738,41 +723,39 @@ impl Client {
 
     async fn get_room_member_avatar(
         &self,
+        avatar_url: &Option<OwnedMxcUri>,
         room_id: &RoomId,
         user_id: &UserId,
-        avatar_url: &Option<OwnedMxcUri>,
     ) -> anyhow::Result<Option<Vec<u8>>> {
         let client = self.client.as_ref().unwrap();
 
         if let Some(room) = client.get_room(room_id) {
-            // TODO: Check if we can get member before fetching the data and received an error...
-
-            match room.get_member(user_id).await {
-                Ok(room_member) => {
-                    if let Some(room_member) = room_member {
-                        let res = match room_member
-                            .avatar(MediaFormat::Thumbnail(MediaThumbnailSize {
-                                method: Method::Scale,
-                                width: uint!(256),
-                                height: uint!(256),
-                            }))
-                            .await
-                        {
-                            Ok(avatar) => Ok(avatar),
-                            Err(err) => Err(err.into()),
-                        };
-                        return res;
-                    }
+            match avatar_url {
+                Some(avatar_url) => {
+                    let thumbnail = self.get_thumbnail(avatar_url.clone()).await;
+                    return Ok(Some(thumbnail?));
                 }
-                Err(err) => {
-                    warn!("Unable to get room member {user_id}: {err}");
-                    if let Some(avatar_url) = avatar_url {
-                        let thumbnail = self.get_thumbnail(avatar_url.clone()).await;
-                        return Ok(Some(thumbnail?));
-                    } else {
-                        debug!("No avatar url set for the {room_id} room");
+                None => match room.get_member(user_id).await {
+                    Ok(room_member) => {
+                        if let Some(room_member) = room_member {
+                            let res = match room_member
+                                .avatar(MediaFormat::Thumbnail(MediaThumbnailSize {
+                                    method: Method::Scale,
+                                    width: uint!(256),
+                                    height: uint!(256),
+                                }))
+                                .await
+                            {
+                                Ok(avatar) => Ok(avatar),
+                                Err(err) => Err(err.into()),
+                            };
+                            return res;
+                        }
                     }
-                }
+                    Err(err) => {
+                        warn!("Unable to get room member {user_id}: {err}");
+                    }
+                },
             }
         }
         Ok(None)
@@ -814,14 +797,10 @@ impl Client {
             WorkerTask::GetRoomAvatar(id, reply) => {
                 reply.send(self.get_room_avatar(&id).await).await;
             }
-            WorkerTask::GetRoomMembers(id, reply) => {
-                reply.send(self.get_room_members(&id).await).await;
-            }
-
-            WorkerTask::GetRoomMemberAvatar(room_id, user_id, avatar_url, reply) => {
+            WorkerTask::GetRoomMemberAvatar(avatar_url, room_id, user_id, reply) => {
                 reply
                     .send(
-                        self.get_room_member_avatar(&room_id, &user_id, &avatar_url)
+                        self.get_room_member_avatar(&avatar_url, &room_id, &user_id)
                             .await,
                     )
                     .await;

src/infrastructure/messaging/matrix/requester.rs

@@ -242,7 +242,7 @@ impl AccountMessagingProviderInterface for Requester {
                                 new_room_tx,
                                 span
                             ) => {
-                                let mut room = Room::new(id, spaces, name, topic, is_direct, Some(state));
+                                let mut room = Room::new(id, name, topic, is_direct, Some(state), spaces);
                                 let room_id = room.id().clone();
 
                                 room.set_messaging_provider(client.clone());
@@ -362,19 +362,6 @@ impl RoomMessagingProviderInterface for Requester {
     async fn get_avatar(&self, room_id: &RoomId) -> anyhow::Result<Option<Avatar>> {
         request_to_worker!(self, WorkerTask::GetRoomAvatar, room_id.clone())
     }
-
-    // TODO: Fix return code
-    async fn get_members(&self, room_id: &RoomId) -> anyhow::Result<Vec<RoomMember>> {
-        match request_to_worker!(self, WorkerTask::GetRoomMembers, room_id.clone()) {
-            Ok(matrix_room_members) => {
-                Ok(join_all(matrix_room_members.iter().map(|member| async {
-                    RoomMember::from_matrix(member, room_id, Rc::new(self.clone())).await
-                }))
-                .await)
-            }
-            Err(err) => Err(err),
-        }
-    }
 }
 
 #[async_trait(?Send)]
@@ -384,16 +371,16 @@ impl SpaceMessagingProviderInterface for Requester {}
 impl MemberMessagingProviderInterface for Requester {
     async fn get_avatar(
         &self,
-        room_id: &RoomId,
-        user_id: &UserId,
-        avatar_url: &Option<AvatarUrl>,
+        avatar_url: Option<AvatarUrl>,
+        room_id: RoomId,
+        user_id: UserId,
     ) -> anyhow::Result<Option<Avatar>> {
         request_to_worker!(
             self,
             WorkerTask::GetRoomMemberAvatar,
-            room_id.clone(),
-            user_id.clone(),
-            avatar_url.clone()
+            avatar_url,
+            room_id,
+            user_id
         )
     }
 }

src/infrastructure/messaging/matrix/worker_tasks.rs

@@ -1,9 +1,6 @@
 use std::fmt::{Debug, Formatter};
 
-use matrix_sdk::{
-    room::RoomMember,
-    ruma::{OwnedMxcUri, OwnedRoomId, OwnedUserId},
-};
+use matrix_sdk::ruma::{OwnedMxcUri, OwnedRoomId, OwnedUserId};
 
 use crate::utils::Sender;
 
@@ -20,12 +17,10 @@ pub enum WorkerTask {
     GetAvatar(Sender<anyhow::Result<Option<Vec<u8>>>>),
 
     GetRoomAvatar(OwnedRoomId, Sender<anyhow::Result<Option<Vec<u8>>>>),
-    GetRoomMembers(OwnedRoomId, Sender<anyhow::Result<Vec<RoomMember>>>),
-
     GetRoomMemberAvatar(
+        Option<OwnedMxcUri>,
         OwnedRoomId,
         OwnedUserId,
-        Option<OwnedMxcUri>,
         Sender<anyhow::Result<Option<Vec<u8>>>>,
     ),
 }
@@ -60,16 +55,11 @@ impl Debug for WorkerTask {
                 .debug_tuple("WorkerTask::GetRoomAvatar")
                 .field(id)
                 .finish(),
-            WorkerTask::GetRoomMembers(id, _) => f
-                .debug_tuple("WorkerTask::GetRoomMembers")
-                .field(id)
-                .finish(),
-
             WorkerTask::GetRoomMemberAvatar(room_id, user_id, avatar_url, _) => f
                 .debug_tuple("WorkerTask::GetRoomMemberAvatar")
+                .field(avatar_url)
                 .field(room_id)
                 .field(user_id)
-                .field(avatar_url)
                 .finish(),
         }
     }