From 7d324612ec92a9818860d0d0e1c4cff358fd6e5f Mon Sep 17 00:00:00 2001
From: "Paul \"LeoNerd\" Evans" <paul@matrix.org>
Date: Mon, 18 Aug 2014 13:17:35 +0100
Subject: [PATCH] Precent lack of presence visiblity from causing room
 /members/list to fail

---
 synapse/rest/room.py | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/synapse/rest/room.py b/synapse/rest/room.py
index 799dd58b2..035209a19 100644
--- a/synapse/rest/room.py
+++ b/synapse/rest/room.py
@@ -350,10 +350,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))