Merge pull request #5465 from matrix-org/babolivier/fix_deactivation_…

…bg_job Fix background job for deactivated flag
matrix-org · Jun 14, 2019 · 14db086 · 14db086
2 parents 9b14a81 + 5cec6d1
commit 14db086
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/changelog.d/5465.misc b/changelog.d/5465.misc
@@ -0,0 +1,2 @@
+Track deactivated accounts in the database.
+
diff --git a/synapse/storage/registration.py b/synapse/storage/registration.py
@@ -642,7 +642,9 @@ def _backgroud_update_set_deactivated_flag_txn(txn):
                 FROM users
                     LEFT JOIN access_tokens ON (access_tokens.user_id = users.name)
                     LEFT JOIN user_threepids ON (user_threepids.user_id = users.name)
-                WHERE password_hash IS NULL OR password_hash = ''
+                WHERE (users.password_hash IS NULL OR users.password_hash = '')
+                AND (users.appservice_id IS NULL OR users.appservice_id = '')
+                AND users.is_guest = 0
                 AND users.name > ?
                 GROUP BY users.name
                 ORDER BY users.name ASC
@@ -666,7 +668,7 @@ def _backgroud_update_set_deactivated_flag_txn(txn):
             logger.info("Marked %d rows as deactivated", rows_processed_nb)
 
             self._background_update_progress_txn(
-                txn, "users_set_deactivated_flag", {"user_id": rows[-1]["user_id"]}
+                txn, "users_set_deactivated_flag", {"user_id": rows[-1]["name"]}
             )
 
             if batch_size > len(rows):