diff options
| author | Erik Johnston <erik@matrix.org> | 2015-09-11 14:26:15 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-09-17 10:26:03 +0100 |
| commit | 744e7d2790380b20260c0740fc68f7f49d07136b (patch) | |
| tree | 707d871ed4e6470b2b0635805eaf723f1419c6eb /synapse/handlers/federation.py | |
| parent | Don't bail out of joining if we encounter a rejected event (diff) | |
| download | synapse-744e7d2790380b20260c0740fc68f7f49d07136b.tar.xz | |
Also handle state
Diffstat (limited to 'synapse/handlers/federation.py')
| -rw-r--r-- | synapse/handlers/federation.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py index 0f11fa390f..b148af5390 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py @@ -1002,7 +1002,7 @@ class FederationHandler(BaseHandler): @defer.inlineCallbacks def _persist_auth_tree(self, auth_events, state, event): events_to_context = {} - for e in auth_events: + for e in itertools.chain(auth_events, state): ctx = yield self.state_handler.compute_event_context( e, outlier=True, ) @@ -1020,7 +1020,7 @@ class FederationHandler(BaseHandler): create_event = e break - for e in auth_events + [event]: + for e in itertools.chain(auth_events, state, [event]): a = { (event_map[e_id].type, event_map[e_id].state_key): event_map[e_id] for e_id, _ in e.auth_events @@ -1033,7 +1033,7 @@ class FederationHandler(BaseHandler): except AuthError: logger.warn( "Rejecting %s because %s", - event.event_id, e.msg + e.event_id, e.msg ) if e == event: |