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

Do not add image size without meta to OGP (regression from #4901) (#4995)

signup-info-prompt
Yamagishi Kazutoshi 2017-09-18 22:00:29 +09:00 committed by Eugen Rochko
parent 9619b7f727
commit dcf1139ebd
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/views/stream_entries/_og_image.html.haml
View File

@ -3,17 +3,20 @@
- if media.image? - if media.image?
= opengraph 'og:image', full_asset_url(media.file.url(:original)) = opengraph 'og:image', full_asset_url(media.file.url(:original))
= opengraph 'og:image:type', media.file_content_type = opengraph 'og:image:type', media.file_content_type
= opengraph 'og:image:width', media.file.meta['original']['width'] - unless media.file.meta.nil?
= opengraph 'og:image:height', media.file.meta['original']['height'] = opengraph 'og:image:width', media.file.meta['original']['width']
= opengraph 'og:image:height', media.file.meta['original']['height']
- elsif media.video? - elsif media.video?
= opengraph 'og:image', full_asset_url(media.file.url(:small)) = opengraph 'og:image', full_asset_url(media.file.url(:small))
= opengraph 'og:image:type', 'image/png' = opengraph 'og:image:type', 'image/png'
= opengraph 'og:image:width', media.file.meta['small']['width'] - unless media.file.meta.nil?
= opengraph 'og:image:height', media.file.meta['small']['height'] = opengraph 'og:image:width', media.file.meta['small']['width']
= opengraph 'og:image:height', media.file.meta['small']['height']
= opengraph 'og:video', full_asset_url(media.file.url(:original)) = opengraph 'og:video', full_asset_url(media.file.url(:original))
= opengraph 'og:video:type', media.file_content_type = opengraph 'og:video:type', media.file_content_type
= opengraph 'og:video:width', media.file.meta['small']['width'] - unless media.file.meta.nil?
= opengraph 'og:video:height', media.file.meta['small']['height'] = opengraph 'og:video:width', media.file.meta['small']['width']
= opengraph 'og:video:height', media.file.meta['small']['height']
- else - else
= opengraph 'og:image', full_asset_url(account.avatar.url(:original)) = opengraph 'og:image', full_asset_url(account.avatar.url(:original))
= opengraph 'og:image:width', '120' = opengraph 'og:image:width', '120'