diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-01-30 14:57:04 +0000 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-01-30 14:57:04 +0000 |
| commit | 8bc3066e0b2abb2199143dd4e22a386291815a2d (patch) | |
| tree | 24aa2af8184fb1fc66189ec59bce0929c6395108 /synapse | |
| parent | Check if the user has joined the room between incremental syncs (diff) | |
| parent | Use 'in' to test if the key exists, remove unused _filters_for_user (diff) | |
| download | synapse-8bc3066e0b2abb2199143dd4e22a386291815a2d.tar.xz | |
Merge branch 'client_v2_filter' into client_v2_sync
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/api/filtering.py | 8 | ||||
| -rw-r--r-- | synapse/storage/filtering.py | 4 |
2 files changed, 2 insertions, 10 deletions
diff --git a/synapse/api/filtering.py b/synapse/api/filtering.py index fa4de2614d..4d570b74f8 100644 --- a/synapse/api/filtering.py +++ b/synapse/api/filtering.py @@ -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): diff --git a/synapse/storage/filtering.py b/synapse/storage/filtering.py index cb01c2040f..e86eeced45 100644 --- a/synapse/storage/filtering.py +++ b/synapse/storage/filtering.py @@ -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): |