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

Compare commits

base: cadence:6583c192cee5bc24974e76fb9fe1b9e47091353b
Branches Tags
cadence:princess
cadence:fix/login-improvements
..
compare: cadence:34af1be7d195b305a11c3adcfa9e7709c7b51dc7
Branches Tags
cadence:princess
cadence:fix/login-improvements

No commits in common. "6583c192cee5bc24974e76fb9fe1b9e47091353b" and "34af1be7d195b305a11c3adcfa9e7709c7b51dc7" have entirely different histories.
6583c192ce ... 34af1be7d1

1 changed files with 1 additions and 26 deletions
Show stats Expand all files Collapse all files

27
src/js/room-picker.js
View file

@ -107,22 +107,7 @@ class Room extends ElemJS {
// if the room has no alias, use the names of its members ("heroes")
const users = this.data.summary["m.heroes"]
if (users && users.length) {
const usernames = users.map(u => {
// if the member is in the room, use their display name
if (this.members.has(u)) {
const displayname = this.members.get(u).value().content.displayname
if (displayname) {
return displayname
}
}
// we don't have the member, so extract the localpart from the mxid
const match = u.match(/^@([^:]+):/)
if (match) {
return match[1]
}
// localpart extraction failed, use the whole mxid
return u
})
const usernames = users.map(u => (u.match(/^@([^:]+):/) || [])[1] || u)
return usernames.join(", ")
}
// the room is empty
@ -130,7 +115,6 @@ class Room extends ElemJS {
}
getIcon() {
// if the room has a normal avatar
const avatar = this.data.state.events.find(e => e.type === "m.room.avatar")
if (avatar) {
const url = avatar.content.url || avatar.content.avatar_url
@ -138,15 +122,6 @@ class Room extends ElemJS {
return resolveMxc(url, 32, "crop")
}
}
// if the room has no avatar set, use a member's avatar
const users = this.data.summary["m.heroes"]
if (users && users[0] && this.members.has(users[0])) {
// console.log(users[0], this.members.get(users[0]))
const userAvatar = this.members.get(users[0]).value().content.avatar_url
if (userAvatar) {
return resolveMxc(userAvatar, 32, "crop")
}
}
return null
}