diff options
| author | Erik Johnston <erik@matrix.org> | 2015-01-30 14:57:33 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-01-30 14:57:33 +0000 |
| commit | fdd2ac495a6da1bce765fc008e9d9bc114451458 (patch) | |
| tree | 576bc559059b0847d2559f3c5dd00de9cf4bf83f /synapse/server.py | |
| parent | Be more specific in naming columns in selects. (diff) | |
| parent | Merge pull request #37 from matrix-org/client_v2_filter (diff) | |
| download | synapse-fdd2ac495a6da1bce765fc008e9d9bc114451458.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into rejections_storage
Conflicts: synapse/storage/__init__.py
Diffstat (limited to 'synapse/server.py')
| -rw-r--r-- | synapse/server.py | 5 |
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) |