requested changes

element-hq · Apr 29, 2024 · 6e7b8af · 6e7b8af
1 parent d7ab4b1
commit 6e7b8af
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/changelog.d/17051.feature b/changelog.d/17051.feature
@@ -1 +1 @@
-Add preliminary support for MSC3823 - Account Suspension.
+Add preliminary support for [MSC3823](https://github.com/matrix-org/matrix-spec-proposals/pull/3823) - Account Suspension.
diff --git a/synapse/storage/databases/main/registration.py b/synapse/storage/databases/main/registration.py
@@ -237,7 +237,7 @@ def get_user_by_id_txn(txn: LoggingTransaction) -> Optional[UserInfo]:
                     deactivated, COALESCE(shadow_banned, FALSE) AS shadow_banned,
                     COALESCE(approved, TRUE) AS approved,
                     COALESCE(locked, FALSE) AS locked,
-                    COALESCE(suspended, FALSE) AS suspended
+                    suspended
                 FROM users
                 WHERE name = ?
                 """,
@@ -1190,7 +1190,8 @@ async def get_user_suspended_status(self, user_id: str) -> bool:
             Args:
                 user_id: The user ID of the user in question
             Returns:
-                True if the user's account is suspended, false if not.
+                True if the user's account is suspended, false if it is not suspended or
+                if the user ID cannot be found.
         """
 
         res = await self.db_pool.simple_select_one_onecol(
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		Add preliminary support for MSC3823 - Account Suspension.
		Add preliminary support for [MSC3823](https://github.com/matrix-org/matrix-spec-proposals/pull/3823) - Account Suspension.