summary refs log tree commit diff
path: root/synapse/handlers/sync.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2016-02-19 11:41:02 +0000
committerRichard van der Hoff <richard@matrix.org>2016-02-19 11:41:02 +0000
commitb71ca2b0140fa4d7866ebb10ee49556de7eff44f (patch)
tree25d7f8d622e6c71b4f3bd247634deb5663ee2c05 /synapse/handlers/sync.py
parentMerge pull request #580 from Rugvip/develop (diff)
downloadsynapse-b71ca2b0140fa4d7866ebb10ee49556de7eff44f.tar.xz
Allow guest users access to messages in rooms they have joined
There should be no difference between guest users and non-guest users in terms
of access to messages. Define the semantics of the is_peeking argument to
filter_events_for_clients (slightly) better; interpret it appropriately, and
set it correctly from /sync.
Diffstat (limited to 'synapse/handlers/sync.py')
-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 1d0f0058a2..f5122b5fb1 100644
--- a/synapse/handlers/sync.py
+++ b/synapse/handlers/sync.py
@@ -623,7 +623,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 = []
@@ -645,7 +644,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