From e0fae823e9938618a260adadb82bfee6e4c2f907 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Mon, 30 May 2022 20:27:19 -0600 Subject: Fix M_USER_ACCOUNT_SUSPENDED error code for spec compliance (#12922) `M_` is a reserved namespace. --- changelog.d/12845.feature | 2 +- changelog.d/12922.feature | 1 + synapse/api/errors.py | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 changelog.d/12922.feature 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. -- cgit 1.4.1