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

src/infrastructure/messaging/matrix/client.rs

@@ -723,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)
@@ -799,10 +797,10 @@ impl Client {
             WorkerTask::GetRoomAvatar(id, reply) => {
                 reply.send(self.get_room_avatar(&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());
@@ -371,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

@@ -18,9 +18,9 @@ pub enum WorkerTask {
 
     GetRoomAvatar(OwnedRoomId, Sender<anyhow::Result<Option<Vec<u8>>>>),
     GetRoomMemberAvatar(
+        Option<OwnedMxcUri>,
         OwnedRoomId,
         OwnedUserId,
-        Option<OwnedMxcUri>,
         Sender<anyhow::Result<Option<Vec<u8>>>>,
     ),
 }
@@ -57,9 +57,9 @@ impl Debug for WorkerTask {
                 .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(),
         }
     }