tileradotorg/synapse
1
0
Fork 0
forked from MirrorHub/synapse
Code Pull requests Activity

Do not define power level limits in setUserPowerLevel. Update the function to be used as a resetUserPowerLevel

Browse source
This commit is contained in:
Emmanuel ROHEE 2014-09-03 15:18:57 +02:00
parent 932f35a7f0
commit 4c7da89219
2 changed files with 3 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
webclient/components/matrix/matrix-service.js
View file

@ -523,20 +523,14 @@ angular.module('matrixService', [])
}, },
/** /**
* Change the power level of a user * Change or reset the power level of a user
* @param {String} room_id the room id * @param {String} room_id the room id
* @param {String} user_id the user id * @param {String} user_id the user id
* @param {Number} powerLevel a value between 0 and 10 * @param {Number} powerLevel a value between 0 and 10
* If undefined, the user power level will be reset, ie he will use the default room user power level
* @returns {promise} an $http promise * @returns {promise} an $http promise
*/ */
setUserPowerLevel: function(room_id, user_id, powerLevel) { setUserPowerLevel: function(room_id, user_id, powerLevel) {
// Sanity check
if (powerLevel < 0 || 10 < powerLevel) {
// Format the error as is it was sent by the server
var deferred = $q.defer();
deferred.reject({data:{error: "Invalid powerLevel: " + powerLevel}});
return deferred.promise;
}
// Hack: currently, there is no home server API so do it by hand by updating // Hack: currently, there is no home server API so do it by hand by updating
// the current m.room.power_levels of the room and send it to the server // the current m.room.power_levels of the room and send it to the server
@ -551,32 +545,6 @@ angular.module('matrixService', [])
return doRequest("PUT", path, undefined, content); return doRequest("PUT", path, undefined, content);
} }
// The room does not exist or does not contain power_levels data
var deferred = $q.defer();
deferred.reject({data:{error: "Invalid room: " + room_id}});
return deferred.promise;
},
/**
* reset the power level of a user so that he will use the room default power level
* @param {String} room_id the room id
* @param {String} user_id the user id
* @returns {promise} an $http promise
*/
resetUserPowerLevel: function(room_id, user_id) {
// Hack: currently, there is no home server API so do it by hand by updating
// the current m.room.power_levels of the room and send it to the server
var room = $rootScope.events.rooms[room_id];
if (room && room["m.room.power_levels"]) {
var content = angular.copy(room["m.room.power_levels"].content);
delete content[user_id];
var path = "/rooms/$room_id/state/m.room.power_levels";
path = path.replace("$room_id", encodeURIComponent(room_id));
return doRequest("PUT", path, undefined, content);
}
// The room does not exist or does not contain power_levels data // The room does not exist or does not contain power_levels data
var deferred = $q.defer(); var deferred = $q.defer();
deferred.reject({data:{error: "Invalid room: " + room_id}}); deferred.reject({data:{error: "Invalid room: " + room_id}});

2
webclient/room/room-controller.js
View file

@ -311,7 +311,7 @@ angular.module('RoomController', ['ngSanitize', 'mFileInput'])
// Reset the power level of an user // Reset the power level of an user
if (2 === args.length) { if (2 === args.length) {
var user_id = args[1]; var user_id = args[1];
promise = matrixService.resetUserPowerLevel($scope.room_id, user_id); promise = matrixService.setUserPowerLevel($scope.room_id, user_id, undefined);
} }
break; break;
} }