imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #326 from matrix-org/dbkr/fix_user_links

Browse source 
Fix user links
This commit is contained in:
Richard van der Hoff 2016-06-30 17:43:08 +01:00 • committed by GitHub
commit a671e07da7
1 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/components/views/rooms/MemberInfo.js
View file

@ -358,10 +358,15 @@ module.exports = React.createClass({
]; ];
var existingRoomId; var existingRoomId;
var currentRoom = MatrixClientPeg.get().getRoom(this.props.member.roomId); // roomId can be null here because of a hack in MatrixChat.onUserClick where we
var currentMembers = currentRoom.getJoinedMembers(); // abuse this to view users rather than room members.
var currentMembers;
if (this.props.member.roomId) {
var currentRoom = MatrixClientPeg.get().getRoom(this.props.member.roomId);
currentMembers = currentRoom.getJoinedMembers();
}
// if we're currently in a 1:1 with this user, start a new chat // if we're currently in a 1:1 with this user, start a new chat
if (currentMembers.length === 2 && if (currentMembers && currentMembers.length === 2 &&
userIds.indexOf(currentMembers[0].userId) !== -1 && userIds.indexOf(currentMembers[0].userId) !== -1 &&
userIds.indexOf(currentMembers[1].userId) !== -1) userIds.indexOf(currentMembers[1].userId) !== -1)
{ {