mirrors/cinny
1
0
Fork 0
mirror of https://github.com/cinnyapp/cinny.git synced 2025-09-13 22:32:26 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Prevent publishing rooms with incompatible joinrules to directory (#2406)

Browse source 
* prevent listing "private" rooms on directory

* clean up boolean expression

* add knock_restricted
This commit is contained in:
Gimle Larpes 2025-08-05 16:10:42 +03:00 • committed by GitHub
parent 1ff09d0fc1
commit e6f14e79da
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
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,8 @@ 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';
import { ExtendedJoinRules } from '../../../components/JoinRulesSwitcher';
type RoomPublishProps = { type RoomPublishProps = {
powerLevels: IPowerLevels; powerLevels: IPowerLevels;
@ -23,6 +26,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: ExtendedJoinRules = (content?.join_rule as ExtendedJoinRules) ?? JoinRule.Invite;
const { visibilityState, setVisibility } = useRoomDirectoryVisibility(room.roomId); const { visibilityState, setVisibility } = useRoomDirectoryVisibility(room.roomId);
@ -30,6 +36,8 @@ 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 || rule === 'knock_restricted';
return ( return (
<SequenceCard <SequenceCard
@ -47,7 +55,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>