diff options
| author | Brendan Abolivier <babolivier@matrix.org> | 2019-12-05 21:00:43 +0000 |
|---|---|---|
| committer | Brendan Abolivier <babolivier@matrix.org> | 2019-12-05 21:00:43 +0000 |
| commit | e126d83f7401456152e07042f8e8b7587adfe1b4 (patch) | |
| tree | fc1a5fcabb0c4094166070cfd5d802cf2cd35546 /synapse/rest/client/v1/room.py | |
| parent | Merge branch 'develop' into babolivier/msc1802 (diff) | |
| parent | Replace /admin/v1/users_paginate endpoint with /admin/v2/users (#5925) (diff) | |
| download | synapse-e126d83f7401456152e07042f8e8b7587adfe1b4.tar.xz | |
Merge branch 'develop' into babolivier/msc1802
Diffstat (limited to 'synapse/rest/client/v1/room.py')
| -rw-r--r-- | synapse/rest/client/v1/room.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/rest/client/v1/room.py b/synapse/rest/client/v1/room.py index 86bbcc0eea..711d4ad304 100644 --- a/synapse/rest/client/v1/room.py +++ b/synapse/rest/client/v1/room.py @@ -714,7 +714,7 @@ class RoomMembershipRestServlet(TransactionRestServlet): target = UserID.from_string(content["user_id"]) event_content = None - if "reason" in content and membership_action in ["kick", "ban"]: + if "reason" in content: event_content = {"reason": content["reason"]} await self.room_member_handler.update_membership( |