diff options
| author | Erik Johnston <erik@matrix.org> | 2018-04-12 13:35:56 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2018-04-12 13:35:56 +0100 |
| commit | dd7f1b10cece222db5b57d92727afaf7780f8b79 (patch) | |
| tree | e9499a2b7cd19f5efab7d7268461e89a5ad2d19a /synapse/rest/client/v1/room.py | |
| parent | Merge branch 'develop' of https://github.com/matrix-org/synapse into matrix-o... (diff) | |
| parent | Merge pull request #3092 from matrix-org/rav/response_cache_metrics (diff) | |
| download | synapse-dd7f1b10cece222db5b57d92727afaf7780f8b79.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'synapse/rest/client/v1/room.py')
| -rw-r--r-- | synapse/rest/client/v1/room.py | 7 |
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} |