brand the email from header

This commit is contained in:
Matthew Hodgson 2016-06-02 21:34:40 +01:00
parent 2675c1e40e
commit 79d1f072f4
2 changed files with 9 additions and 2 deletions

View file

@ -97,7 +97,14 @@ class Mailer(object):
@defer.inlineCallbacks
def send_notification_mail(self, 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 == '':