Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-03 07:54:48 -04:00
Code Issues Projects Releases Packages Wiki Activity

Do not recurse into non-spaces in the spaces summary. (#10256)

Browse source 
Previously m.child.room events in non-space rooms would be
treated as part of the room graph, but this is no longer
supported.
This commit is contained in:
Patrick Cloke 2021-06-29 12:00:04 -04:00 • committed by GitHub
parent 7647b0337f
commit f55836929d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 43 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

11
synapse/handlers/space_summary.py
View file

@ -25,6 +25,7 @@ from synapse.api.constants import (
EventTypes,
HistoryVisibility,
Membership,
RoomTypes,
)
from synapse.events import EventBase
from synapse.events.utils import format_event_for_client_v2
@ -318,7 +319,8 @@ class SpaceSummaryHandler:
Returns:
A tuple of:
An iterable of a single value of the room.
The room information, if the room should be returned to the
user. None, otherwise.
An iterable of the sorted children events. This may be limited
to a maximum size or may include all children.
@ -328,7 +330,11 @@ class SpaceSummaryHandler:
room_entry = await self._build_room_entry(room_id)
# look for child rooms/spaces.
# If 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:
@ -348,6 +354,7 @@ class SpaceSummaryHandler:
event_format=format_event_for_client_v2,
)
)
return room_entry, events_result
async def _summarize_remote_room(