]> cat aescling's git repositories - mastodon.git/commitdiff
Do not add image size without meta to OGP (regression from #4901) (#4995)
authorYamagishi Kazutoshi <ykzts@desire.sh>
Mon, 18 Sep 2017 13:00:29 +0000 (22:00 +0900)
committerEugen Rochko <eugen@zeonfederated.com>
Mon, 18 Sep 2017 13:00:29 +0000 (15:00 +0200)
app/views/stream_entries/_og_image.html.haml

index 66d9619b25067f9c79c8e446abd7fd4fb5b8860a..b5058583b3b1bfe0789f7c61589bbfa73c03b9ed 100644 (file)
@@ -3,17 +3,20 @@
     - if media.image?
       = opengraph 'og:image', full_asset_url(media.file.url(:original))
       = opengraph 'og:image:type', media.file_content_type
-      = opengraph 'og:image:width', media.file.meta['original']['width']
-      = opengraph 'og:image:height', media.file.meta['original']['height']
+      - unless media.file.meta.nil?
+        = opengraph 'og:image:width', media.file.meta['original']['width']
+        = opengraph 'og:image:height', media.file.meta['original']['height']
     - elsif media.video?
       = opengraph 'og:image', full_asset_url(media.file.url(:small))
       = opengraph 'og:image:type', 'image/png'
-      = opengraph 'og:image:width', media.file.meta['small']['width']
-      = opengraph 'og:image:height', media.file.meta['small']['height']
+      - unless media.file.meta.nil?
+        = 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:type', media.file_content_type
-      = opengraph 'og:video:width', media.file.meta['small']['width']
-      = opengraph 'og:video:height', media.file.meta['small']['height']
+      - unless media.file.meta.nil?
+        = opengraph 'og:video:width', media.file.meta['small']['width']
+        = opengraph 'og:video:height', media.file.meta['small']['height']
 - else
   = opengraph 'og:image', full_asset_url(account.avatar.url(:original))
   = opengraph 'og:image:width', '120'