ar
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

rebase/4.0.0rc2
Isabelle Knott 2017-04-13 09:59:43 -04:00 committed by Eugen
parent 093879c177
commit 447b8bc44e
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/stream_entries/show.html.haml
View File

@ -11,7 +11,7 @@
- else - else
%meta{ property: 'og:description', content: @stream_entry.activity.content }/ %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)) }/ %meta{ property: 'og:image', content: full_asset_url(@stream_entry.activity.media_attachments.first.file.url(:small)) }/
- else - else
%meta{ property: 'og:image', content: full_asset_url(@account.avatar.url(:original)) }/ %meta{ property: 'og:image', content: full_asset_url(@account.avatar.url(:original)) }/