Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-03 01:04:49 -04:00
Code Issues Projects Releases Packages Wiki Activity

Adjusted webclient to use new state paths. Updated membership msg template to actually show the person invited. Factored out common membership functions in matrix service.

Browse source
This commit is contained in:
Kegan Dougal 2014-08-26 10:24:47 +01:00
parent 52b64617f9
commit 5796232cb1
6 changed files with 24 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

4
webclient/components/matrix/event-handler-service.js
View file

@ -54,10 +54,6 @@ angular.module('eventHandlerService', [])
}
var handleMessage = function(event, isLiveEvent) {
if ("membership_target" in event.content) {
event.user_id = event.content.membership_target;
}
initRoom(event.room_id);
if (isLiveEvent) {

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

@ -115,19 +115,7 @@ angular.module('matrixService', [])
// Joins a room
join: function(room_id) {
// The REST path spec
var path = "/rooms/$room_id/members/$user_id/state";
// Like the cmd client, escape room ids
room_id = encodeURIComponent(room_id);
// Customize it
path = path.replace("$room_id", room_id);
path = path.replace("$user_id", config.user_id);
return doRequest("PUT", path, undefined, {
membership: "join"
});
return this.membershipChange(room_id, config.user_id, "join");
},
joinAlias: function(room_alias) {
@ -141,34 +129,23 @@ angular.module('matrixService', [])
// Invite a user to a room
invite: function(room_id, user_id) {
// The REST path spec
var path = "/rooms/$room_id/members/$user_id/state";
// Like the cmd client, escape room ids
room_id = encodeURIComponent(room_id);
// Customize it
path = path.replace("$room_id", room_id);
path = path.replace("$user_id", user_id);
return doRequest("PUT", path, undefined, {
membership: "invite"
});
return this.membershipChange(room_id, user_id, "invite");
},
// Leaves a room
leave: function(room_id) {
return this.membershipChange(room_id, config.user_id, "leave");
},
membershipChange: function(room_id, user_id, membershipValue) {
// The REST path spec
var path = "/rooms/$room_id/members/$user_id/state";
var path = "/rooms/$room_id/state/m.room.member/$user_id";
path = path.replace("$room_id", encodeURIComponent(room_id));
path = path.replace("$user_id", encodeURIComponent(user_id));
// Like the cmd client, escape room ids
room_id = encodeURIComponent(room_id);
// Customize it
path = path.replace("$room_id", room_id);
path = path.replace("$user_id", config.user_id);
return doRequest("DELETE", path, undefined, undefined);
return doRequest("PUT", path, undefined, {
membership: membershipValue
});
},
// Retrieves the room ID corresponding to a room alias