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

Merge remote-tracking branch 'origin/develop' into jryans/id-change-red

Browse source
This commit is contained in:
J. Ryan Stinnett 2020-03-30 14:52:22 +01:00
commit a3555cacea
49 changed files with 349 additions and 183 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/utils/ShieldUtils.ts
View file

@ -18,7 +18,7 @@ interface Room {
roomId: string;
}
export async function shieldStatusForMembership(client: Client, room: Room): Promise<string> {
export async function shieldStatusForRoom(client: Client, room: Room): Promise<string> {
const members = (await room.getEncryptionTargetMembers()).map(({userId}) => userId);
const inDMMap = !!DMRoomMap.shared().getUserIdForRoomId(room.roomId);
@ -41,8 +41,8 @@ export async function shieldStatusForMembership(client: Client, room: Room): Pro
/* Don't alarm if no other users are verified */
const includeUser = (verified.length > 0) && // Don't alarm for self in rooms where nobody else is verified
!inDMMap && // Don't alarm for self in DMs with other users
(members.length !== 2) || // Don't alarm for self in 1:1 chats with other users
(members.length === 1); // Do alarm for self if we're alone in a room
(members.length !== 2) || // Don't alarm for self in 1:1 chats with other users
(members.length === 1); // Do alarm for self if we're alone in a room
const targets = includeUser ? [...verified, client.getUserId()] : verified;
for (const userId of targets) {
const devices = await client.getStoredDevicesForUser(userId);