Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-12-15 17:38:48 -05:00
Code Issues Projects Releases Packages Wiki Activity

Add a HomeServer.parse_roomalias() to avoid having to RoomAlias.from_sring(..., hs=hs) - similar to parse_userid()

Browse source
This commit is contained in:
Paul "LeoNerd" Evans 2014-08-13 17:43:10 +01:00
parent 08ed4ccfdf
commit 7fb93f2a47
4 changed files with 18 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

13
synapse/rest/directory.py
View file

@ -16,7 +16,6 @@
from twisted.internet import defer
from synapse.types import RoomAlias, RoomID
from base import RestServlet, client_path_pattern
import json
@ -39,12 +38,11 @@ class ClientDirectoryServer(RestServlet):
# TODO(erikj): Handle request
local_only = "local_only" in request.args
room_alias = urllib.unquote(room_alias)
room_alias_obj = RoomAlias.from_string(room_alias, self.hs)
room_alias = self.hs.parse_roomalias(urllib.unquote(room_alias))
dir_handler = self.handlers.directory_handler
res = yield dir_handler.get_association(
room_alias_obj,
room_alias,
local_only=local_only
)
@ -57,10 +55,9 @@ class ClientDirectoryServer(RestServlet):
logger.debug("Got content: %s", content)
room_alias = urllib.unquote(room_alias)
room_alias_obj = RoomAlias.from_string(room_alias, self.hs)
room_alias = self.hs.parse_roomalias(urllib.unquote(room_alias))
logger.debug("Got room name: %s", room_alias_obj.to_string())
logger.debug("Got room name: %s", room_alias.to_string())
room_id = content["room_id"]
servers = content["servers"]
@ -75,7 +72,7 @@ class ClientDirectoryServer(RestServlet):
try:
yield dir_handler.create_association(
room_alias_obj, room_id, servers
room_alias, room_id, servers
)
except:
logger.exception("Failed to create association")

6
synapse/rest/room.py
View file

@ -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)