diff options
| author | Neil Johnson <neil@fragile.org.uk> | 2018-03-26 14:51:11 +0100 |
|---|---|---|
| committer | Neil Johnson <neil@fragile.org.uk> | 2018-03-26 14:51:11 +0100 |
| commit | aa3587fdd111d01b3bd0a610dab6e102d79f230c (patch) | |
| tree | 1fad5548eab845afcb1fe5f0c5e26694b322d6d3 /synapse/handlers/directory.py | |
| parent | Merge branch 'hotfixes-v0.26.1' of github.com:matrix-org/synapse (diff) | |
| parent | version bump (diff) | |
| download | synapse-aa3587fdd111d01b3bd0a610dab6e102d79f230c.tar.xz | |
Merge branch 'release-v0.27.0' of https://github.com/matrix-org/synapse v0.27.0
Diffstat (limited to 'synapse/handlers/directory.py')
| -rw-r--r-- | synapse/handlers/directory.py | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/synapse/handlers/directory.py b/synapse/handlers/directory.py index a0464ae5c0..c5b6e75e03 100644 --- a/synapse/handlers/directory.py +++ b/synapse/handlers/directory.py @@ -34,9 +34,10 @@ class DirectoryHandler(BaseHandler): self.state = hs.get_state_handler() self.appservice_handler = hs.get_application_service_handler() + self.event_creation_handler = hs.get_event_creation_handler() - self.federation = hs.get_replication_layer() - self.federation.register_query_handler( + self.federation = hs.get_federation_client() + hs.get_federation_registry().register_query_handler( "directory", self.on_directory_query ) @@ -249,8 +250,7 @@ class DirectoryHandler(BaseHandler): def send_room_alias_update_event(self, requester, user_id, room_id): aliases = yield self.store.get_aliases_for_room(room_id) - msg_handler = self.hs.get_handlers().message_handler - yield msg_handler.create_and_send_nonmember_event( + yield self.event_creation_handler.create_and_send_nonmember_event( requester, { "type": EventTypes.Aliases, @@ -272,8 +272,7 @@ class DirectoryHandler(BaseHandler): if not alias_event or alias_event.content.get("alias", "") != alias_str: return - msg_handler = self.hs.get_handlers().message_handler - yield msg_handler.create_and_send_nonmember_event( + yield self.event_creation_handler.create_and_send_nonmember_event( requester, { "type": EventTypes.CanonicalAlias, |