summary refs log tree commit diff
diff options
context:
space:
mode:
authorTravis Ralston <travisr@matrix.org>2022-05-30 20:27:19 -0600
committerGitHub <noreply@github.com>2022-05-31 02:27:19 +0000
commite0fae823e9938618a260adadb82bfee6e4c2f907 (patch)
treeea3bbd61b1b40f595fbb90edbed516774254e00c
parentDon't return `end` from `/messages` if there are no more events (#12903) (diff)
downloadsynapse-e0fae823e9938618a260adadb82bfee6e4c2f907.tar.xz
Fix M_USER_ACCOUNT_SUSPENDED error code for spec compliance (#12922)
`M_` is a reserved namespace.
-rw-r--r--changelog.d/12845.feature2
-rw-r--r--changelog.d/12922.feature1
-rw-r--r--synapse/api/errors.py2
3 files changed, 3 insertions, 2 deletions
diff --git a/changelog.d/12845.feature b/changelog.d/12845.feature
index 628fb16d08..815a1f10ea 100644
--- a/changelog.d/12845.feature
+++ b/changelog.d/12845.feature
@@ -1 +1 @@
-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
+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/changelog.d/12922.feature b/changelog.d/12922.feature
new file mode 100644
index 0000000000..815a1f10ea
--- /dev/null
+++ b/changelog.d/12922.feature
@@ -0,0 +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
diff --git a/synapse/api/errors.py b/synapse/api/errors.py
index 54268e0889..cc7b785472 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 = "M_ORG_MATRIX_MSC3823_USER_ACCOUNT_SUSPENDED"
+    USER_ACCOUNT_SUSPENDED = "ORG.MATRIX.MSC3823.USER_ACCOUNT_SUSPENDED"
 
     BAD_ALIAS = "M_BAD_ALIAS"
     # For restricted join rules.