diff options
| author | Olivier Wilkinson (reivilibre) <oliverw@matrix.org> | 2022-01-06 16:37:36 +0000 |
|---|---|---|
| committer | Olivier Wilkinson (reivilibre) <oliverw@matrix.org> | 2022-01-06 16:37:36 +0000 |
| commit | 1a776f671042bc25a3f98d2abcfad0a2ce888e5f (patch) | |
| tree | da158f6134f300e9a18095ece2416a958c190d29 /synapse | |
| parent | Merge branch 'release-v1.50' into matrix-org-hotfixes (diff) | |
| parent | Work around Mjolnir compatibility issue by adding an import for `glob_to_rege... (diff) | |
| download | synapse-1a776f671042bc25a3f98d2abcfad0a2ce888e5f.tar.xz | |
Merge branch 'release-v1.50' into matrix-org-hotfixes
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/rest/client/capabilities.py | 3 | ||||
| -rw-r--r-- | synapse/util/__init__.py | 7 |
2 files changed, 10 insertions, 0 deletions
diff --git a/synapse/rest/client/capabilities.py b/synapse/rest/client/capabilities.py index 2a3e24ae7e..5c0e3a5680 100644 --- a/synapse/rest/client/capabilities.py +++ b/synapse/rest/client/capabilities.py @@ -73,6 +73,9 @@ class CapabilitiesRestServlet(RestServlet): "enabled": self.config.registration.enable_3pid_changes } + if self.config.experimental.msc3440_enabled: + response["capabilities"]["io.element.thread"] = {"enabled": True} + return 200, response diff --git a/synapse/util/__init__.py b/synapse/util/__init__.py index f157132210..511f52534b 100644 --- a/synapse/util/__init__.py +++ b/synapse/util/__init__.py @@ -31,6 +31,13 @@ from synapse.logging import context if typing.TYPE_CHECKING: pass +# FIXME Mjolnir imports glob_to_regex from this file, but it was moved to +# matrix_common. +# As a temporary workaround, we import glob_to_regex here for +# compatibility with current versions of Mjolnir. +# See https://github.com/matrix-org/mjolnir/pull/174 +from matrix_common.regex import glob_to_regex # noqa + logger = logging.getLogger(__name__) |