summary refs log tree commit diff
path: root/synapse/handlers
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2020-03-23 17:10:02 +0000
committerAndrew Morgan <andrew@amorgan.xyz>2020-03-23 17:10:02 +0000
commit3e219a6ef0a47bda6d09f957f998e857f4d28723 (patch)
treebdefaec4f196d0000a0beaf8f5e783ff6cd60de0 /synapse/handlers
parentAllow empty federation_certificate_verification_whitelist (#6849) (diff)
parentpass room version into FederationClient.send_join (#6854) (diff)
downloadsynapse-3e219a6ef0a47bda6d09f957f998e857f4d28723.tar.xz
pass room version into FederationClient.send_join (#6854)
* commit 'b0c8bdd49':
  pass room version into FederationClient.send_join (#6854)
Diffstat (limited to 'synapse/handlers')
-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 fb5e5245ff..6862b49bdd 100644
--- a/synapse/handlers/federation.py
+++ b/synapse/handlers/federation.py
@@ -1309,9 +1309,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"]