OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #3225 from matrix-org/t3chguy/create_reuse_dialog_hide_left 

ChatCreateOrReuse show only rooms both you and the other party still in
pull/21833/head
Travis Ralston 2019-07-16 11:58:10 -06:00 committed by GitHub
parent 2471f92331 df26840d9e
commit e53b922290
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/components/views/dialogs/ChatCreateOrReuseDialog.js
View File

@ -52,7 +52,12 @@ export default class ChatCreateOrReuseDialog extends React.Component {
const tiles = []; const tiles = [];
for (const roomId of dmRooms) { for (const roomId of dmRooms) {
const room = client.getRoom(roomId); const room = client.getRoom(roomId);
if (room) { if (room && room.getMyMembership() === "join") {
const member = room.getMember(this.props.userId);
if (!member || member.membership !== "join") {
continue;
}
const isInvite = room.getMyMembership() === "invite"; const isInvite = room.getMyMembership() === "invite";
const highlight = room.getUnreadNotificationCount('highlight') > 0 || isInvite; const highlight = room.getUnreadNotificationCount('highlight') > 0 || isInvite;
tiles.push( tiles.push(