Skip to content

Conversation

@zecakeh
Copy link
Contributor

@zecakeh zecakeh commented Dec 19, 2025

As per MSC4323.

Pull Request Checklist

Preview: https://pr2278--matrix-spec-previews.netlify.app

As per MSC4323.

Signed-off-by: Kévin Commaille <[email protected]>
@zecakeh zecakeh requested a review from a team as a code owner December 19, 2025 11:49
Signed-off-by: Kévin Commaille <[email protected]>
Signed-off-by: Kévin Commaille <[email protected]>
Signed-off-by: Kévin Commaille <[email protected]>
Signed-off-by: Kévin Commaille <[email protected]>
Signed-off-by: Kévin Commaille <[email protected]>
Copy link
Member

@anoadragon453 anoadragon453 left a comment

Choose a reason for hiding this comment

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

LGTM overall, thanks for doing this!

Just some small things below, along with a clarification question.

@@ -0,0 +1 @@
Add endpoints to lock and suspend server-local users for administrations and add the `m.account_management` capability, as per [MSC4323](https://github.com/matrix-org/matrix-spec-proposals/pull/4323).
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
Add endpoints to lock and suspend server-local users for administrations and add the `m.account_management` capability, as per [MSC4323](https://github.com/matrix-org/matrix-spec-proposals/pull/4323).
Add administrator endpoints to lock and suspend server-local users and add the `m.account_management` capability, as per [MSC4323](https://github.com/matrix-org/matrix-spec-proposals/pull/4323).

for locking and unlocking accounts as a server implementation detail.
that can be reversed.

{{% added-in v="1.18" %}} To lock or unlock an account, the administrators
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
{{% added-in v="1.18" %}} To lock or unlock an account, the administrators
{{% added-in v="1.18" %}} To lock or unlock an account, administrators

without risk of the client losing state from a logout. Suspensions are reversible,
like locks and unlike deactivations.

{{% added-in v="1.18" %}} To suspend or unsuspend an account, the administrators
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
{{% added-in v="1.18" %}} To suspend or unsuspend an account, the administrators
{{% added-in v="1.18" %}} To suspend or unsuspend an account, administrators

Comment on lines +170 to +171
The requesting user is not a server administrator, or the target user is another
administrator. The errcode is `M_FORBIDDEN`.
Copy link
Member

Choose a reason for hiding this comment

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

@nexy7574 did you intend for server administrators to not be able to look up the suspend/lock status of another administrator?

I'll admit that this how MSC4323 is written, but I'm not sure what the justification for it would be.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants