diff options
| author | Daniel Wagner-Hall <dawagner@gmail.com> | 2015-10-06 08:10:34 -0500 |
|---|---|---|
| committer | Daniel Wagner-Hall <dawagner@gmail.com> | 2015-10-06 08:10:34 -0500 |
| commit | c05b5ef7b0410e74e7d81296df192895344235a8 (patch) | |
| tree | 164735092ac5a244a037123f63b600bea1710ebe /synapse | |
| parent | Merge branch 'daniel/useragent' into daniel/3pidinvites (diff) | |
| parent | Explicitly add Create event as auth event (diff) | |
| download | synapse-c05b5ef7b0410e74e7d81296df192895344235a8.tar.xz | |
Merge branch 'develop' into daniel/3pidinvites
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/handlers/federation.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py index d3d172b7b4..8d99101619 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py @@ -1174,7 +1174,7 @@ class FederationHandler(BaseHandler): auth_ids = [e_id for e_id, _ in e.auth_events] auth = { (e.type, e.state_key): e for e in remote_auth_chain - if e.event_id in auth_ids + if e.event_id in auth_ids or e.type == EventTypes.Create } e.internal_metadata.outlier = True @@ -1292,6 +1292,7 @@ class FederationHandler(BaseHandler): (e.type, e.state_key): e for e in result["auth_chain"] if e.event_id in auth_ids + or event.type == EventTypes.Create } ev.internal_metadata.outlier = True |