Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Avoid unnecessary work in the spaces summary. #10085

Closed
wants to merge 9 commits into from
Closed

Avoid unnecessary work in the spaces summary. #10085

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
352f1fb
Do not recurse into rooms that are not spaces.
clokep May 25, 2021
3357a6a
Remove an unused variable.
clokep Jun 9, 2021
8103061
Stop tracking events unnecessarily.
clokep Jun 9, 2021
e8f2995
Do not include links to inaccessible rooms.
clokep Jun 9, 2021
be7567d
Merge remote-tracking branch 'origin/develop' into clokep/spaces-simp…
clokep Jun 15, 2021
c6d84ce
Remove unstable prefix.
clokep Jun 15, 2021
b9b659b
Clarify comments.
clokep Jun 15, 2021
e948632
Return early to reduce indent.
clokep Jun 15, 2021
a173fe5
More comments!
clokep Jun 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Return early to reduce indent.
  • Loading branch information
@clokep
clokep committed Jun 15, 2021
commit e9486328125a9bd2044ef9a54598368123626b0d
43 changes: 22 additions & 21 deletions synapse/handlers/space_summary.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,29 +340,30 @@ async def _summarize_local_room(

room_entry = await self._build_room_entry(room_id)

# If the the room is a space, check if there are any children.
# If the the room is not a space, return just the room information.
if room_entry.get("room_type") != RoomTypes.SPACE:
return room_entry, ()

# Otherwise, look for child rooms/spaces.
child_events = await self._get_child_events(room_id)

if suggested_only:
# we only care about suggested children
child_events = filter(_is_suggested_child_event, child_events)

if max_children is None or max_children > MAX_ROOMS_PER_SPACE:
max_children = MAX_ROOMS_PER_SPACE

events_result = [] # type: List[JsonDict]
if room_entry.get("room_type") == RoomTypes.SPACE:

# look for child rooms/spaces.
child_events = await self._get_child_events(room_id)

if suggested_only:
# we only care about suggested children
child_events = filter(_is_suggested_child_event, child_events)

if max_children is None or max_children > MAX_ROOMS_PER_SPACE:
max_children = MAX_ROOMS_PER_SPACE

now = self._clock.time_msec()
for edge_event in itertools.islice(child_events, max_children):
events_result.append(
await self._event_serializer.serialize_event(
edge_event,
time_now=now,
event_format=format_event_for_client_v2,
)
now = self._clock.time_msec()
for edge_event in itertools.islice(child_events, max_children):
events_result.append(
await self._event_serializer.serialize_event(
edge_event,
time_now=now,
event_format=format_event_for_client_v2,
)
)

return room_entry, events_result

Expand Down