mirror of
https://github.com/vector-im/element-web.git
synced 2025-10-12 07:51:05 +02:00
Fix merge
This commit is contained in:
parent
b0abb52518
commit
ef7d8c42a8
@ -679,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);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user