Merge pull request #319 from matrix-org/erikj/filter_refactor

Refactor api.filtering to have a Filter API
This commit is contained in:
Erik Johnston 2015-10-22 13:17:10 +01:00
commit b0ac0a9438
3 changed files with 104 additions and 137 deletions

View file

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