summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2018-04-09 12:04:18 +0100
committerErik Johnston <erik@matrix.org>2018-04-09 12:04:18 +0100
commit56b0589865d0a8cc09e0149578faf71daa73da91 (patch)
tree3af3fba0022cab0355e18074495bbc98f8945373 /synapse
parentMerge pull request #3046 from matrix-org/dbkr/join_group (diff)
downloadsynapse-56b0589865d0a8cc09e0149578faf71daa73da91.tar.xz
Use create_and_send_nonmember_event everywhere
Diffstat (limited to 'synapse')
-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}