Merge branch 'master' into develop

This commit is contained in:
RiotRobot 2019-09-12 13:07:27 +01:00
commit b0abb52518
4 changed files with 29 additions and 6 deletions

View file

@ -679,6 +679,9 @@ module.exports = createReactClass({
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;
if (!canAffectUser) {
//console.log("Cannot affect user: %s >= %s", them.powerLevel, me.powerLevel);