summary refs log tree commit diff
path: root/synapse/rest/client/v1/room.py
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2017-04-25 17:22:02 +0100
committerGitHub <noreply@github.com>2017-04-25 17:22:02 +0100
commit22f935ab7cdeca19cc6b4b8c2c0f574710cffae4 (patch)
tree42a740b7758e6b98914ffc4212dc76fea3abd4e1 /synapse/rest/client/v1/room.py
parentMerge pull request #2149 from enckse/develop (diff)
parentfix up (diff)
downloadsynapse-22f935ab7cdeca19cc6b4b8c2c0f574710cffae4.tar.xz
Merge pull request #2159 from matrix-org/erikj/reduce_join_cache_size
Reduce size of joined_user cache
Diffstat (limited to 'synapse/rest/client/v1/room.py')
-rw-r--r--synapse/rest/client/v1/room.py8
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() + } }))