Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
a1d72ea
Add settings for MSC4155
Half-Shot Mar 27, 2025
794695a
copyright
Half-Shot Mar 27, 2025
d213a22
Tweak to not use js-sdk
Half-Shot Mar 27, 2025
c0b881e
Merge remote-tracking branch 'origin/develop' into hs/invite-filterin…
Half-Shot May 29, 2025
acafd03
Update for latest MSC
Half-Shot May 29, 2025
287b8b6
Merge remote-tracking branch 'origin/develop' into hs/invite-filterin…
Half-Shot Jun 2, 2025
44a5fca
Various tidyups
Half-Shot Jun 2, 2025
ff7551a
Move tab
Half-Shot Jun 2, 2025
05066d5
i18n
Half-Shot Jun 2, 2025
d67bdac
update .snap
Half-Shot Jun 2, 2025
caa29f3
mvvm
Half-Shot Jun 2, 2025
0297a40
lint
Half-Shot Jun 2, 2025
1d9d17c
add header
Half-Shot Jun 3, 2025
5a86c7c
Merge remote-tracking branch 'origin/develop' into hs/invite-filterin…
Half-Shot Jun 3, 2025
004fc1a
Remove capability check
Half-Shot Jun 6, 2025
86d81e1
fix
Half-Shot Jun 6, 2025
f5c3d3d
Rewrite to use Settings
Half-Shot Jun 9, 2025
f29c03d
lint
Half-Shot Jun 9, 2025
f26ddaa
Merge remote-tracking branch 'origin/develop' into hs/invite-filterin…
Half-Shot Jun 9, 2025
d614893
lint
Half-Shot Jun 9, 2025
134c7fc
fix test
Half-Shot Jun 9, 2025
fcb1e30
Tweaks
Half-Shot Jun 9, 2025
c01ca6c
lint
Half-Shot Jun 9, 2025
2e895ee
Merge branch 'develop' into hs/invite-filtering-settings
Half-Shot Jun 9, 2025
e805aae
revert copyright
Half-Shot Jun 9, 2025
79ba365
update screenshot
Half-Shot Jun 9, 2025
793fe53
cleanup
Half-Shot Jun 10, 2025
30e2475
Merge branch 'develop' into hs/invite-filtering-settings
Half-Shot Jun 10, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
29 changes: 29 additions & 0 deletions src/@types/invite-rules.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
/*
Copyright 2025 New Vector Ltd.

SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
Please see LICENSE files in the repository root for full details.
*/

export const INVITE_RULES_ACCOUNT_DATA_TYPE = "org.matrix.msc4155.invite_permission_config";

export interface InviteConfigAccountData {
allowed_users?: string[];
blocked_users?: string[];
ignored_users?: string[];
allowed_servers?: string[];
blocked_servers?: string[];
ignored_servers?: string[];
}

/**
* Computed values based on MSC4155. Currently Element Web only supports
* blocking all invites.
*/
export interface ComputedInviteConfig extends Record<string, unknown> {
/**
* Are all invites blocked. This is only about blocking all invites,
* but this being false may still block invites through other rules.
*/
allBlocked: boolean;
}
4 changes: 3 additions & 1 deletion src/@types/matrix-js-sdk.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import type { EmptyObject } from "matrix-js-sdk/src/matrix";
import type { DeviceClientInformation } from "../utils/device/types.ts";
import type { UserWidget } from "../utils/WidgetUtils-types.ts";
import { type MediaPreviewConfig } from "./media_preview.ts";
import { type INVITE_RULES_ACCOUNT_DATA_TYPE, type InviteConfigAccountData } from "./invite-rules.ts";

// Extend Matrix JS SDK types via Typescript declaration merging to support unspecced event fields and types
declare module "matrix-js-sdk/src/types" {
Expand Down Expand Up @@ -60,7 +61,6 @@ declare module "matrix-js-sdk/src/types" {
};
};
}

