summary refs log tree commit diff
path: root/synapse/handlers/sync.py
diff options
context:
space:
mode:
authorRichard van der Hoff <github@rvanderhoff.org.uk>2016-02-22 16:36:06 +0000
committerRichard van der Hoff <github@rvanderhoff.org.uk>2016-02-22 16:36:06 +0000
commitf7e3de02efb4fd4d2b87c8a9f56fc558d077a68a (patch)
tree19435691eb59deb73719cc04d54952291a8fd518 /synapse/handlers/sync.py
parentMerge pull request #594 from matrix-org/markjh/coverage (diff)
parentaddress review comments (diff)
downloadsynapse-f7e3de02efb4fd4d2b87c8a9f56fc558d077a68a.tar.xz
Merge pull request #587 from matrix-org/rav/guest_access_after_room_join
Allow guest users access to messages in rooms they have joined
Diffstat (limited to '')
-rw-r--r--synapse/handlers/sync.py2
1 files changed, 0 insertions, 2 deletions
diff --git a/synapse/handlers/sync.py b/synapse/handlers/sync.py
index 558c7bacb9..c87ff75c05 100644
--- a/synapse/handlers/sync.py
+++ b/synapse/handlers/sync.py
@@ -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