diff options
| author | Patrick Cloke <clokep@users.noreply.github.com> | 2022-12-13 08:43:53 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-13 08:43:53 -0500 |
| commit | 2920e540bfd263e33fa25a6f6d642a9f2b965c2f (patch) | |
| tree | d7514a1b5414107c8f4fd8cba4dfd00df034db61 /synapse | |
| parent | Improve validation of field size limits in events. (#14664) (diff) | |
| download | synapse-2920e540bfd263e33fa25a6f6d642a9f2b965c2f.tar.xz | |
Use the room type from stats in hierarchy response. (#14263)
This avoids pulling additional state information (and events) from the database for each item returned in the hierarchy response. The room type might be out of date until a background update finishes running, the worst impact of this would be spaces being treated as rooms in the hierarchy response. This should self-heal once the background update finishes.
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/handlers/room_summary.py | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/synapse/handlers/room_summary.py b/synapse/handlers/room_summary.py index 8d08625237..c6b869c6f4 100644 --- a/synapse/handlers/room_summary.py +++ b/synapse/handlers/room_summary.py @@ -20,7 +20,6 @@ from typing import TYPE_CHECKING, Dict, Iterable, List, Optional, Sequence, Set, import attr from synapse.api.constants import ( - EventContentFields, EventTypes, HistoryVisibility, JoinRules, @@ -701,13 +700,6 @@ class RoomSummaryHandler: # there should always be an entry assert stats is not None, "unable to retrieve stats for %s" % (room_id,) - current_state_ids = await self._storage_controllers.state.get_current_state_ids( - room_id - ) - create_event = await self._store.get_event( - current_state_ids[(EventTypes.Create, "")] - ) - entry = { "room_id": stats["room_id"], "name": stats["name"], @@ -720,7 +712,7 @@ class RoomSummaryHandler: stats["history_visibility"] == HistoryVisibility.WORLD_READABLE ), "guest_can_join": stats["guest_access"] == "can_join", - "room_type": create_event.content.get(EventContentFields.ROOM_TYPE), + "room_type": stats["room_type"], } if self._msc3266_enabled: @@ -730,7 +722,11 @@ class RoomSummaryHandler: # Federation requests need to provide additional information so the # requested server is able to filter the response appropriately. if for_federation: + current_state_ids = ( + await self._storage_controllers.state.get_current_state_ids(room_id) + ) room_version = await self._store.get_room_version(room_id) + if await self._event_auth_handler.has_restricted_join_rules( current_state_ids, room_version ): |