diff options
| author | Patrick Cloke <patrickc@matrix.org> | 2023-07-26 12:45:17 -0400 |
|---|---|---|
| committer | Patrick Cloke <patrickc@matrix.org> | 2023-07-26 12:45:17 -0400 |
| commit | 02867aeb257c666f23574864b18cf50c4ce99002 (patch) | |
| tree | 358aef29f3ec3730457f73fc32a15acf418d1e1e /synapse/federation/federation_server.py | |
| parent | FIx-up content hash checking for PDUs vs. delegated PDUs. (diff) | |
| parent | Merge branch 'release-v1.89' into develop (diff) | |
| download | synapse-02867aeb257c666f23574864b18cf50c4ce99002.tar.xz | |
Merge remote-tracking branch 'origin/develop' into clokep/lm
Diffstat (limited to 'synapse/federation/federation_server.py')
| -rw-r--r-- | synapse/federation/federation_server.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/federation/federation_server.py b/synapse/federation/federation_server.py index 2a8b177162..24f726a4dd 100644 --- a/synapse/federation/federation_server.py +++ b/synapse/federation/federation_server.py @@ -857,7 +857,7 @@ class FederationServer(FederationBase): raise IncompatibleRoomVersionError(room_version=room_version.identifier) # Check that this room supports knocking as defined by its room version - if not room_version.msc2403_knocking: + if not room_version.knock_join_rule: raise SynapseError( 403, "This room version does not support knocking", @@ -965,7 +965,7 @@ class FederationServer(FederationBase): errcode=Codes.NOT_FOUND, ) - if membership_type == Membership.KNOCK and not room_version.msc2403_knocking: + if membership_type == Membership.KNOCK and not room_version.knock_join_rule: raise SynapseError( 403, "This room version does not support knocking", @@ -994,7 +994,7 @@ class FederationServer(FederationBase): # the event is valid to be sent into the room. Currently this is only done # if the user is being joined via restricted join rules. if ( - room_version.msc3083_join_rules + room_version.restricted_join_rule and event.membership == Membership.JOIN and EventContentFields.AUTHORISING_USER in event.content ): |