Merge remote-tracking branch 'origin/develop' into store_event_actions

This commit is contained in:
David Baker 2016-01-06 17:28:55 +00:00
commit 442fcc02f7
6 changed files with 66 additions and 148 deletions

View file

@ -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: