diff --git a/synapse/rest/client/v2_alpha/filter.py b/synapse/rest/client/v2_alpha/filter.py
index 7695bebc28..7c94f6ec41 100644
--- a/synapse/rest/client/v2_alpha/filter.py
+++ b/synapse/rest/client/v2_alpha/filter.py
@@ -59,7 +59,7 @@ class GetFilterRestServlet(RestServlet):
filter_id=filter_id,
)
- defer.returnValue((200, filter.filter_json))
+ defer.returnValue((200, filter.get_filter_json()))
except KeyError:
raise SynapseError(400, "No such filter")
diff --git a/synapse/rest/client/v2_alpha/sync.py b/synapse/rest/client/v2_alpha/sync.py
index 4114a7e430..ab924ad9e0 100644
--- a/synapse/rest/client/v2_alpha/sync.py
+++ b/synapse/rest/client/v2_alpha/sync.py
@@ -24,7 +24,7 @@ from synapse.events import FrozenEvent
from synapse.events.utils import (
serialize_event, format_event_for_client_v2_without_room_id,
)
-from synapse.api.filtering import FilterCollection
+from synapse.api.filtering import FilterCollection, DEFAULT_FILTER_COLLECTION
from synapse.api.errors import SynapseError
from ._base import client_v2_patterns
@@ -113,20 +113,20 @@ class SyncRestServlet(RestServlet):
)
)
- if filter_id and filter_id.startswith('{'):
- try:
- filter_object = json.loads(filter_id)
- except:
- raise SynapseError(400, "Invalid filter JSON")
- self.filtering._check_valid_filter(filter_object)
- filter = FilterCollection(filter_object)
- else:
- try:
+ if filter_id:
+ if filter_id.startswith('{'):
+ try:
+ filter_object = json.loads(filter_id)
+ except:
+ raise SynapseError(400, "Invalid filter JSON")
+ self.filtering.check_valid_filter(filter_object)
+ filter = FilterCollection(filter_object)
+ else:
filter = yield self.filtering.get_user_filter(
user.localpart, filter_id
)
- except:
- filter = FilterCollection({})
+ else:
+ filter = DEFAULT_FILTER_COLLECTION
sync_config = SyncConfig(
user=user,
|
