summary refs log tree commit diff
path: root/synapse/rest/client
diff options
context:
space:
mode:
authorDaniel Wagner-Hall <daniel@matrix.org>2016-02-17 15:53:59 +0000
committerDaniel Wagner-Hall <daniel@matrix.org>2016-02-17 15:53:59 +0000
commit7e90fb6a5728d223c6597f19194188a9f1e438ad (patch)
tree7d0ce13361eb03526251fdfe4dc32ed3d6ab5104 /synapse/rest/client
parentSome cleanup (diff)
parentMerge pull request #580 from Rugvip/develop (diff)
downloadsynapse-7e90fb6a5728d223c6597f19194188a9f1e438ad.tar.xz
Merge branch 'develop' into daniel/roomcleanupincremental
Conflicts:
	synapse/rest/client/v1/room.py
Diffstat (limited to 'synapse/rest/client')
-rw-r--r--synapse/rest/client/v1/push_rule.py2
-rw-r--r--synapse/rest/client/v1/room.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/synapse/rest/client/v1/push_rule.py b/synapse/rest/client/v1/push_rule.py
index 96633a176c..7766b8be1d 100644
--- a/synapse/rest/client/v1/push_rule.py
+++ b/synapse/rest/client/v1/push_rule.py
@@ -400,7 +400,7 @@ def _filter_ruleset_with_path(ruleset, path):
 
 def _priority_class_from_spec(spec):
     if spec['template'] not in PRIORITY_CLASS_MAP.keys():
-        raise InvalidRuleException("Unknown template: %s" % (spec['kind']))
+        raise InvalidRuleException("Unknown template: %s" % (spec['template']))
     pc = PRIORITY_CLASS_MAP[spec['template']]
 
     if spec['scope'] == 'device':
diff --git a/synapse/rest/client/v1/room.py b/synapse/rest/client/v1/room.py
index 1f5ee09dcc..cf7fcb04ff 100644
--- a/synapse/rest/client/v1/room.py
+++ b/synapse/rest/client/v1/room.py
@@ -165,7 +165,7 @@ class RoomStateEventRestServlet(ClientV1RestServlet):
         else:
             yield msg_handler.send_nonmember_event(event, context)
 
-        defer.returnValue((200, {}))
+        defer.returnValue((200, {"event_id": event.event_id}))
 
 
 # TODO: Needs unit testing for generic events + feedback