Merge pull request #5495 from matrix-org/babolivier/deactivate_bg_job_typo dinsic_2019-06-19

Port "Fix typo in deactivation background job" to dinsic

2 files changed, 2 insertions, 1 deletions

diff --git a/changelog.d/5493.misc b/changelog.d/5493.misc
new file mode 100644

index 0000000000..365e49d634
--- /dev/null
+++ b/changelog.d/5493.misc
@@ -0,0 +1 @@
+Track deactivated accounts in the database.
diff --git a/synapse/storage/registration.py b/synapse/storage/registration.py

index d36917e4d6..0b3c656e90 100644
--- a/synapse/storage/registration.py
+++ b/synapse/storage/registration.py
@@ -662,7 +662,7 @@ class RegistrationStore(
 
             for user in rows:
                 if not user["count_tokens"] and not user["count_threepids"]:
-                    self.set_user_deactivated_status_txn(txn, user["user_id"], True)
+                    self.set_user_deactivated_status_txn(txn, user["name"], True)
                     rows_processed_nb += 1
 
             logger.info("Marked %d rows as deactivated", rows_processed_nb)