Skip to content
Snippets Groups Projects
Commit 8bc3066e authored by Mark Haines's avatar Mark Haines
Browse files

Merge branch 'client_v2_filter' into client_v2_sync

parents 8fe39a03 e97f756a
No related branches found
No related tags found
No related merge requests found
......@@ -114,21 +114,17 @@ class Filtering(object):
if not isinstance(event_type, basestring):
raise SynapseError(400, "Event type should be a string")
try:
if "format" in definition:
event_format = definition["format"]
if event_format not in ["federation", "events"]:
raise SynapseError(400, "Invalid format: %s" % (event_format,))
except KeyError:
pass # format is optional
try:
if "select" in definition:
event_select_list = definition["select"]
for select_key in event_select_list:
if select_key not in ["event_id", "origin_server_ts",
"thread_id", "content", "content.body"]:
raise SynapseError(400, "Bad select: %s" % (select_key,))
except KeyError:
pass # select is optional
if ("bundle_updates" in definition and
type(definition["bundle_updates"]) != bool):
......
......@@ -20,10 +20,6 @@ from ._base import SQLBaseStore
import json
# TODO(paul)
_filters_for_user = {}
class FilteringStore(SQLBaseStore):
@defer.inlineCallbacks
def get_user_filter(self, user_localpart, filter_id):
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment