mastofe

commit: 447b8bc44eb33ae6ffdfbcc7ae52fbe0bba93ece
parent: 093879c1778a525b7aa9b847b58e9ce6604b5acf
Author: Isabelle Knott <isabelle@blackle-mori.com>
Date:   Thu, 13 Apr 2017 09:59:43 -0400

Do not show media attachment as og:image if it was marked as NSFW (#1693)


Diffstat:
M
app/views/stream_entries/show.html.haml
2
+-

1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/views/stream_entries/show.html.haml b/app/views/stream_entries/show.html.haml
@@ -11,7 +11,7 @@
   - else
     %meta{ property: 'og:description', content: @stream_entry.activity.content }/
 
-  - if @stream_entry.activity.is_a?(Status) && @stream_entry.activity.media_attachments.size > 0
+  - if @stream_entry.activity.is_a?(Status) && !@stream_entry.activity.sensitive? && @stream_entry.activity.media_attachments.size > 0
     %meta{ property: 'og:image', content: full_asset_url(@stream_entry.activity.media_attachments.first.file.url(:small)) }/
   - else
     %meta{ property: 'og:image', content: full_asset_url(@account.avatar.url(:original)) }/