matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-17 17:42:41 +03:00
Code Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
RiotRobot
2019-09-12 13:07:27 +01:00
parent d7bac95270 cc072fb256
commit b0abb52518
4 changed files with 29 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/components/views/rooms/MemberInfo.js
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);