Matrix-Mirrors/synapse-product
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse-product.git synced 2025-08-04 02:04:12 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into daniel/roomcleanupincremental

Browse source 
Conflicts:
	synapse/rest/client/v1/room.py
This commit is contained in:
Daniel Wagner-Hall 2016-02-17 15:53:59 +00:00
commit 7e90fb6a57
4 changed files with 92 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

2
synapse/rest/client/v1/push_rule.py
View file

@ -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':

2
synapse/rest/client/v1/room.py
View file

@ -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