sorb/ThreadNet-Web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

Add stable support for MSC4380 invite blocking (#31966)

Browse Source 
* Add stable support for MSC4380 invite blocking

MSC4380 has completed FCP, so we can add stable support for it.

* Set account data to empty value when allowing invites

... because that's what the spec says

* Use identifiers from js-sdk
This commit is contained in:
Richard van der Hoff
2026-02-26 11:41:04 +00:00
committed by GitHub
parent 7ddd645f4d
commit 18c1b37206
4 changed files with 19 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/web/src/settings/controllers/BlockInvitesConfigController.ts
+12 -5
View File
@@ -5,8 +5,9 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com
Please see LICENSE files in the repository root for full details.
*/
import { EventType } from "matrix-js-sdk/src/matrix";
import { type SettingLevel } from "../SettingLevel.ts";
import { MSC4380_INVITE_RULES_ACCOUNT_DATA_TYPE } from "../../@types/invite-rules.ts";
import { _td } from "../../languageHandler.tsx";
import ServerSupportUnstableFeatureController from "./ServerSupportUnstableFeatureController.ts";
import { defaultWatchManager, type SettingKey } from "../Settings.tsx";
@@ -17,11 +18,17 @@ import { defaultWatchManager, type SettingKey } from "../Settings.tsx";
*/
export default class BlockInvitesConfigController extends ServerSupportUnstableFeatureController {
public constructor(settingName: SettingKey) {
super(settingName, defaultWatchManager, [["org.matrix.msc4380"]], undefined, _td("settings|not_supported"));
super(
settingName,
defaultWatchManager,
[["org.matrix.msc4380.stable"]],
"v1.18",
_td("settings|not_supported"),
);
}
public getValueOverride(_level: SettingLevel): boolean {
const accountData = this.client?.getAccountData(MSC4380_INVITE_RULES_ACCOUNT_DATA_TYPE)?.getContent();
const accountData = this.client?.getAccountData(EventType.InvitePermissionConfig)?.getContent();
return accountData?.default_action == "block";
}
@@ -29,8 +36,8 @@ export default class BlockInvitesConfigController extends ServerSupportUnstableF
if (!this.client) {
return false;
}
const newDefault = newValue ? "block" : "allow";
await this.client.setAccountData(MSC4380_INVITE_RULES_ACCOUNT_DATA_TYPE, { default_action: newDefault });
await this.client.setAccountData(EventType.InvitePermissionConfig, newValue ? { default_action: "block" } : {});
return true;
}
}