From ec4db294f9614b4e0e3b10111e71c7e7d6b3abfa Mon Sep 17 00:00:00 2001
From: Julien DAUPHANT <julien.dauphant@beta.gouv.fr>
Date: Tue, 5 Sep 2023 14:34:45 +0200
Subject: [PATCH] =?UTF-8?q?Revert=20"Cr=C3=A9er=20les=20salons=20dans=20un?=
 =?UTF-8?q?=20espace"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit b33c60c2e8fcb5e4e0bc58f3a6c02c4c8edccf86.
---
 .../views/dialogs/TchapCreateRoomDialog.tsx   |  9 ++---
 .../views/elements/TchapRoomTypeSelector.tsx  |  7 ++--
 src/tchap/lib/createTchapRoom.ts              | 34 +++----------------
 3 files changed, 10 insertions(+), 40 deletions(-)

diff --git a/src/tchap/components/views/dialogs/TchapCreateRoomDialog.tsx b/src/tchap/components/views/dialogs/TchapCreateRoomDialog.tsx
index 4a845da0b4..ac5184f0dd 100644
--- a/src/tchap/components/views/dialogs/TchapCreateRoomDialog.tsx
+++ b/src/tchap/components/views/dialogs/TchapCreateRoomDialog.tsx
@@ -32,7 +32,7 @@ import TchapCreateRoom from "../../../lib/createTchapRoom";
 interface IProps {
     defaultPublic?: boolean; // unused for Tchap version
     defaultName?: string;
-    parentSpace?: Room; 
+    parentSpace?: Room; // unused for Tchap version
     defaultEncrypted?: boolean; // unused for Tchap version
     onFinished(proceed: boolean, opts?: IOpts): void;
 }
@@ -43,16 +43,13 @@ interface IState {
     tchapRoomType: TchapRoomType;
     forumFederationSwitchValue: boolean;
     showFederateSwitch: boolean;
-    createRoomInSpace: boolean;
 }
 
 export default class TchapCreateRoomDialog extends React.Component<IProps, IState> {
     private nameField = createRef<Field>();
-    private readonly createRoomInSpace: boolean;
 
     public constructor(props) {
         super(props);
-        this.createRoomInSpace = !!this.props.parentSpace;
 
         const federationOptions = TchapUtils.getRoomFederationOptions();
 
@@ -62,7 +59,6 @@ export default class TchapCreateRoomDialog extends React.Component<IProps, IStat
             tchapRoomType: TchapRoomType.Private,
             forumFederationSwitchValue: federationOptions.forumFederationSwitchDefaultValue,
             showFederateSwitch: federationOptions.showForumFederationSwitch,
-            createRoomInSpace: createRoomInSpace,
         };
     }
 
