diff options
| author | David Baker <dave@matrix.org> | 2017-04-26 11:31:55 +0100 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2017-04-26 11:31:55 +0100 |
| commit | 81804909d3a7c20330b2992cf1fed0672dd8f531 (patch) | |
| tree | a6849618c8e3d2e6eb8f7136c8055c5c4b3e10fb /synapse/rest/client | |
| parent | Fix get_json (diff) | |
| parent | document how to make IPv6 work (#2088) (diff) | |
| download | synapse-81804909d3a7c20330b2992cf1fed0672dd8f531.tar.xz | |
Merge remote-tracking branch 'origin/develop' into dbkr/http_request_propagate_error
Diffstat (limited to 'synapse/rest/client')
| -rw-r--r-- | synapse/rest/client/v1/room.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/synapse/rest/client/v1/room.py b/synapse/rest/client/v1/room.py index 0bdd6b5b36..c376ab8fd7 100644 --- a/synapse/rest/client/v1/room.py +++ b/synapse/rest/client/v1/room.py @@ -406,7 +406,13 @@ class JoinedRoomMemberListRestServlet(ClientV1RestServlet): users_with_profile = yield self.state.get_current_user_in_room(room_id) defer.returnValue((200, { - "joined": users_with_profile + "joined": { + user_id: { + "avatar_url": profile.avatar_url, + "display_name": profile.display_name, + } + for user_id, profile in users_with_profile.iteritems() + } })) |