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

Oops, uncommit 61e0258

Browse source
This commit is contained in:
David Baker 2016-08-02 15:58:21 +01:00
parent 61e0258b6f
commit 3000fae5d8
1 changed files with 9 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -95,31 +95,31 @@ module.exports = React.createClass({
}, },
getExistingOneToOneRoomId: function() { getExistingOneToOneRoomId: function() {
const rooms = MatrixClientPeg.get().getRooms(); var self = this;
const userIds = [ var rooms = MatrixClientPeg.get().getRooms();
var userIds = [
this.props.member.userId, this.props.member.userId,
MatrixClientPeg.get().credentials.userId MatrixClientPeg.get().credentials.userId
]; ];
let existingRoomId = null; var existingRoomId;
let invitedRoomId = null;
// roomId can be null here because of a hack in MatrixChat.onUserClick where we // roomId can be null here because of a hack in MatrixChat.onUserClick where we
// abuse this to view users rather than room members. // abuse this to view users rather than room members.
let currentMembers; var currentMembers;
if (this.props.member.roomId) { if (this.props.member.roomId) {
const currentRoom = MatrixClientPeg.get().getRoom(this.props.member.roomId); var currentRoom = MatrixClientPeg.get().getRoom(this.props.member.roomId);
currentMembers = currentRoom.getJoinedMembers(); currentMembers = currentRoom.getJoinedMembers();
} }
// reuse the first private 1:1 we find // reuse the first private 1:1 we find
existingRoomId = null; existingRoomId = null;
for (let i = 0; i < rooms.length; i++) { for (var i = 0; i < rooms.length; i++) {
// don't try to reuse public 1:1 rooms // don't try to reuse public 1:1 rooms
const join_rules = rooms[i].currentState.getStateEvents("m.room.join_rules", ''); var join_rules = rooms[i].currentState.getStateEvents("m.room.join_rules", '');
if (join_rules && join_rules.getContent().join_rule === 'public') continue; if (join_rules && join_rules.getContent().join_rule === 'public') continue;
const members = rooms[i].getJoinedMembers(); var members = rooms[i].getJoinedMembers();
if (members.length === 2 && if (members.length === 2 &&
userIds.indexOf(members[0].userId) !== -1 && userIds.indexOf(members[0].userId) !== -1 &&
userIds.indexOf(members[1].userId) !== -1) userIds.indexOf(members[1].userId) !== -1)
@ -127,21 +127,6 @@ module.exports = React.createClass({
existingRoomId = rooms[i].roomId; existingRoomId = rooms[i].roomId;
break; break;
} }
const invited = rooms[i].getMembersWithMembership('invite');
if (members.length === 1 &&
invited.length === 1 &&
userIds.indexOf(members[0].userId) !== -1 &&
userIds.indexOf(invited[0].userId) !== -1) &&
invitedRoomId === null
{
invitedRoomId = rooms[i].roomId;
// keep looking: we'll use this one if there's nothing better
}
}
if (existingRoomId === null) {
existingRoomId = invitedRoomId;
} }
return existingRoomId; return existingRoomId;