export interface AccountDataEvents {
// Analytics account data event
"im.vector.analytics": {
Expand Down Expand Up @@ -89,6 +89,8 @@ declare module "matrix-js-sdk/src/types" {
accepted: string[];
};

// MSC4155: Invite filtering
[INVITE_RULES_ACCOUNT_DATA_TYPE]: InviteConfigAccountData;
"io.element.msc4278.media_preview_config": MediaPreviewConfig;
}

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
/*
Copyright 2025 New Vector Ltd.

SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
Please see LICENSE files in the repository root for full details.
*/

import React, { type FC, useCallback, useState } from "react";
import { Root } from "@vector-im/compound-web";
import { logger } from "matrix-js-sdk/src/logger";

import { _t } from "../../../../../languageHandler";
import { useSettingValue } from "../../../../../hooks/useSettings";
import SettingsStore from "../../../../../settings/SettingsStore";
import { SettingLevel } from "../../../../../settings/SettingLevel";
import LabelledToggleSwitch from "../../../elements/LabelledToggleSwitch";

export const InviteRulesAccountSetting: FC = () => {
const rules = useSettingValue("inviteRules");
const settingsDisabled = SettingsStore.disabledMessage("inviteRules");
const [busy, setBusy] = useState(false);

const onChange = useCallback(async (checked: boolean) => {
try {
setBusy(true);
await SettingsStore.setValue("inviteRules", null, SettingLevel.ACCOUNT, {
allBlocked: !checked,
});
} catch (ex) {
logger.error(`Unable to set invite rules`, ex);
} finally {
setBusy(false);
}
}, []);
return (
<Root className="mx_MediaPreviewAccountSetting_Form">
<LabelledToggleSwitch
className="mx_MediaPreviewAccountSetting_ToggleSwitch"
label={_t("settings|invite_controls|default_label")}
value={!rules.allBlocked}
onChange={onChange}
tooltip={settingsDisabled}
disabled={!!settingsDisabled || busy}
/>
</Root>
);
};
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ import LabelledToggleSwitch from "../../../elements/LabelledToggleSwitch";
import * as TimezoneHandler from "../../../../../TimezoneHandler";
import { type BooleanSettingKey } from "../../../../../settings/Settings.tsx";
import { MediaPreviewAccountSettings } from "./MediaPreviewAccountSettings.tsx";
import { InviteRulesAccountSetting } from "./InviteRulesAccountSettings.tsx";

interface IProps {
closeSettingsFn(success: boolean): void;
Expand Down Expand Up @@ -339,6 +340,7 @@ export default class PreferencesUserSettingsTab extends React.Component<IProps,

<SettingsSubsection heading={_t("common|moderation_and_safety")} legacy={false}>
<MediaPreviewAccountSettings />
<InviteRulesAccountSetting />
Copy link
Member Author

@Half-Shot Half-Shot Jun 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was explicitly asked to be part of the M&S section by product.

</SettingsSubsection>

<SettingsSubsection heading={_t("settings|preferences|room_directory_heading")}>
Expand Down
4 changes: 4 additions & 0 deletions src/i18n/strings/en_EN.json
Original file line number Diff line number Diff line change
Expand Up @@ -2686,6 +2686,9 @@
"inline_url_previews_room": "Enable URL previews by default for participants in this room",
"inline_url_previews_room_account": "Enable URL previews for this room (only affects you)",
"insert_trailing_colon_mentions": "Insert a trailing colon after user mentions at the start of a message",
"invite_controls": {
"default_label": "Allow users to invite you to rooms"
},
"jump_to_bottom_on_send": "Jump to the bottom of the timeline when you send a message",
"key_backup": {
"backup_in_progress": "Your keys are being backed up (the first backup could take a few minutes).",
Expand Down Expand Up @@ -2752,6 +2755,7 @@
"show_in_private": "In private rooms",
"show_media": "Always show"
},
"not_supported": "Your server does not implement this feature.",
"notifications": {
"default_setting_description": "This setting will be applied by default to all your rooms.",
"default_setting_section": "I want to be notified for (Default Setting)",
Expand Down
8 changes: 8 additions & 0 deletions src/settings/Settings.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ import { type RecentEmojiData } from "../emojipicker/recent.ts";
import { type Assignable } from "../@types/common.ts";
import { SortingAlgorithm } from "../stores/room-list-v3/skip-list/sorters/index.ts";
import MediaPreviewConfigController from "./controllers/MediaPreviewConfigController.ts";
import InviteRulesConfigController from "./controllers/InviteRulesConfigController.ts";
import { type ComputedInviteConfig } from "../@types/invite-rules.ts";

export const defaultWatchManager = new WatchManager();

Expand Down Expand Up @@ -351,6 +353,7 @@ export interface Settings {
"Electron.enableHardwareAcceleration": IBaseSetting<boolean>;
"Electron.enableContentProtection": IBaseSetting<boolean>;
"mediaPreviewConfig": IBaseSetting<MediaPreviewConfig>;
"inviteRules": IBaseSetting<ComputedInviteConfig>;
"Developer.elementCallUrl": IBaseSetting<string>;
}

Expand Down Expand Up @@ -434,6 +437,11 @@ export const SETTINGS: Settings = {
supportedLevels: LEVELS_ROOM_SETTINGS,
default: MediaPreviewConfigController.default,
},
"inviteRules": {
controller: new InviteRulesConfigController(),
supportedLevels: [SettingLevel.ACCOUNT],
default: InviteRulesConfigController.default,
},
"feature_report_to_moderators": {
isFeature: true,
labsGroup: LabGroup.Moderation,
Expand Down
88 changes: 88 additions & 0 deletions src/settings/controllers/InviteRulesConfigController.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
/*
Copyright 2025 New Vector Ltd.

SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
Please see LICENSE files in the repository root for full details.
*/

import { type MatrixClient, type IContent } from "matrix-js-sdk/src/matrix";

import { type SettingLevel } from "../SettingLevel.ts";
import MatrixClientBackedController from "./MatrixClientBackedController.ts";
import {
type ComputedInviteConfig as ComputedInviteRules,
INVITE_RULES_ACCOUNT_DATA_TYPE,
type InviteConfigAccountData,
} from "../../@types/invite-rules.ts";
import { _t } from "../../languageHandler.tsx";

/**
* Handles invite filtering rules provided by MSC4155.
* This handler does not make use of the roomId parameter.
*/
export default class InviteRulesConfigController extends MatrixClientBackedController {
public static readonly default: ComputedInviteRules = {
allBlocked: false,
};

private static getValidSettingData(content: IContent): ComputedInviteRules {
const expectedConfig = content as InviteConfigAccountData;
return {
allBlocked: !!expectedConfig.blocked_users?.includes("*"),
};
}

public initMatrixClient(newClient: MatrixClient): void {
newClient.doesServerSupportUnstableFeature("org.matrix.msc4155").then((result) => {
this.featureSupported = result;
});
}

public featureSupported?: boolean;

public constructor() {
super();
this.featureSupported = false;
}

private getValue = (): ComputedInviteRules => {
const accountData =
this.client?.getAccountData(INVITE_RULES_ACCOUNT_DATA_TYPE)?.getContent<InviteConfigAccountData>() ?? {};
return InviteRulesConfigController.getValidSettingData(accountData);
};

public getValueOverride(_level: SettingLevel): ComputedInviteRules {
return this.getValue();
}

public get settingDisabled(): true | string {
return this.featureSupported ? true : _t("settings|not_supported");
}

public async beforeChange(
_level: SettingLevel,
_roomId: string | null,
newValue: ComputedInviteRules,
): Promise<boolean> {
if (!this.client) {
return false;
}
const existingContent = this.client
.getAccountData(INVITE_RULES_ACCOUNT_DATA_TYPE)
?.getContent<InviteConfigAccountData>();
const newContent: InviteConfigAccountData = {
...existingContent,
blocked_users: [...(existingContent?.blocked_users ?? [])],
};
if (newValue.allBlocked && !newContent.blocked_users!.includes("*")) {
newContent.blocked_users!.push("*");
} else if (!newValue.allBlocked && newContent.blocked_users?.includes("*")) {
newContent.blocked_users = newContent.blocked_users.filter((u) => u !== "*");
} else {
// No changes required.
return false;
}
await this.client.setAccountData(INVITE_RULES_ACCOUNT_DATA_TYPE, newContent);
return true;
}
}
3 changes: 3 additions & 0 deletions src/settings/handlers/AccountSettingsHandler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,9 @@ export default class AccountSettingsHandler extends MatrixClientBackedSettingsHa
case "mediaPreviewConfig":
// Handled in MediaPreviewConfigController.
return;
case "inviteRules":
// Handled in InviteRulesConfigController.
return;
default:
return this.setAccountData(DEFAULT_SETTINGS_EVENT_TYPE, settingName, newValue);
}
Expand Down
3 changes: 3 additions & 0 deletions src/settings/handlers/RoomAccountSettingsHandler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,9 @@ export default class RoomAccountSettingsHandler extends MatrixClientBackedSettin
case "mediaPreviewConfig":
// Handled in MediaPreviewConfigController.
return;
case "inviteRules":
// Handled in InviteRulesConfigController.
return;
default:
return this.setRoomAccountData(roomId, DEFAULT_SETTINGS_EVENT_TYPE, settingName, newValue);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ describe("<MatrixChat />", () => {
setGuest: jest.fn(),
setNotifTimelineSet: jest.fn(),
getAccountData: jest.fn(),
doesServerSupportUnstableFeature: jest.fn(),
doesServerSupportUnstableFeature: jest.fn().mockResolvedValue(false),
getDevices: jest.fn().mockResolvedValue({ devices: [] }),
getProfileInfo: jest.fn().mockResolvedValue({
displayname: "Ernie",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
/*
Copyright 2025 New Vector Ltd.

SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
Please see LICENSE files in the repository root for full details.
*/
import React from "react";
import { render } from "jest-matrix-react";
import userEvent from "@testing-library/user-event";

import { InviteRulesAccountSetting } from "../../../../../../../src/components/views/settings/tabs/user/InviteRulesAccountSettings";
import SettingsStore from "../../../../../../../src/settings/SettingsStore";
import { type ComputedInviteConfig } from "../../../../../../../src/@types/invite-rules";
import { SettingLevel } from "../../../../../../../src/settings/SettingLevel";

function mockSetting(mediaPreviews: ComputedInviteConfig, supported = true) {
jest.spyOn(SettingsStore, "getValue").mockImplementation((settingName) => {
if (settingName === "inviteRules") {
return mediaPreviews;
}
throw Error(`Unexpected setting ${settingName}`);
});
jest.spyOn(SettingsStore, "disabledMessage").mockImplementation((settingName) => {
if (settingName === "inviteRules") {
return supported ? undefined : "test-not-supported";
}
throw Error(`Unexpected setting ${settingName}`);
});
}

describe("InviteRulesAccountSetting", () => {
afterEach(() => {
jest.restoreAllMocks();
});

it("does not render if not supported", async () => {
mockSetting({ allBlocked: false }, false);
const { findByText, findByLabelText } = render(<InviteRulesAccountSetting />);
const input = await findByLabelText("Allow users to invite you to rooms");
await userEvent.hover(input);
const result = await findByText("test-not-supported");
expect(result).toBeInTheDocument();
});
it("renders correct state when invites are not blocked", async () => {
mockSetting({ allBlocked: false }, true);
const { findByLabelText } = render(<InviteRulesAccountSetting />);
const result = await findByLabelText("Allow users to invite you to rooms");
expect(result).toBeChecked();
});
it("renders correct state when invites are blocked", async () => {
mockSetting({ allBlocked: true }, true);
const { findByLabelText } = render(<InviteRulesAccountSetting />);
const result = await findByLabelText("Allow users to invite you to rooms");
expect(result).not.toBeChecked();
});
it("handles disabling all invites", async () => {
mockSetting({ allBlocked: false }, true);
jest.spyOn(SettingsStore, "setValue").mockImplementation();
const { findByLabelText } = render(<InviteRulesAccountSetting />);
const result = await findByLabelText("Allow users to invite you to rooms");
await userEvent.click(result);
expect(SettingsStore.setValue).toHaveBeenCalledWith("inviteRules", null, SettingLevel.ACCOUNT, {
allBlocked: true,
});
});
it("handles enabling all invites", async () => {
mockSetting({ allBlocked: true }, true);
jest.spyOn(SettingsStore, "setValue").mockImplementation();
const { findByLabelText } = render(<InviteRulesAccountSetting />);
const result = await findByLabelText("Allow users to invite you to rooms");
await userEvent.click(result);
expect(SettingsStore.setValue).toHaveBeenCalledWith("inviteRules", null, SettingLevel.ACCOUNT, {
allBlocked: false,
});
});
});
Original file line number Diff line number Diff line change
Expand Up @@ -1297,6 +1297,36 @@ exports[`PreferencesUserSettingsTab should render 1`] = `
</div>
</div>
</form>
<form
class="_root_19upo_16 mx_MediaPreviewAccountSetting_Form"
>
<div
class="mx_SettingsFlag mx_MediaPreviewAccountSetting_ToggleSwitch"
>
<span
class="mx_SettingsFlag_label"
>
<div
id="mx_LabelledToggleSwitch_«re»"
>
Allow users to invite you to rooms
</div>
</span>
<div
aria-checked="true"
aria-disabled="true"
aria-label="Your server does not implement this feature."
aria-labelledby="mx_LabelledToggleSwitch_«re»"
class="mx_AccessibleButton mx_ToggleSwitch mx_ToggleSwitch_on"
role="switch"
tabindex="0"
>
<div
class="mx_ToggleSwitch_ball"
/>
</div>
</div>
</form>
</div>
<div
class="_separator_7ckbw_8"
Expand Down
Loading
Loading