OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Created kick & unban methods in matrixService. Made some factorisation.

pull/10/head
Emmanuel ROHEE 2014-09-05 17:30:50 +02:00
parent cf4c17deaf
commit 3be6156774
2 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
webclient/components/matrix/matrix-service.js
View File

@ -168,23 +168,20 @@ angular.module('matrixService', [])
}, },
// Change the membership of an another user // Change the membership of an another user
setMembership: function(room_id, user_id, membershipValue) { setMembership: function(room_id, user_id, membershipValue, reason) {
return this.setMembershipObject(room_id, user_id, {
membership : membershipValue
});
},
// Change the membership of an another user
setMembershipObject: function(room_id, user_id, membershipObject) {
// The REST path spec // The REST path spec
var path = "/rooms/$room_id/state/m.room.member/$user_id"; var path = "/rooms/$room_id/state/m.room.member/$user_id";
path = path.replace("$room_id", encodeURIComponent(room_id)); path = path.replace("$room_id", encodeURIComponent(room_id));
path = path.replace("$user_id", user_id); path = path.replace("$user_id", user_id);
return doRequest("PUT", path, undefined, membershipObject); return doRequest("PUT", path, undefined, {
membership : membershipValue,
reason: reason
});
}, },
// Bans a user from from a room // Bans a user from a room
ban: function(room_id, user_id, reason) { ban: function(room_id, user_id, reason) {
var path = "/rooms/$room_id/ban"; var path = "/rooms/$room_id/ban";
path = path.replace("$room_id", encodeURIComponent(room_id)); path = path.replace("$room_id", encodeURIComponent(room_id));
@ -194,7 +191,20 @@ angular.module('matrixService', [])
reason: reason reason: reason
}); });
}, },
// Unbans a user in a room
unban: function(room_id, user_id) {
// FIXME: To update when there will be homeserver API for unban
// For now, do an unban by resetting the user membership to "leave"
return this.setMembership(room_id, user_id, "leave");
},
// Kicks a user from a room
kick: function(room_id, user_id, reason) {
// Set the user membership to "leave" to kick him
return this.setMembership(room_id, user_id, "leave", reason);
},
// Retrieves the room ID corresponding to a room alias // Retrieves the room ID corresponding to a room alias
resolveRoomAlias:function(room_alias) { resolveRoomAlias:function(room_alias) {
var path = "/_matrix/client/api/v1/directory/room/$room_alias"; var path = "/_matrix/client/api/v1/directory/room/$room_alias";

15
webclient/room/room-controller.js
View File

@ -325,15 +325,9 @@ angular.module('RoomController', ['ngSanitize', 'matrixFilter', 'mFileInput'])
// Kick a user from the room with an optional reason // Kick a user from the room with an optional reason
if (args) { if (args) {
var matches = args.match(/^(\S+?)( +(.*))?$/); var matches = args.match(/^(\S+?)( +(.*))?$/);
if (matches.length === 2) { if (matches) {
promise = matrixService.setMembership($scope.room_id, matches[1], "leave"); promise = matrixService.kick($scope.room_id, matches[1], matches[3]);
} }
else if (matches.length === 4) {
promise = matrixService.setMembershipObject($scope.room_id, matches[1], {
membership: "leave",
reason: matches[3] // TODO: we need to specify resaon in the spec
});
}
} }
if (!promise) { if (!promise) {
@ -357,14 +351,11 @@ angular.module('RoomController', ['ngSanitize', 'matrixFilter', 'mFileInput'])
case "/unban": case "/unban":
// Unban a user from the room // Unban a user from the room
// FIXME: this feels horribly asymmetrical - why are we banning via RPC
// and unbanning by editing the membership list?
// Why can't we specify a reason?
if (args) { if (args) {
var matches = args.match(/^(\S+)$/); var matches = args.match(/^(\S+)$/);
if (matches) { if (matches) {
// Reset the user membership to "leave" to unban him // Reset the user membership to "leave" to unban him
promise = matrixService.setMembership($scope.room_id, matches[1], "leave"); promise = matrixService.unban($scope.room_id, matches[1]);
} }
} }