diff options
| author | Matthew Hodgson <matthew@arasphere.net> | 2016-06-03 12:15:01 +0100 |
|---|---|---|
| committer | Matthew Hodgson <matthew@arasphere.net> | 2016-06-03 12:15:01 +0100 |
| commit | aa6fab0cc2c875f1a692c3dd83f62a7f81dbefd8 (patch) | |
| tree | 5034a5aba0c6e604683080357ae6481803a4dea1 /synapse | |
| parent | Merge branch 'erikj/cache_perf' of github.com:matrix-org/synapse into develop (diff) | |
| parent | Merge branch 'develop' into matthew/brand-from-header (diff) | |
| download | synapse-aa6fab0cc2c875f1a692c3dd83f62a7f81dbefd8.tar.xz | |
Merge pull request #822 from matrix-org/matthew/brand-from-header
brand the email from header
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/config/emailconfig.py | 2 | ||||
| -rw-r--r-- | synapse/push/mailer.py | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/synapse/config/emailconfig.py b/synapse/config/emailconfig.py index 90bdd08f00..a187161272 100644 --- a/synapse/config/emailconfig.py +++ b/synapse/config/emailconfig.py @@ -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 diff --git a/synapse/push/mailer.py b/synapse/push/mailer.py index c3431cdbf2..88402e42a6 100644 --- a/synapse/push/mailer.py +++ b/synapse/push/mailer.py @@ -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 == '': |