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

Commit

Permalink
Remove the obsolete MSC1849 configuration flag. (#11843)
Browse files Browse the repository at this point in the history
MSC1849 was replaced by MSC2675, which was merged.
The configuration flag, which defaulted to true, is no
longer useful.
  • Loading branch information
clokep authored Jan 31, 2022
1 parent 7eb198d commit 02755c3
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 6 deletions.
1 change: 1 addition & 0 deletions changelog.d/11843.removal
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Remove the `experimental_msc1849_support_enabled` flag as the features are now stable.
2 changes: 0 additions & 2 deletions synapse/config/experimental.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@ class ExperimentalConfig(Config):
def read_config(self, config: JsonDict, **kwargs):
experimental = config.get("experimental_features") or {}

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

Expand Down
4 changes: 0 additions & 4 deletions synapse/storage/databases/main/relations.py
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@ def __init__(
):
super().__init__(database, db_conn, hs)

self._msc1849_enabled = hs.config.experimental.msc1849_enabled
self._msc3440_enabled = hs.config.experimental.msc3440_enabled

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

# TODO Parallelize.
results = {}
Expand Down

0 comments on commit 02755c3

Please sign in to comment.