diff options
| author | Dirk Klimpel <5740567+dklimpel@users.noreply.github.com> | 2023-03-02 18:59:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-02 12:59:53 -0500 |
| commit | ecbe0ddbe7c47e05bc27b39dc10a9c30eafd2960 (patch) | |
| tree | 9d65fbad2d0972274641b1c3d828c59c003ef95b /synapse/replication | |
| parent | Remove the unspecced and bugged PUT /knock/{roomIdOrAlias} endpoint (#15189) (diff) | |
| download | synapse-ecbe0ddbe7c47e05bc27b39dc10a9c30eafd2960.tar.xz | |
Add support for knocking to workers. (#15133)
Diffstat (limited to 'synapse/replication')
| -rw-r--r-- | synapse/replication/http/membership.py | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/synapse/replication/http/membership.py b/synapse/replication/http/membership.py index 9fa1060d48..67b01db67e 100644 --- a/synapse/replication/http/membership.py +++ b/synapse/replication/http/membership.py @@ -142,17 +142,12 @@ class ReplicationRemoteKnockRestServlet(ReplicationEndpoint): } async def _handle_request( # type: ignore[override] - self, - request: SynapseRequest, - content: JsonDict, - room_id: str, - user_id: str, + self, request: SynapseRequest, content: JsonDict, room_id: str, user_id: str ) -> Tuple[int, JsonDict]: remote_room_hosts = content["remote_room_hosts"] event_content = content["content"] requester = Requester.deserialize(self.store, content["requester"]) - request.requester = requester logger.debug("remote_knock: %s on room: %s", user_id, room_id) @@ -277,16 +272,12 @@ class ReplicationRemoteRescindKnockRestServlet(ReplicationEndpoint): } async def _handle_request( # type: ignore[override] - self, - request: SynapseRequest, - content: JsonDict, - knock_event_id: str, + self, request: SynapseRequest, content: JsonDict, knock_event_id: str ) -> Tuple[int, JsonDict]: txn_id = content["txn_id"] event_content = content["content"] requester = Requester.deserialize(self.store, content["requester"]) - request.requester = requester # hopefully we're now on the master, so this won't recurse! @@ -363,3 +354,5 @@ def register_servlets(hs: "HomeServer", http_server: HttpServer) -> None: ReplicationRemoteJoinRestServlet(hs).register(http_server) ReplicationRemoteRejectInviteRestServlet(hs).register(http_server) ReplicationUserJoinedLeftRoomRestServlet(hs).register(http_server) + ReplicationRemoteKnockRestServlet(hs).register(http_server) + ReplicationRemoteRescindKnockRestServlet(hs).register(http_server) |