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/rest | |
| 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/rest')
| -rw-r--r-- | synapse/rest/__init__.py | 2 | ||||
| -rw-r--r-- | synapse/rest/client/knock.py | 1 | ||||
| -rw-r--r-- | synapse/rest/client/room.py | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/synapse/rest/__init__.py b/synapse/rest/__init__.py index c327f15043..2e19e055d3 100644 --- a/synapse/rest/__init__.py +++ b/synapse/rest/__init__.py @@ -139,7 +139,7 @@ class ClientRestResource(JsonResource): relations.register_servlets(hs, client_resource) if is_main_process: password_policy.register_servlets(hs, client_resource) - knock.register_servlets(hs, client_resource) + knock.register_servlets(hs, client_resource) # moving to /_synapse/admin if is_main_process: diff --git a/synapse/rest/client/knock.py b/synapse/rest/client/knock.py index 10975224c0..4fa66904ba 100644 --- a/synapse/rest/client/knock.py +++ b/synapse/rest/client/knock.py @@ -63,7 +63,6 @@ class KnockRoomAliasServlet(RestServlet): # twisted.web.server.Request.args is incorrectly defined as Optional[Any] args: Dict[bytes, List[bytes]] = request.args # type: ignore - remote_room_hosts = parse_strings_from_args( args, "server_name", required=False ) diff --git a/synapse/rest/client/room.py b/synapse/rest/client/room.py index 14b04810a1..45aee3d3fe 100644 --- a/synapse/rest/client/room.py +++ b/synapse/rest/client/room.py @@ -926,7 +926,7 @@ class RoomMembershipRestServlet(TransactionRestServlet): self.auth = hs.get_auth() def register(self, http_server: HttpServer) -> None: - # /rooms/$roomid/[invite|join|leave] + # /rooms/$roomid/[join|invite|leave|ban|unban|kick] PATTERNS = ( "/rooms/(?P<room_id>[^/]*)/" "(?P<membership_action>join|invite|leave|ban|unban|kick)" |