diff options
| author | Brendan Abolivier <babolivier@matrix.org> | 2019-06-14 18:12:56 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-14 18:12:56 +0100 |
| commit | 14db0864288298df7b86c56a67b007808236d2db (patch) | |
| tree | eec64991c8324b81a4fdf02435863ef0f5865890 | |
| parent | Merge pull request #5462 from matrix-org/babolivier/account_validity_deactiva... (diff) | |
| parent | Fix changelog (diff) | |
| download | synapse-14db0864288298df7b86c56a67b007808236d2db.tar.xz | |
Merge pull request #5465 from matrix-org/babolivier/fix_deactivation_bg_job
Fix background job for deactivated flag
| -rw-r--r-- | changelog.d/5465.misc | 2 | ||||
| -rw-r--r-- | synapse/storage/registration.py | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/changelog.d/5465.misc b/changelog.d/5465.misc new file mode 100644 index 0000000000..af5f0f8f45 --- /dev/null +++ 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 index 9f910eac9c..d36917e4d6 100644 --- a/synapse/storage/registration.py +++ b/synapse/storage/registration.py @@ -642,7 +642,9 @@ class RegistrationStore( 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 @@ class RegistrationStore( 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): |