Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Remove unstable identifiers for MSC3069. #12596

Merged
merged 2 commits into from
May 3, 2022
Merged

Remove unstable identifiers for MSC3069. #12596

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
30bb381
Remove unstable identifiers for MSC3069.
clokep Apr 29, 2022
3b9d24a
Newsfragment
clokep Apr 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/12596.removal
View file
Open in desktop
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).
2 changes: 0 additions & 2 deletions synapse/rest/client/account.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
}

Expand Down
6 changes: 0 additions & 6 deletions tests/rest/client/test_account.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
},
)
Expand All @@ -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,
},
)
Expand All @@ -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,
},
)
Expand Down