Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-03 02:44:53 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor

Browse source
This commit is contained in:
Erik Johnston 2014-08-18 15:53:40 +01:00
commit b4a1f2ccb5
5 changed files with 55 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

12
synapse/rest/room.py
View file

@ -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))