mirror of
https://git.anonymousland.org/anonymousland/synapse-product.git
synced 2024-12-11 14:34:19 -05:00
if an email pusher specifies a brand param, use it
This commit is contained in:
parent
07233a1ec8
commit
f84b89f0c6
@ -72,7 +72,12 @@ class EmailPusher(object):
|
|||||||
self.processing = False
|
self.processing = False
|
||||||
|
|
||||||
if self.hs.config.email_enable_notifs:
|
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:
|
else:
|
||||||
self.mailer = None
|
self.mailer = None
|
||||||
|
|
||||||
|
@ -78,12 +78,12 @@ ALLOWED_ATTRS = {
|
|||||||
|
|
||||||
|
|
||||||
class Mailer(object):
|
class Mailer(object):
|
||||||
def __init__(self, hs):
|
def __init__(self, hs, app_name):
|
||||||
self.hs = hs
|
self.hs = hs
|
||||||
self.store = self.hs.get_datastore()
|
self.store = self.hs.get_datastore()
|
||||||
self.state_handler = self.hs.get_state_handler()
|
self.state_handler = self.hs.get_state_handler()
|
||||||
loader = jinja2.FileSystemLoader(self.hs.config.email_template_dir)
|
loader = jinja2.FileSystemLoader(self.hs.config.email_template_dir)
|
||||||
self.app_name = self.hs.config.email_app_name
|
self.app_name = app_name
|
||||||
env = jinja2.Environment(loader=loader)
|
env = jinja2.Environment(loader=loader)
|
||||||
env.filters["format_ts"] = format_ts_filter
|
env.filters["format_ts"] = format_ts_filter
|
||||||
env.filters["mxc_to_http"] = self.mxc_to_http_filter
|
env.filters["mxc_to_http"] = self.mxc_to_http_filter
|
||||||
|
Loading…
Reference in New Issue
Block a user