Mirrors
/
synapse-old
mirror of https://github.com/matrix-org/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove unstable identifiers for MSC3069. (#12596)

This commit is contained in:
Patrick Cloke 2022-05-03 12:43:12 -04:00 committed by GitHub
parent d66d68f917
commit aa5f5ede33
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/12596.removal Normal file
View File

@ -0,0 +1 @@
Remove unstable identifiers from [MSC3069](https://github.com/matrix-org/matrix-doc/pull/3069).

2
synapse/rest/client/account.py
View File

@ -882,9 +882,7 @@ class WhoamiRestServlet(RestServlet):
response = { response = {
"user_id": requester.user.to_string(), "user_id": requester.user.to_string(),
# MSC: https://github.com/matrix-org/matrix-doc/pull/3069
# Entered spec in Matrix 1.2 # Entered spec in Matrix 1.2
"org.matrix.msc3069.is_guest": bool(requester.is_guest),
"is_guest": bool(requester.is_guest), "is_guest": bool(requester.is_guest),
} }

6
tests/rest/client/test_account.py
View File

@ -520,8 +520,6 @@ class WhoamiTestCase(unittest.HomeserverTestCase):
{ {
"user_id": user_id, "user_id": user_id,
"device_id": device_id, "device_id": device_id,
# MSC3069 entered spec in Matrix 1.2 but maintained compatibility
"org.matrix.msc3069.is_guest": False,
"is_guest": False, "is_guest": False,
}, },
) )
@ -540,8 +538,6 @@ class WhoamiTestCase(unittest.HomeserverTestCase):
{ {
"user_id": user_id, "user_id": user_id,
"device_id": device_id, "device_id": device_id,
# MSC3069 entered spec in Matrix 1.2 but maintained compatibility
"org.matrix.msc3069.is_guest": True,
"is_guest": True, "is_guest": True,
}, },
) )
@ -564,8 +560,6 @@ class WhoamiTestCase(unittest.HomeserverTestCase):
whoami, whoami,
{ {
"user_id": user_id, "user_id": user_id,
# MSC3069 entered spec in Matrix 1.2 but maintained compatibility
"org.matrix.msc3069.is_guest": False,
"is_guest": False, "is_guest": False,
}, },
) )