OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

fix layout; handle app naming in synapse, not jinja

pull/759/head
Matthew Hodgson 2016-05-05 15:54:29 +01:00
parent a5974f89d6
commit 81c2176cba
7 changed files with 45 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
res/templates-vector/mail.css
View File

@ -85,11 +85,14 @@ body {
.sender_name { .sender_name {
margin-left: 75px; margin-left: 75px;
display: inline; display: inline;
font-weight: bold; font-size: 13px;
color: #a2a2a2;
} }
.message_time { .message_time {
float: right; float: right;
font-size: 11px;
color: #a2a2a2;
} }
.message_body { .message_body {

4
res/templates-vector/notif_mail.html
View File

@ -8,9 +8,9 @@
<body> <body>
<div id="page"> <div id="page">
<div class="header"> <div class="header">
<img class="logo" src="http://matrix.org/img/vector-logo-email.png" width="64" height="83" alt="Vector"/> <img class="logo" src="http://matrix.org/img/vector-logo-email.png" width="64" height="83" alt="[Vector]"/>
<div class="salutation">Hi {{ user_display_name }},</div> <div class="salutation">Hi {{ user_display_name }},</div>
<div class="summarytext">{{ summary_text|replace("%app%", "Vector") }}</div> <div class="summarytext">{{ summary_text }}</div>
</div> </div>
<div class="content"> <div class="content">
{% for room in rooms %} {% for room in rooms %}

2
res/templates-vector/notif_mail.txt
View File

@ -1,6 +1,6 @@
Hi {{ user_display_name }}, Hi {{ user_display_name }},
{{ summary_text|replace("%app%", "Vector") }} {{ summary_text }}
{% for room in rooms %} {% for room in rooms %}
{% include 'room.txt' with context %} {% include 'room.txt' with context %}

2
res/templates/notif_mail.html
View File

@ -8,7 +8,7 @@
<body> <body>
<div id="page"> <div id="page">
<div className="salutation">Hi {{ user_display_name }},</div> <div className="salutation">Hi {{ user_display_name }},</div>
<div className="summarytext">{{ summary_text|replace("%app%", "Matrix") }}</div> <div className="summarytext">{{ summary_text }}</div>
<div class="content"> <div class="content">
{% for room in rooms %} {% for room in rooms %}
{% include 'room.html' with context %} {% include 'room.html' with context %}

2
res/templates/notif_mail.txt
View File

@ -1,6 +1,6 @@
Hi {{ user_display_name }}, Hi {{ user_display_name }},
{{ summary_text|replace("%app%", "Matrix") }} {{ summary_text }}
{% for room in rooms %} {% for room in rooms %}
{% include 'room.txt' with context %} {% include 'room.txt' with context %}

5
synapse/config/emailconfig.py
View File

@ -65,6 +65,10 @@ class EmailConfig(Config):
self.email_template_dir = email_config["template_dir"] self.email_template_dir = email_config["template_dir"]
self.email_notif_template_html = email_config["notif_template_html"] self.email_notif_template_html = email_config["notif_template_html"]
self.email_notif_template_text = email_config["notif_template_text"] self.email_notif_template_text = email_config["notif_template_text"]
if "app_name" in email_config:
self.email_app_name = email_config["app_name"]
else:
self.email_app_name = "Matrix"
# make sure it's valid # make sure it's valid
parsed = email.utils.parseaddr(self.email_notif_from) parsed = email.utils.parseaddr(self.email_notif_from)
@ -83,6 +87,7 @@ class EmailConfig(Config):
# smtp_host: "localhost" # smtp_host: "localhost"
# smtp_port: 25 # smtp_port: 25
# notif_from: Your Friendly Matrix Home Server <noreply@example.com> # notif_from: Your Friendly Matrix Home Server <noreply@example.com>
# app_name: Matrix
# template_dir: res/templates # template_dir: res/templates
# notif_template_html: notif_mail.html # notif_template_html: notif_mail.html
# notif_template_text: notif_mail.txt # notif_template_text: notif_mail.txt

47
synapse/push/mailer.py
View File

@ -39,15 +39,15 @@ import logging
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
MESSAGE_FROM_PERSON_IN_ROOM = "You have a message on %%app%% from %(person)s " \ MESSAGE_FROM_PERSON_IN_ROOM = "You have a message on %(app)s from %(person)s " \
"in the %s room..." "in the %s room..."
MESSAGE_FROM_PERSON = "You have a message on %%app%% from %(person)s..." MESSAGE_FROM_PERSON = "You have a message on %(app)s from %(person)s..."
MESSAGES_FROM_PERSON = "You have messages on %%app%% from %(person)s..." MESSAGES_FROM_PERSON = "You have messages on %(app)s from %(person)s..."
MESSAGES_IN_ROOM = "There are some messages on %%app%% for you in the %(room)s room..." MESSAGES_IN_ROOM = "There are some messages on %(app)s for you in the %(room)s room..."
MESSAGES_IN_ROOMS = "Here are some messages on %%app%% you may have missed..." MESSAGES_IN_ROOMS = "Here are some messages on %(app)s you may have missed..."
INVITE_FROM_PERSON_TO_ROOM = "%(person)s has invited you to join the " \ INVITE_FROM_PERSON_TO_ROOM = "%(person)s has invited you to join the " \
"%(room)s room on %%app%%..." "%(room)s room on %(app)s..."
INVITE_FROM_PERSON = "%(person)s has invited you to chat on %%app%%..." INVITE_FROM_PERSON = "%(person)s has invited you to chat on %(app)s..."
CONTEXT_BEFORE = 1 CONTEXT_BEFORE = 1
CONTEXT_AFTER = 1 CONTEXT_AFTER = 1
@ -79,6 +79,7 @@ class Mailer(object):
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
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
@ -306,10 +307,15 @@ class Mailer(object):
inviter_name = name_from_member_event(inviter_member_event) inviter_name = name_from_member_event(inviter_member_event)
if room_name is None: if room_name is None:
return INVITE_FROM_PERSON % {"person": inviter_name} return INVITE_FROM_PERSON % {
"person": inviter_name,
"app": self.app_name
}
else: else:
return INVITE_FROM_PERSON_TO_ROOM % { return INVITE_FROM_PERSON_TO_ROOM % {
"person": inviter_name, "room": room_name "person": inviter_name,
"room": room_name,
"app": self.app_name,
} }
sender_name = None sender_name = None
@ -322,18 +328,22 @@ class Mailer(object):
if sender_name is not None and room_name is not None: if sender_name is not None and room_name is not None:
return MESSAGE_FROM_PERSON_IN_ROOM % { return MESSAGE_FROM_PERSON_IN_ROOM % {
"person": sender_name, "room": room_name "person": sender_name,
"room": room_name,
"app": self.app_name,
} }
elif sender_name is not None: elif sender_name is not None:
return MESSAGE_FROM_PERSON % { return MESSAGE_FROM_PERSON % {
"person": sender_name "person": sender_name,
"app": self.app_name,
} }
else: else:
# There's more than one notification for this room, so just # There's more than one notification for this room, so just
# say there are several # say there are several
if room_name is not None: if room_name is not None:
return MESSAGES_IN_ROOM % { return MESSAGES_IN_ROOM % {
"room": room_name "room": room_name,
"app": self.app_name,
} }
else: else:
# If the room doesn't have a name, say who the messages # If the room doesn't have a name, say who the messages
@ -347,19 +357,24 @@ class Mailer(object):
"person": descriptor_from_member_events([ "person": descriptor_from_member_events([
state_by_room[room_id][("m.room.member", s)] state_by_room[room_id][("m.room.member", s)]
for s in sender_ids for s in sender_ids
]) ]),
"app": self.app_name,
} }
else: else:
# Stuff's happened in multiple different rooms # Stuff's happened in multiple different rooms
return MESSAGES_IN_ROOMS return MESSAGES_IN_ROOMS % {
"app": self.app_name,
}
def make_room_link(self, room_id): def make_room_link(self, room_id):
# XXX: matrix.to # XXX: matrix.to
return "https://vector.im/#/room/%s" % (room_id,) # need /beta for Universal Links to work on iOS
return "https://vector.im/beta/#/room/%s" % (room_id,)
def make_notif_link(self, notif): def make_notif_link(self, notif):
# XXX: matrix.to # XXX: matrix.to
return "https://vector.im/#/room/%s/%s" % ( # need /beta for Universal Links to work on iOS
return "https://vector.im/beta/#/room/%s/%s" % (
notif['room_id'], notif['event_id'] notif['room_id'], notif['event_id']
) )