summary refs log tree commit diff
path: root/synapse/rest/client/v1
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-11-28 11:02:04 +0000
committerErik Johnston <erik@matrix.org>2019-11-28 11:02:04 +0000
commit69d8fb83c6da35d7e1f04fa3afba0fd5406bd9d9 (patch)
tree09a70e57510eb94de612ab52f1b6c0b85b6a26ae /synapse/rest/client/v1
parentRemove local threepids on account deactivation (#6426) (diff)
downloadsynapse-69d8fb83c6da35d7e1f04fa3afba0fd5406bd9d9.tar.xz
MSC2367 Allow reason field on all member events
Diffstat (limited to 'synapse/rest/client/v1')
-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(