Include the stable identifier for MSC3288. (#11187)

clokep · web-flow · commit a930da3291b5 · 2021-10-27T14:19:19.000Z
Includes both the stable and unstable identifier to store-invite
calls to the identity server. In the future we should remove the
unstable identifier.
diff --git a/changelog.d/11187.feature 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
@@ -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.

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Support the stable room type field for [MSC3288](https://github.com/matrix-org/matrix-doc/pull/3288).`
Original file line number	Diff line number	Diff line change
`@@ -879,6 +879,8 @@ async def ask_id_server_for_third_party_invite(`
`879`	`879`	`}`
`880`	`880`
`881`	`881`	`if room_type is not None:`
	`882`	`+ invite_config["room_type"] = room_type`
	`883`	`+ # TODO The unstable field is deprecated and should be removed in the future.`
`882`	`884`	`invite_config["org.matrix.msc3288.room_type"] = room_type`
`883`	`885`
`884`	`886`	`# If a custom web client location is available, include it in the request.`