diff options
| author | Erik Johnston <erik@matrix.org> | 2016-09-02 14:54:07 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-09-02 14:54:07 +0100 |
| commit | 3baf641a487f5adffd20a55cb93f36d4620c626c (patch) | |
| tree | 737609506c74db37a83a3d18267a4defe707793d /synapse/federation | |
| parent | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/state_storage (diff) | |
| parent | Explicitly specify state_key for history_visibility fetching (diff) | |
| download | synapse-3baf641a487f5adffd20a55cb93f36d4620c626c.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/state_storage
Diffstat (limited to 'synapse/federation')
| -rw-r--r-- | synapse/federation/federation_server.py | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/synapse/federation/federation_server.py b/synapse/federation/federation_server.py index aba19639c7..5621655098 100644 --- a/synapse/federation/federation_server.py +++ b/synapse/federation/federation_server.py @@ -223,16 +223,14 @@ class FederationServer(FederationBase): if not in_room: raise AuthError(403, "Host not in room.") - pdus = yield self.handler.get_state_for_pdu( + state_ids = yield self.handler.get_state_ids_for_pdu( room_id, event_id, ) - auth_chain = yield self.store.get_auth_chain( - [pdu.event_id for pdu in pdus] - ) + auth_chain_ids = yield self.store.get_auth_chain_ids(state_ids) defer.returnValue((200, { - "pdu_ids": [pdu.event_id for pdu in pdus], - "auth_chain_ids": [pdu.event_id for pdu in auth_chain], + "pdu_ids": state_ids, + "auth_chain_ids": auth_chain_ids, })) @defer.inlineCallbacks |