summary refs log tree commit diff
path: root/synapse/events
diff options
context:
space:
mode:
authorPatrick Cloke <clokep@users.noreply.github.com>2021-10-15 10:30:48 -0400
committerGitHub <noreply@github.com>2021-10-15 14:30:48 +0000
commit55731333488bfd53ece117938dde1cef710eef68 (patch)
tree1aac455f46664ec3c65ba5358ed8b28da2949044 /synapse/events
parentFix logging context warnings when losing replication connection (#10984) (diff)
downloadsynapse-55731333488bfd53ece117938dde1cef710eef68.tar.xz
Move experimental & retention config out of the server module. (#11070)
Diffstat (limited to 'synapse/events')
-rw-r--r--synapse/events/utils.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/synapse/events/utils.py b/synapse/events/utils.py
index 23bd24d963..3f3eba86a8 100644
--- a/synapse/events/utils.py
+++ b/synapse/events/utils.py
@@ -385,9 +385,7 @@ class EventClientSerializer:
 
     def __init__(self, hs: "HomeServer"):
         self.store = hs.get_datastore()
-        self.experimental_msc1849_support_enabled = (
-            hs.config.server.experimental_msc1849_support_enabled
-        )
+        self._msc1849_enabled = hs.config.experimental.msc1849_enabled
 
     async def serialize_event(
         self,
@@ -418,7 +416,7 @@ class EventClientSerializer:
         # we need to bundle in with the event.
         # Do not bundle relations if the event has been redacted
         if not event.internal_metadata.is_redacted() and (
-            self.experimental_msc1849_support_enabled and bundle_aggregations
+            self._msc1849_enabled and bundle_aggregations
         ):
             annotations = await self.store.get_aggregation_groups_for_event(event_id)
             references = await self.store.get_relations_for_event(