PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge pull request #2711 from matrix-org/travis/fix-dm-invites

Browse source 
Make sure direct chat invites are treated as invites
This commit is contained in:
Bruno Windels 2019-02-27 09:28:31 +01:00 committed by GitHub
commit f422e9db98
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/stores/RoomListStore.js
View file

@ -292,11 +292,15 @@ class RoomListStore extends Store {
// Stack the user's tags on top // Stack the user's tags on top
tags.push(...this._filterTags(room.tags)); tags.push(...this._filterTags(room.tags));
// Order matters here: The DMRoomMap updates before invites
// are accepted, so we check to see if the room is an invite
// first, then if it is a direct chat, and finally default
// to the "recents" list.
const dmRoomMap = DMRoomMap.shared(); const dmRoomMap = DMRoomMap.shared();
if (dmRoomMap.getUserIdForRoomId(room.roomId)) { if (myMembership === 'invite') {
tags.push("im.vector.fake.direct");
} else if (myMembership === 'invite') {
tags.push("im.vector.fake.invite"); tags.push("im.vector.fake.invite");
} else if (dmRoomMap.getUserIdForRoomId(room.roomId)) {
tags.push("im.vector.fake.direct");
} else if (tags.length === 0) { } else if (tags.length === 0) {
tags.push("im.vector.fake.recent"); tags.push("im.vector.fake.recent");
} }