matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-07 10:46:24 +03:00
Code Activity

fixup: don't consider left DM rooms

Browse Source
This commit is contained in:
Bruno Windels
2019-11-12 17:33:24 +01:00
parent 0a2255ce73
commit 8dd7d8e5c0
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/components/views/right_panel/UserInfo.js
View File

@@ -190,7 +190,10 @@ function openDMForUser(cli, userId) {
const dmRooms = DMRoomMap.shared().getDMRoomsForUserId(userId);
const lastActiveRoom = dmRooms.reduce((lastActiveRoom, roomId) => {
const room = cli.getRoom(roomId);
if (!lastActiveRoom || (room && lastActiveRoom.getLastActiveTimestamp() < room.getLastActiveTimestamp())) {
if (!room || room.getMyMembership() === "leave") {
return lastActiveRoom;
}
if (!lastActiveRoom || lastActiveRoom.getLastActiveTimestamp() < room.getLastActiveTimestamp()) {
return room;
}
return lastActiveRoom;
@@ -317,7 +320,7 @@ const UserOptionsSection = withLegacyMatrixClient(({matrixClient: cli, member, i
return (
<div className="mx_UserInfo_container">
<h3>{ _t("User Options") }</h3>
<h3>{ _t("Options") }</h3>
<div className="mx_UserInfo_buttons">
{ directMessageButton }
{ readReceiptButton }