cadence
/
Carbon
3
9
Fork 1
Code Issues 14 Pull Requests 1 Releases Wiki Activity

Don't break on rooms with a redacted name
continuous-integration/drone/push Build is passing Details

This commit is contained in:
Cadence Ember 2020-10-21 22:10:58 +13:00
parent a7ded5fae3
commit 64c3e18788
Signed by: cadence
GPG Key ID: BC1C2C61CF521B17
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/js/room-picker.js
View File

@ -94,15 +94,20 @@ class Room extends ElemJS {
}
getName() {
// if the room has a name
let name = this.data.state.events.find(e => e.type === "m.room.name")
if (name) {
name = name.content.name
} else {
const users = this.data.summary["m.heroes"]
const usernames = users.map(u => (u.match(/^@([^:]+):/) || [])[1] || u)
name = usernames.join(", ")
if (name && name.content.name) {
return name.content.name
}
return name
// if the room has no name, use its canonical alias
let canonicalAlias = this.data.state.events.find(e => e.type === "m.room.canonical_alias")
if (canonicalAlias && canonicalAlias.content.alias) {
return canonicalAlias.content.alias
}
// if the room has no alias, use the names of its members ("heroes")
const users = this.data.summary["m.heroes"]
const usernames = users.map(u => (u.match(/^@([^:]+):/) || [])[1] || u)
return usernames.join(", ")
}
getIcon() {