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

Make Room::member_display_name return MXID as fallback. 

If there is no display name set. This means the method can now always
return something so there is no need to wrap in an `Option`.
master
Denis Kasak 2020-06-09 16:11:41 +02:00
parent e6b67e5fa7
commit b93eb0e318
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -304,15 +304,17 @@ impl Room {
/// Get the disambiguated display name for a member of this room. /// Get the disambiguated display name for a member of this room.
/// ///
/// If a user has no display name set, returns the MXID as a fallback.
///
/// When displaying a room member's display name, clients *must* use this method to obtain the /// When displaying a room member's display name, clients *must* use this method to obtain the
/// name instead of displaying the `RoomMember::display_name` directly. This is because /// name instead of displaying the `RoomMember::display_name` directly. This is because
/// multiple users can share the same display name in which case the display name has to be /// multiple users can share the same display name in which case the display name has to be
/// disambiguated. /// disambiguated.
pub fn member_display_name<'a>(&'a self, id: &UserId) -> Option<Cow<'a, str>> { pub fn member_display_name<'a>(&'a self, id: &'a UserId) -> Cow<'a, str> {
self.disambiguated_display_names self.disambiguated_display_names
.get(id) .get(id)
.map(|s| s.as_str().into()) .map(|s| s.as_str().into())
.or_else(|| { .unwrap_or_else(|| {
self.members.get(id).map(|member| { self.members.get(id).map(|member| {
member member
.display_name .display_name
@ -320,7 +322,7 @@ impl Room {
.map(|s| s.to_string()) .map(|s| s.to_string())
.unwrap_or_else(|| format!("{}", member.user_id)) .unwrap_or_else(|| format!("{}", member.user_id))
.into() .into()
}) }).unwrap_or(id.as_ref().into())
}) })
} }
@ -765,7 +767,7 @@ mod test {
{ {
let room = client.get_joined_room(&room_id).await.unwrap(); let room = client.get_joined_room(&room_id).await.unwrap();
let room = room.read().await; let room = room.read().await;
let display_name1 = room.member_display_name(&user_id1).unwrap(); let display_name1 = room.member_display_name(&user_id1);
assert_eq!("example", display_name1); assert_eq!("example", display_name1);
} }
@ -780,8 +782,8 @@ mod test {
{ {
let room = client.get_joined_room(&room_id).await.unwrap(); let room = client.get_joined_room(&room_id).await.unwrap();
let room = room.read().await; let room = room.read().await;
let display_name1 = room.member_display_name(&user_id1).unwrap(); let display_name1 = room.member_display_name(&user_id1);
let display_name2 = room.member_display_name(&user_id2).unwrap(); let display_name2 = room.member_display_name(&user_id2);
assert_eq!(format!("example ({})", user_id1), display_name1); assert_eq!(format!("example ({})", user_id1), display_name1);
assert_eq!(format!("example ({})", user_id2), display_name2); assert_eq!(format!("example ({})", user_id2), display_name2);