diff options
| author | Erik Johnston <erik@matrix.org> | 2014-08-26 18:57:55 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-08-26 18:57:55 +0100 |
| commit | 93cff1668c5e42d45a8393a1ac59173c8101b375 (patch) | |
| tree | b20e984d79e5bc59fedbfac335c97fe349404b14 /webclient | |
| parent | WIP: Completely change how event streaming and pagination work. This reflects... (diff) | |
| parent | Pepper UT TODOs (diff) | |
| download | synapse-93cff1668c5e42d45a8393a1ac59173c8101b375.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into stream_refactor
Diffstat (limited to 'webclient')
| -rw-r--r-- | webclient/components/matrix/matrix-service.js | 11 |
1 files changed, 5 insertions, 6 deletions
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); }, |