diff options
| author | David Baker <dave@matrix.org> | 2017-03-01 17:20:37 +0000 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2017-03-01 17:20:37 +0000 |
| commit | 3557cf34dc011211db1b80016ce09ada86b41ffc (patch) | |
| tree | 9ff6c82f81d7a932ffc1d66d677a5cfa65157494 /synapse/handlers/room_member.py | |
| parent | WIP support for msisdn 3pid proxy methods (diff) | |
| parent | kick jenkins (diff) | |
| download | synapse-3557cf34dc011211db1b80016ce09ada86b41ffc.tar.xz | |
Merge remote-tracking branch 'origin/develop' into dbkr/msisdn_signin
Diffstat (limited to 'synapse/handlers/room_member.py')
| -rw-r--r-- | synapse/handlers/room_member.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/handlers/room_member.py b/synapse/handlers/room_member.py index b2806555cf..2052d6d05f 100644 --- a/synapse/handlers/room_member.py +++ b/synapse/handlers/room_member.py @@ -719,7 +719,9 @@ class RoomMemberHandler(BaseHandler): ) membership = member.membership if member else None - if membership is not None and membership != Membership.LEAVE: + if membership is not None and membership not in [ + Membership.LEAVE, Membership.BAN + ]: raise SynapseError(400, "User %s in room %s" % ( user_id, room_id )) |