diff --git a/synapse/handlers/account_validity.py b/synapse/handlers/account_validity.py
index 5b927f10b3..d752cf34f0 100644
--- a/synapse/handlers/account_validity.py
+++ b/synapse/handlers/account_validity.py
@@ -15,12 +15,9 @@
import email.mime.multipart
import email.utils
import logging
-from email.mime.multipart import MIMEMultipart
-from email.mime.text import MIMEText
from typing import TYPE_CHECKING, List, Optional, Tuple
from synapse.api.errors import StoreError, SynapseError
-from synapse.logging.context import make_deferred_yieldable
from synapse.metrics.background_process_metrics import wrap_as_background_process
from synapse.types import UserID
from synapse.util import stringutils
@@ -36,9 +33,11 @@ class AccountValidityHandler:
self.hs = hs
self.config = hs.config
self.store = self.hs.get_datastore()
- self.sendmail = self.hs.get_sendmail()
+ self.send_email_handler = self.hs.get_send_email_handler()
self.clock = self.hs.get_clock()
+ self._app_name = self.hs.config.email_app_name
+
self._account_validity_enabled = (
hs.config.account_validity.account_validity_enabled
)
@@ -63,23 +62,10 @@ class AccountValidityHandler:
self._template_text = (
hs.config.account_validity.account_validity_template_text
)
- account_validity_renew_email_subject = (
+ self._renew_email_subject = (
hs.config.account_validity.account_validity_renew_email_subject
)
- try:
- app_name = hs.config.email_app_name
-
- self._subject = account_validity_renew_email_subject % {"app": app_name}
-
- self._from_string = hs.config.email_notif_from % {"app": app_name}
- except Exception:
- # If substitution failed, fall back to the bare strings.
- self._subject = account_validity_renew_email_subject
- self._from_string = hs.config.email_notif_from
-
- self._raw_from = email.utils.parseaddr(self._from_string)[1]
-
# Check the renewal emails to send and send them every 30min.
if hs.config.run_background_tasks:
self.clock.looping_call(self._send_renewal_emails, 30 * 60 * 1000)
@@ -159,38 +145,17 @@ class AccountValidityHandler:
}
html_text = self._template_html.render(**template_vars)
- html_part = MIMEText(html_text, "html", "utf8")
-
plain_text = self._template_text.render(**template_vars)
- text_part = MIMEText(plain_text, "plain", "utf8")
for address in addresses:
raw_to = email.utils.parseaddr(address)[1]
- multipart_msg = MIMEMultipart("alternative")
- multipart_msg["Subject"] = self._subject
- multipart_msg["From"] = self._from_string
- multipart_msg["To"] = address
- multipart_msg["Date"] = email.utils.formatdate()
- multipart_msg["Message-ID"] = email.utils.make_msgid()
- multipart_msg.attach(text_part)
- multipart_msg.attach(html_part)
-
- logger.info("Sending renewal email to %s", address)
-
- await make_deferred_yieldable(
- self.sendmail(
- self.hs.config.email_smtp_host,
- self._raw_from,
- raw_to,
- multipart_msg.as_string().encode("utf8"),
- reactor=self.hs.get_reactor(),
- port=self.hs.config.email_smtp_port,
- requireAuthentication=self.hs.config.email_smtp_user is not None,
- username=self.hs.config.email_smtp_user,
- password=self.hs.config.email_smtp_pass,
- requireTransportSecurity=self.hs.config.require_transport_security,
- )
+ await self.send_email_handler.send_email(
+ email_address=raw_to,
+ subject=self._renew_email_subject,
+ app_name=self._app_name,
+ html=html_text,
+ text=plain_text,
)
await self.store.set_renewal_mail_status(user_id=user_id, email_sent=True)
|
