diff options
| author | David Baker <dave@matrix.org> | 2016-06-01 09:54:36 +0100 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2016-06-01 09:54:36 +0100 |
| commit | 8e539f13c005fa94c0dfee4cf1ea04acb1aedf59 (patch) | |
| tree | f888e47f736cd6f43db9983d6c802ebf669308a3 /res | |
| parent | pep8 (diff) | |
| parent | handle emotes & notices correctly in email notifs (diff) | |
| download | synapse-8e539f13c005fa94c0dfee4cf1ea04acb1aedf59.tar.xz | |
Merge remote-tracking branch 'origin/develop' into dbkr/room_list_spider
Diffstat (limited to 'res')
| -rw-r--r-- | res/templates/notif.html | 6 | ||||
| -rw-r--r-- | res/templates/notif.txt | 6 |
2 files changed, 10 insertions, 2 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" %} 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" %} |