diff options
| author | David Baker <dave@matrix.org> | 2016-06-02 15:33:28 +0100 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2016-06-02 15:33:28 +0100 |
| commit | 812b5de0feeb905643faf4decff3d7b566d3dbe9 (patch) | |
| tree | 70c5d4a2dab2e35bc39711392cba52e22e5a145f /synapse/push/emailpusher.py | |
| parent | Merge branch 'dbkr/split_out_auth_handler' into dbkr/email_unsubscribe (diff) | |
| parent | Fix setting the _clock in SQLBaseStore (diff) | |
| download | synapse-812b5de0feeb905643faf4decff3d7b566d3dbe9.tar.xz | |
Merge remote-tracking branch 'origin/develop' into dbkr/email_unsubscribe
Diffstat (limited to 'synapse/push/emailpusher.py')
| -rw-r--r-- | synapse/push/emailpusher.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/synapse/push/emailpusher.py b/synapse/push/emailpusher.py index 46d7c0434b..12a3ec7fd8 100644 --- a/synapse/push/emailpusher.py +++ b/synapse/push/emailpusher.py @@ -44,7 +44,8 @@ THROTTLE_RESET_AFTER_MS = (12 * 60 * 60 * 1000) # does each email include all unread notifs, or just the ones which have happened # since the last mail? -INCLUDE_ALL_UNREAD_NOTIFS = True +# XXX: this is currently broken as it includes ones from parted rooms(!) +INCLUDE_ALL_UNREAD_NOTIFS = False class EmailPusher(object): @@ -72,7 +73,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 |