diff options
| author | David Baker <dave@matrix.org> | 2016-06-01 09:54:36 +0100 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2016-06-01 09:54:36 +0100 |
| commit | 8e539f13c005fa94c0dfee4cf1ea04acb1aedf59 (patch) | |
| tree | f888e47f736cd6f43db9983d6c802ebf669308a3 /synapse/handlers/directory.py | |
| parent | pep8 (diff) | |
| parent | handle emotes & notices correctly in email notifs (diff) | |
| download | synapse-8e539f13c005fa94c0dfee4cf1ea04acb1aedf59.tar.xz | |
Merge remote-tracking branch 'origin/develop' into dbkr/room_list_spider
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) |