summary refs log tree commit diff
path: root/synapse/handlers/federation.py
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2021-10-04 14:17:05 +0100
committerBrendan Abolivier <babolivier@matrix.org>2021-10-04 14:17:05 +0100
commitebbd37b66db2c5ed700d50dd00e3e108d7f1268c (patch)
tree235bd75367c221a98d10c03eb86d63173e875bb2 /synapse/handlers/federation.py
parentMerge branch 'release-v1.44' into matrix-org-hotfixes (diff)
parentFix error in `get_user_ip_and_agents` when fetching from the database (#10968) (diff)
downloadsynapse-ebbd37b66db2c5ed700d50dd00e3e108d7f1268c.tar.xz
Merge branch 'release-v1.44' into matrix-org-hotfixes
Diffstat (limited to 'synapse/handlers/federation.py')
-rw-r--r--synapse/handlers/federation.py9
1 files changed, 7 insertions, 2 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py

index b17ef2a9a1..adbd150e46 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py
@@ -27,7 +27,12 @@ from unpaddedbase64 import decode_base64 from twisted.internet import defer from synapse import event_auth -from synapse.api.constants import EventTypes, Membership, RejectedReason +from synapse.api.constants import ( + EventContentFields, + EventTypes, + Membership, + RejectedReason, +) from synapse.api.errors import ( AuthError, CodeMessageException, @@ -712,7 +717,7 @@ class FederationHandler(BaseHandler): if include_auth_user_id: event_content[ - "join_authorised_via_users_server" + EventContentFields.AUTHORISING_USER ] = await self._event_auth_handler.get_user_which_could_invite( room_id, state_ids,