mirror of
https://github.com/element-hq/element-web
synced 2024-10-25 12:16:00 +03:00
Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
commit
d5093b7ba0
1 changed files with 2 additions and 5 deletions
|
@ -191,14 +191,11 @@ function _showAnyInviteErrors(addrs, room) {
|
||||||
function _getDirectMessageRooms(addr) {
|
function _getDirectMessageRooms(addr) {
|
||||||
const dmRoomMap = new DMRoomMap(MatrixClientPeg.get());
|
const dmRoomMap = new DMRoomMap(MatrixClientPeg.get());
|
||||||
const dmRooms = dmRoomMap.getDMRoomsForUserId(addr);
|
const dmRooms = dmRoomMap.getDMRoomsForUserId(addr);
|
||||||
const rooms = [];
|
const rooms = dmRooms.filter((dmRoom) => {
|
||||||
dmRooms.forEach((dmRoom) => {
|
|
||||||
const room = MatrixClientPeg.get().getRoom(dmRoom);
|
const room = MatrixClientPeg.get().getRoom(dmRoom);
|
||||||
if (room) {
|
if (room) {
|
||||||
const me = room.getMember(MatrixClientPeg.get().credentials.userId);
|
const me = room.getMember(MatrixClientPeg.get().credentials.userId);
|
||||||
if (me.membership == 'join') {
|
return me && me.membership == 'join';
|
||||||
rooms.push(room);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
return rooms;
|
return rooms;
|
||||||
|
|
Loading…
Reference in a new issue