mirror of
https://git.anonymousland.org/anonymousland/synapse.git
synced 2024-09-07 09:11:56 +00:00
Correctly pass app_name to all email templates. (#7829)
We didn't do this for e.g. registration emails.
This commit is contained in:
parent
457096e6df
commit
f886a69916
1
changelog.d/7829.bugfix
Normal file
1
changelog.d/7829.bugfix
Normal file
@ -0,0 +1 @@
|
|||||||
|
Fix bug where we did not always pass in `app_name` or `server_name` to email templates, including e.g. for registration emails.
|
@ -269,7 +269,6 @@ class Mailer(object):
|
|||||||
user_id, app_id, email_address
|
user_id, app_id, email_address
|
||||||
),
|
),
|
||||||
"summary_text": summary_text,
|
"summary_text": summary_text,
|
||||||
"app_name": self.app_name,
|
|
||||||
"rooms": rooms,
|
"rooms": rooms,
|
||||||
"reason": reason,
|
"reason": reason,
|
||||||
}
|
}
|
||||||
@ -278,7 +277,7 @@ class Mailer(object):
|
|||||||
email_address, "[%s] %s" % (self.app_name, summary_text), template_vars
|
email_address, "[%s] %s" % (self.app_name, summary_text), template_vars
|
||||||
)
|
)
|
||||||
|
|
||||||
async def send_email(self, email_address, subject, template_vars):
|
async def send_email(self, email_address, subject, extra_template_vars):
|
||||||
"""Send an email with the given information and template text"""
|
"""Send an email with the given information and template text"""
|
||||||
try:
|
try:
|
||||||
from_string = self.hs.config.email_notif_from % {"app": self.app_name}
|
from_string = self.hs.config.email_notif_from % {"app": self.app_name}
|
||||||
@ -291,6 +290,13 @@ class Mailer(object):
|
|||||||
if raw_to == "":
|
if raw_to == "":
|
||||||
raise RuntimeError("Invalid 'to' address")
|
raise RuntimeError("Invalid 'to' address")
|
||||||
|
|
||||||
|
template_vars = {
|
||||||
|
"app_name": self.app_name,
|
||||||
|
"server_name": self.hs.config.server.server_name,
|
||||||
|
}
|
||||||
|
|
||||||
|
template_vars.update(extra_template_vars)
|
||||||
|
|
||||||
html_text = self.template_html.render(**template_vars)
|
html_text = self.template_html.render(**template_vars)
|
||||||
html_part = MIMEText(html_text, "html", "utf8")
|
html_part = MIMEText(html_text, "html", "utf8")
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user