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

Must not take our user into account when calculating room name.

master
Denis Kasak 2020-06-10 22:45:08 +02:00
parent 331cb02266
commit 97b1bb6004
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
matrix_sdk/src/client.rs
View File

@ -1952,7 +1952,7 @@ mod test {
room_names.push(room.read().await.display_name()) room_names.push(room.read().await.display_name())
} }
assert_eq!(vec!["example, example2"], room_names); assert_eq!(vec!["example2"], room_names);
} }
#[tokio::test] #[tokio::test]

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

@ -213,6 +213,7 @@ impl RoomName {
/// <https://matrix.org/docs/spec/client_server/latest#calculating-the-display-name-for-a-room> /// <https://matrix.org/docs/spec/client_server/latest#calculating-the-display-name-for-a-room>
pub fn calculate_name( pub fn calculate_name(
&self, &self,
own_user_id: &UserId,
invited_members: &HashMap<UserId, RoomMember>, invited_members: &HashMap<UserId, RoomMember>,
joined_members: &HashMap<UserId, RoomMember>, joined_members: &HashMap<UserId, RoomMember>,
) -> String { ) -> String {
@ -241,6 +242,7 @@ impl RoomName {
// TODO: This should use `self.heroes` but it is always empty?? // TODO: This should use `self.heroes` but it is always empty??
if heroes >= invited_joined { if heroes >= invited_joined {
let mut names = members let mut names = members
.filter(|m| m.user_id != *own_user_id)
.take(3) .take(3)
.map(|mem| { .map(|mem| {
mem.display_name mem.display_name
@ -253,6 +255,7 @@ impl RoomName {
names.join(", ") names.join(", ")
} else if heroes < invited_joined && invited + joined > one { } else if heroes < invited_joined && invited + joined > one {
let mut names = members let mut names = members
.filter(|m| m.user_id != *own_user_id)
.take(3) .take(3)
.map(|mem| { .map(|mem| {
mem.display_name mem.display_name
@ -302,7 +305,7 @@ impl Room {
/// Return the display name of the room. /// Return the display name of the room.
pub fn display_name(&self) -> String { pub fn display_name(&self) -> String {
self.room_name self.room_name
.calculate_name(&self.invited_members, &self.joined_members) .calculate_name(&self.own_user_id, &self.invited_members, &self.joined_members)
} }
/// Is the room a encrypted room. /// Is the room a encrypted room.
@ -970,7 +973,7 @@ mod test {
room_names.push(room.read().await.display_name()) room_names.push(room.read().await.display_name())
} }
assert_eq!(vec!["example, example2"], room_names); assert_eq!(vec!["example2"], room_names);
} }
#[async_test] #[async_test]