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

This fixes an KeyError exception, after this PR the content is just considered unknown.
matrix-org · Dec 18, 2020 · 4136255 · 4136255
1 parent a7a9139
commit 4136255
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/changelog.d/8965.bugfix b/changelog.d/8965.bugfix
@@ -0,0 +1 @@
+Fix a longstanding bug where a `m.image` event without a `url` would cause errors on push.
diff --git a/synapse/push/mailer.py b/synapse/push/mailer.py
@@ -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,

diff --git a/synapse/res/templates/notif.html b/synapse/res/templates/notif.html
@@ -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>
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.