From 3f4d25a48ba17a1e2bcc6510f6cf6de7dd496a11 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Thu, 17 Feb 2022 17:22:55 +0000 Subject: [PATCH] Remove unstable MSC3283 flags (#12018) Fixes #11962 --- changelog.d/12018.removal | 1 + synapse/config/experimental.py | 3 --- synapse/rest/client/capabilities.py | 14 -------------- 3 files changed, 1 insertion(+), 17 deletions(-) create mode 100644 changelog.d/12018.removal diff --git a/changelog.d/12018.removal b/changelog.d/12018.removal new file mode 100644 index 000000000..e940b6222 --- /dev/null +++ b/changelog.d/12018.removal @@ -0,0 +1 @@ +Drop support for [MSC3283](https://github.com/matrix-org/matrix-doc/pull/3283) unstable flags now that the stable flags are supported. diff --git a/synapse/config/experimental.py b/synapse/config/experimental.py index 12b5638cf..bcdeb9ee2 100644 --- a/synapse/config/experimental.py +++ b/synapse/config/experimental.py @@ -41,9 +41,6 @@ class ExperimentalConfig(Config): # MSC3244 (room version capabilities) self.msc3244_enabled: bool = experimental.get("msc3244_enabled", True) - # MSC3283 (set displayname, avatar_url and change 3pid capabilities) - self.msc3283_enabled: bool = experimental.get("msc3283_enabled", False) - # MSC3266 (room summary api) self.msc3266_enabled: bool = experimental.get("msc3266_enabled", False) diff --git a/synapse/rest/client/capabilities.py b/synapse/rest/client/capabilities.py index 6682da077..e05c926b6 100644 --- a/synapse/rest/client/capabilities.py +++ b/synapse/rest/client/capabilities.py @@ -72,20 +72,6 @@ class CapabilitiesRestServlet(RestServlet): "org.matrix.msc3244.room_capabilities" ] = MSC3244_CAPABILITIES - # Must be removed in later versions. - # Is only included for migration. - # Also the parts in `synapse/config/experimental.py`. - if self.config.experimental.msc3283_enabled: - response["capabilities"]["org.matrix.msc3283.set_displayname"] = { - "enabled": self.config.registration.enable_set_displayname - } - response["capabilities"]["org.matrix.msc3283.set_avatar_url"] = { - "enabled": self.config.registration.enable_set_avatar_url - } - response["capabilities"]["org.matrix.msc3283.3pid_changes"] = { - "enabled": self.config.registration.enable_3pid_changes - } - if self.config.experimental.msc3440_enabled: response["capabilities"]["io.element.thread"] = {"enabled": True}