Merge remote-tracking branch 'upstream/release-v1.49'

This commit is contained in:
Tulir Asokan 2021-12-07 16:54:59 +02:00
commit 08a269e2af
165 changed files with 7713 additions and 2703 deletions

View file

@ -247,13 +247,7 @@ class MessageHandler:
room_state = room_state_events[membership_event_id]
now = self.clock.time_msec()
events = await self._event_serializer.serialize_events(
room_state.values(),
now,
# We don't bother bundling aggregations in when asked for state
# events, as clients won't use them.
bundle_relations=False,
)
events = await self._event_serializer.serialize_events(room_state.values(), now)
return events
async def get_joined_members(self, requester: Requester, room_id: str) -> dict: