diff options
| author | Erik Johnston <erik@matrix.org> | 2014-08-18 15:53:40 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-08-18 15:53:40 +0100 |
| commit | b4a1f2ccb58d6e17372dca310b627364d9792684 (patch) | |
| tree | 4cbb906a7c33a810b5da2b9e2c60eac6d5738d6f /synapse/rest/room.py | |
| parent | Add two different columns for ordering the events table, one which can be use... (diff) | |
| parent | Update the default longpoll timeout time. (diff) | |
| download | synapse-b4a1f2ccb58d6e17372dca310b627364d9792684.tar.xz | |
Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor
Diffstat (limited to 'synapse/rest/room.py')
| -rw-r--r-- | synapse/rest/room.py | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/synapse/rest/room.py b/synapse/rest/room.py index fe0953c69d..dfb2aabe70 100644 --- a/synapse/rest/room.py +++ b/synapse/rest/room.py @@ -353,10 +353,14 @@ class RoomMemberListRestServlet(RestServlet): for event in members["chunk"]: target_user = self.hs.parse_userid(event["target_user_id"]) - presence_state = yield self.handlers.presence_handler.get_state( - target_user=target_user, auth_user=user - ) - event["content"].update(presence_state) + # Presence is an optional cache; don't fail if we can't fetch it + try: + presence_state = yield self.handlers.presence_handler.get_state( + target_user=target_user, auth_user=user + ) + event["content"].update(presence_state) + except: + pass defer.returnValue((200, members)) |