From 4c5db7cc9f54c5571cdf6b63cda5094a7814e69e Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 9 Sep 2016 17:23:15 +0100 Subject: [PATCH] Don't always show DM rooms in Direct Messages Favourites belong in favourites & parted ones belong in Historical, etc. --- src/components/views/rooms/RoomList.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js index 1265fc1af0..134b2286aa 100644 --- a/src/components/views/rooms/RoomList.js +++ b/src/components/views/rooms/RoomList.js @@ -233,10 +233,6 @@ module.exports = React.createClass({ else if (HIDE_CONFERENCE_CHANS && Rooms.isConfCallRoom(room, me, self.props.ConferenceHandler)) { // skip past this room & don't put it in any lists } - else if (dmRoomMap.getUserIdForRoomId(room.roomId)) { - // "Direct Message" rooms - s.lists["im.vector.fake.direct"].push(room); - } else if (me.membership == "join" || me.membership === "ban" || (me.membership === "leave" && me.events.member.getSender() !== me.events.member.getStateKey())) { @@ -250,6 +246,10 @@ module.exports = React.createClass({ s.lists[tagNames[i]].push(room); } } + else if (dmRoomMap.getUserIdForRoomId(room.roomId)) { + // "Direct Message" rooms (that we're still in and that aren't otherwise tagged) + s.lists["im.vector.fake.direct"].push(room); + } else { s.lists["im.vector.fake.recent"].push(room); }