From 868cb2132e35fbe8f6c88326068c38b62ecc416c Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 30 Jul 2021 15:10:08 +0100
Subject: [PATCH] createRoom, only send join rule event if we have a join rule
 to put inside it

---
 src/createRoom.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/createRoom.ts b/src/createRoom.ts
index a3b06fa8ba..31774bf56f 100644
--- a/src/createRoom.ts
+++ b/src/createRoom.ts
@@ -184,7 +184,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 },