From a930da3291b5b1d2375c3bd7c4a34f1588704292 Mon Sep 17 00:00:00 2001
From: Patrick Cloke <clokep@users.noreply.github.com>
Date: Wed, 27 Oct 2021 10:19:19 -0400
Subject: [PATCH] Include the stable identifier for MSC3288. (#11187)

Includes both the stable and unstable identifier to store-invite
calls to the identity server. In the future we should remove the
unstable identifier.
---
 changelog.d/11187.feature    | 1 +
 synapse/handlers/identity.py | 2 ++
 2 files changed, 3 insertions(+)
 create mode 100644 changelog.d/11187.feature

diff --git a/changelog.d/11187.feature b/changelog.d/11187.feature
new file mode 100644
index 000000000..dd2810903
--- /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).
diff --git a/synapse/handlers/identity.py b/synapse/handlers/identity.py
index 7ef8698a5..6a315117b 100644
--- a/synapse/handlers/identity.py
+++ b/synapse/handlers/identity.py
@@ -879,6 +879,8 @@ class IdentityHandler:
         }
 
         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.