diff options
| author | Erik Johnston <erik@matrix.org> | 2015-10-20 16:57:51 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-10-20 16:57:51 +0100 |
| commit | 44e2933bf87d278ef0d860ee04e61ecac9744480 (patch) | |
| tree | c6a15fc8843f99a9f9ce0e47ab2b4254f5d285e4 /synapse/rest/client/v2_alpha | |
| parent | Explicitly check for Sqlite3Engine (diff) | |
| parent | Docstring (diff) | |
| download | synapse-44e2933bf87d278ef0d860ee04e61ecac9744480.tar.xz | |
Merge branch 'erikj/filter_refactor' into erikj/search
Diffstat (limited to 'synapse/rest/client/v2_alpha')
| -rw-r--r-- | synapse/rest/client/v2_alpha/sync.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/rest/client/v2_alpha/sync.py b/synapse/rest/client/v2_alpha/sync.py index fffecb24f5..5e27a859f9 100644 --- a/synapse/rest/client/v2_alpha/sync.py +++ b/synapse/rest/client/v2_alpha/sync.py @@ -23,7 +23,7 @@ from synapse.types import StreamToken from synapse.events.utils import ( serialize_event, format_event_for_client_v2_without_event_id, ) -from synapse.api.filtering import Filter +from synapse.api.filtering import FilterCollection from ._base import client_v2_pattern import copy @@ -103,7 +103,7 @@ class SyncRestServlet(RestServlet): user.localpart, filter_id ) except: - filter = Filter({}) + filter = FilterCollection({}) sync_config = SyncConfig( user=user, |