1 files changed, 6 insertions, 3 deletions
diff --git a/synapse/storage/databases/main/__init__.py b/synapse/storage/databases/main/__init__.py
index 394985d87f..bf779587d9 100644
--- a/synapse/storage/databases/main/__init__.py
+++ b/synapse/storage/databases/main/__init__.py
@@ -176,7 +176,7 @@ class DataStore(
user_id: Optional[str] = None,
name: Optional[str] = None,
guests: bool = True,
- deactivated: bool = False,
+ deactivated: Optional[bool] = None,
admins: Optional[bool] = None,
order_by: str = UserSortOrder.NAME.value,
direction: Direction = Direction.FORWARDS,
@@ -232,8 +232,11 @@ class DataStore(
if not guests:
filters.append("is_guest = 0")
- if not deactivated:
- filters.append("deactivated = 0")
+ if deactivated is not None:
+ if deactivated:
+ filters.append("deactivated = 1")
+ else:
+ filters.append("deactivated = 0")
if not locked:
filters.append("locked IS FALSE")
|
