diff options
| author | Travis Ralston <travisr@matrix.org> | 2022-05-30 20:27:19 -0600 |
|---|---|---|
| committer | Travis Ralston <travisr@matrix.org> | 2022-05-30 20:29:40 -0600 |
| commit | bcfdfeb65df820ba460de5fb96a554f694de361b (patch) | |
| tree | c34b68772954200b38c5dbc6c2b95e5b2d06047e | |
| parent | Fix M_USER_ACCOUNT_SUSPENDED error code for spec compliance (#12922) (diff) | |
| download | synapse-bcfdfeb65df820ba460de5fb96a554f694de361b.tar.xz | |
Revert "Fix M_USER_ACCOUNT_SUSPENDED error code for spec compliance (#12922)"
This reverts commit e0fae823e9938618a260adadb82bfee6e4c2f907.
| -rw-r--r-- | changelog.d/12845.feature | 2 | ||||
| -rw-r--r-- | changelog.d/12922.feature | 1 | ||||
| -rw-r--r-- | synapse/api/errors.py | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/changelog.d/12845.feature b/changelog.d/12845.feature index 815a1f10ea..628fb16d08 100644 --- a/changelog.d/12845.feature +++ b/changelog.d/12845.feature @@ -1 +1 @@ -Support the new error code "ORG.MATRIX.MSC3823.USER_ACCOUNT_SUSPENDED" from [MSC3823](https://github.com/matrix-org/matrix-spec-proposals/pull/3823). \ No newline at end of file +Support the new error code "M_ORG_MATRIX_MSC3823_USER_ACCOUNT_SUSPENDED" from [MSC3823](https://github.com/matrix-org/matrix-spec-proposals/pull/3823). \ No newline at end of file diff --git a/changelog.d/12922.feature b/changelog.d/12922.feature deleted file mode 100644 index 815a1f10ea..0000000000 --- a/changelog.d/12922.feature +++ /dev/null @@ -1 +0,0 @@ -Support the new error code "ORG.MATRIX.MSC3823.USER_ACCOUNT_SUSPENDED" from [MSC3823](https://github.com/matrix-org/matrix-spec-proposals/pull/3823). \ No newline at end of file diff --git a/synapse/api/errors.py b/synapse/api/errors.py index cc7b785472..54268e0889 100644 --- a/synapse/api/errors.py +++ b/synapse/api/errors.py @@ -84,7 +84,7 @@ class Codes(str, Enum): # By opposition to `USER_DEACTIVATED`, this is a reversible measure # that can possibly be appealed and reverted. # Part of MSC3823. - USER_ACCOUNT_SUSPENDED = "ORG.MATRIX.MSC3823.USER_ACCOUNT_SUSPENDED" + USER_ACCOUNT_SUSPENDED = "M_ORG_MATRIX_MSC3823_USER_ACCOUNT_SUSPENDED" BAD_ALIAS = "M_BAD_ALIAS" # For restricted join rules. |