summary refs log tree commit diff
path: root/res/templates/notif.txt
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.txt
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.txt')
-rw-r--r--res/templates/notif.txt6
1 files changed, 5 insertions, 1 deletions
diff --git a/res/templates/notif.txt b/res/templates/notif.txt
index a3ddac80ce..a37bee9833 100644
--- a/res/templates/notif.txt
+++ b/res/templates/notif.txt
@@ -1,7 +1,11 @@
 {% for message in notif.messages %}
-{{ message.sender_name }} ({{ message.ts|format_ts("%H:%M") }})
+{% if message.msgtype == "m.emote" %}* {% endif %}{{ message.sender_name }} ({{ message.ts|format_ts("%H:%M") }})
 {% if message.msgtype == "m.text" %}
 {{ message.body_text_plain }}
+{% elif message.msgtype == "m.emote" %}
+{{ message.body_text_plain }}
+{% elif message.msgtype == "m.notice" %}
+{{ message.body_text_plain }}
 {% elif message.msgtype == "m.image" %}
 {{ message.body_text_plain }}
 {% elif message.msgtype == "m.file" %}