mirror of
https://github.com/element-hq/synapse
synced 2024-09-06 11:10:06 +00:00
Merge branch 'develop' into daniel/3pidinvites
This commit is contained in:
commit
c05b5ef7b0
1 changed files with 2 additions and 1 deletions
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in a new issue