diff options
| author | Daniel Wagner-Hall <daniel@matrix.org> | 2016-02-15 14:38:27 +0000 |
|---|---|---|
| committer | Daniel Wagner-Hall <daniel@matrix.org> | 2016-02-15 14:38:27 +0000 |
| commit | dbeed36dec021df3036e088910c72d5727910dd3 (patch) | |
| tree | f98ced054476684af05d2ce6fb4b4066fd56ecd4 /synapse/rest/client/v1/room.py | |
| parent | Revert "Merge two of the room join codepaths" (diff) | |
| download | synapse-dbeed36dec021df3036e088910c72d5727910dd3.tar.xz | |
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.
Diffstat (limited to 'synapse/rest/client/v1/room.py')
| -rw-r--r-- | synapse/rest/client/v1/room.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/rest/client/v1/room.py b/synapse/rest/client/v1/room.py index 81bfe377bd..76025213dc 100644 --- a/synapse/rest/client/v1/room.py +++ b/synapse/rest/client/v1/room.py @@ -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)) |