From 96ab4c7e6c6b3eda129d1f4791fcc7d1a4105558 Mon Sep 17 00:00:00 2001 From: Patrick Cloke Date: Tue, 26 Oct 2021 15:17:43 -0400 Subject: [PATCH 1/2] Include the stable identifier for MSC3288. --- synapse/handlers/identity.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/synapse/handlers/identity.py b/synapse/handlers/identity.py index 7ef8698a5ea9..6a315117ba03 100644 --- a/synapse/handlers/identity.py +++ b/synapse/handlers/identity.py @@ -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. From 989d231e0c699ccfb5d855f9d0a70948651c56e6 Mon Sep 17 00:00:00 2001 From: Patrick Cloke Date: Tue, 26 Oct 2021 15:26:46 -0400 Subject: [PATCH 2/2] Newsfragment --- changelog.d/11187.feature | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/11187.feature diff --git a/changelog.d/11187.feature b/changelog.d/11187.feature new file mode 100644 index 000000000000..dd2810903006 --- /dev/null +++ b/changelog.d/11187.feature @@ -0,0 +1 @@ +Support the stable room type field for [MSC3288](https://github.com/matrix-org/matrix-doc/pull/3288).