char
/
matrix-rust-sdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix display name disambiguation so it passes the test.

master
Denis Kasak 2020-06-09 15:17:38 +02:00
parent 60a43439e5
commit a9fd63fd4b
1 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
matrix_sdk_base/src/models/room.rs
View File

@ -327,17 +327,24 @@ impl Room {
return false; return false;
} }
let member = RoomMember::new(event); let new_member = RoomMember::new(event);
// find all users that share the same display name as the joining user // find all users that share the same display name as the joining user
let users_with_same_name: Vec<_> = self let users_with_same_name: Vec<_> = self
.disambiguated_display_names .members
.iter() .iter()
.filter(|(_, v)| { .filter(|(_, existing_member)| {
member new_member
.display_name .display_name
.as_ref() .as_ref()
.map(|n| &n == v) .and_then(|new_member_name| {
existing_member
.display_name
.as_ref()
.and_then(|existing_member_name| {
Some(new_member_name == existing_member_name)
})
})
.unwrap_or(false) .unwrap_or(false)
}) })
.map(|(k, _)| k) .map(|(k, _)| k)
@ -368,17 +375,19 @@ impl Room {
// insert new member's display name // insert new member's display name
self.disambiguated_display_names.insert( self.disambiguated_display_names.insert(
member.user_id.clone(), new_member.user_id.clone(),
member new_member
.display_name .display_name
.as_ref() .as_ref()
.map(|n| format!("{} ({})", n, member.user_id)) .map(|n| format!("{} ({})", n, new_member.user_id))
.unwrap_or_else(|| format!("{}", member.user_id)), .unwrap_or_else(|| format!("{}", new_member.user_id)),
); );
} }
self.members self.members.insert(
.insert(UserId::try_from(event.state_key.as_str()).unwrap(), member); UserId::try_from(event.state_key.as_str()).unwrap(),
new_member,
);
true true
} }