summary refs log tree commit diff
path: root/synapse/rest/client/v1/room.py
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2021-04-22 18:26:10 +0100
committerAndrew Morgan <andrew@amorgan.xyz>2021-04-22 18:26:10 +0100
commit15f31e1ca9c90bed34b2de084c669b81e48e7f22 (patch)
treeb34df1a72437244309c1b50204ca02a974f230ae /synapse/rest/client/v1/room.py
parentMerge commit 'fa50e4bf4' into anoa/dinsic_release_1_31_0 (diff)
parentSupport icons for Identity Providers (#9154) (diff)
downloadsynapse-15f31e1ca9c90bed34b2de084c669b81e48e7f22.tar.xz
Merge commit '0cd2938bc' into anoa/dinsic_release_1_31_0
Diffstat (limited to 'synapse/rest/client/v1/room.py')
-rw-r--r--synapse/rest/client/v1/room.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/synapse/rest/client/v1/room.py b/synapse/rest/client/v1/room.py

index 804ac3473f..c8b128583f 100644 --- a/synapse/rest/client/v1/room.py +++ b/synapse/rest/client/v1/room.py
@@ -31,7 +31,6 @@ from synapse.api.errors import ( ) from synapse.api.filtering import Filter from synapse.events.utils import format_event_for_client_v2 -from synapse.http.endpoint import parse_and_validate_server_name from synapse.http.servlet import ( RestServlet, assert_params_in_dict, @@ -47,7 +46,7 @@ from synapse.storage.state import StateFilter from synapse.streams.config import PaginationConfig from synapse.types import RoomAlias, RoomID, StreamToken, ThirdPartyInstanceID, UserID from synapse.util import json_decoder -from synapse.util.stringutils import random_string +from synapse.util.stringutils import parse_and_validate_server_name, random_string if TYPE_CHECKING: import synapse.server