summary refs log tree commit diff
path: root/synapse/replication/http/membership.py
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2020-08-13 11:45:08 +0100
committerBrendan Abolivier <babolivier@matrix.org>2020-08-13 11:45:08 +0100
commit527f73d902001d7d4ba4df402866d7ccff3e9b6d (patch)
tree5e8876654b13ebf186ff19233e67612b5da8420c /synapse/replication/http/membership.py
parentMerge branch 'develop' into matrix-org-hotfixes (diff)
parentConvert the roommember database to async/await. (#8070) (diff)
downloadsynapse-527f73d902001d7d4ba4df402866d7ccff3e9b6d.tar.xz
Merge branch 'develop' into matrix-org-hotfixes
Diffstat (limited to 'synapse/replication/http/membership.py')
-rw-r--r--synapse/replication/http/membership.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/synapse/replication/http/membership.py b/synapse/replication/http/membership.py

index 63ef6eb7be..741329ab5f 100644 --- a/synapse/replication/http/membership.py +++ b/synapse/replication/http/membership.py
@@ -52,7 +52,9 @@ class ReplicationRemoteJoinRestServlet(ReplicationEndpoint): self.clock = hs.get_clock() @staticmethod - def _serialize_payload(requester, room_id, user_id, remote_room_hosts, content): + async def _serialize_payload( + requester, room_id, user_id, remote_room_hosts, content + ): """ Args: requester(Requester) @@ -112,7 +114,7 @@ class ReplicationRemoteRejectInviteRestServlet(ReplicationEndpoint): self.member_handler = hs.get_room_member_handler() @staticmethod - def _serialize_payload( # type: ignore + async def _serialize_payload( # type: ignore invite_event_id: str, txn_id: Optional[str], requester: Requester, @@ -174,7 +176,7 @@ class ReplicationUserJoinedLeftRoomRestServlet(ReplicationEndpoint): self.distributor = hs.get_distributor() @staticmethod - def _serialize_payload(room_id, user_id, change): + async def _serialize_payload(room_id, user_id, change): """ Args: room_id (str)