about summary refs log tree commit diff
diff options
context:
space:
mode:
authormayaeh <mayaeh@marimo-net.org>2019-09-05 13:14:30 +0900
committerEugen Rochko <eugen@zeonfederated.com>2019-09-05 06:14:30 +0200
commite265b8887dbd883bc7ca04832dc67ffe46966889 (patch)
treec57264744b567debd16505639735df804149f432
parent7db2c2e2ba049845bdfdbf9931ffae6ae5ccddd3 (diff)
Fix NotificationMailer failing when receiving mention with media from remote instance (#11765)
-rw-r--r--app/views/notification_mailer/_status.html.haml5
1 files changed, 4 insertions, 1 deletions
diff --git a/app/views/notification_mailer/_status.html.haml b/app/views/notification_mailer/_status.html.haml
index 40f3aa88a..e992e5563 100644
--- a/app/views/notification_mailer/_status.html.haml
+++ b/app/views/notification_mailer/_status.html.haml
@@ -36,7 +36,10 @@
                                 - if status.media_attachments.size > 0
                                   %p
                                     - status.media_attachments.each do |a|
-                                      = link_to medium_url(a), medium_url(a)
+                                      - if status.local?
+                                        = link_to medium_url(a), medium_url(a)
+                                      - else
+                                        = link_to a.remote_url, a.remote_url
 
                               %p.status-footer
                                 = link_to l(status.created_at), web_url("statuses/#{status.id}")