@@ -153,7 +149,7 @@ export default class TchapCreateRoomDialog extends React.Component<IProps, IStat
     public render() {
         const shortDomain: string = TchapUtils.getShortDomain();
 
-        const title = this.createRoomInSpace ? _t("Create a room in this space") : _t("Create a room");
+        const title = _t("Create a room");
 
         return (
             <BaseDialog
@@ -180,7 +176,6 @@ export default class TchapCreateRoomDialog extends React.Component<IProps, IStat
                             forumFederationSwitchValue={this.state.forumFederationSwitchValue}
                             setForumFederationSwitchValue={this.onForumFederatedChange}
                             setRoomType={this.onTchapRoomTypeChange}
-                            createRoomInSpace={this.createRoomInSpace}
                         />
                     </div>
                 </form>
diff --git a/src/tchap/components/views/elements/TchapRoomTypeSelector.tsx b/src/tchap/components/views/elements/TchapRoomTypeSelector.tsx
index 9e0c00a0fb..5f23cc05e7 100644
--- a/src/tchap/components/views/elements/TchapRoomTypeSelector.tsx
+++ b/src/tchap/components/views/elements/TchapRoomTypeSelector.tsx
@@ -21,7 +21,6 @@ interface IProps {
     forumFederationSwitchValue?: boolean;
     setRoomType(value: TchapRoomType): void;
     setForumFederationSwitchValue(forumFederationSwitchValue: boolean): void;
-    createRoomInSpace: boolean;
 }
 
 interface IState {
@@ -84,7 +83,7 @@ export default class TchapRoomTypeSelector extends React.Component<IProps, IStat
                         onChange={this.onRoomTypeChange}
                     >
                         <div className="tc_TchapRoomTypeSelector_RadioButton_title">{_t("Private room")}</div>
-                        <div>{this.createRoomInSpace ? _t("Private discussions accessible to all users of this space.")  : _t("Accessible to all users by invitation from an administrator.")}</div>
+                        <div>{_t("Accessible to all users by invitation from an administrator.")}</div>
                     </StyledRadioButton>
                 </label>
                 <label className={externalClasses}>
@@ -98,7 +97,7 @@ export default class TchapRoomTypeSelector extends React.Component<IProps, IStat
                             {_t("Private room open to external users")}
                         </div>
                         <div>
-                            {this.createRoomInSpace ? _t("Accessible to all users of this space and to external guests by invitation of an administrator.") : _t("Accessible to all users and to external guests by invitation of an administrator.")}
+                            {_t("Accessible to all users and to external guests by invitation of an administrator.")}
                         </div>
                     </StyledRadioButton>
                 </label>
@@ -110,7 +109,7 @@ export default class TchapRoomTypeSelector extends React.Component<IProps, IStat
                         onChange={this.onRoomTypeChange}
                     >
                         <div className="tc_TchapRoomTypeSelector_RadioButton_title">{_t("Forum room")}</div>
-                        <div>{this.createRoomInSpace ? _t("Public discussion accessible to all users of this space or from a shared link.") : _t("Accessible to all users from the forum directory or from a shared link.")}</div>
+                        <div>{_t("Accessible to all users from the forum directory or from a shared link.")}</div>
                         {roomFederateOpt}
                     </StyledRadioButton>
                 </label>
diff --git a/src/tchap/lib/createTchapRoom.ts b/src/tchap/lib/createTchapRoom.ts
index 1e79c9a92c..e5680fcd1c 100644
--- a/src/tchap/lib/createTchapRoom.ts
+++ b/src/tchap/lib/createTchapRoom.ts
@@ -30,16 +30,10 @@ export default class TchapCreateRoom {
         createRoomOpts.creation_content = { "m.federate": federate };
         createRoomOpts.initial_state = createRoomOpts.initial_state || [];
 
-        opts.parentSpace = this.props.parentSpace;
-
         switch (tchapRoomType) {
             case TchapRoomType.Forum: {
-                // Space "Forum" only for  members and not encrypted
-                if (this.props.parentSpace) {
-                    createRoomOpts.visibility = Visibility.PrivateChat;
-                } else {      //"Forum" only for tchap members and not encrypted
-                    createRoomOpts.visibility = Visibility.Public;
-                }
+                //"Forum" only for tchap members and not encrypted
+                createRoomOpts.visibility = Visibility.Public;
                 createRoomOpts.preset = Preset.PublicChat;
                 // Here we could have used createRoomOpts.accessRule directly,
                 // but since accessRules are a custom Tchap event, it is ignored by later code.
@@ -52,12 +46,7 @@ export default class TchapCreateRoom {
                     state_key: "",
                 });
 
-                //Open to space by default
-                if (this.props.parentSpace) {
-                    opts.joinRule = JoinRule.Restricted;
-                } else {
-                    opts.joinRule = JoinRule.Public;
-                }
+                opts.joinRule = JoinRule.Public;
                 opts.encryption = false;
                 opts.historyVisibility = HistoryVisibility.Shared;
                 break;
@@ -73,12 +62,7 @@ export default class TchapCreateRoom {
                     type: TchapRoomAccessRulesEventId,
                     state_key: "",
                 });
-                //Open to space by default
-                if (this.props.parentSpace) {
-                    opts.joinRule = JoinRule.Restricted;
-                } else {
-                    opts.joinRule = JoinRule.Invite;
-                }
+                opts.joinRule = JoinRule.Invite;
                 opts.encryption = true;
                 opts.historyVisibility = HistoryVisibility.Invited;
                 break;
@@ -94,20 +78,12 @@ export default class TchapCreateRoom {
                     type: TchapRoomAccessRulesEventId,
                     state_key: "",
                 });
-                //Open to space by default
-                if (this.props.parentSpace) {
-                    opts.joinRule = JoinRule.Restricted;
-                } else {
-                    opts.joinRule = JoinRule.Invite;
-                }
+                opts.joinRule = JoinRule.Invite;
                 opts.encryption = true;
                 opts.historyVisibility = HistoryVisibility.Invited;
                 break;
             }
         }
-
-      
-
         return opts;
     }
 }