Merge pull request #1917 from matrix-org/dbkr/make_ban_reasons_work
Make kick & ban reasons workpull/1013/head
commit
fa467e62a9
|
@ -609,6 +609,10 @@ class RoomMembershipRestServlet(ClientV1RestServlet):
|
|||
raise SynapseError(400, "Missing user_id key.")
|
||||
target = UserID.from_string(content["user_id"])
|
||||
|
||||
event_content = None
|
||||
if 'reason' in content and membership_action in ['kick', 'ban']:
|
||||
event_content = {'reason': content['reason']}
|
||||
|
||||
yield self.handlers.room_member_handler.update_membership(
|
||||
requester=requester,
|
||||
target=target,
|
||||
|
@ -616,6 +620,7 @@ class RoomMembershipRestServlet(ClientV1RestServlet):
|
|||
action=membership_action,
|
||||
txn_id=txn_id,
|
||||
third_party_signed=content.get("third_party_signed", None),
|
||||
content=event_content,
|
||||
)
|
||||
|
||||
defer.returnValue((200, {}))
|
||||
|
|
Loading…
Reference in New Issue