Merge pull request #1922 from matrix-org/dbkr/allow_forget_for_ban

Allow forgetting rooms you're banned from
This commit is contained in:
David Baker 2017-02-17 10:52:30 +00:00 committed by GitHub
commit 8c87bb550e

View File

@ -719,7 +719,9 @@ class RoomMemberHandler(BaseHandler):
) )
membership = member.membership if member else None 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" % ( raise SynapseError(400, "User %s in room %s" % (
user_id, room_id user_id, room_id
)) ))