matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-05 23:10:41 +03:00
Code Activity

Fix 2 new NPEs

Browse Source
This commit is contained in:
Michael Telatynski
2021-07-06 12:05:30 +01:00
parent 06284fe73d
commit d004163177
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
View File

@@ -104,7 +104,7 @@ export default class SecurityRoomSettingsTab extends React.Component<IProps, ISt
const restrictedRoomCapabilities = SpaceStore.instance.restrictedJoinRuleSupport; const restrictedRoomCapabilities = SpaceStore.instance.restrictedJoinRuleSupport;
const roomSupportsRestricted = Array.isArray(restrictedRoomCapabilities?.support) const roomSupportsRestricted = Array.isArray(restrictedRoomCapabilities?.support)
&& restrictedRoomCapabilities.support.includes(room.getVersion()); && restrictedRoomCapabilities.support.includes(room.getVersion());
const preferredRestrictionVersion = roomSupportsRestricted ? null : restrictedRoomCapabilities.preferred; const preferredRestrictionVersion = roomSupportsRestricted ? undefined : restrictedRoomCapabilities?.preferred;
this.setState({ joinRule, restrictedAllowRoomIds, guestAccess, history, encrypted, this.setState({ joinRule, restrictedAllowRoomIds, guestAccess, history, encrypted,
roomSupportsRestricted, preferredRestrictionVersion }); roomSupportsRestricted, preferredRestrictionVersion });

12
src/createRoom.ts
View File

@@ -144,19 +144,19 @@ export default async function createRoom(opts: IOpts): Promise<string | null> {
} }
if (opts.parentSpace) { if (opts.parentSpace) {
opts.createOpts.initial_state.push(makeSpaceParentEvent(opts.parentSpace, true)); createOpts.initial_state.push(makeSpaceParentEvent(opts.parentSpace, true));
opts.createOpts.initial_state.push({ createOpts.initial_state.push({
type: EventType.RoomHistoryVisibility, type: EventType.RoomHistoryVisibility,
content: { content: {
"history_visibility": opts.createOpts.preset === Preset.PublicChat ? "world_readable" : "invited", "history_visibility": createOpts.preset === Preset.PublicChat ? "world_readable" : "invited",
}, },
}); });
if (opts.joinRule === JoinRule.Restricted) { if (opts.joinRule === JoinRule.Restricted) {
if (SpaceStore.instance.restrictedJoinRuleSupport?.preferred) { if (SpaceStore.instance.restrictedJoinRuleSupport?.preferred) {
opts.createOpts.room_version = SpaceStore.instance.restrictedJoinRuleSupport.preferred; createOpts.room_version = SpaceStore.instance.restrictedJoinRuleSupport.preferred;
opts.createOpts.initial_state.push({ createOpts.initial_state.push({
type: EventType.RoomJoinRules, type: EventType.RoomJoinRules,
content: { content: {
"join_rule": JoinRule.Restricted, "join_rule": JoinRule.Restricted,
@@ -171,7 +171,7 @@ export default async function createRoom(opts: IOpts): Promise<string | null> {
} }
if (opts.joinRule !== JoinRule.Restricted) { if (opts.joinRule !== JoinRule.Restricted) {
opts.createOpts.initial_state.push({ createOpts.initial_state.push({
type: EventType.RoomJoinRules, type: EventType.RoomJoinRules,
content: { join_rule: opts.joinRule }, content: { join_rule: opts.joinRule },
}); });