summary refs log tree commit diff
path: root/synapse/rest/client/v1/room.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-03-21 12:25:33 +0000
committerErik Johnston <erik@matrix.org>2019-03-21 12:48:37 +0000
commit164798ec32a30e07bd5972ec216e7848f0928c78 (patch)
tree498b115d9eb2b96c886087d85b6140df46cae412 /synapse/rest/client/v1/room.py
parentCorrectly handle 3PID invites in create room spam check (diff)
downloadsynapse-164798ec32a30e07bd5972ec216e7848f0928c78.tar.xz
Add 3PID invite support to spam checker
Diffstat (limited to 'synapse/rest/client/v1/room.py')
-rw-r--r--synapse/rest/client/v1/room.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/rest/client/v1/room.py b/synapse/rest/client/v1/room.py

index 48da4d557f..17a1503cdb 100644 --- a/synapse/rest/client/v1/room.py +++ b/synapse/rest/client/v1/room.py
@@ -666,7 +666,8 @@ class RoomMembershipRestServlet(ClientV1RestServlet): content["address"], content["id_server"], requester, - txn_id + txn_id, + new_room=False, ) defer.returnValue((200, {})) return