mirror of
https://mau.dev/maunium/synapse.git
synced 2024-12-15 13:13:54 +01:00
Merge pull request #822 from matrix-org/matthew/brand-from-header
brand the email from header
This commit is contained in:
commit
aa6fab0cc2
2 changed files with 9 additions and 2 deletions
|
@ -89,7 +89,7 @@ class EmailConfig(Config):
|
|||
# enable_notifs: false
|
||||
# smtp_host: "localhost"
|
||||
# smtp_port: 25
|
||||
# notif_from: Your Friendly Matrix Home Server <noreply@example.com>
|
||||
# notif_from: "Your Friendly %(app)s Home Server <noreply@example.com>"
|
||||
# app_name: Matrix
|
||||
# template_dir: res/templates
|
||||
# notif_template_html: notif_mail.html
|
||||
|
|
|
@ -99,7 +99,14 @@ class Mailer(object):
|
|||
@defer.inlineCallbacks
|
||||
def send_notification_mail(self, app_id, user_id, email_address,
|
||||
push_actions, reason):
|
||||
raw_from = email.utils.parseaddr(self.hs.config.email_notif_from)[1]
|
||||
try:
|
||||
from_string = self.hs.config.email_notif_from % {
|
||||
"app": self.app_name
|
||||
}
|
||||
except TypeError:
|
||||
from_string = self.hs.config.email_notif_from
|
||||
|
||||
raw_from = email.utils.parseaddr(from_string)[1]
|
||||
raw_to = email.utils.parseaddr(email_address)[1]
|
||||
|
||||
if raw_to == '':
|
||||
|
|
Loading…
Reference in a new issue