summary refs log tree commit diff
path: root/synapse/handlers
diff options
context:
space:
mode:
authorPatrick Cloke <clokep@users.noreply.github.com>2021-11-23 06:43:56 -0500
committerGitHub <noreply@github.com>2021-11-23 06:43:56 -0500
commit6a5dd485bd82b269e7e169c0385290d081eae801 (patch)
tree34296b57c6efd2daf3e5f5605bcbdd8fc31a2273 /synapse/handlers
parentAdd config for customizing the claim used for JWT logins. (#11361) (diff)
downloadsynapse-6a5dd485bd82b269e7e169c0385290d081eae801.tar.xz
Refactor the code to inject bundled relations during serialization. (#11408)
Diffstat (limited to 'synapse/handlers')
-rw-r--r--synapse/handlers/events.py2
-rw-r--r--synapse/handlers/message.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/synapse/handlers/events.py b/synapse/handlers/events.py
index 1f64534a8a..b4ff935546 100644
--- a/synapse/handlers/events.py
+++ b/synapse/handlers/events.py
@@ -124,7 +124,7 @@ class EventStreamHandler:
                 as_client_event=as_client_event,
                 # We don't bundle "live" events, as otherwise clients
                 # will end up double counting annotations.
-                bundle_aggregations=False,
+                bundle_relations=False,
             )
 
             chunk = {
diff --git a/synapse/handlers/message.py b/synapse/handlers/message.py
index 22dd4cf5fd..95b4fad3c6 100644
--- a/synapse/handlers/message.py
+++ b/synapse/handlers/message.py
@@ -252,7 +252,7 @@ class MessageHandler:
             now,
             # We don't bother bundling aggregations in when asked for state
             # events, as clients won't use them.
-            bundle_aggregations=False,
+            bundle_relations=False,
         )
         return events