You've already forked matrix-react-sdk
mirror of
https://github.com/matrix-org/matrix-react-sdk.git
synced 2025-11-10 09:22:25 +03:00
Fix merge
This commit is contained in:
@@ -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);
|
||||||
|
|||||||
Reference in New Issue
Block a user