From 30bb381603999a222b94987179a1aa0bfd4db628 Mon Sep 17 00:00:00 2001
From: Patrick Cloke <patrickc@matrix.org>
Date: Fri, 29 Apr 2022 14:45:17 -0400
Subject: [PATCH 1/2] Remove unstable identifiers for MSC3069.

---
 synapse/rest/client/account.py    | 2 --
 tests/rest/client/test_account.py | 6 ------
 2 files changed, 8 deletions(-)

diff --git a/synapse/rest/client/account.py b/synapse/rest/client/account.py
index 5587cae98a61..bdc4a9c0683d 100644
--- a/synapse/rest/client/account.py
+++ b/synapse/rest/client/account.py
@@ -882,9 +882,7 @@ async def on_GET(self, request: SynapseRequest) -> Tuple[int, JsonDict]:
 
         response = {
             "user_id": requester.user.to_string(),
-            # MSC: https://github.com/matrix-org/matrix-doc/pull/3069
             # Entered spec in Matrix 1.2
-            "org.matrix.msc3069.is_guest": bool(requester.is_guest),
             "is_guest": bool(requester.is_guest),
         }
 
diff --git a/tests/rest/client/test_account.py b/tests/rest/client/test_account.py
index e00b5c171c78..e0a11da97b67 100644
--- a/tests/rest/client/test_account.py
+++ b/tests/rest/client/test_account.py
@@ -520,8 +520,6 @@ def test_GET_whoami(self) -> None:
             {
                 "user_id": user_id,
                 "device_id": device_id,
-                # MSC3069 entered spec in Matrix 1.2 but maintained compatibility
-                "org.matrix.msc3069.is_guest": False,
                 "is_guest": False,
             },
         )
@@ -540,8 +538,6 @@ def test_GET_whoami_guests(self) -> None:
             {
                 "user_id": user_id,
                 "device_id": device_id,
-                # MSC3069 entered spec in Matrix 1.2 but maintained compatibility
-                "org.matrix.msc3069.is_guest": True,
                 "is_guest": True,
             },
         )
@@ -564,8 +560,6 @@ def test_GET_whoami_appservices(self) -> None:
             whoami,
             {
                 "user_id": user_id,
-                # MSC3069 entered spec in Matrix 1.2 but maintained compatibility
-                "org.matrix.msc3069.is_guest": False,
                 "is_guest": False,
             },
         )

From 3b9d24a55b653e18932a983dee707a51b57af6c5 Mon Sep 17 00:00:00 2001
From: Patrick Cloke <patrickc@matrix.org>
Date: Fri, 29 Apr 2022 14:47:58 -0400
Subject: [PATCH 2/2] Newsfragment

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

diff --git a/changelog.d/12596.removal b/changelog.d/12596.removal
new file mode 100644
index 000000000000..14fbfb39540a
--- /dev/null
+++ b/changelog.d/12596.removal
@@ -0,0 +1 @@
+Remove unstable identifiers from [MSC3069](https://github.com/matrix-org/matrix-doc/pull/3069).