summary refs log tree commit diff
path: root/synapse/rest/client/v2_alpha
diff options
context:
space:
mode:
authorDavid Baker <dave@matrix.org>2016-01-06 17:28:55 +0000
committerDavid Baker <dave@matrix.org>2016-01-06 17:28:55 +0000
commit442fcc02f70fd0ae0034fc15c79b9e521c3d0143 (patch)
tree9d20a280a761ac50f227ebb8e4b8c74d354bb8df /synapse/rest/client/v2_alpha
parentAdding is_guest here won't work because it just constructs a dict of uid -> p... (diff)
parentMerge pull request #469 from matrix-org/markjh/joined_guest_access (diff)
downloadsynapse-442fcc02f70fd0ae0034fc15c79b9e521c3d0143.tar.xz
Merge remote-tracking branch 'origin/develop' into store_event_actions
Diffstat (limited to 'synapse/rest/client/v2_alpha')
-rw-r--r--synapse/rest/client/v2_alpha/sync.py7
1 files changed, 1 insertions, 6 deletions
diff --git a/synapse/rest/client/v2_alpha/sync.py b/synapse/rest/client/v2_alpha/sync.py
index 095f96e218..25e3d919a8 100644
--- a/synapse/rest/client/v2_alpha/sync.py
+++ b/synapse/rest/client/v2_alpha/sync.py
@@ -120,15 +120,10 @@ class SyncRestServlet(RestServlet):
             except:
                 filter = FilterCollection({})
 
-        if is_guest and filter.list_rooms() is None:
-            raise SynapseError(
-                400, "Guest users must provide a list of rooms in the filter"
-            )
-
         sync_config = SyncConfig(
             user=user,
-            is_guest=is_guest,
             filter=filter,
+            is_guest=is_guest,
         )
 
         if since is not None: