summary refs log tree commit diff
path: root/synapse/server.py
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2018-05-18 11:28:04 +0100
committerGitHub <noreply@github.com>2018-05-18 11:28:04 +0100
commit6d9dc671391dadb75e8c0d860c7f1eb3e27681ec (patch)
tree55fd9ea0d7aadde8829adaf270a69f72363d360b /synapse/server.py
parentMerge pull request #3235 from matrix-org/rav/fix_receipts_deferred (diff)
parentBetter docstrings (diff)
downloadsynapse-6d9dc671391dadb75e8c0d860c7f1eb3e27681ec.tar.xz
Merge pull request #3232 from matrix-org/rav/server_notices_room
Infrastructure for a server notices room
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 9e6f3584b2..85f54cd047 100644 --- a/synapse/server.py +++ b/synapse/server.py
@@ -72,6 +72,7 @@ from synapse.rest.media.v1.media_repository import ( MediaRepository, MediaRepositoryResource, ) +from synapse.server_notices.server_notices_manager import ServerNoticesManager from synapse.state import StateHandler, StateResolutionHandler from synapse.storage import DataStore from synapse.streams.events import EventSources @@ -156,6 +157,7 @@ class HomeServer(object): 'spam_checker', 'room_member_handler', 'federation_registry', + 'server_notices_manager', ] def __init__(self, hostname, **kwargs): @@ -398,6 +400,9 @@ class HomeServer(object): def build_federation_registry(self): return FederationHandlerRegistry() + def build_server_notices_manager(self): + return ServerNoticesManager(self) + def remove_pusher(self, app_id, push_key, user_id): return self.get_pusherpool().remove_pusher(app_id, push_key, user_id)