summary refs log tree commit diff
path: root/synapse/storage/_base.py
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2019-06-07 15:30:54 +0100
committerBrendan Abolivier <babolivier@matrix.org>2019-06-14 15:05:56 +0100
commit6d56a694f4cbfaf9c57a56837d4170e6c6783f3c (patch)
treee46a7f7e08ce8d547e9d0a1fefb65a66fe2d3398 /synapse/storage/_base.py
parentTrack deactivated accounts in the database (#5378) (diff)
downloadsynapse-6d56a694f4cbfaf9c57a56837d4170e6c6783f3c.tar.xz
Don't send renewal emails to deactivated users
Diffstat (limited to 'synapse/storage/_base.py')
-rw-r--r--synapse/storage/_base.py4
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, [])