Merge pull request #6517 from matrix-org/t3chguy/cp/6516

t3chguy · web-flow · commit fe2993ef7f79 · 2021-07-30T15:31:09.000+01:00
[Release] createRoom, only send join rule event if we have a join rule to put in it
diff --git a/src/createRoom.ts b/src/createRoom.ts
@@ -169,7 +169,8 @@ export default async function createRoom(opts: IOpts): Promise<string | null> {
         }
     }
 
-    if (opts.joinRule !== JoinRule.Restricted) {
+    // we handle the restricted join rule in the parentSpace handling block above
+    if (opts.joinRule && opts.joinRule !== JoinRule.Restricted) {
         createOpts.initial_state.push({
             type: EventType.RoomJoinRules,
             content: { join_rule: opts.joinRule },

Original file line number	Diff line number	Diff line change
`@@ -169,7 +169,8 @@ export default async function createRoom(opts: IOpts): Promise<string \| null> {`
`169`	`169`	`}`
`170`	`170`	`}`
`171`	`171`
`172`		`- if (opts.joinRule !== JoinRule.Restricted) {`
	`172`	`+ // we handle the restricted join rule in the parentSpace handling block above`
	`173`	`+ if (opts.joinRule && opts.joinRule !== JoinRule.Restricted) {`
`173`	`174`	`createOpts.initial_state.push({`
`174`	`175`	`type: EventType.RoomJoinRules,`
`175`	`176`	`content: { join_rule: opts.joinRule },`