summary refs log tree commit diff
path: root/synapse/server.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/server.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/server.py')
-rw-r--r--synapse/server.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/synapse/server.py b/synapse/server.py

index f152f0321e..23bdad0c7c 100644 --- a/synapse/server.py +++ b/synapse/server.py
@@ -33,6 +33,7 @@ from synapse.api.ratelimiting import Ratelimiter from synapse.crypto.keyring import Keyring from synapse.push.pusherpool import PusherPool from synapse.events.builder import EventBuilderFactory +from synapse.api.filtering import Filtering class BaseHomeServer(object): @@ -81,6 +82,7 @@ class BaseHomeServer(object): 'keyring', 'pusherpool', 'event_builder_factory', + 'filtering', ] def __init__(self, hostname, **kwargs): @@ -200,5 +202,8 @@ class HomeServer(BaseHomeServer): hostname=self.hostname, ) + def build_filtering(self): + return Filtering(self) + def build_pusherpool(self): return PusherPool(self)