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

Merge pull request #3411 from matrix-org/t3chguy/synapse_deactivate_memberinfo_no_room 

Support Synapse deactivate on MemberInfo without Room (timeline pill)
pull/21833/head
Michael Telatynski 2019-09-11 17:12:38 +01:00 committed by GitHub
parent f23f35bbe9 0b56e7a81c
commit 379fab8068
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/components/views/rooms/MemberInfo.js
View File

@ -642,7 +642,10 @@ module.exports = createReactClass({
_calculateOpsPermissions: async function(member) { _calculateOpsPermissions: async function(member) {
const defaultPerms = { const defaultPerms = {
can: {}, can: {
// Calculate permissions for Synapse before doing the PL checks
synapseDeactivate: await this.context.matrixClient.isSynapseAdministrator(),
},
muted: false, muted: false,
}; };
const room = this.context.matrixClient.getRoom(member.roomId); const room = this.context.matrixClient.getRoom(member.roomId);
@ -656,9 +659,10 @@ module.exports = createReactClass({
const them = member; const them = member;
return { return {
can: await this._calculateCanPermissions( can: {
me, them, powerLevels.getContent(), ...defaultPerms.can,
), ...await this._calculateCanPermissions(me, them, powerLevels.getContent()),
},
muted: this._isMuted(them, powerLevels.getContent()), muted: this._isMuted(them, powerLevels.getContent()),
isTargetMod: them.powerLevel > powerLevels.getContent().users_default, isTargetMod: them.powerLevel > powerLevels.getContent().users_default,
}; };
@ -675,9 +679,6 @@ module.exports = createReactClass({
redactMessages: false, redactMessages: false,
}; };
// Calculate permissions for Synapse before doing the PL checks
can.synapseDeactivate = await this.context.matrixClient.isSynapseAdministrator();
const canAffectUser = them.powerLevel < me.powerLevel || isMe; const canAffectUser = them.powerLevel < me.powerLevel || isMe;
if (!canAffectUser) { if (!canAffectUser) {
//console.log("Cannot affect user: %s >= %s", them.powerLevel, me.powerLevel); //console.log("Cannot affect user: %s >= %s", them.powerLevel, me.powerLevel);