From 5a93bfe1f03bf225bcf3b14089faefa3b5715499 Mon Sep 17 00:00:00 2001 From: Kegan Dougal Date: Tue, 26 Aug 2014 17:21:48 +0100 Subject: Removed MessageRestServlet, use RoomSendEventRestServlet instead. Updated cmdclient, tests and webclient. All appears to work. --- webclient/components/matrix/matrix-service.js | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'webclient') diff --git a/webclient/components/matrix/matrix-service.js b/webclient/components/matrix/matrix-service.js index fe5f120aaf..2286485605 100644 --- a/webclient/components/matrix/matrix-service.js +++ b/webclient/components/matrix/matrix-service.js @@ -162,12 +162,12 @@ angular.module('matrixService', []) return doRequest("GET", path, undefined, {}); }, - sendMessage: function(room_id, msg_id, content) { + sendMessage: function(room_id, txn_id, content) { // The REST path spec - var path = "/rooms/$room_id/messages/$from/$msg_id"; + var path = "/rooms/$room_id/send/m.room.message/$txn_id"; - if (!msg_id) { - msg_id = "m" + new Date().getTime(); + if (!txn_id) { + txn_id = "m" + new Date().getTime(); } // Like the cmd client, escape room ids @@ -175,8 +175,7 @@ angular.module('matrixService', []) // Customize it path = path.replace("$room_id", room_id); - path = path.replace("$from", config.user_id); - path = path.replace("$msg_id", msg_id); + path = path.replace("$txn_id", txn_id); return doRequest("PUT", path, undefined, content); }, -- cgit 1.4.1