Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Ensure that a URL exists in the content during push. #8965

Merged
merged 2 commits into from
Dec 18, 2020
Merged

Ensure that a URL exists in the content during push. #8965

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b3228d9
Ensure that a URL exists in the content during push.
clokep Dec 17, 2020
4f035bf
Merge remote-tracking branch 'origin/develop' into clokep/check-url
clokep Dec 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/8965.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix a longstanding bug where a `m.image` event without a `url` would cause errors on push.
6 changes: 5 additions & 1 deletion synapse/push/mailer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -486,7 +486,11 @@ def add_text_message_vars(
def add_image_message_vars(
self, messagevars: Dict[str, Any], event: EventBase
) -> None:
messagevars["image_url"] = event.content["url"]
"""
Potentially add an image URL to the message variables.
"""
if "url" in event.content:
messagevars["image_url"] = event.content["url"]

async def make_summary_text(
self,
Expand Down
2 changes: 1 addition & 1 deletion synapse/res/templates/notif.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
{{ message.body_text_html }}
{%- elif message.msgtype == "m.notice" %}
{{ message.body_text_html }}
{%- elif message.msgtype == "m.image" %}
{%- elif message.msgtype == "m.image" and message.image_url %}
<img src="{{ message.image_url|mxc_to_http(640, 480, scale) }}" />
{%- elif message.msgtype == "m.file" %}
<span class="filename">{{ message.body_text_plain }}</span>
Expand Down