Mirrors
/
synapse
mirror of https://github.com/element-hq/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove experimental configuration flag for MSC3666. (#12436)

This commit is contained in:
Patrick Cloke 2022-04-11 15:37:46 -04:00 committed by GitHub
parent 4586119f0b
commit ab3165efb7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
changelog.d/12436.feature Normal file
View File

@ -0,0 +1,2 @@
Include bundled aggregations in search results
([MSC3666](https://github.com/matrix-org/matrix-spec-proposals/pull/3666)).

2
synapse/config/experimental.py
View File

@ -28,8 +28,6 @@ class ExperimentalConfig(Config):
# MSC3440 (thread relation) # MSC3440 (thread relation)
self.msc3440_enabled: bool = experimental.get("msc3440_enabled", False) self.msc3440_enabled: bool = experimental.get("msc3440_enabled", False)
# MSC3666: including bundled relations in /search.
self.msc3666_enabled: bool = experimental.get("msc3666_enabled", False)
# MSC3026 (busy presence state) # MSC3026 (busy presence state)
self.msc3026_enabled: bool = experimental.get("msc3026_enabled", False) self.msc3026_enabled: bool = experimental.get("msc3026_enabled", False)

30
synapse/handlers/search.py
View File

@ -59,8 +59,6 @@ class SearchHandler:
self.state_store = self.storage.state self.state_store = self.storage.state
self.auth = hs.get_auth() self.auth = hs.get_auth()
self._msc3666_enabled = hs.config.experimental.msc3666_enabled
async def get_old_rooms_from_upgraded_room(self, room_id: str) -> Iterable[str]: async def get_old_rooms_from_upgraded_room(self, room_id: str) -> Iterable[str]:
"""Retrieves room IDs of old rooms in the history of an upgraded room. """Retrieves room IDs of old rooms in the history of an upgraded room.
@ -353,22 +351,20 @@ class SearchHandler:
state = await self.state_handler.get_current_state(room_id) state = await self.state_handler.get_current_state(room_id)
state_results[room_id] = list(state.values()) state_results[room_id] = list(state.values())
aggregations = None aggregations = await self._relations_handler.get_bundled_aggregations(
if self._msc3666_enabled: # Generate an iterable of EventBase for all the events that will be
aggregations = await self._relations_handler.get_bundled_aggregations( # returned, including contextual events.
# Generate an iterable of EventBase for all the events that will be itertools.chain(
# returned, including contextual events. # The events_before and events_after for each context.
itertools.chain( itertools.chain.from_iterable(
# The events_before and events_after for each context. itertools.chain(context["events_before"], context["events_after"]) # type: ignore[arg-type]
itertools.chain.from_iterable( for context in contexts.values()
itertools.chain(context["events_before"], context["events_after"]) # type: ignore[arg-type]
for context in contexts.values()
),
# The returned events.
search_result.allowed_events,
), ),
user.to_string(), # The returned events.
) search_result.allowed_events,
),
user.to_string(),
)
# We're now about to serialize the events. We should not make any # We're now about to serialize the events. We should not make any
# blocking calls after this. Otherwise, the 'age' will be wrong. # blocking calls after this. Otherwise, the 'age' will be wrong.