Merge branch 'master' into develop

This commit is contained in:
RiotRobot 2019-09-16 17:49:46 +01:00
commit dd0ffa8e72
4 changed files with 47 additions and 7 deletions

View file

@ -643,7 +643,11 @@ module.exports = createReactClass({
_calculateOpsPermissions: async function(member) {
let canDeactivate = false;
if (this.context.matrixClient) {
canDeactivate = await this.context.matrixClient.isSynapseAdministrator();
try {
canDeactivate = await this.context.matrixClient.isSynapseAdministrator();
} catch (e) {
console.error(e);
}
}
const defaultPerms = {