summary refs log tree commit diff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--res/templates-vector/mail.css5
-rw-r--r--res/templates-vector/notif_mail.html4
-rw-r--r--res/templates-vector/notif_mail.txt2
-rw-r--r--res/templates/notif_mail.html2
-rw-r--r--res/templates/notif_mail.txt2
-rw-r--r--synapse/config/emailconfig.py5
-rw-r--r--synapse/push/mailer.py47
7 files changed, 45 insertions, 22 deletions
diff --git a/res/templates-vector/mail.css b/res/templates-vector/mail.css
index 642948fdc1..103c5ff8ca 100644
--- a/res/templates-vector/mail.css
+++ b/res/templates-vector/mail.css
@@ -85,11 +85,14 @@ body {
 .sender_name  {
     margin-left: 75px;
     display: inline;
-    font-weight: bold;
+    font-size: 13px;
+    color: #a2a2a2;
 }
 
 .message_time  {
     float: right;
+    font-size: 11px;
+    color: #a2a2a2;
 }
 
 .message_body {
diff --git a/res/templates-vector/notif_mail.html b/res/templates-vector/notif_mail.html
index 86e7b6e867..c49cc66548 100644
--- a/res/templates-vector/notif_mail.html
+++ b/res/templates-vector/notif_mail.html
@@ -8,9 +8,9 @@
     <body>
         <div id="page">
             <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="summarytext">{{ summary_text|replace("%app%", "Vector") }}</div>
+                <div class="summarytext">{{ summary_text }}</div>
             </div>
             <div class="content">
                 {% for room in rooms %}
diff --git a/res/templates-vector/notif_mail.txt b/res/templates-vector/notif_mail.txt
index dec2e5960b..24843042a5 100644
--- a/res/templates-vector/notif_mail.txt
+++ b/res/templates-vector/notif_mail.txt
@@ -1,6 +1,6 @@
 Hi {{ user_display_name }},
 
-{{ summary_text|replace("%app%", "Vector") }}
+{{ summary_text }}
 
 {% for room in rooms %}
 {% include 'room.txt' with context %}
diff --git a/res/templates/notif_mail.html b/res/templates/notif_mail.html
index 0290fdea01..cc3573e65a 100644
--- a/res/templates/notif_mail.html
+++ b/res/templates/notif_mail.html
@@ -8,7 +8,7 @@
     <body>
         <div id="page">
             <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">
                 {% for room in rooms %}
                     {% include 'room.html' with context %}
diff --git a/res/templates/notif_mail.txt b/res/templates/notif_mail.txt
index 5d5a8442f9..24843042a5 100644
--- a/res/templates/notif_mail.txt
+++ b/res/templates/notif_mail.txt
@@ -1,6 +1,6 @@
 Hi {{ user_display_name }},
 
-{{ summary_text|replace("%app%", "Matrix") }}
+{{ summary_text }}
 
 {% for room in rooms %}
 {% include 'room.txt' with context %}
diff --git a/synapse/config/emailconfig.py b/synapse/config/emailconfig.py
index 7a38680435..d6f4f83a14 100644
--- a/synapse/config/emailconfig.py
+++ b/synapse/config/emailconfig.py
@@ -65,6 +65,10 @@ class EmailConfig(Config):
             self.email_template_dir = email_config["template_dir"]
             self.email_notif_template_html = email_config["notif_template_html"]
             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
             parsed = email.utils.parseaddr(self.email_notif_from)
@@ -83,6 +87,7 @@ class EmailConfig(Config):
         #   smtp_host: "localhost"
         #   smtp_port: 25
         #   notif_from: Your Friendly Matrix Home Server <noreply@example.com>
+        #   app_name: Matrix
         #   template_dir: res/templates
         #   notif_template_html: notif_mail.html
         #   notif_template_text: notif_mail.txt
diff --git a/synapse/push/mailer.py b/synapse/push/mailer.py
index aab6387125..497905d811 100644
--- a/synapse/push/mailer.py
+++ b/synapse/push/mailer.py
@@ -39,15 +39,15 @@ import logging
 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..."
-MESSAGE_FROM_PERSON = "You have a message on %%app%% from %(person)s..."
-MESSAGES_FROM_PERSON = "You have messages on %%app%% from %(person)s..."
-MESSAGES_IN_ROOM = "There are some messages on %%app%% for you in the %(room)s room..."
-MESSAGES_IN_ROOMS = "Here are some messages on %%app%% you may have missed..."
+MESSAGE_FROM_PERSON = "You have a message on %(app)s from %(person)s..."
+MESSAGES_FROM_PERSON = "You have messages on %(app)s from %(person)s..."
+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)s you may have missed..."
 INVITE_FROM_PERSON_TO_ROOM = "%(person)s has invited you to join the " \
-                             "%(room)s room on %%app%%..."
-INVITE_FROM_PERSON = "%(person)s has invited you to chat on %%app%%..."
+                             "%(room)s room on %(app)s..."
+INVITE_FROM_PERSON = "%(person)s has invited you to chat on %(app)s..."
 
 CONTEXT_BEFORE = 1
 CONTEXT_AFTER = 1
@@ -79,6 +79,7 @@ class Mailer(object):
         self.store = self.hs.get_datastore()
         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
         env = jinja2.Environment(loader=loader)
         env.filters["format_ts"] = format_ts_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)
 
                 if room_name is None:
-                    return INVITE_FROM_PERSON % {"person": inviter_name}
+                    return INVITE_FROM_PERSON % {
+                        "person": inviter_name,
+                        "app": self.app_name
+                    }
                 else:
                     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
@@ -322,18 +328,22 @@ class Mailer(object):
 
                 if sender_name is not None and room_name is not None:
                     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:
                     return MESSAGE_FROM_PERSON % {
-                        "person": sender_name
+                        "person": sender_name,
+                        "app": self.app_name,
                     }
             else:
                 # There's more than one notification for this room, so just
                 # say there are several
                 if room_name is not None:
                     return MESSAGES_IN_ROOM % {
-                        "room": room_name
+                        "room": room_name,
+                        "app": self.app_name,
                     }
                 else:
                     # If the room doesn't have a name, say who the messages
@@ -347,19 +357,24 @@ class Mailer(object):
                         "person": descriptor_from_member_events([
                             state_by_room[room_id][("m.room.member", s)]
                             for s in sender_ids
-                        ])
+                        ]),
+                        "app": self.app_name,
                     }
         else:
             # 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):
         # 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):
         # 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']
         )
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-12-28 10:33:27 +0000