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

Update shield display rules

Browse source
This commit is contained in:
Zoe 2020-03-27 11:58:54 +00:00
parent cf4f595f79
commit 0f2e2ea069
2 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/components/structures/RoomView.js
View file

@ -40,6 +40,7 @@ import rate_limited_func from '../../ratelimitedfunc';
import * as ObjectUtils from '../../ObjectUtils';
import * as Rooms from '../../Rooms';
import eventSearch from '../../Searching';
import DMRoomMap from '../../utils/DMRoomMap';
import {isOnlyCtrlOrCmdKeyEvent, Key} from '../../Keyboard';
@ -833,7 +834,12 @@ export default createReactClass({
/* Check all verified user devices. */
/* Don't alarm if no other users are verified */
const targets = (verified.length > 0) ? [...verified, this.context.getUserId()] : verified;
const isDM = !!DMRoomMap.shared().getUserIdForRoomId(this.props.room.roomId);
const includeUser = (verified.length > 0) && // Don't alarm for self in rooms where nobody else is verified
!isDM && // Don't alarm for self in DMs with other users
(e2eMembers.length != 2) || // Don't alarm for self in 1:1 chats with other users
(e2eMembers.length == 1); // Do alarm for self if we're alone in a room
const targets = includeUser ? [...verified, this.context.getUserId()] : verified;
for (const userId of targets) {
const devices = await this.context.getStoredDevicesForUser(userId);
const anyDeviceNotVerified = devices.some(({deviceId}) => {

7
src/components/views/rooms/RoomTile.js
View file

@ -167,7 +167,12 @@ export default createReactClass({
/* Check all verified user devices. */
/* Don't alarm if no other users are verified */
const targets = (verified.length > 0) ? [...verified, cli.getUserId()] : verified;
const isDM = DMRoomMap.shared().getUserIdForRoomId(this.props.room.roomId);
const includeUser = (verified.length > 0) && // Don't alarm for self in rooms where nobody else is verified
!isDM && // Don't alarm for self in DMs with other users
(e2eMembers.length != 2) || // Don't alarm for self in 1:1 chats with other users
(e2eMembers.length == 1); // Do alarm for self if we're alone in a room
const targets = includeUser ? [...verified, cli.getUserId()] : verified;
for (const userId of targets) {
const devices = await cli.getStoredDevicesForUser(userId);
const allDevicesVerified = devices.every(({deviceId}) => {