Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-02 12:06:08 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/develop' into dbkr/email_unsubscribe

Browse source
This commit is contained in:
David Baker 2016-06-02 15:33:28 +01:00
commit 812b5de0fe
9 changed files with 813 additions and 563 deletions
Download patch file Download diff file Expand all files Collapse all files

4
synapse/push/mailer.py
View file

@ -78,13 +78,13 @@ ALLOWED_ATTRS = {
class Mailer(object):
def __init__(self, hs):
def __init__(self, hs, app_name):
self.hs = hs
self.store = self.hs.get_datastore()
self.handlers = self.hs.get_handlers()
self.state_handler = self.hs.get_state_handler()
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.filters["format_ts"] = format_ts_filter
env.filters["mxc_to_http"] = self.mxc_to_http_filter