vv/fractal
1
0
Fork 0
Code Pull requests Projects Releases Packages Activity

room: Also show other user avatar if they are alone in room

Browse source
This commit is contained in:
Kévin Commaille 2023-05-26 14:59:23 +02:00
parent ae02a70e7b
commit 82bacca9a1
No known key found for this signature in database
GPG key ID: 29A48C1F03620416
1 changed files with 28 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
src/session/model/room/mod.rs
View file

@ -1636,36 +1636,43 @@ impl Room {
let avatar_url = matrix_room.avatar_url(); let avatar_url = matrix_room.avatar_url();
let avatar_data = self.avatar_data(); let avatar_data = self.avatar_data();
if avatar_url.is_none() && matrix_room.active_members_count() == 2 { let members_count = matrix_room.active_members_count();
// Fallback to other user's avatar if this is a 1-to-1 room. if avatar_url.is_none() && members_count > 0 && members_count <= 2 {
// Check if this is a 1-to-1 room to see if we can use a fallback.
// First, make sure the members are loaded. // First, make sure the members are loaded.
self.load_members().await; self.load_members().await;
let own_user_id = self.session().user().unwrap().user_id(); let own_user_id = self.session().user().unwrap().user_id();
let members = self.members(); let members = self.members();
let mut has_own_member = false;
let mut other_member = None;
if members.n_items() >= 1 { // Get the other member from the list.
// Try to get the member from the list. for member in members.iter::<Member>() {
for member in members.iter::<Member>() { let Ok(member) = member else {
match member { break;
Ok(member) => { };
if member.user_id() != own_user_id
&& matches!( if matches!(member.membership(), Membership::Join | Membership::Invite) {
member.membership(), if member.user_id() == own_user_id {
Membership::Join | Membership::Invite has_own_member = true;
) } else {
{ other_member = Some(member);
avatar_data.set_image(member.avatar_data().image());
return;
}
}
Err(error) => {
debug!("Error iterating through room members: {error}");
break;
}
} }
} }
if has_own_member && other_member.is_some() {
break;
}
}
// Fallback to other user's avatar if this is a 1-to-1 room.
if members_count == 1 || (members_count == 2 && has_own_member) {
if let Some(other_member) = other_member {
avatar_data.set_image(other_member.avatar_data().image());
return;
}
} }
} }