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

room: fix broken calculate_name, used UInt::max needed min, heroes is always empty

master
Devin R 2020-04-23 06:53:34 -04:00
parent 305633635d
commit ef4d69b0ac
1 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/models/room.rs
View File

@ -139,23 +139,40 @@ 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.
// the order in which we check for a name ^^ // the order in which we check for a name ^^
if let Some(name) = &self.name { if let Some(name) = &self.name {
name.clone() let name = name.trim();
name.to_string()
} else if let Some(alias) = &self.canonical_alias { } else if let Some(alias) = &self.canonical_alias {
alias.alias().to_string() let alias = alias.alias().trim();
} else if !self.aliases.is_empty() { alias.to_string()
self.aliases[0].alias().to_string() } else if !self.aliases.is_empty() && !self.aliases[0].alias().is_empty() {
self.aliases[0].alias().trim().to_string()
} else { } else {
let joined = self.joined_member_count.unwrap_or(UInt::max_value()); let joined = self.joined_member_count.unwrap_or(UInt::min_value());
let invited = self.invited_member_count.unwrap_or(UInt::max_value()); let invited = self.invited_member_count.unwrap_or(UInt::min_value());
let heroes = UInt::new(self.heroes.len() as u64).unwrap(); let heroes = UInt::new(self.heroes.len() as u64).unwrap();
let one = UInt::new(1).unwrap(); let one = UInt::new(1).unwrap();
if heroes >= (joined + invited - one) { let invited_joined = if invited + joined == UInt::min_value() {
let mut names = self.heroes.iter().take(3).cloned().collect::<Vec<String>>(); UInt::min_value()
} else {
invited + joined - one
};
// TODO this should use `self.heroes but it is always empty??
if heroes >= invited_joined {
let mut names = members
.values()
.take(3)
.map(|mem| mem.user_id.localpart().to_string())
.collect::<Vec<String>>();
names.sort(); names.sort();
names.join(", ") names.join(", ")
} else if heroes < (joined + invited - one) && invited + joined > one { } else if heroes < invited_joined && invited + joined > one {
let mut names = self.heroes.iter().take(3).cloned().collect::<Vec<String>>(); let mut names = members
.values()
.take(3)
.map(|mem| mem.user_id.localpart().to_string())
.collect::<Vec<String>>();
names.sort(); names.sort();
// TODO what is the length the spec wants us to use here and in the `else` // TODO what is the length the spec wants us to use here and in the `else`
format!("{}, and {} others", names.join(", "), (joined + invited)) format!("{}, and {} others", names.join(", "), (joined + invited))