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

Include the stable identifier for MSC3288. #11187

Merged
merged 3 commits into from
Oct 27, 2021
Merged

Include the stable identifier for MSC3288. #11187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
96ab4c7
Include the stable identifier for MSC3288.
clokep Oct 26, 2021
989d231
Newsfragment
clokep Oct 26, 2021
e4b9b04
Merge remote-tracking branch 'origin/develop' into clokep/stable-msc3288
clokep Oct 27, 2021
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/11187.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Support the stable room type field for [MSC3288](https://github.com/matrix-org/matrix-doc/pull/3288).
2 changes: 2 additions & 0 deletions synapse/handlers/identity.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -879,6 +879,8 @@ async def ask_id_server_for_third_party_invite(
}

if room_type is not None:
invite_config["room_type"] = room_type
# TODO The unstable field is deprecated and should be removed in the future.
invite_config["org.matrix.msc3288.room_type"] = room_type

# If a custom web client location is available, include it in the request.
Expand Down