From 68f8fc2f143d44b560b07e7521b28aae332e243d Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 28 Apr 2016 16:59:57 +0100
Subject: Support file messages & fix plain text

---
 res/templates/notif.html | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'res/templates/notif.html')

diff --git a/res/templates/notif.html b/res/templates/notif.html
index bdff2786ff..70f5655352 100644
--- a/res/templates/notif.html
+++ b/res/templates/notif.html
@@ -18,13 +18,11 @@
                 <div class="message_time">{{ message.ts|format_ts("%H:%M") }}</div>
                 <div class="message_body">
                     {% if message.msgtype == "m.text" %}
-                        {% if message.format == "org.matrix.custom.html" %}
-                            {{ message.body_text_html }}
-                        {% else %}
-                            {{ message.body_text_plain }}
-                        {% endif %}
+                        {{ 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" %}
+                        <span class="filename">{{ message.body_text_plain }}</span>
                     {% endif %}
                 </div>
             </div>
-- 
cgit 1.4.1