[core] store content_length in root of link object (was in .media att…

…ribute)
atlassian · Jul 13, 2015 · 8fdd8a1 · 8fdd8a1
1 parent d7908de
commit 8fdd8a1
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/lib/oembed.js b/lib/oembed.js
@@ -84,9 +84,9 @@ exports.getOembed = function(uri, data, options) {
         if (m.height) {
             oembed.height = m.height;
         }
-        if (m.content_length) {
-            oembed.content_length = m.content_length;
-        }
+    }
+    if (link) {
+        oembed.content_length = link.content_length;
     }
 
     if (link && !inlineReader) {

diff --git a/lib/plugins/validators/async/22_imageSize.js b/lib/plugins/validators/async/22_imageSize.js
@@ -67,7 +67,7 @@ module.exports = {
                 };
 
                 if (data.content_length) {
-                    link._imageMeta.content_length = data.content_length;
+                    link.content_length = data.content_length;
                 }
             }
 

diff --git a/lib/plugins/validators/media.js b/lib/plugins/validators/media.js
@@ -78,10 +78,6 @@ function moveMediaAttrs(link) {
                 m.height = link._imageMeta.height;
                 link.type = "image/" + link._imageMeta.type.toLowerCase();
             }
-
-            if (_imageMeta.content_length) {
-                m.content_length = link._imageMeta.content_length;
-            }
         }
 
         if (!isEmpty(m)) {

diff --git a/lib/plugins/validators/sync/07_duplicateLink.js b/lib/plugins/validators/sync/07_duplicateLink.js
@@ -66,6 +66,11 @@ module.exports = {
             // Merge unique rels.
             storedLink.rel = _.union(link.rel || [], storedLink.rel || []);
 
+            // Store content_length.
+            if (storedLink.content_length || link.content_length) {
+                storedLink.content_length = storedLink.content_length || link.content_length;
+            }
+
             // Set error to new link to remove it from result.
             if (link.href !== storedLink.href && storedLink.href !== linkNoProtocol) {