OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #1929 from matrix-org/erikj/context_fix 

Fix /context/ visibiltiy rules
pull/1930/head
Erik Johnston 2017-02-20 16:19:19 +01:00 committed by GitHub
parent 11940d462a 17673404fb
commit b5c268738b
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
synapse/handlers/room.py
View File

@ -356,7 +356,7 @@ class RoomCreationHandler(BaseHandler):
class RoomContextHandler(BaseHandler): class RoomContextHandler(BaseHandler):
@defer.inlineCallbacks @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 """Retrieves events, pagination tokens and state around a given event
in a room. in a room.
@ -375,12 +375,15 @@ class RoomContextHandler(BaseHandler):
now_token = yield self.hs.get_event_sources().get_current_token() 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): def filter_evts(events):
return filter_events_for_client( return filter_events_for_client(
self.store, self.store,
user.to_string(), user.to_string(),
events, events,
is_peeking=is_guest is_peeking=is_peeking
) )
event = yield self.store.get_event(event_id, get_prev_content=True, event = yield self.store.get_event(event_id, get_prev_content=True,

1
synapse/rest/client/v1/room.py
View File

@ -505,7 +505,6 @@ class RoomEventContext(ClientV1RestServlet):
room_id, room_id,
event_id, event_id,
limit, limit,
requester.is_guest,
) )
if not results: if not results: