From f58b300d271ddaad7ce81687547f3c6ed7e7187a Mon Sep 17 00:00:00 2001
From: Patrick Cloke <clokep@users.noreply.github.com>
Date: Wed, 29 Dec 2021 08:02:03 -0500
Subject: [PATCH] Do not attempt to bundled aggregations for /members and
/state. (#11623)
Both of those APIs return state events, which will not have bundled
aggregations added anyway.
---
changelog.d/11623.bugfix | 1 +
synapse/handlers/message.py | 4 +---
2 files changed, 2 insertions(+), 3 deletions(-)
create mode 100644 changelog.d/11623.bugfix
diff --git a/changelog.d/11623.bugfix b/changelog.d/11623.bugfix
new file mode 100644
index 0000000000..4116e5dd7c
--- /dev/null
+++ b/changelog.d/11623.bugfix
@@ -0,0 +1 @@
+Fix a long-standing bug where responses included bundled aggregations when they should not, per [MSC2675](https://github.com/matrix-org/matrix-doc/pull/2675).
diff --git a/synapse/handlers/message.py b/synapse/handlers/message.py
index 1a7190085a..5e3d3886eb 100644
--- a/synapse/handlers/message.py
+++ b/synapse/handlers/message.py
@@ -246,9 +246,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, bundle_aggregations=True
- )
+ 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:
--
GitLab