OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Support image notifs

pull/759/head
David Baker 2016-04-28 15:55:53 +01:00
parent 60f86fc876
commit 4845c7359d
2 changed files with 33 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
res/templates/notif.html
View File

@ -17,10 +17,14 @@
<div class="sender_name">{{ message.sender_name }}</div> <div class="sender_name">{{ message.sender_name }}</div>
<div class="message_time">{{ message.ts|format_ts("%H:%M") }}</div> <div class="message_time">{{ message.ts|format_ts("%H:%M") }}</div>
<div class="message_body"> <div class="message_body">
{% if message.format == "org.matrix.custom.html" %} {% if message.msgtype == "m.text" %}
{{ message.body_text_html }} {% if message.format == "org.matrix.custom.html" %}
{% else %} {{ message.body_text_html }}
{{ message.body_text_plain }} {% else %}
{{ message.body_text_plain }}
{% endif %}
{% elif message.msgtype == "m.image" %}
<img src="{{ message.image_url|mxc_to_http(640, 480, scale) }}" />
{% endif %} {% endif %}
</div> </div>
</div> </div>

36
synapse/push/mailer.py
View File

@ -200,13 +200,6 @@ class Mailer(object):
def get_message_vars(self, notif, event, room_state): def get_message_vars(self, notif, event, room_state):
if event.type != "m.room.message": if event.type != "m.room.message":
return None return None
if event.content["msgtype"] != "m.text":
return None
if "format" in event.content:
msgformat = event.content["format"]
else:
msgformat = None
sender_state_event = room_state[("m.room.member", event.sender)] sender_state_event = room_state[("m.room.member", event.sender)]
sender_name = name_from_member_event(sender_state_event) sender_name = name_from_member_event(sender_state_event)
@ -217,7 +210,7 @@ class Mailer(object):
sender_hash = string_ordinal_total(event.sender) sender_hash = string_ordinal_total(event.sender)
ret = { ret = {
"format": msgformat, "msgtype": event.content["msgtype"],
"is_historical": event.event_id != notif['event_id'], "is_historical": event.event_id != notif['event_id'],
"ts": event.origin_server_ts, "ts": event.origin_server_ts,
"sender_name": sender_name, "sender_name": sender_name,
@ -225,13 +218,34 @@ class Mailer(object):
"sender_hash": sender_hash, "sender_hash": sender_hash,
} }
if msgformat == "org.matrix.custom.html": if event.content["msgtype"] == "m.text":
ret["body_text_html"] = safe_markup(event.content["formatted_body"]) self.add_text_message_vars(ret, event)
elif event.content["msgtype"] == "m.image":
self.add_image_message_vars(ret, event)
else: else:
ret["body_text_html"] = safe_text(event.content["body"]) return None
return ret return ret
def add_text_message_vars(self, vars, event):
if "format" in event.content:
msgformat = event.content["format"]
else:
msgformat = None
vars["format"] = msgformat
if msgformat == "org.matrix.custom.html":
vars["body_text_html"] = safe_markup(event.content["formatted_body"])
else:
vars["body_text_html"] = safe_text(event.content["body"])
return vars
def add_image_message_vars(self, vars, event):
vars["image_url"] = event.content["url"]
return vars
def make_summary_text(self, notifs_by_room, state_by_room, notif_events, user_id): def make_summary_text(self, notifs_by_room, state_by_room, notif_events, user_id):
if len(notifs_by_room) == 1: if len(notifs_by_room) == 1:
# Only one room has new stuff # Only one room has new stuff