diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2020-02-04 12:06:18 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-04 12:06:18 +0000 |
| commit | c7d6d5c69eb9036749d57b2d299ff1f1a50d0768 (patch) | |
| tree | bd549f6df389c645263e4ab7b2ea6dc21f972916 /synapse/handlers/message.py | |
| parent | Add typing to SyncHandler (#6821) (diff) | |
| parent | make FederationHandler.send_invite async (diff) | |
| download | synapse-c7d6d5c69eb9036749d57b2d299ff1f1a50d0768.tar.xz | |
Merge pull request #6837 from matrix-org/rav/federation_async
Port much of `synapse.handlers.federation` to async/await.
Diffstat (limited to 'synapse/handlers/message.py')
| -rw-r--r-- | synapse/handlers/message.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/synapse/handlers/message.py b/synapse/handlers/message.py index bdf16c84d3..be6ae18a92 100644 --- a/synapse/handlers/message.py +++ b/synapse/handlers/message.py @@ -932,10 +932,9 @@ class EventCreationHandler(object): # way? If we have been invited by a remote server, we need # to get them to sign the event. - returned_invite = yield federation_handler.send_invite( - invitee.domain, event + returned_invite = yield defer.ensureDeferred( + federation_handler.send_invite(invitee.domain, event) ) - event.unsigned.pop("room_state", None) # TODO: Make sure the signatures actually are correct. |