mirrors/synapse
1
0
Fork 0
mirror of https://github.com/element-hq/synapse.git synced 2024-11-27 12:08:32 +03:00
Code Issues Projects Releases Packages Wiki Activity

Change uses of get_user_by_req because it returns a tuple now.

Browse source
This commit is contained in:
David Baker 2015-01-28 18:04:40 +00:00
parent 26c8fff19e
commit 8552ed8df2
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -138,7 +138,7 @@ class PushRuleRestServlet(ClientV1RestServlet):
except InvalidRuleException as e: except InvalidRuleException as e:
raise SynapseError(400, e.message) raise SynapseError(400, e.message)
user = yield self.auth.get_user_by_req(request) user, _ = yield self.auth.get_user_by_req(request)
content = _parse_json(request) content = _parse_json(request)
@ -184,7 +184,7 @@ class PushRuleRestServlet(ClientV1RestServlet):
except InvalidRuleException as e: except InvalidRuleException as e:
raise SynapseError(400, e.message) raise SynapseError(400, e.message)
user = yield self.auth.get_user_by_req(request) user, _ = yield self.auth.get_user_by_req(request)
if 'device' in spec: if 'device' in spec:
rules = yield self.hs.get_datastore().get_push_rules_for_user_name( rules = yield self.hs.get_datastore().get_push_rules_for_user_name(
@ -215,7 +215,7 @@ class PushRuleRestServlet(ClientV1RestServlet):
@defer.inlineCallbacks @defer.inlineCallbacks
def on_GET(self, request): def on_GET(self, request):
user = yield self.auth.get_user_by_req(request) user, _ = yield self.auth.get_user_by_req(request)
# we build up the full structure and then decide which bits of it # we build up the full structure and then decide which bits of it
# to send which means doing unnecessary work sometimes but is # to send which means doing unnecessary work sometimes but is

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

@ -27,7 +27,7 @@ class PusherRestServlet(ClientV1RestServlet):
@defer.inlineCallbacks @defer.inlineCallbacks
def on_POST(self, request): def on_POST(self, request):
user = yield self.auth.get_user_by_req(request) user, _ = yield self.auth.get_user_by_req(request)
content = _parse_json(request) content = _parse_json(request)