diff options
| author | Mark Haines <mjark@negativecurvature.net> | 2016-06-03 14:51:33 +0100 |
|---|---|---|
| committer | Mark Haines <mjark@negativecurvature.net> | 2016-06-03 14:51:33 +0100 |
| commit | dd6f62ed99033d7c793685b6cce5dfba9d3aff89 (patch) | |
| tree | 0044c60b4100253a0875be891bbb4ecfce80d47c /synapse/push/mailer.py | |
| parent | Send updates to the syncing users every ten seconds or immediately if they've... (diff) | |
| parent | Merge pull request #833 from matrix-org/markjh/client_ips (diff) | |
| download | synapse-dd6f62ed99033d7c793685b6cce5dfba9d3aff89.tar.xz | |
Merge branch 'develop' into markjh/synchrotronII
Diffstat (limited to 'synapse/push/mailer.py')
| -rw-r--r-- | synapse/push/mailer.py | 9 |
1 files changed, 8 insertions, 1 deletions
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 == '': |