diff options
| author | Hubert Chathi <hubert@uhoreg.ca> | 2020-08-05 17:04:03 -0400 |
|---|---|---|
| committer | Hubert Chathi <hubert@uhoreg.ca> | 2020-08-05 17:04:03 -0400 |
| commit | 460ebc558a2550a423ed859bdd0f74b22cba1859 (patch) | |
| tree | 3ab978e67490cd5bc175cee767015d16d79f4aea /synapse/replication/http/send_event.py | |
| parent | maybe this will make lint happy? (diff) | |
| parent | Rename database classes to make some sense (#8033) (diff) | |
| download | synapse-460ebc558a2550a423ed859bdd0f74b22cba1859.tar.xz | |
Merge remote-tracking branch 'origin/develop' into dehydration
Diffstat (limited to 'synapse/replication/http/send_event.py')
| -rw-r--r-- | synapse/replication/http/send_event.py | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/synapse/replication/http/send_event.py b/synapse/replication/http/send_event.py index c981723c1a..f13d452426 100644 --- a/synapse/replication/http/send_event.py +++ b/synapse/replication/http/send_event.py @@ -15,8 +15,6 @@ import logging -from twisted.internet import defer - from synapse.api.room_versions import KNOWN_ROOM_VERSIONS from synapse.events import make_event_from_dict from synapse.events.snapshot import EventContext @@ -62,8 +60,7 @@ class ReplicationSendEventRestServlet(ReplicationEndpoint): self.clock = hs.get_clock() @staticmethod - @defer.inlineCallbacks - def _serialize_payload( + async def _serialize_payload( event_id, store, event, context, requester, ratelimit, extra_users ): """ @@ -77,7 +74,7 @@ class ReplicationSendEventRestServlet(ReplicationEndpoint): extra_users (list(UserID)): Any extra users to notify about event """ - serialized_context = yield context.serialize(event, store) + serialized_context = await context.serialize(event, store) payload = { "event": event.get_pdu_json(), |