summary refs log tree commit diff
path: root/synapse/handlers/account_validity.py
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2019-06-14 15:35:31 +0100
committerGitHub <noreply@github.com>2019-06-14 15:35:31 +0100
commit9b14a810d2da78708342fffd0e831c198ec26e90 (patch)
treefbf8270b042161740604c4c2642fc3b03a5947b7 /synapse/handlers/account_validity.py
parentMerge pull request #5460 from matrix-org/joriks/demo_python3 (diff)
parentDon't send renewal emails to deactivated users (diff)
downloadsynapse-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/handlers/account_validity.py')
-rw-r--r--synapse/handlers/account_validity.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/synapse/handlers/account_validity.py b/synapse/handlers/account_validity.py
index 261446517d..5e0b92eb1c 100644
--- a/synapse/handlers/account_validity.py
+++ b/synapse/handlers/account_validity.py
@@ -110,6 +110,9 @@ class AccountValidityHandler(object):
         # Stop right here if the user doesn't have at least one email address.
         # In this case, they will have to ask their server admin to renew their
         # account manually.
+        # We don't need to do a specific check to make sure the account isn't
+        # deactivated, as a deactivated account isn't supposed to have any
+        # email address attached to it.
         if not addresses:
             return