Skip to content
This repository was archived by the owner on Apr 26, 2024. It is now read-only.

Commit 02755c3

Browse files
authored
Remove the obsolete MSC1849 configuration flag. (#11843)
MSC1849 was replaced by MSC2675, which was merged. The configuration flag, which defaulted to true, is no longer useful.
1 parent 7eb198d commit 02755c3

File tree

3 files changed

+1
-6
lines changed

3 files changed

+1
-6
lines changed

changelog.d/11843.removal

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Remove the `experimental_msc1849_support_enabled` flag as the features are now stable.

synapse/config/experimental.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ class ExperimentalConfig(Config):
2424
def read_config(self, config: JsonDict, **kwargs):
2525
experimental = config.get("experimental_features") or {}
2626

27-
# Whether to enable experimental MSC1849 (aka relations) support
28-
self.msc1849_enabled = config.get("experimental_msc1849_support_enabled", True)
2927
# MSC3440 (thread relation)
3028
self.msc3440_enabled: bool = experimental.get("msc3440_enabled", False)
3129

synapse/storage/databases/main/relations.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ def __init__(
7575
):
7676
super().__init__(database, db_conn, hs)
7777

78-
self._msc1849_enabled = hs.config.experimental.msc1849_enabled
7978
self._msc3440_enabled = hs.config.experimental.msc3440_enabled
8079

8180
@cached(tree=True)
@@ -683,9 +682,6 @@ async def get_bundled_aggregations(
683682
A map of event ID to the bundled aggregation for the event. Not all
684683
events may have bundled aggregations in the results.
685684
"""
686-
# If bundled aggregations are disabled, nothing to do.
687-
if not self._msc1849_enabled:
688-
return {}
689685

690686
# TODO Parallelize.
691687
results = {}

0 commit comments

Comments
 (0)