diff options
| author | Sean Quah <8349537+squahtx@users.noreply.github.com> | 2023-05-05 15:06:22 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-05 15:06:22 +0100 |
| commit | e46d5f3586025a491d11a31ce2be4c540c38d404 (patch) | |
| tree | 1a0d9a7b99cf0d7a0e19143c588f4b077f559fad /synapse/rest/client/room.py | |
| parent | Allow running Complement integration tests via podman (#15543) (diff) | |
| download | synapse-e46d5f3586025a491d11a31ce2be4c540c38d404.tar.xz | |
Factor out an `is_mine_server_name` method (#15542)
Add an `is_mine_server_name` method, similar to `is_mine_id`. Ideally we would use this consistently, instead of sometimes comparing against `hs.hostname` and other times reaching into `hs.config.server.server_name`. Also fix a bug in the tests where `hs.hostname` would sometimes differ from `hs.config.server.server_name`. Signed-off-by: Sean Quah <seanq@matrix.org>
Diffstat (limited to 'synapse/rest/client/room.py')
| -rw-r--r-- | synapse/rest/client/room.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/rest/client/room.py b/synapse/rest/client/room.py index 7699cc8d1b..951bd033f5 100644 --- a/synapse/rest/client/room.py +++ b/synapse/rest/client/room.py @@ -501,7 +501,7 @@ class PublicRoomListRestServlet(RestServlet): limit = None handler = self.hs.get_room_list_handler() - if server and server != self.hs.config.server.server_name: + if server and not self.hs.is_mine_server_name(server): # Ensure the server is valid. try: parse_and_validate_server_name(server) @@ -551,7 +551,7 @@ class PublicRoomListRestServlet(RestServlet): limit = None handler = self.hs.get_room_list_handler() - if server and server != self.hs.config.server.server_name: + if server and not self.hs.is_mine_server_name(server): # Ensure the server is valid. try: parse_and_validate_server_name(server) |