Remove unstable identifiers for MSC3069. (#12596)

matrix-org · May 3, 2022 · aa5f5ed · aa5f5ed
1 parent d66d68f
commit aa5f5ed
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 8 deletions.
diff --git a/changelog.d/12596.removal b/changelog.d/12596.removal
@@ -0,0 +1 @@
+Remove unstable identifiers from [MSC3069](https://github.com/matrix-org/matrix-doc/pull/3069).
diff --git 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
@@ -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,
             },
         )
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Remove unstable identifiers from [MSC3069](https://github.com/matrix-org/matrix-doc/pull/3069).