summary refs log tree commit diff
path: root/synapse/event_auth.py
diff options
context:
space:
mode:
authorTravis Ralston <travisr@matrix.org>2022-02-22 11:35:01 -0700
committerGitHub <noreply@github.com>2022-02-22 18:35:01 +0000
commite3fe6347be1da930b6a0ed2005b565369800a327 (patch)
tree706037fb67be7625556af1ca4ce084da934e6133 /synapse/event_auth.py
parentBetter error message when failing to request from another process (#12060) (diff)
downloadsynapse-e3fe6347be1da930b6a0ed2005b565369800a327.tar.xz
Remove excess condition on `knock->leave` check (#11900)
Diffstat (limited to 'synapse/event_auth.py')
-rw-r--r--synapse/event_auth.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/event_auth.py b/synapse/event_auth.py
index eca00bc975..621a3efccc 100644
--- a/synapse/event_auth.py
+++ b/synapse/event_auth.py
@@ -374,9 +374,9 @@ def _is_membership_change_allowed(
         return
 
     # Require the user to be in the room for membership changes other than join/knock.
-    if Membership.JOIN != membership and (
-        RoomVersion.msc2403_knocking and Membership.KNOCK != membership
-    ):
+    # Note that the room version check for knocking is done implicitly by `caller_knocked`
+    # and the ability to set a membership of `knock` in the first place.
+    if Membership.JOIN != membership and Membership.KNOCK != membership:
         # If the user has been invited or has knocked, they are allowed to change their
         # membership event to leave
         if (