summary refs log tree commit diff
path: root/synapse/handlers
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-10-02 13:11:49 +0100
committerErik Johnston <erik@matrix.org>2015-10-02 13:22:36 +0100
commit49ebd472fab93ce8e8841cbd24ac209d56f15341 (patch)
tree6e679e08437952c199aa1e6bf8e40d7c8e547501 /synapse/handlers
parentAdd 'trusted_private_chat' to room creation presets (diff)
downloadsynapse-49ebd472fab93ce8e8841cbd24ac209d56f15341.tar.xz
Explicitly add Create event as auth event
Diffstat (limited to 'synapse/handlers')
-rw-r--r--synapse/handlers/federation.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py
index 3aff80bf59..3882ba79ed 100644
--- a/synapse/handlers/federation.py
+++ b/synapse/handlers/federation.py
@@ -162,7 +162,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 auth_chain
-                        if e.event_id in auth_ids
+                        if e.event_id in auth_ids or e.type == EventTypes.Create
                     }
                     event_infos.append({
                         "event": e,
@@ -1221,7 +1221,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
 
@@ -1339,6 +1339,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