Disable "Publish this room" option in invite only rooms (#7441)

2022-01-10 05:46:30 -06:00
parent fdd0a2ada3
commit c03cb67aef
2 changed files with 30 additions and 21 deletions
--- a/src/components/views/room_settings/RoomPublishSetting.tsx
+++ b/src/components/views/room_settings/RoomPublishSetting.tsx
@@ -68,9 +68,12 @@ export default class RoomPublishSetting extends React.PureComponent<IProps, ISta
    render() {
        const client = MatrixClientPeg.get();

+        const room = client.getRoom(this.props.roomId);
+        const isRoomPublishable = room.getJoinRule() !== "invite";
+
        const enabled = (
-            DirectoryCustomisations.requireCanonicalAliasAccessToPublish?.() === false ||
-            this.props.canSetCanonicalAlias
+            (DirectoryCustomisations.requireCanonicalAliasAccessToPublish?.() === false ||
+            this.props.canSetCanonicalAlias) && (isRoomPublishable || this.state.isRoomPublished)
        );

        return (