Merge some room joining codepaths

Force joining by alias to go through the send_membership_event checks,
rather than bypassing them straight into _do_join. This is the first of
many stages of cleanup.
This commit is contained in:
Daniel Wagner-Hall 2016-02-15 14:38:27 +00:00
parent 4de08a4672
commit dbeed36dec
2 changed files with 11 additions and 5 deletions

View file

@ -246,7 +246,7 @@ class JoinRoomAliasServlet(ClientV1RestServlet):
if is_room_alias:
handler = self.handlers.room_member_handler
ret_dict = yield handler.join_room_alias(
requester.user,
requester,
identifier,
)
defer.returnValue((200, ret_dict))