From 6ff92ede8f26b403cc05f5e18b0c0f445bfdff13 Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Fri, 13 Jul 2018 12:51:32 +0200 Subject: [PATCH] this code actually never fires, so remove it and that's ok because createRoom will already mark a DM as such on the inviter's side. So here we just handle the invitees side. --- src/components/structures/RoomView.js | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js index 3a9b3ae748..a545eaab54 100644 --- a/src/components/structures/RoomView.js +++ b/src/components/structures/RoomView.js @@ -758,22 +758,6 @@ module.exports = React.createClass({ if (dmInviter) { Rooms.setDMRoom(roomId, dmInviter); - return; - } - - const invitedMembers = this.state.room.getMembersWithMembership("invite"); - const joinedMembers = this.state.room.getMembersWithMembership("join"); - - // There must be one invited member and one joined member - if (invitedMembers.length !== 1 || joinedMembers.length !== 1) { - return; - } - - // The user may have sent an invite with is_direct sent - const other = invitedMembers[0]; - if (other && !!other.getDirectChatInviter()) { - Rooms.setDMRoom(roomId, other.userId); - return; } },