From 4c52a5cbb7f24dd3ccd4649d533ce47bebd88f0a Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Thu, 17 Feb 2022 16:47:06 +0000
Subject: [PATCH 1/3] Remove unstable MSC3283 flags

Fixes #11962
---
 synapse/config/experimental.py      |  3 ---
 synapse/rest/client/capabilities.py | 14 --------------
 2 files changed, 17 deletions(-)

diff --git a/synapse/config/experimental.py b/synapse/config/experimental.py
index 12b5638cf8b7..bcdeb9ee232d 100644
--- a/synapse/config/experimental.py
+++ b/synapse/config/experimental.py
@@ -41,9 +41,6 @@ def read_config(self, config: JsonDict, **kwargs):
         # 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 6682da077a3e..e05c926b6f06 100644
--- a/synapse/rest/client/capabilities.py
+++ b/synapse/rest/client/capabilities.py
@@ -72,20 +72,6 @@ async def on_GET(self, request: SynapseRequest) -> Tuple[int, JsonDict]:
                 "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}
 

From 113d267459bb8e8588a7cf13338901fb5cedf2f5 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Thu, 17 Feb 2022 16:48:49 +0000
Subject: [PATCH 2/3] Newsfile

---
 changelog.d/12018.removal | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/12018.removal

diff --git a/changelog.d/12018.removal b/changelog.d/12018.removal
new file mode 100644
index 000000000000..f3bb99fd66eb
--- /dev/null
+++ b/changelog.d/12018.removal
@@ -0,0 +1 @@
+Drop support for MSC3283 unstable flags now that the stable flags are supported.

From 2551c58026ec2b6fc4ca8926e528fd055fe3ec9f Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Thu, 17 Feb 2022 16:53:37 +0000
Subject: [PATCH 3/3] Update newsfile

---
 changelog.d/12018.removal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/changelog.d/12018.removal b/changelog.d/12018.removal
index f3bb99fd66eb..e940b62228ac 100644
--- a/changelog.d/12018.removal
+++ b/changelog.d/12018.removal
@@ -1 +1 @@
-Drop support for MSC3283 unstable flags now that the stable flags are supported.
+Drop support for [MSC3283](https://github.com/matrix-org/matrix-doc/pull/3283) unstable flags now that the stable flags are supported.