diff options
author | Erik Johnston <erikj@jki.re> | 2017-06-01 15:39:32 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-01 15:39:32 +0100 |
commit | 87e5e05aeae3f921f17af4d57cfec6e15f104c42 (patch) | |
tree | 45228bb7292a2cabd0a7c89ecaab42f7d33d3569 /synapse/server.py | |
parent | Merge pull request #2251 from matrix-org/erikj/current_state_delta_stream (diff) | |
parent | Fix sqlite (diff) | |
download | synapse-87e5e05aeae3f921f17af4d57cfec6e15f104c42.tar.xz |
Merge pull request #2252 from matrix-org/erikj/user_dir
Add a user directory
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 e400e278c6..a38e5179e0 100644 --- a/synapse/server.py +++ b/synapse/server.py @@ -49,6 +49,7 @@ from synapse.handlers.events import EventHandler, EventStreamHandler from synapse.handlers.initial_sync import InitialSyncHandler from synapse.handlers.receipts import ReceiptsHandler from synapse.handlers.read_marker import ReadMarkerHandler +from synapse.handlers.user_directory import UserDirectoyHandler from synapse.http.client import SimpleHttpClient, InsecureInterceptableContextFactory from synapse.http.matrixfederationclient import MatrixFederationHttpClient from synapse.notifier import Notifier @@ -137,6 +138,7 @@ class HomeServer(object): 'tcp_replication', 'read_marker_handler', 'action_generator', + 'user_directory_handler', ] def __init__(self, hostname, **kwargs): @@ -304,6 +306,9 @@ class HomeServer(object): def build_action_generator(self): return ActionGenerator(self) + def build_user_directory_handler(self): + return UserDirectoyHandler(self) + def remove_pusher(self, app_id, push_key, user_id): return self.get_pusherpool().remove_pusher(app_id, push_key, user_id) |