mirrors/cinny
1
0
Fork 0
mirror of https://github.com/cinnyapp/cinny.git synced 2025-11-04 14:30:29 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

prevent listing "private" rooms on directory

Browse source
This commit is contained in:
Gimle Larpes 2025-07-29 00:22:36 +02:00
parent 31942b1114
commit cdaeb18798
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/app/features/common-settings/general/RoomPublish.tsx
View file

@ -1,6 +1,7 @@
import React from 'react'; import React from 'react';
import { Box, color, Spinner, Switch, Text } from 'folds'; import { Box, color, Spinner, Switch, Text } from 'folds';
import { MatrixError } from 'matrix-js-sdk'; import { JoinRule, MatrixError } from 'matrix-js-sdk';
import { RoomJoinRulesEventContent } from 'matrix-js-sdk/lib/types';
import { SequenceCard } from '../../../components/sequence-card'; import { SequenceCard } from '../../../components/sequence-card';
import { SequenceCardStyle } from '../../room-settings/styles.css'; import { SequenceCardStyle } from '../../room-settings/styles.css';
import { SettingTile } from '../../../components/setting-tile'; import { SettingTile } from '../../../components/setting-tile';
@ -10,6 +11,7 @@ import { AsyncStatus, useAsyncCallback } from '../../../hooks/useAsyncCallback';
import { IPowerLevels, powerLevelAPI } from '../../../hooks/usePowerLevels'; import { IPowerLevels, powerLevelAPI } from '../../../hooks/usePowerLevels';
import { StateEvent } from '../../../../types/matrix/room'; import { StateEvent } from '../../../../types/matrix/room';
import { useMatrixClient } from '../../../hooks/useMatrixClient'; import { useMatrixClient } from '../../../hooks/useMatrixClient';
import { useStateEvent } from '../../../hooks/useStateEvent';
type RoomPublishProps = { type RoomPublishProps = {
powerLevels: IPowerLevels; powerLevels: IPowerLevels;
@ -23,6 +25,9 @@ export function RoomPublish({ powerLevels }: RoomPublishProps) {
StateEvent.RoomCanonicalAlias, StateEvent.RoomCanonicalAlias,
userPowerLevel userPowerLevel
); );
const joinRuleEvent = useStateEvent(room, StateEvent.RoomJoinRules);
const content = joinRuleEvent?.getContent<RoomJoinRulesEventContent>();
const rule: JoinRule = content?.join_rule ?? JoinRule.Invite;
const { visibilityState, setVisibility } = useRoomDirectoryVisibility(room.roomId); const { visibilityState, setVisibility } = useRoomDirectoryVisibility(room.roomId);
@ -30,6 +35,7 @@ export function RoomPublish({ powerLevels }: RoomPublishProps) {
const loading = const loading =
visibilityState.status === AsyncStatus.Loading || toggleState.status === AsyncStatus.Loading; visibilityState.status === AsyncStatus.Loading || toggleState.status === AsyncStatus.Loading;
const validRule = rule === JoinRule.Public || rule === JoinRule.Knock;
return ( return (
<SequenceCard <SequenceCard
@ -47,7 +53,7 @@ export function RoomPublish({ powerLevels }: RoomPublishProps) {
<Switch <Switch
value={visibilityState.data} value={visibilityState.data}
onChange={toggleVisibility} onChange={toggleVisibility}
disabled={!canEditCanonical} disabled={!(canEditCanonical && validRule)}
/> />
)} )}
</Box> </Box>