summary refs log tree commit diff
path: root/synapse/rest
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-10-22 13:17:10 +0100
committerErik Johnston <erik@matrix.org>2015-10-22 13:17:10 +0100
commitb0ac0a9438f9acdaedde44e79f1d2f5f8a323c4a (patch)
tree8bbaa4bcbfa0f55f7b234bb3c133171a0614b32c /synapse/rest
parentMerge pull request #320 from matrix-org/appservice-retry-cap (diff)
parentDocstring (diff)
downloadsynapse-b0ac0a9438f9acdaedde44e79f1d2f5f8a323c4a.tar.xz
Merge pull request #319 from matrix-org/erikj/filter_refactor
Refactor api.filtering to have a Filter API
Diffstat (limited to 'synapse/rest')
-rw-r--r--synapse/rest/client/v2_alpha/sync.py4
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 73473a7e6b..6c4f2b7cd4 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,