Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-02 15:16:04 -04:00
Code Issues Projects Releases Packages Wiki Activity

Send mail notifs with a plaintext part too

Browse source
This commit is contained in:
David Baker 2016-04-29 13:56:21 +01:00
parent b2c04da8dc
commit 40d40e470d
5 changed files with 50 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

27
synapse/push/mailer.py
View file

@ -19,6 +19,7 @@ from twisted.mail.smtp import sendmail
import email.utils
import email.mime.multipart
from email.mime.text import MIMEText
from email.mime.multipart import MIMEMultipart
from synapse.util.async import concurrently_execute
from synapse.util.presentable_names import (
@ -74,7 +75,12 @@ class Mailer(object):
env = jinja2.Environment(loader=loader)
env.filters["format_ts"] = format_ts_filter
env.filters["mxc_to_http"] = self.mxc_to_http_filter
self.notif_template = env.get_template(self.hs.config.email_notif_template_html)
self.notif_template_html = env.get_template(
self.hs.config.email_notif_template_html
)
self.notif_template_text = env.get_template(
self.hs.config.email_notif_template_text
)
@defer.inlineCallbacks
def send_notification_mail(self, user_id, email_address, push_actions):
@ -135,16 +141,23 @@ class Mailer(object):
"rooms": rooms,
}
plainText = self.notif_template.render(**template_vars)
html_text = self.notif_template_html.render(**template_vars)
html_part = MIMEText(html_text, "html", "utf8")
plain_text = self.notif_template_text.render(**template_vars)
text_part = MIMEText(plain_text, "plain", "utf8")
multipart_msg = MIMEMultipart('alternative')
multipart_msg['Subject'] = "New Matrix Notifications"
multipart_msg['From'] = self.hs.config.email_notif_from
multipart_msg['To'] = email_address
multipart_msg.attach(text_part)
multipart_msg.attach(html_part)
text_part = MIMEText(plainText, "html", "utf8")
text_part['Subject'] = "New Matrix Notifications"
text_part['From'] = self.hs.config.email_notif_from
text_part['To'] = email_address
yield sendmail(
self.hs.config.email_smtp_host,
raw_from, raw_to, text_part.as_string(),
raw_from, raw_to, multipart_msg.as_string(),
port=self.hs.config.email_smtp_port
)