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

[Release] createRoom, only send join rule event if we have a join rule to put in it
matrix-org · Jul 30, 2021 · fe2993e · fe2993e
2 parents a7a84df + f86265b
commit fe2993e
Showing 1 changed file with 2 additions and 1 deletion.
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 },