summary refs log tree commit diff
path: root/res/templates/notif.html
diff options
context:
space:
mode:
authorDavid Baker <dave@matrix.org>2016-06-01 09:54:36 +0100
committerDavid Baker <dave@matrix.org>2016-06-01 09:54:36 +0100
commit8e539f13c005fa94c0dfee4cf1ea04acb1aedf59 (patch)
treef888e47f736cd6f43db9983d6c802ebf669308a3 /res/templates/notif.html
parentpep8 (diff)
parenthandle emotes & notices correctly in email notifs (diff)
downloadsynapse-8e539f13c005fa94c0dfee4cf1ea04acb1aedf59.tar.xz
Merge remote-tracking branch 'origin/develop' into dbkr/room_list_spider
Diffstat (limited to 'res/templates/notif.html')
-rw-r--r--res/templates/notif.html6
1 files changed, 5 insertions, 1 deletions
diff --git a/res/templates/notif.html b/res/templates/notif.html
index 834840861e..88b921ca9c 100644
--- a/res/templates/notif.html
+++ b/res/templates/notif.html
@@ -17,11 +17,15 @@
         </td>
         <td class="message_contents">
             {% if loop.index0 == 0 or notif.messages[loop.index0 - 1].sender_name != notif.messages[loop.index0].sender_name %}
-                <div class="sender_name">{{ message.sender_name }}</div>
+                <div class="sender_name">{% if message.msgtype == "m.emote" %}*{% endif %} {{ message.sender_name }}</div>
             {% endif %}
             <div class="message_body">
                 {% if message.msgtype == "m.text" %}
                     {{ message.body_text_html }}
+                {% elif message.msgtype == "m.emote" %}
+                    {{ message.body_text_html }}
+                {% elif message.msgtype == "m.notice" %}
+                    {{ message.body_text_html }}
                 {% elif message.msgtype == "m.image" %}
                     <img src="{{ message.image_url|mxc_to_http(640, 480, scale) }}" />
                 {% elif message.msgtype == "m.file" %}