summary refs log tree commit diff
path: root/synapse/handlers/federation.py
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2020-02-06 15:50:39 +0000
committerGitHub <noreply@github.com>2020-02-06 15:50:39 +0000
commitb0c8bdd49dd416ed066b12daee95cf5f4828f03b (patch)
treea8095fbfeb1d989090fcb0e7c03298e87ef9e741 /synapse/handlers/federation.py
parentAllow empty federation_certificate_verification_whitelist (#6849) (diff)
downloadsynapse-b0c8bdd49dd416ed066b12daee95cf5f4828f03b.tar.xz
pass room version into FederationClient.send_join (#6854)
... which allows us to sanity-check the create event.
Diffstat (limited to 'synapse/handlers/federation.py')
-rw-r--r--synapse/handlers/federation.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py
index ef3cc264b7..10e8b6ea4c 100644
--- a/synapse/handlers/federation.py
+++ b/synapse/handlers/federation.py
@@ -1305,9 +1305,8 @@ class FederationHandler(BaseHandler):
             except ValueError:
                 pass
 
-            event_format_version = room_version_obj.event_format
             ret = await self.federation_client.send_join(
-                target_hosts, event, event_format_version
+                target_hosts, event, room_version_obj
             )
 
             origin = ret["origin"]