diff options
author | Mark Haines <mjark@negativecurvature.net> | 2016-05-31 14:31:19 +0100 |
---|---|---|
committer | Mark Haines <mjark@negativecurvature.net> | 2016-05-31 14:31:19 +0100 |
commit | 014e0799f90b67e29fa7d1fcb7938e0a0c6b8617 (patch) | |
tree | e72ab5618420cd31c55493ed56f3e781c6eb1078 /synapse/handlers/directory.py | |
parent | Merge pull request #802 from matrix-org/dbkr/split_room_list_handler (diff) | |
parent | Move the AS handler out of the Handlers object. (diff) | |
download | synapse-014e0799f90b67e29fa7d1fcb7938e0a0c6b8617.tar.xz |
Merge pull request #803 from matrix-org/markjh/liberate_appservice_handler
Move the AS handler out of the Handlers object.
Diffstat (limited to 'synapse/handlers/directory.py')
-rw-r--r-- | synapse/handlers/directory.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/handlers/directory.py b/synapse/handlers/directory.py index 8eeb225811..4bea7f2b19 100644 --- a/synapse/handlers/directory.py +++ b/synapse/handlers/directory.py @@ -33,6 +33,7 @@ class DirectoryHandler(BaseHandler): super(DirectoryHandler, self).__init__(hs) self.state = hs.get_state_handler() + self.appservice_handler = hs.get_application_service_handler() self.federation = hs.get_replication_layer() self.federation.register_query_handler( @@ -281,7 +282,7 @@ class DirectoryHandler(BaseHandler): ) if not result: # Query AS to see if it exists - as_handler = self.hs.get_handlers().appservice_handler + as_handler = self.appservice_handler result = yield as_handler.query_room_alias_exists(room_alias) defer.returnValue(result) |