summary refs log tree commit diff
path: root/synapse/handlers
diff options
context:
space:
mode:
authorAaron Raimist <aaron@raim.ist>2021-09-21 05:23:34 -0500
committerGitHub <noreply@github.com>2021-09-21 10:23:34 +0000
commit6a751ff5e064bbb1fae2915e533031531c9d74e7 (patch)
tree45e5a9fe2b31d056809156dc60b15196a603bd3a /synapse/handlers
parentGHA: reintroduce an env var for `$GITHUB_HEAD_REF` (#10659) (diff)
downloadsynapse-6a751ff5e064bbb1fae2915e533031531c9d74e7.tar.xz
Allow sending a membership event to unban a user (#10807)
* Allow membership event to unban user

Signed-off-by: Aaron Raimist <aaron@raim.ist>
Diffstat (limited to 'synapse/handlers')
-rw-r--r--synapse/handlers/room_member.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/handlers/room_member.py b/synapse/handlers/room_member.py
index a3e13c2270..7bb3f0bc47 100644
--- a/synapse/handlers/room_member.py
+++ b/synapse/handlers/room_member.py
@@ -668,7 +668,7 @@ class RoomMemberHandler(metaclass=abc.ABCMeta):
                     " (membership=%s)" % old_membership,
                     errcode=Codes.BAD_STATE,
                 )
-            if old_membership == "ban" and action != "unban":
+            if old_membership == "ban" and action not in ["ban", "unban", "leave"]:
                 raise SynapseError(
                     403,
                     "Cannot %s user who was banned" % (action,),