Merge pull request #6693 from SimonBrandner/fix/guest/18776

Render guest settings only in public rooms/spaces
matrix-org · Sep 9, 2021 · a6d2bb5 · a6d2bb5
2 parents bdb29e9 + 4f1ff13
commit a6d2bb5
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 33 deletions.
diff --git a/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx b/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
@@ -634,6 +634,22 @@ export default class SecurityRoomSettingsTab extends React.Component<IProps, ISt
             historySection = null;
         }
 
+        let advanced;
+        if (this.state.joinRule === JoinRule.Public) {
+            advanced = (
+                <>
+                    <AccessibleButton
+                        onClick={this.toggleAdvancedSection}
+                        kind="link"
+                        className="mx_SettingsTab_showAdvanced"
+                    >
+                        { this.state.showAdvancedSection ? _t("Hide advanced") : _t("Show advanced") }
+                    </AccessibleButton>
+                    { this.state.showAdvancedSection && this.renderAdvanced() }
+                </>
+            );
+        }
+
         return (
             <div className="mx_SettingsTab mx_SecurityRoomSettingsTab">
                 <div className="mx_SettingsTab_heading">{ _t("Security & Privacy") }</div>
@@ -659,15 +675,7 @@ export default class SecurityRoomSettingsTab extends React.Component<IProps, ISt
                     { this.renderJoinRule() }
                 </div>
 
-                <AccessibleButton
-                    onClick={this.toggleAdvancedSection}
-                    kind="link"
-                    className="mx_SettingsTab_showAdvanced"
-                >
-                    { this.state.showAdvancedSection ? _t("Hide advanced") : _t("Show advanced") }
-                </AccessibleButton>
-                { this.state.showAdvancedSection && this.renderAdvanced() }
-
+                { advanced }
                 { historySection }
             </div>
         );

diff --git a/src/components/views/spaces/SpaceSettingsVisibilityTab.tsx b/src/components/views/spaces/SpaceSettingsVisibilityTab.tsx
@@ -94,30 +94,32 @@ const SpaceSettingsVisibilityTab = ({ matrixClient: cli, space }: IProps) => {
     const canonicalAliasEv = space.currentState.getStateEvents(EventType.RoomCanonicalAlias, "");
 
     let advancedSection;
-    if (showAdvancedSection) {
-        advancedSection = <>
-            <AccessibleButton onClick={toggleAdvancedSection} kind="link" className="mx_SettingsTab_showAdvanced">
-                { _t("Hide advanced") }
-            </AccessibleButton>
-
-            <LabelledToggleSwitch
-                value={guestAccessEnabled}
-                onChange={setGuestAccessEnabled}
-                disabled={!canSetGuestAccess}
-                label={_t("Enable guest access")}
-            />
-            <p>
-                { _t("Guests can join a space without having an account.") }
-                <br />
-                { _t("This may be useful for public spaces.") }
-            </p>
-        </>;
-    } else {
-        advancedSection = <>
-            <AccessibleButton onClick={toggleAdvancedSection} kind="link" className="mx_SettingsTab_showAdvanced">
-                { _t("Show advanced") }
-            </AccessibleButton>
-        </>;
+    if (visibility === SpaceVisibility.Unlisted) {
+        if (showAdvancedSection) {
+            advancedSection = <>
+                <AccessibleButton onClick={toggleAdvancedSection} kind="link" className="mx_SettingsTab_showAdvanced">
+                    { _t("Hide advanced") }
+                </AccessibleButton>
+
+                <LabelledToggleSwitch
+                    value={guestAccessEnabled}
+                    onChange={setGuestAccessEnabled}
+                    disabled={!canSetGuestAccess}
+                    label={_t("Enable guest access")}
+                />
+                <p>
+                    { _t("Guests can join a space without having an account.") }
+                    <br />
+                    { _t("This may be useful for public spaces.") }
+                </p>
+            </>;
+        } else {
+            advancedSection = <>
+                <AccessibleButton onClick={toggleAdvancedSection} kind="link" className="mx_SettingsTab_showAdvanced">
+                    { _t("Show advanced") }
+                </AccessibleButton>
+            </>;
+        }
     }
 
     let addressesSection;