Skip to content
This repository was archived by the owner on Sep 11, 2024. It is now read-only.

Commit 7eb3a77

Browse files
authored
Merge pull request #761 from matrix-org/luke/fix-people-section2
Fix people section DropTarget and refactor Rooms
2 parents 5535192 + dca02d9 commit 7eb3a77

File tree

2 files changed

+16
-0
lines changed

2 files changed

+16
-0
lines changed

src/Rooms.js

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,20 @@ export function looksLikeDirectMessageRoom(room, me) {
7979
return false;
8080
}
8181

82+
export function guessAndSetDMRoom(room, isDirect) {
83+
let newTarget;
84+
if (isDirect) {
85+
const guessedTarget = guessDMRoomTarget(
86+
room, room.getMember(MatrixClientPeg.get().credentials.userId),
87+
);
88+
newTarget = guessedTarget.userId;
89+
} else {
90+
newTarget = null;
91+
}
92+
93+
return setDMRoom(room.roomId, newTarget);
94+
}
95+
8296
/**
8397
* Marks or unmarks the given room as being as a DM room.
8498
* @param {string} roomId The ID of the room to modify

src/components/views/rooms/RoomList.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -485,6 +485,8 @@ module.exports = React.createClass({
485485

486486
<RoomSubList list={ self.state.lists['im.vector.fake.direct'] }
487487
label="People"
488+
tagName="im.vector.fake.direct"
489+
verb="tag direct chat"
488490
editable={ true }
489491
order="recent"
490492
selectedRoom={ self.props.selectedRoom }

0 commit comments

Comments
 (0)