diff options
| author | Erik Johnston <erik@matrix.org> | 2022-06-01 16:02:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-01 16:02:53 +0100 |
| commit | 888a29f4127723a8d048ce47cff37ee8a7a6f1b9 (patch) | |
| tree | 891ae4c95632801bb097aaed8aea5d8b541c5cf7 /synapse/handlers/directory.py | |
| parent | Fix complement tests using the wrong path (#12933) (diff) | |
| download | synapse-888a29f4127723a8d048ce47cff37ee8a7a6f1b9.tar.xz | |
Wait for lazy join to complete when getting current state (#12872)
Diffstat (limited to 'synapse/handlers/directory.py')
| -rw-r--r-- | synapse/handlers/directory.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/synapse/handlers/directory.py b/synapse/handlers/directory.py index 4aa33df884..44e84698c4 100644 --- a/synapse/handlers/directory.py +++ b/synapse/handlers/directory.py @@ -45,6 +45,7 @@ class DirectoryHandler: self.appservice_handler = hs.get_application_service_handler() self.event_creation_handler = hs.get_event_creation_handler() self.store = hs.get_datastores().main + self._storage_controllers = hs.get_storage_controllers() self.config = hs.config self.enable_room_list_search = hs.config.roomdirectory.enable_room_list_search self.require_membership = hs.config.server.require_membership_for_aliases @@ -463,7 +464,11 @@ class DirectoryHandler: making_public = visibility == "public" if making_public: room_aliases = await self.store.get_aliases_for_room(room_id) - canonical_alias = await self.store.get_canonical_alias_for_room(room_id) + canonical_alias = ( + await self._storage_controllers.state.get_canonical_alias_for_room( + room_id + ) + ) if canonical_alias: room_aliases.append(canonical_alias) |