Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Specify account suspension #2014

Merged
merged 4 commits into from
Dec 12, 2024
Merged
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
Apply suggestions from code review
Co-authored-by: Richard van der Hoff <[email protected]>
  • Loading branch information
turt2live and richvdh authored Dec 11, 2024

Unverified

This user has not yet uploaded their public signing key.
commit 0c3569651d46ae52e75ad268e93f1dc30ac18fe8
6 changes: 3 additions & 3 deletions content/client-server-api/_index.md
Original file line number Diff line number Diff line change
@@ -1493,8 +1493,8 @@ To enable users to appeal to a lock clients MAY use

{{% added-in v="1.13" %}}

Similar to [locking](#account-locking), a user's account MAY be suspended to
prevent further activity from that account. A similar effect is achieved, though
Server administrators MAY suspend a user's account to prevent further activity
from that account. The effect is similar to [locking](#account-locking), though
without risk of the client losing state from a logout. Suspensions are reversible,
like locks and unlike deactivations.

@@ -1509,7 +1509,7 @@ following, however:
[cross-signing data](#cross-signing).
* [Populate their key backup](#server-side-key-backups).
* Leave rooms and reject invites.
* Redacting their own events.
* Redact their own events.
* Log out or delete any device of theirs, including the current session.
* Deactivate their account, potentially with a time delay to discourage making
a new account right away.
Loading