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

Merge pull request #2762 from matrix-org/dbkr/duplicated-people

Browse source 
Don't duplicate direct chats from other tags
This commit is contained in:
David Baker 2019-03-06 15:39:45 +00:00 committed by GitHub
commit 1ed485b5b7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/stores/RoomListStore.js
View file

@ -319,7 +319,9 @@ class RoomListStore extends Store {
const dmRoomMap = DMRoomMap.shared(); const dmRoomMap = DMRoomMap.shared();
if (myMembership === 'invite') { if (myMembership === 'invite') {
tags.push("im.vector.fake.invite"); tags.push("im.vector.fake.invite");
} else if (dmRoomMap.getUserIdForRoomId(room.roomId)) { } else if (dmRoomMap.getUserIdForRoomId(room.roomId) && tags.length === 0) {
// We intentionally don't duplicate rooms in other tags into the people list
// as a feature.
tags.push("im.vector.fake.direct"); 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");