diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-01-23 13:21:58 +0000 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-01-23 13:21:58 +0000 |
| commit | ada711504efb4dd25fe1123d38a0b2d196b9890a (patch) | |
| tree | 73789e6eb42442559a7d1e34385827b7465f580c /synapse/rest/client/v1/room.py | |
| parent | Replace hs.parse_roomid with RoomID.from_string (diff) | |
| download | synapse-ada711504efb4dd25fe1123d38a0b2d196b9890a.tar.xz | |
Replace hs.parse_roomalias with RoomAlias.from_string
Diffstat (limited to 'synapse/rest/client/v1/room.py')
| -rw-r--r-- | synapse/rest/client/v1/room.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/rest/client/v1/room.py b/synapse/rest/client/v1/room.py index f0a9c932c1..42712d4a7c 100644 --- a/synapse/rest/client/v1/room.py +++ b/synapse/rest/client/v1/room.py @@ -20,7 +20,7 @@ from base import RestServlet, client_path_pattern from synapse.api.errors import SynapseError, Codes from synapse.streams.config import PaginationConfig from synapse.api.constants import EventTypes, Membership -from synapse.types import UserID, RoomID +from synapse.types import UserID, RoomID, RoomAlias import json import logging @@ -224,7 +224,7 @@ class JoinRoomAliasServlet(RestServlet): identifier = None is_room_alias = False try: - identifier = self.hs.parse_roomalias(room_identifier) + identifier = RoomAlias.from_string(room_identifier) is_room_alias = True except SynapseError: identifier = RoomID.from_string(room_identifier) |