about summary refs log tree commit diff
path: root/app/views/stream_entries
diff options
context:
space:
mode:
authorYamagishi Kazutoshi <ykzts@desire.sh>2017-09-18 22:00:29 +0900
committerEugen Rochko <eugen@zeonfederated.com>2017-09-18 15:00:29 +0200
commitdcf1139ebd65375fd130d71c2e664827d00e9d4f (patch)
tree24a5fea63f22dc08fa7ea0ce7a8f6ea7c40739eb /app/views/stream_entries
parent9619b7f7278ed63ba2caaf6eaa1ef711d72c1918 (diff)
Do not add image size without meta to OGP (regression from #4901) (#4995)
Diffstat (limited to 'app/views/stream_entries')
-rw-r--r--app/views/stream_entries/_og_image.html.haml15
1 files changed, 9 insertions, 6 deletions
diff --git a/app/views/stream_entries/_og_image.html.haml b/app/views/stream_entries/_og_image.html.haml
index 66d9619b2..b5058583b 100644
--- a/app/views/stream_entries/_og_image.html.haml
+++ b/app/views/stream_entries/_og_image.html.haml
@@ -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'