matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-12-14 19:22:15 +03:00
Code Activity

fix based on rich's feedback

Browse Source 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
This commit is contained in:
Michael Telatynski
2017-05-23 12:55:05 +01:00
parent 09529a1aa8
commit 69ed6f283d
1 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/models/room-state.js
View File

@@ -248,7 +248,7 @@ RoomState.prototype.getUserIdsWithDisplayName = function(displayName) {
/** /**
* Returns true if userId is in room, event is not redacted and either sender of * Returns true if userId is in room, event is not redacted and either sender of
* mxEvent or has powerlevel sufficient to redact events other than their own. * mxEvent or has power level sufficient to redact events other than their own.
* @param {MatrixEvent} mxEvent The event to test permission for * @param {MatrixEvent} mxEvent The event to test permission for
* @param {string} userId The user ID of the user to test permission for * @param {string} userId The user ID of the user to test permission for
* @return {boolean} true if the given used ID can redact given event * @return {boolean} true if the given used ID can redact given event
@@ -260,18 +260,16 @@ RoomState.prototype.maySendRedactionForEvent = function(mxEvent, userId) {
if (mxEvent.status || mxEvent.isRedacted()) return false; if (mxEvent.status || mxEvent.isRedacted()) return false;
if (mxEvent.getSender() === userId) return true; if (mxEvent.getSender() === userId) return true;
return this._hasSufficientPowerLevelFor('redact', userId); return this._hasSufficientPowerLevelFor('redact', member.powerLevel);
}; };
/** /**
* Returns true if the given user ID has sufficient power level for type * Returns true if the given power level is sufficient for action
* @param {string} type The type of power level to check against * @param {string} action The type of power level to check
* @param {string} userId The user ID of the user to test permission for * @param {number} powerLevel The power level of the member
* @return {boolean} true if the given user ID has sufficient power level * @return {boolean} true if the given power level is sufficient
*/ */
RoomState.prototype._hasSufficientPowerLevelFor = function(type, userId) { RoomState.prototype._hasSufficientPowerLevelFor = function(action, powerLevel) {
const member = this.getMember(userId);
const powerLevelsEvent = this.getStateEvents('m.room.power_levels', ''); const powerLevelsEvent = this.getStateEvents('m.room.power_levels', '');
let powerLevels; let powerLevels;
@@ -279,12 +277,12 @@ RoomState.prototype._hasSufficientPowerLevelFor = function(type, userId) {
powerLevels = powerLevelsEvent.getContent(); powerLevels = powerLevelsEvent.getContent();
} }
let requiredLevel = powerLevels.state_default || 50; let requiredLevel = 50;
if (powerLevels[type] !== undefined) { if (powerLevels[action] !== undefined) {
requiredLevel = powerLevels[type]; requiredLevel = powerLevels[action];
} }
return member.powerLevel >= requiredLevel; return powerLevel >= requiredLevel;
}; };
/** /**