diff options
| author | David Baker <dave@matrix.org> | 2017-10-02 16:20:41 +0100 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2017-10-02 16:20:41 +0100 |
| commit | 27955056e092b440ed00da13fe6326dd438bb900 (patch) | |
| tree | 8480cf26404b89993e6ffa6cadbabc477be19661 /synapse/rest/client/v1/room.py | |
| parent | Merge pull request #2472 from matrix-org/erikj/groups_rooms (diff) | |
| parent | Merge pull request #2480 from matrix-org/rav/federation_client_logging (diff) | |
| download | synapse-27955056e092b440ed00da13fe6326dd438bb900.tar.xz | |
Merge branch 'develop' into erikj/groups_merged
Diffstat (limited to 'synapse/rest/client/v1/room.py')
| -rw-r--r-- | synapse/rest/client/v1/room.py | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/synapse/rest/client/v1/room.py b/synapse/rest/client/v1/room.py index cd388770c8..6c379d53ac 100644 --- a/synapse/rest/client/v1/room.py +++ b/synapse/rest/client/v1/room.py @@ -398,22 +398,18 @@ class JoinedRoomMemberListRestServlet(ClientV1RestServlet): def __init__(self, hs): super(JoinedRoomMemberListRestServlet, self).__init__(hs) - self.state = hs.get_state_handler() + self.message_handler = hs.get_handlers().message_handler @defer.inlineCallbacks def on_GET(self, request, room_id): - yield self.auth.get_user_by_req(request) + requester = yield self.auth.get_user_by_req(request) - users_with_profile = yield self.state.get_current_user_in_room(room_id) + users_with_profile = yield self.message_handler.get_joined_members( + requester, room_id, + ) defer.returnValue((200, { - "joined": { - user_id: { - "avatar_url": profile.avatar_url, - "display_name": profile.display_name, - } - for user_id, profile in users_with_profile.iteritems() - } + "joined": users_with_profile, })) |