diff options
| author | David Baker <dave@matrix.org> | 2016-04-28 16:59:57 +0100 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2016-04-28 16:59:57 +0100 |
| commit | 68f8fc2f143d44b560b07e7521b28aae332e243d (patch) | |
| tree | f5edd1974065984f98c14cbcb2ef13ab0b298ec0 | |
| parent | Support image notifs (diff) | |
| download | synapse-68f8fc2f143d44b560b07e7521b28aae332e243d.tar.xz | |
Support file messages & fix plain text
| -rw-r--r-- | res/templates/notif.html | 8 | ||||
| -rw-r--r-- | synapse/push/mailer.py | 5 |
2 files changed, 6 insertions, 7 deletions
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> diff --git a/synapse/push/mailer.py b/synapse/push/mailer.py index e6554dc7fd..60a4878a3e 100644 --- a/synapse/push/mailer.py +++ b/synapse/push/mailer.py @@ -222,8 +222,9 @@ class Mailer(object): self.add_text_message_vars(ret, event) elif event.content["msgtype"] == "m.image": self.add_image_message_vars(ret, event) - else: - return None + + if "body" in event.content: + ret["body_text_plain"] = event.content["body"] return ret |