diff options
| author | Kegan Dougal <kegan@matrix.org> | 2014-08-26 10:24:47 +0100 |
|---|---|---|
| committer | Kegan Dougal <kegan@matrix.org> | 2014-08-26 10:24:47 +0100 |
| commit | 5796232cb19927612957db3fcf4b77cd383187a6 (patch) | |
| tree | 18a3724608377c91d64eb2daab49d2d91a8cf4fe /synapse | |
| parent | Merge branch 'develop' of github.com:matrix-org/synapse into client_server_ur... (diff) | |
| download | synapse-5796232cb19927612957db3fcf4b77cd383187a6.tar.xz | |
Adjusted webclient to use new state paths. Updated membership msg template to actually show the person invited. Factored out common membership functions in matrix service.
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/rest/room.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/rest/room.py b/synapse/rest/room.py index a07e031984..2d681bd893 100644 --- a/synapse/rest/room.py +++ b/synapse/rest/room.py @@ -318,7 +318,8 @@ class RoomMemberListRestServlet(RestServlet): user_id=user.to_string()) for event in members["chunk"]: - target_user = self.hs.parse_userid(event["state_key"]) + # FIXME: should probably be state_key here, not user_id + target_user = self.hs.parse_userid(event["user_id"]) # Presence is an optional cache; don't fail if we can't fetch it try: presence_state = yield self.handlers.presence_handler.get_state( |