summary refs log tree commit diff
path: root/synapse/rest/client
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-11-29 13:30:36 +0000
committerGitHub <noreply@github.com>2019-11-29 13:30:36 +0000
commit1c3a61529fa898808ea9cb424bc1587dffdc7353 (patch)
treee33af67e215bd374ec02cc62744b44174b39aeaa /synapse/rest/client
parentMerge pull request #6436 from matrix-org/babolivier/fix-state-retrieval (diff)
parentNewsfile (diff)
downloadsynapse-1c3a61529fa898808ea9cb424bc1587dffdc7353.tar.xz
Merge pull request #6434 from matrix-org/erikj/msc2367_membership_reasons
Implement MSC 2367 - Membership Reasons
Diffstat (limited to 'synapse/rest/client')
-rw-r--r--synapse/rest/client/v1/room.py2
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(