summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-02-17 11:06:14 +0000
committerErik Johnston <erik@matrix.org>2016-02-17 11:06:14 +0000
commit97d1b3a5061f43d17c43291f0f079afc50319746 (patch)
treeab33b8eb641617a643a4fedf7a68e47d0637a43e /synapse
parentFix typo in request validation for adding push rules. (diff)
parentclient/v1/room: include event_id in response to state event PUT, in accordanc... (diff)
downloadsynapse-97d1b3a5061f43d17c43291f0f079afc50319746.tar.xz
Merge pull request #581 from Rugvip/event_id
client/v1/room: include event_id in response to state event PUT
Diffstat (limited to 'synapse')
-rw-r--r--synapse/rest/client/v1/room.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/rest/client/v1/room.py b/synapse/rest/client/v1/room.py
index d3c1b359a2..24706f9383 100644
--- a/synapse/rest/client/v1/room.py
+++ b/synapse/rest/client/v1/room.py
@@ -150,11 +150,11 @@ class RoomStateEventRestServlet(ClientV1RestServlet):
             event_dict["state_key"] = state_key
 
         msg_handler = self.handlers.message_handler
-        yield msg_handler.create_and_send_event(
+        event = yield msg_handler.create_and_send_event(
             event_dict, token_id=requester.access_token_id, txn_id=txn_id,
         )
 
-        defer.returnValue((200, {}))
+        defer.returnValue((200, {"event_id": event.event_id}))
 
 
 # TODO: Needs unit testing for generic events + feedback