From 9658efd6d7f160552a87d4f29622c42c8c283744 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 28 Aug 2017 01:04:18 +0100
Subject: [PATCH] add comment and remove redundant logic

---
 src/components/views/rooms/MemberInfo.js | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/components/views/rooms/MemberInfo.js b/src/components/views/rooms/MemberInfo.js
index af32d60cef..8ed05023ad 100644
--- a/src/components/views/rooms/MemberInfo.js
+++ b/src/components/views/rooms/MemberInfo.js
@@ -40,9 +40,6 @@ import withMatrixClient from '../../../wrappers/withMatrixClient';
 import AccessibleButton from '../elements/AccessibleButton';
 import GeminiScrollbar from 'react-gemini-scrollbar';
 
-// States which both sides of the dmRoom must have for it to be considered relevant.
-const joinStates = ['invite', 'join'];
-
 module.exports = withMatrixClient(React.createClass({
     displayName: 'MemberInfo',
 
@@ -613,6 +610,10 @@ module.exports = withMatrixClient(React.createClass({
         var startChat, kickButton, banButton, muteButton, giveModButton, spinner;
         if (this.props.member.userId !== this.props.matrixClient.credentials.userId) {
             const dmRoomMap = new DMRoomMap(this.props.matrixClient);
+            // dmRooms will not include dmRooms that we have been invited into but did not join.
+            // Because DMRoomMap runs off account_data[m.direct] which is only set on join of dm room.
+            // XXX: we potentially want DMs we have been invited to, to also show up here :L
+            // especially as logic below concerns specially if we haven't joined but have been invited
             const dmRooms = dmRoomMap.getDMRoomsForUserId(this.props.member.userId);
 
             const RoomTile = sdk.getComponent("rooms.RoomTile");
@@ -622,11 +623,11 @@ module.exports = withMatrixClient(React.createClass({
                 const room = this.props.matrixClient.getRoom(roomId);
                 if (room) {
                     const me = room.getMember(this.props.matrixClient.credentials.userId);
-                    // not a DM room if we have are not joined/invited
-                    if (!me.membership || !joinStates.includes(me.membership)) continue;
-                    // not a DM room if they are not joined/invited
+                    // not a DM room if we have are not joined
+                    if (!me.membership || me.membership !== 'join') continue;
+                    // not a DM room if they are not joined
                     const them = this.props.member;
-                    if (!them.membership || !joinStates.includes(them.membership)) continue;
+                    if (!them.membership || them.membership !== 'join') continue;
 
                     const highlight = room.getUnreadNotificationCount('highlight') > 0 || me.membership === 'invite';