summary refs log tree commit diff
path: root/synapse/storage/__init__.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-01-30 14:56:08 +0000
committerErik Johnston <erik@matrix.org>2015-01-30 14:56:08 +0000
commit471c47441d0c188e845b75c8f446c44899fdcfe7 (patch)
tree6288505c1c8024909b6127523ce5e07a9abad6ee /synapse/storage/__init__.py
parentAdd room member count condition and default rule to make a noise on rooms of ... (diff)
parentUse 'in' to test if the key exists, remove unused _filters_for_user (diff)
downloadsynapse-471c47441d0c188e845b75c8f446c44899fdcfe7.tar.xz
Merge pull request #37 from matrix-org/client_v2_filter
Client v2 filter
Diffstat (limited to 'synapse/storage/__init__.py')
-rw-r--r--synapse/storage/__init__.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/storage/__init__.py b/synapse/storage/__init__.py
index 7b18acf421..abddb22ac7 100644
--- a/synapse/storage/__init__.py
+++ b/synapse/storage/__init__.py
@@ -32,9 +32,9 @@ from .event_federation import EventFederationStore
 from .pusher import PusherStore
 from .push_rule import PushRuleStore
 from .media_repository import MediaRepositoryStore
-
 from .state import StateStore
 from .signatures import SignatureStore
+from .filtering import FilteringStore
 
 from syutil.base64util import decode_base64
 from syutil.jsonutil import encode_canonical_json
@@ -64,6 +64,7 @@ SCHEMAS = [
     "event_signatures",
     "pusher",
     "media_repository",
+    "filtering",
 ]
 
 
@@ -85,6 +86,7 @@ class DataStore(RoomMemberStore, RoomStore,
                 DirectoryStore, KeyStore, StateStore, SignatureStore,
                 EventFederationStore,
                 MediaRepositoryStore,
+                FilteringStore,
                 PusherStore,
                 PushRuleStore
                 ):