diff options
| author | Patrick Cloke <clokep@users.noreply.github.com> | 2022-05-03 12:43:12 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-03 12:43:12 -0400 |
| commit | aa5f5ede3331bf916f459137e9d0df3ac0743093 (patch) | |
| tree | c8c35e984f4b0211d92caf4c00315ee00dc4b5f9 | |
| parent | Add extra debug logging to federation sender (#12614) (diff) | |
| download | synapse-aa5f5ede3331bf916f459137e9d0df3ac0743093.tar.xz | |
Remove unstable identifiers for MSC3069. (#12596)
| -rw-r--r-- | changelog.d/12596.removal | 1 | ||||
| -rw-r--r-- | synapse/rest/client/account.py | 2 | ||||
| -rw-r--r-- | tests/rest/client/test_account.py | 6 |
3 files changed, 1 insertions, 8 deletions
diff --git a/changelog.d/12596.removal b/changelog.d/12596.removal new file mode 100644 index 0000000000..14fbfb3954 --- /dev/null +++ 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 index 5587cae98a..bdc4a9c068 100644 --- a/synapse/rest/client/account.py +++ b/synapse/rest/client/account.py @@ -882,9 +882,7 @@ class WhoamiRestServlet(RestServlet): 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 e00b5c171c..e0a11da97b 100644 --- a/tests/rest/client/test_account.py +++ b/tests/rest/client/test_account.py @@ -520,8 +520,6 @@ class WhoamiTestCase(unittest.HomeserverTestCase): { "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 @@ class WhoamiTestCase(unittest.HomeserverTestCase): { "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 @@ class WhoamiTestCase(unittest.HomeserverTestCase): whoami, { "user_id": user_id, - # MSC3069 entered spec in Matrix 1.2 but maintained compatibility - "org.matrix.msc3069.is_guest": False, "is_guest": False, }, ) |