diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-01-28 15:36:21 +0000 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-01-28 15:43:41 +0000 |
| commit | c59bcabf0b5c0ab78c0f89da75b031993c4660d9 (patch) | |
| tree | 5691f2b6cc16fb0435c78925004bc12392fa3a42 /synapse/rest/client/v1/events.py | |
| parent | Merge pull request #34 from matrix-org/remove_serialize_event_from_hs (diff) | |
| download | synapse-c59bcabf0b5c0ab78c0f89da75b031993c4660d9.tar.xz | |
Return the device_id from get_auth_by_req
Diffstat (limited to 'synapse/rest/client/v1/events.py')
| -rw-r--r-- | synapse/rest/client/v1/events.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/rest/client/v1/events.py b/synapse/rest/client/v1/events.py index a0d051227b..e58ee46fcd 100644 --- a/synapse/rest/client/v1/events.py +++ b/synapse/rest/client/v1/events.py @@ -34,7 +34,7 @@ class EventStreamRestServlet(ClientV1RestServlet): @defer.inlineCallbacks def on_GET(self, request): - auth_user = yield self.auth.get_user_by_req(request) + auth_user, device_id = yield self.auth.get_user_by_req(request) try: handler = self.handlers.event_stream_handler pagin_config = PaginationConfig.from_request(request) @@ -71,7 +71,7 @@ class EventRestServlet(ClientV1RestServlet): @defer.inlineCallbacks def on_GET(self, request, event_id): - auth_user = yield self.auth.get_user_by_req(request) + auth_user, device_id = yield self.auth.get_user_by_req(request) handler = self.handlers.event_handler event = yield handler.get_event(auth_user, event_id) |