diff options
| author | David Baker <dave@matrix.org> | 2017-03-01 17:20:37 +0000 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2017-03-01 17:20:37 +0000 |
| commit | 3557cf34dc011211db1b80016ce09ada86b41ffc (patch) | |
| tree | 9ff6c82f81d7a932ffc1d66d677a5cfa65157494 /synapse/rest/client/v1 | |
| parent | WIP support for msisdn 3pid proxy methods (diff) | |
| parent | kick jenkins (diff) | |
| download | synapse-3557cf34dc011211db1b80016ce09ada86b41ffc.tar.xz | |
Merge remote-tracking branch 'origin/develop' into dbkr/msisdn_signin
Diffstat (limited to 'synapse/rest/client/v1')
| -rw-r--r-- | synapse/rest/client/v1/room.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/synapse/rest/client/v1/room.py b/synapse/rest/client/v1/room.py index 2ebf5e59a0..90242a6bac 100644 --- a/synapse/rest/client/v1/room.py +++ b/synapse/rest/client/v1/room.py @@ -505,7 +505,6 @@ class RoomEventContext(ClientV1RestServlet): room_id, event_id, limit, - requester.is_guest, ) if not results: @@ -609,6 +608,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 +619,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, {})) |