Remove excess condition on `knock->leave` check (#11900)

This commit is contained in:
Travis Ralston 2022-02-22 11:35:01 -07:00 committed by GitHub
parent 6d14b3dabf
commit e3fe6347be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions

1
changelog.d/11900.misc Normal file
View File

@ -0,0 +1 @@
Remove unnecessary condition on knock->leave auth rule check.

View File

@ -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 (