diff options
| author | Erik Johnston <erik@matrix.org> | 2014-08-14 10:01:04 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-08-14 10:01:04 +0100 |
| commit | 10294b60824347d73b01f7ce4add18467d1e6f0c (patch) | |
| tree | 06d04a0a2e0ccf183bfc602ce9694d5958ed7a2e /synapse/rest/room.py | |
| parent | Make feedback table also store sender. (diff) | |
| parent | grammar fix (diff) | |
| download | synapse-10294b60824347d73b01f7ce4add18467d1e6f0c.tar.xz | |
Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor
Conflicts: synapse/storage/_base.py
Diffstat (limited to 'synapse/rest/room.py')
| -rw-r--r-- | synapse/rest/room.py | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/synapse/rest/room.py b/synapse/rest/room.py index 228bc9623d..1fc0c996b8 100644 --- a/synapse/rest/room.py +++ b/synapse/rest/room.py @@ -22,7 +22,6 @@ from synapse.api.events.room import (RoomTopicEvent, MessageEvent, RoomMemberEvent, FeedbackEvent) from synapse.api.constants import Feedback, Membership from synapse.api.streams import PaginationConfig -from synapse.types import RoomAlias import json import logging @@ -150,10 +149,7 @@ class JoinRoomAliasServlet(RestServlet): logger.debug("room_alias: %s", room_alias) - room_alias = RoomAlias.from_string( - urllib.unquote(room_alias), - self.hs - ) + room_alias = self.hs.parse_roomalias(urllib.unquote(room_alias)) handler = self.handlers.room_member_handler ret_dict = yield handler.join_room_alias(user, room_alias) |