diff options
| author | Brendan Abolivier <babolivier@matrix.org> | 2019-06-14 15:35:31 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-14 15:35:31 +0100 |
| commit | 9b14a810d2da78708342fffd0e831c198ec26e90 (patch) | |
| tree | fbf8270b042161740604c4c2642fc3b03a5947b7 /synapse/storage/_base.py | |
| parent | Merge pull request #5460 from matrix-org/joriks/demo_python3 (diff) | |
| parent | Don't send renewal emails to deactivated users (diff) | |
| download | synapse-9b14a810d2da78708342fffd0e831c198ec26e90.tar.xz | |
Merge pull request #5462 from matrix-org/babolivier/account_validity_deactivated_accounts_2
Don't send renewal emails to deactivated users (second attempt)
Diffstat (limited to 'synapse/storage/_base.py')
| -rw-r--r-- | synapse/storage/_base.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/storage/_base.py b/synapse/storage/_base.py index ae891aa332..941c07fce5 100644 --- a/synapse/storage/_base.py +++ b/synapse/storage/_base.py @@ -299,12 +299,12 @@ class SQLBaseStore(object): def select_users_with_no_expiration_date_txn(txn): """Retrieves the list of registered users with no expiration date from the - database. + database, filtering out deactivated users. """ sql = ( "SELECT users.name FROM users" " LEFT JOIN account_validity ON (users.name = account_validity.user_id)" - " WHERE account_validity.user_id is NULL;" + " WHERE account_validity.user_id is NULL AND users.deactivated = 0;" ) txn.execute(sql, []) |