Merge pull request #1917 from matrix-org/dbkr/make_ban_reasons_work

Make kick & ban reasons work

synapse/rest/client/v1/room.py

@@ -609,13 +609,18 @@ def on_POST(self, request, room_id, membership_action, txn_id=None):
                 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,
             room_id=room_id,
             action=membership_action,
             txn_id=txn_id,
             third_party_signed=content.get("third_party_signed", None),
+            content=event_content,
         )
 
         defer.returnValue((200, {}))