OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #3797 from matrix-org/dbkr/remove_unverify 

Remove 'unverify' from UserInfoPanel
pull/21833/head
David Baker 2020-01-03 15:23:52 +00:00 committed by GitHub
parent 23dffb69ac 5faae1d2f2
commit f9216ea590
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/components/views/right_panel/UserInfo.js
View File

@ -74,17 +74,6 @@ const _getE2EStatus = (cli, userId, devices) => {
return "warning"; return "warning";
}; };
async function unverifyUser(matrixClient, userId) {
const devices = await matrixClient.getStoredDevicesForUser(userId);
for (const device of devices) {
if (device.isVerified()) {
matrixClient.setDeviceVerified(
userId, device.deviceId, false,
);
}
}
}
function openDMForUser(matrixClient, userId) { function openDMForUser(matrixClient, userId) {
const dmRooms = DMRoomMap.shared().getDMRoomsForUserId(userId); const dmRooms = DMRoomMap.shared().getDMRoomsForUserId(userId);
const lastActiveRoom = dmRooms.reduce((lastActiveRoom, roomId) => { const lastActiveRoom = dmRooms.reduce((lastActiveRoom, roomId) => {
@ -331,14 +320,6 @@ const UserOptionsSection = ({member, isIgnored, canInvite, devices}) => {
</AccessibleButton> </AccessibleButton>
); );
} }
let unverifyButton;
if (devices && devices.some(device => device.isVerified())) {
unverifyButton = (
<AccessibleButton onClick={() => unverifyUser(cli, member.userId)} className="mx_UserInfo_field mx_UserInfo_destructive">
{ _t('Unverify user') }
</AccessibleButton>
);
}
return ( return (
<div className="mx_UserInfo_container"> <div className="mx_UserInfo_container">
@ -350,7 +331,6 @@ const UserOptionsSection = ({member, isIgnored, canInvite, devices}) => {
{ insertPillButton } { insertPillButton }
{ inviteUserButton } { inviteUserButton }
{ ignoreButton } { ignoreButton }
{ unverifyButton }
</div> </div>
</div> </div>
); );

1
src/i18n/strings/en_EN.json
View File

@ -1114,7 +1114,6 @@
"%(count)s verified sessions|other": "%(count)s verified sessions", "%(count)s verified sessions|other": "%(count)s verified sessions",
"%(count)s verified sessions|one": "1 verified session", "%(count)s verified sessions|one": "1 verified session",
"Direct message": "Direct message", "Direct message": "Direct message",
"Unverify user": "Unverify user",
"Remove from community": "Remove from community", "Remove from community": "Remove from community",
"Disinvite this user from community?": "Disinvite this user from community?", "Disinvite this user from community?": "Disinvite this user from community?",
"Remove this user from community?": "Remove this user from community?", "Remove this user from community?": "Remove this user from community?",