summary refs log tree commit diff
diff options
context:
space:
mode:
authorPatrick Cloke <clokep@users.noreply.github.com>2022-02-28 13:29:09 -0500
committerGitHub <noreply@github.com>2022-02-28 18:29:09 +0000
commit1866fb39d7ffc86d7374a9aed916f70a91ec65fa (patch)
tree85b49b4d5c9c19a1c32adeb088360fcd96245be3
parentAdd type hints to `tests/rest/client` (#12084) (diff)
downloadsynapse-1866fb39d7ffc86d7374a9aed916f70a91ec65fa.tar.xz
Move experimental support for MSC3440 to /versions. (#12099)
Instead of being part of /capabilities, this matches a change to
MSC3440 to properly use these endpoints.
-rw-r--r--changelog.d/12099.misc1
-rw-r--r--synapse/rest/client/capabilities.py3
-rw-r--r--synapse/rest/client/versions.py2
3 files changed, 3 insertions, 3 deletions
diff --git a/changelog.d/12099.misc b/changelog.d/12099.misc
new file mode 100644
index 0000000000..0553825dbc
--- /dev/null
+++ b/changelog.d/12099.misc
@@ -0,0 +1 @@
+Move experimental support for [MSC3440](https://github.com/matrix-org/matrix-doc/pull/3440) to /versions.
diff --git a/synapse/rest/client/capabilities.py b/synapse/rest/client/capabilities.py
index b80fdd3712..4237071c61 100644
--- a/synapse/rest/client/capabilities.py
+++ b/synapse/rest/client/capabilities.py
@@ -72,9 +72,6 @@ class CapabilitiesRestServlet(RestServlet):
                 "org.matrix.msc3244.room_capabilities"
             ] = MSC3244_CAPABILITIES
 
-        if self.config.experimental.msc3440_enabled:
-            response["capabilities"]["io.element.thread"] = {"enabled": True}
-
         if self.config.experimental.msc3720_enabled:
             response["capabilities"]["org.matrix.msc3720.account_status"] = {
                 "enabled": True,
diff --git a/synapse/rest/client/versions.py b/synapse/rest/client/versions.py
index 00f29344a8..2e5d0e4e22 100644
--- a/synapse/rest/client/versions.py
+++ b/synapse/rest/client/versions.py
@@ -99,6 +99,8 @@ class VersionsRestServlet(RestServlet):
                     "org.matrix.msc2716": self.config.experimental.msc2716_enabled,
                     # Adds support for jump to date endpoints (/timestamp_to_event) as per MSC3030
                     "org.matrix.msc3030": self.config.experimental.msc3030_enabled,
+                    # Adds support for thread relations, per MSC3440.
+                    "org.matrix.msc3440": self.config.experimental.msc3440_enabled,
                 },
             },
         )