Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
commit
6b9159f3fa
1 changed files with 14 additions and 1 deletions
|
@ -109,10 +109,15 @@ module.exports = React.createClass({
|
||||||
|
|
||||||
const mlist = props.room.currentState.members;
|
const mlist = props.room.currentState.members;
|
||||||
const userIds = [];
|
const userIds = [];
|
||||||
|
const leftUserIds = [];
|
||||||
// for .. in optimisation to return early if there are >2 keys
|
// for .. in optimisation to return early if there are >2 keys
|
||||||
for (const uid in mlist) {
|
for (const uid in mlist) {
|
||||||
if (mlist.hasOwnProperty(uid)) {
|
if (mlist.hasOwnProperty(uid)) {
|
||||||
|
if (["join", "invite"].includes(mlist[uid].membership)) {
|
||||||
userIds.push(uid);
|
userIds.push(uid);
|
||||||
|
} else {
|
||||||
|
leftUserIds.push(uid);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if (userIds.length > 2) {
|
if (userIds.length > 2) {
|
||||||
return null;
|
return null;
|
||||||
|
@ -134,6 +139,14 @@ module.exports = React.createClass({
|
||||||
false,
|
false,
|
||||||
);
|
);
|
||||||
} else if (userIds.length == 1) {
|
} else if (userIds.length == 1) {
|
||||||
|
// The other 1-1 user left, leaving just the current user, so show the left user's avatar
|
||||||
|
if (leftUserIds.length === 1) {
|
||||||
|
return mlist[leftUserIds[0]].getAvatarUrl(
|
||||||
|
MatrixClientPeg.get().getHomeserverUrl(),
|
||||||
|
props.width, props.height, props.resizeMethod,
|
||||||
|
false,
|
||||||
|
);
|
||||||
|
}
|
||||||
return mlist[userIds[0]].getAvatarUrl(
|
return mlist[userIds[0]].getAvatarUrl(
|
||||||
MatrixClientPeg.get().getHomeserverUrl(),
|
MatrixClientPeg.get().getHomeserverUrl(),
|
||||||
Math.floor(props.width * window.devicePixelRatio),
|
Math.floor(props.width * window.devicePixelRatio),
|
||||||
|
|
Loading…
Reference in a new issue