summary refs log tree commit diff
path: root/synapse/rest
diff options
context:
space:
mode:
authorMark Haines <mjark@negativecurvature.net>2016-01-06 18:10:11 +0100
committerMark Haines <mjark@negativecurvature.net>2016-01-06 18:10:11 +0100
commitc582f178b77f040f7f2707f3bd6d5384f9ba12c7 (patch)
tree9fe6c34aeeeb88687339b4737615f3c66bd9fd11 /synapse/rest
parentLog when starting stats reporting (diff)
parentPass whether the user was a guest to some of the event streams (diff)
downloadsynapse-c582f178b77f040f7f2707f3bd6d5384f9ba12c7.tar.xz
Merge pull request #469 from matrix-org/markjh/joined_guest_access
Guest users must be joined to a room to see it in /sync
Diffstat (limited to 'synapse/rest')
-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 35a70ffad1..dc3e6f70b7 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: