diff options
| author | Erik Johnston <erik@matrix.org> | 2017-10-23 13:13:53 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2017-10-23 13:13:53 +0100 |
| commit | ffba97807746f6f0d7a8820c0d980f188dcad08c (patch) | |
| tree | 36301e98cdc6400afe71b89fc4b0c8beccd0deea /synapse/rest/client/v1/room.py | |
| parent | Merge pull request #2540 from 4nd3r/patch-1 (diff) | |
| parent | Bump version and changelog (diff) | |
| download | synapse-ffba97807746f6f0d7a8820c0d980f188dcad08c.tar.xz | |
Merge branch 'release-v0.24.0' of github.com:matrix-org/synapse v0.24.0
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, })) |