Merge pull request #3437 from matrix-org/travis/fix-deactivate

Wrap deactivation check with sanity conditions
matrix-org · Sep 13, 2019 · e18b38c · e18b38c
2 parents 7afd80e + 3150d65
commit e18b38c
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/components/views/rooms/MemberInfo.js b/src/components/views/rooms/MemberInfo.js
@@ -641,10 +641,15 @@ module.exports = createReactClass({
     },
 
     _calculateOpsPermissions: async function(member) {
+        let canDeactivate = false;
+        if (this.context.matrixClient) {
+            canDeactivate = await this.context.matrixClient.isSynapseAdministrator();
+        }
+
         const defaultPerms = {
             can: {
                 // Calculate permissions for Synapse before doing the PL checks
-                synapseDeactivate: await this.context.matrixClient.isSynapseAdministrator(),
+                synapseDeactivate: canDeactivate,
             },
             muted: false,
         };
@@ -668,7 +673,7 @@ module.exports = createReactClass({
         };
     },
 
-    _calculateCanPermissions: async function(me, them, powerLevels) {
+    _calculateCanPermissions: function(me, them, powerLevels) {
         const isMe = me.userId === them.userId;
         const can = {
             kick: false,