diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-01-23 11:55:12 +0000 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-01-23 11:55:12 +0000 |
| commit | 1c06c48ce2db3c6355e29de1533aebf36bc3775b (patch) | |
| tree | a114a45bcf1a1f9184344381548fd58008013ece /synapse/rest/client | |
| parent | Replace hs.parse_userid with UserID.from_string (diff) | |
| download | synapse-1c06c48ce2db3c6355e29de1533aebf36bc3775b.tar.xz | |
Replace hs.parse_roomid with RoomID.from_string
Diffstat (limited to 'synapse/rest/client')
| -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 c5837b3403..f0a9c932c1 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 +from synapse.types import UserID, RoomID import json import logging @@ -227,7 +227,7 @@ class JoinRoomAliasServlet(RestServlet): identifier = self.hs.parse_roomalias(room_identifier) is_room_alias = True except SynapseError: - identifier = self.hs.parse_roomid(room_identifier) + identifier = RoomID.from_string(room_identifier) # TODO: Support for specifying the home server to join with? |