diff options
author | Matthew Hodgson <matthew@matrix.org> | 2016-06-02 13:29:48 +0100 |
---|---|---|
committer | Matthew Hodgson <matthew@matrix.org> | 2016-06-02 13:29:48 +0100 |
commit | f84b89f0c6b2e67897fec8639b79bf1d45c8f2b6 (patch) | |
tree | d6bf5911a1908167a42de9a53db1b7b07cf9476a /synapse/push/emailpusher.py | |
parent | Merge pull request #815 from matrix-org/dbkr/email_greeting_not_none (diff) | |
download | synapse-f84b89f0c6b2e67897fec8639b79bf1d45c8f2b6.tar.xz |
if an email pusher specifies a brand param, use it
Diffstat (limited to 'synapse/push/emailpusher.py')
-rw-r--r-- | synapse/push/emailpusher.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/synapse/push/emailpusher.py b/synapse/push/emailpusher.py index a72cba8306..e38ed02006 100644 --- a/synapse/push/emailpusher.py +++ b/synapse/push/emailpusher.py @@ -72,7 +72,12 @@ class EmailPusher(object): self.processing = False if self.hs.config.email_enable_notifs: - self.mailer = Mailer(self.hs) + if 'data' in pusherdict and 'brand' in pusherdict['data']: + app_name = pusherdict['data']['brand'] + else: + app_name = self.hs.config.email_app_name + + self.mailer = Mailer(self.hs, app_name) else: self.mailer = None |