Merge branch 'release-v0.19.2' of github.com:matrix-org/synapse

matrix-org · Feb 21, 2017 · 3346a21 · 3346a21
2 parents 6184f6f + 30ecfef
commit 3346a21
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -1,3 +1,10 @@
+Changes in synapse v0.19.2 (2017-02-20)
+=======================================
+
+* Fix bug with event visibility check in /context/ API. Thanks to Tokodomo for
+  pointing it out! (PR #1929)
+
+
 Changes in synapse v0.19.1 (2017-02-09)
 =======================================
 

diff --git a/synapse/__init__.py b/synapse/__init__.py
@@ -16,4 +16,4 @@
 """ This is a reference implementation of a Matrix home server.
 """
 
-__version__ = "0.19.1"
+__version__ = "0.19.2"
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py
@@ -356,7 +356,7 @@ def send(etype, content, **kwargs):
 
 class RoomContextHandler(BaseHandler):
     @defer.inlineCallbacks
-    def get_event_context(self, user, room_id, event_id, limit, is_guest):
+    def get_event_context(self, user, room_id, event_id, limit):
         """Retrieves events, pagination tokens and state around a given event
         in a room.
 
@@ -375,12 +375,15 @@ def get_event_context(self, user, room_id, event_id, limit, is_guest):
 
         now_token = yield self.hs.get_event_sources().get_current_token()
 
+        users = yield self.store.get_users_in_room(room_id)
+        is_peeking = user.to_string() not in users
+
         def filter_evts(events):
             return filter_events_for_client(
                 self.store,
                 user.to_string(),
                 events,
-                is_peeking=is_guest
+                is_peeking=is_peeking
             )
 
         event = yield self.store.get_event(event_id, get_prev_content=True,

diff --git a/synapse/rest/client/v1/room.py b/synapse/rest/client/v1/room.py
@@ -505,7 +505,6 @@ def on_GET(self, request, room_id, event_id):
             room_id,
             event_id,
             limit,
-            requester.is_guest,
         )
 
         if not results: