summary refs log tree commit diff
path: root/synapse/storage
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2020-01-08 13:27:17 +0000
committerRichard van der Hoff <richard@matrix.org>2020-01-08 13:27:17 +0000
commitb064a41291f2aaa4c99fc22ee3d81385a4137e9a (patch)
tree7af39994034ae1914cb8adffb27fa6a8a392e809 /synapse/storage
parentMerge pull request #6624 from matrix-org/babolivier/retention_doc (diff)
parentFix GET request on /_synapse/admin/v2/users endpoint (#6563) (diff)
downloadsynapse-b064a41291f2aaa4c99fc22ee3d81385a4137e9a.tar.xz
Merge remote-tracking branch 'origin/release-v1.8.0' into develop
Diffstat (limited to 'synapse/storage')
-rw-r--r--synapse/storage/data_stores/main/__init__.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/storage/data_stores/main/__init__.py b/synapse/storage/data_stores/main/__init__.py
index c577c0df5f..2700cca822 100644
--- a/synapse/storage/data_stores/main/__init__.py
+++ b/synapse/storage/data_stores/main/__init__.py
@@ -526,9 +526,9 @@ class DataStore(
 
         attr_filter = {}
         if not guests:
-            attr_filter["is_guest"] = False
+            attr_filter["is_guest"] = 0
         if not deactivated:
-            attr_filter["deactivated"] = False
+            attr_filter["deactivated"] = 0
 
         return self.db.simple_select_list_paginate(
             desc="get_users_paginate",