summary refs log tree commit diff
path: root/synapse/rest/client/v1
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2018-04-10 16:43:58 +0100
committerGitHub <noreply@github.com>2018-04-10 16:43:58 +0100
commiteaa2ebf20b0e1f40882d38e9ea2440a44d0a4a56 (patch)
treeb2ce01241a93970efd5723b38ce988442fb940b7 /synapse/rest/client/v1
parentMerge pull request #3078 from matrix-org/erikj/federation_sender (diff)
parentNote why we're limiting concurrent event sends (diff)
downloadsynapse-eaa2ebf20b0e1f40882d38e9ea2440a44d0a4a56.tar.xz
Merge pull request #3079 from matrix-org/erikj/limit_concurrent_sends
Limit concurrent event sends for a room
Diffstat (limited to 'synapse/rest/client/v1')
-rw-r--r--synapse/rest/client/v1/room.py7
1 files changed, 1 insertions, 6 deletions
diff --git a/synapse/rest/client/v1/room.py b/synapse/rest/client/v1/room.py
index d06cbdc35e..2ad0e5943b 100644
--- a/synapse/rest/client/v1/room.py
+++ b/synapse/rest/client/v1/room.py
@@ -165,17 +165,12 @@ class RoomStateEventRestServlet(ClientV1RestServlet):
                 content=content,
             )
         else:
-            event, context = yield self.event_creation_hander.create_event(
+            event = yield self.event_creation_hander.create_and_send_nonmember_event(
                 requester,
                 event_dict,
-                token_id=requester.access_token_id,
                 txn_id=txn_id,
             )
 
-            yield self.event_creation_hander.send_nonmember_event(
-                requester, event, context,
-            )
-
         ret = {}
         if event:
             ret = {"event_id": event.event_id}