summary refs log tree commit diff
path: root/synapse/rest/client
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2017-09-28 10:09:32 +0100
committerErik Johnston <erik@matrix.org>2017-09-28 10:09:32 +0100
commit8090fd4664de87bad636ace6774dad8c33bd5276 (patch)
tree004e0c3acc15bea438e498d07f68427b3a22fdee /synapse/rest/client
parentFix bug where /joined_members didn't check user was in room (diff)
downloadsynapse-8090fd4664de87bad636ace6774dad8c33bd5276.tar.xz
Fix /joined_members to work with AS users
Diffstat (limited to 'synapse/rest/client')
-rw-r--r--synapse/rest/client/v1/room.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/synapse/rest/client/v1/room.py b/synapse/rest/client/v1/room.py

index 4be0fee38d..6c379d53ac 100644 --- a/synapse/rest/client/v1/room.py +++ b/synapse/rest/client/v1/room.py
@@ -403,10 +403,9 @@ class JoinedRoomMemberListRestServlet(ClientV1RestServlet): @defer.inlineCallbacks def on_GET(self, request, room_id): requester = yield self.auth.get_user_by_req(request) - user_id = requester.user.to_string() users_with_profile = yield self.message_handler.get_joined_members( - user_id, room_id, + requester, room_id, ) defer.returnValue((200, {