imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Exclude functional members from DM detection (#9124)

Browse source 
* Exclude functional members from DM detection

* Fix getRoomFunctionalMembers test

* Simplify getFunctionalMembers

* Remove unnecessary filter
This commit is contained in:
Michael Weimann 2022-08-01 19:28:33 +02:00 • committed by GitHub
parent 91a24c411b
commit f10e3abb6e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 312 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/utils/dm/findDMForUser.ts
View file

@ -19,6 +19,7 @@ import { MatrixClient, Room } from "matrix-js-sdk/src/matrix";
import DMRoomMap from "../DMRoomMap";
import { isLocalRoom } from "../localRoom/isLocalRoom";
import { isJoinedOrNearlyJoined } from "../membership";
import { getFunctionalMembers } from "../room/getFunctionalMembers";
/**
* Tries to find a DM room with a specific user.
@ -39,8 +40,11 @@ export function findDMForUser(client: MatrixClient, userId: string): Room {
if (r && r.getMyMembership() === "join") {
if (isLocalRoom(r)) return false;
const functionalUsers = getFunctionalMembers(r);
const members = r.currentState.getMembers();
const joinedMembers = members.filter(m => isJoinedOrNearlyJoined(m.membership));
const joinedMembers = members.filter(
m => !functionalUsers.includes(m.userId) && isJoinedOrNearlyJoined(m.membership),
);
const otherMember = joinedMembers.find(m => m.userId === userId);
return otherMember && joinedMembers.length === 2;
}