Merge pull request #587 from matrix-org/rav/guest_access_after_room_join

Allow guest users access to messages in rooms they have joined
This commit is contained in:
Richard van der Hoff 2016-02-22 16:36:06 +00:00
commit f7e3de02ef
3 changed files with 41 additions and 16 deletions

View file

@ -645,7 +645,6 @@ class SyncHandler(BaseHandler):
recents = yield self._filter_events_for_client(
sync_config.user.to_string(),
recents,
is_peeking=sync_config.is_guest,
)
else:
recents = []
@ -667,7 +666,6 @@ class SyncHandler(BaseHandler):
loaded_recents = yield self._filter_events_for_client(
sync_config.user.to_string(),
loaded_recents,
is_peeking=sync_config.is_guest,
)
loaded_recents.extend(recents)
recents = loaded_recents