Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Commit

Permalink
Merge pull request #3411 from matrix-org/t3chguy/synapse_deactivate_m…
Browse files Browse the repository at this point in the history
…emberinfo_no_room

Support Synapse deactivate on MemberInfo without Room (timeline pill)
  • Loading branch information
t3chguy authored Sep 11, 2019
2 parents f23f35b + 0b56e7a commit 379fab8
Showing 1 changed file with 8 additions and 7 deletions.
15 changes: 8 additions & 7 deletions src/components/views/rooms/MemberInfo.js
Original file line number Diff line number Diff line change
Expand Up @@ -642,7 +642,10 @@ module.exports = createReactClass({

_calculateOpsPermissions: async function(member) {
const defaultPerms = {
can: {},
can: {
// Calculate permissions for Synapse before doing the PL checks
synapseDeactivate: await this.context.matrixClient.isSynapseAdministrator(),
},
muted: false,
};
const room = this.context.matrixClient.getRoom(member.roomId);
Expand All @@ -656,9 +659,10 @@ module.exports = createReactClass({

const them = member;
return {
can: await this._calculateCanPermissions(
me, them, powerLevels.getContent(),
),
can: {
...defaultPerms.can,
...await this._calculateCanPermissions(me, them, powerLevels.getContent()),
},
muted: this._isMuted(them, powerLevels.getContent()),
isTargetMod: them.powerLevel > powerLevels.getContent().users_default,
};
Expand All @@ -675,9 +679,6 @@ 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);
Expand Down

0 comments on commit 379fab8

Please sign in to comment.