Merge pull request #6714 from matrix-org/t3chguy/fix/18760

Only make the initial space rooms suggested by default
matrix-org · Sep 2, 2021 · 7d74cfe · 7d74cfe
2 parents 9be9e75 + daba23d
commit 7d74cfe
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/components/structures/SpaceRoomView.tsx b/src/components/structures/SpaceRoomView.tsx
@@ -519,6 +519,7 @@ const SpaceSetupFirstRooms = ({ space, title, description, onFinished }) => {
                     inlineErrors: true,
                     parentSpace: space,
                     joinRule: !isPublic ? JoinRule.Restricted : undefined,
+                    suggested: true,
                 });
             }));
             onFinished(filteredRoomNames.length > 0);

diff --git a/src/createRoom.ts b/src/createRoom.ts
@@ -62,6 +62,8 @@ export interface IOpts {
     roomType?: RoomType | string;
     historyVisibility?: HistoryVisibility;
     parentSpace?: Room;
+    // contextually only makes sense if parentSpace is specified, if true then will be added to parentSpace as suggested
+    suggested?: boolean;
     joinRule?: JoinRule;
 }
 
@@ -228,7 +230,7 @@ export default async function createRoom(opts: IOpts): Promise<string | null> {
         }
     }).then(() => {
         if (opts.parentSpace) {
-            return SpaceStore.instance.addRoomToSpace(opts.parentSpace, roomId, [client.getDomain()], true);
+            return SpaceStore.instance.addRoomToSpace(opts.parentSpace, roomId, [client.getDomain()], opts.suggested);
         }
         if (opts.associatedWithCommunity) {
             return GroupStore.addRoomToGroup(opts.associatedWithCommunity, roomId, false);