diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-01-29 14:58:00 +0000 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-01-29 14:58:00 +0000 |
| commit | 396a67a09ad6217cab8010466d4f06ac897ad885 (patch) | |
| tree | cbe6996b8ad2b5560f17944625daedae8bf09285 /synapse/server.py | |
| parent | Use get_room_events_stream to get changes to the rooms if the number of chang... (diff) | |
| parent | Merge changes from develop (diff) | |
| download | synapse-396a67a09ad6217cab8010466d4f06ac897ad885.tar.xz | |
Merge branch 'client_v2_filter' into client_v2_sync
Conflicts: synapse/rest/client/v2_alpha/__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) |