From 458d478b2c6ced056035889315b5dee73a862b1f Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Fri, 27 Nov 2015 21:59:39 +0200
Subject: [PATCH 001/320] [promo] parse promo uri from oembed discovery url;
 discard for=oembed option

---
 lib/plugins/system/oembed/oembed.js | 29 ++++++++++++++++++++---------
 modules/api/views.js                |  6 ++----
 2 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/lib/plugins/system/oembed/oembed.js b/lib/plugins/system/oembed/oembed.js
index 318d0742d..54f2e3e6d 100644
--- a/lib/plugins/system/oembed/oembed.js
+++ b/lib/plugins/system/oembed/oembed.js
@@ -3,7 +3,7 @@ var urlLib = require('url');
 
 module.exports = {
 
-    provides: 'self',
+    provides: ['self', '__promoUri', '__forcePromo'],
 
     getData: function(url, oembedLinks, options, cb) {
 
@@ -25,16 +25,27 @@ module.exports = {
             }
         }
 
-        if (self_endpoint && !options.forOembed) {
+        if (self_endpoint) {
+
             var urlObj = urlLib.parse(href, true);
-            delete urlObj.search;
-            urlObj.query['for'] = 'oembed';
-            href = urlLib.format(urlObj);
-            skip = false;
-        } else if (self_endpoint) {
-            skip = true;
+
+            var promo = urlObj.query.promo;
+
+            if (promo === '1' || promo === 'true') {
+
+                return cb(null, {
+                    __forcePromo: true
+                });
+
+            } else if (promo.match(/https?:\/\/.+/i)) {
+
+                return cb(null, {
+                    __promoUri: promo
+                });
+            }
         }
-        if (skip) {
+
+        if (skip || self_endpoint) {
             return cb(null);
         }
 
diff --git a/modules/api/views.js b/modules/api/views.js
index 02f9d4cd6..3e776c02a 100644
--- a/modules/api/views.js
+++ b/modules/api/views.js
@@ -71,8 +71,7 @@ module.exports = function(app) {
                     getWhitelistRecord: whitelist.findWhitelistRecordFor,
                     maxWidth: getIntParam(req, 'maxwidth') || getIntParam(req, 'max-width'),
                     promoUri: req.query.promoUri,
-                    forcePromo: getBooleanParam(req, 'forcePromo'),
-                    forOembed: req.query['for'] === 'oembed'
+                    forcePromo: getBooleanParam(req, 'forcePromo')
                 }, cb);
             }
 
@@ -377,8 +376,7 @@ module.exports = function(app) {
                     getWhitelistRecord: whitelist.findWhitelistRecordFor,
                     filterNonSSL: getBooleanParam(req, 'ssl'),
                     filterNonHTML5: getBooleanParam(req, 'html5'),
-                    maxWidth: getIntParam(req, 'maxwidth') || getIntParam(req, 'max-width'),
-                    forOembed: req.query['for'] === 'oembed'
+                    maxWidth: getIntParam(req, 'maxwidth') || getIntParam(req, 'max-width')
                 }, cb);
             }
 

From 5dea214d41d9f39c9143c937e528818ff122bd15 Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Tue, 1 Dec 2015 15:48:22 +0200
Subject: [PATCH 002/320] [promo] parse iframe.ly/api/iframe as promo iframe

---
 lib/plugins/system/promo/promoEmbed.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/plugins/system/promo/promoEmbed.js b/lib/plugins/system/promo/promoEmbed.js
index 74cbcb40e..68170d83c 100644
--- a/lib/plugins/system/promo/promoEmbed.js
+++ b/lib/plugins/system/promo/promoEmbed.js
@@ -1,5 +1,6 @@
 var res = [
     /\/\/iframe\.ly\/\w+/i,
+    /\/\/iframe\.ly\/api\/iframe/i,
     /\/\/www\.youtube\.com\/embed\/\w+/i,
     /\/\/player\.vimeo\.com\/video\/\d+/i,
     /\/\/w\.soundcloud\.com\/player\//i,

From 33c7b3f6a2a18ac07778f796fd4470f96b8a066e Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Tue, 1 Dec 2015 16:25:30 +0200
Subject: [PATCH 003/320] [promo] parse iframe.ly/api/iframe as promo iframe

---
 lib/plugins/system/promo/promoEmbed.js | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/lib/plugins/system/promo/promoEmbed.js b/lib/plugins/system/promo/promoEmbed.js
index 68170d83c..bea24cea3 100644
--- a/lib/plugins/system/promo/promoEmbed.js
+++ b/lib/plugins/system/promo/promoEmbed.js
@@ -1,12 +1,25 @@
+var urlLib = require('url');
+
+var iframelyApiRe = /iframe\.ly\/api\/iframe.+url=/i;
+
 var res = [
-    /\/\/iframe\.ly\/\w+/i,
-    /\/\/iframe\.ly\/api\/iframe/i,
+    /iframe\.ly\/\w+/i,
+    iframelyApiRe,
     /\/\/www\.youtube\.com\/embed\/\w+/i,
     /\/\/player\.vimeo\.com\/video\/\d+/i,
     /\/\/w\.soundcloud\.com\/player\//i,
     /\/\/vine\.co\/v\/\w+\/embed/i
 ];
 
+function extractGetParamUrl(src) {
+    if (src.match(iframelyApiRe)) {
+        var urlObj = urlLib.parse(src, true);
+        return urlObj.query['url'];
+    } else {
+        return src;
+    }
+}
+
 module.exports = {
 
     provides: '__promoUri',
@@ -19,7 +32,7 @@ module.exports = {
         if (embeds.length) {
             var href = embeds.attr('href');
             return {
-                __promoUri: href
+                __promoUri: extractGetParamUrl(href)
             };
         }
 
@@ -39,6 +52,10 @@ module.exports = {
             }
             var src = cheerio(this).attr('src');
 
+            if (!src) {
+                return;
+            }
+
             var i = 0;
             while(i < res.length && !src.match(res[i])) {
                 i++;
@@ -51,7 +68,7 @@ module.exports = {
 
         if (result) {
             return {
-                __promoUri: result
+                __promoUri: extractGetParamUrl(result)
             };
         }
     }

From be7a51a0cc3d88a3caea927bdeac72b5fae1a822 Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Tue, 1 Dec 2015 17:54:25 +0200
Subject: [PATCH 004/320] [promo] remove soundcloud embed iframe detection,
 can't recognize canonical

---
 lib/plugins/system/promo/promoEmbed.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/plugins/system/promo/promoEmbed.js b/lib/plugins/system/promo/promoEmbed.js
index bea24cea3..1c0a7e4b5 100644
--- a/lib/plugins/system/promo/promoEmbed.js
+++ b/lib/plugins/system/promo/promoEmbed.js
@@ -7,7 +7,6 @@ var res = [
     iframelyApiRe,
     /\/\/www\.youtube\.com\/embed\/\w+/i,
     /\/\/player\.vimeo\.com\/video\/\d+/i,
-    /\/\/w\.soundcloud\.com\/player\//i,
     /\/\/vine\.co\/v\/\w+\/embed/i
 ];
 

From 166f24d07e62fd4387e412ecec02342090b63a40 Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Wed, 2 Dec 2015 18:47:35 +0200
Subject: [PATCH 005/320] [whitelist] bug fix: add delay to whitelist file
 reload in case of long writes

---
 lib/whitelist.js | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/lib/whitelist.js b/lib/whitelist.js
index 5967adc72..0821cda8a 100644
--- a/lib/whitelist.js
+++ b/lib/whitelist.js
@@ -302,7 +302,10 @@
             p = path.resolve('.', p);
             // Check if newer file added.
             if (p.match(/iframely-.*\.json/)) {
-                loadLastWhitelist();
+                // Wait sometime to be sure write finished.
+                setTimeout(function() {
+                    loadLastWhitelist();
+                }, 5000);
             }
         });
 
@@ -310,7 +313,10 @@
             p = path.resolve('.', p);
             // Reload last whitelist.
             if (p == currentWhitelistFilename) {
-                readWhitelist(p);
+                // Wait sometime to be sure write finished.
+                setTimeout(function() {
+                    readWhitelist(p);
+                }, 5000);
             }
         });
 

From 214872a9cc2f0232661bd76f0def68764d634124 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Fri, 11 Dec 2015 09:44:11 -0500
Subject: [PATCH 006/320] [domains] move custom domains for BrightCove to
 domain plugin

---
 plugins/domains/brightcove.com.js  | 23 +++++++++++++++++++++--
 plugins/links/brightcove-hosted.js | 15 ---------------
 2 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/plugins/domains/brightcove.com.js b/plugins/domains/brightcove.com.js
index fed8450e5..8e34f9ea5 100644
--- a/plugins/domains/brightcove.com.js
+++ b/plugins/domains/brightcove.com.js
@@ -1,6 +1,9 @@
 module.exports = {
 
-    re: /^https?:\/\/link\.brightcove\.com\/services\/player\//i,
+    re: [
+        /^https?:\/\/link\.brightcove\.com\/services\/player\//i,
+        /^https?:\/\/[a-z\-]+\.\w+\.(com|org|net|co|)\/services\/player\/bcpid\d+\/?\?bc/i
+    ],
 
     mixins: [
         "twitter-title",
@@ -8,7 +11,7 @@ module.exports = {
         "twitter-image"
     ],
 
-    getLink: function(twitter) {        
+    getLink: function(twitter) {
 
         // Make Brightcove consistently autoplay. It depends on customer settings and we can not make them all NOT to autoplay - so the only way out is to autoplay them all.
 
@@ -30,4 +33,20 @@ module.exports = {
         "https://link.brightcove.com/services/player/bcpid1638546175001?bckey=AQ~~,AAAAmtVJIFk~,TVGOQ5ZTwJZhmi7steBjnvKikk1S5nut&bctid=2587584769001&secureConnections=true&secureHTMLConnections=true&linkSrc=twitter&autoStart=false&height=100%25&width=100%25",
         "https://link.brightcove.com/services/player/bcpid616303324001?bckey=AQ~~,AAAAj36EGjE~,w53r2XdUtII0XxxdqYeLp1bOxUXrsIg0&bctid=620166577001&secureConnections=true&secureHTMLConnections=true&linkSrc=twitter&autoStart=false&height=100%25&width=100%25"
     ]
+
+    /* Sample direct-video URLs:
+        http://video-embed.masslive.com/services/player/bcpid1949030308001?bctid=3082707357001&bckey=AQ~~,AAAAQBxUOok~,jSZP67EiqBfkIeiCdBewgHg1-uVWQxpS
+        http://video-embed.cleveland.com/services/player/bcpid1949055968001?bctid=3086114271001&bckey=AQ~~,AAAAQBxUNqE~,xKBGzTdiYSSRqIKPsPdkNW3W_DNtPBTa
+        http://video.archstl.org/services/player/bcpid1697747652001?bckey=AQ~~,AAABKmWKzxE~,jhq2mLafyYPtb2fDysY2ou3LA4sZBXej&bctid=2766873636001&iframe=true&height=275&width=485
+        http://video.popularmechanics.com/services/player/bcpid16382224001?bckey=AQ~~,AAAAAAyqBbs~,3zLG8i7OTQIWSRZG2AhyY0vOQ2Zz32h-&bctid=3087691540001
+        http://video.billboard.com/services/player/bcpid3063835940001?bckey=AQ~~,AAAAAEMcC3Y~,NII8yi9nN4ynMSuZMypu6TcjvNjfaYWZ&bclid=3064795148001&bctid=3082031207001
+        http://video-embed.nj.com/services/player/bcpid1950981419001?bctid=3092316229001&bckey=AQ~~,AAAAPLMILBk~,Vn8u6tPOf8Us2eD8W1ez5Zw-Ss_6Anfe
+        http://video.bafta.org/services/player/bcpid601325186001?bckey=AQ~~,AAAABxWZS7k~,uLPjGIDNpTmMdurNjyFkV6rYlN-J6re3&bctid=753252127001
+
+        http://video-embed.masslive.com/services/player/bcpid1949030308001?bctid=3082707357001&bckey=AQ~~,AAAAQBxUOok~,jSZP67EiqBfkIeiCdBewgHg1-uVWQxpS
+        http://video.symantec.com/services/player/bcpid975006955001?bckey=AQ%7E%7E%2CAAAABuIiy9k%7E%2CI8BhasVwr9wjJz4AWmdUlYymEtyorXkA&bctid=976391207001
+        http://video.elcolombiano.com/services/player/bcpid2115059022001?bckey=AQ~~,AAABMdBKz4k~,kXKBkGGWjAV3BlMLVMYIIJUmR9KeWfwc&bctid=3082494089001
+        http://video.scholastic.com/services/player/bcpid2602614477001?bckey=AQ~~,AAAAAFv844g~,BASb5BU03X9zO_bolhfjuH41AJVXYFl_&bctid=3027833348001
+        http://trvideo.technologyreview.com/services/player/bcpid1237507476001?bckey=AQ~~,AAAAAAEgZvo~,jStb8wH-jnIlhYFjMUYJttcZynWzN1UG&bctid=1238876339001
+    */    
 };
\ No newline at end of file
diff --git a/plugins/links/brightcove-hosted.js b/plugins/links/brightcove-hosted.js
index ceac973fe..6a606de17 100644
--- a/plugins/links/brightcove-hosted.js
+++ b/plugins/links/brightcove-hosted.js
@@ -48,21 +48,6 @@ module.exports = {
         }
     }
 
-    /* Sample direct-video URLs:
-        http://video-embed.masslive.com/services/player/bcpid1949030308001?bctid=3082707357001&bckey=AQ~~,AAAAQBxUOok~,jSZP67EiqBfkIeiCdBewgHg1-uVWQxpS
-        http://video-embed.cleveland.com/services/player/bcpid1949055968001?bctid=3086114271001&bckey=AQ~~,AAAAQBxUNqE~,xKBGzTdiYSSRqIKPsPdkNW3W_DNtPBTa
-        http://video.archstl.org/services/player/bcpid1697747652001?bckey=AQ~~,AAABKmWKzxE~,jhq2mLafyYPtb2fDysY2ou3LA4sZBXej&bctid=2766873636001&iframe=true&height=275&width=485
-        http://video.popularmechanics.com/services/player/bcpid16382224001?bckey=AQ~~,AAAAAAyqBbs~,3zLG8i7OTQIWSRZG2AhyY0vOQ2Zz32h-&bctid=3087691540001
-        http://video.billboard.com/services/player/bcpid3063835940001?bckey=AQ~~,AAAAAEMcC3Y~,NII8yi9nN4ynMSuZMypu6TcjvNjfaYWZ&bclid=3064795148001&bctid=3082031207001
-        http://video-embed.nj.com/services/player/bcpid1950981419001?bctid=3092316229001&bckey=AQ~~,AAAAPLMILBk~,Vn8u6tPOf8Us2eD8W1ez5Zw-Ss_6Anfe
-        http://video.bafta.org/services/player/bcpid601325186001?bckey=AQ~~,AAAABxWZS7k~,uLPjGIDNpTmMdurNjyFkV6rYlN-J6re3&bctid=753252127001
-
-        http://video-embed.masslive.com/services/player/bcpid1949030308001?bctid=3082707357001&bckey=AQ~~,AAAAQBxUOok~,jSZP67EiqBfkIeiCdBewgHg1-uVWQxpS
-        http://video.symantec.com/services/player/bcpid975006955001?bckey=AQ%7E%7E%2CAAAABuIiy9k%7E%2CI8BhasVwr9wjJz4AWmdUlYymEtyorXkA&bctid=976391207001
-        http://video.elcolombiano.com/services/player/bcpid2115059022001?bckey=AQ~~,AAABMdBKz4k~,kXKBkGGWjAV3BlMLVMYIIJUmR9KeWfwc&bctid=3082494089001
-        http://video.scholastic.com/services/player/bcpid2602614477001?bckey=AQ~~,AAAAAFv844g~,BASb5BU03X9zO_bolhfjuH41AJVXYFl_&bctid=3027833348001
-        http://trvideo.technologyreview.com/services/player/bcpid1237507476001?bckey=AQ~~,AAAAAAEgZvo~,jStb8wH-jnIlhYFjMUYJttcZynWzN1UG&bctid=1238876339001
-    */
 
     /* Sample URLs with BrightCove Twitter Players:
         http://www.channel4.com/programmes/the-mill/videos/all/s1-ep2-the-introduction - unless denied

From 13e4773ce1cd3263eaba682278d37907510112d4 Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Fri, 11 Dec 2015 22:30:10 +0200
Subject: [PATCH 007/320] [core] remove forcePromo option

---
 lib/core.js                            |  4 ----
 lib/loader/utils.js                    |  1 -
 lib/plugins/system/oembed/oembed.js    | 10 ++--------
 lib/plugins/system/promo/promoEmbed.js |  2 +-
 lib/plugins/system/promo/promoLink.js  |  2 +-
 modules/api/views.js                   |  3 +--
 6 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/lib/core.js b/lib/core.js
index 2f9de2faa..d4b75e244 100644
--- a/lib/core.js
+++ b/lib/core.js
@@ -1350,10 +1350,6 @@
             context.__promoUri = options.promoUri;
         }
 
-        if (options.forcePromo) {
-            context.__forcePromo = true;
-        }
-
         if (options.getWhitelistRecord) {
             var whitelistRecord = options.getWhitelistRecord(uri);
             if (whitelistRecord) {
diff --git a/lib/loader/utils.js b/lib/loader/utils.js
index 7cf54aba7..452eb33b3 100644
--- a/lib/loader/utils.js
+++ b/lib/loader/utils.js
@@ -8,7 +8,6 @@
         "options",
         "request",
         "whitelistRecord",
-        "__forcePromo",
         "__readabilityEnabled"
     ];
 
diff --git a/lib/plugins/system/oembed/oembed.js b/lib/plugins/system/oembed/oembed.js
index 54f2e3e6d..e660de78d 100644
--- a/lib/plugins/system/oembed/oembed.js
+++ b/lib/plugins/system/oembed/oembed.js
@@ -3,7 +3,7 @@ var urlLib = require('url');
 
 module.exports = {
 
-    provides: ['self', '__promoUri', '__forcePromo'],
+    provides: ['self', '__promoUri'],
 
     getData: function(url, oembedLinks, options, cb) {
 
@@ -31,13 +31,7 @@ module.exports = {
 
             var promo = urlObj.query.promo;
 
-            if (promo === '1' || promo === 'true') {
-
-                return cb(null, {
-                    __forcePromo: true
-                });
-
-            } else if (promo.match(/https?:\/\/.+/i)) {
+            if (promo.match(/https?:\/\/.+/i)) {
 
                 return cb(null, {
                     __promoUri: promo
diff --git a/lib/plugins/system/promo/promoEmbed.js b/lib/plugins/system/promo/promoEmbed.js
index 1c0a7e4b5..ede430868 100644
--- a/lib/plugins/system/promo/promoEmbed.js
+++ b/lib/plugins/system/promo/promoEmbed.js
@@ -25,7 +25,7 @@ module.exports = {
 
     generic: true,
 
-    getData: function(__forcePromo, cheerio) {
+    getData: function(cheerio) {
 
         var embeds = cheerio('a[data-iframely-url]');
         if (embeds.length) {
diff --git a/lib/plugins/system/promo/promoLink.js b/lib/plugins/system/promo/promoLink.js
index 2ffea79a2..b516e6c12 100644
--- a/lib/plugins/system/promo/promoLink.js
+++ b/lib/plugins/system/promo/promoLink.js
@@ -5,7 +5,7 @@ module.exports = {
     generic: true,
 
     getData: function(meta, whitelistRecord, options) {
-        if (options.forcePromo || meta.promo && whitelistRecord.isAllowed && whitelistRecord.isAllowed('html-meta.promo')) {
+        if (meta.promo && whitelistRecord.isAllowed && whitelistRecord.isAllowed('html-meta.promo')) {
             return {
                 __promoUri: meta.promo
             };
diff --git a/modules/api/views.js b/modules/api/views.js
index 3e776c02a..1f9eaae87 100644
--- a/modules/api/views.js
+++ b/modules/api/views.js
@@ -70,8 +70,7 @@ module.exports = function(app) {
                     readability: getBooleanParam(req, 'readability'),
                     getWhitelistRecord: whitelist.findWhitelistRecordFor,
                     maxWidth: getIntParam(req, 'maxwidth') || getIntParam(req, 'max-width'),
-                    promoUri: req.query.promoUri,
-                    forcePromo: getBooleanParam(req, 'forcePromo')
+                    promoUri: req.query.promoUri
                 }, cb);
             }
 

From 151951c76965d1e6db087bf7b5bb958c4c210fb5 Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Fri, 11 Dec 2015 22:32:03 +0200
Subject: [PATCH 008/320] [promo] remove promoEmbed.js plugin

---
 lib/plugins/system/promo/promoEmbed.js | 74 --------------------------
 1 file changed, 74 deletions(-)
 delete mode 100644 lib/plugins/system/promo/promoEmbed.js

diff --git a/lib/plugins/system/promo/promoEmbed.js b/lib/plugins/system/promo/promoEmbed.js
deleted file mode 100644
index ede430868..000000000
--- a/lib/plugins/system/promo/promoEmbed.js
+++ /dev/null
@@ -1,74 +0,0 @@
-var urlLib = require('url');
-
-var iframelyApiRe = /iframe\.ly\/api\/iframe.+url=/i;
-
-var res = [
-    /iframe\.ly\/\w+/i,
-    iframelyApiRe,
-    /\/\/www\.youtube\.com\/embed\/\w+/i,
-    /\/\/player\.vimeo\.com\/video\/\d+/i,
-    /\/\/vine\.co\/v\/\w+\/embed/i
-];
-
-function extractGetParamUrl(src) {
-    if (src.match(iframelyApiRe)) {
-        var urlObj = urlLib.parse(src, true);
-        return urlObj.query['url'];
-    } else {
-        return src;
-    }
-}
-
-module.exports = {
-
-    provides: '__promoUri',
-
-    generic: true,
-
-    getData: function(cheerio) {
-
-        var embeds = cheerio('a[data-iframely-url]');
-        if (embeds.length) {
-            var href = embeds.attr('href');
-            return {
-                __promoUri: extractGetParamUrl(href)
-            };
-        }
-
-        embeds = cheerio('[data-embed-canonical]');
-        if (embeds.length) {
-            var href = embeds.attr('data-embed-canonical');
-            return {
-                __promoUri: href
-            };
-        }
-
-        embeds = cheerio('iframe');
-        var result;
-        embeds.each(function() {
-            if (result) {
-                return;
-            }
-            var src = cheerio(this).attr('src');
-
-            if (!src) {
-                return;
-            }
-
-            var i = 0;
-            while(i < res.length && !src.match(res[i])) {
-                i++;
-            }
-
-            if (i < res.length) {
-                result = src;
-            }
-        });
-
-        if (result) {
-            return {
-                __promoUri: extractGetParamUrl(result)
-            };
-        }
-    }
-};
\ No newline at end of file

From 04eed37441826db6ecb21cd54aa384c31e9c0047 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Fri, 11 Dec 2015 15:35:58 -0500
Subject: [PATCH 009/320] clean up promo meta plugin

---
 config.local.js.SAMPLE                | 3 ++-
 lib/plugins/system/promo/promoLink.js | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/config.local.js.SAMPLE b/config.local.js.SAMPLE
index 29322e65b..f4fc32a54 100644
--- a/config.local.js.SAMPLE
+++ b/config.local.js.SAMPLE
@@ -191,7 +191,8 @@
                 "image": "allow"
               },
               "html-meta": {
-                "video": ["allow", "responsive"]
+                "video": ["allow", "responsive"],
+                "promo": "allow"
               }
         }
         */
diff --git a/lib/plugins/system/promo/promoLink.js b/lib/plugins/system/promo/promoLink.js
index b516e6c12..bc075a27b 100644
--- a/lib/plugins/system/promo/promoLink.js
+++ b/lib/plugins/system/promo/promoLink.js
@@ -4,7 +4,7 @@ module.exports = {
 
     generic: true,
 
-    getData: function(meta, whitelistRecord, options) {
+    getData: function(meta, whitelistRecord) {
         if (meta.promo && whitelistRecord.isAllowed && whitelistRecord.isAllowed('html-meta.promo')) {
             return {
                 __promoUri: meta.promo

From 513b8fa97e6540849bc170723b53dd644920b055 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Fri, 11 Dec 2015 15:46:04 -0500
Subject: [PATCH 010/320] move promo oembedLink to separate plugin

---
 lib/plugins/system/oembed/oembed.js         | 17 +--------
 lib/plugins/system/promo/promoOembedLink.js | 38 +++++++++++++++++++++
 2 files changed, 39 insertions(+), 16 deletions(-)
 create mode 100644 lib/plugins/system/promo/promoOembedLink.js

diff --git a/lib/plugins/system/oembed/oembed.js b/lib/plugins/system/oembed/oembed.js
index e660de78d..a28432339 100644
--- a/lib/plugins/system/oembed/oembed.js
+++ b/lib/plugins/system/oembed/oembed.js
@@ -1,9 +1,8 @@
 var oembedUtils = require('./oembedUtils');
-var urlLib = require('url');
 
 module.exports = {
 
-    provides: ['self', '__promoUri'],
+    provides: 'self',
 
     getData: function(url, oembedLinks, options, cb) {
 
@@ -25,20 +24,6 @@ module.exports = {
             }
         }
 
-        if (self_endpoint) {
-
-            var urlObj = urlLib.parse(href, true);
-
-            var promo = urlObj.query.promo;
-
-            if (promo.match(/https?:\/\/.+/i)) {
-
-                return cb(null, {
-                    __promoUri: promo
-                });
-            }
-        }
-
         if (skip || self_endpoint) {
             return cb(null);
         }
diff --git a/lib/plugins/system/promo/promoOembedLink.js b/lib/plugins/system/promo/promoOembedLink.js
new file mode 100644
index 000000000..cd836d577
--- /dev/null
+++ b/lib/plugins/system/promo/promoOembedLink.js
@@ -0,0 +1,38 @@
+var urlLib = require('url');
+
+module.exports = {
+
+    provides: '__promoUri',
+
+    generic: true,
+
+    getData: function(oembedLinks, whitelistRecord) {
+
+		if (meta.promo && whitelistRecord.isAllowed && whitelistRecord.isAllowed('html-meta.promo')) {    	
+
+	        var href = oembedLinks[0].href;
+	        var self_endpoint = false;
+
+	        if (CONFIG.SELF_OEMBED_POINT_RE_LIST) {
+	            var i;
+	            for(i = 0; i < CONFIG.SELF_OEMBED_POINT_RE_LIST.length && !self_endpoint; i++) {
+	                self_endpoint = href.match(CONFIG.SELF_OEMBED_POINT_RE_LIST[i]);
+	            }
+	        }
+
+	        if (self_endpoint) {
+
+	            var urlObj = urlLib.parse(href, true);
+	            var promo = urlObj.query.promo;
+
+	            if (promo.match(/https?:\/\/.+/i)) {
+
+	                return {
+	                    __promoUri: promo
+	                };
+	            }
+	        }
+
+    	}
+    }
+};
\ No newline at end of file

From 21c8823cc4ad5d975e43fc440a20505c94462f4c Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Sat, 12 Dec 2015 15:56:46 -0500
Subject: [PATCH 011/320] move all promo-related plugins to one generic parsers
 folder

---
 plugins/links/{ => promo}/brightcove-hosted.js                | 0
 plugins/links/{ => promo}/og-youtube.js                       | 0
 .../promo/promoLink.js => plugins/links/promo/promo-link.js   | 2 --
 .../promoOembedLink.js => plugins/links/promo/promo-oembed.js | 4 +---
 {lib/plugins/system => plugins/links}/promo/promo.js          | 2 +-
 plugins/links/{ => promo}/twitter-youtube.js                  | 0
 6 files changed, 2 insertions(+), 6 deletions(-)
 rename plugins/links/{ => promo}/brightcove-hosted.js (100%)
 rename plugins/links/{ => promo}/og-youtube.js (100%)
 rename lib/plugins/system/promo/promoLink.js => plugins/links/promo/promo-link.js (93%)
 rename lib/plugins/system/promo/promoOembedLink.js => plugins/links/promo/promo-oembed.js (86%)
 rename {lib/plugins/system => plugins/links}/promo/promo.js (97%)
 rename plugins/links/{ => promo}/twitter-youtube.js (100%)

diff --git a/plugins/links/brightcove-hosted.js b/plugins/links/promo/brightcove-hosted.js
similarity index 100%
rename from plugins/links/brightcove-hosted.js
rename to plugins/links/promo/brightcove-hosted.js
diff --git a/plugins/links/og-youtube.js b/plugins/links/promo/og-youtube.js
similarity index 100%
rename from plugins/links/og-youtube.js
rename to plugins/links/promo/og-youtube.js
diff --git a/lib/plugins/system/promo/promoLink.js b/plugins/links/promo/promo-link.js
similarity index 93%
rename from lib/plugins/system/promo/promoLink.js
rename to plugins/links/promo/promo-link.js
index bc075a27b..e32041623 100644
--- a/lib/plugins/system/promo/promoLink.js
+++ b/plugins/links/promo/promo-link.js
@@ -2,8 +2,6 @@ module.exports = {
 
     provides: '__promoUri',
 
-    generic: true,
-
     getData: function(meta, whitelistRecord) {
         if (meta.promo && whitelistRecord.isAllowed && whitelistRecord.isAllowed('html-meta.promo')) {
             return {
diff --git a/lib/plugins/system/promo/promoOembedLink.js b/plugins/links/promo/promo-oembed.js
similarity index 86%
rename from lib/plugins/system/promo/promoOembedLink.js
rename to plugins/links/promo/promo-oembed.js
index cd836d577..9dce32f38 100644
--- a/lib/plugins/system/promo/promoOembedLink.js
+++ b/plugins/links/promo/promo-oembed.js
@@ -4,11 +4,9 @@ module.exports = {
 
     provides: '__promoUri',
 
-    generic: true,
-
     getData: function(oembedLinks, whitelistRecord) {
 
-		if (meta.promo && whitelistRecord.isAllowed && whitelistRecord.isAllowed('html-meta.promo')) {    	
+		if (whitelistRecord.isAllowed && whitelistRecord.isAllowed('html-meta.promo')) {    	
 
 	        var href = oembedLinks[0].href;
 	        var self_endpoint = false;
diff --git a/lib/plugins/system/promo/promo.js b/plugins/links/promo/promo.js
similarity index 97%
rename from lib/plugins/system/promo/promo.js
rename to plugins/links/promo/promo.js
index 1af1ed1f0..1cb53bcf7 100644
--- a/lib/plugins/system/promo/promo.js
+++ b/plugins/links/promo/promo.js
@@ -1,4 +1,4 @@
-var core = require('../../../core');
+var core = require('../../../lib/core');
 var _ = require('underscore');
 
 module.exports = {
diff --git a/plugins/links/twitter-youtube.js b/plugins/links/promo/twitter-youtube.js
similarity index 100%
rename from plugins/links/twitter-youtube.js
rename to plugins/links/promo/twitter-youtube.js

From cc71dd3ca7807b1177f673472a5fe0305b6f68eb Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Mon, 14 Dec 2015 16:55:42 -0500
Subject: [PATCH 012/320] [general] make sure favicon's content_length > 0

---
 lib/plugins/validators/async/20_checkFavicon.js | 5 +++++
 lib/utils.js                                    | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/plugins/validators/async/20_checkFavicon.js b/lib/plugins/validators/async/20_checkFavicon.js
index 2f33fb0ef..0bcd03eba 100644
--- a/lib/plugins/validators/async/20_checkFavicon.js
+++ b/lib/plugins/validators/async/20_checkFavicon.js
@@ -46,6 +46,11 @@ module.exports = {
                         link.error = "Non-image MIME type: '" + data.content_type + "'";
                     }
                 }
+                
+                if (data.code == 200 && data.content_length && data.content_length == 0) {
+                    link.error = "Image with 0 content_length";
+                }
+
             }
 
             // Store timing.
diff --git a/lib/utils.js b/lib/utils.js
index ab9e3d86b..264242497 100644
--- a/lib/utils.js
+++ b/lib/utils.js
@@ -668,7 +668,8 @@ var getUriStatus = function(uri, options, cb) {
             r.abort();
             cb(null, {
                 code: res.statusCode,
-                content_type: res.headers['content-type']
+                content_type: res.headers['content-type'],
+                content_length: res.headers['content-length'] || '0'
             });
         });
 };

From 26718bbf7ac8be5ff1cfdc914ecd3d9dc96a2403 Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Thu, 17 Dec 2015 15:47:50 +0200
Subject: [PATCH 013/320] [domains] twitter: custom API request cache TTL

---
 config.local.js.SAMPLE            | 3 ++-
 lib/request.js                    | 4 +++-
 plugins/domains/twitter.status.js | 1 +
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/config.local.js.SAMPLE b/config.local.js.SAMPLE
index e7b68e556..8be56ded2 100644
--- a/config.local.js.SAMPLE
+++ b/config.local.js.SAMPLE
@@ -108,7 +108,8 @@
                 access_token_secret: 'INSERT YOUR VALUE',
                 hide_media: false,
                 hide_thread: false,
-                omit_script: false
+                omit_script: false,
+                cache_ttl: 100 * 365 * 24 * 3600 // 100 Years.
             },
             flickr: {
                 apiKey: 'INSERT YOUR VALUE'
diff --git a/lib/request.js b/lib/request.js
index 81656260a..f6a6f8a35 100644
--- a/lib/request.js
+++ b/lib/request.js
@@ -34,9 +34,11 @@ module.exports = function(options, callback) {
 
     var prepareResult = options.prepareResult;
     var useCacheOnly = options.useCacheOnly;
+    var ttl = options.ttl;
 
     delete options.prepareData;
     delete options.useCacheOnly;
+    delete options.ttl;
 
     var prefix = CONFIG.API_REQUEST_CACHE_PREFIX ? (CONFIG.API_REQUEST_CACHE_PREFIX + ':') : '';
 
@@ -68,7 +70,7 @@ module.exports = function(options, callback) {
                             },
                             data: data
                         }, {
-                            ttl: CONFIG.API_REQUEST_CACHE_TTL
+                            ttl: ttl || CONFIG.API_REQUEST_CACHE_TTL
                         });
                     }
 
diff --git a/plugins/domains/twitter.status.js b/plugins/domains/twitter.status.js
index 300307630..87781039a 100644
--- a/plugins/domains/twitter.status.js
+++ b/plugins/domains/twitter.status.js
@@ -65,6 +65,7 @@ module.exports = {
                             oauth: oauth,
                             json: true,
                             useCacheOnly: blockExpireIn > 0,
+                            ttl: c.cache_ttl,
                             prepareResult: function(error, response, data, cb) {
 
                                 if (response.fromRequestCache) {

From 9511ee17c447f3962c6f4677fee193fc07712dae Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Thu, 17 Dec 2015 18:10:38 +0200
Subject: [PATCH 014/320] [oembed] do not leave undefined content_length in
 oembed response

---
 lib/oembed.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/oembed.js b/lib/oembed.js
index 8f2d674a5..8a93cc848 100644
--- a/lib/oembed.js
+++ b/lib/oembed.js
@@ -85,7 +85,7 @@ exports.getOembed = function(uri, data, options) {
             oembed.height = m.height;
         }
     }
-    if (link) {
+    if (link && link.content_length) {
         oembed.content_length = link.content_length;
     }
 

From cb772b98044ebc0b2abb6b9f1a87b41494e9ecf4 Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Thu, 17 Dec 2015 19:23:02 +0200
Subject: [PATCH 015/320] [meta] canonical: resolve relative path to absolute

---
 plugins/meta/canonical.js | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/plugins/meta/canonical.js b/plugins/meta/canonical.js
index 2a96b80b9..3b15ae4bf 100644
--- a/plugins/meta/canonical.js
+++ b/plugins/meta/canonical.js
@@ -1,8 +1,18 @@
+var urlLib = require('url');
+
 module.exports = {
 
-    getMeta: function(meta) {
-        return {
-            canonical: (meta.canonical && meta.canonical.href || meta.canonical) || (meta.og && meta.og.url) || (meta.twitter && meta.twitter.url)
-        };
+    getMeta: function(url, meta) {
+
+        var canonical = (meta.canonical && meta.canonical.href || meta.canonical) || (meta.og && meta.og.url) || (meta.twitter && meta.twitter.url);
+
+        if (canonical) {
+
+            canonical = urlLib.resolve(url, canonical);
+
+            return {
+                canonical: canonical
+            };
+        }
     }
 };
\ No newline at end of file

From a07fcd7a601f860d0ea1e71408d319bb2de0819f Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Thu, 17 Dec 2015 19:53:49 +0200
Subject: [PATCH 016/320] [config] add html-meta.embedURL option

---
 config.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/config.js b/config.js
index d3b701dbe..70ae46e61 100644
--- a/config.js
+++ b/config.js
@@ -139,7 +139,8 @@
                 "photo"
             ],
             "html-meta": [  // TODO: Need change to 'fb'.
-                "video"
+                "video",
+                "embedURL"
             ]
         },
 

From 1e5c900f9cdac2dc9189f08e1fd3896e2309b274 Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Thu, 17 Dec 2015 23:15:02 +0200
Subject: [PATCH 017/320] [whitelist] fix apply whitelist rels for embedURL
 video

---
 lib/whitelist.js                   |  9 +--------
 plugins/links/embedURL/embedURL.js |  4 ++--
 plugins/links/video_src.js         | 10 +++++++---
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/lib/whitelist.js b/lib/whitelist.js
index 0821cda8a..050eb325c 100644
--- a/lib/whitelist.js
+++ b/lib/whitelist.js
@@ -41,14 +41,7 @@
 
         if (sources.length == 0 && rels.indexOf("player") > -1) {
 
-            // Meta is not available in new version.
-            // Maybe need to create new tag.
-            //if (meta && meta.video_src) {
-                result.push({
-                    source: "html-meta",
-                    type: "video"
-                });
-            //}
+            // Skip single player rel.
 
         } else {
             sources.forEach(function(source) {
diff --git a/plugins/links/embedURL/embedURL.js b/plugins/links/embedURL/embedURL.js
index f9d026561..f0ea060dc 100644
--- a/plugins/links/embedURL/embedURL.js
+++ b/plugins/links/embedURL/embedURL.js
@@ -64,10 +64,10 @@ module.exports = {
                 type: type
             };
 
-            if (whitelistRecord.isAllowed('html-meta.embedURL', 'html5')) {
+            if (whitelistRecord.isAllowed('html-meta.embedURL', CONFIG.R.html5)) {
                 player.rel.push(CONFIG.R.html5);
             }
-            if (whitelistRecord.isAllowed('html-meta.embedURL', 'autoplay')) {
+            if (whitelistRecord.isAllowed('html-meta.embedURL', CONFIG.R.autoplay)) {
                 player.rel.push(CONFIG.R.autoplay);
             }
 
diff --git a/plugins/links/video_src.js b/plugins/links/video_src.js
index 64113f6b6..82356e108 100644
--- a/plugins/links/video_src.js
+++ b/plugins/links/video_src.js
@@ -17,9 +17,13 @@ module.exports = {
                 player.height = meta.video_height;
             }
 
-            if (whitelistRecord.isAllowed('html-meta.video', 'html5')) {
-                player.rel.push('html5');
-            }            
+            if (whitelistRecord.isAllowed('html-meta.video', CONFIG.R.html5)) {
+                player.rel.push(CONFIG.R.html5);
+            }
+
+            if (whitelistRecord.isAllowed('html-meta.video', CONFIG.R.autoplay)) {
+                player.rel.push(CONFIG.R.autoplay);
+            }
 
             return player;
         }

From d1763d1973fd3f34e8d89291b376bc65dca0de8a Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Fri, 18 Dec 2015 13:57:25 -0500
Subject: [PATCH 018/320] change default aspect ratio to 16:9

---
 config.js                          | 2 +-
 plugins/domains/kickstarter.com.js | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/config.js b/config.js
index d3b701dbe..39117e49d 100644
--- a/config.js
+++ b/config.js
@@ -33,7 +33,7 @@
         VERSION: version,
 
         SKIP_IFRAMELY_RENDERS: false,
-        DEFAULT_ASPECT_RATIO: 4 / 3,
+        DEFAULT_ASPECT_RATIO: 16 / 9,
 
         T: {
             text_html: "text/html",
diff --git a/plugins/domains/kickstarter.com.js b/plugins/domains/kickstarter.com.js
index a0d5f75ef..06dfee378 100644
--- a/plugins/domains/kickstarter.com.js
+++ b/plugins/domains/kickstarter.com.js
@@ -48,8 +48,6 @@ module.exports = {
 
             if ((meta.twitter && meta.twitter.card == 'player') || (meta.og && meta.og.type == 'video') || meta.video_src || (href && /video\.html$/.test(href))) {
 
-                console.log("was here");
-
                 links.push ({
                     href: href,
                     type: CONFIG.T.text_html,

From 3a40060c83199c71c25f095187a5eb72532dd1a7 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Fri, 18 Dec 2015 14:30:46 -0500
Subject: [PATCH 019/320] [domains] better support for Getty's international
 domains

---
 plugins/domains/gettyimages.com.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/plugins/domains/gettyimages.com.js b/plugins/domains/gettyimages.com.js
index 62eca8df9..ba6724225 100644
--- a/plugins/domains/gettyimages.com.js
+++ b/plugins/domains/gettyimages.com.js
@@ -3,7 +3,7 @@ var $ = require('cheerio');
 module.exports = {
 
     // Photos only for now. TODO: Stay tuned for when video embeds become available
-    re: /^https?:\/\/www\.gettyimages\.(com|ca|com\.au|be|dk|de|es|fr|in|ie|it|nl|co\.nz|no|at|pt|ch|fi|se|ae|co\.uk|co\.jp)\/detail\/([a-zA-Z0-9\-]+)\/[a-zA-Z0-9\-]+\/(\d+)/i,
+    re: /^https?:\/\/www\.gettyimages\.(com|ca|com\.au|be|dk|de|es|fr|in|ie|it|nl|co\.nz|no|at|pt|ch|fi|se|ae|co\.uk|co\.jp)\/detail\/([^\/]+)\/[^\/]+\/(\d+)/i,
 
     provides: 'getty',
 
@@ -68,6 +68,7 @@ module.exports = {
     tests: [
         "http://www.gettyimages.ca/detail/photo/reflection-of-trees-high-res-stock-photography/103260792",
         "http://www.gettyimages.com/detail/illustration/pizza-icons-white-series-royalty-free-illustration/185819032",
-        "http://www.gettyimages.de/detail/nachrichtenfoto/sylvie-meis-and-daniel-hartwich-attend-the-8th-show-of-nachrichtenfoto/493388593"
+        "http://www.gettyimages.de/detail/nachrichtenfoto/sylvie-meis-and-daniel-hartwich-attend-the-8th-show-of-nachrichtenfoto/493388593",
+        "http://www.gettyimages.fr/detail/photo-d'actualit%C3%A9/filipe-toledo-of-brasil-is-the-2015-quiksilver-pro-photo-dactualit%C3%A9/466056674?license"
     ]
 };
\ No newline at end of file

From f30713f62e331c9b7579e6cfd0a2bc0480ab1292 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Fri, 18 Dec 2015 15:08:40 -0500
Subject: [PATCH 020/320] [domains] add buzzfeed videos via youtube promo

---
 .../domains/buzzfeed.com/buzzfeed.isvideo.js  | 20 +++++++++++++
 .../domains/buzzfeed.com/buzzfeed.video.js    | 30 +++++++++++++++++++
 2 files changed, 50 insertions(+)
 create mode 100644 plugins/domains/buzzfeed.com/buzzfeed.isvideo.js
 create mode 100644 plugins/domains/buzzfeed.com/buzzfeed.video.js

diff --git a/plugins/domains/buzzfeed.com/buzzfeed.isvideo.js b/plugins/domains/buzzfeed.com/buzzfeed.isvideo.js
new file mode 100644
index 000000000..8dbce1a4e
--- /dev/null
+++ b/plugins/domains/buzzfeed.com/buzzfeed.isvideo.js
@@ -0,0 +1,20 @@
+module.exports = {
+
+    re: [
+        /^https?:\/\/www\.buzzfeed\.com\//i
+    ],
+
+    provides: "__isBuzzFeedVideo",
+
+    getData: function(twitter, cb) {
+
+        if (twitter.card === 'player') {
+            cb(null, {
+                __isBuzzFeedVideo: true
+            });
+        } else {
+            cb();
+        }
+
+    }
+};
diff --git a/plugins/domains/buzzfeed.com/buzzfeed.video.js b/plugins/domains/buzzfeed.com/buzzfeed.video.js
new file mode 100644
index 000000000..ad5a29708
--- /dev/null
+++ b/plugins/domains/buzzfeed.com/buzzfeed.video.js
@@ -0,0 +1,30 @@
+module.exports = {
+
+    provides: '__promoUri',    
+
+    re: [
+        /^https?:\/\/www\.buzzfeed\.com\//i
+    ],
+
+    mixins: [
+        "*"
+    ],    
+
+    getData: function(cheerio, __isBuzzFeedVideo, cb) {
+
+        var $el = cheerio('.video-embed-videopost');
+        var embed = JSON.parse($el.attr('rel:bf_bucket_data'));
+
+        if (embed.video && embed.video.url) {
+            cb (null, {
+                __promoUri: embed.video.url.replace(/^http:\/\/youtube/, 'https://www.youtube')
+            });
+        } else {
+            cb();
+        }
+    },
+
+    tests: [ 
+        "http://www.buzzfeed.com/brentbennett/star-wars-cast-members-do-star-wars-impersonations#.idE4zm45aA"
+    ]
+};

From 783dd26cecd63b64c205688c68d6e6c2523af591 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Mon, 21 Dec 2015 13:57:46 -0500
Subject: [PATCH 021/320] [domains] return Someecards parser

---
 plugins/.noneed/someecards.com.js | 35 -------------------------------
 plugins/domains/someecards.com.js | 21 +++++++++++++++++++
 2 files changed, 21 insertions(+), 35 deletions(-)
 delete mode 100644 plugins/.noneed/someecards.com.js
 create mode 100644 plugins/domains/someecards.com.js

diff --git a/plugins/.noneed/someecards.com.js b/plugins/.noneed/someecards.com.js
deleted file mode 100644
index a0b1acb96..000000000
--- a/plugins/.noneed/someecards.com.js
+++ /dev/null
@@ -1,35 +0,0 @@
-module.exports = {
-
-    notPlugin: true,
-
-    mixins: [
-        "og-title",
-        "og-site",
-        "canonical",
-        "favicon"
-    ],
-
-    getLink: function (meta) {
-        if (meta.twitter && meta.twitter.card == "photo" && meta.twitter.image) {
-            return {
-                href: meta.twitter.image.url || meta.twitter.image,
-                type: CONFIG.T.image,
-                rel: [CONFIG.R.image],
-                width: meta.twitter.image.width,
-                height: meta.twitter.image.height
-            };
-        }
-
-        if (meta.image_src) {
-            return {
-                href: meta.image_src,
-                type: CONFIG.t.image,
-                rel: [CONGIG.R.image]
-            }
-        }
-    },
-
-    tests: [
-        "http://www.someecards.com/usercards/viewcard/eea3c10dfaeb6ef8c6eb386707343c36"
-    ]
-};
diff --git a/plugins/domains/someecards.com.js b/plugins/domains/someecards.com.js
new file mode 100644
index 000000000..3d9ae857e
--- /dev/null
+++ b/plugins/domains/someecards.com.js
@@ -0,0 +1,21 @@
+module.exports = {
+
+    mixins: [
+        "*"
+    ],
+
+    getLink: function (og) {
+        if (og.type === "someecards:card" && og.image) {
+            return {
+                href: og.image.url || og.image,
+                type: CONFIG.T.image,
+                rel: [CONFIG.R.image, CONFIG.R.og],
+            };
+        }
+    },
+
+    tests: [
+        "http://www.someecards.com/usercards/viewcard/eea3c10dfaeb6ef8c6eb386707343c36",
+        "http://www.someecards.com/christmas-cards/theres-nothing-like-holiday-cheer-to-offset-devastating-seasonal-affective-disorder"
+    ]
+};
\ No newline at end of file

From d13aee972c4ae0a0b5b48fe649b156acfe4904bd Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Wed, 23 Dec 2015 17:05:02 +0200
Subject: [PATCH 022/320] [validators] add 'player' rel to video file link

---
 lib/plugins/validators/sync/10_video_hml5.js | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/lib/plugins/validators/sync/10_video_hml5.js b/lib/plugins/validators/sync/10_video_hml5.js
index 46f65faa3..e0614f506 100644
--- a/lib/plugins/validators/sync/10_video_hml5.js
+++ b/lib/plugins/validators/sync/10_video_hml5.js
@@ -2,8 +2,15 @@ module.exports = {
 
     prepareLink: function(link) {
         // Add 'html5' rel to 'video/*'.
-        if (link.type.indexOf('video/') === 0 && link.rel.indexOf('html5') === -1) {
-            link.rel.push('html5');
+        if (link.type.indexOf('video/') === 0) {
+
+            if (link.rel.indexOf('html5') === -1) {
+                link.rel.push('html5');
+            }
+
+            if (link.rel.indexOf('player') === -1) {
+                link.rel.push('player');
+            }
         }
     }
 };
\ No newline at end of file

From ec3b89d312dd0d42508b053c8e32b919a79ef416 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Fri, 25 Dec 2015 12:21:38 -0500
Subject: [PATCH 023/320] [domains] support amcharts

---
 plugins/domains/live.amcharts.com.js | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 plugins/domains/live.amcharts.com.js

diff --git a/plugins/domains/live.amcharts.com.js b/plugins/domains/live.amcharts.com.js
new file mode 100644
index 000000000..dda761d42
--- /dev/null
+++ b/plugins/domains/live.amcharts.com.js
@@ -0,0 +1,20 @@
+module.exports = {
+
+    re: /https?:\/\/live\.amcharts\.com\/([a-zA-Z0-9\-]+)/i,
+
+    mixins: ["*"],
+
+    getLink: function(urlMatch) {
+
+        return {
+            type: CONFIG.T.text_html,
+            rel: [CONFIG.R.app, CONFIG.R.ssl, CONFIG.R.html5],
+            href: 'https://live.amcharts.com/' + urlMatch[1] + '/embed/',
+            "aspect-ratio": 16 / 9
+        };
+    },
+
+    tests: [
+        "http://live.amcharts.com/UxZGR/"
+    ]
+};
\ No newline at end of file

From 2e569e4915681652e0fe036247d42bc1ca5ad3bf Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Fri, 25 Dec 2015 12:56:20 -0500
Subject: [PATCH 024/320] [core] better handle some Invalid images

---
 lib/plugins/validators/async/22_imageSize.js | 30 ++++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/lib/plugins/validators/async/22_imageSize.js b/lib/plugins/validators/async/22_imageSize.js
index 243ff7329..7078e8f9e 100644
--- a/lib/plugins/validators/async/22_imageSize.js
+++ b/lib/plugins/validators/async/22_imageSize.js
@@ -53,7 +53,7 @@ module.exports = {
                     };
                 }
 
-                if (error === 404 || (error.indexOf && error.indexOf('invalid') > -1)) {
+                if (error === 404 || (typeof error === 'string' && /invalid/i.test(error))) {
                     // Image not found. Exclude link from results.
                     link.error = error;
                 }
@@ -68,24 +68,24 @@ module.exports = {
                 if (data.content_length) {
                     link.content_length = data.content_length;
                 }
-            }
 
-            // Special case: add rel image for image file with specific size.
-            if (link.rel.indexOf(CONFIG.R.image) === -1 && link.rel.indexOf(CONFIG.R.file) > -1 && data.width >= 100 && data.height >= 100) {
-                link.rel.push(CONFIG.R.image);
-            }
+                // Special case: add rel image for image file with specific size.
+                if (link.rel.indexOf(CONFIG.R.image) === -1 && link.rel.indexOf(CONFIG.R.file) > -1 && data.width >= 100 && data.height >= 100) {
+                    link.rel.push(CONFIG.R.image);
+                }
 
-            if (link.rel.indexOf(CONFIG.R.file) > -1 && data.width === 1 && data.height === 1) {
-                link.error = "Too small image file";
-            }
+                if (link.rel.indexOf(CONFIG.R.file) > -1 && data.width === 1 && data.height === 1) {
+                    link.error = "Too small image file";
+                }
 
-            // Store timing.
-            if (options.debug && data && data._time) {
-                link._imageMeta = link._imageMeta || {};
-                link._imageMeta.time = data && data._time;
-            }
+                // Store timing.
+                if (options.debug && data && data._time) {
+                    link._imageMeta = link._imageMeta || {};
+                    link._imageMeta.time = data && data._time;
+                }
 
-            mediaPlugin.prepareLink(link, options);
+                mediaPlugin.prepareLink(link, options);
+            }
 
             cb();
         });

From 65a5991625f64b0e37cd7419d291a38364c3983d Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Sun, 27 Dec 2015 11:57:09 -0500
Subject: [PATCH 025/320] [domains] start of Amazon parser - get missing
 thumbnails

---
 plugins/domains/amazon.com.js | 47 +++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 plugins/domains/amazon.com.js

diff --git a/plugins/domains/amazon.com.js b/plugins/domains/amazon.com.js
new file mode 100644
index 000000000..c6373c374
--- /dev/null
+++ b/plugins/domains/amazon.com.js
@@ -0,0 +1,47 @@
+var $ = require('cheerio');
+
+module.exports = {
+
+    re: /^https?:\/\/www\.amazon\.(com|ca|com\.au|be|dk|de|es|fr|in|ie|it|nl|co\.nz|no|at|pt|ch|fi|se|ae|pl|co\.uk|co\.jp)\/([a-zA-Z0-9\-]+\/)?dp\/[a-zA-Z0-9\-]+/i,
+
+    provides: "__isAmazonImageNeeded",
+
+    mixins: [
+        "*"
+    ],
+
+    getLink: function(__isAmazonImageNeeded, cheerio) {
+
+        // Smart move: grab missing image from Pinterest share button
+        var $pin = cheerio('#tell-a-friend-byline a[href*="pinterest"], #tell-a-friend a[href*="pinterest"]');
+
+        if ($pin.length) {
+            
+            href = $pin.attr('href');
+            
+            return {
+                href: decodeURIComponent(decodeURIComponent(href.match(/media%3D([^&]+)/i)[1])),
+                rel: CONFIG.R.thumbnail,
+                type: CONFIG.T.image
+            }
+        }
+    },
+
+    getData: function (meta) {
+        if ((meta.twitter && meta.twitter.image) || (meta.og && meta.og.image)) {
+            return;
+        } else {
+            return {
+                __isAmazonImageNeeded: true
+            }
+        }
+    },
+
+    tests: [
+        "http://www.amazon.com/Vegucated/dp/B006LZSF8M/ref=sr_1_1?s=instant-video&ie=UTF8&qid=1372118186&sr=1-1&keywords=vegucated",
+        "http://www.amazon.com/The-Whole-Truth-Shaw-Book-ebook/dp/B0011UCPM4/ref=pd_zg_rss_ts_b_17_6?ie=UTF8&tag=recomshop-22",
+        "http://www.amazon.co.uk/Vegetable-Perfection-tasty-recipes-shoots/dp/1849757097/ref=asap_bc?ie=UTF8",
+        "http://www.amazon.com/Tapestry-Hanging-Mandala-Tapestries-Bedspread/dp/B00ODVE012/ref=sr_1_75?s=furniture&ie=UTF8&qid=1450055989&sr=1-75&keywords=tapestry",
+        "http://www.amazon.ca/The-Fight-Security-Failings-Political/dp/1250082986?tag=smarturl-ca-20"
+    ]
+};
\ No newline at end of file

From b4bddfeeb7c6484cfed01a85fb39abf872fbb682 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Sun, 27 Dec 2015 12:11:30 -0500
Subject: [PATCH 026/320] [domains] more URLs for Amazon products

---
 plugins/domains/amazon.com.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/plugins/domains/amazon.com.js b/plugins/domains/amazon.com.js
index c6373c374..37ccaf682 100644
--- a/plugins/domains/amazon.com.js
+++ b/plugins/domains/amazon.com.js
@@ -2,7 +2,10 @@ var $ = require('cheerio');
 
 module.exports = {
 
-    re: /^https?:\/\/www\.amazon\.(com|ca|com\.au|be|dk|de|es|fr|in|ie|it|nl|co\.nz|no|at|pt|ch|fi|se|ae|pl|co\.uk|co\.jp)\/([a-zA-Z0-9\-]+\/)?dp\/[a-zA-Z0-9\-]+/i,
+    re: [
+        /^https?:\/\/www\.amazon\.(com|ca|com\.au|be|dk|de|es|fr|in|ie|it|nl|co\.nz|no|at|pt|ch|fi|se|ae|pl|co\.uk|co\.jp)\/([a-zA-Z0-9\-]+\/)?dp\/[a-zA-Z0-9\-]+/i,
+        /^https?:\/\/www\.amazon\.(com|ca|com\.au|be|dk|de|es|fr|in|ie|it|nl|co\.nz|no|at|pt|ch|fi|se|ae|pl|co\.uk|co\.jp)\/gp\/product\/[a-zA-Z0-9\-]+/i
+    ],
 
     provides: "__isAmazonImageNeeded",
 
@@ -42,6 +45,7 @@ module.exports = {
         "http://www.amazon.com/The-Whole-Truth-Shaw-Book-ebook/dp/B0011UCPM4/ref=pd_zg_rss_ts_b_17_6?ie=UTF8&tag=recomshop-22",
         "http://www.amazon.co.uk/Vegetable-Perfection-tasty-recipes-shoots/dp/1849757097/ref=asap_bc?ie=UTF8",
         "http://www.amazon.com/Tapestry-Hanging-Mandala-Tapestries-Bedspread/dp/B00ODVE012/ref=sr_1_75?s=furniture&ie=UTF8&qid=1450055989&sr=1-75&keywords=tapestry",
-        "http://www.amazon.ca/The-Fight-Security-Failings-Political/dp/1250082986?tag=smarturl-ca-20"
+        "http://www.amazon.ca/The-Fight-Security-Failings-Political/dp/1250082986?tag=smarturl-ca-20",
+        "http://www.amazon.com/gp/product/B0057OC5O8/"
     ]
 };
\ No newline at end of file

From 1ce47a60eb07fb0d6ba3ab899bc62660215ae5aa Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Mon, 28 Dec 2015 12:41:12 -0500
Subject: [PATCH 027/320] [domains] move Flickr photos to native img html

---
 plugins/domains/flickr.com/flickr.photo.js | 25 ++++++++++++++++------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/plugins/domains/flickr.com/flickr.photo.js b/plugins/domains/flickr.com/flickr.photo.js
index ad81720ba..321db1fb0 100644
--- a/plugins/domains/flickr.com/flickr.photo.js
+++ b/plugins/domains/flickr.com/flickr.photo.js
@@ -12,7 +12,7 @@ module.exports = {
         "domain-icon"
     ],
 
-    getLink: function(urlMatch, request, options, cb) {
+    getLink: function(urlMatch, oembed, request, options, cb) {
         gUtils.getPhotoSizes(urlMatch[2], request, options.getProviderOptions('flickr.apiKey'), function(error, sizes) {
 
             if (error) {
@@ -47,12 +47,22 @@ module.exports = {
             var media_only = options.getProviderOptions('flickr.media_only', false);
 
             if (!media_only) {
-                result.splice(0, 0, {
-                    href: 'https://www.flickr.com/photos/' + urlMatch[1] + '/' + urlMatch[2] + '/player',
-                    rel: [CONFIG.R.image, CONFIG.R.player, CONFIG.R.html5],
-                    type: CONFIG.T.text_html,
-                    "aspect-ratio": last.width / last.height
-                });
+
+                if (oembed.html) {
+                    result.splice(0, 0, {
+                        html: oembed.html,
+                        rel: [CONFIG.R.image, CONFIG.R.ssl, CONFIG.R.inline, CONFIG.R.html5],
+                        type: CONFIG.T.text_html,
+                        "aspect-ratio": last.width / last.height
+                    });
+                } else { // future-proof, if html disappears
+                    result.splice(0, 0, {
+                        href: 'https://www.flickr.com/photos/' + urlMatch[1] + '/' + urlMatch[2] + '/player',
+                        rel: [CONFIG.R.image, CONFIG.R.player, CONFIG.R.html5],
+                        type: CONFIG.T.text_html,
+                        "aspect-ratio": last.width / last.height
+                    });
+                }
             }
 
             cb(null, result);
@@ -63,6 +73,7 @@ module.exports = {
         feed: "http://api.flickr.com/services/feeds/photos_public.gne"
     },
         "http://www.flickr.com/photos/jup3nep/8243797061/?f=hp",
+        "https://www.flickr.com/photos/marshal-banana/23869537421",
         {
             skipMixins: [
                 "oembed-title",

From 80b385e85c7f3ed3371b2f925256740c14e56bbb Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Mon, 28 Dec 2015 13:39:52 -0500
Subject: [PATCH 028/320] [domains] simplify Flickr parser

---
 config.local.js.SAMPLE                       |  4 -
 plugins/domains/flickr.com/flickr.photo.js   | 81 +++++++-------------
 plugins/domains/flickr.com/flickr.profile.js |  7 +-
 3 files changed, 28 insertions(+), 64 deletions(-)

diff --git a/config.local.js.SAMPLE b/config.local.js.SAMPLE
index 70f97a541..1057ab5df 100644
--- a/config.local.js.SAMPLE
+++ b/config.local.js.SAMPLE
@@ -110,10 +110,6 @@
                 hide_thread: false,
                 omit_script: false
             },
-            flickr: {
-                apiKey: 'INSERT YOUR VALUE'
-                // media_only: true     // disables slideshow and gives plain image
-            },
             "google.maps": {
             //  apiKey: 'INSERT YOUR VALUE' // not required, but recommended
             },
diff --git a/plugins/domains/flickr.com/flickr.photo.js b/plugins/domains/flickr.com/flickr.photo.js
index 321db1fb0..47c83918a 100644
--- a/plugins/domains/flickr.com/flickr.photo.js
+++ b/plugins/domains/flickr.com/flickr.photo.js
@@ -12,61 +12,33 @@ module.exports = {
         "domain-icon"
     ],
 
-    getLink: function(urlMatch, oembed, request, options, cb) {
-        gUtils.getPhotoSizes(urlMatch[2], request, options.getProviderOptions('flickr.apiKey'), function(error, sizes) {
-
-            if (error) {
-                return cb(error);
-            }
-
-            var result = sizes && sizes.map(function(size, idx) {
-
-                if (size.media == "photo") {
-
-                    return {
-                        href: size.source.replace(/^https?:/i, ""),
-                        width: size.width,
-                        height: size.height,
-                        type: CONFIG.T.image_jpeg,
-                        rel: size.width >= 800 || (idx === sizes.length - 1) ? CONFIG.R.image : CONFIG.R.thumbnail
-                    };
-
-                } else if (size.media == "video") {
-
-                    return {
-                        href: size.source,
-                        "aspect-ratio": size.width / size.height,
-                        type: /mp4/i.test(size.label) ? CONFIG.T.video_mp4 : CONFIG.T.flash,
-                        rel: CONFIG.R.player
-                    };
-                }
-            }) || [];
-
-            var last = sizes[sizes.length - 1];
-
-            var media_only = options.getProviderOptions('flickr.media_only', false);
-
-            if (!media_only) {
-
-                if (oembed.html) {
-                    result.splice(0, 0, {
-                        html: oembed.html,
-                        rel: [CONFIG.R.image, CONFIG.R.ssl, CONFIG.R.inline, CONFIG.R.html5],
-                        type: CONFIG.T.text_html,
-                        "aspect-ratio": last.width / last.height
-                    });
-                } else { // future-proof, if html disappears
-                    result.splice(0, 0, {
-                        href: 'https://www.flickr.com/photos/' + urlMatch[1] + '/' + urlMatch[2] + '/player',
-                        rel: [CONFIG.R.image, CONFIG.R.player, CONFIG.R.html5],
-                        type: CONFIG.T.text_html,
-                        "aspect-ratio": last.width / last.height
-                    });
-                }
-            }
+    getLink: function(oembed) {
+
+        var result =  [{
+            html: oembed.html,
+            rel: [oembed.type === 'photo' ? CONFIG.R.image : CONFIG.R.player, CONFIG.R.ssl, CONFIG.R.inline, CONFIG.R.html5],
+            type: CONFIG.T.text_html,
+            "aspect-ratio": oembed.width / oembed.height,
+            "max-width": oembed.width
+        } , {
+            href: oembed.thumbnail_url,
+            rel: CONFIG.R.thumbnail,
+            type: CONFIG.T.image_jpeg,
+            width: oembed.thumbnail_width,
+            heigh: oembed.thumbnail_height 
+        }];
+
+        if (oembed.type === 'photo') {
+            result.push ({
+                href: oembed.url,
+                rel: [CONFIG.R.image, CONFIG.R.thumbnail],
+                type: CONFIG.T.image_jpeg,
+                width: oembed.width,
+                heigh: oembed.height
+            });
+        }
 
-            cb(null, result);
-        });
+        return result;
     },
 
     tests: [{
@@ -74,6 +46,7 @@ module.exports = {
     },
         "http://www.flickr.com/photos/jup3nep/8243797061/?f=hp",
         "https://www.flickr.com/photos/marshal-banana/23869537421",
+        "http://www.flickr.com/photos/gonzai/6027481335/in/photostream/",
         {
             skipMixins: [
                 "oembed-title",
diff --git a/plugins/domains/flickr.com/flickr.profile.js b/plugins/domains/flickr.com/flickr.profile.js
index 872654352..56f1cccc6 100644
--- a/plugins/domains/flickr.com/flickr.profile.js
+++ b/plugins/domains/flickr.com/flickr.profile.js
@@ -3,12 +3,7 @@ module.exports = {
     re: /^https?:\/\/www\.flickr\.com\/photos\/([@a-zA-Z0-9_\.-]+)\/?([?#].*)?$/,
 
     mixins: [
-        "og-image",
-        "favicon",
-        "canonical",
-        "twitter-description",
-        "og-site",
-        "og-title"
+        "*"
     ],
 
     getLink: function(urlMatch, og) {

From 34f54b7f50f37fac0c156c4cc4c3af1d57cc57aa Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Tue, 29 Dec 2015 15:25:25 +0200
Subject: [PATCH 029/320] [meta] delete meta 'description' if it is equal to
 'title'

---
 lib/core.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/core.js b/lib/core.js
index d4b75e244..3de94e579 100644
--- a/lib/core.js
+++ b/lib/core.js
@@ -922,6 +922,10 @@
         // Remove _meta data.
         var canonical = result.meta.canonical;
 
+        if (result.meta.title === result.meta.description) {
+            delete result.meta.description;
+        }
+
         for(var i = 0; i < links.length;) {
             var link = links[i];
 

From 636650dd78a24149a873a2de804ea8ac57dbc2f3 Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Tue, 29 Dec 2015 16:17:33 +0200
Subject: [PATCH 030/320] [promo] accept app responsive iframes as promo

---
 plugins/links/promo/promo.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/plugins/links/promo/promo.js b/plugins/links/promo/promo.js
index 1cb53bcf7..c5eac6a15 100644
--- a/plugins/links/promo/promo.js
+++ b/plugins/links/promo/promo.js
@@ -37,6 +37,13 @@ module.exports = {
                 // Detect if has something except thumbnail.
                 hasGoodLinks = true;
             }
+
+            if (link.href && link.type === CONFIG.T.text_html && (!link.media || link.media["aspect-ratio"])) {
+                // Detect responsive iframes.
+                hasGoodLinks = true;
+                return true;
+            }
+
             return match.length;
         });
 

From d9c57cecff01714858385cda8ef4eeab920e1578 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Tue, 29 Dec 2015 12:32:17 -0500
Subject: [PATCH 031/320] [domains] add Discovery.com

---
 plugins/domains/discovery.com.js | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 plugins/domains/discovery.com.js

diff --git a/plugins/domains/discovery.com.js b/plugins/domains/discovery.com.js
new file mode 100644
index 000000000..1ca25e9a5
--- /dev/null
+++ b/plugins/domains/discovery.com.js
@@ -0,0 +1,26 @@
+module.exports = {
+
+    mixins: [
+        "*"
+    ],
+
+    getLink: function(meta, og) {
+
+        if (og.video && meta.shortlink && /https?:\/\/www\.discovery\.com\/\?p=\d+/i.test(meta.shortlink)) {
+
+            var id = meta.shortlink.match(/https?:\/\/www\.discovery\.com\/\?p=(\d+)/i)[1];
+
+            return {
+                href: "http://www.discovery.com/embed?page=" + id,
+                rel: [CONFIG.R.player], // not html5, not ssl
+                type: CONFIG.T.text_html,
+                "aspect-ratio": 16 / 9
+            }
+        }
+
+    },
+
+    tests: [
+        "http://www.discovery.com/tv-shows/mythbusters/videos/hindenburg-minimyth/"
+    ]
+};
\ No newline at end of file

From 3cead6a65530d8bc143ae94a2116c8e7545f9c45 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Tue, 29 Dec 2015 12:56:58 -0500
Subject: [PATCH 032/320] [general] try & return videos attached to og article
 with rel=promo

---
 plugins/links/og-video.js      | 18 ++++++++++++------
 plugins/meta/media-detector.js |  2 +-
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/plugins/links/og-video.js b/plugins/links/og-video.js
index 8746db2dc..7d063b00a 100644
--- a/plugins/links/og-video.js
+++ b/plugins/links/og-video.js
@@ -1,12 +1,18 @@
 var _ = require("underscore");
 var utils = require('./utils');
 
-function getVideoLinks(video, whitelistRecord) {
+function getVideoLinks(video, whitelistRecord, og) {
+
+    var rel = [CONFIG.R.player, CONFIG.R.og];
+
+    if (og.type && typeof og.type === 'string' && og.type.match(/article/i)) {
+        rel.push (CONFIG.R.promo);
+    }
 
     var players = [{
         href: video.url || video,
         type: CONFIG.T.maybe_text_html,
-        rel: [CONFIG.R.player, CONFIG.R.og],
+        rel: rel,
         width: video.width,
         height: video.height
     }];
@@ -15,7 +21,7 @@ function getVideoLinks(video, whitelistRecord) {
         players.push({
             href: video.secure_url,
             type: CONFIG.T.maybe_text_html,
-            rel: [CONFIG.R.player, CONFIG.R.og],
+            rel: rel,
             width: video.width,
             height: video.height
         });
@@ -25,7 +31,7 @@ function getVideoLinks(video, whitelistRecord) {
         players.push({
             href: video.iframe,
             type: CONFIG.T.maybe_text_html,
-            rel: [CONFIG.R.player, CONFIG.R.og],
+            rel: rel,
             width: video.width,
             height: video.height
         });
@@ -43,12 +49,12 @@ module.exports = {
             if (og.video instanceof Array) {
 
                 return utils.mergeMediaSize(_.flatten(og.video.map(function(video) {
-                    return getVideoLinks(video, whitelistRecord);
+                    return getVideoLinks(video, whitelistRecord, og);
                 })));
 
             } else if (og.video) {
 
-                return getVideoLinks(og.video, whitelistRecord);
+                return getVideoLinks(og.video, whitelistRecord, og);
             }
         }
     }
diff --git a/plugins/meta/media-detector.js b/plugins/meta/media-detector.js
index 56d975baa..6bab01a90 100644
--- a/plugins/meta/media-detector.js
+++ b/plugins/meta/media-detector.js
@@ -8,7 +8,7 @@ module.exports = {
 
         if (meta.og) {
 
-            if (meta.og.video || (meta.og.type && typeof meta.og.type === 'string' && meta.og.type.match(/video|movie/i) || /\/(video|videos)\//i.test(url))) {
+            if ((meta.og.video && !meta.og.type )|| (meta.og.type && typeof meta.og.type === 'string' && meta.og.type.match(/video|movie/i) || /\/(video|videos)\//i.test(url))) {
 
                 has_player = true;
             }

From c1f4a2cf76354c3a372612b84c63d51c6d1ad712 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Tue, 29 Dec 2015 15:26:51 -0500
Subject: [PATCH 033/320] Revert "[general] try & return videos attached to og
 article with rel=promo"

This reverts commit 3cead6a65530d8bc143ae94a2116c8e7545f9c45.
---
 plugins/links/og-video.js      | 18 ++++++------------
 plugins/meta/media-detector.js |  2 +-
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/plugins/links/og-video.js b/plugins/links/og-video.js
index 7d063b00a..8746db2dc 100644
--- a/plugins/links/og-video.js
+++ b/plugins/links/og-video.js
@@ -1,18 +1,12 @@
 var _ = require("underscore");
 var utils = require('./utils');
 
-function getVideoLinks(video, whitelistRecord, og) {
-
-    var rel = [CONFIG.R.player, CONFIG.R.og];
-
-    if (og.type && typeof og.type === 'string' && og.type.match(/article/i)) {
-        rel.push (CONFIG.R.promo);
-    }
+function getVideoLinks(video, whitelistRecord) {
 
     var players = [{
         href: video.url || video,
         type: CONFIG.T.maybe_text_html,
-        rel: rel,
+        rel: [CONFIG.R.player, CONFIG.R.og],
         width: video.width,
         height: video.height
     }];
@@ -21,7 +15,7 @@ function getVideoLinks(video, whitelistRecord, og) {
         players.push({
             href: video.secure_url,
             type: CONFIG.T.maybe_text_html,
-            rel: rel,
+            rel: [CONFIG.R.player, CONFIG.R.og],
             width: video.width,
             height: video.height
         });
@@ -31,7 +25,7 @@ function getVideoLinks(video, whitelistRecord, og) {
         players.push({
             href: video.iframe,
             type: CONFIG.T.maybe_text_html,
-            rel: rel,
+            rel: [CONFIG.R.player, CONFIG.R.og],
             width: video.width,
             height: video.height
         });
@@ -49,12 +43,12 @@ module.exports = {
             if (og.video instanceof Array) {
 
                 return utils.mergeMediaSize(_.flatten(og.video.map(function(video) {
-                    return getVideoLinks(video, whitelistRecord, og);
+                    return getVideoLinks(video, whitelistRecord);
                 })));
 
             } else if (og.video) {
 
-                return getVideoLinks(og.video, whitelistRecord, og);
+                return getVideoLinks(og.video, whitelistRecord);
             }
         }
     }
diff --git a/plugins/meta/media-detector.js b/plugins/meta/media-detector.js
index 6bab01a90..56d975baa 100644
--- a/plugins/meta/media-detector.js
+++ b/plugins/meta/media-detector.js
@@ -8,7 +8,7 @@ module.exports = {
 
         if (meta.og) {
 
-            if ((meta.og.video && !meta.og.type )|| (meta.og.type && typeof meta.og.type === 'string' && meta.og.type.match(/video|movie/i) || /\/(video|videos)\//i.test(url))) {
+            if (meta.og.video || (meta.og.type && typeof meta.og.type === 'string' && meta.og.type.match(/video|movie/i) || /\/(video|videos)\//i.test(url))) {
 
                 has_player = true;
             }

From dc6d9e529b0beef61cddb9fd3099e330e119e63f Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Sun, 3 Jan 2016 12:09:12 -0500
Subject: [PATCH 034/320] [domains] do not use Vine's oembed player

---
 plugins/domains/vine.co.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/domains/vine.co.js b/plugins/domains/vine.co.js
index 7a9823aba..854a5a3e2 100644
--- a/plugins/domains/vine.co.js
+++ b/plugins/domains/vine.co.js
@@ -7,7 +7,8 @@ module.exports = {
     mixins: [
         "twitter-player",
         "twitter-stream",
-        "oembed-video",
+        //"oembed-video",
+        "og-video",
         "oembed-thumbnail",
         "favicon",
         "oembed-author",

From 4442a9790cea1eeb51817e9042663b52a892657b Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Sun, 3 Jan 2016 12:20:38 -0500
Subject: [PATCH 035/320] [general] only use twitter:site as sitename when it
 matches the domain

---
 plugins/meta/twitter-site.js | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/plugins/meta/twitter-site.js b/plugins/meta/twitter-site.js
index b7873c83b..fc186c62d 100644
--- a/plugins/meta/twitter-site.js
+++ b/plugins/meta/twitter-site.js
@@ -2,10 +2,17 @@ module.exports = {
 
     lowestPriority: true,
 
-    getMeta: function(twitter) {
+    getMeta: function(url, twitter) {
 
-        return {
-            site: (twitter.site && twitter.site.value) || twitter.site
-        }
+    	var site = (twitter.site && twitter.site.value) || twitter.site;
+    	if (!site) {return;}
+
+    	site = site.replace(/^@/, '');
+
+    	if (url.indexOf(site.toLowerCase())) {
+	        return {
+	            site: site
+	        }
+    	}
     }
 };
\ No newline at end of file

From 876af3af2de58a3db4cb7cf3623350ac8b8d9164 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Mon, 4 Jan 2016 10:45:44 -0500
Subject: [PATCH 036/320] [domains] add option to customize Bandcamp

---
 config.local.js.SAMPLE          | 15 +++++++++++++++
 plugins/domains/bandcamp.com.js | 30 ++++++++++++++++++++++++------
 2 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/config.local.js.SAMPLE b/config.local.js.SAMPLE
index 1057ab5df..f03a61f02 100644
--- a/config.local.js.SAMPLE
+++ b/config.local.js.SAMPLE
@@ -159,6 +159,21 @@
                 media_only: true // disables branded player for gifs and returns just the image
             }
             */
+            /*
+            bandcamp: {
+                get_params: '/size=large/bgcol=333333/linkcol=ffffff/artwork=small/transparent=true/',
+                media: {
+                    album: {
+                        height: 472,
+                        'max-width': 700
+                    }, 
+                    track: {
+                        height: 120,
+                        'max-width': 700
+                    }
+                }
+            }
+            */            
         },
 
         // WHITELIST_WILDCARD, if present, will be added to whitelist as record for top level domain: "*"
diff --git a/plugins/domains/bandcamp.com.js b/plugins/domains/bandcamp.com.js
index f08ed01a2..076ac46b3 100644
--- a/plugins/domains/bandcamp.com.js
+++ b/plugins/domains/bandcamp.com.js
@@ -27,15 +27,18 @@ module.exports = {
         };
     },
 
-    getLinks: function(meta, twitter) {
+    getLinks: function(meta, twitter, options) {
 
-        if (twitter.site !== 'bandcamp') {
+        if (twitter.site !== 'bandcamp' || !twitter.player.value) {
             return;
         }
+        
+        var params = options.getProviderOptions('bandcamp');
+        var result = null;
 
-        if (meta.og && meta.og.video && meta.twitter.site == "bandcamp") {
+        if (!params && meta.og && meta.og.video) {
 
-            return [{
+            result = [{
                 href: meta.twitter.player.value,
                 type: CONFIG.T.text_html,
                 rel: [CONFIG.R.player, CONFIG.R.twitter, CONFIG.R.html5],
@@ -47,8 +50,23 @@ module.exports = {
                 rel: [CONFIG.R.player, CONFIG.R.og, CONFIG.R.html5],
                 "max-width": 700,
                 height: meta.og.video.height
-            }]
-        }        
+            }];
+
+        } else if (params) {
+
+            var album = /album=\d+/i.test(twitter.player.value) && twitter.player.value.match(/album=(\d+)/i)[1];
+            var track = /track=\d+/i.test(twitter.player.value) && twitter.player.value.match(/track=(\d+)/i)[1];
+
+            result = {
+                href: 'https://bandcamp.com/EmbeddedPlayer' + (album ? '/album=' + album : '') + (track ? '/track=' + track : '') + params.get_params, // (in /../../ way)
+                rel: [CONFIG.R.player, CONFIG.R.html5],
+                type: CONFIG.T.text_html,
+                media: album ? params.media.album : params.media.track
+            }
+
+        }
+
+        return result;
 
     },
 

From 50cf1761dbde3b58f80770e98f7310f0d8b9e4c2 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Mon, 4 Jan 2016 11:17:09 -0500
Subject: [PATCH 037/320] Revert "[domains] simplify Flickr parser"

This reverts commit 80b385e85c7f3ed3371b2f925256740c14e56bbb.
---
 config.local.js.SAMPLE                       |  4 +
 plugins/domains/flickr.com/flickr.photo.js   | 81 +++++++++++++-------
 plugins/domains/flickr.com/flickr.profile.js |  7 +-
 3 files changed, 64 insertions(+), 28 deletions(-)

diff --git a/config.local.js.SAMPLE b/config.local.js.SAMPLE
index f03a61f02..a82862f62 100644
--- a/config.local.js.SAMPLE
+++ b/config.local.js.SAMPLE
@@ -110,6 +110,10 @@
                 hide_thread: false,
                 omit_script: false
             },
+            flickr: {
+                apiKey: 'INSERT YOUR VALUE'
+                // media_only: true     // disables slideshow and gives plain image
+            },
             "google.maps": {
             //  apiKey: 'INSERT YOUR VALUE' // not required, but recommended
             },
diff --git a/plugins/domains/flickr.com/flickr.photo.js b/plugins/domains/flickr.com/flickr.photo.js
index 47c83918a..321db1fb0 100644
--- a/plugins/domains/flickr.com/flickr.photo.js
+++ b/plugins/domains/flickr.com/flickr.photo.js
@@ -12,33 +12,61 @@ module.exports = {
         "domain-icon"
     ],
 
-    getLink: function(oembed) {
-
-        var result =  [{
-            html: oembed.html,
-            rel: [oembed.type === 'photo' ? CONFIG.R.image : CONFIG.R.player, CONFIG.R.ssl, CONFIG.R.inline, CONFIG.R.html5],
-            type: CONFIG.T.text_html,
-            "aspect-ratio": oembed.width / oembed.height,
-            "max-width": oembed.width
-        } , {
-            href: oembed.thumbnail_url,
-            rel: CONFIG.R.thumbnail,
-            type: CONFIG.T.image_jpeg,
-            width: oembed.thumbnail_width,
-            heigh: oembed.thumbnail_height 
-        }];
-
-        if (oembed.type === 'photo') {
-            result.push ({
-                href: oembed.url,
-                rel: [CONFIG.R.image, CONFIG.R.thumbnail],
-                type: CONFIG.T.image_jpeg,
-                width: oembed.width,
-                heigh: oembed.height
-            });
-        }
+    getLink: function(urlMatch, oembed, request, options, cb) {
+        gUtils.getPhotoSizes(urlMatch[2], request, options.getProviderOptions('flickr.apiKey'), function(error, sizes) {
+
+            if (error) {
+                return cb(error);
+            }
+
+            var result = sizes && sizes.map(function(size, idx) {
+
+                if (size.media == "photo") {
+
+                    return {
+                        href: size.source.replace(/^https?:/i, ""),
+                        width: size.width,
+                        height: size.height,
+                        type: CONFIG.T.image_jpeg,
+                        rel: size.width >= 800 || (idx === sizes.length - 1) ? CONFIG.R.image : CONFIG.R.thumbnail
+                    };
+
+                } else if (size.media == "video") {
+
+                    return {
+                        href: size.source,
+                        "aspect-ratio": size.width / size.height,
+                        type: /mp4/i.test(size.label) ? CONFIG.T.video_mp4 : CONFIG.T.flash,
+                        rel: CONFIG.R.player
+                    };
+                }
+            }) || [];
+
+            var last = sizes[sizes.length - 1];
+
+            var media_only = options.getProviderOptions('flickr.media_only', false);
+
+            if (!media_only) {
+
+                if (oembed.html) {
+                    result.splice(0, 0, {
+                        html: oembed.html,
+                        rel: [CONFIG.R.image, CONFIG.R.ssl, CONFIG.R.inline, CONFIG.R.html5],
+                        type: CONFIG.T.text_html,
+                        "aspect-ratio": last.width / last.height
+                    });
+                } else { // future-proof, if html disappears
+                    result.splice(0, 0, {
+                        href: 'https://www.flickr.com/photos/' + urlMatch[1] + '/' + urlMatch[2] + '/player',
+                        rel: [CONFIG.R.image, CONFIG.R.player, CONFIG.R.html5],
+                        type: CONFIG.T.text_html,
+                        "aspect-ratio": last.width / last.height
+                    });
+                }
+            }
 
-        return result;
+            cb(null, result);
+        });
     },
 
     tests: [{
@@ -46,7 +74,6 @@ module.exports = {
     },
         "http://www.flickr.com/photos/jup3nep/8243797061/?f=hp",
         "https://www.flickr.com/photos/marshal-banana/23869537421",
-        "http://www.flickr.com/photos/gonzai/6027481335/in/photostream/",
         {
             skipMixins: [
                 "oembed-title",
diff --git a/plugins/domains/flickr.com/flickr.profile.js b/plugins/domains/flickr.com/flickr.profile.js
index 56f1cccc6..872654352 100644
--- a/plugins/domains/flickr.com/flickr.profile.js
+++ b/plugins/domains/flickr.com/flickr.profile.js
@@ -3,7 +3,12 @@ module.exports = {
     re: /^https?:\/\/www\.flickr\.com\/photos\/([@a-zA-Z0-9_\.-]+)\/?([?#].*)?$/,
 
     mixins: [
-        "*"
+        "og-image",
+        "favicon",
+        "canonical",
+        "twitter-description",
+        "og-site",
+        "og-title"
     ],
 
     getLink: function(urlMatch, og) {

From d0d2b6aa835ea7c30ec2510e643691f9cc500e54 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Mon, 4 Jan 2016 11:18:54 -0500
Subject: [PATCH 038/320] Revert "[domains] move Flickr photos to native img
 html"

This reverts commit 1ce47a60eb07fb0d6ba3ab899bc62660215ae5aa.
---
 plugins/domains/flickr.com/flickr.photo.js | 25 ++++++----------------
 1 file changed, 7 insertions(+), 18 deletions(-)

diff --git a/plugins/domains/flickr.com/flickr.photo.js b/plugins/domains/flickr.com/flickr.photo.js
index 321db1fb0..ad81720ba 100644
--- a/plugins/domains/flickr.com/flickr.photo.js
+++ b/plugins/domains/flickr.com/flickr.photo.js
@@ -12,7 +12,7 @@ module.exports = {
         "domain-icon"
     ],
 
-    getLink: function(urlMatch, oembed, request, options, cb) {
+    getLink: function(urlMatch, request, options, cb) {
         gUtils.getPhotoSizes(urlMatch[2], request, options.getProviderOptions('flickr.apiKey'), function(error, sizes) {
 
             if (error) {
@@ -47,22 +47,12 @@ module.exports = {
             var media_only = options.getProviderOptions('flickr.media_only', false);
 
             if (!media_only) {
-
-                if (oembed.html) {
-                    result.splice(0, 0, {
-                        html: oembed.html,
-                        rel: [CONFIG.R.image, CONFIG.R.ssl, CONFIG.R.inline, CONFIG.R.html5],
-                        type: CONFIG.T.text_html,
-                        "aspect-ratio": last.width / last.height
-                    });
-                } else { // future-proof, if html disappears
-                    result.splice(0, 0, {
-                        href: 'https://www.flickr.com/photos/' + urlMatch[1] + '/' + urlMatch[2] + '/player',
-                        rel: [CONFIG.R.image, CONFIG.R.player, CONFIG.R.html5],
-                        type: CONFIG.T.text_html,
-                        "aspect-ratio": last.width / last.height
-                    });
-                }
+                result.splice(0, 0, {
+                    href: 'https://www.flickr.com/photos/' + urlMatch[1] + '/' + urlMatch[2] + '/player',
+                    rel: [CONFIG.R.image, CONFIG.R.player, CONFIG.R.html5],
+                    type: CONFIG.T.text_html,
+                    "aspect-ratio": last.width / last.height
+                });
             }
 
             cb(null, result);
@@ -73,7 +63,6 @@ module.exports = {
         feed: "http://api.flickr.com/services/feeds/photos_public.gne"
     },
         "http://www.flickr.com/photos/jup3nep/8243797061/?f=hp",
-        "https://www.flickr.com/photos/marshal-banana/23869537421",
         {
             skipMixins: [
                 "oembed-title",

From ecb0ffbc6fb8a4487f7b0c78930fc181e0ebebd5 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Mon, 4 Jan 2016 12:10:41 -0500
Subject: [PATCH 039/320] [docs] add Bandcamp to the list of customization
 examples

---
 docs/PARAMS.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/docs/PARAMS.md b/docs/PARAMS.md
index bb5b294ff..b41cdcf73 100644
--- a/docs/PARAMS.md
+++ b/docs/PARAMS.md
@@ -43,9 +43,9 @@ Also, for [oEmbed API](https://iframely.com/docs/oembed-api) only:
 
 ## For individual embeds publishers
 
-By default, Iframely provides what we believe is the best embeds for any individual publisher. But tastes do differ.
+Number of publishers give different embedding options. By default, Iframely provides embeds that we believe is the best fit for most common use case. But you, of course, may need it differently.
 
-Iframely team can configure what embeds you get for most publishers with multiple options. [Send us an email](mailto:support@iframely.com) and we'll start from there. Most adjustments take less than 30 mins to turn around. Since it's a manual process, however, we only offer this option for paid accounts.
+In that case, Iframely team can configure the exact embeds you like for your favourite publishers. Since it's a manual process, we offer it for paid accounts only. [Send us an email](mailto:support@iframely.com) and we'll start from there. Most adjustments take less than 30 mins to manually turn around.
 
 Examples of what people often request: 
 
@@ -57,4 +57,6 @@ Examples of what people often request:
  - Show user message for Instagram embeds
  - Giphy: disable branded GIF player and use Iframely's [friendly GIFs](/docs/gifs) instead
  - Turn on support of Twitter videos (experimental)
+ - Bandcamp players
+ - Etc.
 

From f2520a49299d8cbaccf72d6d1371ecf5c5d2e5c6 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Mon, 4 Jan 2016 12:44:52 -0500
Subject: [PATCH 040/320] [domains] proper responsive hack for Flickr's photo
 html embeds

---
 config.local.js.SAMPLE                       |  4 --
 plugins/domains/flickr.com/flickr.gallery.js | 20 ++++--
 plugins/domains/flickr.com/flickr.photo.js   | 73 ++++++++------------
 plugins/domains/flickr.com/flickr.profile.js |  7 +-
 4 files changed, 44 insertions(+), 60 deletions(-)

diff --git a/config.local.js.SAMPLE b/config.local.js.SAMPLE
index a82862f62..f03a61f02 100644
--- a/config.local.js.SAMPLE
+++ b/config.local.js.SAMPLE
@@ -110,10 +110,6 @@
                 hide_thread: false,
                 omit_script: false
             },
-            flickr: {
-                apiKey: 'INSERT YOUR VALUE'
-                // media_only: true     // disables slideshow and gives plain image
-            },
             "google.maps": {
             //  apiKey: 'INSERT YOUR VALUE' // not required, but recommended
             },
diff --git a/plugins/domains/flickr.com/flickr.gallery.js b/plugins/domains/flickr.com/flickr.gallery.js
index f456b3f4f..4947a1828 100644
--- a/plugins/domains/flickr.com/flickr.gallery.js
+++ b/plugins/domains/flickr.com/flickr.gallery.js
@@ -1,17 +1,26 @@
 module.exports = {
 
-    re: /^https?:\/\/www\.flickr\.com(\/photos\/[@a-zA-Z0-9_\.]+\/sets\/(\d+))/i,
+    re: /^https?:\/\/www\.flickr\.com(\/photos\/[@a-zA-Z0-9_\.\-]+\/(?:sets|albums)\/(\d+))/i,    
 
     mixins: [
-        "*"
+        "oembed-thumbnail",
+        "domain-icon",
+        "oembed-author",
+        "oembed-site",
+        "oembed-title"
     ],
 
-    getLink: function(urlMatch) {
-        return {
+    getLink: function(urlMatch, oembed) {
+        return [{
             href: 'https://www.flickr.com/apps/slideshow/show.swf?v=143270&offsite=true&lang=en-us&page_show_url=' + encodeURIComponent(urlMatch[1] + '/show/') + '&page_show_back_url=' + encodeURIComponent(urlMatch[1] + '/') + '&set_id=' + encodeURIComponent(urlMatch[2]) + '&jump_to=',
             type: CONFIG.T.flash,
             rel: CONFIG.R.player
-        };
+        }, {
+            html: oembed.html.replace(/width=\"\d+\" height=\"\d+\" alt/, 'width="100%" alt'),
+            rel: [CONFIG.R.player, CONFIG.R.ssl, CONFIG.R.inline, CONFIG.R.html5],
+            type: CONFIG.T.text_html,
+            "aspect-ratio": oembed.width / oembed.height            
+        }];
     },
 
     tests: [
@@ -21,6 +30,7 @@ module.exports = {
             selector: "a.photo-list-album"
         },
         "http://www.flickr.com/photos/jup3nep/sets/72157603856136177/",
+        "https://www.flickr.com/photos/marshal-banana/albums/72157661935064149",
         {
             skipMixins: [
                 "twitter-author",
diff --git a/plugins/domains/flickr.com/flickr.photo.js b/plugins/domains/flickr.com/flickr.photo.js
index ad81720ba..2c05b8551 100644
--- a/plugins/domains/flickr.com/flickr.photo.js
+++ b/plugins/domains/flickr.com/flickr.photo.js
@@ -2,7 +2,7 @@ var gUtils = require('./utils');
 
 module.exports = {
 
-    re: /^https?:\/\/www\.flickr\.com\/photos\/([@a-zA-Z0-9_\.-]+)\/(\d+).*?$/i,
+    re: /^https?:\/\/www\.flickr\.com\/photos\/([@a-zA-Z0-9_\.\-]+)\/(\d+).*?$/i,
 
     mixins: [
         "oembed-title",
@@ -12,57 +12,40 @@ module.exports = {
         "domain-icon"
     ],
 
-    getLink: function(urlMatch, request, options, cb) {
-        gUtils.getPhotoSizes(urlMatch[2], request, options.getProviderOptions('flickr.apiKey'), function(error, sizes) {
-
-            if (error) {
-                return cb(error);
-            }
-
-            var result = sizes && sizes.map(function(size, idx) {
-
-                if (size.media == "photo") {
-
-                    return {
-                        href: size.source.replace(/^https?:/i, ""),
-                        width: size.width,
-                        height: size.height,
-                        type: CONFIG.T.image_jpeg,
-                        rel: size.width >= 800 || (idx === sizes.length - 1) ? CONFIG.R.image : CONFIG.R.thumbnail
-                    };
-
-                } else if (size.media == "video") {
-
-                    return {
-                        href: size.source,
-                        "aspect-ratio": size.width / size.height,
-                        type: /mp4/i.test(size.label) ? CONFIG.T.video_mp4 : CONFIG.T.flash,
-                        rel: CONFIG.R.player
-                    };
-                }
-            }) || [];
-
-            var last = sizes[sizes.length - 1];
-
-            var media_only = options.getProviderOptions('flickr.media_only', false);
-
-            if (!media_only) {
-                result.splice(0, 0, {
-                    href: 'https://www.flickr.com/photos/' + urlMatch[1] + '/' + urlMatch[2] + '/player',
-                    rel: [CONFIG.R.image, CONFIG.R.player, CONFIG.R.html5],
-                    type: CONFIG.T.text_html,
-                    "aspect-ratio": last.width / last.height
-                });
-            }
+    getLink: function(oembed) {
+
+        var result =  [{
+            html: oembed.html.replace(/width=\"\d+\" height=\"\d+\" alt/, 'width="100%" alt'),
+            rel: [oembed.type === 'photo' ? CONFIG.R.image : CONFIG.R.player, CONFIG.R.ssl, CONFIG.R.inline, CONFIG.R.html5],
+            type: CONFIG.T.text_html,
+            "aspect-ratio": oembed.width / oembed.height
+        } , {
+            href: oembed.thumbnail_url,
+            rel: CONFIG.R.thumbnail,
+            type: CONFIG.T.image_jpeg,
+            width: oembed.thumbnail_width,
+            heigh: oembed.thumbnail_height 
+        }];
+
+        if (oembed.type === 'photo') {
+            result.push ({
+                href: oembed.url,
+                rel: [CONFIG.R.image, CONFIG.R.thumbnail],
+                type: CONFIG.T.image_jpeg,
+                width: oembed.width,
+                heigh: oembed.height
+            });
+        }
 
-            cb(null, result);
-        });
+        return result;
     },
 
     tests: [{
         feed: "http://api.flickr.com/services/feeds/photos_public.gne"
     },
         "http://www.flickr.com/photos/jup3nep/8243797061/?f=hp",
+        "https://www.flickr.com/photos/marshal-banana/23869537421",
+        "http://www.flickr.com/photos/gonzai/6027481335/in/photostream/",
         {
             skipMixins: [
                 "oembed-title",
diff --git a/plugins/domains/flickr.com/flickr.profile.js b/plugins/domains/flickr.com/flickr.profile.js
index 872654352..56f1cccc6 100644
--- a/plugins/domains/flickr.com/flickr.profile.js
+++ b/plugins/domains/flickr.com/flickr.profile.js
@@ -3,12 +3,7 @@ module.exports = {
     re: /^https?:\/\/www\.flickr\.com\/photos\/([@a-zA-Z0-9_\.-]+)\/?([?#].*)?$/,
 
     mixins: [
-        "og-image",
-        "favicon",
-        "canonical",
-        "twitter-description",
-        "og-site",
-        "og-title"
+        "*"
     ],
 
     getLink: function(urlMatch, og) {

From dd8fe7473b142e397249a5ab5344aa00812715e8 Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Tue, 5 Jan 2016 15:46:26 +0200
Subject: [PATCH 041/320] [domains] flickr.com: update oembed provider

In url like:

https://www.flickr.com//photos/supportspartans/sets/72157630936017776/sh
ow/with/7727549982/

skip part /show/with/7727549982/
---
 lib/plugins/system/oembed/providers.json | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/plugins/system/oembed/providers.json b/lib/plugins/system/oembed/providers.json
index 726ccf643..f22ede731 100644
--- a/lib/plugins/system/oembed/providers.json
+++ b/lib/plugins/system/oembed/providers.json
@@ -39,9 +39,11 @@
     {
         "name": "Flickr",
         "templates": [
-            "(www\\.)?flickr\\.com/.*"
+            "(?:www\\.)?flickr\\.com/(photos/[@a-zA-Z0-9_\\.-]+/?(?:[?#].*)?$)",
+            "(?:www\\.)?flickr\\.com/(photos/[@a-zA-Z0-9_\\.-]+/\\d+.*?$)",
+            "(?:www\\.)?flickr\\.com/(photos/[@a-zA-Z0-9_\\.-]+/(?:sets|albums)/(?:\\d+))"
         ],
-        "endpoint": "http://www.flickr.com/services/oembed/"
+        "endpoint": "http://www.flickr.com/services/oembed/?format={format}&url=https://www.flickr.com/{1}"
     },
     {
         "name": "Hulu",

From 23f68e01f907d967f8e4ba705b588aed25cdca3a Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Tue, 5 Jan 2016 17:00:57 +0200
Subject: [PATCH 042/320] [domains] flickr.com gallery: fix lowercase 'n'

---
 plugins/domains/flickr.com/flickr.gallery.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/domains/flickr.com/flickr.gallery.js b/plugins/domains/flickr.com/flickr.gallery.js
index 4947a1828..b48317e8c 100644
--- a/plugins/domains/flickr.com/flickr.gallery.js
+++ b/plugins/domains/flickr.com/flickr.gallery.js
@@ -16,7 +16,9 @@ module.exports = {
             type: CONFIG.T.flash,
             rel: CONFIG.R.player
         }, {
-            html: oembed.html.replace(/width=\"\d+\" height=\"\d+\" alt/, 'width="100%" alt'),
+            html: oembed.html
+                .replace(/\@n/g, "@N")
+                .replace(/width=\"\d+\" height=\"\d+\" alt/, 'width="100%" alt'),
             rel: [CONFIG.R.player, CONFIG.R.ssl, CONFIG.R.inline, CONFIG.R.html5],
             type: CONFIG.T.text_html,
             "aspect-ratio": oembed.width / oembed.height            

From b8efd50728d5bdc4aac12656dd60ec2caf3174d2 Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Tue, 5 Jan 2016 18:17:48 +0200
Subject: [PATCH 043/320] [promo] promo-oembed: better promo check

---
 plugins/links/promo/promo-oembed.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/links/promo/promo-oembed.js b/plugins/links/promo/promo-oembed.js
index 9dce32f38..589f6fe39 100644
--- a/plugins/links/promo/promo-oembed.js
+++ b/plugins/links/promo/promo-oembed.js
@@ -23,7 +23,7 @@ module.exports = {
 	            var urlObj = urlLib.parse(href, true);
 	            var promo = urlObj.query.promo;
 
-	            if (promo.match(/https?:\/\/.+/i)) {
+	            if (promo && promo.match(/https?:\/\/.+/i)) {
 
 	                return {
 	                    __promoUri: promo

From d2981e0f5ce22e91afddcff9ffcd6bfd81173e92 Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Thu, 7 Jan 2016 20:06:50 +0200
Subject: [PATCH 044/320] [cache] do not use cache for meta and oembed if
 options.refrsh=true

---
 lib/plugins/system/meta/cachedMeta.js    | 43 ++++++++++++++----------
 lib/plugins/system/oembed/oembedUtils.js |  6 +++-
 modules/api/views.js                     |  6 ++--
 3 files changed, 35 insertions(+), 20 deletions(-)

diff --git a/lib/plugins/system/meta/cachedMeta.js b/lib/plugins/system/meta/cachedMeta.js
index 9dab478d0..e9011b7c1 100644
--- a/lib/plugins/system/meta/cachedMeta.js
+++ b/lib/plugins/system/meta/cachedMeta.js
@@ -6,31 +6,40 @@ module.exports = {
 
     provides: ['__noCachedMeta', 'meta'],
 
-    getData: function(url, cb) {
+    getData: function(url, options, cb) {
 
-        var meta_key = 'meta:' + url;
+        if (options.refresh) {
 
-        cache.get(meta_key, function(error, data) {
+            cb(null, {
+                __noCachedMeta: true
+            });
 
-            if (error) {
-                sysUtils.log('   -- Error loading cached meta for: ' + url + '. ' + error);
-            }
+        } else {
 
-            if (!error && data) {
+            var meta_key = 'meta:' + url;
 
-                sysUtils.log('   -- Using cached meta for: ' + url);
+            cache.get(meta_key, function(error, data) {
 
-                cb(error, {
-                    meta: data
-                });
+                if (error) {
+                    sysUtils.log('   -- Error loading cached meta for: ' + url + '. ' + error);
+                }
 
-            } else {
+                if (!error && data) {
 
-                cb(null, {
-                    __noCachedMeta: true
-                });
-            }
-        });
+                    sysUtils.log('   -- Using cached meta for: ' + url);
+
+                    cb(error, {
+                        meta: data
+                    });
+
+                } else {
+
+                    cb(null, {
+                        __noCachedMeta: true
+                    });
+                }
+            });
+        }
     }
 
 };
\ No newline at end of file
diff --git a/lib/plugins/system/oembed/oembedUtils.js b/lib/plugins/system/oembed/oembedUtils.js
index 2738a3a8c..ef60545e6 100644
--- a/lib/plugins/system/oembed/oembedUtils.js
+++ b/lib/plugins/system/oembed/oembedUtils.js
@@ -146,7 +146,11 @@ module.exports.getOembed = function(uri, options, callback) {
     async.waterfall([
 
         function(cb) {
-            cache.get(oembed_key, cb);
+            if (options.refresh) {
+                cb(null, null);
+            } else {
+                cache.get(oembed_key, cb);
+            }
         },
 
         function(data, cb) {
diff --git a/modules/api/views.js b/modules/api/views.js
index 1f9eaae87..e96976fe4 100644
--- a/modules/api/views.js
+++ b/modules/api/views.js
@@ -70,7 +70,8 @@ module.exports = function(app) {
                     readability: getBooleanParam(req, 'readability'),
                     getWhitelistRecord: whitelist.findWhitelistRecordFor,
                     maxWidth: getIntParam(req, 'maxwidth') || getIntParam(req, 'max-width'),
-                    promoUri: req.query.promoUri
+                    promoUri: req.query.promoUri,
+                    refresh: getBooleanParam(req, 'refresh')
                 }, cb);
             }
 
@@ -375,7 +376,8 @@ module.exports = function(app) {
                     getWhitelistRecord: whitelist.findWhitelistRecordFor,
                     filterNonSSL: getBooleanParam(req, 'ssl'),
                     filterNonHTML5: getBooleanParam(req, 'html5'),
-                    maxWidth: getIntParam(req, 'maxwidth') || getIntParam(req, 'max-width')
+                    maxWidth: getIntParam(req, 'maxwidth') || getIntParam(req, 'max-width'),
+                    refresh: getBooleanParam(req, 'refresh')
                 }, cb);
             }
 

From 4a69b03413f1ace8ff0a4cb244bc092cc3349e0a Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Thu, 7 Jan 2016 17:17:52 -0500
Subject: [PATCH 045/320] [domains] add Reddit comments

---
 plugins/domains/reddit.com/reddit.com.ejs |  1 +
 plugins/domains/reddit.com/reddit.com.js  | 26 +++++++++++++++++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 plugins/domains/reddit.com/reddit.com.ejs
 create mode 100644 plugins/domains/reddit.com/reddit.com.js

diff --git a/plugins/domains/reddit.com/reddit.com.ejs b/plugins/domains/reddit.com/reddit.com.ejs
new file mode 100644
index 000000000..ae1ba3bba
--- /dev/null
+++ b/plugins/domains/reddit.com/reddit.com.ejs
@@ -0,0 +1 @@
+<div class="reddit-embed" data-embed-media="www.redditmedia.com" data-embed-parent="false" data-embed-live="true" data-embed-created="<%= date %>"><a href="<%=url %>">Comment</a> from discussion <a href="<%=thread_url%>"><%=thread_title%></a>.</div><script async src="https://www.redditstatic.com/comment-embed.js"></script>
\ No newline at end of file
diff --git a/plugins/domains/reddit.com/reddit.com.js b/plugins/domains/reddit.com/reddit.com.js
new file mode 100644
index 000000000..eff630385
--- /dev/null
+++ b/plugins/domains/reddit.com/reddit.com.js
@@ -0,0 +1,26 @@
+module.exports = {
+
+    re: /^https?:\/\/(?:www|m\.)?reddit\.com\/r\/([^\/]+)\/comments\/([a-zA-Z0-9]+)\/([a-zA-Z0-9_]+)\/([a-zA-Z0-9]+)/i,
+
+    mixins: [
+        "*"
+    ],
+
+    getLink: function(urlMatch, twitter) {
+            
+        return {
+            template_context: {
+                url: 'https://reddit.com/r/' + urlMatch[1] + '/comments/' + urlMatch[2] + '/' + urlMatch[3] + '/' + urlMatch[4],
+                thread_title: twitter.title || 'reddit thread',
+                thread_url: 'https://reddit.com/r/' + urlMatch[1] + '/comments/' + urlMatch[2] + '/' + urlMatch[3],
+                date: new Date ()
+            },
+            type: CONFIG.T.text_html,
+            rel: [CONFIG.R.app, CONFIG.R.inline, CONFIG.R.ssl]
+        }
+    },
+
+    tests: [
+        "https://www.reddit.com/r/photography/comments/3ub9mo/official_mega_thread_black_friday_cyber_monday/cxdtl7r"
+    ]
+};
\ No newline at end of file

From 1c24d853c2d8bef1cb9dc42c6de569d992983e5d Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Fri, 8 Jan 2016 14:26:26 +0200
Subject: [PATCH 046/320] [domains] reddit.com: fix plugin regexp

---
 plugins/domains/reddit.com/reddit.com.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/domains/reddit.com/reddit.com.js b/plugins/domains/reddit.com/reddit.com.js
index eff630385..6f9a2cebe 100644
--- a/plugins/domains/reddit.com/reddit.com.js
+++ b/plugins/domains/reddit.com/reddit.com.js
@@ -1,13 +1,13 @@
 module.exports = {
 
-    re: /^https?:\/\/(?:www|m\.)?reddit\.com\/r\/([^\/]+)\/comments\/([a-zA-Z0-9]+)\/([a-zA-Z0-9_]+)\/([a-zA-Z0-9]+)/i,
+
+    re: /^https?:\/\/(?:www\.|m\.)?reddit\.com\/r\/([^\/]+)\/comments\/([a-zA-Z0-9]+)\/([a-zA-Z0-9_]+)\/([a-zA-Z0-9]+)/i,
 
     mixins: [
         "*"
     ],
 
     getLink: function(urlMatch, twitter) {
-            
         return {
             template_context: {
                 url: 'https://reddit.com/r/' + urlMatch[1] + '/comments/' + urlMatch[2] + '/' + urlMatch[3] + '/' + urlMatch[4],
@@ -17,7 +17,7 @@ module.exports = {
             },
             type: CONFIG.T.text_html,
             rel: [CONFIG.R.app, CONFIG.R.inline, CONFIG.R.ssl]
-        }
+        };
     },
 
     tests: [

From 3edd57960185d7672471d21db30cb0e573d08c09 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Fri, 8 Jan 2016 08:00:04 -0500
Subject: [PATCH 047/320] [domains] fix some cases for NBC

---
 plugins/domains/nbc.com.js               | 26 ++++++++++++++++++++++++
 plugins/domains/tumblr.com/tumblr.api.js |  2 +-
 2 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 plugins/domains/nbc.com.js

diff --git a/plugins/domains/nbc.com.js b/plugins/domains/nbc.com.js
new file mode 100644
index 000000000..f1a3d9ac5
--- /dev/null
+++ b/plugins/domains/nbc.com.js
@@ -0,0 +1,26 @@
+module.exports = {
+
+    mixins: [
+        "*"
+    ],
+
+    getLink: function(twitter) {
+
+        if (twitter.player && twitter.player.value && !/\/onsite_universal\//i.test(twitter.player.value)) { // avoid "this video is not allowed on this domain"        
+
+            return {
+                href: twitter.player.value,
+                type: CONFIG.T.text_html,
+                rel: [CONFIG.R.player, CONFIG.R.html5],
+                "aspect-ratio": twitter.player.width > twitter.player.height ? twitter.player.width / twitter.player.height : twitter.player.height / twitter.player.width
+                // yep, width and height can be mixed
+            }
+        }
+    },
+
+    tests: [
+        "https://www.nbc.com/the-tonight-show/video/alex-rodriguez-clears-up-his-animosity-toward-jimmy/2928739",
+        "http://www.nbc.com/late-night-with-seth-meyers/video/the-bots-performance-blinded/2845870" // US only, wrong width and height
+        // "http://www.nbc.com/saturday-night-live/video/hotline-bling-parody/2933534", // not allowed
+    ]
+};
\ No newline at end of file
diff --git a/plugins/domains/tumblr.com/tumblr.api.js b/plugins/domains/tumblr.com/tumblr.api.js
index c67e85baa..8318245c9 100644
--- a/plugins/domains/tumblr.com/tumblr.api.js
+++ b/plugins/domains/tumblr.com/tumblr.api.js
@@ -18,7 +18,7 @@ module.exports = {
         }
 
         return {
-            title: tumblr_post.title || caption || tumblr_post.blog_name,
+            title: tumblr_post.title || caption || tumblr_post.summary || tumblr_post.blog_name,
             site: 'Tumblr',
             author: tumblr_post.blog_name,
             author_url: 'http://' + tumblr_post.blog_name + '.tumblr.com',

From 2795bfa001943e57a42b36d5abcf286708b76e67 Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Fri, 8 Jan 2016 16:10:01 +0200
Subject: [PATCH 048/320] [domains] add "reddit comment" oembed endpoint

---
 lib/plugins/system/oembed/providers.json  |  7 ++++++
 plugins/domains/reddit.com/reddit.com.ejs |  1 -
 plugins/domains/reddit.com/reddit.com.js  | 26 -----------------------
 3 files changed, 7 insertions(+), 27 deletions(-)
 delete mode 100644 plugins/domains/reddit.com/reddit.com.ejs
 delete mode 100644 plugins/domains/reddit.com/reddit.com.js

diff --git a/lib/plugins/system/oembed/providers.json b/lib/plugins/system/oembed/providers.json
index f22ede731..f18cfb569 100644
--- a/lib/plugins/system/oembed/providers.json
+++ b/lib/plugins/system/oembed/providers.json
@@ -452,5 +452,12 @@
             "stock.adobe.com/.*"
         ],
         "endpoint": "https://stock.adobe.com/oembed"
+    },
+    {
+        "name": "Reddit comment",
+        "templates": [
+            "(?:www\\.|m\\.)?reddit\\.com/r/([^\/]+)/comments/([a-zA-Z0-9]+)/([a-zA-Z0-9_]+)/([a-zA-Z0-9]+)"
+        ],
+        "endpoint": "https://www.reddit.com/oembed"
     }
 ]
\ No newline at end of file
diff --git a/plugins/domains/reddit.com/reddit.com.ejs b/plugins/domains/reddit.com/reddit.com.ejs
deleted file mode 100644
index ae1ba3bba..000000000
--- a/plugins/domains/reddit.com/reddit.com.ejs
+++ /dev/null
@@ -1 +0,0 @@
-<div class="reddit-embed" data-embed-media="www.redditmedia.com" data-embed-parent="false" data-embed-live="true" data-embed-created="<%= date %>"><a href="<%=url %>">Comment</a> from discussion <a href="<%=thread_url%>"><%=thread_title%></a>.</div><script async src="https://www.redditstatic.com/comment-embed.js"></script>
\ No newline at end of file
diff --git a/plugins/domains/reddit.com/reddit.com.js b/plugins/domains/reddit.com/reddit.com.js
deleted file mode 100644
index 6f9a2cebe..000000000
--- a/plugins/domains/reddit.com/reddit.com.js
+++ /dev/null
@@ -1,26 +0,0 @@
-module.exports = {
-
-
-    re: /^https?:\/\/(?:www\.|m\.)?reddit\.com\/r\/([^\/]+)\/comments\/([a-zA-Z0-9]+)\/([a-zA-Z0-9_]+)\/([a-zA-Z0-9]+)/i,
-
-    mixins: [
-        "*"
-    ],
-
-    getLink: function(urlMatch, twitter) {
-        return {
-            template_context: {
-                url: 'https://reddit.com/r/' + urlMatch[1] + '/comments/' + urlMatch[2] + '/' + urlMatch[3] + '/' + urlMatch[4],
-                thread_title: twitter.title || 'reddit thread',
-                thread_url: 'https://reddit.com/r/' + urlMatch[1] + '/comments/' + urlMatch[2] + '/' + urlMatch[3],
-                date: new Date ()
-            },
-            type: CONFIG.T.text_html,
-            rel: [CONFIG.R.app, CONFIG.R.inline, CONFIG.R.ssl]
-        };
-    },
-
-    tests: [
-        "https://www.reddit.com/r/photography/comments/3ub9mo/official_mega_thread_black_friday_cyber_monday/cxdtl7r"
-    ]
-};
\ No newline at end of file

From 2cfb6c7ab790e93e742e82893d6abd1f729adb3c Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Sun, 10 Jan 2016 11:01:00 -0500
Subject: [PATCH 049/320] [domains] simple fix for monosnap's small twitter
 photos

---
 plugins/domains/monosnap.com.js | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 plugins/domains/monosnap.com.js

diff --git a/plugins/domains/monosnap.com.js b/plugins/domains/monosnap.com.js
new file mode 100644
index 000000000..48a789f12
--- /dev/null
+++ b/plugins/domains/monosnap.com.js
@@ -0,0 +1,9 @@
+module.exports = {
+
+    re: [
+        /^https?:\/\/monosnap\.com\/file\/[a-zA-Z0-9]+/i
+    ],
+
+    mixins: ['*', 'og-image-rel-image']
+
+};
\ No newline at end of file

From 9d90db2152c856fea3021136d2aaf9a3b2579476 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Sun, 10 Jan 2016 11:01:27 -0500
Subject: [PATCH 050/320] [domains] a little better regex for hosted brightcove

---
 plugins/links/promo/brightcove-hosted.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/links/promo/brightcove-hosted.js b/plugins/links/promo/brightcove-hosted.js
index 6a606de17..9cfb9e018 100644
--- a/plugins/links/promo/brightcove-hosted.js
+++ b/plugins/links/promo/brightcove-hosted.js
@@ -25,7 +25,7 @@ module.exports = {
         }
         
 
-        var urlMatch = video_src.match(/^https?:\/\/link\.brightcove\.com\/services\/player\/bcpid(\d+)\?/i);
+        var urlMatch = video_src.match(/^https?:\/\/link\.brightcove\.com\/services\/player\/bcpid(\d+)\/?\?/i);
 
         if (urlMatch) {
 

From d203178be8f6c1b24854cf21830a9d71ac575819 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Wed, 13 Jan 2016 07:40:53 -0500
Subject: [PATCH 051/320] [domain] config option to disable Vine player on
 mobile

---
 plugins/domains/vine.co.js | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/plugins/domains/vine.co.js b/plugins/domains/vine.co.js
index 854a5a3e2..d7f8d8b55 100644
--- a/plugins/domains/vine.co.js
+++ b/plugins/domains/vine.co.js
@@ -5,7 +5,7 @@ module.exports = {
     ],
 
     mixins: [
-        "twitter-player",
+        //"twitter-player",
         "twitter-stream",
         //"oembed-video",
         "og-video",
@@ -18,6 +18,22 @@ module.exports = {
         "oembed-title"
     ],
 
+    getLink: function (twitter, options) {
+
+        var rel = [CONFIG.R.player];
+
+        if (!(options.getProviderOptions("vine") && options.getProviderOptions("vine").disable_on_mobile)) {
+            rel.push(CONFIG.R.html5);
+        }
+
+        return {
+            href: twitter.player.value,
+            type: CONFIG.T.text_html,
+            rel: rel,
+            "aspect-ratio": twitter.player.width / twitter.player.height
+        }
+    },
+
     // plugin is left for tests and speed mostly, as it is well covered by generic plugins
     tests: [
         "https://vine.co/v/bjHh0zHdgZT",

From b8a6e6c48b31768ae0efacea9e56771f49bd20d5 Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Wed, 13 Jan 2016 14:52:34 +0200
Subject: [PATCH 052/320] [domain] config option to disable Vine player on
 mobile

---
 plugins/domains/vine.co.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/domains/vine.co.js b/plugins/domains/vine.co.js
index d7f8d8b55..c426cc29f 100644
--- a/plugins/domains/vine.co.js
+++ b/plugins/domains/vine.co.js
@@ -22,7 +22,7 @@ module.exports = {
 
         var rel = [CONFIG.R.player];
 
-        if (!(options.getProviderOptions("vine") && options.getProviderOptions("vine").disable_on_mobile)) {
+        if (!options.getProviderOptions("vine.disable_on_mobile")) {
             rel.push(CONFIG.R.html5);
         }
 

From 55635b0c47243d3317884367b8208eba0ddcbafc Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Wed, 13 Jan 2016 12:12:37 -0500
Subject: [PATCH 053/320] [meta] return media=reader for og:type==article

---
 plugins/meta/media-detector.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/meta/media-detector.js b/plugins/meta/media-detector.js
index 56d975baa..6bab01a90 100644
--- a/plugins/meta/media-detector.js
+++ b/plugins/meta/media-detector.js
@@ -8,7 +8,7 @@ module.exports = {
 
         if (meta.og) {
 
-            if (meta.og.video || (meta.og.type && typeof meta.og.type === 'string' && meta.og.type.match(/video|movie/i) || /\/(video|videos)\//i.test(url))) {
+            if ((meta.og.video && !meta.og.type )|| (meta.og.type && typeof meta.og.type === 'string' && meta.og.type.match(/video|movie/i) || /\/(video|videos)\//i.test(url))) {
 
                 has_player = true;
             }

From 94eb8c62c3958b49fe80d19c94b391803a303f2b Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Wed, 13 Jan 2016 12:27:13 -0500
Subject: [PATCH 054/320] [meta] do not force media=player on players if
 there's another media already

---
 lib/core.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/core.js b/lib/core.js
index 3de94e579..6af8f003f 100644
--- a/lib/core.js
+++ b/lib/core.js
@@ -956,7 +956,7 @@
                     }
                 }
 
-                if (link.rel.indexOf(CONFIG.R.player) > -1) {
+                if (link.rel.indexOf(CONFIG.R.player) > -1 && !(result.meta && result.meta.media)) {
                     result.meta.media = 'player';
                 }
 

From d9c3acdd0c2fcdf82c6418aa3dc22b2c03a87d38 Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Wed, 13 Jan 2016 19:31:15 +0200
Subject: [PATCH 055/320] [core] simplify check

---
 lib/core.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/core.js b/lib/core.js
index 6af8f003f..f70545581 100644
--- a/lib/core.js
+++ b/lib/core.js
@@ -956,7 +956,7 @@
                     }
                 }
 
-                if (link.rel.indexOf(CONFIG.R.player) > -1 && !(result.meta && result.meta.media)) {
+                if (!result.meta.media && link.rel.indexOf(CONFIG.R.player) > -1) {
                     result.meta.media = 'player';
                 }
 

From 3640560f225db47e8d0e998c9a1d686b671f44a2 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Thu, 14 Jan 2016 10:35:04 -0500
Subject: [PATCH 056/320] [domains] do not use rel promo for bleacher report

---
 plugins/domains/bleacherreport.com.js | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/plugins/domains/bleacherreport.com.js b/plugins/domains/bleacherreport.com.js
index 815ad95b6..88921beb7 100644
--- a/plugins/domains/bleacherreport.com.js
+++ b/plugins/domains/bleacherreport.com.js
@@ -7,13 +7,24 @@ module.exports = {
         if (oembed.type === 'video' && oembed.video_id) {
             return {
                 href: "http://bleacherreport.com/video_embed?id=" + oembed.video_id,
-                rel: [CONFIG.R.player, CONFIG.R.html5, CONFIG.R.promo],
+                rel: [CONFIG.R.player, CONFIG.R.html5],
                 type: CONFIG.T.text_html,
                 'aspect-ratio': 630 / 355
             }
         }
     },
 
+    getMeta: function (oembed) {
+
+        if (oembed.type === 'video' && oembed.video_id) {
+            return {
+                media: "player"
+            }
+        }
+    },
+
+    highestPriority: true,    
+
     tests: [
         "http://bleacherreport.com/articles/2522329-cam-newton-most-fun-substitute-teacher-ever"
         // Should not work - http://bleacherreport.com/articles/2580263-newsman-says-michigan-beat-michigan-state-while-reporting-outside-the-big-house (embeded video)

From ecb94de29a2634303c38a3430445ccfb3a049e13 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Thu, 14 Jan 2016 11:00:21 -0500
Subject: [PATCH 057/320] [domain] add popsugar vids

---
 plugins/domains/popsugar.com.js | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 plugins/domains/popsugar.com.js

diff --git a/plugins/domains/popsugar.com.js b/plugins/domains/popsugar.com.js
new file mode 100644
index 000000000..f3228e9d7
--- /dev/null
+++ b/plugins/domains/popsugar.com.js
@@ -0,0 +1,21 @@
+module.exports = {
+ 
+    mixins: ["*"],
+
+    getLink: function (twitter) {
+
+        if (twitter.player && twitter.player.stream) {
+            return {
+                href: (twitter.player.stream.value || twitter.player.stream).replace(/^https:\/\//, 'http://'), //https has broken redirects
+                rel: CONFIG.R.player,
+                type: CONFIG.T.maybe_text_html, // verify that it is ok
+                'aspect-ratio': 16/9
+            }
+        }
+    },
+
+    tests: [
+        "http://www.popsugar.com/home/House-Hunters-Spoof-Video-38029585",
+        "http://www.popsugar.com/celebrity/Viola-Davis-Sexual-Assault-Speech-Video-39127511"
+    ]
+};
\ No newline at end of file

From 137a99868b33bc9c7affff56a907d17fe46bbc31 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Thu, 14 Jan 2016 11:19:56 -0500
Subject: [PATCH 058/320] [domains] support nbcsports vids

---
 plugins/domains/nbcsports.com.js | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 plugins/domains/nbcsports.com.js

diff --git a/plugins/domains/nbcsports.com.js b/plugins/domains/nbcsports.com.js
new file mode 100644
index 000000000..416e14d35
--- /dev/null
+++ b/plugins/domains/nbcsports.com.js
@@ -0,0 +1,27 @@
+module.exports = {
+
+	re: [
+		/^https?:\/\/www\.nbcsports\.com\/videos?\/[a-zA-Z0-9-]+/i
+	],
+
+    mixins: [
+        "*"
+    ],
+
+    getLink: function(twitter) {
+
+        if (twitter.player) {
+
+            return {
+                href: twitter.player.stream.value || twitter.player.stream,
+                type: CONFIG.T.maybe_text_html, // verify, it is likely a text/html rather than mp4
+                rel: [CONFIG.R.player, CONFIG.R.html5],
+                "aspect-ratio": 16 / 9 // twitter.player width & height are incorrect
+            }
+        }
+    },
+
+    tests: [
+        "http://www.nbcsports.com/video/redskins-team-beat-wild-card-matchup-vs-packers"
+    ]
+};
\ No newline at end of file

From aaf3c790dc90ba84ba5c06f74e21e28a13c197fc Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Thu, 14 Jan 2016 19:59:45 -0500
Subject: [PATCH 059/320] [docs] better embed selector for buzzfeed

---
 plugins/domains/buzzfeed.com/buzzfeed.video.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/plugins/domains/buzzfeed.com/buzzfeed.video.js b/plugins/domains/buzzfeed.com/buzzfeed.video.js
index ad5a29708..fb324d4d3 100644
--- a/plugins/domains/buzzfeed.com/buzzfeed.video.js
+++ b/plugins/domains/buzzfeed.com/buzzfeed.video.js
@@ -12,7 +12,7 @@ module.exports = {
 
     getData: function(cheerio, __isBuzzFeedVideo, cb) {
 
-        var $el = cheerio('.video-embed-videopost');
+        var $el = cheerio('.video-embed-area');
         var embed = JSON.parse($el.attr('rel:bf_bucket_data'));
 
         if (embed.video && embed.video.url) {
@@ -25,6 +25,7 @@ module.exports = {
     },
 
     tests: [ 
-        "http://www.buzzfeed.com/brentbennett/star-wars-cast-members-do-star-wars-impersonations#.idE4zm45aA"
+        "http://www.buzzfeed.com/brentbennett/star-wars-cast-members-do-star-wars-impersonations#.idE4zm45aA",
+        "http://www.buzzfeed.com/tristanhill/if-you-won-the-lottery"
     ]
 };

From 96370bb6e0b2d2ca42fe01872f246e2ac464687e Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Fri, 15 Jan 2016 12:20:28 -0500
Subject: [PATCH 060/320] fix undefined on og-youtube

---
 plugins/links/promo/og-youtube.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/links/promo/og-youtube.js b/plugins/links/promo/og-youtube.js
index e91a67f8d..8aee03cfb 100644
--- a/plugins/links/promo/og-youtube.js
+++ b/plugins/links/promo/og-youtube.js
@@ -7,7 +7,7 @@ module.exports = {
         // do not process if there is a whitelist record for this domain as processing will take longer
         if (!whitelistRecord.isDefault && whitelistRecord.isAllowed && whitelistRecord.isAllowed('og.video')) {return;}
         
-        var video_src = (og.video && og.video.url) || og.video;
+        var video_src = (og.video && og.video.url) || (og.video && og.video.iframe) || og.video;
         if (!video_src || /youtube\.com|vimeo\.com|dailymotion\.com/.test(url) || video_src instanceof Array) {
             return;
         }

From dfc59be5ccff2a979879d311550d0687a7158d2e Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Fri, 15 Jan 2016 14:33:20 -0500
Subject: [PATCH 061/320] [domains] add support for cinesports

---
 plugins/domains/cinesport.video.js | 52 ++++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)
 create mode 100644 plugins/domains/cinesport.video.js

diff --git a/plugins/domains/cinesport.video.js b/plugins/domains/cinesport.video.js
new file mode 100644
index 000000000..44dfc084a
--- /dev/null
+++ b/plugins/domains/cinesport.video.js
@@ -0,0 +1,52 @@
+var cheerio = require('cheerio');
+
+module.exports = {
+
+    re: [
+        /^https?:\/\/cinesport\.(\w+)\.com\/[a-zA-Z0-9-]+/i,
+        /^https?:\/\/(?:www\.)?cinesport\.com\/[a-zA-Z0-9-]+/i
+    ],
+
+    mixins: ["*"],
+
+    getMeta: function (oembed) {
+        return {
+            keywords: oembed.keywords
+        }
+    },
+
+    getLink: function(oembed) {
+
+        if (!(oembed.type === 'video' && oembed.html)) {
+            return;
+        }
+
+        var $container = cheerio('<div>');
+        try{
+            $container.html(oembed.html);
+        } catch(ex) {}
+
+        var $iframe = $container.find('iframe');
+
+        if ($iframe.length == 1) {
+
+            var href = $iframe.attr('src');
+
+            return {
+                href: href,
+                type: CONFIG.T.text_html,
+                rel: [CONFIG.R.player, CONFIG.R.autoplay, CONFIG.R.html5],
+                "aspect-ratio": 1 /  0.5725
+            };
+        }
+
+    },
+
+    tests: [
+        "http://cinesport.stltoday.com/saint-louis-sports/matter-will-sanctions-hurt-mizzou/",
+        "http://www.cinesport.com/nba/three-jimmy-butler-scores-53-points/",
+        "http://www.cinesport.com/nhl/rutherford-blues-send-kroenke-message/",
+        "http://cinesport.cincinnati.com/cincinnati-sports/ap-alabama-tops-clemson-title-game/"
+    ]
+
+};
\ No newline at end of file

From 53c1a935a77372a08d45623309a62a462ea9a516 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Fri, 15 Jan 2016 14:50:12 -0500
Subject: [PATCH 062/320] [fb] fix  broken embeds for fb personal pages when
 "security check required"

---
 plugins/domains/facebook.com/facebook.data.js | 3 ++-
 plugins/domains/facebook.com/facebook.page.js | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/plugins/domains/facebook.com/facebook.data.js b/plugins/domains/facebook.com/facebook.data.js
index 62e8a64b5..d3cfd43ac 100644
--- a/plugins/domains/facebook.com/facebook.data.js
+++ b/plugins/domains/facebook.com/facebook.data.js
@@ -11,7 +11,8 @@ module.exports = {
 
     getMeta: function(meta) {
         return {
-            title: title = meta["description"] ? meta["description"]: meta["html-title"].replace(/ \| Facebook$/, "")
+            title: meta["html-title"].replace(/ \| Facebook$/, ""),
+            description: meta["description"]
         };
     },
 
diff --git a/plugins/domains/facebook.com/facebook.page.js b/plugins/domains/facebook.com/facebook.page.js
index f9fc3a0cf..2215522f0 100644
--- a/plugins/domains/facebook.com/facebook.page.js
+++ b/plugins/domains/facebook.com/facebook.page.js
@@ -8,7 +8,7 @@ module.exports = {
     getLink: function(meta, oembed, options) {
 
         // skip user profiles - they can not be embedded
-        if (meta.al && meta.al.android && meta.al.android.url && /\/profile\//.test(meta.al.android.url)) {
+        if (!meta.al || (meta.al && meta.al.android && meta.al.android.url && /\/profile\//.test(meta.al.android.url))) {
            return;
         }
 

From f1005e80fe094ada224c9c371b4e81fdd4c33bef Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Sat, 16 Jan 2016 09:27:36 -0500
Subject: [PATCH 063/320] [domains] add support for foxsports

---
 plugins/domains/foxsports.com.js | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 plugins/domains/foxsports.com.js

diff --git a/plugins/domains/foxsports.com.js b/plugins/domains/foxsports.com.js
new file mode 100644
index 000000000..858d944f0
--- /dev/null
+++ b/plugins/domains/foxsports.com.js
@@ -0,0 +1,29 @@
+module.exports = {
+
+    re: [
+        /^https?:\/\/www\.foxsports\.com\/video\/?\?vid=(\d+)/i
+    ],
+
+    mixins: [
+        "*"
+    ],    
+
+    getLink: function(urlMatch, cheerio) {
+
+        var $el = cheerio('.platformPlayer');
+        var player = JSON.parse($el.attr('data-player-config'));
+
+        if (player.share_embed && player.releaseURL) {
+            return {
+                href: '//player.foxfdm.com/sports/embed-iframe.html?videourl=' + player.releaseURL,
+                rel: [CONFIG.R.player, CONFIG.R.autoplay, CONFIG.R.html5],
+                type: CONFIG.T.text_html,
+                'aspect-ratio': 640 / 360
+            }
+        }
+    },
+
+    tests: [ 
+        "http://www.foxsports.com/video?vid=551579203750"
+    ]
+};

From 4d5984ad156dfb355f5727290356eafb3e719b1b Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Sat, 16 Jan 2016 09:31:55 -0500
Subject: [PATCH 064/320] [domains] some more URLs for foxsports

---
 plugins/domains/foxsports.com.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/plugins/domains/foxsports.com.js b/plugins/domains/foxsports.com.js
index 858d944f0..2b5984197 100644
--- a/plugins/domains/foxsports.com.js
+++ b/plugins/domains/foxsports.com.js
@@ -1,7 +1,7 @@
 module.exports = {
 
     re: [
-        /^https?:\/\/www\.foxsports\.com\/video\/?\?vid=(\d+)/i
+        /^https?:\/\/www\.foxsports\.com\/(?:\w+\/)?video\/?\?vid=(\d+)/i
     ],
 
     mixins: [
@@ -24,6 +24,7 @@ module.exports = {
     },
 
     tests: [ 
-        "http://www.foxsports.com/video?vid=551579203750"
+        "http://www.foxsports.com/video?vid=551579203750",
+        "http://www.foxsports.com/mlb/video?vid=602673731627"
     ]
 };

From b079550d06015d605f707ba9eda4a353b17d895d Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Mon, 18 Jan 2016 11:49:30 -0500
Subject: [PATCH 065/320] [general] better media detector for /video/ urls

---
 plugins/meta/date.js           | 2 +-
 plugins/meta/media-detector.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/meta/date.js b/plugins/meta/date.js
index 117c63e50..b02377d4b 100644
--- a/plugins/meta/date.js
+++ b/plugins/meta/date.js
@@ -2,7 +2,7 @@ module.exports = {
 
     getMeta: function(meta, url) {
 
-        var date = meta.date || meta.pubdate || meta.lastmod || (meta.article && meta.article.published_time) || meta['last-modified'];
+        var date = meta.date || meta.pubdate || meta.lastmod || (meta.article && meta.article.published_time) || meta['last-modified'] || meta.timestamp;
 
         // Can be multiple dates.
         if (date && date instanceof Array) {
diff --git a/plugins/meta/media-detector.js b/plugins/meta/media-detector.js
index 6bab01a90..bca43b6ae 100644
--- a/plugins/meta/media-detector.js
+++ b/plugins/meta/media-detector.js
@@ -8,7 +8,7 @@ module.exports = {
 
         if (meta.og) {
 
-            if ((meta.og.video && !meta.og.type )|| (meta.og.type && typeof meta.og.type === 'string' && meta.og.type.match(/video|movie/i) || /\/(video|videos)\//i.test(url))) {
+            if ((meta.og.video && !meta.og.type )|| (meta.og.type && typeof meta.og.type === 'string' && meta.og.type.match(/video|movie/i)) || /\/videos?\//i.test(url)) {
 
                 has_player = true;
             }

From 8b04a232b29e45e99f7f9bbec0c0301fdc5ad256 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Mon, 18 Jan 2016 11:53:55 -0500
Subject: [PATCH 066/320] [youtube] detect when embeds are not allowed

---
 plugins/domains/youtube.com/youtube.video.js | 33 +++++++++++++-------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/plugins/domains/youtube.com/youtube.video.js b/plugins/domains/youtube.com/youtube.video.js
index 55ae6dcb3..465e14849 100644
--- a/plugins/domains/youtube.com/youtube.video.js
+++ b/plugins/domains/youtube.com/youtube.video.js
@@ -24,7 +24,7 @@ module.exports = {
             return cb (new Error ("No youtube.api_key configured"));
         }
 
-        var statsUri = "https://www.googleapis.com/youtube/v3/videos?part=id%2Csnippet%2Cstatistics%2CcontentDetails%2Cplayer&key=" + api_key + "&id=" + urlMatch[1];
+        var statsUri = "https://www.googleapis.com/youtube/v3/videos?part=id%2Csnippet%2Cstatistics%2CcontentDetails%2Cplayer%2Cstatus&key=" + api_key + "&id=" + urlMatch[1];
 
         request({
             uri: statsUri,
@@ -67,7 +67,8 @@ module.exports = {
                         viewCount: entry.statistics && entry.statistics.viewCount,
 
                         hd: entry.contentDetails && entry.contentDetails.definition == "hd",
-                        playerHtml: entry.player && entry.player.embedHtml
+                        playerHtml: entry.player && entry.player.embedHtml,
+                        embeddable: entry.status ? entry.status.embeddable : true
                     };
 
                     if (entry.snippet && entry.snippet.thumbnails ) {
@@ -105,6 +106,7 @@ module.exports = {
             likes: youtube_video_gdata.likeCount,
             dislikes: youtube_video_gdata.dislikeCount,
             views: youtube_video_gdata.viewCount,
+            media: 'player', 
             site: "YouTube"
         };
     },
@@ -161,16 +163,6 @@ module.exports = {
         
 
         var links = [{
-            href: 'https://www.youtube.com/embed/' + youtube_video_gdata.id + params,
-            rel: [CONFIG.R.player, CONFIG.R.html5],
-            type: CONFIG.T.text_html,
-            "aspect-ratio": widescreen ? 16 / 9 : 4 / 3
-        }, {
-            href: 'https://www.youtube.com/embed/' + youtube_video_gdata.id + autoplay,
-            rel: [CONFIG.R.player, CONFIG.R.html5, CONFIG.R.autoplay],
-            type: CONFIG.T.text_html,
-            "aspect-ratio": widescreen ? 16 / 9 : 4 / 3
-        }, {
             href: youtube_video_gdata.thumbnails.mq && youtube_video_gdata.thumbnails.mq.url,
             rel: CONFIG.R.thumbnail,
             type: CONFIG.T.image_jpeg,
@@ -178,6 +170,22 @@ module.exports = {
             height: 180
         }];
 
+        if (youtube_video_gdata.embeddable) {
+            links.push({
+                href: 'https://www.youtube.com/embed/' + youtube_video_gdata.id + params,
+                rel: [CONFIG.R.player, CONFIG.R.html5],
+                type: CONFIG.T.text_html,
+                "aspect-ratio": widescreen ? 16 / 9 : 4 / 3
+            }); 
+
+            links.push({
+                href: 'https://www.youtube.com/embed/' + youtube_video_gdata.id + autoplay,
+                rel: [CONFIG.R.player, CONFIG.R.html5, CONFIG.R.autoplay],
+                type: CONFIG.T.text_html,
+                "aspect-ratio": widescreen ? 16 / 9 : 4 / 3
+            });
+        }
+
         if (youtube_video_gdata.thumbnails.maxres) {
             links.push({
                 href: youtube_video_gdata.thumbnails.maxres.url,
@@ -208,5 +216,6 @@ module.exports = {
     },
         "http://www.youtube.com/watch?v=etDRmrB9Css",
         "http://www.youtube.com/embed/Q_uaI28LGJk"
+        // embeds disabled - https://www.youtube.com/watch?v=e58FeKOgsU8
     ]
 };

From a16dac2a35543ead681c5448a280da625c7c2f67 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Mon, 18 Jan 2016 12:04:13 -0500
Subject: [PATCH 067/320] [core] allow new and custom request cache keys
 (unique) + cache migration

---
 lib/request.js | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/lib/request.js b/lib/request.js
index f6a6f8a35..15c8ef5c9 100644
--- a/lib/request.js
+++ b/lib/request.js
@@ -35,14 +35,18 @@ module.exports = function(options, callback) {
     var prepareResult = options.prepareResult;
     var useCacheOnly = options.useCacheOnly;
     var ttl = options.ttl;
+    var cache_key = options.cache_key;
+    var new_cache_key = options.new_cache_key; // this is to allow temp migration
 
     delete options.prepareData;
     delete options.useCacheOnly;
     delete options.ttl;
+    delete options.cache_key;
+    delete options.new_cache_key;
 
     var prefix = CONFIG.API_REQUEST_CACHE_PREFIX ? (CONFIG.API_REQUEST_CACHE_PREFIX + ':') : '';
 
-    var key = 'req:' + prefix + hash(JSON.stringify(options));
+    var key = 'req:' + prefix + (cache_key || hash(JSON.stringify(options)));
 
     cache.get(key, function(error, data) {
 
@@ -72,6 +76,19 @@ module.exports = function(options, callback) {
                         }, {
                             ttl: ttl || CONFIG.API_REQUEST_CACHE_TTL
                         });
+
+                        // temp cache migration, set new key as well
+                        if (new_cache_key) {
+                            cache.set('req:' + prefix + new_cache_key, {
+                                response: {
+                                    statusCode: response && response.statusCode,
+                                    headers: response.headers
+                                },
+                                data: data
+                            }, {
+                                ttl: ttl || CONFIG.API_REQUEST_CACHE_TTL
+                            });
+                        }
                     }
 
                     // Send prepared data up.

From 74dba1db754513cef87df6a875fa2d026ae2db77 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Mon, 18 Jan 2016 12:04:44 -0500
Subject: [PATCH 068/320] [youtube] move youtube to new custom cache key

---
 plugins/domains/youtube.com/youtube.video.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/domains/youtube.com/youtube.video.js b/plugins/domains/youtube.com/youtube.video.js
index 465e14849..40c9aa76e 100644
--- a/plugins/domains/youtube.com/youtube.video.js
+++ b/plugins/domains/youtube.com/youtube.video.js
@@ -28,6 +28,8 @@ module.exports = {
 
         request({
             uri: statsUri,
+            cache_key: "https://www.googleapis.com/youtube/v3/videos?part=id%2Csnippet%2Cstatistics%2CcontentDetails%2Cplayer&key=" + api_key + "&id=" + urlMatch[1],
+            new_cache_key: "youtube:" + urlMatch[1],
             json: true,
             prepareResult: function(error, b, data, cb) {
 

From ed1fe2cda61bcbcbf8623ad68e5f0b981e2df3a9 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Mon, 18 Jan 2016 12:18:01 -0500
Subject: [PATCH 069/320] [migrate keys] fix older yt cache key

---
 plugins/domains/youtube.com/youtube.video.js | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/plugins/domains/youtube.com/youtube.video.js b/plugins/domains/youtube.com/youtube.video.js
index 40c9aa76e..5c86a1280 100644
--- a/plugins/domains/youtube.com/youtube.video.js
+++ b/plugins/domains/youtube.com/youtube.video.js
@@ -1,4 +1,5 @@
 var cheerio = require('cheerio');
+var crypto = require('crypto'); // temp
 
 module.exports = {
 
@@ -26,10 +27,15 @@ module.exports = {
 
         var statsUri = "https://www.googleapis.com/youtube/v3/videos?part=id%2Csnippet%2Cstatistics%2CcontentDetails%2Cplayer%2Cstatus&key=" + api_key + "&id=" + urlMatch[1];
 
+        var cache_key = '"' + crypto.createHash('md5').update(JSON.stringify({
+            uri: "https://www.googleapis.com/youtube/v3/videos?part=id%2Csnippet%2Cstatistics%2CcontentDetails%2Cplayer&key=" + api_key + "&id=" + urlMatch[1], //old_one
+            json: true
+        })).digest("hex") + '"';
+
         request({
             uri: statsUri,
-            cache_key: "https://www.googleapis.com/youtube/v3/videos?part=id%2Csnippet%2Cstatistics%2CcontentDetails%2Cplayer&key=" + api_key + "&id=" + urlMatch[1],
-            new_cache_key: "youtube:" + urlMatch[1],
+            cache_key: cache_key,
+            new_cache_key: "youtube:gdata:" + urlMatch[1],
             json: true,
             prepareResult: function(error, b, data, cb) {
 

From 3ef146558df57e97a7f4f8480d070b84297f2911 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Mon, 18 Jan 2016 12:23:56 -0500
Subject: [PATCH 070/320] [migrate keys] simple cache key for Twitter oEmbed

---
 plugins/domains/twitter.status.js | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/plugins/domains/twitter.status.js b/plugins/domains/twitter.status.js
index 87781039a..9193db47e 100644
--- a/plugins/domains/twitter.status.js
+++ b/plugins/domains/twitter.status.js
@@ -2,6 +2,7 @@ var async = require('async');
 var cache = require('../../lib/cache');
 var sysUtils = require('../../logging');
 var _ = require('underscore');
+var crypto = require('crypto'); // temp
 
 module.exports = {
 
@@ -59,12 +60,22 @@ module.exports = {
                             omit_script: c.omit_script
                         };
 
+                        var cache_key = '"' + crypto.createHash('md5').update(JSON.stringify({
+                            url: 'https://api.twitter.com/1.1/statuses/oembed.json',
+                            qs: qs,
+                            oauth: oauth,
+                            json: true
+                        })).digest("hex") + '"';
+
+
                         request({
                             url: url,
                             qs: qs,
                             oauth: oauth,
                             json: true,
                             useCacheOnly: blockExpireIn > 0,
+                            cache_key: cache_key,
+                            new_cache_key: 'twitter:oembed:' + id,
                             ttl: c.cache_ttl,
                             prepareResult: function(error, response, data, cb) {
 

From a10d7f05f0b997f455e7b1ebd6d34ee81955dfb6 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Mon, 18 Jan 2016 14:23:39 -0500
Subject: [PATCH 071/320] [twitter] if API is blocked - fallback to oembed 1.0
 rather than generic parsers

---
 plugins/domains/twitter.status.js | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/plugins/domains/twitter.status.js b/plugins/domains/twitter.status.js
index 9193db47e..0c35be9cf 100644
--- a/plugins/domains/twitter.status.js
+++ b/plugins/domains/twitter.status.js
@@ -51,7 +51,7 @@ module.exports = {
 
                     oembed: function(cb) {
 
-                        var url = "https://api.twitter.com/1.1/statuses/oembed.json";
+                        var url = "https://api.twitter.com/1" + (blockExpireIn > 0 ? "" : ".1") + "/statuses/oembed.json";              
 
                         var qs = {
                             id: id,
@@ -68,12 +68,10 @@ module.exports = {
                         })).digest("hex") + '"';
 
 
-                        request({
+                        request(_.extend({
                             url: url,
-                            qs: qs,
-                            oauth: oauth,
+                            qs: qs,                            
                             json: true,
-                            useCacheOnly: blockExpireIn > 0,
                             cache_key: cache_key,
                             new_cache_key: 'twitter:oembed:' + id,
                             ttl: c.cache_ttl,
@@ -115,7 +113,7 @@ module.exports = {
                                         }
 
                                         // Store expire date as value to be sure it past.
-                                        var expireIn = now + ttl;
+                                        var expireIn = now + ttl;                                        
 
                                         cache.set(block_key, expireIn, {ttl: ttl});
                                     }
@@ -129,9 +127,10 @@ module.exports = {
                                     return cb('Object expected in Twitter API (statuses/oembed.json), got: ' + data);
                                 }
 
+
                                 cb(error, data);
                             }
-                        }, cb);
+                        }, (blockExpireIn > 0 ? null : {oauth: oauth})), cb); // add oauth if 1.1, else skip it
                     },
 
                     post: function(cb) {
@@ -181,10 +180,6 @@ module.exports = {
 
         ], function(error, data) {
 
-            if (error === 'no-cache') {
-                sysUtils.log('   -- Twitter API limit reached, plugin temporary disabled for ' + blockExpireIn + ' seconds.');
-                return cb('Twitter API limit reached, wait ' + blockExpireIn + ' seconds.');
-            }
 
             if (error) {
                 return cb(error);

From 1ec2c8c04f8257b14b71b53fb5cf810375442781 Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Mon, 18 Jan 2016 22:35:16 +0200
Subject: [PATCH 072/320] [domains] twitter: get is_video from og

---
 plugins/domains/twitter.status.js | 190 +++++++++++-------------------
 1 file changed, 68 insertions(+), 122 deletions(-)

diff --git a/plugins/domains/twitter.status.js b/plugins/domains/twitter.status.js
index 0c35be9cf..9e45d2ecf 100644
--- a/plugins/domains/twitter.status.js
+++ b/plugins/domains/twitter.status.js
@@ -14,7 +14,7 @@ module.exports = {
 
     mixins: ['domain-icon'],
 
-    getData: function(urlMatch, request, options, cb) {
+    getData: function(urlMatch, og, request, options, cb) {
         var id = urlMatch[1];
 
         var c = options.getProviderOptions("twitter") || options.getProviderOptions("twitter.status");
@@ -47,156 +47,102 @@ module.exports = {
                     }
                 }
 
-                async.parallel({
-
-                    oembed: function(cb) {
-
-                        var url = "https://api.twitter.com/1" + (blockExpireIn > 0 ? "" : ".1") + "/statuses/oembed.json";              
-
-                        var qs = {
-                            id: id,
-                            hide_media: c.hide_media,
-                            hide_thread: c.hide_thread,
-                            omit_script: c.omit_script
-                        };
-
-                        var cache_key = '"' + crypto.createHash('md5').update(JSON.stringify({
-                            url: 'https://api.twitter.com/1.1/statuses/oembed.json',
-                            qs: qs,
-                            oauth: oauth,
-                            json: true
-                        })).digest("hex") + '"';
-
-
-                        request(_.extend({
-                            url: url,
-                            qs: qs,                            
-                            json: true,
-                            cache_key: cache_key,
-                            new_cache_key: 'twitter:oembed:' + id,
-                            ttl: c.cache_ttl,
-                            prepareResult: function(error, response, data, cb) {
-
-                                if (response.fromRequestCache) {
-                                    if (blockExpireIn > 0) {
-                                        sysUtils.log('   -- Twitter API limit reached (' + blockExpireIn + ' seconds left), but cache used.');
-                                    } else {
-                                        sysUtils.log('   -- Twitter API cache used.');
-                                    }
-                                }
-
-                                // Do not block api if data from cache.
-                                if (!response.fromRequestCache) {
-
-                                    var remaining = parseInt(response.headers['x-rate-limit-remaining']);
-
-                                    if (response.statusCode === 429 || remaining <= 7) {
-                                        var now = Math.round(new Date().getTime() / 1000);
-                                        var limitResetAt = parseInt(response.headers['x-rate-limit-reset']);
-                                        var ttl = limitResetAt - now;
-
-                                        // Do not allow ttl 0.
-                                        // 5 seconds - to cover possible time difference with twitter.
-                                        if (ttl < 5) {
-                                            ttl = 5;
-                                        }
+                var url = "https://api.twitter.com/1" + (blockExpireIn > 0 ? "" : ".1") + "/statuses/oembed.json";
+
+                var qs = {
+                    id: id,
+                    hide_media: c.hide_media,
+                    hide_thread: c.hide_thread,
+                    omit_script: c.omit_script
+                };
+
+                var cache_key = '"' + crypto.createHash('md5').update(JSON.stringify({
+                        url: 'https://api.twitter.com/1.1/statuses/oembed.json',
+                        qs: qs,
+                        oauth: oauth,
+                        json: true
+                    })).digest("hex") + '"';
+
+
+                request(_.extend({
+                    url: url,
+                    qs: qs,
+                    json: true,
+                    cache_key: cache_key,
+                    new_cache_key: 'twitter:oembed:' + id,
+                    ttl: c.cache_ttl,
+                    prepareResult: function(error, response, data, cb) {
+
+                        if (response.fromRequestCache) {
+                            if (blockExpireIn > 0) {
+                                sysUtils.log('   -- Twitter API limit reached (' + blockExpireIn + ' seconds left), but cache used.');
+                            } else {
+                                sysUtils.log('   -- Twitter API cache used.');
+                            }
+                        }
 
-                                        // Block maximum for 15 minutes.
-                                        if (ttl > 15*60) {
-                                            ttl = 15*60
-                                        }
+                        // Do not block api if data from cache.
+                        if (!response.fromRequestCache) {
 
-                                        if (response.statusCode === 429) {
-                                            sysUtils.log('   -- Twitter API limit reached by status code 429. Disabling for ' + ttl + ' seconds.');
-                                        } else {
-                                            sysUtils.log('   -- Twitter API limit warning, remaining calls: ' + remaining + '. Disabling for ' + ttl + ' seconds.');
-                                        }
+                            var remaining = parseInt(response.headers['x-rate-limit-remaining']);
 
-                                        // Store expire date as value to be sure it past.
-                                        var expireIn = now + ttl;                                        
+                            if (response.statusCode === 429 || remaining <= 7) {
+                                var now = Math.round(new Date().getTime() / 1000);
+                                var limitResetAt = parseInt(response.headers['x-rate-limit-reset']);
+                                var ttl = limitResetAt - now;
 
-                                        cache.set(block_key, expireIn, {ttl: ttl});
-                                    }
+                                // Do not allow ttl 0.
+                                // 5 seconds - to cover possible time difference with twitter.
+                                if (ttl < 5) {
+                                    ttl = 5;
                                 }
 
-                                if (response.statusCode !== 200) {
-                                    return cb('Non-200 response from Twitter API (statuses/oembed.json: ' + response.statusCode);
+                                // Block maximum for 15 minutes.
+                                if (ttl > 15*60) {
+                                    ttl = 15*60
                                 }
 
-                                if (typeof data !== 'object') {
-                                    return cb('Object expected in Twitter API (statuses/oembed.json), got: ' + data);
+                                if (response.statusCode === 429) {
+                                    sysUtils.log('   -- Twitter API limit reached by status code 429. Disabling for ' + ttl + ' seconds.');
+                                } else {
+                                    sysUtils.log('   -- Twitter API limit warning, remaining calls: ' + remaining + '. Disabling for ' + ttl + ' seconds.');
                                 }
 
+                                // Store expire date as value to be sure it past.
+                                var expireIn = now + ttl;
 
-                                cb(error, data);
+                                cache.set(block_key, expireIn, {ttl: ttl});
                             }
-                        }, (blockExpireIn > 0 ? null : {oauth: oauth})), cb); // add oauth if 1.1, else skip it
-                    },
-
-                    post: function(cb) {
-
-                        var show_video = c.media_only;
-
-                        if (show_video) {
-
-                            var url = "https://api.twitter.com/1.1/statuses/show.json";
-
-                            var qs = {
-                                id: id
-                            };
-
-                            request({
-                                url: url,
-                                qs: qs,
-                                oauth: oauth,
-                                json: true,
-                                useCacheOnly: blockExpireIn > 0,
-                                prepareResult: function(error, response, data, cb) {
-
-                                    if (response.statusCode !== 200) {
-                                        return cb('Non-200 response from Twitter API (statuses/show.json): ' + response.statusCode);
-                                    }
+                        }
 
-                                    if (typeof data !== 'object') {
-                                        return cb('Object expected in Twitter API (statuses/show.json), got: ' + data);
-                                    }
+                        if (response.statusCode !== 200) {
+                            return cb('Non-200 response from Twitter API (statuses/oembed.json: ' + response.statusCode);
+                        }
 
-                                    var is_video = !!_.find(data.extended_entities && data.extended_entities.media, function(m) {
-                                        return m.video_info && m.type === "video";
-                                    });
+                        if (typeof data !== 'object') {
+                            return cb('Object expected in Twitter API (statuses/oembed.json), got: ' + data);
+                        }
 
-                                    cb(error, {
-                                        is_video: is_video
-                                    });
-                                }
-                            }, cb);
 
-                        } else {
-                            cb(null, null);
-                        }
+                        cb(error, data);
                     }
-                }, cb);
+                }, (blockExpireIn > 0 ? null : {oauth: oauth})), cb); // add oauth if 1.1, else skip it
+
             }
 
-        ], function(error, data) {
+        ], function(error, oembed) {
 
 
             if (error) {
                 return cb(error);
             }
 
-            // Oembed.
-
-            var oembed = data.oembed;
-
             oembed.title = oembed.author_name + ' on Twitter';
 
             oembed["min-width"] = c["min-width"];
             oembed["max-width"] = c["max-width"];
-
-            // Post data.
-
-            oembed.is_video = data.post && data.post.is_video;
+            
+            oembed.is_video = og.type === 'video';
 
             cb(null, {
                 twitter_oembed: oembed

From f1f091f786bb55c680042d23e8dd58d8673bf7c8 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Mon, 18 Jan 2016 16:01:36 -0500
Subject: [PATCH 073/320] better case for twitter video

---
 plugins/domains/twitter.status.js | 43 +++++++++++++------------------
 plugins/domains/twitter.video.js  | 15 +++++++++++
 2 files changed, 33 insertions(+), 25 deletions(-)
 create mode 100644 plugins/domains/twitter.video.js

diff --git a/plugins/domains/twitter.status.js b/plugins/domains/twitter.status.js
index 9e45d2ecf..6052d4f9c 100644
--- a/plugins/domains/twitter.status.js
+++ b/plugins/domains/twitter.status.js
@@ -10,11 +10,11 @@ module.exports = {
         /^https?:\/\/twitter\.com\/(?:\w+)\/status(?:es)?\/(\d+)/i
     ],
 
-    provides: 'twitter_oembed',
+    provides: ['twitter_oembed', 'twitter_video', '__allow_twitter_video'],
 
     mixins: ['domain-icon'],
 
-    getData: function(urlMatch, og, request, options, cb) {
+    getData: function(urlMatch, request, options, cb) {
         var id = urlMatch[1];
 
         var c = options.getProviderOptions("twitter") || options.getProviderOptions("twitter.status");
@@ -141,12 +141,18 @@ module.exports = {
 
             oembed["min-width"] = c["min-width"];
             oembed["max-width"] = c["max-width"];
-            
-            oembed.is_video = og.type === 'video';
 
-            cb(null, {
-                twitter_oembed: oembed
-            });
+            var result = {
+                twitter_oembed: oembed,                
+            };
+
+            if (c.media_only) {
+                result.__allow_twitter_video = true;
+            } else {
+                result.twitter_video = false;
+            }
+
+            cb(null, result);
         });
     },
 
@@ -161,7 +167,7 @@ module.exports = {
         };
     },
 
-    getLink: function(twitter_oembed, options) {
+    getLink: function(twitter_oembed, twitter_video, options) {
 
         var html = twitter_oembed.html;
 
@@ -171,15 +177,14 @@ module.exports = {
 
         var links = [];
 
-        if (twitter_oembed.is_video) {
+        if (twitter_video) {
 
             html = html.replace(/class="twitter-tweet"/g, 'class="twitter-video"');
             links.push({
                 html: html,
                 type: CONFIG.T.text_html,
-                rel: [CONFIG.R.oembed, CONFIG.R.player, CONFIG.R.inline, CONFIG.R.ssl],
-                "min-width": twitter_oembed["min-width"],
-                "max-width": twitter_oembed["max-width"]
+                rel: [CONFIG.R.player, CONFIG.R.inline, CONFIG.R.ssl, CONFIG.R.html5],
+                "aspect-ratio": twitter_video.width / twitter_video.height
             });
 
         } else {
@@ -187,24 +192,12 @@ module.exports = {
             links.push({
                 html: html,
                 type: CONFIG.T.text_html,
-                rel: [CONFIG.R.oembed, CONFIG.R.app, CONFIG.R.inline, CONFIG.R.ssl],
+                rel: [CONFIG.R.app, CONFIG.R.inline, CONFIG.R.ssl, CONFIG.R.html5],
                 "min-width": twitter_oembed["min-width"],
                 "max-width": twitter_oembed["max-width"]
             });
         }
 
-
-        /*
-        // forget about image for now - it takes 500 ms to verify its size
-        if (og.image && og.image.user_generated) {
-            links.push({
-                href: og.image.url,
-                type: CONFIG.T.image,
-                rel: [CONFIG.R.image]
-            });
-        }
-        */
-
         return links;
     },
 
diff --git a/plugins/domains/twitter.video.js b/plugins/domains/twitter.video.js
new file mode 100644
index 000000000..aa74a52ba
--- /dev/null
+++ b/plugins/domains/twitter.video.js
@@ -0,0 +1,15 @@
+module.exports = {
+
+    re: [
+        /^https?:\/\/twitter\.com\/(?:\w+)\/status(?:es)?\/(\d+)/i
+    ],
+
+    provides: ['twitter_video'],
+
+    getData: function(__allow_twitter_video, og) {
+
+        return {
+            twitter_video: og.video || false
+        }
+    }
+};
\ No newline at end of file

From 7d28e0ae7f869ad09330125c4bb8a418eea80e83 Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Tue, 19 Jan 2016 14:16:04 +0200
Subject: [PATCH 074/320] [iframely.js] change default aspect ratio to 16/9

---
 lib/html-utils.js     | 2 +-
 static/js/iframely.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/html-utils.js b/lib/html-utils.js
index d578cf024..9c181c61e 100644
--- a/lib/html-utils.js
+++ b/lib/html-utils.js
@@ -28,7 +28,7 @@
 
         // Default aspect ratio.
         if (!media || (!media.height && !media["aspect-ratio"])) {
-            $container.css('padding-bottom', '75%');
+            $container.css('padding-bottom', '56.25%');
         }
 
         if (media) {
diff --git a/static/js/iframely.js b/static/js/iframely.js
index 9f4b0380e..0d63e187e 100644
--- a/static/js/iframely.js
+++ b/static/js/iframely.js
@@ -228,7 +228,7 @@
 
         // Default aspect ratio.
         if (!media || (!media.height && !media["aspect-ratio"])) {
-            $container.css('padding-bottom', '75%');
+            $container.css('padding-bottom', '56.25%');
         }
 
         if (media) {

From 1c12cdf74567d697a6f03a20c1ce07ace45a58be Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Wed, 20 Jan 2016 19:57:22 +0200
Subject: [PATCH 075/320] [cache] store request cache from old key to new key

---
 lib/request.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/request.js b/lib/request.js
index 15c8ef5c9..3723ec710 100644
--- a/lib/request.js
+++ b/lib/request.js
@@ -55,6 +55,12 @@ module.exports = function(options, callback) {
             // Send cached data up.
             prepareResult(null, _.extend(data.response, {fromRequestCache: true}), data.data, callback);
 
+            if (new_cache_key) {
+                cache.set('req:' + prefix + new_cache_key, data, {
+                    ttl: ttl || CONFIG.API_REQUEST_CACHE_TTL
+                });
+            }
+
         } else if (useCacheOnly) {
 
             callback('no-cache');

From af9486189d65671c2d546a927bf0d2690f75847b Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Thu, 21 Jan 2016 09:20:39 -0500
Subject: [PATCH 076/320] [domains] good-bye Rdio

---
 plugins/domains/rdio.com.js | 47 -------------------------------------
 1 file changed, 47 deletions(-)
 delete mode 100644 plugins/domains/rdio.com.js

diff --git a/plugins/domains/rdio.com.js b/plugins/domains/rdio.com.js
deleted file mode 100644
index 19d438d2c..000000000
--- a/plugins/domains/rdio.com.js
+++ /dev/null
@@ -1,47 +0,0 @@
-var $ = require('cheerio');
-
-module.exports = {
-
-    mixins: [
-        "oembed-title",
-        "oembed-site"
-    ],
-
-    getLink: function(oembed) {
-
-        var $container = $('<div>');
-        try {
-            $container.html(oembed.html);
-        } catch(ex) {}
-
-        var $iframe = $container.find('iframe');
-        var player; 
-
-        if ($iframe.length == 1) {
-            player = {
-                href: $iframe.attr('src'),
-                type: CONFIG.T.text_html,
-                rel: [CONFIG.R.player, CONFIG.R.html5],
-                "min-width": oembed.width,
-                "min-height": oembed.height
-            }
-        }
-
-        return [player, {
-            }, {
-                href: oembed.thumbnail_url,
-                type: CONFIG.T.image,
-                rel: CONFIG.R.thumbnail,
-                width: oembed.thumbnail_width,
-                height: oembed.thumbnail_height
-            }, {
-                href: '//www.rdio.com/favicon.ico',
-                type: CONFIG.T.image,
-                rel: CONFIG.R.icon
-        }];
-    },
-
-    tests: [
-        "http://www.rdio.com/artist/Big_Boi/album/Vicious_Lies_and_Dangerous_Rumors_(Deluxe_Explicit_Version)/track/CPU/"
-    ]
-};
\ No newline at end of file

From ede01b187182b3c8360ec2005f7b4c5bd5f658ef Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Fri, 22 Jan 2016 13:09:02 -0500
Subject: [PATCH 077/320] [domains] support for imgur topic pages

---
 plugins/domains/imgur.com.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/plugins/domains/imgur.com.js b/plugins/domains/imgur.com.js
index a1d296a61..81e9e9f84 100644
--- a/plugins/domains/imgur.com.js
+++ b/plugins/domains/imgur.com.js
@@ -1,6 +1,9 @@
 module.exports = {
 
-    re: /https?:\/\/imgur\.com\/(?:\w+\/)?(\w+).*/i,
+    re: [
+        /https?:\/\/imgur\.com\/t\/\w+\/(\w+).*/i,
+        /https?:\/\/imgur\.com\/(?:\w+\/)?(\w+).*/i
+    ],
 
     provides: ["oembedLinks"],
 
@@ -64,6 +67,8 @@ module.exports = {
         // "http://imgur.com/r/aww/tFKv2zQ",    // kitten bomb before, doesn't seem to show up any longer
         "http://imgur.com/gallery/bSE9nTM",
         "http://imgur.com/gallery/EqmEsJj",
-        "https://imgur.com/gallery/kkEzJsa"
+        "https://imgur.com/gallery/kkEzJsa",
+        "http://imgur.com/t/workout/HFwjGoF",
+        "http://imgur.com/t/water/ud7YwQp"
     ]
 };
\ No newline at end of file

From 6d9bfb0c731d21783cb594b3958a1abd724748a1 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Fri, 22 Jan 2016 13:24:44 -0500
Subject: [PATCH 078/320] [general] parsely page type == post doesn't mean it
 is reader

ex. Eurosport
---
 plugins/meta/parsely_page.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/plugins/meta/parsely_page.js b/plugins/meta/parsely_page.js
index 10b399b5f..dc0268449 100644
--- a/plugins/meta/parsely_page.js
+++ b/plugins/meta/parsely_page.js
@@ -28,8 +28,7 @@ module.exports = {
             date: parsely_page.pub_date,
             author: parsely_page.author,
             keywords: parsely_page.tags && parsely_page.tags instanceof Array ? parsely_page.tags.join(', ') : null,
-            category: parsely_page.section,
-            media: parsely_page.type == "post" ? 'reader': null
+            category: parsely_page.section            
         };
     }
 };
\ No newline at end of file

From 428bc635b7ee40eacd2b7a3697dd4e3f08a43a7f Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Sat, 23 Jan 2016 14:38:23 -0500
Subject: [PATCH 079/320] [domains] better fix for fb profiles/pages

---
 lib/plugins/system/oembed/providers.json      | 7 -------
 plugins/domains/facebook.com/facebook.page.js | 6 ++++--
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/lib/plugins/system/oembed/providers.json b/lib/plugins/system/oembed/providers.json
index f18cfb569..d75cd9263 100644
--- a/lib/plugins/system/oembed/providers.json
+++ b/lib/plugins/system/oembed/providers.json
@@ -22,13 +22,6 @@
         ],
         "endpoint": "https://www.facebook.com/plugins/video/oembed.json/"
     },
-    {
-        "name": "Facebook Page",
-        "templates": [
-            "(www|m)\\.facebook\\.com/([a-zA-Z0-9\\.\\-]+)/?(?:\\?f?ref=\\w+)?$"
-        ],
-        "endpoint": "https://www.facebook.com/plugins/page/oembed.json/"
-    },
     {
         "name": "Blip",
         "templates": [
diff --git a/plugins/domains/facebook.com/facebook.page.js b/plugins/domains/facebook.com/facebook.page.js
index 2215522f0..17497ddb0 100644
--- a/plugins/domains/facebook.com/facebook.page.js
+++ b/plugins/domains/facebook.com/facebook.page.js
@@ -5,12 +5,14 @@ module.exports = {
         /^https?:\/\/(www|m)\.facebook\.com\/([a-zA-Z0-9\.\-]+)\/?(?:\?f?ref=\w+)?$/i
     ],
 
-    getLink: function(meta, oembed, options) {
+    getLink: function(oembed, options) {
 
         // skip user profiles - they can not be embedded
+        /*
         if (!meta.al || (meta.al && meta.al.android && meta.al.android.url && /\/profile\//.test(meta.al.android.url))) {
            return;
-        }
+        }*/
+        // not required: as of Jan 23, 2016 the private profile do not have oembed discovery link, whereas public pages do.
 
         return {
             type: CONFIG.T.text_html,

From 639967b897ea6d8074c1758eaadb1e6c352a611f Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Sun, 24 Jan 2016 08:30:40 -0500
Subject: [PATCH 080/320] [facebook] better fix for exclusion of user profiles

---
 lib/plugins/system/oembed/providers.json      |  7 +++++++
 plugins/domains/facebook.com/facebook.page.js | 10 ++++------
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/lib/plugins/system/oembed/providers.json b/lib/plugins/system/oembed/providers.json
index d75cd9263..f18cfb569 100644
--- a/lib/plugins/system/oembed/providers.json
+++ b/lib/plugins/system/oembed/providers.json
@@ -22,6 +22,13 @@
         ],
         "endpoint": "https://www.facebook.com/plugins/video/oembed.json/"
     },
+    {
+        "name": "Facebook Page",
+        "templates": [
+            "(www|m)\\.facebook\\.com/([a-zA-Z0-9\\.\\-]+)/?(?:\\?f?ref=\\w+)?$"
+        ],
+        "endpoint": "https://www.facebook.com/plugins/page/oembed.json/"
+    },
     {
         "name": "Blip",
         "templates": [
diff --git a/plugins/domains/facebook.com/facebook.page.js b/plugins/domains/facebook.com/facebook.page.js
index 17497ddb0..388435d53 100644
--- a/plugins/domains/facebook.com/facebook.page.js
+++ b/plugins/domains/facebook.com/facebook.page.js
@@ -5,14 +5,12 @@ module.exports = {
         /^https?:\/\/(www|m)\.facebook\.com\/([a-zA-Z0-9\.\-]+)\/?(?:\?f?ref=\w+)?$/i
     ],
 
-    getLink: function(oembed, options) {
+    getLink: function(oembed, meta, options) {
 
-        // skip user profiles - they can not be embedded
-        /*
-        if (!meta.al || (meta.al && meta.al.android && meta.al.android.url && /\/profile\//.test(meta.al.android.url))) {
+        // skip user profiles - they can not be embedded        
+        if ((meta.al && meta.al.android && meta.al.android.url && /\/profile\//.test(meta.al.android.url)) || !/blockquote/.test(oembed.html)) {
            return;
-        }*/
-        // not required: as of Jan 23, 2016 the private profile do not have oembed discovery link, whereas public pages do.
+        }        
 
         return {
             type: CONFIG.T.text_html,

From 6c0ea6b89d720feaf180719e64f1a2b88ead7779 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Sun, 24 Jan 2016 14:20:37 -0500
Subject: [PATCH 081/320] [domains] better coverage for fox sports

---
 plugins/domains/foxsports.com.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugins/domains/foxsports.com.js b/plugins/domains/foxsports.com.js
index 2b5984197..3004d0daf 100644
--- a/plugins/domains/foxsports.com.js
+++ b/plugins/domains/foxsports.com.js
@@ -1,7 +1,8 @@
 module.exports = {
 
     re: [
-        /^https?:\/\/www\.foxsports\.com\/(?:\w+\/)?video\/?\?vid=(\d+)/i
+        /^https?:\/\/www\.foxsports\.com\/(?:\w+\/)?video\/?\?vid=(\d+)/i,
+        /^https?:\/\/www\.foxsports\.com\/(?:\w+\/)?video\/[a-zA-Z-]+\-()/i        
     ],
 
     mixins: [
@@ -25,6 +26,7 @@ module.exports = {
 
     tests: [ 
         "http://www.foxsports.com/video?vid=551579203750",
-        "http://www.foxsports.com/mlb/video?vid=602673731627"
+        "http://www.foxsports.com/mlb/video?vid=602673731627",
+        "http://www.foxsports.com/mlb/video/scherzer-harper-mock-papelbon-incident-with-handshake-100115?utm_medium=twitter&utm_source=twitterfeed"
     ]
 };

From 492ba043125431ccf398e7d2b24ff79c50e99182 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Sun, 24 Jan 2016 21:23:13 -0500
Subject: [PATCH 082/320] [domains] support for naver tvcast

---
 plugins/domains/tvcast.naver.com.js | 61 +++++++++++++++++++++++++++++
 1 file changed, 61 insertions(+)
 create mode 100644 plugins/domains/tvcast.naver.com.js

diff --git a/plugins/domains/tvcast.naver.com.js b/plugins/domains/tvcast.naver.com.js
new file mode 100644
index 000000000..573e1de83
--- /dev/null
+++ b/plugins/domains/tvcast.naver.com.js
@@ -0,0 +1,61 @@
+var cheerio = require('cheerio');
+
+module.exports = {
+
+    re: [
+        /^https?:\/\/tvcast\.naver\.com\/v\/(\d+)/i
+    ],
+
+    mixins: ['*'],
+
+    provides: 'naver_html',
+
+    getData: function(urlMatch, meta, request, cb) {
+
+        if (!meta.naver || !meta.naver.video || !meta.naver.video.id) {
+            return cb (null);
+        } else {
+
+            request({            
+                uri: "http://tvcast.naver.com/api/clipShareHtml?videoId=" + meta.naver.video.id,
+                json: true,
+                prepareResult: function(error, response, body, cb) {
+
+                    if (error) {
+                        return cb(error);
+                    }
+                    cb(null, {
+                        naver_html: body[0] // they return an array
+                    });
+                }
+            }, cb);
+        }
+    },
+
+    getLink: function(naver_html) {
+
+        var $container = cheerio('<div>');
+        try{
+            $container.html(naver_html);
+        } catch(ex) {}
+
+        var $iframe = $container.find('iframe');
+
+        if ($iframe.length == 1) {
+
+            return {
+                href: $iframe.attr('src').replace(/isAutoPlay=true/, 'isAutoPlay=false'),
+                type: CONFIG.T.text_html,
+                rel: [CONFIG.R.player, CONFIG.R.html5],
+                "aspect-ratio": $iframe.attr('height') && $iframe.attr('width') ? $iframe.attr('width') / $iframe.attr('height') : CONFIG.DEFAULT_ASPECT_RATIO
+            };
+        }        
+
+    },
+
+    tests: [{
+        noFeeds: true
+    },
+        "http://tvcast.naver.com/v/462633"
+    ]
+};
\ No newline at end of file

From 6d988519d6540b842c801e2b222b2dc3b1c3708f Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Mon, 25 Jan 2016 09:26:47 -0500
Subject: [PATCH 083/320] [domains] support for bloomberg videos

---
 plugins/domains/bloomberg.video.js | 55 ++++++++++++++++++++++++++++++
 1 file changed, 55 insertions(+)
 create mode 100644 plugins/domains/bloomberg.video.js

diff --git a/plugins/domains/bloomberg.video.js b/plugins/domains/bloomberg.video.js
new file mode 100644
index 000000000..4563cc45c
--- /dev/null
+++ b/plugins/domains/bloomberg.video.js
@@ -0,0 +1,55 @@
+module.exports = {
+
+    re: [
+        /^https?:\/\/www\.bloomberg\.com\/news\/videos\/(\d{4}\-\d{2}\-\d{2}\/[a-zA-Z0-9\-]+)/i
+    ],
+
+    mixins: ['*'],
+
+    provides: 'bmmr',
+
+    getData: function(urlMatch, request, cb) {
+
+        request({
+            uri: "http://www.bloomberg.com/api/videos/slug/" + urlMatch[1],
+            json: true,
+            prepareResult: function(error, response, body, cb) {
+
+                if (error) {
+                    return cb(error);
+                }
+
+                var video_id = body.type === 'video' && body.attachments && body.attachments.video && body.attachments.all && body.attachments.all[0] && body.attachments.all[0].type === 'video' 
+                            ? body.attachments.all[0].id : null;
+
+                var video = video_id && body.attachments.video [video_id];
+
+                if (video_id && video) {                        
+                    cb(null, {
+                        bmmr: video
+                    });
+                } else {
+                    cb(null);
+                }
+            }
+        }, cb);
+    },
+
+    getLink: function(bmmr) {
+
+        if (bmmr.bmmrId) {
+            return {
+                href: 'http://www.bloomberg.com/api/embed/iframe?id=' + bmmr.bmmrId,                
+                type: CONFIG.T.text_html,
+                rel: [CONFIG.R.player, CONFIG.R.html5],
+                "aspect-ratio": 16 / 9
+            };
+        }
+    },
+
+    tests: [{
+        noFeeds: true
+    },
+        "http://www.bloomberg.com/news/videos/2015-03-05/why-cheap-oil-doesn-t-stop-the-drilling"
+    ]
+};
\ No newline at end of file

From 07978fee15442ed5b6e8aa176faa3530ce254e7e Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Mon, 25 Jan 2016 12:54:52 -0500
Subject: [PATCH 084/320] [domains] fix myvideo.de

---
 plugins/domains/myvideo.de.js | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/plugins/domains/myvideo.de.js b/plugins/domains/myvideo.de.js
index 01d527c3e..8606e3eb8 100644
--- a/plugins/domains/myvideo.de.js
+++ b/plugins/domains/myvideo.de.js
@@ -1,8 +1,8 @@
 module.exports = {
 
     re: [
-        /^https?:\/\/www\.myvideo\.de\/watch\/([0-9]+)/i,
-        /^https?:\/\/www\.myvideo\.de\/musik\/\w+\/[\w-]+-([0-9]+)/i
+        /^https?:\/\/www\.myvideo\.de\/watch\/([0-9]+)/i
+        // the rest should be covered by whitelist via embedURL - it verifies permissions etc
     ],
 
     mixins: ["*"],
@@ -10,7 +10,7 @@ module.exports = {
     getLink: function (urlMatch) {
 
         return {
-            href: "https://www.myvideo.de/embed/"+ urlMatch[1],
+            href: "http://www.myvideo.de/embedded/public/"+ urlMatch[1],
             type: CONFIG.T.text_html,            
             rel: CONFIG.R.player,
             "aspect-ratio": 611 / 383,
@@ -18,10 +18,7 @@ module.exports = {
         }
     },
 
-    tests: [{
-        page: "http://www.myvideo.de/Top_100/Top_100_Charts",
-        selector: ".chartlist--videolist-item-title"
-    },
+    tests: [
         "http://www.myvideo.de/watch/9790416/Balbina_Seife_feat_Maeckes"
     ]
 };
\ No newline at end of file

From 3092be7f25d5b1be3a66058e2b2a1b3965fc5e68 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Mon, 25 Jan 2016 15:59:11 -0500
Subject: [PATCH 085/320] [domains] fix media_only config for Imgur

---
 plugins/domains/500px.com.js | 2 +-
 plugins/domains/imgur.com.js | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/plugins/domains/500px.com.js b/plugins/domains/500px.com.js
index 7abd647b4..d3f1c29b4 100644
--- a/plugins/domains/500px.com.js
+++ b/plugins/domains/500px.com.js
@@ -1,6 +1,6 @@
 module.exports = {
 
-    re: /^https:\/\/500px\.com\/photo.+/,
+    re: /^https?:\/\/500px\.com\/photo.+/,
 
     mixins: [
         "*",
diff --git a/plugins/domains/imgur.com.js b/plugins/domains/imgur.com.js
index 81e9e9f84..dad3d8163 100644
--- a/plugins/domains/imgur.com.js
+++ b/plugins/domains/imgur.com.js
@@ -32,6 +32,14 @@ module.exports = {
                     type: CONFIG.T.text_html,
                     rel: [CONFIG.R.app, CONFIG.R.oembed, CONFIG.R.html5, CONFIG.R.inline, CONFIG.R.ssl]
                 };
+            } else {
+                return {
+                    href: "http://s.imgur.com/images/favicon-96x96.png",
+                    width: 96,
+                    height: 96,
+                    type: CONFIG.T.image_png,
+                    rel: CONFIG.R.icon
+                }
             }
         }
     },

From 590c9cb2773c08f84630bc5bc9f01402b3723128 Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Mon, 25 Jan 2016 23:46:08 +0200
Subject: [PATCH 086/320] [lib] fix: Cannot read property 'refresh' of null

---
 lib/plugins/system/oembed/oembedUtils.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/plugins/system/oembed/oembedUtils.js b/lib/plugins/system/oembed/oembedUtils.js
index ef60545e6..3459e0d79 100644
--- a/lib/plugins/system/oembed/oembedUtils.js
+++ b/lib/plugins/system/oembed/oembedUtils.js
@@ -146,7 +146,7 @@ module.exports.getOembed = function(uri, options, callback) {
     async.waterfall([
 
         function(cb) {
-            if (options.refresh) {
+            if (options && options.refresh) {
                 cb(null, null);
             } else {
                 cache.get(oembed_key, cb);

From e742f9fea825dd852541bd6e10b859ef6d9c23a7 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Tue, 26 Jan 2016 11:37:38 -0500
Subject: [PATCH 087/320] [domains] minor fixes for Archive, IMDB, giphy

---
 plugins/domains/archive.org.js |  5 +++--
 plugins/domains/cnn.com.js     |  2 +-
 plugins/domains/i.giphy.com.js |  5 +++--
 plugins/domains/imdb.com.js    | 18 ++++++++++++------
 4 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/plugins/domains/archive.org.js b/plugins/domains/archive.org.js
index 3c6350dd9..c4c6377ad 100644
--- a/plugins/domains/archive.org.js
+++ b/plugins/domains/archive.org.js
@@ -24,7 +24,7 @@ module.exports = {
             }
 
 
-            if (/\.(mp4)$/i.test(player.href)) {
+            if (/\.(mp4|avi)$/i.test(player.href)) {
                 player["aspect-ratio"] = twitter.player.width / twitter.player.height;
             }
 
@@ -40,6 +40,7 @@ module.exports = {
     },
 
     tests: [
-        "https://archive.org/details/um2000-09-01.shnf"
+        "https://archive.org/details/um2000-09-01.shnf",
+        "https://archive.org/details/ChronoTrigger_456"
     ]
 };
\ No newline at end of file
diff --git a/plugins/domains/cnn.com.js b/plugins/domains/cnn.com.js
index c38ee6fca..79cf75c8f 100644
--- a/plugins/domains/cnn.com.js
+++ b/plugins/domains/cnn.com.js
@@ -1,7 +1,7 @@
 module.exports = {
 
     re: [
-        /^https?:\/\/(www|edition)\.cnn\.com\/videos\//i,        
+        /^https?:\/\/(www|edition)\.cnn\.com\/videos\//i,
     ],
 
     mixins: [
diff --git a/plugins/domains/i.giphy.com.js b/plugins/domains/i.giphy.com.js
index ff6650ab0..c80230ec9 100644
--- a/plugins/domains/i.giphy.com.js
+++ b/plugins/domains/i.giphy.com.js
@@ -2,8 +2,9 @@ module.exports = {
 
     re: [
     	/https?:\/\/i\.giphy\.com\/(\w+)\.gif(\?.*)?$/i,
-    	/https?:\/\/media\d?\.giphy\.com\/media\/(\w+)\/giphy\.gif$/i,
-        /https?:\/\/giphy\.com\/gifs\/(\w+)\/html5$/i
+    	/https?:\/\/media\d?\.giphy\.com\/media\/(\w+)\/(?:giphy|\d+)\.gif$/i,
+        /https?:\/\/giphy\.com\/gifs\/(\w+)\/html5$/i,
+        /https?:\/\/giphy\.com\/embed\/(\w+)/i        
     ],
 
     getLink: function(urlMatch, cb) {
diff --git a/plugins/domains/imdb.com.js b/plugins/domains/imdb.com.js
index 14c17416c..793897bbf 100644
--- a/plugins/domains/imdb.com.js
+++ b/plugins/domains/imdb.com.js
@@ -1,7 +1,8 @@
 module.exports = {
 
     re: [
-        /^https?:\/\/www\.imdb\.com\/video\/[\w]+\/vi(\d+)/i
+        /^https?:\/\/www\.imdb\.com\/video\/[\w]+\/vi(\d+)/i,
+        /^https?:\/\/www\.imdb\.com\/title\/\w{2}[\d]+\/?[^\/#]+#\w{2}\-vi(\d+)$/i
     ],    
 
     mixins: [
@@ -13,7 +14,11 @@ module.exports = {
         "og-title"
     ],
 
-    getLink: function(urlMatch, options) {
+    getLink: function(url, urlMatch, options) {
+
+        if (/^https?:\/\/www\.imdb\.com\/video\/screenplay\/vi(\d+)/i.test(url)) {
+            return;
+        }
 
         var width = options.maxWidth || 480;
 
@@ -22,16 +27,17 @@ module.exports = {
         }
 
         return {
-            href: "http://www.imdb.com/video/imdb/vi" + urlMatch[1] + "/imdb/embed?autoplay=false&width=" + width,
+            href: "//www.imdb.com/video/imdb/vi" + urlMatch[1] + "/imdb/embed?autoplay=false&width=" + width,
             type: CONFIG.T.text_html,
             rel: [CONFIG.R.player, CONFIG.R.html5],
             width: width,
-            height: width / (16/9) + 40 // 40px body margin
-        };
+            height: width / (16/9)
+        }
     },
 
     tests: [
         "http://www.imdb.com/video/epk/vi1061203225/",
-        "http://www.imdb.com/video/imdb/vi2792795161?ref_=tt_pv_vi_aiv_2"
+        "http://www.imdb.com/video/imdb/vi2792795161?ref_=tt_pv_vi_aiv_2",
+        "http://www.imdb.com/title/tt2937696/?ref_=ext_shr_tw_vi_tt_ov_vi#lb-vi1383576089"
     ]
 };
\ No newline at end of file

From 0e94f8a604c0c05158269e55ab20b51381b1a5ea Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Tue, 26 Jan 2016 11:49:02 -0500
Subject: [PATCH 088/320] [domains] support for aljazeera america

---
 plugins/domains/america.aljazeera.com.js | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 plugins/domains/america.aljazeera.com.js

diff --git a/plugins/domains/america.aljazeera.com.js b/plugins/domains/america.aljazeera.com.js
new file mode 100644
index 000000000..e59a692fa
--- /dev/null
+++ b/plugins/domains/america.aljazeera.com.js
@@ -0,0 +1,22 @@
+module.exports = {
+
+    re: [
+        /^https?:\/\/america\.aljazeera\.com(\/watch\/shows\/[\/a-zA-Z0-9-]+)\.html$/i
+    ],
+
+    mixins: ["*"],
+
+    getLink: function(urlMatch) {
+
+        return {
+                href: "http://america.aljazeera.com/watch/embed.html/content/ajam" + urlMatch[1],                
+                type: CONFIG.T.text_html,
+                rel: [CONFIG.R.player, CONFIG.R.html5],
+                "aspect-ratio": 4 / 3
+            };
+    },
+
+    tests: [
+        "http://america.aljazeera.com/watch/shows/live-news/2015/12/the-arts-raising-awareness-of-human-rights-abuses.html"
+    ]
+};
\ No newline at end of file

From 7a5185fc006127f70e35d4264c84a6288b3bdb10 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Tue, 26 Jan 2016 12:02:18 -0500
Subject: [PATCH 089/320] [domains] support AOL features

---
 plugins/domains/features.aol.com.js | 30 +++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 plugins/domains/features.aol.com.js

diff --git a/plugins/domains/features.aol.com.js b/plugins/domains/features.aol.com.js
new file mode 100644
index 000000000..70e199c2f
--- /dev/null
+++ b/plugins/domains/features.aol.com.js
@@ -0,0 +1,30 @@
+module.exports = {
+
+    re: [
+        /^https?:\/\/features\.aol\.com\/video\//i        
+    ],
+
+    mixins: ["*"],
+
+    getLink: function(cheerio) {
+
+        var $feature = cheerio('.feature-info');
+        if ($feature.length) {
+            var playlist = $feature.attr('data-playlist');
+
+            if (playlist) {
+                return {
+                    href: "//pshared.5min.com/Scripts/PlayerSeed.js?sid=281&&playList=" + playlist,
+                    type: CONFIG.T.javascript,
+                    rel: [CONFIG.R.player,  CONFIG.R.inline, CONFIG.R.html5],
+                    "aspect-ratio": 16 / 9
+
+                }
+            }
+        }
+    },
+
+    tests: [
+        "http://features.aol.com/video/rescuers-make-shocking-discovery-inside-abandoned-home"
+    ]
+};
\ No newline at end of file

From 89f165177e298629f1e7f8f3c8fd15f49e9f2fa9 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Tue, 26 Jan 2016 12:21:03 -0500
Subject: [PATCH 090/320] [domains] other form of Imgur topics

---
 plugins/domains/imgur.com.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugins/domains/imgur.com.js b/plugins/domains/imgur.com.js
index dad3d8163..12afb969e 100644
--- a/plugins/domains/imgur.com.js
+++ b/plugins/domains/imgur.com.js
@@ -2,7 +2,8 @@ module.exports = {
 
     re: [
         /https?:\/\/imgur\.com\/t\/\w+\/(\w+).*/i,
-        /https?:\/\/imgur\.com\/(?:\w+\/)?(\w+).*/i
+        /https?:\/\/imgur\.com\/topic\/[a-zA-Z0-9\-_&]+\/(\w+).*/i,
+        /https?:\/\/imgur\.com\/(?:\w+\/)?(\w+).*/i,
     ],
 
     provides: ["oembedLinks"],
@@ -77,6 +78,7 @@ module.exports = {
         "http://imgur.com/gallery/EqmEsJj",
         "https://imgur.com/gallery/kkEzJsa",
         "http://imgur.com/t/workout/HFwjGoF",
-        "http://imgur.com/t/water/ud7YwQp"
+        "http://imgur.com/t/water/ud7YwQp",
+        "http://imgur.com/topic/The_Oscars_&_Movies/YFQo6Vl"
     ]
 };
\ No newline at end of file

From aa1a01e4c09e4a4009e9cd6538b848e2412b5a52 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Tue, 26 Jan 2016 12:30:01 -0500
Subject: [PATCH 091/320] [domains] fallback for interlude.fm

---
 lib/plugins/system/oembed/providers.json | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/lib/plugins/system/oembed/providers.json b/lib/plugins/system/oembed/providers.json
index f18cfb569..6030d22a2 100644
--- a/lib/plugins/system/oembed/providers.json
+++ b/lib/plugins/system/oembed/providers.json
@@ -459,5 +459,12 @@
             "(?:www\\.|m\\.)?reddit\\.com/r/([^\/]+)/comments/([a-zA-Z0-9]+)/([a-zA-Z0-9_]+)/([a-zA-Z0-9]+)"
         ],
         "endpoint": "https://www.reddit.com/oembed"
+    },
+    {
+        "name": "Interlude",
+        "templates": [
+            "interlude.fm/v/([a-zA-Z0-9-]+)"
+        ],
+        "endpoint": "https://v.interlude.fm/oembed?vid={1}"
     }
 ]
\ No newline at end of file

From 9a77ac89fa603d5626be26f2864c232a35c7abfd Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Tue, 26 Jan 2016 12:37:29 -0500
Subject: [PATCH 092/320] [instagram] make title/description be consistent with
 Twitter & FB approach

---
 plugins/domains/instagram.com.js | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/plugins/domains/instagram.com.js b/plugins/domains/instagram.com.js
index 1c5be47f4..0ecd48c0f 100644
--- a/plugins/domains/instagram.com.js
+++ b/plugins/domains/instagram.com.js
@@ -7,7 +7,6 @@ module.exports = {
     ],
 
     mixins: [
-        "oembed-title",
         "oembed-site",
         "oembed-author",
         "oembed-thumbnail",
@@ -15,6 +14,17 @@ module.exports = {
         "favicon"
     ],
 
+    getMeta: function (og) {
+
+        var match = og.title.match(/[a-zA-Z0-9\s]+on\sInstagram/i);
+
+        return {
+            title: match ? match[0] : "Post on Instagram",
+            description: og.description
+        }
+
+    },
+
     getLinks: function(urlMatch, meta, oembed, options) {
         var src = 'http://instagram.com/p/' + urlMatch[1] + '/media/?size=';
 

From 51a05e979fadeaa58492aa61634c64b08b2749f6 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Tue, 26 Jan 2016 13:01:45 -0500
Subject: [PATCH 093/320] [tests] fix Google favicon

---
 lib/plugins/validators/async/20_checkFavicon.js | 2 +-
 lib/utils.js                                    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/plugins/validators/async/20_checkFavicon.js b/lib/plugins/validators/async/20_checkFavicon.js
index 0bcd03eba..f6f21a8ff 100644
--- a/lib/plugins/validators/async/20_checkFavicon.js
+++ b/lib/plugins/validators/async/20_checkFavicon.js
@@ -47,7 +47,7 @@ module.exports = {
                     }
                 }
                 
-                if (data.code == 200 && data.content_length && data.content_length == 0) {
+                if (data.code == 200 && data.content_length && data.content_length === 0) {
                     link.error = "Image with 0 content_length";
                 }
 
diff --git a/lib/utils.js b/lib/utils.js
index 86de7ff7c..dcb789d1e 100644
--- a/lib/utils.js
+++ b/lib/utils.js
@@ -669,7 +669,7 @@ var getUriStatus = function(uri, options, cb) {
             cb(null, {
                 code: res.statusCode,
                 content_type: res.headers['content-type'],
-                content_length: res.headers['content-length'] || '0'
+                content_length: res.headers['content-length'] ? parseInt(res.headers['content-length'] || '0', 10) : null
             });
         });
 };

From b1dc991800d3f6ca593e842a3c173f305be461bf Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Tue, 26 Jan 2016 13:03:16 -0500
Subject: [PATCH 094/320] [domains] not required: Pastie, Screenr and Yandex
 vid

---
 plugins/domains/pastie.org.js       | 25 -------------------------
 plugins/domains/screenr.com.js      | 17 -----------------
 plugins/domains/video.yandex.ru.js  | 21 ---------------------
 plugins/domains/videos.nymag.com.js |  2 +-
 4 files changed, 1 insertion(+), 64 deletions(-)
 delete mode 100644 plugins/domains/pastie.org.js
 delete mode 100644 plugins/domains/screenr.com.js
 delete mode 100644 plugins/domains/video.yandex.ru.js

diff --git a/plugins/domains/pastie.org.js b/plugins/domains/pastie.org.js
deleted file mode 100644
index 2e8bcde5b..000000000
--- a/plugins/domains/pastie.org.js
+++ /dev/null
@@ -1,25 +0,0 @@
-module.exports = {
-
-    re: /http:\/\/pastie\.org\/(?:pastes\/)?(\d+)/i,
-
-    mixins: ['domain-icon'],
-
-    getMeta: function(urlMatch) {
-        return {
-            title: '#' + urlMatch[1] + ' - Pastie'
-        };
-    },
-
-    getLink: function(urlMatch) {
-        return {
-            html: '<script src="http://pastie.org/' + urlMatch[1] + '.js" type="text/javascript"></script>',
-            type: CONFIG.T.text_html,
-            rel: CONFIG.R.reader // not inline :\
-        };
-    },
-
-    tests: [ 
-        "http://pastie.org/807135"
-    ]    
-
-};
\ No newline at end of file
diff --git a/plugins/domains/screenr.com.js b/plugins/domains/screenr.com.js
deleted file mode 100644
index ec31535fd..000000000
--- a/plugins/domains/screenr.com.js
+++ /dev/null
@@ -1,17 +0,0 @@
-module.exports = {
-
-    re: /https?:\/\/www\.screenr\.com\/\w+/i,
-
-    mixins: [
-        "oembed-title",
-        "oembed-thumbnail",
-        "oembed-author",
-        "oembed-site",
-        "oembed-video",
-        "domain-icon"
-    ],
-
-    tests: [
-        "http://www.screenr.com/e4HH"
-    ]
-};
\ No newline at end of file
diff --git a/plugins/domains/video.yandex.ru.js b/plugins/domains/video.yandex.ru.js
deleted file mode 100644
index 94d6e3824..000000000
--- a/plugins/domains/video.yandex.ru.js
+++ /dev/null
@@ -1,21 +0,0 @@
-module.exports = {
-
-    re: [
-        /^https?:\/\/video\.yandex\.ru\/users\/[^\/]+\/view\/\d+\//i
-    ],    
-
-    mixins: [
-        "oembed-title",
-        "oembed-thumbnail",
-        "oembed-author",
-        "oembed-duration",
-        "oembed-site",
-        "oembed-description",
-        "domain-icon",
-        "oembed-video"
-    ],
-
-    tests: [
-        "http://video.yandex.ru/users/remnjoff/view/347/"
-    ]
-};
\ No newline at end of file
diff --git a/plugins/domains/videos.nymag.com.js b/plugins/domains/videos.nymag.com.js
index c209f41f7..f574ec964 100644
--- a/plugins/domains/videos.nymag.com.js
+++ b/plugins/domains/videos.nymag.com.js
@@ -30,7 +30,7 @@ module.exports = {
     },
         "http://videos.nymag.com/video/Models-Studio-Jourdan-Dunn-2;toprated",
         {
-            skipMixins: ["og-description"]
+            skipMixins: ["og-description", "favicon"]
         }
     ]
 };
\ No newline at end of file

From dccc7c1585a4cc302666d09bab82e519932b8d57 Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Tue, 26 Jan 2016 20:21:57 +0200
Subject: [PATCH 095/320] [core] fix date parsing

---
 lib/core.js  |  4 ++++
 lib/utils.js | 20 +++++++++++---------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/lib/core.js b/lib/core.js
index f70545581..f8456166e 100644
--- a/lib/core.js
+++ b/lib/core.js
@@ -797,6 +797,10 @@
 
                         if (key === 'date') {
                             v = utils.unifyDate(v);
+                            if (!v) {
+                                // Disable invalid date.
+                                r.data[key] = v;
+                            }
                         }
 
                         if (key === 'title' || key === 'canonical') {
diff --git a/lib/utils.js b/lib/utils.js
index dcb789d1e..8c64c5ea8 100644
--- a/lib/utils.js
+++ b/lib/utils.js
@@ -423,6 +423,10 @@ var NOW = new Date().getTime();
 
 exports.unifyDate = function(date) {
 
+    if (typeof date === "string" && date.match(/^\d+$/)) {
+        date = parseInt(date);
+    }
+
     if (typeof date === "number") {
 
         if (date === 0) {
@@ -434,19 +438,17 @@ exports.unifyDate = function(date) {
             date = date * 1000;
         }
 
-        var parsedDate = moment(date);
-        if (parsedDate.isValid()) {
-            return parsedDate.toJSON();
-        }
+        return new Date(date).toISOString();
     }
 
     // TODO: time in format 'Mon, 29 October 2012 18:15:00' parsed as local timezone anyway.
-    var parsedDate = moment.utc(date);
-    
-    if (parsedDate && parsedDate.isValid()) {
-        return parsedDate.toJSON();
+    var timestamp = Date.parse(date);
+    if (!isNaN(timestamp)) {
+        return new Date(timestamp).toISOString();
     }
-    return date;
+
+    // Bad date to parse.
+    return null;
 };
 
 

From cd204baf6b3d7fc2108920e39a8b5959c067771a Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Tue, 26 Jan 2016 13:47:44 -0500
Subject: [PATCH 096/320] [domains] arte.tv not needed

---
 plugins/domains/arte.tv.js | 48 --------------------------------------
 1 file changed, 48 deletions(-)
 delete mode 100644 plugins/domains/arte.tv.js

diff --git a/plugins/domains/arte.tv.js b/plugins/domains/arte.tv.js
deleted file mode 100644
index a1d0da658..000000000
--- a/plugins/domains/arte.tv.js
+++ /dev/null
@@ -1,48 +0,0 @@
-var re = /^http:\/\/www\.arte\.tv\/guide\/(\w+)\/([\d-]+)\//i;
-
-module.exports = {
-
-    re: re,
-
-    mixins: [
-        "og-image",
-        "favicon",
-        "twitter-author",
-        "canonical",
-        "date",
-        "og-site",
-        "twitter-title"
-    ],
-
-    getLink: function(urlMatch) {
-        return [{
-            href: 'http://www.arte.tv/guide/' + urlMatch[1] + '/embed/' + urlMatch[2] + '/small',
-            type: CONFIG.T.text_html,
-            rel: CONFIG.R.player,
-            width: 300,
-            height: 170
-        }, {
-            href: 'http://www.arte.tv/guide/' + urlMatch[1] + '/embed/' + urlMatch[2] + '/medium',
-            type: CONFIG.T.text_html,
-            rel: CONFIG.R.player,
-            width: 600,
-            height: 340
-        }, {
-            href: 'http://www.arte.tv/guide/' + urlMatch[1] + '/embed/' + urlMatch[2] + '/large',
-            type: CONFIG.T.text_html,
-            rel: CONFIG.R.player,
-            width: 900,
-            height: 510
-        }]
-    },
-
-    tests: [{
-        page: 'http://www.arte.tv/guide/de',
-        selector: 'li a',
-        getUrl: function(url) {
-            if (url.match(re)) return url;
-        }
-    },
-        "http://www.arte.tv/guide/fr/050305-000/valery-giscard-d-estaing-et-helmut-schmidt#details-functions-share"
-    ]
-};
\ No newline at end of file

From cc87fffb4fc746de3bf29767fffbaefb3cc6e92b Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Tue, 26 Jan 2016 15:25:06 -0500
Subject: [PATCH 097/320] v 0.9.2 what's new

---
 WHATSNEW.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/WHATSNEW.md b/WHATSNEW.md
index 6f505ff72..081eb034f 100644
--- a/WHATSNEW.md
+++ b/WHATSNEW.md
@@ -4,6 +4,14 @@ This is the history of the Iframely changes. Updates that are older than one yea
 
 Stay tuned, either by watching [Iframely on GitHub](https://github.com/itteco/iframely) or following [Iframely on Twitter](https://twitter.com/iframely).
 
+### 2016.01.26, Version 0.9.2
+
+ - Domains clean up & maintenance
+ - Added: Reddit comments, Discovery, amCharts, Buzzfeed videos, Fox Sports, NBC Sports, Aljazeera, Naver tvcast, Cinesports, thumbnails for Amazon products
+ - Gave better life for `rel=promo`, treat it as attachment media, if you see it
+
+
+
 ### 2015.12.15, Version 0.9.1
 
  - Critical fix for Instagram 

From 4ce29403ff0999e516f351582fad702e28706eeb Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Tue, 26 Jan 2016 22:34:13 +0200
Subject: [PATCH 098/320] update version to 0.9.2

---
 package.json          | 2 +-
 static/js/iframely.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 34725c5dc..8402ee20a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "iframely",
-    "version": "0.9.1",
+    "version": "0.9.2",
     
     "description": "oEmbed/2 gateway endpoint. Get embed data for various http links through one self-hosted API",
     "keywords": ["oembed", "embed", "open graph", "og", "twitter cards"],
diff --git a/static/js/iframely.js b/static/js/iframely.js
index 0d63e187e..1f2629d20 100644
--- a/static/js/iframely.js
+++ b/static/js/iframely.js
@@ -4,7 +4,7 @@
 
      Iframely consumer client lib.
 
-     Version 0.8.3
+     Version 0.9.2
 
      Fetches and renders iframely oebmed/2 widgets.
 

From 003b346fc2bc7f1041a513155b252eb128bdbbc4 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Tue, 26 Jan 2016 20:24:49 -0500
Subject: [PATCH 099/320] [domains] broader regex for Bloomberg video

---
 plugins/domains/bloomberg.video.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/domains/bloomberg.video.js b/plugins/domains/bloomberg.video.js
index 4563cc45c..044482a4b 100644
--- a/plugins/domains/bloomberg.video.js
+++ b/plugins/domains/bloomberg.video.js
@@ -1,7 +1,9 @@
 module.exports = {
 
     re: [
-        /^https?:\/\/www\.bloomberg\.com\/news\/videos\/(\d{4}\-\d{2}\-\d{2}\/[a-zA-Z0-9\-]+)/i
+        /^https?:\/\/www\.bloomberg\.com\/news\/videos\/(\d{4}\-\d{2}\-\d{2}\/[a-zA-Z0-9\-]+)/i,
+        /^https?:\/\/www\.bloomberg\.com\/news\/videos\/(b\/[a-zA-Z0-9-]+)/i,
+        /^https?:\/\/www\.bloomberg\.com\/video\/([a-zA-Z0-9-]+)\.html$/i
     ],
 
     mixins: ['*'],

From 9d9325a14d7b4fd6d72f074635f39451ebbf7af9 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Tue, 26 Jan 2016 20:25:32 -0500
Subject: [PATCH 100/320] [domains] finally - support for player widget URLs of
 SoundCloud

---
 lib/plugins/system/oembed/providers.json |  3 ++-
 plugins/domains/w.soundcloud.com.js      | 20 ++++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 plugins/domains/w.soundcloud.com.js

diff --git a/lib/plugins/system/oembed/providers.json b/lib/plugins/system/oembed/providers.json
index 6030d22a2..64273fc06 100644
--- a/lib/plugins/system/oembed/providers.json
+++ b/lib/plugins/system/oembed/providers.json
@@ -222,7 +222,8 @@
     {
         "name": "SoundCloud",
         "templates": [
-            "soundcloud\\.com/.+"
+            "soundcloud\\.com/.+",
+            "api\\.soundcloud\\.com\/tracks\\/\\d+"
         ],
         "endpoint": "http://soundcloud.com/oembed"
     },
diff --git a/plugins/domains/w.soundcloud.com.js b/plugins/domains/w.soundcloud.com.js
new file mode 100644
index 000000000..c7ccc3282
--- /dev/null
+++ b/plugins/domains/w.soundcloud.com.js
@@ -0,0 +1,20 @@
+module.exports = {
+
+    re: [
+        /^https:?\/\/w\.soundcloud\.com\/player\/?\?\/?url=(https:\/\/api\.soundcloud\.com\/tracks\/\d+)$/i
+    ],
+
+    getLink: function(urlMatch, cb) {
+
+        cb ({
+            redirect: urlMatch[1]
+        });
+    },
+
+    tests: [{
+        noFeeds: true,
+      
+    },
+        "https://w.soundcloud.com/player/?/url=https://api.soundcloud.com/tracks/212506132"
+    ]
+};
\ No newline at end of file

From ed23c20aa84c371013d0cd442a2f26f90212d135 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Tue, 26 Jan 2016 20:51:26 -0500
Subject: [PATCH 101/320] [domains] better aspect ratio for MSNBC

+ do not slow down non video pages
---
 plugins/domains/msnbc.com.js | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 plugins/domains/msnbc.com.js

diff --git a/plugins/domains/msnbc.com.js b/plugins/domains/msnbc.com.js
new file mode 100644
index 000000000..560c1ed0c
--- /dev/null
+++ b/plugins/domains/msnbc.com.js
@@ -0,0 +1,30 @@
+module.exports = {
+
+    mixins: [
+        "*"
+    ],
+
+    provides: '__allowEmbedURL',
+
+    getData: function(twitter, whitelistRecord) {
+
+        if (twitter.player && whitelistRecord.isAllowed && whitelistRecord.isAllowed('html-meta.embedURL')) { 
+            return {
+                __allowEmbedURL: true
+            };        
+        }
+    },
+
+    getLink: function(schemaVideoObject, whitelistRecord) {
+        return {
+            href: schemaVideoObject.embedURL || schemaVideoObject.embedUrl,
+            rel: [CONFIG.R.player, CONFIG.R.html5],
+            type: CONFIG.T.text_html,
+            'aspect-ratio': 4/3
+        }
+    },
+
+    tests: [
+        "http://www.msnbc.com/andrea-mitchell-reports/watch/clinton-emails-take-unwanted-spotlight-410353731888"
+    ]
+};
\ No newline at end of file

From 6a5f4e7fc32df1781b3bc9e2d2cf81c4bbda034d Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Tue, 26 Jan 2016 23:41:42 -0500
Subject: [PATCH 102/320] [domains] fix ssl for twitch

---
 plugins/domains/twitch.tv.js | 39 ++++++++++++++++++++++--------------
 1 file changed, 24 insertions(+), 15 deletions(-)

diff --git a/plugins/domains/twitch.tv.js b/plugins/domains/twitch.tv.js
index 799c2b4af..711c9244e 100644
--- a/plugins/domains/twitch.tv.js
+++ b/plugins/domains/twitch.tv.js
@@ -1,25 +1,34 @@
 module.exports = {
 
     mixins: [
-        "og-image",
-        "favicon",
-        "og-description",
-        "og-site",
-        "og-title"
+        "*"
     ],
 
-    getLink: function (og) {
+    getLink: function (og, request, cb) {
 
-        if (!(og.video && og.video.secure_url)) {
-            return;
-        }
+        if (og.video && og.video.secure_url) {
+
+            request({
+                uri: og.video.secure_url,
+                followRedirect: false,
+                prepareResult: function(error, response, body, cb) {
+
+                    if (error) {
+                        return cb(error);
+                    }
 
+                    return cb (null, {
+                        href: response.headers.location ? response.headers.location.replace(/^http/, 'https') : og.video.secure_url, // ssl re-directs to non-ssl.
+                        type: og.video.type,
+                        rel: [CONFIG.R.player, CONFIG.R.autoplay],
+                        "aspect-ratio": og.video.width / og.video.height
+                    });
 
-        return {
-            href: og.video.secure_url,
-            type: og.video.type,
-            rel: [CONFIG.R.player, CONFIG.R.autoplay],
-            "aspect-ratio": og.video.width / og.video.height
-        };
+                }
+            }, cb);
+
+        } else {
+            return cb(null);
+        }
     }
 };
\ No newline at end of file

From 6aa22f6d0602ca38b8c596ee89eed3d02f8ef178 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Tue, 26 Jan 2016 23:45:41 -0500
Subject: [PATCH 103/320] [domains] fix media detector for smugmug

---
 plugins/domains/smugmug.com.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/plugins/domains/smugmug.com.js b/plugins/domains/smugmug.com.js
index 6e15f14ee..a93b7f878 100644
--- a/plugins/domains/smugmug.com.js
+++ b/plugins/domains/smugmug.com.js
@@ -8,6 +8,16 @@ module.exports = {
         "*"
     ],
 
+    highestPriority: true, 
+
+    getMeta: function (oembed) {
+
+        return {
+            media: 'player'
+        }
+
+    },
+
     getLink: function (oembed) {
 
         var links = [];

From f1692c1a3c6ef0e338b21817b7f81223a1ada621 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Wed, 27 Jan 2016 09:56:55 -0500
Subject: [PATCH 104/320] [general] fix the check for broken favicons

---
 lib/plugins/validators/async/20_checkFavicon.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/plugins/validators/async/20_checkFavicon.js b/lib/plugins/validators/async/20_checkFavicon.js
index f6f21a8ff..3dc4d6b45 100644
--- a/lib/plugins/validators/async/20_checkFavicon.js
+++ b/lib/plugins/validators/async/20_checkFavicon.js
@@ -47,7 +47,7 @@ module.exports = {
                     }
                 }
                 
-                if (data.code == 200 && data.content_length && data.content_length === 0) {
+                if (data.code == 200 && data.content_length === 0) {
                     link.error = "Image with 0 content_length";
                 }
 

From 87f64fd7aff297bf5a59de4a738ec61b1cb02763 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Wed, 27 Jan 2016 10:38:38 -0500
Subject: [PATCH 105/320] [domains] smugmug is also ssl now

---
 plugins/domains/smugmug.com.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/domains/smugmug.com.js b/plugins/domains/smugmug.com.js
index a93b7f878..82cb74341 100644
--- a/plugins/domains/smugmug.com.js
+++ b/plugins/domains/smugmug.com.js
@@ -56,7 +56,7 @@ module.exports = {
 
             if ($iframe.length == 1) {
                 links.push({
-                    href: $iframe.attr('src') + "?width=100%&height=100%",
+                    href: $iframe.attr('src').replace(/^http:\/\//, '//') + "?width=100%&height=100%",
                     type: CONFIG.T.text_html,
                     rel: [CONFIG.R.player, CONFIG.R.oembed]
                 });

From 7045cc7f27da87baf3160724a0dbecb721411c5c Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Thu, 28 Jan 2016 10:38:29 -0500
Subject: [PATCH 106/320] [domains] support vox cards

---
 plugins/domains/vox.com/vox.cards.ejs |  2 ++
 plugins/domains/vox.com/vox.cards.js  | 23 +++++++++++++++++++++++
 2 files changed, 25 insertions(+)
 create mode 100644 plugins/domains/vox.com/vox.cards.ejs
 create mode 100644 plugins/domains/vox.com/vox.cards.js

diff --git a/plugins/domains/vox.com/vox.cards.ejs b/plugins/domains/vox.com/vox.cards.ejs
new file mode 100644
index 000000000..de26eacd0
--- /dev/null
+++ b/plugins/domains/vox.com/vox.cards.ejs
@@ -0,0 +1,2 @@
+<div class="vox-cardstack"><a href="http://www.vox.com/cards/<%= slug %>"></a></div>
+<script src="//embed.vox.com/cardstack.js"></script>
\ No newline at end of file
diff --git a/plugins/domains/vox.com/vox.cards.js b/plugins/domains/vox.com/vox.cards.js
new file mode 100644
index 000000000..e5f78c0b1
--- /dev/null
+++ b/plugins/domains/vox.com/vox.cards.js
@@ -0,0 +1,23 @@
+module.exports = {
+
+    re: /^https?:\/\/www\.vox\.com\/cards\/([a-z0-9\-]+)/i,
+
+    mixins: [
+        "*"
+    ],
+
+    getLink: function(urlMatch) {
+            
+            return {
+                template_context: {
+                    slug: urlMatch[1]
+                },
+                type: CONFIG.T.text_html,
+                rel: [CONFIG.R.app, CONFIG.R.ssl]
+        }
+    },
+
+    tests: [
+        "http://www.vox.com/cards/iowa-caucus-2016-polls"
+    ]
+};
\ No newline at end of file

From 5dbedcd6239c25de46e79aa49ed59653738125be Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Thu, 28 Jan 2016 10:38:52 -0500
Subject: [PATCH 107/320] [domains] add apester

---
 plugins/domains/apester.com.js | 64 ++++++++++++++++++++++++++++++++++
 1 file changed, 64 insertions(+)
 create mode 100644 plugins/domains/apester.com.js

diff --git a/plugins/domains/apester.com.js b/plugins/domains/apester.com.js
new file mode 100644
index 000000000..a63821e41
--- /dev/null
+++ b/plugins/domains/apester.com.js
@@ -0,0 +1,64 @@
+module.exports = {
+
+    re: [
+        /^https?:\/\/(?:renderer|preview)\.qmerce\.com\/interaction\/([a-z0-9]+)/i
+    ],
+
+    mixins: ['*'],
+
+    provides: 'qmerce',
+
+    getData: function(urlMatch, request, cb) {
+
+        // need to detect the height
+        request({
+            uri: "http://preview.qmerce.com/api/interaction/" + urlMatch[1],
+            json: true,
+            prepareResult: function(error, response, body, cb) {
+
+                if (error) {
+                    return cb(error);
+                } 
+
+                if (body.message !== 'ok' ) {
+                    return cb(body.message);
+                } else {
+                    cb(null, {
+                        qmerce: body.payload
+                    });
+                }
+            }
+        }, cb);
+    },
+
+    getLink: function(qmerce, urlMatch) {
+        return [{
+            href: '//renderer.qmerce.com/interaction/' + urlMatch[1],
+            type: CONFIG.T.text_html,
+            rel: [CONFIG.R.survey, CONFIG.R.html5],
+            height: qmerce.data.size.height // do not check for "undefined" - let it fail if it happens
+        }, {
+            href: qmerce.image && qmerce.image.path && ('http://images.apester.com/' + qmerce.image.path.replace (/\//g, '%2F')),
+            type: CONFIG.T.image,
+            rel: CONFIG.R.thumbnail
+        }]
+    },
+
+    getMeta: function(qmerce) {
+        return {
+            title: qmerce.title,
+            date: qmerce.updated || qmerce.created,
+            author: qmerce.publisher && qmerce.publisher.name
+        }
+    },    
+
+    tests: [
+        "http://renderer.qmerce.com/interaction/5661a18763937fdb5ef4fa87",
+        "http://renderer.qmerce.com/interaction/567cd70dc3b9c606515e7716",
+        "http://renderer.qmerce.com/interaction/567af436781fde0551b3e049",
+        "https://preview.qmerce.com/interaction/566e7dacd98c046319a768b4",
+        "https://preview.qmerce.com/interaction/562a434547771a99601c3626",
+        "http://renderer.qmerce.com/interaction/562146b041d4754d14603b18",
+        "http://renderer.qmerce.com/interaction/569388818089e8dd05aff3a8"
+    ]
+};
\ No newline at end of file

From 526cea3e0619da7d15692ee97ed41e1dda12190f Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Fri, 29 Jan 2016 15:27:55 -0500
Subject: [PATCH 108/320] [domains] minor fixes

---
 plugins/domains/cnn.com.js          | 2 +-
 plugins/domains/features.aol.com.js | 2 +-
 plugins/domains/mail.ru.js          | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugins/domains/cnn.com.js b/plugins/domains/cnn.com.js
index 79cf75c8f..7b6ac7137 100644
--- a/plugins/domains/cnn.com.js
+++ b/plugins/domains/cnn.com.js
@@ -1,7 +1,7 @@
 module.exports = {
 
     re: [
-        /^https?:\/\/(www|edition)\.cnn\.com\/videos\//i,
+        /^https?:\/\/(www|edition)?\.?cnn\.com\/videos\//i,
     ],
 
     mixins: [
diff --git a/plugins/domains/features.aol.com.js b/plugins/domains/features.aol.com.js
index 70e199c2f..d975f0dbd 100644
--- a/plugins/domains/features.aol.com.js
+++ b/plugins/domains/features.aol.com.js
@@ -14,7 +14,7 @@ module.exports = {
 
             if (playlist) {
                 return {
-                    href: "//pshared.5min.com/Scripts/PlayerSeed.js?sid=281&&playList=" + playlist,
+                    href: "http://pshared.5min.com/Scripts/PlayerSeed.js?sid=281&&playList=" + playlist,
                     type: CONFIG.T.javascript,
                     rel: [CONFIG.R.player,  CONFIG.R.inline, CONFIG.R.html5],
                     "aspect-ratio": 16 / 9
diff --git a/plugins/domains/mail.ru.js b/plugins/domains/mail.ru.js
index 1507d9f74..48ced67ab 100644
--- a/plugins/domains/mail.ru.js
+++ b/plugins/domains/mail.ru.js
@@ -1,7 +1,7 @@
 module.exports = {
 
     re: [
-        /^https?:\/\/my\.mail\.ru\/(inbox|mail)\/[a-zA-Z0-9\._\-]+\/video\/([a-zA-Z0-9_]+)\/([a-zA-Z0-9_]+)\.html/i
+        /^https?:\/\/my\.mail\.ru\/(inbox|mail|list|bk|corp)\/[a-zA-Z0-9\._\-]+\/video\/([a-zA-Z0-9_]+)\/([a-zA-Z0-9_]+)\.html/i
     ],
 
     mixins: [
@@ -15,7 +15,7 @@ module.exports = {
         }
 
         return {
-                href: 'http://videoapi.my.mail.ru/videos/embed/mail/' + url.replace(/^https?:\/\/my\.mail\.ru\/(inbox|mail)\//, ''),
+                href: 'http://videoapi.my.mail.ru/videos/embed/' + url.replace(/^https?:\/\/my\.mail\.ru\//, '').replace(/^inbox/, 'mail'),
                 type: CONFIG.T.text_html,
                 rel: [CONFIG.R.player, CONFIG.R.ssl, CONFIG.R.html5],
                 "aspect-ratio": 626 / 367

From 972486ec7204b85802930ab2be42e156bd61a8c5 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Sat, 30 Jan 2016 11:20:48 -0500
Subject: [PATCH 109/320] [domains] globalnews.ca doesn't publish
 twitter:player any longer

---
 plugins/domains/archive.org.js   |  2 +-
 plugins/domains/globalnews.ca.js | 22 ++++++++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 plugins/domains/globalnews.ca.js

diff --git a/plugins/domains/archive.org.js b/plugins/domains/archive.org.js
index c4c6377ad..0fced436a 100644
--- a/plugins/domains/archive.org.js
+++ b/plugins/domains/archive.org.js
@@ -24,7 +24,7 @@ module.exports = {
             }
 
 
-            if (/\.(mp4|avi)$/i.test(player.href)) {
+            if (/\.(mp4|avi|mov)$/i.test(player.href)) {
                 player["aspect-ratio"] = twitter.player.width / twitter.player.height;
             }
 
diff --git a/plugins/domains/globalnews.ca.js b/plugins/domains/globalnews.ca.js
new file mode 100644
index 000000000..5c0765f3d
--- /dev/null
+++ b/plugins/domains/globalnews.ca.js
@@ -0,0 +1,22 @@
+module.exports = {
+
+    re: [
+        /^https?:\/\/globalnews\.ca\/video\/(\d+)\//i
+    ],
+
+    mixins: ["*"],
+
+    getLink: function(urlMatch) {
+
+        return {
+                href: "http://globalnews.ca/video/embed/" + urlMatch[1] + "/",
+                type: CONFIG.T.text_html,
+                rel: [CONFIG.R.player, CONFIG.R.html5],
+                "aspect-ratio": 670 / 437
+            };
+    },
+
+    tests: [
+        "http://globalnews.ca/video/1915279/red-wings-forward-drew-miller-gets-slashed-in-face-on-ice"
+    ]
+};
\ No newline at end of file

From 8e97c28d7386df712966578a263ea8278f4e6f45 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Mon, 1 Feb 2016 09:37:17 -0500
Subject: [PATCH 110/320] [domains] explicit media detector for clip.vn

---
 plugins/domains/clip.vn.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/plugins/domains/clip.vn.js b/plugins/domains/clip.vn.js
index 1ed6ad2bf..910e39978 100644
--- a/plugins/domains/clip.vn.js
+++ b/plugins/domains/clip.vn.js
@@ -3,6 +3,7 @@ module.exports = {
     re: /^http:\/\/clip\.vn\/watch\/(?:[\w-]+,)?([\w-]+)\/?/i,
 
     mixins: ["*"],
+    highestPriority: true,    
 
     getLink: function(urlMatch) {
         return {
@@ -13,6 +14,12 @@ module.exports = {
         };
     },
 
+    getMeta: function(urlMatch) {
+        return {
+            "media": "player"
+        };
+    },    
+
     tests: [{
         pageWithFeed: "http://clip.vn/"
     },

From 493db5aea3f205f6b6d48989d62e710939d797ab Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Thu, 4 Feb 2016 14:57:36 -0500
Subject: [PATCH 111/320] [domains] fix t-online.de

---
 plugins/domains/t-online.de.js | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 plugins/domains/t-online.de.js

diff --git a/plugins/domains/t-online.de.js b/plugins/domains/t-online.de.js
new file mode 100644
index 000000000..0426e6899
--- /dev/null
+++ b/plugins/domains/t-online.de.js
@@ -0,0 +1,29 @@
+module.exports = {
+
+    re: [
+        /^https?:\/\/www\.t\-online\.de\/tv\//i
+    ],
+
+    mixins: [
+        "*"
+    ],
+
+    getLink: function(meta) {
+
+        var href = meta.video_src.href || meta.video_src;
+
+        if (href && /\.mp4$/.test(href)) {
+        
+            return {
+                href: meta.video_src.href || meta.video_src,
+                type: CONFIG.T.video_mp4,                
+                rel: [CONFIG.R.player],
+                "aspect-ratio": meta.video_width &&  meta.video_height ? (meta.video_width > meta.video_height ? meta.video_width / meta.video_height : meta.video_height / meta.video_width) : 16 / 9
+            }
+        }
+    },
+
+    tests: [
+        "http://www.t-online.de/tv/stars/vip-spotlight/id_58647502/sexy-bilder-stars-im-bikini.html?vid=ap"
+    ]
+};
\ No newline at end of file

From eb9a01eb002d98f190f189d2345afce9ef118713 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Thu, 4 Feb 2016 15:05:53 -0500
Subject: [PATCH 112/320] [domains] future fix for abc.go.com - when they
 actually fix the embed player

---
 plugins/.fixme/abc.go.com.js | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 plugins/.fixme/abc.go.com.js

diff --git a/plugins/.fixme/abc.go.com.js b/plugins/.fixme/abc.go.com.js
new file mode 100644
index 000000000..2385f5d9d
--- /dev/null
+++ b/plugins/.fixme/abc.go.com.js
@@ -0,0 +1,24 @@
+module.exports = {
+
+    re: /^https?:\/\/abc\.go\.com\/shows\/[\w\-]+\/video\/(?:most\-recent\/|featured\/)?([a-zA-Z0-9_]+)/i,
+
+    mixins: [
+        "*"
+    ],
+
+    getLink: function(urlMatch) {
+
+        return {
+            href: "//abc.go.com/embed/" + urlMatch[1],
+            rel: [CONFIG.R.player, CONFIG.R.html5],
+            type: CONFIG.T.text_html,
+            'aspect-ratio': 644/362
+        };
+    },
+
+    tests: [
+        "http://abc.go.com/shows/jimmy-kimmel-live/video/most-recent/vdka0_uujyfy0k",
+        "http://abc.go.com/shows/bachelor-live/video/VDKA0_phcdyfk5"
+    ]
+
+};
\ No newline at end of file

From 9b9ad7eaa39e2acac7c335c4d6a6690383785dbf Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Wed, 10 Feb 2016 14:21:39 -0500
Subject: [PATCH 113/320] [domains] return support for ComedyCentral + other
 minors

---
 plugins/domains/behance.net.js |  3 ++-
 plugins/domains/cc.com.js      | 30 ++++++++++++++++++++++++++++++
 plugins/domains/mail.ru.js     |  2 +-
 3 files changed, 33 insertions(+), 2 deletions(-)
 create mode 100644 plugins/domains/cc.com.js

diff --git a/plugins/domains/behance.net.js b/plugins/domains/behance.net.js
index 41b7c11b5..d613670f2 100644
--- a/plugins/domains/behance.net.js
+++ b/plugins/domains/behance.net.js
@@ -45,7 +45,8 @@ module.exports = {
                 type: CONFIG.T.text_html,
                 rel: [CONFIG.R.reader, CONFIG.R.oembed, CONFIG.R.html5],
                 "min-width": oembed.thumbnail_width,
-                "min-height": oembed.thumbnail_height
+                "min-height": oembed.thumbnail_height,
+                "aspect-ratio": 1 / Math.sqrt(2) // A4
             };
         }
     },
diff --git a/plugins/domains/cc.com.js b/plugins/domains/cc.com.js
new file mode 100644
index 000000000..6811672a4
--- /dev/null
+++ b/plugins/domains/cc.com.js
@@ -0,0 +1,30 @@
+module.exports = {
+
+    re: [        
+        /https?:\/\/www\.cc\.com\/video\-clips\//i
+    ],
+
+    mixins: ["*"],
+
+    getLink: function(sm4, cheerio) {
+
+        if (sm4.type && /video/i.test(sm4.type)) {
+
+            var $player = cheerio('.video_player[data-mgid*="mgid:arc:video:comedycentral.com"]');
+        
+            if ($player.length) {
+                return {
+                    href: "http://media.mtvnservices.com/embed/" + $player.attr('data-mgid'),
+                    type: CONFIG.T.text_html,
+                    rel: [CONFIG.R.player,  CONFIG.R.html5],
+                    "aspect-ratio": 512 / 288
+
+                }
+            }
+        }
+    },
+
+    tests: [
+        "http://www.cc.com/video-clips/4hfvws/the-daily-show-with-trevor-noah-jon-stewart-returns-to-shame-congress"
+    ]
+};
\ No newline at end of file
diff --git a/plugins/domains/mail.ru.js b/plugins/domains/mail.ru.js
index 48ced67ab..aaff56cdf 100644
--- a/plugins/domains/mail.ru.js
+++ b/plugins/domains/mail.ru.js
@@ -15,7 +15,7 @@ module.exports = {
         }
 
         return {
-                href: 'http://videoapi.my.mail.ru/videos/embed/' + url.replace(/^https?:\/\/my\.mail\.ru\//, '').replace(/^inbox/, 'mail'),
+                href: '//videoapi.my.mail.ru/videos/embed/' + url.replace(/^https?:\/\/my\.mail\.ru\//, '').replace(/^inbox/, 'mail'),
                 type: CONFIG.T.text_html,
                 rel: [CONFIG.R.player, CONFIG.R.ssl, CONFIG.R.html5],
                 "aspect-ratio": 626 / 367

From 133a007054905e573a3752ac695d7a1a16288c72 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Wed, 10 Feb 2016 21:47:49 -0500
Subject: [PATCH 114/320] [domains] support for NHL redesign

---
 plugins/domains/nhl.com.js | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 plugins/domains/nhl.com.js

diff --git a/plugins/domains/nhl.com.js b/plugins/domains/nhl.com.js
new file mode 100644
index 000000000..891c95126
--- /dev/null
+++ b/plugins/domains/nhl.com.js
@@ -0,0 +1,30 @@
+module.exports = {
+
+    re: [        
+        /https?:\/\/(?:www\.)?nhl\.com(\/\w+\/)video\/([a-zA-Z0-9\-]+\/t\-\d+\/c\-\d+)/i,
+        /https?:\/\/(?:www\.)?nhl\.com(\/)video\/([a-zA-Z0-9\-]+\/t\-\d+\/c\-\d+)/i
+    ],
+
+    mixins: ["*"],
+
+    getLinks: function(urlMatch) {
+
+        return [{
+            href: "https://www.nhl.com" + urlMatch[1] + "video/embed/" + urlMatch[2] + "?autostart=false",
+            type: CONFIG.T.text_html,
+            rel: [CONFIG.R.player,  CONFIG.R.html5],
+            "aspect-ratio": 540 / 310
+        }, {
+            href: "https://www.nhl.com" + urlMatch[1] + "video/embed/" + urlMatch[2] + "?autostart=true",
+            type: CONFIG.T.text_html,
+            rel: [CONFIG.R.player,  CONFIG.R.html5, CONFIG.R.autoplay],
+            "aspect-ratio": 540 / 310
+        }]
+    },
+
+    tests: [
+        "https://www.nhl.com/blackhawks/video/whatsyourgoal-emilie/t-277443408/c-40739903",
+        "https://www.nhl.com/video/toews-ot-winner/t-277350912/c-40861003",
+        "https://www.nhl.com/video/niskanens-go-ahead-goal/t-277983160/c-40970503"
+    ]
+};
\ No newline at end of file

From 8cfef27ffbcdcc1635a5a24f3ac1628af078e507 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Wed, 10 Feb 2016 21:48:07 -0500
Subject: [PATCH 115/320] [domains] a bit more URLs for Comedy Central

---
 plugins/domains/cc.com.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/plugins/domains/cc.com.js b/plugins/domains/cc.com.js
index 6811672a4..f509c39d6 100644
--- a/plugins/domains/cc.com.js
+++ b/plugins/domains/cc.com.js
@@ -1,7 +1,7 @@
 module.exports = {
 
     re: [        
-        /https?:\/\/www\.cc\.com\/video\-clips\//i
+        /https?:\/\/www\.cc\.com\/video\-(clips|collections)\//i
     ],
 
     mixins: ["*"],
@@ -25,6 +25,7 @@ module.exports = {
     },
 
     tests: [
-        "http://www.cc.com/video-clips/4hfvws/the-daily-show-with-trevor-noah-jon-stewart-returns-to-shame-congress"
+        "http://www.cc.com/video-clips/4hfvws/the-daily-show-with-trevor-noah-jon-stewart-returns-to-shame-congress",
+        "http://www.cc.com/video-collections/igf7f1/the-daily-show-with-jon-stewart-jon-s-final-episode/bjutn7?xrs=share_copy_email"
     ]
 };
\ No newline at end of file

From a6dc3981e4fa023d827ba9b6eb9cb694498b7e2f Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Wed, 10 Feb 2016 22:26:06 -0500
Subject: [PATCH 116/320] [domains] 500px now provides js embeds

---
 lib/plugins/system/oembed/providers.json |  4 ++--
 plugins/domains/500px/500px.com.ejs      |  7 +++++++
 plugins/domains/{ => 500px}/500px.com.js | 23 +++++++++++++++--------
 3 files changed, 24 insertions(+), 10 deletions(-)
 create mode 100644 plugins/domains/500px/500px.com.ejs
 rename plugins/domains/{ => 500px}/500px.com.js (55%)

diff --git a/lib/plugins/system/oembed/providers.json b/lib/plugins/system/oembed/providers.json
index 64273fc06..23835a6bc 100644
--- a/lib/plugins/system/oembed/providers.json
+++ b/lib/plugins/system/oembed/providers.json
@@ -253,9 +253,9 @@
     {
         "name": "500px",
         "templates": [
-            "500px\\.com/photo/(\\d+).*"
+            "500px\\.com/photo/(\\d+)\\[a-zA-Z0-9_-]+"
         ],
-        "endpoint": "http://500px.com/photo/{1}/oembed.{format}"
+        "endpoint": "https://500px.com/oembed"        
     },
     {
         "name": "Dipdive",
diff --git a/plugins/domains/500px/500px.com.ejs b/plugins/domains/500px/500px.com.ejs
new file mode 100644
index 000000000..5503672bc
--- /dev/null
+++ b/plugins/domains/500px/500px.com.ejs
@@ -0,0 +1,7 @@
+<div class='pixels-photo'>
+  <p>
+    <img src='<%= img_src %>' alt='<%= title %>'>
+  </p>
+  <a href='<%= canonical %>' alt='<%= title %>'></a>
+</div>
+<script type='text/javascript' src='https://500px.com/embed.js'></script>
\ No newline at end of file
diff --git a/plugins/domains/500px.com.js b/plugins/domains/500px/500px.com.js
similarity index 55%
rename from plugins/domains/500px.com.js
rename to plugins/domains/500px/500px.com.js
index d3f1c29b4..4e4197264 100644
--- a/plugins/domains/500px.com.js
+++ b/plugins/domains/500px/500px.com.js
@@ -23,19 +23,26 @@ module.exports = {
         };
     },
 
-    getLinks: function(meta) {
-        return {
-            href: meta["shortcut icon"].href,
-            type: CONFIG.T.image_icon,
-            rel: CONFIG.R.icon,
-            width: 32,
-            height: 32
+    getLinks: function(url, oembed) {
+        if (oembed.type === 'photo') {
+            return {
+                template_context: {
+                    title: oembed.title + ' | ' + oembed.provider_name,
+                    img_src: oembed.url,
+                    canonical: url
+                },
+                type: CONFIG.T.text_html,
+                rel: [CONFIG.R.image, CONFIG.R.inline, CONFIG.R.html5],
+                "aspect-ratio": oembed.width / oembed.height
+
+            }
         }
     },
 
     tests: [{
         pageWithFeed: "https://500px.com/flow"
     },
-        "http://500px.com/photo/13541787?from=upcoming"
+        "http://500px.com/photo/13541787?from=upcoming",
+        "https://500px.com/photo/56891080/frozen-by-ryan-pendleton?ctx_page=1&from=user&user_id=116369"
     ]
 };
\ No newline at end of file

From 4b0dc7acd58b13b44a60fa3e49da38d10d0850df Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Fri, 12 Feb 2016 08:09:29 -0500
Subject: [PATCH 117/320] [domains] fix nbc sports

---
 plugins/domains/nbcsports.com.js | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/plugins/domains/nbcsports.com.js b/plugins/domains/nbcsports.com.js
index 416e14d35..b25e66915 100644
--- a/plugins/domains/nbcsports.com.js
+++ b/plugins/domains/nbcsports.com.js
@@ -8,20 +8,28 @@ module.exports = {
         "*"
     ],
 
-    getLink: function(twitter) {
+    getLink: function(twitter, cheerio) {
 
         if (twitter.player) {
 
-            return {
-                href: twitter.player.stream.value || twitter.player.stream,
-                type: CONFIG.T.maybe_text_html, // verify, it is likely a text/html rather than mp4
-                rel: [CONFIG.R.player, CONFIG.R.html5],
-                "aspect-ratio": 16 / 9 // twitter.player width & height are incorrect
+            var $player = cheerio('#vod-player');
+
+            if ($player.length) {
+                
+                var src = $player.attr('src');
+                
+                return {
+                    href: src.match(/\/\/vplayer\.nbcsports\.com\/p\/[a-zA-Z0-9_]+\/nbcsports\/select\/media\/[a-zA-Z0-9_]+/i)[0],
+                    rel: [CONFIG.R.player, CONFIG.R.html5],
+                    type: CONFIG.T.text_html,
+                    "aspect-ratio": 16/9
+                }
             }
         }
     },
 
     tests: [
-        "http://www.nbcsports.com/video/redskins-team-beat-wild-card-matchup-vs-packers"
+        "http://www.nbcsports.com/video/redskins-team-beat-wild-card-matchup-vs-packers",
+        "http://www.nbcsports.com/video/alex-morgan-scores-opening-12-seconds-vs-costa-rica"
     ]
 };
\ No newline at end of file

From de0b03a8349761910954f4c9517029f8fb3a5c6f Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Fri, 12 Feb 2016 15:44:32 +0200
Subject: [PATCH 118/320] [oembed] return description meta in oembed response

---
 lib/oembed.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/oembed.js b/lib/oembed.js
index 8a93cc848..27d5d56b2 100644
--- a/lib/oembed.js
+++ b/lib/oembed.js
@@ -23,6 +23,9 @@ exports.getOembed = function(uri, data, options) {
     if (data.meta.site) {
         oembed.provider_name = data.meta.site;
     }
+    if (data.meta.description) {
+        oembed.description = data.meta.description;
+    }
 
     // Search only promo for thumbnails.
     var thumbnailLinks = htmlUtils.filterLinksByRel(CONFIG.R.promo, data.links);

From 36557a0f392480fce91ac0b090f416918a4f01ad Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Fri, 12 Feb 2016 08:59:32 -0500
Subject: [PATCH 119/320] [domains] forgot SSL flag for 500px html embeds

---
 plugins/domains/500px/500px.com.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/domains/500px/500px.com.js b/plugins/domains/500px/500px.com.js
index 4e4197264..e7eabc7d0 100644
--- a/plugins/domains/500px/500px.com.js
+++ b/plugins/domains/500px/500px.com.js
@@ -32,7 +32,7 @@ module.exports = {
                     canonical: url
                 },
                 type: CONFIG.T.text_html,
-                rel: [CONFIG.R.image, CONFIG.R.inline, CONFIG.R.html5],
+                rel: [CONFIG.R.image, CONFIG.R.inline, CONFIG.R.html5, CONFIG.R.ssl],
                 "aspect-ratio": oembed.width / oembed.height
 
             }

From ede40ba43a24a97b70c8e52a8260cf7ab8d4ab59 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Fri, 12 Feb 2016 13:14:46 -0500
Subject: [PATCH 120/320] [tests] better URL scheme for myvideo.de

---
 plugins/domains/myvideo.de.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/plugins/domains/myvideo.de.js b/plugins/domains/myvideo.de.js
index 8606e3eb8..3b28500a6 100644
--- a/plugins/domains/myvideo.de.js
+++ b/plugins/domains/myvideo.de.js
@@ -1,7 +1,8 @@
 module.exports = {
 
     re: [
-        /^https?:\/\/www\.myvideo\.de\/watch\/([0-9]+)/i
+        /^https?:\/\/www\.myvideo\.de\/watch\/([0-9]+)/i,
+        /^https?:\/\/www\.myvideo\.de[\/a-zA-Z0-9\-]+\/[a-zA-Z0-9\-]+\-m\-(\d+)/i
         // the rest should be covered by whitelist via embedURL - it verifies permissions etc
     ],
 
@@ -19,6 +20,8 @@ module.exports = {
     },
 
     tests: [
-        "http://www.myvideo.de/watch/9790416/Balbina_Seife_feat_Maeckes"
+        "http://www.myvideo.de/watch/9790416/Balbina_Seife_feat_Maeckes",
+        "http://www.myvideo.de/filme/cristiano-ronaldo-feet-m-11870130",
+        "http://www.myvideo.de/serien/zoo/highlights/preview-folge-9-gefahr-droht-oben-m-12145697"
     ]
 };
\ No newline at end of file

From abc34dfd9474ef9afa78f4d0798ce8b783161b0c Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Mon, 15 Feb 2016 17:46:15 +0200
Subject: [PATCH 121/320] [domains] return twitter api call error

---
 plugins/domains/twitter.status.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/plugins/domains/twitter.status.js b/plugins/domains/twitter.status.js
index 6052d4f9c..08ea43ad5 100644
--- a/plugins/domains/twitter.status.js
+++ b/plugins/domains/twitter.status.js
@@ -73,6 +73,10 @@ module.exports = {
                     ttl: c.cache_ttl,
                     prepareResult: function(error, response, data, cb) {
 
+                        if (error) {
+                            return cb(error);
+                        }
+
                         if (response.fromRequestCache) {
                             if (blockExpireIn > 0) {
                                 sysUtils.log('   -- Twitter API limit reached (' + blockExpireIn + ' seconds left), but cache used.');

From 2ce137b86a3ffef5b63878a0aa31ec38800d1603 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Mon, 15 Feb 2016 10:47:43 -0500
Subject: [PATCH 122/320] [domains] support 'share' links of newsinc

---
 plugins/domains/launch.newsinc.com.js | 43 +++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 plugins/domains/launch.newsinc.com.js

diff --git a/plugins/domains/launch.newsinc.com.js b/plugins/domains/launch.newsinc.com.js
new file mode 100644
index 000000000..31e1b562d
--- /dev/null
+++ b/plugins/domains/launch.newsinc.com.js
@@ -0,0 +1,43 @@
+var URL = require("url");
+
+module.exports = {
+
+    re: [
+        /^https?:\/\/launch\.newsinc\.com\/share\.html\?.+/i,
+        /^https?:\/\/launch\.newsinc\.com\/embed.html\?.+/i
+    ],
+
+    mixins: ["*"],
+
+    getLink: function(url) {
+
+        var link = URL.parse(url, true);
+        var query = link.query;
+        var trackingGroup = query.trackingGroup;
+        var siteSection = query.siteSection;
+        var videoId = query.videoId;
+
+        if (trackingGroup && videoId) {
+
+            return {                
+                href: '//launch.newsinc.com/embed.html?type=VideoPlayer/Single&widgetId=2&trackingGroup=' + trackingGroup + '&videoId=' + videoId + (siteSection ? '&siteSection=ndn' + siteSection : ''),
+                        // embed code in player lists `widegtId=1`, but that one autoplays and no thumbnail available
+                type: CONFIG.T.text_html,
+                rel: [CONFIG.R.player, CONFIG.R.html5],
+                "aspect-ratio": 16 / 9
+            };
+        }
+    },
+
+    tests: [{
+        noFeeds: true
+    },
+        "http://launch.newsinc.com/share.html?trackingGroup=91585&siteSection=unitedpress&videoId=30060852",
+        "http://launch.newsinc.com/share.html?trackingGroup=91663&videoId=29926306",
+        "http://launch.newsinc.com/share.html?trackingGroup=91002&siteSection=latimes_hom_non_sec&videoId=29750644",
+        "http://launch.newsinc.com/?type=VideoPlayer/Single&widgetId=1&trackingGroup=69016&siteSection=unitedpress&videoId=28774159",
+        "http://launch.newsinc.com/share.html?trackingGroup=90051&siteSection=nydailynews-entertainment&videoId=28336738",
+        "http://launch.newsinc.com/share.html?trackingGroup=69016&siteSection=omahawh_spt_ncaa_sty_pp&videoId=28750854"
+    ]
+
+};
\ No newline at end of file

From a1ea1fdc2563af864f168d8951a699499e94b09c Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Tue, 16 Feb 2016 08:30:43 -0500
Subject: [PATCH 123/320] [facebook] avoid 500 errors from the origin - do not
 request the source page

should resolve #106
---
 plugins/domains/facebook.com/facebook.data.js | 45 +++++-------------
 .../facebook.com/facebook.redirects.js        | 46 +++++++++++++++++++
 2 files changed, 57 insertions(+), 34 deletions(-)
 create mode 100644 plugins/domains/facebook.com/facebook.redirects.js

diff --git a/plugins/domains/facebook.com/facebook.data.js b/plugins/domains/facebook.com/facebook.data.js
index d3cfd43ac..a98034cf6 100644
--- a/plugins/domains/facebook.com/facebook.data.js
+++ b/plugins/domains/facebook.com/facebook.data.js
@@ -3,50 +3,27 @@ module.exports = {
     // It's official: https://developers.facebook.com/docs/plugins/oembed-endpoints
 
     mixins: [
-        "favicon",
+        "domain-favicon",
         "oembed-author",
         "oembed-canonical",
         "oembed-site"
     ],
 
-    getMeta: function(meta) {
-        return {
-            title: meta["html-title"].replace(/ \| Facebook$/, ""),
-            description: meta["description"]
-        };
-    },
+    getMeta: function(oembed) {
 
-    getData: function(url, meta, cb) {
+        if (oembed.html) {
 
-        if (meta["html-title"] === "Facebook" || meta["html-title"] === "Leaving Facebook...") {
-            // the content is not public
-            return cb({responseStatusCode: 403});
-        }
+            var description = oembed.html.match(/<p>(.*?)<\/p>/i);
+            description = description ? description[1]: '';
 
-        if (/^https?:\/\/(?:www|m|business)\.facebook\.com\/login\.php/i.test(url)) {
-            // redirect to login
-            return cb({responseStatusCode: 403});
-        }
+            var title = oembed.html.match(/>([^<>]+)<\/a><p>/i);
+            title = title ? title [1] : oembed.author_name;
 
-        
-        if (meta["html-title"] === "Content Not Found") {
-            // for mobiles pages like https://m.facebook.com/story.php?story_fbid=654911224606798 fb doesn't return 404
-            return cb({responseStatusCode: 404});
-        } 
-        
-
-        // Little hack for FB mobile URLs, as FB embeds don't recognize it's own mobile links.
-        if (url.indexOf("m.facebook.com/story.php") > -1) {
-            return cb({redirect: url.replace("m.facebook.com/story.php", "www.facebook.com/permalink.php")});
-        } else if (url.indexOf("m.facebook.com/") > -1) {
-            return cb({redirect: url.replace("m.facebook.com", "www.facebook.com")});
+            return {
+                title: title,
+                description: description 
+            };
         }
-
-        if (url.indexOf('facebook.com/l.php?u=') > -1) {
-            return cb({redirect: decodeURIComponent(url.match(/u=([^&]+)/i)[1])});
-        }        
-
-        cb(null);
     },
 
     tests: [{
diff --git a/plugins/domains/facebook.com/facebook.redirects.js b/plugins/domains/facebook.com/facebook.redirects.js
new file mode 100644
index 000000000..97942bf7f
--- /dev/null
+++ b/plugins/domains/facebook.com/facebook.redirects.js
@@ -0,0 +1,46 @@
+module.exports = {
+
+    re: [        
+        /^https?:\/\/m\.facebook\.com\/story\.php/i,
+        /^https?:\/\/(?:www|m|business)\.facebook\.com\/login\.php/i,
+        /^https?:\/\/m\.facebook\.com/i,
+        /^https?:\/\/facebook\.com\/l\.php\?u=/i
+    ],
+
+    getData: function(url, meta, cb) {
+
+        if (meta["html-title"] === "Facebook" || meta["html-title"] === "Leaving Facebook...") {
+            // the content is not public
+            return cb({responseStatusCode: 403});
+        }
+
+        if (/^https?:\/\/(?:www|m|business)\.facebook\.com\/login\.php/i.test(url)) {
+            // redirect to login
+            return cb({responseStatusCode: 403});
+        }
+
+        
+        if (meta["html-title"] === "Content Not Found") {
+            // for mobiles pages like https://m.facebook.com/story.php?story_fbid=654911224606798 fb doesn't return 404
+            return cb({responseStatusCode: 404});
+        } 
+        
+
+        // Little hack for FB mobile URLs, as FB embeds don't recognize it's own mobile links.
+        if (url.indexOf("m.facebook.com/story.php") > -1) {
+            return cb({redirect: url.replace("m.facebook.com/story.php", "www.facebook.com/permalink.php")});
+        } else if (url.indexOf("m.facebook.com/") > -1) {
+            return cb({redirect: url.replace("m.facebook.com", "www.facebook.com")});
+        }
+
+        if (url.indexOf('facebook.com/l.php?u=') > -1) {
+            return cb({redirect: decodeURIComponent(url.match(/u=([^&]+)/i)[1])});
+        }        
+
+        cb(null);
+    },
+
+    tests: [{
+        noFeeds: true
+    }]
+};
\ No newline at end of file

From cd977f37e494e2c457cbab6409445fc1fe50a994 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Tue, 16 Feb 2016 08:33:00 -0500
Subject: [PATCH 124/320] [facebook] favicon typo

---
 plugins/domains/facebook.com/facebook.data.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/domains/facebook.com/facebook.data.js b/plugins/domains/facebook.com/facebook.data.js
index a98034cf6..68377dc2d 100644
--- a/plugins/domains/facebook.com/facebook.data.js
+++ b/plugins/domains/facebook.com/facebook.data.js
@@ -3,7 +3,7 @@ module.exports = {
     // It's official: https://developers.facebook.com/docs/plugins/oembed-endpoints
 
     mixins: [
-        "domain-favicon",
+        "domain-icon",
         "oembed-author",
         "oembed-canonical",
         "oembed-site"

From 42cf886c806760715e79ee952e4afc943cff5c16 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Tue, 16 Feb 2016 08:46:59 -0500
Subject: [PATCH 125/320] [facebook] handle line breaks in the descriptions

---
 plugins/domains/facebook.com/facebook.data.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/domains/facebook.com/facebook.data.js b/plugins/domains/facebook.com/facebook.data.js
index 68377dc2d..4a6038630 100644
--- a/plugins/domains/facebook.com/facebook.data.js
+++ b/plugins/domains/facebook.com/facebook.data.js
@@ -13,7 +13,7 @@ module.exports = {
 
         if (oembed.html) {
 
-            var description = oembed.html.match(/<p>(.*?)<\/p>/i);
+            var description = oembed.html.match(/<p>([^<>]+)<\/p>/i);
             description = description ? description[1]: '';
 
             var title = oembed.html.match(/>([^<>]+)<\/a><p>/i);

From 7ba6796c745fb18557e5413da2ded1da148359cc Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Tue, 16 Feb 2016 09:50:08 -0500
Subject: [PATCH 126/320] [facebook] better title detect for pages

---
 plugins/domains/facebook.com/facebook.data.js |  8 ++++++--
 plugins/domains/facebook.com/facebook.page.js | 13 +++++++++++++
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/plugins/domains/facebook.com/facebook.data.js b/plugins/domains/facebook.com/facebook.data.js
index 4a6038630..bebb21876 100644
--- a/plugins/domains/facebook.com/facebook.data.js
+++ b/plugins/domains/facebook.com/facebook.data.js
@@ -16,12 +16,16 @@ module.exports = {
             var description = oembed.html.match(/<p>([^<>]+)<\/p>/i);
             description = description ? description[1]: '';
 
+            var author = oembed.html.match(/Posted by <a(?:[^<>]+)>([^<>]+)<\/a>/);
+            author = author ? author[1]: oembed.author_name;
+
             var title = oembed.html.match(/>([^<>]+)<\/a><p>/i);
-            title = title ? title [1] : oembed.author_name;
+            title = title ? title[1] : author;
 
             return {
                 title: title,
-                description: description 
+                description: description,
+                author: author
             };
         }
     },
diff --git a/plugins/domains/facebook.com/facebook.page.js b/plugins/domains/facebook.com/facebook.page.js
index 388435d53..0103c87ac 100644
--- a/plugins/domains/facebook.com/facebook.page.js
+++ b/plugins/domains/facebook.com/facebook.page.js
@@ -5,6 +5,19 @@ module.exports = {
         /^https?:\/\/(www|m)\.facebook\.com\/([a-zA-Z0-9\.\-]+)\/?(?:\?f?ref=\w+)?$/i
     ],
 
+    getMeta: function(oembed, urlMatch) {
+
+        if (oembed.html) {
+
+            var title = oembed.html.match(/>([^<>]+)<\/a><\/blockquote>/i);
+            title = title ? title[1] : urlMatch[2];
+
+            return {
+                title: title
+            };
+        }
+    },    
+
     getLink: function(oembed, meta, options) {
 
         // skip user profiles - they can not be embedded        

From fe3a5ba2f02471067cacd9b156e148840b0d4dea Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Thu, 18 Feb 2016 12:12:01 +0200
Subject: [PATCH 127/320] [domains] twitter.com: use oembed v 1, remove rate
 limits

---
 plugins/domains/twitter.status.js | 64 ++-----------------------------
 1 file changed, 3 insertions(+), 61 deletions(-)

diff --git a/plugins/domains/twitter.status.js b/plugins/domains/twitter.status.js
index 08ea43ad5..58566cf3e 100644
--- a/plugins/domains/twitter.status.js
+++ b/plugins/domains/twitter.status.js
@@ -29,25 +29,12 @@ module.exports = {
             token: c.access_token,
             token_secret: c.access_token_secret
         };
-        var blockExpireIn = 0;
-        var block_key = 'twbl:' + c.consumer_key;
 
         async.waterfall([
 
             function(cb) {
-                cache.get(block_key, cb);
-            },
 
-            function(expireIn, cb) {
-
-                if (expireIn) {
-                    var now = Math.round(new Date().getTime() / 1000);
-                    if (expireIn > now) {
-                        blockExpireIn = expireIn - now;
-                    }
-                }
-
-                var url = "https://api.twitter.com/1" + (blockExpireIn > 0 ? "" : ".1") + "/statuses/oembed.json";
+                var url = "https://api.twitter.com/1/statuses/oembed.json";
 
                 var qs = {
                     id: id,
@@ -63,8 +50,7 @@ module.exports = {
                         json: true
                     })).digest("hex") + '"';
 
-
-                request(_.extend({
+                request({
                     url: url,
                     qs: qs,
                     json: true,
@@ -77,48 +63,6 @@ module.exports = {
                             return cb(error);
                         }
 
-                        if (response.fromRequestCache) {
-                            if (blockExpireIn > 0) {
-                                sysUtils.log('   -- Twitter API limit reached (' + blockExpireIn + ' seconds left), but cache used.');
-                            } else {
-                                sysUtils.log('   -- Twitter API cache used.');
-                            }
-                        }
-
-                        // Do not block api if data from cache.
-                        if (!response.fromRequestCache) {
-
-                            var remaining = parseInt(response.headers['x-rate-limit-remaining']);
-
-                            if (response.statusCode === 429 || remaining <= 7) {
-                                var now = Math.round(new Date().getTime() / 1000);
-                                var limitResetAt = parseInt(response.headers['x-rate-limit-reset']);
-                                var ttl = limitResetAt - now;
-
-                                // Do not allow ttl 0.
-                                // 5 seconds - to cover possible time difference with twitter.
-                                if (ttl < 5) {
-                                    ttl = 5;
-                                }
-
-                                // Block maximum for 15 minutes.
-                                if (ttl > 15*60) {
-                                    ttl = 15*60
-                                }
-
-                                if (response.statusCode === 429) {
-                                    sysUtils.log('   -- Twitter API limit reached by status code 429. Disabling for ' + ttl + ' seconds.');
-                                } else {
-                                    sysUtils.log('   -- Twitter API limit warning, remaining calls: ' + remaining + '. Disabling for ' + ttl + ' seconds.');
-                                }
-
-                                // Store expire date as value to be sure it past.
-                                var expireIn = now + ttl;
-
-                                cache.set(block_key, expireIn, {ttl: ttl});
-                            }
-                        }
-
                         if (response.statusCode !== 200) {
                             return cb('Non-200 response from Twitter API (statuses/oembed.json: ' + response.statusCode);
                         }
@@ -127,11 +71,9 @@ module.exports = {
                             return cb('Object expected in Twitter API (statuses/oembed.json), got: ' + data);
                         }
 
-
                         cb(error, data);
                     }
-                }, (blockExpireIn > 0 ? null : {oauth: oauth})), cb); // add oauth if 1.1, else skip it
-
+                }, cb);
             }
 
         ], function(error, oembed) {

From 81d9f47a4e7fbf9c5b8befbc9bfd03753650dbb1 Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Thu, 18 Feb 2016 16:35:00 +0200
Subject: [PATCH 128/320] Revert "[domains] twitter.com: use oembed v 1, remove
 rate limits"

This reverts commit fe3a5ba2f02471067cacd9b156e148840b0d4dea.
---
 plugins/domains/twitter.status.js | 64 +++++++++++++++++++++++++++++--
 1 file changed, 61 insertions(+), 3 deletions(-)

diff --git a/plugins/domains/twitter.status.js b/plugins/domains/twitter.status.js
index 58566cf3e..08ea43ad5 100644
--- a/plugins/domains/twitter.status.js
+++ b/plugins/domains/twitter.status.js
@@ -29,12 +29,25 @@ module.exports = {
             token: c.access_token,
             token_secret: c.access_token_secret
         };
+        var blockExpireIn = 0;
+        var block_key = 'twbl:' + c.consumer_key;
 
         async.waterfall([
 
             function(cb) {
+                cache.get(block_key, cb);
+            },
 
-                var url = "https://api.twitter.com/1/statuses/oembed.json";
+            function(expireIn, cb) {
+
+                if (expireIn) {
+                    var now = Math.round(new Date().getTime() / 1000);
+                    if (expireIn > now) {
+                        blockExpireIn = expireIn - now;
+                    }
+                }
+
+                var url = "https://api.twitter.com/1" + (blockExpireIn > 0 ? "" : ".1") + "/statuses/oembed.json";
 
                 var qs = {
                     id: id,
@@ -50,7 +63,8 @@ module.exports = {
                         json: true
                     })).digest("hex") + '"';
 
-                request({
+
+                request(_.extend({
                     url: url,
                     qs: qs,
                     json: true,
@@ -63,6 +77,48 @@ module.exports = {
                             return cb(error);
                         }
 
+                        if (response.fromRequestCache) {
+                            if (blockExpireIn > 0) {
+                                sysUtils.log('   -- Twitter API limit reached (' + blockExpireIn + ' seconds left), but cache used.');
+                            } else {
+                                sysUtils.log('   -- Twitter API cache used.');
+                            }
+                        }
+
+                        // Do not block api if data from cache.
+                        if (!response.fromRequestCache) {
+
+                            var remaining = parseInt(response.headers['x-rate-limit-remaining']);
+
+                            if (response.statusCode === 429 || remaining <= 7) {
+                                var now = Math.round(new Date().getTime() / 1000);
+                                var limitResetAt = parseInt(response.headers['x-rate-limit-reset']);
+                                var ttl = limitResetAt - now;
+
+                                // Do not allow ttl 0.
+                                // 5 seconds - to cover possible time difference with twitter.
+                                if (ttl < 5) {
+                                    ttl = 5;
+                                }
+
+                                // Block maximum for 15 minutes.
+                                if (ttl > 15*60) {
+                                    ttl = 15*60
+                                }
+
+                                if (response.statusCode === 429) {
+                                    sysUtils.log('   -- Twitter API limit reached by status code 429. Disabling for ' + ttl + ' seconds.');
+                                } else {
+                                    sysUtils.log('   -- Twitter API limit warning, remaining calls: ' + remaining + '. Disabling for ' + ttl + ' seconds.');
+                                }
+
+                                // Store expire date as value to be sure it past.
+                                var expireIn = now + ttl;
+
+                                cache.set(block_key, expireIn, {ttl: ttl});
+                            }
+                        }
+
                         if (response.statusCode !== 200) {
                             return cb('Non-200 response from Twitter API (statuses/oembed.json: ' + response.statusCode);
                         }
@@ -71,9 +127,11 @@ module.exports = {
                             return cb('Object expected in Twitter API (statuses/oembed.json), got: ' + data);
                         }
 
+
                         cb(error, data);
                     }
-                }, cb);
+                }, (blockExpireIn > 0 ? null : {oauth: oauth})), cb); // add oauth if 1.1, else skip it
+
             }
 
         ], function(error, oembed) {

From 9dfd5ed8cf50ec6d9c06c5559de47a6ba0acb443 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Thu, 18 Feb 2016 10:05:28 -0500
Subject: [PATCH 129/320] [twitter] remove temp cache keys - move completely to
 new ones

---
 plugins/domains/twitter.status.js | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/plugins/domains/twitter.status.js b/plugins/domains/twitter.status.js
index 08ea43ad5..7295f82fe 100644
--- a/plugins/domains/twitter.status.js
+++ b/plugins/domains/twitter.status.js
@@ -2,7 +2,6 @@ var async = require('async');
 var cache = require('../../lib/cache');
 var sysUtils = require('../../logging');
 var _ = require('underscore');
-var crypto = require('crypto'); // temp
 
 module.exports = {
 
@@ -56,20 +55,11 @@ module.exports = {
                     omit_script: c.omit_script
                 };
 
-                var cache_key = '"' + crypto.createHash('md5').update(JSON.stringify({
-                        url: 'https://api.twitter.com/1.1/statuses/oembed.json',
-                        qs: qs,
-                        oauth: oauth,
-                        json: true
-                    })).digest("hex") + '"';
-
-
                 request(_.extend({
                     url: url,
                     qs: qs,
                     json: true,
-                    cache_key: cache_key,
-                    new_cache_key: 'twitter:oembed:' + id,
+                    cache_key: 'twitter:oembed:' + id,
                     ttl: c.cache_ttl,
                     prepareResult: function(error, response, data, cb) {
 

From 4c5c321bca7ef32c8776cc9a65a043ba649a2784 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Thu, 18 Feb 2016 10:20:28 -0500
Subject: [PATCH 130/320] [twitter] use oauth/1.1 if configured - otherwise,
 oEmbed 1.0

---
 config.local.js.SAMPLE            | 17 ++++++++---------
 plugins/domains/twitter.status.js | 30 +++++++++++++++++++-----------
 2 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/config.local.js.SAMPLE b/config.local.js.SAMPLE
index c275dae1f..a80c0c51b 100644
--- a/config.local.js.SAMPLE
+++ b/config.local.js.SAMPLE
@@ -102,18 +102,18 @@
             "twitter": {
                 "max-width": 550,
                 "min-width": 250,
-                consumer_key: 'INSERT YOUR VALUE',
-                consumer_secret: 'INSERT YOUR VALUE',
-                access_token: 'INSERT YOUR VALUE',
-                access_token_secret: 'INSERT YOUR VALUE',
+
+                // Twitter rolled back to oEmbed v 1, their 1.1+oauth endpoint is no longer in the documentation
+                // consumer_key: 'INSERT YOUR VALUE',
+                // consumer_secret: 'INSERT YOUR VALUE',
+                // access_token: 'INSERT YOUR VALUE',
+                // access_token_secret: 'INSERT YOUR VALUE',
+
                 hide_media: false,
                 hide_thread: false,
                 omit_script: false,
                 cache_ttl: 100 * 365 * 24 * 3600 // 100 Years.
             },
-            "google.maps": {
-            //  apiKey: 'INSERT YOUR VALUE' // not required, but recommended
-            },
             readability: {
                 enabled: false
                 // allowPTagDescription: true  // to enable description fallback to first paragraph
@@ -127,8 +127,7 @@
                 // media_only: true     // disables status embeds for images and videos - will return plain media
             },
             google: {
-                // https://developers.google.com/maps/documentation/embed/guide#api_key
-                // yes, there is already "apiKey" option above, but I am not sure if old keys are the same as the news ones.
+                // https://developers.google.com/maps/documentation/embed/guide#api_key                
                 maps_key: "INSERT YOUR VALUE"
             },
 
diff --git a/plugins/domains/twitter.status.js b/plugins/domains/twitter.status.js
index 7295f82fe..917f46457 100644
--- a/plugins/domains/twitter.status.js
+++ b/plugins/domains/twitter.status.js
@@ -22,19 +22,26 @@ module.exports = {
             return cb('Twitter API Disabled');
         }
 
-        var oauth = {
-            consumer_key: c.consumer_key,
-            consumer_secret: c.consumer_secret,
-            token: c.access_token,
-            token_secret: c.access_token_secret
-        };
+        var oauth = c.consumer_key 
+            ? {
+                consumer_key: c.consumer_key,
+                consumer_secret: c.consumer_secret,
+                token: c.access_token,
+                token_secret: c.access_token_secret
+            } : false;
+
         var blockExpireIn = 0;
         var block_key = 'twbl:' + c.consumer_key;
 
         async.waterfall([
 
             function(cb) {
-                cache.get(block_key, cb);
+
+                if (oauth) {
+                    cache.get(block_key, cb);
+                } else {
+                    cb(null, null);
+                }
             },
 
             function(expireIn, cb) {
@@ -46,7 +53,7 @@ module.exports = {
                     }
                 }
 
-                var url = "https://api.twitter.com/1" + (blockExpireIn > 0 ? "" : ".1") + "/statuses/oembed.json";
+                var url = "https://api.twitter.com/1" + (!oauth || blockExpireIn > 0 ? "" : ".1") + "/statuses/oembed.json";
 
                 var qs = {
                     id: id,
@@ -75,10 +82,11 @@ module.exports = {
                             }
                         }
 
-                        // Do not block api if data from cache.
-                        if (!response.fromRequestCache) {
+                        // Do not block 1.1 api if data from cache.
+                        if (oauth && !response.fromRequestCache) {
 
                             var remaining = parseInt(response.headers['x-rate-limit-remaining']);
+                            console.log('x-rate-limit-remaining: ' + remaining);
 
                             if (response.statusCode === 429 || remaining <= 7) {
                                 var now = Math.round(new Date().getTime() / 1000);
@@ -120,7 +128,7 @@ module.exports = {
 
                         cb(error, data);
                     }
-                }, (blockExpireIn > 0 ? null : {oauth: oauth})), cb); // add oauth if 1.1, else skip it
+                }, (!oauth || blockExpireIn ? null : {oauth: oauth})), cb); // add oauth if 1.1, else skip it
 
             }
 

From d7f36afcfdab579e448495006c6c760047db0091 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Thu, 18 Feb 2016 10:27:12 -0500
Subject: [PATCH 131/320] no i didn't

---
 plugins/domains/twitter.status.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/plugins/domains/twitter.status.js b/plugins/domains/twitter.status.js
index 917f46457..16c6947bb 100644
--- a/plugins/domains/twitter.status.js
+++ b/plugins/domains/twitter.status.js
@@ -86,7 +86,6 @@ module.exports = {
                         if (oauth && !response.fromRequestCache) {
 
                             var remaining = parseInt(response.headers['x-rate-limit-remaining']);
-                            console.log('x-rate-limit-remaining: ' + remaining);
 
                             if (response.statusCode === 429 || remaining <= 7) {
                                 var now = Math.round(new Date().getTime() / 1000);

From 9bebad8cdfc2047cd377b1ff0c11f7bda4967543 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Thu, 18 Feb 2016 10:33:52 -0500
Subject: [PATCH 132/320] [youtube] remove temporary cache key migration code

---
 plugins/domains/youtube.com/youtube.video.js | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/plugins/domains/youtube.com/youtube.video.js b/plugins/domains/youtube.com/youtube.video.js
index 5c86a1280..da921750d 100644
--- a/plugins/domains/youtube.com/youtube.video.js
+++ b/plugins/domains/youtube.com/youtube.video.js
@@ -1,5 +1,4 @@
 var cheerio = require('cheerio');
-var crypto = require('crypto'); // temp
 
 module.exports = {
 
@@ -27,15 +26,9 @@ module.exports = {
 
         var statsUri = "https://www.googleapis.com/youtube/v3/videos?part=id%2Csnippet%2Cstatistics%2CcontentDetails%2Cplayer%2Cstatus&key=" + api_key + "&id=" + urlMatch[1];
 
-        var cache_key = '"' + crypto.createHash('md5').update(JSON.stringify({
-            uri: "https://www.googleapis.com/youtube/v3/videos?part=id%2Csnippet%2Cstatistics%2CcontentDetails%2Cplayer&key=" + api_key + "&id=" + urlMatch[1], //old_one
-            json: true
-        })).digest("hex") + '"';
-
         request({
             uri: statsUri,
-            cache_key: cache_key,
-            new_cache_key: "youtube:gdata:" + urlMatch[1],
+            cache_key: "youtube:gdata:" + urlMatch[1],
             json: true,
             prepareResult: function(error, b, data, cb) {
 

From 92961f7729340c6f1c2b4203e2769fc88fd7f199 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Thu, 18 Feb 2016 12:21:56 -0500
Subject: [PATCH 133/320] what's new for v 0.9.3

---
 WHATSNEW.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/WHATSNEW.md b/WHATSNEW.md
index 081eb034f..74fc5cc22 100644
--- a/WHATSNEW.md
+++ b/WHATSNEW.md
@@ -4,6 +4,15 @@ This is the history of the Iframely changes. Updates that are older than one yea
 
 Stay tuned, either by watching [Iframely on GitHub](https://github.com/itteco/iframely) or following [Iframely on Twitter](https://twitter.com/iframely).
 
+### 2016.02.18, Version 0.9.3
+
+ - Fix errors for Facebook videos where origin pages return sparadic HTTP code 500 ([#106](https://github.com/itteco/iframely/issues/106))
+ - Twitter retired 1.1 API for oEmbed from their documentation. oAuth configuration is now optional
+ - 500px provides HTML embeds for photos now
+ - Fix NHL after their site's re-design
+ - Minor fixes for number of other domain parsers
+
+
 ### 2016.01.26, Version 0.9.2
 
  - Domains clean up & maintenance

From 0c3f0166e7d3010b84a64be7a015555ab504fd8d Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Thu, 18 Feb 2016 20:24:36 +0200
Subject: [PATCH 134/320] [domains] imgur.com: fix image link

---
 plugins/domains/imgur.com.js | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/plugins/domains/imgur.com.js b/plugins/domains/imgur.com.js
index 12afb969e..5c835013c 100644
--- a/plugins/domains/imgur.com.js
+++ b/plugins/domains/imgur.com.js
@@ -18,7 +18,19 @@ module.exports = {
         "oembed-site"
     ],
     
-    getLink: function(oembed, twitter, options) {
+    getLinks: function(urlMatch, oembed, meta, twitter, options) {
+
+        var links = [];
+
+        if (twitter.image && twitter.image.indexOf && twitter.image.indexOf(urlMatch[1]) > -1) {
+            links.push({
+                href: twitter.image,
+                type: CONFIG.T.image_jpeg,
+                rel: CONFIG.R.image,
+                width: meta.og && meta.og.image && meta.og.image.width,
+                height: meta.og && meta.og.image && meta.og.image.height
+            });
+        }
 
         if (oembed.type == "rich") {
             // oembed photo isn't used as of May 18, 2015
@@ -26,23 +38,25 @@ module.exports = {
             var media_only = options.getProviderOptions('imgur.media_only', false);
             var isGallery = twitter.card == "gallery";
 
-            if (!media_only || isGallery) {                
-                return {
+            if (!media_only || isGallery) {
+                links.push({
                     html: oembed.html,
                     width: oembed.width,
                     type: CONFIG.T.text_html,
                     rel: [CONFIG.R.app, CONFIG.R.oembed, CONFIG.R.html5, CONFIG.R.inline, CONFIG.R.ssl]
-                };
+                });
             } else {
-                return {
+                links.push({
                     href: "http://s.imgur.com/images/favicon-96x96.png",
                     width: 96,
                     height: 96,
                     type: CONFIG.T.image_png,
                     rel: CONFIG.R.icon
-                }
+                });
             }
         }
+
+        return links;
     },
 
     getData: function (meta, urlMatch, cb) {

From 3c5f3a9752065ca4cb85f1ef709dfadf0634b36c Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Thu, 18 Feb 2016 20:40:19 +0200
Subject: [PATCH 135/320] [domains] imgur.com: fix detecting gallery; fix
 oembed for /topic/ urls

---
 plugins/domains/imgur.com.js | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/plugins/domains/imgur.com.js b/plugins/domains/imgur.com.js
index 5c835013c..6552f1912 100644
--- a/plugins/domains/imgur.com.js
+++ b/plugins/domains/imgur.com.js
@@ -18,7 +18,7 @@ module.exports = {
         "oembed-site"
     ],
     
-    getLinks: function(urlMatch, oembed, meta, twitter, options) {
+    getLinks: function(urlMatch, oembed, twitter, options) {
 
         var links = [];
 
@@ -26,9 +26,7 @@ module.exports = {
             links.push({
                 href: twitter.image,
                 type: CONFIG.T.image_jpeg,
-                rel: CONFIG.R.image,
-                width: meta.og && meta.og.image && meta.og.image.width,
-                height: meta.og && meta.og.image && meta.og.image.height
+                rel: CONFIG.R.image
             });
         }
 
@@ -36,7 +34,7 @@ module.exports = {
             // oembed photo isn't used as of May 18, 2015
 
             var media_only = options.getProviderOptions('imgur.media_only', false);
-            var isGallery = twitter.card == "gallery";
+            var isGallery = twitter.card !== 'player' && links.length === 0;
 
             if (!media_only || isGallery) {
                 links.push({
@@ -59,19 +57,23 @@ module.exports = {
         return links;
     },
 
-    getData: function (meta, urlMatch, cb) {
+    getData: function (meta, url, urlMatch, cb) {
 
-         var links =  ['json', 'xml'].map(function(format) {
+        if (url.indexOf('/topic/') > -1) {
+            var links =  ['json', 'xml'].map(function(format) {
                 return {
-                    href: "http://api.imgur.com/oembed." + format + "?url=http://imgur.com/" + (meta.twitter && meta.twitter.card == 'gallery' ? 'a/' : '') + urlMatch[1] ,
+                    href: "http://api.imgur.com/oembed." + format + "?url=http://imgur.com/" + urlMatch[1],
                     rel: 'alternate',
                     type: 'application/' + format + '+oembed'
                 }
-            });        
+            });
 
-        cb(null, {
-            oembedLinks: links
-        });            
+            cb(null, {
+                oembedLinks: links
+            });
+        } else {
+            cb();
+        }
     },
 
     tests: [{

From a6a1469bc69ca9cb0ed5f33300a839db28ad6b84 Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Thu, 18 Feb 2016 21:02:32 +0200
Subject: [PATCH 136/320] [domains] imgur.com: fix test

---
 plugins/domains/imgur.com.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/domains/imgur.com.js b/plugins/domains/imgur.com.js
index 6552f1912..894dbf2c1 100644
--- a/plugins/domains/imgur.com.js
+++ b/plugins/domains/imgur.com.js
@@ -79,6 +79,7 @@ module.exports = {
     tests: [{
         pageWithFeed: "http://imgur.com/"
     }, {
+        skipMethods: ["getData"],
         skipMixins: [
             "twitter-image",
             "twitter-stream",       // works for GIFvs only

From 42df17c82bc010f01a4c222ebc259527d7ea6e89 Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Thu, 18 Feb 2016 21:25:33 +0200
Subject: [PATCH 137/320] [domains] imgur.com: fix oembed url to unified

---
 plugins/domains/imgur.com.js | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/plugins/domains/imgur.com.js b/plugins/domains/imgur.com.js
index 894dbf2c1..a3a77129a 100644
--- a/plugins/domains/imgur.com.js
+++ b/plugins/domains/imgur.com.js
@@ -59,27 +59,22 @@ module.exports = {
 
     getData: function (meta, url, urlMatch, cb) {
 
-        if (url.indexOf('/topic/') > -1) {
-            var links =  ['json', 'xml'].map(function(format) {
-                return {
-                    href: "http://api.imgur.com/oembed." + format + "?url=http://imgur.com/" + urlMatch[1],
-                    rel: 'alternate',
-                    type: 'application/' + format + '+oembed'
-                }
-            });
+        var links =  ['json', 'xml'].map(function(format) {
+            return {
+                href: "http://api.imgur.com/oembed." + format + "?url=http://imgur.com/" + urlMatch[1],
+                rel: 'alternate',
+                type: 'application/' + format + '+oembed'
+            }
+        });
 
-            cb(null, {
-                oembedLinks: links
-            });
-        } else {
-            cb();
-        }
+        cb(null, {
+            oembedLinks: links
+        });
     },
 
     tests: [{
         pageWithFeed: "http://imgur.com/"
     }, {
-        skipMethods: ["getData"],
         skipMixins: [
             "twitter-image",
             "twitter-stream",       // works for GIFvs only

From afde3be19ef93840f3541473cb3b2b6d13ca0f4e Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Thu, 18 Feb 2016 22:29:21 +0200
Subject: [PATCH 138/320] [domains] imgur.com: better oembed urls

---
 plugins/domains/imgur.com.js | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/plugins/domains/imgur.com.js b/plugins/domains/imgur.com.js
index a3a77129a..46f866963 100644
--- a/plugins/domains/imgur.com.js
+++ b/plugins/domains/imgur.com.js
@@ -57,11 +57,18 @@ module.exports = {
         return links;
     },
 
-    getData: function (meta, url, urlMatch, cb) {
+    getData: function (url, urlMatch, twitter, cb) {
+
+        var isGallery = false;
+        var isA = url.indexOf('/a/') > -1;
+
+        if (twitter.image && twitter.image.indexOf && twitter.image.indexOf(urlMatch[1]) > -1) {
+            isGallery = twitter.card !== 'player';
+        }
 
         var links =  ['json', 'xml'].map(function(format) {
             return {
-                href: "http://api.imgur.com/oembed." + format + "?url=http://imgur.com/" + urlMatch[1],
+                href: "http://api.imgur.com/oembed." + format + "?url=http://imgur.com/" + (isGallery || isA ? 'a/' : '') + urlMatch[1],
                 rel: 'alternate',
                 type: 'application/' + format + '+oembed'
             }
@@ -91,6 +98,7 @@ module.exports = {
         "https://imgur.com/gallery/kkEzJsa",
         "http://imgur.com/t/workout/HFwjGoF",
         "http://imgur.com/t/water/ud7YwQp",
-        "http://imgur.com/topic/The_Oscars_&_Movies/YFQo6Vl"
+        "http://imgur.com/topic/The_Oscars_&_Movies/YFQo6Vl",
+        "http://imgur.com/a/G1oOO"
     ]
 };
\ No newline at end of file

From 6b50af2ed96e756b26212a8119f2cb75aa05d9d3 Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Thu, 18 Feb 2016 22:36:23 +0200
Subject: [PATCH 139/320] [domains] imgur.com: fix oembed links overriding

---
 plugins/domains/imgur.com.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/domains/imgur.com.js b/plugins/domains/imgur.com.js
index 46f866963..80b3a37e6 100644
--- a/plugins/domains/imgur.com.js
+++ b/plugins/domains/imgur.com.js
@@ -57,11 +57,13 @@ module.exports = {
         return links;
     },
 
-    getData: function (url, urlMatch, twitter, cb) {
+    getData: function (url, urlMatch, meta, cb) {
 
         var isGallery = false;
         var isA = url.indexOf('/a/') > -1;
 
+        var twitter = meta.twitter;
+
         if (twitter.image && twitter.image.indexOf && twitter.image.indexOf(urlMatch[1]) > -1) {
             isGallery = twitter.card !== 'player';
         }

From 5f79376446a182c09957e617714ac34fc04fc9a3 Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Thu, 18 Feb 2016 22:45:30 +0200
Subject: [PATCH 140/320] [domains] imgur.com: logic fix

---
 plugins/domains/imgur.com.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/domains/imgur.com.js b/plugins/domains/imgur.com.js
index 80b3a37e6..c450a2e3f 100644
--- a/plugins/domains/imgur.com.js
+++ b/plugins/domains/imgur.com.js
@@ -65,6 +65,7 @@ module.exports = {
         var twitter = meta.twitter;
 
         if (twitter.image && twitter.image.indexOf && twitter.image.indexOf(urlMatch[1]) > -1) {
+        } else {
             isGallery = twitter.card !== 'player';
         }
 

From 64dc2814f921c72065f391c7a896b598e02ccd4b Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Fri, 19 Feb 2016 15:07:28 +0200
Subject: [PATCH 141/320] update to 0.9.3

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 8402ee20a..b81ba32f4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "iframely",
-    "version": "0.9.2",
+    "version": "0.9.3",
     
     "description": "oEmbed/2 gateway endpoint. Get embed data for various http links through one self-hosted API",
     "keywords": ["oembed", "embed", "open graph", "og", "twitter cards"],

From 3bf85500d38be4296aa5ec0fa623c22ace1056c5 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Fri, 19 Feb 2016 09:26:19 -0500
Subject: [PATCH 142/320] [domains] fix archive.org players

---
 plugins/domains/archive.org.js | 45 ++++++++++++++++++++--------------
 1 file changed, 27 insertions(+), 18 deletions(-)

diff --git a/plugins/domains/archive.org.js b/plugins/domains/archive.org.js
index 0fced436a..f998ad340 100644
--- a/plugins/domains/archive.org.js
+++ b/plugins/domains/archive.org.js
@@ -12,35 +12,44 @@ module.exports = {
 
         } else {
 
-            var player = {
-                href: twitter.player.value || twitter.player,
-                type: CONFIG.T.text_html,
-                rel: [CONFIG.R.player, CONFIG.R.html5]
-            }
+            var playerHref = twitter.player.value || twitter.player;
+            var hrefMatch = playerHref.match(/^https?:\/\/archive\.org\/embed\/([^\/]+)\/?/i); 
 
-            if (/\.(mp3|wma)$/i.test(player.href)) {
-                player.height = 40;
-                player["max-width"] = 776;
-            }
+            if (hrefMatch) {
 
+                var player = {
+                    href: 'https://archive.org/embed/' + hrefMatch[1],
+                    type: CONFIG.T.text_html,
+                    rel: [CONFIG.R.player, CONFIG.R.html5]
+                }
 
-            if (/\.(mp4|avi|mov)$/i.test(player.href)) {
-                player["aspect-ratio"] = twitter.player.width / twitter.player.height;
-            }
+                if (/\.(mp3|wma)$/i.test(playerHref)) {
+                    player.height = 40;
+                    player["max-width"] = 776;
+                }
 
-            if (/playlist/i.test(player.href)) {
-                player.height = 250;
-                player["max-width"] = 776;
-            }
 
-            return player;
+                if (/\.(mp4|avi|mov|mpeg)$/i.test(playerHref)) {
+                    player["aspect-ratio"] = twitter.player.width / twitter.player.height;
+                }
+
+                if (/playlist/i.test(playerHref)) {
+                    player.height = 250;
+                    player["max-width"] = 776;
+                }
+
+                return player;
+            }
 
         }
 
     },
 
     tests: [
+        "https://archive.org/details/Podcast8.23GoethesIronicMephistopheles1700s1800s",
+        "https://archive.org/details/TheInternetArchivistsFinalCutBoostedSound",
         "https://archive.org/details/um2000-09-01.shnf",
-        "https://archive.org/details/ChronoTrigger_456"
+        "https://archive.org/details/ChronoTrigger_456",
+        "https://archive.org/details/YourFami1948"
     ]
 };
\ No newline at end of file

From 4d7eb03a4824f5860112878b009a94af8f9a0d2b Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Wed, 24 Feb 2016 11:20:46 -0500
Subject: [PATCH 143/320] =?UTF-8?q?[domains]=20bring=20back=20support=20fo?=
 =?UTF-8?q?r=20Lib=C3=A9ration.fr?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugins/links/promo/twitter-youtube.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/links/promo/twitter-youtube.js b/plugins/links/promo/twitter-youtube.js
index 7dcdefa97..f54b91922 100644
--- a/plugins/links/promo/twitter-youtube.js
+++ b/plugins/links/promo/twitter-youtube.js
@@ -43,7 +43,8 @@ module.exports = {
 
 
         // or DailyMotion, e.g. Liberation, Le Point, L'Express
-        urlMatch = video_src.match(/^https?:\/\/www\.dailymotion\.com\/(?:swf|embed)?\/?video\/([_a-zA-Z0-9\-]+)/i);
+        urlMatch = video_src.match(/^https?:\/\/www\.dailymotion\.com\/(?:swf|embed)?\/?video\/([_a-zA-Z0-9\-]+)/i)
+                    || video_src.match(/^https?:\/\/dai.ly\/([_a-zA-Z0-9\-]+)/i); // e.g. Libération.fr
 
         if (urlMatch) {
             return {

From 09945124e8029a158282e7fcec7ceb5ce6115204 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Wed, 24 Feb 2016 14:25:43 -0500
Subject: [PATCH 144/320] [generic] try and fix user errors in MIME types for
 og:images

---
 plugins/links/og-image.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/links/og-image.js b/plugins/links/og-image.js
index a0e4af6a4..599bd7276 100644
--- a/plugins/links/og-image.js
+++ b/plugins/links/og-image.js
@@ -6,7 +6,7 @@ function getImageLinks(image) {
 
     var images = [{
         href: image.url || image,
-        type: image.type || CONFIG.T.image,
+        type: image.type && /^image\//i.test(image.type) ? image.type : CONFIG.T.image,
         rel: rel,
         width: image.width,
         height: image.height
@@ -15,7 +15,7 @@ function getImageLinks(image) {
     if (image.secure_url) {
         images.push({
             href: image.secure_url,
-            type: image.type || CONFIG.T.image,
+            type: image.type && /^image\//i.test(image.type) ? image.type : CONFIG.T.image,
             rel: rel,
             width: image.width,
             height: image.height

From 60641ade392df1ccf83016163789d610f93e5822 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Wed, 24 Feb 2016 15:07:46 -0500
Subject: [PATCH 145/320] [generic] follow http-equiv refresh-redirects when
 required

---
 lib/plugins/system/meta/HTMLMetaHandler.js | 11 +++++++++++
 lib/plugins/system/meta/meta.js            |  6 ++++++
 2 files changed, 17 insertions(+)

diff --git a/lib/plugins/system/meta/HTMLMetaHandler.js b/lib/plugins/system/meta/HTMLMetaHandler.js
index acbdff1b5..d5748d76b 100644
--- a/lib/plugins/system/meta/HTMLMetaHandler.js
+++ b/lib/plugins/system/meta/HTMLMetaHandler.js
@@ -90,6 +90,15 @@ HTMLMetaHandler.prototype.onopentag = function(name, attributes) {
 
             this._customProperties["x-frame-options"] = metaTag.content;
 
+        } else if (!this._refresh && metaTag['http-equiv'] && metaTag['http-equiv'].toLowerCase() == 'refresh') {
+
+            // ex.: http://tv.sme.sk/v/29770/kalinak-o-ficovi-cudujem-sa-ze-vedie-vladu.html
+            var refresh = metaTag.content && metaTag.content.match(/url=(?:'|")?([^'"]+)(?:'|")?/i);
+
+            if (refresh) { 
+                this._refresh = refresh[1];
+            }
+
         } else if (metaTag.name == "description") {
 
             this._customProperties["html-description"] = metaTag.content;
@@ -313,6 +322,8 @@ HTMLMetaHandler.prototype._finalMerge = function() {
 
     this._result['charset'] = this._charset || 'UTF-8';
 
+    if (this._refresh) {this._result['refresh'] = this._refresh;}
+
     this._callback(null, this._result);
 };
 
diff --git a/lib/plugins/system/meta/meta.js b/lib/plugins/system/meta/meta.js
index d1aef427f..572cd0041 100644
--- a/lib/plugins/system/meta/meta.js
+++ b/lib/plugins/system/meta/meta.js
@@ -25,6 +25,12 @@ module.exports = {
                     });
                 }
 
+                if (meta.refresh && !(meta['html-title'] && meta['html-title'] !== '')) {
+                    return cb({
+                        redirect: meta.refresh
+                    });
+                }
+
                 var meta_key = 'meta:' + url;
                 cache.set(meta_key, meta);
 

From 5317bf1381cdd89222f43dab14efdfdc24467ac5 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Wed, 24 Feb 2016 15:43:54 -0500
Subject: [PATCH 146/320] [generic] proper media detector for oembed video

---
 plugins/links/oembed-video.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/plugins/links/oembed-video.js b/plugins/links/oembed-video.js
index 7cd128591..fdc421478 100644
--- a/plugins/links/oembed-video.js
+++ b/plugins/links/oembed-video.js
@@ -51,9 +51,12 @@ module.exports = {
 
     },
 
-    getMeta: function(oembed) {
+    highestPriority: true,
 
-        if (oembed.type === "video" || oembed.type === "audio") {
+    getMeta: function(oembed, whitelistRecord) {
+
+        if (oembed.type === "video" || oembed.type === "audio"
+            || (oembed.type === "rich" && !whitelistRecord.isDefault && whitelistRecord.isAllowed('oembed.rich') && whitelistRecord.isAllowed('oembed.rich', "player")) ) {
             return {
                 media: "player"
             };

From c354a5dde3a45c395e81d294736f36e5a817532a Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Fri, 26 Feb 2016 12:56:30 -0500
Subject: [PATCH 147/320] [domains] support screenshots of hosted CloudApps

---
 plugins/links/promo/cloudapp-hosted.js | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 plugins/links/promo/cloudapp-hosted.js

diff --git a/plugins/links/promo/cloudapp-hosted.js b/plugins/links/promo/cloudapp-hosted.js
new file mode 100644
index 000000000..6469f1b7e
--- /dev/null
+++ b/plugins/links/promo/cloudapp-hosted.js
@@ -0,0 +1,16 @@
+module.exports = {
+
+    getLink: function(twitter) {
+
+        if (twitter.card === "photo" && twitter.site === '@cloudapp' 
+            && twitter.image && /^https?:\/\/f\.cl\.ly\//.test(twitter.image.url || twitter.image.src || twitter.image))  {
+
+            return {
+                href: twitter.image.url || twitter.image.src || twitter.image,
+                type: CONFIG.T.image,
+                rel: CONFIG.R.image
+            };
+        }
+
+    }
+};
\ No newline at end of file

From c8472607f52e57ab667da4574c42b9fd77997722 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Fri, 26 Feb 2016 13:15:12 -0500
Subject: [PATCH 148/320] [domains] add upload date for Vimeo

---
 plugins/domains/vimeo.com.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/domains/vimeo.com.js b/plugins/domains/vimeo.com.js
index 9d5b4cf6a..cb13e9330 100644
--- a/plugins/domains/vimeo.com.js
+++ b/plugins/domains/vimeo.com.js
@@ -13,7 +13,8 @@ module.exports = {
     getMeta: function(oembed) {
 
         return {
-            canonical: "https://vimeo.com/" + oembed.video_id
+            canonical: "https://vimeo.com/" + oembed.video_id,
+            date: oembed.upload_date
         };
     },
 

From e7b151ef7a0151c5ca7938605bf3da572e2eacb5 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Fri, 26 Feb 2016 14:07:19 -0500
Subject: [PATCH 149/320] [domains] support for vbox7.com

---
 plugins/domains/vbox7.com.js | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 plugins/domains/vbox7.com.js

diff --git a/plugins/domains/vbox7.com.js b/plugins/domains/vbox7.com.js
new file mode 100644
index 000000000..bcde7a91f
--- /dev/null
+++ b/plugins/domains/vbox7.com.js
@@ -0,0 +1,22 @@
+module.exports = {
+
+    re: [        
+        /https?:\/\/vbox7\.com\/play:(\w+)/i
+    ],
+
+    mixins: ["*"],
+
+    getLinks: function(urlMatch) {
+
+        return {
+            href: "//vbox7.com/emb/external.php?vid=" + urlMatch[1],
+            type: CONFIG.T.text_html,
+            rel: [CONFIG.R.player,  CONFIG.R.html5],
+            "aspect-ratio": 16 / 9
+        }
+    },
+
+    tests: [
+        "http://vbox7.com/play:86abb51a7d?pos=src"
+    ]
+};
\ No newline at end of file

From eff4aba7561186f9384a8b32e95166023ddaa857 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Fri, 26 Feb 2016 14:19:17 -0500
Subject: [PATCH 150/320] [domains] fix scrollbars in NBC News players

---
 plugins/domains/nbcnews.com.js | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 plugins/domains/nbcnews.com.js

diff --git a/plugins/domains/nbcnews.com.js b/plugins/domains/nbcnews.com.js
new file mode 100644
index 000000000..5ba7b619e
--- /dev/null
+++ b/plugins/domains/nbcnews.com.js
@@ -0,0 +1,34 @@
+module.exports = {
+
+    mixins: [
+        "*"
+    ],
+
+    highestPriority: true, 
+
+    getMeta: function (schemaVideoObject) {
+
+        // if schemaVideoObject -> media=player
+        return {
+            media: "player"
+        }
+
+    },
+
+    getLink: function(schemaVideoObject) {
+
+        if (schemaVideoObject.embedURL || schemaVideoObject.embedUrl) {
+
+            return {
+                href: schemaVideoObject.embedURL || schemaVideoObject.embedUrl,
+                rel: [CONFIG.R.player, CONFIG.R.html5],
+                type: CONFIG.T.text_html, 
+                "aspect-ratio": 4/3 // Fixes it for NBC news
+            };
+        }
+    },
+
+    tests: [
+        "http://www.nbcnews.com/nightly-news/nypds-wenjian-liu-remembered-wake-n279116"
+    ]
+};
\ No newline at end of file

From 2b8a32c804ff5ca431c764cc6bd1c5d529387234 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Fri, 26 Feb 2016 14:58:31 -0500
Subject: [PATCH 151/320] [domains] fix broken twitter player for Yahoo videos

---
 plugins/domains/yahoo.video.js | 41 ++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 plugins/domains/yahoo.video.js

diff --git a/plugins/domains/yahoo.video.js b/plugins/domains/yahoo.video.js
new file mode 100644
index 000000000..b3cf59dca
--- /dev/null
+++ b/plugins/domains/yahoo.video.js
@@ -0,0 +1,41 @@
+module.exports = {
+
+    re: [        
+        /https?:\/\/[\w\.]+yahoo\.com\//i
+    ],
+
+    mixins: ["*"],
+
+    highestPriority: true,
+
+    getMeta: function(twitter) {
+
+        if (twitter.card == 'player') {
+
+            return {
+                media: "player"
+            }
+        }
+    },    
+
+    getLinks: function(twitter) {
+
+        if (twitter.card == 'player' && !/\?format=embed$/i.test(twitter.player.value || twitter.player)) {
+
+            return {
+                href: (twitter.player.value || twitter.player) + '?format=embed',
+                type: CONFIG.T.text_html,
+                rel: [CONFIG.R.player,  CONFIG.R.html5],
+                "aspect-ratio": twitter.player.width / twitter.player.height
+            }
+        }
+    },
+
+    tests: [
+        "https://ca.news.yahoo.com/video/unicorn-leads-california-highway-patrol-134024517.html",
+        "https://uk.news.yahoo.com/video/cctv-shows-london-thieves-moped-164116329.html",
+        "https://br.noticias.yahoo.com/video/colombiano-cria-biblioteca-com-livros-173319839.html",
+        "https://screen.yahoo.com/miles-ahead-clip-gone-153000608.html",
+        "https://movies.yahoo.com/video/crimson-peak-clip-proper-welcome-153000548.html"
+    ]
+};
\ No newline at end of file

From 577d2162904a4442f1f69a3fa8a31db30becf192 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Fri, 26 Feb 2016 15:18:19 -0500
Subject: [PATCH 152/320] [domains] support Knightlab's juxtapose  and
 timeline.js

---
 plugins/domains/knightlab.js | 29 +++++++++++++++++++++++++++++
 plugins/domains/storymap.js  | 22 ----------------------
 2 files changed, 29 insertions(+), 22 deletions(-)
 create mode 100644 plugins/domains/knightlab.js
 delete mode 100644 plugins/domains/storymap.js

diff --git a/plugins/domains/knightlab.js b/plugins/domains/knightlab.js
new file mode 100644
index 000000000..69f8c25e2
--- /dev/null
+++ b/plugins/domains/knightlab.js
@@ -0,0 +1,29 @@
+module.exports = {
+
+    re: [
+        /^https?:\/\/s3\.amazonaws\.com\/(?:uploads|CDN)\.knightlab\.com\/(storymapjs)\/\w+\/(?:[a-zA-Z0-9\-\/]+)\.html/i,
+        /^https?:\/\/cdn\.knightlab\.com\/libs\/(storymapjs)\/(?:dev|latest)\/embed\//,        
+        /^https?:\/\/cdn\.knightlab\.com\/libs\/(juxtapose|timeline3?)\/(?:dev|latest)\/embed\/index\.html\?/
+    ],
+
+    mixins: ["*"],
+
+    getLink: function(url, urlMatch) {
+
+        return {
+                href: url + (url.indexOf('?') > -1 ? '&' :'?') + 'for=iframely',
+                type: CONFIG.T.text_html,
+                rel: [CONFIG.R.app, CONFIG.R.html5],
+                "height": urlMatch[1] == 'storymapjs' ? 800 : urlMatch[1] == 'juxtapose' ? 360: 650
+            };
+    },
+
+    tests: [
+        "https://s3.amazonaws.com/uploads.knightlab.com/storymapjs/86a5b5c6facef8e74eb685573b846f6b/civilian-deaths-evidence-of-war-crimes-in-yemen/index.html",
+        "http://cdn.knightlab.com/libs//latest/embed/index.html?source=1t9XBaa5oqMpwgi49smaUdk269PL0miJ-xtjsuExOZwQ&font=Default&lang=en&initial_zoom=100&height=650",
+        "https://cdn.knightlab.com/libs/juxtapose/latest/embed/index.html?uid=f9031656-dcc3-11e5-a524-0e7075bba956",
+        "http://cdn.knightlab.com/libs/juxtapose/dev/embed/index.html?uid=75ec66e0-204a-11e5-91b9-0e7075bba956",
+        "http://cdn.knightlab.com/libs/timeline/latest/embed/index.html?source=0Atwxho6G5yhjdEdJNU1JMzhLdjdHUTFMNnc4bHNud3c&font=PTSerif-PTSans&maptype=toner&lang=en&hash_bookmark=true&start_zoom_adjust=2&height=650#13",
+        "http://cdn.knightlab.com/libs/storymapjs/latest/embed/?url=https://10113115706d4ad7837a4a5dd2c4cf80328d7999.googledrive.com/host/0B91AkpxdaWYyUmFYQ1Rlbmctd1k/published.json"
+    ]
+};
\ No newline at end of file
diff --git a/plugins/domains/storymap.js b/plugins/domains/storymap.js
deleted file mode 100644
index c2ad1e5fe..000000000
--- a/plugins/domains/storymap.js
+++ /dev/null
@@ -1,22 +0,0 @@
-module.exports = {
-
-    re: [
-        /^https?:\/\/s3\.amazonaws\.com\/(uploads|CDN)\.knightlab\.com\/storymapjs\/\w+\/([a-zA-Z0-9\-\/]+)\.html/i        
-    ],
-
-    mixins: ["*"],
-
-    getLink: function(url) {
-
-        return {
-                href: url + '?for=iframely',
-                type: CONFIG.T.text_html,
-                rel: [CONFIG.R.app, CONFIG.R.html5],
-                "height": 800
-            };
-    },
-
-    tests: [
-        "https://s3.amazonaws.com/uploads.knightlab.com/storymapjs/86a5b5c6facef8e74eb685573b846f6b/civilian-deaths-evidence-of-war-crimes-in-yemen/index.html"
-    ]
-};
\ No newline at end of file

From b0fc497249d45f51a9369b1d42979ff5f44f9e94 Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Mon, 29 Feb 2016 14:52:33 +0200
Subject: [PATCH 153/320] [config] allow use proxy server for custom urls

---
 config.local.js.SAMPLE                   |  5 +++++
 lib/plugins/system/oembed/oembedUtils.js |  1 +
 lib/utils.js                             | 18 ++++++++++++++++--
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/config.local.js.SAMPLE b/config.local.js.SAMPLE
index a80c0c51b..d1d242e7e 100644
--- a/config.local.js.SAMPLE
+++ b/config.local.js.SAMPLE
@@ -97,6 +97,11 @@
             }
         }],
 
+        PROXY: [{
+            re: [/^https?:\/\/www\.domain\.com/],
+            proxy_server: 'http://1.2.3.4:8080'
+        }]
+
         // Customize API calls to 3rd parties. At the very least - configure required keys.
         providerOptions: {
             "twitter": {
diff --git a/lib/plugins/system/oembed/oembedUtils.js b/lib/plugins/system/oembed/oembedUtils.js
index 3459e0d79..581c594d1 100644
--- a/lib/plugins/system/oembed/oembedUtils.js
+++ b/lib/plugins/system/oembed/oembedUtils.js
@@ -123,6 +123,7 @@ module.exports.getOembed = function(uri, options, callback) {
     }
 
     try {
+        // TODO: make 'for'.
         var params = _.find(ADD_OEMBED_PARAMS, function (params) {
             return _.find(params.re, function (re) {
                 return uri.match(re);
diff --git a/lib/utils.js b/lib/utils.js
index 8c64c5ea8..54ec2d37a 100644
--- a/lib/utils.js
+++ b/lib/utils.js
@@ -41,7 +41,7 @@ var getUrl = exports.getUrl = function(url, options) {
 
             var supportGzip = !process.version.match(/^v0\.8/);
 
-            var r = request({
+            var request_options = {
                 uri: url,
                 method: 'GET',
                 headers: {
@@ -53,7 +53,21 @@ var getUrl = exports.getUrl = function(url, options) {
                 timeout: options.timeout || CONFIG.RESPONSE_TIMEOUT,
                 followRedirect: options.followRedirect,
                 jar: jar
-            })
+            };
+
+            if (CONFIG.PROXY) {
+                // TODO: make 'for'.
+                var proxy = _.find(CONFIG.PROXY, function (p) {
+                    return _.find(p.re, function (re) {
+                        return url.match(re);
+                    });
+                });
+                if (proxy) {
+                    request_options.proxy = proxy.proxy_server;
+                }
+            }
+
+            var r = request(request_options)
                 .on('error', function(error) {
                     req.emit('error', error);
                 })

From 7a49c788357e984060f7fc1ba8f97b3bd1e78684 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Mon, 29 Feb 2016 10:32:12 -0500
Subject: [PATCH 154/320] [domains] add Deezer (requires non-US proxy)

---
 plugins/domains/deezer.com.js | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 plugins/domains/deezer.com.js

diff --git a/plugins/domains/deezer.com.js b/plugins/domains/deezer.com.js
new file mode 100644
index 000000000..2645d2da8
--- /dev/null
+++ b/plugins/domains/deezer.com.js
@@ -0,0 +1,32 @@
+module.exports = {
+
+    mixins: [
+        "*"
+    ],
+
+    getLink: function(url, twitter) {
+
+        if (twitter.card !== 'player' || !twitter.player) {
+
+            return;
+
+        } else {
+
+            return {
+                href: /\/track\//i.test(url) ? twitter.player.value.replace(/&height=\d+/i, '&height=92') : twitter.player.value,
+                type: CONFIG.T.text_html,
+                rel: [CONFIG.R.player, CONFIG.R.html5],
+                height: /\/track\//i.test(url) ? 92 : twitter.player.height
+            }
+
+        }
+
+    },
+
+    tests: [
+        "http://www.deezer.com/track/11523496",
+        "http://www.deezer.com/track/61423083",
+        "http://www.deezer.com/album/11417888",
+        "http://www.deezer.com/album/1215117"
+    ]
+};
\ No newline at end of file

From b0ea30885eaaea53c82dda599be61051b4b00ba2 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Wed, 2 Mar 2016 08:29:06 -0500
Subject: [PATCH 155/320] [domains] Gfycat has fixed iFrame embeds

---
 plugins/{domains => .noneed}/gfycat.com.js | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename plugins/{domains => .noneed}/gfycat.com.js (100%)

diff --git a/plugins/domains/gfycat.com.js b/plugins/.noneed/gfycat.com.js
similarity index 100%
rename from plugins/domains/gfycat.com.js
rename to plugins/.noneed/gfycat.com.js

From ea823c0840a1a4553d177d5097f1f268fc60baa9 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Wed, 2 Mar 2016 10:12:34 -0500
Subject: [PATCH 156/320] [domains] better international URLs for Amazon

---
 plugins/domains/amazon.com.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/domains/amazon.com.js b/plugins/domains/amazon.com.js
index 37ccaf682..d5c4f5024 100644
--- a/plugins/domains/amazon.com.js
+++ b/plugins/domains/amazon.com.js
@@ -3,8 +3,8 @@ var $ = require('cheerio');
 module.exports = {
 
     re: [
-        /^https?:\/\/www\.amazon\.(com|ca|com\.au|be|dk|de|es|fr|in|ie|it|nl|co\.nz|no|at|pt|ch|fi|se|ae|pl|co\.uk|co\.jp)\/([a-zA-Z0-9\-]+\/)?dp\/[a-zA-Z0-9\-]+/i,
-        /^https?:\/\/www\.amazon\.(com|ca|com\.au|be|dk|de|es|fr|in|ie|it|nl|co\.nz|no|at|pt|ch|fi|se|ae|pl|co\.uk|co\.jp)\/gp\/product\/[a-zA-Z0-9\-]+/i
+        /^https?:\/\/www\.amazon\.(com|ca|com\.au|be|dk|de|es|fr|in|ie|it|nl|co\.nz|no|at|pt|ch|fi|se|ae|pl|co\.uk|co\.jp)\/([a-zA-Z0-9\-%]+\/)?dp\/[a-zA-Z0-9\-]+/i,
+        /^https?:\/\/www\.amazon\.(com|ca|com\.au|be|dk|de|es|fr|in|ie|it|nl|co\.nz|no|at|pt|ch|fi|se|ae|pl|co\.uk|co\.jp)\/gp\/product\/[a-zA-Z0-9\-%]+/i
     ],
 
     provides: "__isAmazonImageNeeded",

From da2d852ba3106de9fe03dcf1e052aea575b34d7f Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Wed, 2 Mar 2016 16:02:39 -0500
Subject: [PATCH 157/320] [domains] video.hhl.com got issues old SSL cipher

---
 plugins/domains/video.nhl.com.js | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 plugins/domains/video.nhl.com.js

diff --git a/plugins/domains/video.nhl.com.js b/plugins/domains/video.nhl.com.js
new file mode 100644
index 000000000..eb4d2599c
--- /dev/null
+++ b/plugins/domains/video.nhl.com.js
@@ -0,0 +1,20 @@
+module.exports = {
+
+    mixins: ["*"],
+
+    getLink: function(twitter) {
+
+        if (twitter.player) {
+            return {
+                href: (twitter.player.value || twitter.player).replace(/^https:\/\//, 'http://').replace(/&?twitter=true/, ''),
+                type: CONFIG.T.text_html,
+                rel: [CONFIG.R.player, CONFIG.R.html5],
+                "aspect-ration": twitter.player.width / twitter.player.height
+            };
+        }
+    },
+
+    tests: [
+        "http://video.nhl.com/videocenter/console?catid=917&id=263236"
+    ]
+};
\ No newline at end of file

From 4dfd8b951e3d1fe8e2e9745bd58f3aca9ebbdcde Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Thu, 3 Mar 2016 07:27:08 -0500
Subject: [PATCH 158/320] [domains] Pinterest allows underscores in user names

---
 plugins/domains/pinterest.com/pinterest.board.js | 2 +-
 plugins/domains/pinterest.com/pinterest.user.js  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/domains/pinterest.com/pinterest.board.js b/plugins/domains/pinterest.com/pinterest.board.js
index bb7da9766..14af12c33 100644
--- a/plugins/domains/pinterest.com/pinterest.board.js
+++ b/plugins/domains/pinterest.com/pinterest.board.js
@@ -2,7 +2,7 @@ var DEFAULT_WIDTH = 600;
 
 module.exports = {
 
-    re: /^https?:\/\/(?:www\.)?pinterest\.com\/((?!pin)[a-zA-Z0-9%]+)\/([a-zA-Z0-9%\-]+)\/?(?:$|\?|#)/i,
+    re: /^https?:\/\/(?:www\.)?pinterest\.com\/((?!pin)[a-zA-Z0-9%_]+)\/([a-zA-Z0-9%\-]+)\/?(?:$|\?|#)/i,
 
     mixins: [
         "*"
diff --git a/plugins/domains/pinterest.com/pinterest.user.js b/plugins/domains/pinterest.com/pinterest.user.js
index bdc9a0af1..0f2a8c375 100644
--- a/plugins/domains/pinterest.com/pinterest.user.js
+++ b/plugins/domains/pinterest.com/pinterest.user.js
@@ -2,7 +2,7 @@ var DEFAULT_WIDTH = 600;
 
 module.exports = {
 
-    re: /^https?:\/\/(?:www\.)?pinterest\.com\/((?!pin)[a-zA-Z0-9%]+)\/?(?:$|\?|#)/i,
+    re: /^https?:\/\/(?:www\.)?pinterest\.com\/((?!pin)[a-zA-Z0-9%_]+)\/?(?:$|\?|#)/i,
 
     mixins: [
         "og-image",

From 6bf22c722a35175f1cb97c61ad9d27240fca7d04 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Wed, 9 Mar 2016 12:05:24 -0500
Subject: [PATCH 159/320] [domains] return ESPN though old twitter player

---
 plugins/domains/espn.com.js | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 plugins/domains/espn.com.js

diff --git a/plugins/domains/espn.com.js b/plugins/domains/espn.com.js
new file mode 100644
index 000000000..150a04a8c
--- /dev/null
+++ b/plugins/domains/espn.com.js
@@ -0,0 +1,29 @@
+module.exports = {
+
+    re: [
+        /https?:\/\/espn\.go\.com\/video\/clip\?id=(espn):(\d+)/i,
+        /https?:\/\/xgames\.espn\.go\.com\/(xgames)\/video\/(\d+)\//i
+    ],
+
+    mixins: ["*"],
+
+    getLink: function(urlMatch) {
+
+        // Fallback to Twitter:player as it was before March 8, 2016
+
+        var player_id = urlMatch[1] === 'xgmames' ? 'id=' + urlMatch[2] + '&omniReportSuite=wdgespexpn' :
+                        'cms=espn&id=espn:' + urlMatch[2];
+
+        return {
+            href: 'https://espn.go.com/video/iframe/twitter/?' + player_id,
+            type: CONFIG.T.maybe_text_html, // ping href to check that it doesn't 404
+            rel: [CONFIG.R.player, CONFIG.R.html5],
+            "aspect-ratio": 16/9
+        };
+    },
+
+    tests: [
+        "http://espn.go.com/video/clip?id=espn:14780138",
+        "http://xgames.espn.go.com/xgames/video/13380522/real-moto-drake-mcelroy"
+    ]
+};
\ No newline at end of file

From 1a069c5fcbc512d370e049efda1424fe209f9f3e Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Fri, 11 Mar 2016 20:14:53 +0200
Subject: [PATCH 160/320] [utils] allow generate <amp-iframe>

---
 lib/html-utils.js | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/lib/html-utils.js b/lib/html-utils.js
index 9c181c61e..48505af37 100644
--- a/lib/html-utils.js
+++ b/lib/html-utils.js
@@ -212,12 +212,25 @@
             },
             generate: function(data, options) {
 
-                var $iframe = $('<iframe>')
-                    .attr('src', data.href)
-                    .attr('frameborder', '0')
-                    .attr('allowfullscreen', true)
-                    .attr('webkitallowfullscreen', true)
-                    .attr('mozallowfullscreen', true);
+                var $iframe;
+
+                if (options.amp) {
+                    $iframe = $('<amp-iframe>')
+                        .attr('src', data.href)
+                        .attr('width', 400)
+                        .attr('height', 300)
+                        .attr('frameborder', '0')
+                        .attr('layout', 'responsive')
+                        .attr('resizable', '')
+                        .attr('sandbox', 'allow-scripts allow-same-origin allow-popups');
+                } else {
+                    $iframe = $('<iframe>')
+                        .attr('src', data.href)
+                        .attr('frameborder', '0')
+                        .attr('allowfullscreen', true)
+                        .attr('webkitallowfullscreen', true)
+                        .attr('mozallowfullscreen', true);
+                }
 
                 if (options && options.disableSizeWrapper) {
                     return $iframe;

From 06b0feedbc753f7426592d79b2942fd6ced760f2 Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Fri, 11 Mar 2016 20:35:54 +0200
Subject: [PATCH 161/320] [utils] put overflow layer in <amp-iframe>

---
 lib/html-utils.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/html-utils.js b/lib/html-utils.js
index 48505af37..7a72414fc 100644
--- a/lib/html-utils.js
+++ b/lib/html-utils.js
@@ -223,6 +223,7 @@
                         .attr('layout', 'responsive')
                         .attr('resizable', '')
                         .attr('sandbox', 'allow-scripts allow-same-origin allow-popups');
+                    $iframe.html('<div overflow tabindex=0 role=button aria-label="Read more">Read more</div>');
                 } else {
                     $iframe = $('<iframe>')
                         .attr('src', data.href)

From f3aa8bf866aa49b5c83e01f0c78089af9663f561 Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Mon, 14 Mar 2016 16:59:38 +0200
Subject: [PATCH 162/320] [utils] bugfix undefined

---
 lib/html-utils.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/html-utils.js b/lib/html-utils.js
index 7a72414fc..89bf66dc4 100644
--- a/lib/html-utils.js
+++ b/lib/html-utils.js
@@ -214,7 +214,7 @@
 
                 var $iframe;
 
-                if (options.amp) {
+                if (options && options.amp) {
                     $iframe = $('<amp-iframe>')
                         .attr('src', data.href)
                         .attr('width', 400)

From e0e9200c3dafe57d785667918bb670c65b83f8aa Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Mon, 14 Mar 2016 21:04:06 +0200
Subject: [PATCH 163/320] Revert "[utils] bugfix undefined"

This reverts commit f3aa8bf866aa49b5c83e01f0c78089af9663f561.
---
 lib/html-utils.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/html-utils.js b/lib/html-utils.js
index 89bf66dc4..7a72414fc 100644
--- a/lib/html-utils.js
+++ b/lib/html-utils.js
@@ -214,7 +214,7 @@
 
                 var $iframe;
 
-                if (options && options.amp) {
+                if (options.amp) {
                     $iframe = $('<amp-iframe>')
                         .attr('src', data.href)
                         .attr('width', 400)

From 847d4462d868a9c5d236e7ce4ba151489e6ce5cc Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Mon, 14 Mar 2016 21:04:09 +0200
Subject: [PATCH 164/320] Revert "[utils] put overflow layer in <amp-iframe>"

This reverts commit 06b0feedbc753f7426592d79b2942fd6ced760f2.
---
 lib/html-utils.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/html-utils.js b/lib/html-utils.js
index 7a72414fc..48505af37 100644
--- a/lib/html-utils.js
+++ b/lib/html-utils.js
@@ -223,7 +223,6 @@
                         .attr('layout', 'responsive')
                         .attr('resizable', '')
                         .attr('sandbox', 'allow-scripts allow-same-origin allow-popups');
-                    $iframe.html('<div overflow tabindex=0 role=button aria-label="Read more">Read more</div>');
                 } else {
                     $iframe = $('<iframe>')
                         .attr('src', data.href)

From bf30ad506c9b9fe0f620f8f3609e94f59405d5a5 Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Mon, 14 Mar 2016 21:04:13 +0200
Subject: [PATCH 165/320] Revert "[utils] allow generate <amp-iframe>"

This reverts commit 1a069c5fcbc512d370e049efda1424fe209f9f3e.
---
 lib/html-utils.js | 25 ++++++-------------------
 1 file changed, 6 insertions(+), 19 deletions(-)

diff --git a/lib/html-utils.js b/lib/html-utils.js
index 48505af37..9c181c61e 100644
--- a/lib/html-utils.js
+++ b/lib/html-utils.js
@@ -212,25 +212,12 @@
             },
             generate: function(data, options) {
 
-                var $iframe;
-
-                if (options.amp) {
-                    $iframe = $('<amp-iframe>')
-                        .attr('src', data.href)
-                        .attr('width', 400)
-                        .attr('height', 300)
-                        .attr('frameborder', '0')
-                        .attr('layout', 'responsive')
-                        .attr('resizable', '')
-                        .attr('sandbox', 'allow-scripts allow-same-origin allow-popups');
-                } else {
-                    $iframe = $('<iframe>')
-                        .attr('src', data.href)
-                        .attr('frameborder', '0')
-                        .attr('allowfullscreen', true)
-                        .attr('webkitallowfullscreen', true)
-                        .attr('mozallowfullscreen', true);
-                }
+                var $iframe = $('<iframe>')
+                    .attr('src', data.href)
+                    .attr('frameborder', '0')
+                    .attr('allowfullscreen', true)
+                    .attr('webkitallowfullscreen', true)
+                    .attr('mozallowfullscreen', true);
 
                 if (options && options.disableSizeWrapper) {
                     return $iframe;

From 339c75c3152bdbe53207f641b554c6f100647197 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Tue, 15 Mar 2016 10:43:48 -0400
Subject: [PATCH 166/320] [core] allow custom user agents for specific sites

---
 lib/utils.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/utils.js b/lib/utils.js
index 54ec2d37a..1ef33199e 100644
--- a/lib/utils.js
+++ b/lib/utils.js
@@ -63,7 +63,12 @@ var getUrl = exports.getUrl = function(url, options) {
                     });
                 });
                 if (proxy) {
-                    request_options.proxy = proxy.proxy_server;
+                    if (proxy.proxy_server) {
+                        request_options.proxy = proxy.proxy_server;
+                    }
+                    if (proxy.user_agent && request_options.headers) {
+                        request_options.headers['User-Agent'] = proxy.user_agent;
+                    }
                 }
             }
 

From f7acf10fc0bb40e6d96cda2aa0bd043a9521f4d8 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Tue, 15 Mar 2016 10:44:14 -0400
Subject: [PATCH 167/320] [domains] improve couple domains a bit

---
 plugins/domains/amazon.com.js | 5 +++--
 plugins/domains/espn.com.js   | 2 ++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/plugins/domains/amazon.com.js b/plugins/domains/amazon.com.js
index d5c4f5024..aadbfcdb6 100644
--- a/plugins/domains/amazon.com.js
+++ b/plugins/domains/amazon.com.js
@@ -31,7 +31,7 @@ module.exports = {
     },
 
     getData: function (meta) {
-        if ((meta.twitter && meta.twitter.image) || (meta.og && meta.og.image)) {
+        if (meta.twitter && meta.twitter.image) {
             return;
         } else {
             return {
@@ -46,6 +46,7 @@ module.exports = {
         "http://www.amazon.co.uk/Vegetable-Perfection-tasty-recipes-shoots/dp/1849757097/ref=asap_bc?ie=UTF8",
         "http://www.amazon.com/Tapestry-Hanging-Mandala-Tapestries-Bedspread/dp/B00ODVE012/ref=sr_1_75?s=furniture&ie=UTF8&qid=1450055989&sr=1-75&keywords=tapestry",
         "http://www.amazon.ca/The-Fight-Security-Failings-Political/dp/1250082986?tag=smarturl-ca-20",
-        "http://www.amazon.com/gp/product/B0057OC5O8/"
+        "http://www.amazon.com/gp/product/B0057OC5O8/",
+        "http://www.amazon.com/The-Borderland-A-Novel-Texas/dp/0786884932"
     ]
 };
\ No newline at end of file
diff --git a/plugins/domains/espn.com.js b/plugins/domains/espn.com.js
index 150a04a8c..730817373 100644
--- a/plugins/domains/espn.com.js
+++ b/plugins/domains/espn.com.js
@@ -2,6 +2,7 @@ module.exports = {
 
     re: [
         /https?:\/\/espn\.go\.com\/video\/clip\?id=(espn):(\d+)/i,
+        /https?:\/\/(espn)\.go\.com\/video\/clip\?id=(\d+)/i,
         /https?:\/\/xgames\.espn\.go\.com\/(xgames)\/video\/(\d+)\//i
     ],
 
@@ -24,6 +25,7 @@ module.exports = {
 
     tests: [
         "http://espn.go.com/video/clip?id=espn:14780138",
+        "http://espn.go.com/video/clip?id=13328484",
         "http://xgames.espn.go.com/xgames/video/13380522/real-moto-drake-mcelroy"
     ]
 };
\ No newline at end of file

From cd918832a0bd6f0a17be05cbf25d7f2acf9abb4f Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Wed, 16 Mar 2016 13:29:57 -0400
Subject: [PATCH 168/320] [core] better parse dates with Z indicator

---
 lib/utils.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/utils.js b/lib/utils.js
index 1ef33199e..745c77820 100644
--- a/lib/utils.js
+++ b/lib/utils.js
@@ -462,6 +462,12 @@ exports.unifyDate = function(date) {
 
     // TODO: time in format 'Mon, 29 October 2012 18:15:00' parsed as local timezone anyway.
     var timestamp = Date.parse(date);
+
+    if (isNaN(timestamp)) {
+        // allow Z at the end which Node doesn't seem to parse into timestamp otherwise        
+        timestamp = Date.parse(date.replace(/Z$/, ''));
+    }
+
     if (!isNaN(timestamp)) {
         return new Date(timestamp).toISOString();
     }

From 7eb421941a8780c83689d1497dc238b37d6ad72b Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Wed, 16 Mar 2016 13:30:45 -0400
Subject: [PATCH 169/320] [domains] minor fix for mail.ru

---
 plugins/domains/mail.ru.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/plugins/domains/mail.ru.js b/plugins/domains/mail.ru.js
index aaff56cdf..91dbb88f4 100644
--- a/plugins/domains/mail.ru.js
+++ b/plugins/domains/mail.ru.js
@@ -15,7 +15,7 @@ module.exports = {
         }
 
         return {
-                href: '//videoapi.my.mail.ru/videos/embed/' + url.replace(/^https?:\/\/my\.mail\.ru\//, '').replace(/^inbox/, 'mail'),
+                href: '//videoapi.my.mail.ru/videos/embed/' + url.replace(/^https?:\/\/my\.mail\.ru\//, ''),
                 type: CONFIG.T.text_html,
                 rel: [CONFIG.R.player, CONFIG.R.ssl, CONFIG.R.html5],
                 "aspect-ratio": 626 / 367
@@ -25,6 +25,7 @@ module.exports = {
     tests: [
         "http://my.mail.ru/mail/ee.vlz/video/22396/44907.html",
         "http://my.mail.ru/mail/stryukova_lv/video/6177/1029.html",
-        "http://my.mail.ru/mail/shiniavskii/video/_myvideo/4.html"
+        "http://my.mail.ru/mail/shiniavskii/video/_myvideo/4.html",
+        "https://my.mail.ru/inbox/wwf00/video/11/46.html"
     ]
 };
\ No newline at end of file

From 0ddcdf90d2e0362b4d20391302d9f70fe4bf092f Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Tue, 22 Mar 2016 09:28:41 -0400
Subject: [PATCH 170/320] [domains] Livestream now is well covered by generic
 parsers

---
 plugins/{domains => .noneed}/livestream.com.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename plugins/{domains => .noneed}/livestream.com.js (92%)

diff --git a/plugins/domains/livestream.com.js b/plugins/.noneed/livestream.com.js
similarity index 92%
rename from plugins/domains/livestream.com.js
rename to plugins/.noneed/livestream.com.js
index aa8096b37..7a3d74f6c 100644
--- a/plugins/domains/livestream.com.js
+++ b/plugins/.noneed/livestream.com.js
@@ -16,7 +16,7 @@ module.exports = {
             return {
                 href: meta.twitter.player.value,
                 type: CONFIG.T.text_html,
-                rel: [CONFIG.R.player, CONFIG.R.twitter],
+                rel: [CONFIG.R.player, CONFIG.R.twitter, CONFIG.R.html5],
                 "aspect-ratio": meta.twitter.player.width / meta.twitter.player.height
             };
 

From 701539ac003d7ed03c08e4f90ade5b25de2358a2 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Tue, 22 Mar 2016 09:29:01 -0400
Subject: [PATCH 171/320] [domains] add NBA

---
 plugins/domains/nba.com.js    | 34 ++++++++++++++++++++++++++++++++++
 plugins/meta/embedurl-meta.js | 10 ++++++++++
 2 files changed, 44 insertions(+)
 create mode 100644 plugins/domains/nba.com.js
 create mode 100644 plugins/meta/embedurl-meta.js

diff --git a/plugins/domains/nba.com.js b/plugins/domains/nba.com.js
new file mode 100644
index 000000000..802fe21f2
--- /dev/null
+++ b/plugins/domains/nba.com.js
@@ -0,0 +1,34 @@
+module.exports = {
+
+    provides: '__allowEmbedURL',
+
+    getData: function(og) {
+        if (og.type === 'movie' || og.type === 'video' || og.type === 'video.other') {
+            return {
+                __allowEmbedURL: true
+            };
+        }
+    },
+
+    mixins: [
+        "*"
+    ],
+
+    getLink: function(schemaVideoObject) {
+
+        if (schemaVideoObject.contentURL || schemaVideoObject.contentUrl) {
+
+            return {
+                href: schemaVideoObject.contentURL || schemaVideoObject.contentUrl,
+                rel: [CONFIG.R.player, CONFIG.R.html5],
+                type: CONFIG.T.text_html, 
+                // "aspect-ratio": use default
+            };
+        }
+    },
+
+    tests: [
+        "http://www.nba.com/video/games/sixers/2015/04/15/0021401227-mia-phi-play1.nba/",
+        "http://www.nba.com/video/channels/tnt_overtime/2015/10/07/nba-on-tnt-the-quest-cavs.nba/"
+    ]
+};
\ No newline at end of file
diff --git a/plugins/meta/embedurl-meta.js b/plugins/meta/embedurl-meta.js
new file mode 100644
index 000000000..d22e196e3
--- /dev/null
+++ b/plugins/meta/embedurl-meta.js
@@ -0,0 +1,10 @@
+module.exports = {
+
+    getMeta: function(schemaVideoObject) {
+
+        return {
+            duration: schemaVideoObject.duration,
+            date: schemaVideoObject.uploadDate
+        };
+    }
+};
\ No newline at end of file

From 8a8898bb943a2ef5878e4cf202c696e2af7316aa Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Tue, 22 Mar 2016 09:41:25 -0400
Subject: [PATCH 172/320] [domains] move NY Times to their new oEmbed

---
 lib/plugins/system/oembed/providers.json |  7 ++++
 plugins/domains/nytimes.video.js         | 44 +++++++++++++++++++-----
 2 files changed, 43 insertions(+), 8 deletions(-)

diff --git a/lib/plugins/system/oembed/providers.json b/lib/plugins/system/oembed/providers.json
index 23835a6bc..3d3c01279 100644
--- a/lib/plugins/system/oembed/providers.json
+++ b/lib/plugins/system/oembed/providers.json
@@ -467,5 +467,12 @@
             "interlude.fm/v/([a-zA-Z0-9-]+)"
         ],
         "endpoint": "https://v.interlude.fm/oembed?vid={1}"
+    },
+    {
+        "name": "NYTimes",
+        "templates": [
+            "www\\.nytimes\\.com/(interactive|video)/"            
+        ],
+        "endpoint": "http://www.nytimes.com/svc/oembed/json/"
     }
 ]
\ No newline at end of file
diff --git a/plugins/domains/nytimes.video.js b/plugins/domains/nytimes.video.js
index d3040bc7f..48f23f6a8 100644
--- a/plugins/domains/nytimes.video.js
+++ b/plugins/domains/nytimes.video.js
@@ -1,3 +1,5 @@
+var cheerio = require('cheerio');
+
 module.exports = {
 
     re: [
@@ -6,17 +8,43 @@ module.exports = {
     ], 
 
     mixins: [
-        "*"
+        "oembed-thumbnail",
+        "domain-favicon",
+        "oembed-author",
+        "oembed-canonical",
+        "media-detector",
+        "oembed-site",
+        "oembed-title",
+        "og-image"
     ],
 
-    getLink: function(meta, urlMatch) {
+    getMeta: function(oembed) {
+
+        return {
+            description: oembed.summary, 
+            date: oembed.publication_date
+        }
+    },
+
+    getLink: function(oembed) {
+
+        if (oembed.type === "video" || oembed.type === "rich" ) {
+
+            var $container = cheerio('<div>');
+            try {
+                $container.html(oembed.html5 || oembed.html);
+            } catch (ex) {}
+
+            var $iframe = $container.find('iframe');
+
+            if ($iframe.length == 1) {
 
-        if (meta.medium == "video") {
-            return {
-                href: "http://graphics8.nytimes.com/bcvideo/1.0/iframe/embed.html?videoId=" + urlMatch[1] + "&playerType=embed",
-                type: CONFIG.T.text_html,
-                rel: [CONFIG.R.player, CONFIG.R.html5],
-                "aspect-ratio": 1.45 // seems to work well on diff widths                
+                return {
+                    href: $iframe.attr('src'),
+                    type: CONFIG.T.text_html,
+                    rel: [CONFIG.R.player, CONFIG.R.html5],
+                    "aspect-ratio": 1.45 // temporary until fixed padding is available or until oembed has proper width and height
+                }
             }
         }
     },

From 968ec04a09f064242127bb813bb3a5fd8197245c Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Wed, 23 Mar 2016 11:44:07 -0400
Subject: [PATCH 173/320] [domains] update Pastebin

---
 plugins/domains/pastebin.com.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/domains/pastebin.com.js b/plugins/domains/pastebin.com.js
index 60e6ebb41..85ebc8154 100644
--- a/plugins/domains/pastebin.com.js
+++ b/plugins/domains/pastebin.com.js
@@ -20,9 +20,9 @@ module.exports = {
         }
 
         return {
-            href: "//pastebin.com/embed_iframe.php?i="+ urlMatch[1],
-            type: CONFIG.T.text_html,  // Will have scrollbars, true. However, JS embeds of PasteBin use document.write, and so do not work in async js apps
-            rel: CONFIG.R.reader
+            href: "//pastebin.com/embed_js/"+ urlMatch[1],
+            type: CONFIG.T.javascript,  
+            rel: [CONFIG.R.reader, CONFIG.R.html5, CONFIG.R.ssl]  // not inline
         }
     },
 

From 35a0605f2ce13410d2a5f003011e0b7b5c489a49 Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Thu, 24 Mar 2016 14:39:29 +0200
Subject: [PATCH 174/320] [domains] nba.com: fix content type

---
 plugins/domains/nba.com.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/domains/nba.com.js b/plugins/domains/nba.com.js
index 802fe21f2..ec514aea7 100644
--- a/plugins/domains/nba.com.js
+++ b/plugins/domains/nba.com.js
@@ -21,7 +21,7 @@ module.exports = {
             return {
                 href: schemaVideoObject.contentURL || schemaVideoObject.contentUrl,
                 rel: [CONFIG.R.player, CONFIG.R.html5],
-                type: CONFIG.T.text_html, 
+                type: CONFIG.T.maybe_text_html
                 // "aspect-ratio": use default
             };
         }

From e1103b3fb427ecf0c86638dede2faa454ca8e631 Mon Sep 17 00:00:00 2001
From: dan <dan@imake.io>
Date: Fri, 25 Mar 2016 18:50:01 +0100
Subject: [PATCH 175/320] add support for setting interface and port via env
 vars

---
 config.local.js.SAMPLE | 3 ++-
 server.js              | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/config.local.js.SAMPLE b/config.local.js.SAMPLE
index a80c0c51b..2a81f1512 100644
--- a/config.local.js.SAMPLE
+++ b/config.local.js.SAMPLE
@@ -23,7 +23,8 @@
             // /^https?:\/\/yourdomain\.com\//,
         ],
 
-        port: 8061,
+        port: 8061, //can be overridden by PORT env var
+        host: 'localhost', //can be overridden by HOST env var
 
         // Optional SSL cert, if you serve under HTTPS. 
         /*
diff --git a/server.js b/server.js
index 8163761dc..8138cb5de 100644
--- a/server.js
+++ b/server.js
@@ -106,7 +106,9 @@ app.get('/', function(req, res) {
 process.title = "iframely";
 process.env.NODE_TLS_REJECT_UNAUTHORIZED = "0";
 
-app.listen(CONFIG.port);
+var listener = app.listen(process.env.PORT || CONFIG.port, process.env.HOST || CONFIG.host, function(){
+    console.log('\niframely is listening on ' + listener.address().address + ':' + listener.address().port + '\n');
+});
 
 if (CONFIG.ssl) {
     var options = { key: CONFIG.ssl.key, cert: CONFIG.ssl.cert };
@@ -114,7 +116,6 @@ if (CONFIG.ssl) {
 }
 
 console.log('');
-console.log('Iframely listening on port', CONFIG.port);
 console.log(' - support@iframely.com - if you need help');
 console.log(' - twitter.com/iframely - news & updates');
 console.log(' - github.com/itteco/iframely - star & contribute');

From 0c49c741d53bfbe43482347924433754117f774b Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Fri, 25 Mar 2016 19:50:40 +0200
Subject: [PATCH 176/320] [domains] nytimes.video: fix mixins

---
 plugins/domains/nytimes.video.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/plugins/domains/nytimes.video.js b/plugins/domains/nytimes.video.js
index 48f23f6a8..05841c09e 100644
--- a/plugins/domains/nytimes.video.js
+++ b/plugins/domains/nytimes.video.js
@@ -9,7 +9,6 @@ module.exports = {
 
     mixins: [
         "oembed-thumbnail",
-        "domain-favicon",
         "oembed-author",
         "oembed-canonical",
         "media-detector",

From 279c4061736b456506af292733b09e83596336cb Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Fri, 25 Mar 2016 13:52:53 -0400
Subject: [PATCH 177/320] [domains] fix Comedy Central - again

---
 plugins/domains/cc.com.js | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/plugins/domains/cc.com.js b/plugins/domains/cc.com.js
index f509c39d6..a4aa2ce06 100644
--- a/plugins/domains/cc.com.js
+++ b/plugins/domains/cc.com.js
@@ -6,20 +6,17 @@ module.exports = {
 
     mixins: ["*"],
 
-    getLink: function(sm4, cheerio) {
+    getLink: function(cheerio) {        
 
-        if (sm4.type && /video/i.test(sm4.type)) {
-
-            var $player = cheerio('.video_player[data-mgid*="mgid:arc:video:comedycentral.com"]');
+        var $player = cheerio('.video_player[data-mgid*="mgid:arc:video:comedycentral.com"]');
         
-            if ($player.length) {
-                return {
-                    href: "http://media.mtvnservices.com/embed/" + $player.attr('data-mgid'),
-                    type: CONFIG.T.text_html,
-                    rel: [CONFIG.R.player,  CONFIG.R.html5],
-                    "aspect-ratio": 512 / 288
+        if ($player.length) {
+            return {
+                href: "http://media.mtvnservices.com/embed/" + $player.attr('data-mgid'),
+                type: CONFIG.T.text_html,
+                rel: [CONFIG.R.player,  CONFIG.R.html5],
+                "aspect-ratio": 512 / 288
 
-                }
             }
         }
     },

From 3b0182c7357a31a1e9cbcdbf2c1577bd72cacd37 Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Fri, 25 Mar 2016 19:58:26 +0200
Subject: [PATCH 178/320] [domains] nytimes.video: fix mixins

---
 plugins/domains/nytimes.video.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/domains/nytimes.video.js b/plugins/domains/nytimes.video.js
index 05841c09e..8493a522d 100644
--- a/plugins/domains/nytimes.video.js
+++ b/plugins/domains/nytimes.video.js
@@ -9,6 +9,7 @@ module.exports = {
 
     mixins: [
         "oembed-thumbnail",
+        "domain-icon",
         "oembed-author",
         "oembed-canonical",
         "media-detector",

From 2b9d6fc3ae0e7882fadf13fe8d25f72c228c3ef1 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Tue, 29 Mar 2016 08:24:31 -0400
Subject: [PATCH 179/320] [domains] more URLs for geogebra

---
 plugins/domains/geogebra.org.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugins/domains/geogebra.org.js b/plugins/domains/geogebra.org.js
index 9227e38a8..982cc18c2 100644
--- a/plugins/domains/geogebra.org.js
+++ b/plugins/domains/geogebra.org.js
@@ -5,7 +5,8 @@ module.exports = {
     re: [
     	/^https?:\/\/tube\.geogebra\.org\/material\/\w+\/id\/(\d+)/i,
     	/^https?:\/\/tube\.geogebra\.org\/m\/(\d+)/i,
-    	/^https?:\/\/tube\.geogebra\.org\/student\/m(\d+)/i
+    	/^https?:\/\/tube\.geogebra\.org\/student\/m(\d+)/i,
+    	/^https?:\/\/\w+\.geogebra\.org\/m\/(\d+)/i    	
     ],
 
     mixins: [
@@ -57,6 +58,7 @@ module.exports = {
     tests: [
         "http://tube.geogebra.org/material/simple/id/106299",
         "http://tube.geogebra.org/m/60391",
-        "https://tube.geogebra.org/student/m29659"
+        "https://tube.geogebra.org/student/m29659",
+        "http://www.geogebra.org/m/141300"
     ]
 };
\ No newline at end of file

From 41c773fb7ea377ae60a127e76c581ada35b6c8e7 Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Tue, 29 Mar 2016 19:26:17 +0300
Subject: [PATCH 180/320] [logging] log sender ip address

---
 logging.js           | 12 ++++++++++++
 modules/api/views.js |  8 ++++----
 utils.js             |  2 +-
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/logging.js b/logging.js
index 26a75676a..5e0c80d0d 100644
--- a/logging.js
+++ b/logging.js
@@ -2,6 +2,18 @@ var moment = require('moment');
 
 exports.log = function() {
     var args = Array.prototype.slice.apply(arguments);
+
+    // Add ip if request provided.
+    var request = args[0];
+    if (request && request.headers) {
+        args.shift();
+        var remote_addr = request.headers['x-forwarded-for'] || request.connection.remoteAddress;
+        if (remote_addr) {
+            args.splice(0, 0, remote_addr, '-');
+        }
+    }
+
     args.splice(0, 0, "--", moment().utc().format("\\[YY-MM-DD HH:mm:ss\\]"));
+
     console.log.apply(console, args);
 };
\ No newline at end of file
diff --git a/modules/api/views.js b/modules/api/views.js
index e96976fe4..4419ac109 100644
--- a/modules/api/views.js
+++ b/modules/api/views.js
@@ -56,7 +56,7 @@ module.exports = function(app) {
             return next(new Error("local domains not supported"));
         }
 
-        log('Loading /iframely for', uri);
+        log(req, 'Loading /iframely for', uri);
 
         async.waterfall([
 
@@ -188,7 +188,7 @@ module.exports = function(app) {
             return next(new Error("local domains not supported"));
         }
 
-        log('Loading /reader for', uri);
+        log(req, 'Loading /reader for', uri);
 
         async.waterfall([
 
@@ -251,7 +251,7 @@ module.exports = function(app) {
             return next(new Error("local domains not supported"));
         }
 
-        log('Loading /render for', uri);
+        log(req, 'Loading /render for', uri);
 
         async.waterfall([
 
@@ -366,7 +366,7 @@ module.exports = function(app) {
             return next(new Error("local domains not supported"));
         }
 
-        log('Loading /oembed for', uri);
+        log(req, 'Loading /oembed for', uri);
 
         async.waterfall([
 
diff --git a/utils.js b/utils.js
index c1ef162ca..ab5a37244 100644
--- a/utils.js
+++ b/utils.js
@@ -222,7 +222,7 @@
 
                                 if (head) {
 
-                                    log("Using cache for", req.url.replace(/\?.+/, ''), req.query.uri || req.query.url);
+                                    log(req, "Using cache for", req.url.replace(/\?.+/, ''), req.query.uri || req.query.url);
 
                                     var requestedEtag = req.headers['if-none-match'];
 

From 79cdfbe94c1e954fa25c517f808c080fbb36ff5a Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Tue, 29 Mar 2016 12:32:31 -0400
Subject: [PATCH 181/320] =?UTF-8?q?[domains]=20support=20for=20Acad=C3=A9m?=
 =?UTF-8?q?ie=20de=20Bordeaux?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/plugins/system/oembed/providers.json | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/lib/plugins/system/oembed/providers.json b/lib/plugins/system/oembed/providers.json
index 3d3c01279..88f437b7e 100644
--- a/lib/plugins/system/oembed/providers.json
+++ b/lib/plugins/system/oembed/providers.json
@@ -474,5 +474,13 @@
             "www\\.nytimes\\.com/(interactive|video)/"            
         ],
         "endpoint": "http://www.nytimes.com/svc/oembed/json/"
+    },
+    {
+        "name": "Academie de Bordeaux",
+        "templates": [
+            "(\\w+)\\.ac\\-bordeaux\\.fr/mediacad/default/media/display(?:[\\/a-z0-9]+)?/(m/\\d+)"
+            
+        ],
+        "endpoint": "http://{1}.ac-bordeaux.fr/mediacad/default/media/display/{2}/d/j?format={format}"
     }
 ]
\ No newline at end of file

From d51e39b52ab09f943d172d338a71fe29d29b15dd Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Tue, 29 Mar 2016 21:56:16 +0300
Subject: [PATCH 182/320] [utils] better wrapper for responsive iframes with
 100% width

---
 lib/html-utils.js     | 9 ++++-----
 static/js/iframely.js | 9 ++++-----
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/lib/html-utils.js b/lib/html-utils.js
index 9c181c61e..afd67c6a0 100644
--- a/lib/html-utils.js
+++ b/lib/html-utils.js
@@ -31,6 +31,9 @@
             $container.css('padding-bottom', '56.25%');
         }
 
+        var $widthLimiterContainer = $('<div>')
+            .append($container);
+
         if (media) {
 
             if (media["aspect-ratio"]) {
@@ -50,19 +53,15 @@
 
             // Min/max width can be controlled by one more parent div.
             if (media["max-width"] || media["min-width"]) {
-                var $widthLimiterContainer = $('<div>')
-                    //.addClass("iframely-outer-container")
-                    .append($container);
                 ["max-width", "min-width"].forEach(function(attr) {
                     if (media[attr]) {
                         $widthLimiterContainer.css(attr, media[attr] + 'px');
                     }
                 });
-                $container = $widthLimiterContainer;
             }
         }
 
-        return $container;
+        return $widthLimiterContainer;
     }
 
     var renders = {
diff --git a/static/js/iframely.js b/static/js/iframely.js
index 1f2629d20..bb0e9f17e 100644
--- a/static/js/iframely.js
+++ b/static/js/iframely.js
@@ -231,6 +231,9 @@
             $container.css('padding-bottom', '56.25%');
         }
 
+        var $widthLimiterContainer = $('<div>')
+            .append($container);
+
         if (media) {
 
             if (media["aspect-ratio"]) {
@@ -250,19 +253,15 @@
 
             // Min/max width can be controlled by one more parent div.
             if (media["max-width"] || media["min-width"]) {
-                var $widthLimiterContainer = $('<div>')
-                    //.addClass("iframely-outer-container")
-                    .append($container);
                 ["max-width", "min-width"].forEach(function(attr) {
                     if (media[attr]) {
                         $widthLimiterContainer.css(attr, media[attr]);
                     }
                 });
-                $container = $widthLimiterContainer;
             }
         }
 
-        return $container;
+        return $widthLimiterContainer;
     }
 
     var renders = {

From 04ec3bd2ca173c9afa09c3bb23391d2fa9682c1d Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Wed, 30 Mar 2016 12:07:08 -0400
Subject: [PATCH 183/320] [domains] more URLs for Academie Bordeaux

---
 lib/plugins/system/oembed/providers.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/plugins/system/oembed/providers.json b/lib/plugins/system/oembed/providers.json
index 88f437b7e..fb2e5a137 100644
--- a/lib/plugins/system/oembed/providers.json
+++ b/lib/plugins/system/oembed/providers.json
@@ -478,8 +478,8 @@
     {
         "name": "Academie de Bordeaux",
         "templates": [
-            "(\\w+)\\.ac\\-bordeaux\\.fr/mediacad/default/media/display(?:[\\/a-z0-9]+)?/(m/\\d+)"
-            
+            "(\\w+)\\.ac\\-bordeaux\\.fr/mediacad/default/media/display(?:[\\/a-z0-9]+)?/(m/\\d+)",
+            "(\\w+)\\.ac\\-bordeaux\\.fr/mediacad/(m/\\d+)"            
         ],
         "endpoint": "http://{1}.ac-bordeaux.fr/mediacad/default/media/display/{2}/d/j?format={format}"
     }

From 4fa82ef92be6291142e46c20cbe5c24a1de3a7b9 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Wed, 30 Mar 2016 12:07:31 -0400
Subject: [PATCH 184/320] [domains] fix image for Someecards

---
 plugins/meta/canonical.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/meta/canonical.js b/plugins/meta/canonical.js
index 3b15ae4bf..304df3b2c 100644
--- a/plugins/meta/canonical.js
+++ b/plugins/meta/canonical.js
@@ -2,6 +2,8 @@ var urlLib = require('url');
 
 module.exports = {
 
+	highestPriority: true,
+
     getMeta: function(url, meta) {
 
         var canonical = (meta.canonical && meta.canonical.href || meta.canonical) || (meta.og && meta.og.url) || (meta.twitter && meta.twitter.url);

From 0806e5d771aad17888bcb87c99bc58f07b222daf Mon Sep 17 00:00:00 2001
From: kfei <kfei@kfei.net>
Date: Wed, 30 Mar 2016 12:20:24 +0800
Subject: [PATCH 185/320] Add Dockerfile and an init script for container

The Docker container will:
  - Run `forever start cluster.js` by default
  - Run `forever start <args>` if command line arguments are supplied
  - Gracefully shutdown when receiving SIGTERM from `docker stop`

A brief documentation:

```bash
docker build -t iframely:latest .
docker run -it -p 8061:8061 -v $PWD/config.local.js:/iframely/config.local.js --name iframely iframely:latest
docker stop iframely
```

Signed-off-by: kfei <kfei@kfei.net>
---
 .dockerignore        |  2 ++
 Dockerfile           | 18 ++++++++++++++++++
 docker/entrypoint.sh | 27 +++++++++++++++++++++++++++
 3 files changed, 47 insertions(+)
 create mode 100644 .dockerignore
 create mode 100644 Dockerfile
 create mode 100755 docker/entrypoint.sh

diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 000000000..3978a0f7a
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,2 @@
+.git
+.gitignore
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 000000000..fcf9f609c
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,18 @@
+FROM node:5.8
+
+EXPOSE 8061
+
+COPY . /iframely
+
+WORKDIR /iframely
+
+RUN DEPS="libkrb5-dev" \
+    apt-get update && \
+    apt-get install -q -y --no-install-recommends $DEPS && \
+    npm install -g forever && \
+    npm install && \
+    apt-get purge -y --auto-remove $DEPS && \
+    apt-get autoremove && \
+    apt-get clean
+
+ENTRYPOINT ["/iframely/docker/entrypoint.sh"]
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
new file mode 100755
index 000000000..302582665
--- /dev/null
+++ b/docker/entrypoint.sh
@@ -0,0 +1,27 @@
+#!/bin/bash
+
+export ARGV="$@"
+export ARGC="$#"
+
+function sigterm_handler() {
+    echo "SIGTERM signal received."
+    forever stopall
+}
+
+trap "sigterm_handler; exit" TERM
+
+function entrypoint() {
+    if [ "$ARGC" -eq 0 ]
+    then
+        # Run server in cluster mode by default
+        forever start cluster.js
+    else
+        # Use command line arguments supplied at runtime
+        forever start $ARGV
+    fi
+
+    forever --fifo logs 0 &
+    wait
+}
+
+entrypoint

From eb8f4662d41b54ff57155e96b9ba36644f6a1aa5 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Tue, 5 Apr 2016 08:40:19 -0400
Subject: [PATCH 186/320] [domains] Revert NYTimes oembed support for videos

Re #112 - Apparently, NYTimes rolled back their oEmbed for now
---
 lib/plugins/system/oembed/providers.json |  7 ----
 plugins/domains/nytimes.video.js         | 44 +++++-------------------
 2 files changed, 8 insertions(+), 43 deletions(-)

diff --git a/lib/plugins/system/oembed/providers.json b/lib/plugins/system/oembed/providers.json
index fb2e5a137..69990f49c 100644
--- a/lib/plugins/system/oembed/providers.json
+++ b/lib/plugins/system/oembed/providers.json
@@ -468,13 +468,6 @@
         ],
         "endpoint": "https://v.interlude.fm/oembed?vid={1}"
     },
-    {
-        "name": "NYTimes",
-        "templates": [
-            "www\\.nytimes\\.com/(interactive|video)/"            
-        ],
-        "endpoint": "http://www.nytimes.com/svc/oembed/json/"
-    },
     {
         "name": "Academie de Bordeaux",
         "templates": [
diff --git a/plugins/domains/nytimes.video.js b/plugins/domains/nytimes.video.js
index 8493a522d..898ece5a7 100644
--- a/plugins/domains/nytimes.video.js
+++ b/plugins/domains/nytimes.video.js
@@ -1,5 +1,3 @@
-var cheerio = require('cheerio');
-
 module.exports = {
 
     re: [
@@ -8,43 +6,17 @@ module.exports = {
     ], 
 
     mixins: [
-        "oembed-thumbnail",
-        "domain-icon",
-        "oembed-author",
-        "oembed-canonical",
-        "media-detector",
-        "oembed-site",
-        "oembed-title",
-        "og-image"
+        "*"
     ],
 
-    getMeta: function(oembed) {
-
-        return {
-            description: oembed.summary, 
-            date: oembed.publication_date
-        }
-    },
-
-    getLink: function(oembed) {
-
-        if (oembed.type === "video" || oembed.type === "rich" ) {
-
-            var $container = cheerio('<div>');
-            try {
-                $container.html(oembed.html5 || oembed.html);
-            } catch (ex) {}
-
-            var $iframe = $container.find('iframe');
-
-            if ($iframe.length == 1) {
+    getLink: function(meta, urlMatch) {
 
-                return {
-                    href: $iframe.attr('src'),
-                    type: CONFIG.T.text_html,
-                    rel: [CONFIG.R.player, CONFIG.R.html5],
-                    "aspect-ratio": 1.45 // temporary until fixed padding is available or until oembed has proper width and height
-                }
+        if (meta.medium == "video") {
+            return {
+                href: "//graphics8.nytimes.com/bcvideo/1.0/iframe/embed.html?videoId=" + urlMatch[1] + "&playerType=embed",
+                type: CONFIG.T.text_html,
+                rel: [CONFIG.R.player, CONFIG.R.html5],
+                "aspect-ratio": 1.45 // seems to work well on diff widths                
             }
         }
     },

From b28186fa24b5a761410a73d7522d2f15d9a6fd79 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Tue, 5 Apr 2016 09:32:58 -0400
Subject: [PATCH 187/320] [domains] update the iFrame src for NYTimes videos

#112
---
 plugins/domains/nytimes.video.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/domains/nytimes.video.js b/plugins/domains/nytimes.video.js
index 898ece5a7..e6d60514b 100644
--- a/plugins/domains/nytimes.video.js
+++ b/plugins/domains/nytimes.video.js
@@ -13,7 +13,7 @@ module.exports = {
 
         if (meta.medium == "video") {
             return {
-                href: "//graphics8.nytimes.com/bcvideo/1.0/iframe/embed.html?videoId=" + urlMatch[1] + "&playerType=embed",
+                href: "//graphics8.nytimes.com/video/players/offsite/index.html?videoId=" + urlMatch[1],                
                 type: CONFIG.T.text_html,
                 rel: [CONFIG.R.player, CONFIG.R.html5],
                 "aspect-ratio": 1.45 // seems to work well on diff widths                

From 33290ac2db5cac2ae24ef9a2d9909e6881257561 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Thu, 7 Apr 2016 10:18:40 -0400
Subject: [PATCH 188/320] [domains] fix aol features

---
 plugins/domains/features.aol.com.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/domains/features.aol.com.js b/plugins/domains/features.aol.com.js
index d975f0dbd..71b1f890e 100644
--- a/plugins/domains/features.aol.com.js
+++ b/plugins/domains/features.aol.com.js
@@ -14,7 +14,7 @@ module.exports = {
 
             if (playlist) {
                 return {
-                    href: "http://pshared.5min.com/Scripts/PlayerSeed.js?sid=281&&playList=" + playlist,
+                    href: "http://pshared.5min.com/Scripts/PlayerSeed.js?sid=281&playList=" + playlist,
                     type: CONFIG.T.javascript,
                     rel: [CONFIG.R.player,  CONFIG.R.inline, CONFIG.R.html5],
                     "aspect-ratio": 16 / 9

From 7f7074b4bf3703cd1d103dfb243b2f548cb0ab27 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Fri, 8 Apr 2016 12:59:22 -0400
Subject: [PATCH 189/320] [domains] better aspect ratio detection for
 Kickstarter

---
 plugins/domains/kickstarter.com.js | 69 +++++++++++++++++++++---------
 1 file changed, 49 insertions(+), 20 deletions(-)

diff --git a/plugins/domains/kickstarter.com.js b/plugins/domains/kickstarter.com.js
index 06dfee378..b7a943829 100644
--- a/plugins/domains/kickstarter.com.js
+++ b/plugins/domains/kickstarter.com.js
@@ -1,3 +1,4 @@
+var utils = require('../../lib/utils');
 var cheerio = require('cheerio');
 
 module.exports = {
@@ -12,11 +13,11 @@ module.exports = {
 
         "twitter-player",
         "og-video",
-        "og-image",
+        // "og-image", // Added in getLinks
         "favicon"
     ],
 
-    getLink: function (meta, oembed) {
+    getLinks: function (meta, oembed, options, cb) {
 
         // When there is no project video, Kikstarter's oEmbed has diff output
         // 'meta' param is there to determine if there's a video
@@ -26,14 +27,6 @@ module.exports = {
         // We have to rely on auto-discovery as it seems to work. 
         // Ex.: https://www.kickstarter.com/projects/sparkdevices/spark-electron-cellular-dev-kit-with-a-simple-data/posts/1148266
 
-        var links = [{
-            href: oembed.thumbnail_url,
-            rel: [CONFIG.R.thumbnail, CONFIG.R.oembed],
-            type: CONFIG.T.image,
-            width: oembed.thumbnail_width,
-            height: oembed.thumbnail_height
-        }];
-
         var $container = cheerio('<div>');
 
         try {
@@ -48,27 +41,62 @@ module.exports = {
 
             if ((meta.twitter && meta.twitter.card == 'player') || (meta.og && meta.og.type == 'video') || meta.video_src || (href && /video\.html$/.test(href))) {
 
-                links.push ({
-                    href: href,
-                    type: CONFIG.T.text_html,
-                    rel: [CONFIG.R.player, CONFIG.R.oembed, CONFIG.R.html5],
-                    "aspect-ratio": oembed.width / oembed.height
+                var aspect = oembed.height ? oembed.width / oembed.height : 0;
+
+                // This is to fix incorrect aspect for both iFrame and images :\
+                utils.getImageMetadata((meta.og.image && meta.og.image.url) || oembed.thumbnail_url, options, function(error, data) {
+
+                    var links = [];
+
+                    if (error || data.error) {
+
+                        console.log ('Error getting og image for Kickstarter: ' + error);
+
+                    } else if (data.width && data.height) {
+
+                        links.push({
+                            href: (meta.og.image && meta.og.image.url) || oembed.thumbnail_url,
+                            type: CONFIG.T.image, 
+                            rel: CONFIG.R.thumbnail,
+                            width: data.width,
+                            height: data.height
+                        });
+                    
+                        aspect = Math.max(aspect, data.width / data.height);
+
+                    }
+
+                    links.push({
+                        href: href,
+                        type: CONFIG.T.text_html,
+                        rel: [CONFIG.R.player, CONFIG.R.oembed, CONFIG.R.html5],
+                        "aspect-ratio": aspect
+                    });
+
+                    return cb(null, links);
+
                 });
 
 
             } else {
  
-                links.push ({
+                return cb(null, [{
                     href: href,
                     type: CONFIG.T.text_html,
                     rel: [CONFIG.R.app, CONFIG.R.oembed, CONFIG.R.html5],
                     width: oembed.width,
                     height: oembed.height
-                });
+                }, {
+                    href: oembed.thumbnail_url,
+                    rel: [CONFIG.R.thumbnail, CONFIG.R.oembed],
+                    type: CONFIG.T.image
+                }]);
+                
             }
-        }
 
-        return links;
+        } else {
+            cb (null, null);
+        }        
 
     },
 
@@ -82,6 +110,7 @@ module.exports = {
     },
         "http://www.kickstarter.com/projects/1104350651/taktik-premium-protection-system-for-the-iphone",
         "https://www.kickstarter.com/projects/1578116861/toejam-and-earl-back-in-the-groove",
-        "https://www.kickstarter.com/projects/sparkdevices/spark-electron-cellular-dev-kit-with-a-simple-data/posts/1148266"
+        "https://www.kickstarter.com/projects/sparkdevices/spark-electron-cellular-dev-kit-with-a-simple-data/posts/1148266",
+        "https://www.kickstarter.com/projects/1818505613/codeybot-new-robot-who-teaches-coding?ref=home_potd"
     ]
 };
\ No newline at end of file

From a81b03ce386400dbcbcc7f703cbcbb3ac8b46ce9 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Mon, 11 Apr 2016 13:10:37 -0400
Subject: [PATCH 190/320] [brightcove] handle new HTML5 players

---
 .../link.brightcove.com.js}                   |  1 +
 .../brightcove.com/players.brightcove.net.js  | 22 ++++++++
 .../links/promo/brightcove-allow-in-page.js   | 17 ++++++
 plugins/links/promo/brightcove-hosted.js      | 15 +++--
 .../links/promo/brightcove-in-page-promo.js   | 55 +++++++++++++++++++
 plugins/links/promo/brightcove-via-gallery.js | 26 +++++++++
 6 files changed, 130 insertions(+), 6 deletions(-)
 rename plugins/domains/{brightcove.com.js => brightcove.com/link.brightcove.com.js} (98%)
 create mode 100644 plugins/domains/brightcove.com/players.brightcove.net.js
 create mode 100644 plugins/links/promo/brightcove-allow-in-page.js
 create mode 100644 plugins/links/promo/brightcove-in-page-promo.js
 create mode 100644 plugins/links/promo/brightcove-via-gallery.js

diff --git a/plugins/domains/brightcove.com.js b/plugins/domains/brightcove.com/link.brightcove.com.js
similarity index 98%
rename from plugins/domains/brightcove.com.js
rename to plugins/domains/brightcove.com/link.brightcove.com.js
index 8e34f9ea5..a2bbb40d6 100644
--- a/plugins/domains/brightcove.com.js
+++ b/plugins/domains/brightcove.com/link.brightcove.com.js
@@ -2,6 +2,7 @@ module.exports = {
 
     re: [
         /^https?:\/\/link\.brightcove\.com\/services\/player\//i,
+        /^https?:\/\/link\.brightcove\.co.jp\/services\/player\//i,
         /^https?:\/\/[a-z\-]+\.\w+\.(com|org|net|co|)\/services\/player\/bcpid\d+\/?\?bc/i
     ],
 
diff --git a/plugins/domains/brightcove.com/players.brightcove.net.js b/plugins/domains/brightcove.com/players.brightcove.net.js
new file mode 100644
index 000000000..e5b4c427f
--- /dev/null
+++ b/plugins/domains/brightcove.com/players.brightcove.net.js
@@ -0,0 +1,22 @@
+module.exports = {
+
+    re: [
+        /^https?:\/\/players\.brightcove\.net\/(\d+)\/([a-zA-Z0-9\-]+|default)_default\/index.html\?videoId=(\d+)/i
+    ],
+
+    mixins: [
+        "*"
+    ],
+
+    //HTML parser will 404 if BC account or player does not exist.
+    getLink: function(urlMatch) {
+
+        return {
+            href: '//players.brightcove.net/' + urlMatch[1] + '/' + urlMatch[2] + '_default/index.html?videoId=' + urlMatch[3] + '&for=embed',
+            rel: [CONFIG.R.player, CONFIG.R.html5],
+            type: CONFIG.T.text_html,
+            // aspect-ratio not known, use default...
+        };
+    }
+
+};    
\ No newline at end of file
diff --git a/plugins/links/promo/brightcove-allow-in-page.js b/plugins/links/promo/brightcove-allow-in-page.js
new file mode 100644
index 000000000..73878323c
--- /dev/null
+++ b/plugins/links/promo/brightcove-allow-in-page.js
@@ -0,0 +1,17 @@
+module.exports = {
+
+    provides: '__allowBrightcoveInPage',
+
+    getData: function(meta, whitelistRecord) {
+
+        // Allow slow cheerio parser, if whitelisted,
+        // But do not call, if there is twitter:player
+        if (whitelistRecord.isAllowed('html-meta.brightcoveInPage')) {
+
+            return {
+                __allowBrightcoveInPage: true
+            };
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/plugins/links/promo/brightcove-hosted.js b/plugins/links/promo/brightcove-hosted.js
index 9cfb9e018..6928e19ad 100644
--- a/plugins/links/promo/brightcove-hosted.js
+++ b/plugins/links/promo/brightcove-hosted.js
@@ -1,12 +1,12 @@
 module.exports = {
 
-    provides: '__promoUri',    
+    provides: '__promoUri',
 
     getData: function(url, meta, whitelistRecord) {
 
         if (!whitelistRecord.isDefault && ((meta.og && meta.og.image) || (meta.twitter && meta.twitter.image))) {return;}
 
-        if (url.match(/^https?:\/\/link\.brightcove\.com\/services\/player\/bcpid(\d+)\?/i)) {return;}
+        if (url.match(/^https?:\/\/link\.brightcove\.(?:com|co\.jp)\/services\/player\/bcpid(\d+)\?/i)) {return;}
         // do not process links to itself, otherwise -> infinite recursion
 
 
@@ -20,12 +20,12 @@ module.exports = {
             video_src = ogv && (ogv.url || ogv.secure_url);          
         }
 
-        if (!video_src || !/\.brightcove\.com\/services\//i.test(video_src)) {
+        if (!video_src || !/\.brightcove\.(?:com|co\.jp)\/services\//i.test(video_src)) {
             return;
         }
         
 
-        var urlMatch = video_src.match(/^https?:\/\/link\.brightcove\.com\/services\/player\/bcpid(\d+)\/?\?/i);
+        var urlMatch = video_src.match(/^https?:\/\/link\.brightcove\.(?:com|co\.jp)\/services\/player\/bcpid(\d+)\/?\?/i);
 
         if (urlMatch) {
 
@@ -34,14 +34,14 @@ module.exports = {
             };
         }
 
-        if (/^https?:\/\/(?:c|secure)\.brightcove\.com\/services\/viewer\/federated_f9\//i.test(video_src)) {
+        if (/^https?:\/\/(?:c|secure)\.brightcove\.(?:com|co\.jp)\/services\/viewer\/federated_f9\/?/i.test(video_src)) {
             var playerID = video_src.match(/playerID=([^&]+)/i);
             var videoID = video_src.match(/videoID=([^&]+)/i); // some have `Id` for some reason
 
             if (playerID && videoID) {
 
                 return {
-                    __promoUri: "http://link.brightcove.com/services/player/bcpid" + playerID[1] + "?bctid=" + videoID[1]
+                    __promoUri: "http://link.brightcove." + (/\.co\.jp/.test(video_src) ? 'co.jp' : 'com')+ "/services/player/bcpid" + playerID[1] + "?bctid=" + videoID[1]
                 };
             }
 
@@ -100,4 +100,7 @@ module.exports = {
         http://www.shreveporttimes.com/videos/news/2015/08/18/31906711/
         http://www.hudsonstarobserver.com/video/4384889790001
     */
+
+    /* http://tv.tokyo-gas.co.jp/watch/902548399002  - Japaneese
+    */
 };
\ No newline at end of file
diff --git a/plugins/links/promo/brightcove-in-page-promo.js b/plugins/links/promo/brightcove-in-page-promo.js
new file mode 100644
index 000000000..cf568f1d6
--- /dev/null
+++ b/plugins/links/promo/brightcove-in-page-promo.js
@@ -0,0 +1,55 @@
+/**
+ * This plugin relies on whitelist to detect Brightcove's embed-in-page players
+ * http://docs.brightcove.com/en/perform/brightcove-player/guides/embed-in-page.html
+ */
+
+module.exports = {
+
+    provides: '__promoUri',
+
+    getData: function(cheerio, __allowBrightcoveInPage) {
+
+        /* we are looking for following video on the page, and check that embed is allowed
+                    <video
+                        id="video-js-4306274716001"
+                        data-account="1125911414"
+                        data-player="VJ949r8Fg"
+                        data-embed="default"
+                        data-video-id="4306274716001"
+                        class="main-media__video-player video-js"
+                        autoplay>
+                    </video>
+                    <script src="//players.brightcove.net/1125911414/VJ949r8Fg_default/index.min.js"></script>
+        */
+
+        var $video = cheerio('video.video-js[id*="video-js-"]');
+
+        if ($video.length == 1) {
+
+            var embed = $video.attr('data-embed');
+            var id = $video.attr('id');
+            var account = $video.attr('data-account');
+            var player = $video.attr('data-player');
+            var video_id = $video.attr('data-video-id');
+
+            // Let's validate
+            if (!embed || !id || !account || !player || !video_id) {
+                return;
+            } 
+
+            if (embed !== 'default' || id.indexOf(video_id) ==-1 || !/^\d+$/.test(account) || !/^\d+$/.test(video_id)) {
+                return;
+            }
+
+            return {
+                __promoUri: 'https://players.brightcove.net/' + account + '/' + player + '_' + embed + '/index.html?videoId=' + video_id
+            }
+        }
+    },
+
+    /**
+    * http://www.hollywoodreporter.com/video/vin-diesel-voicing-groot-guardians-615140
+    * http://www.billboard.com/articles/columns/rock/6605231/eddie-van-halen-addiction-david-lee-roth-touring?mobile_redirection=false
+    */
+
+};
\ No newline at end of file
diff --git a/plugins/links/promo/brightcove-via-gallery.js b/plugins/links/promo/brightcove-via-gallery.js
new file mode 100644
index 000000000..cf32d1898
--- /dev/null
+++ b/plugins/links/promo/brightcove-via-gallery.js
@@ -0,0 +1,26 @@
+module.exports = {
+
+    getLink: function(url, meta, twitter, whitelistRecord) {
+
+        if (whitelistRecord.isDefault 
+            && (meta.generator && /^brightcove$/i.test(meta.generator)) 
+            && (twitter.player && /^https?:\/\/players\.brightcove\.net\//i.test(twitter.player.value))) {
+
+            return {
+                href: twitter.player.value, 
+                type: CONFIG.T.text_html,
+                rel: [CONFIG.R.player, CONFIG.R.html5],
+                "aspect-ratio": twitter.player.width / twitter.player.height
+            };
+        }
+    }
+
+
+    /* Sample URLs for hosted Brightcove video galleries
+        http://video.ibc.org/detail/videos/media-distribution/video/4486234369001/e102-sunday-1130-mam-is-dead?autoStart=true        
+        http://video.massachusetts.edu/detail/videos/here-for-a-reason/video/4767578288001/transform?autoStart=true
+        http://oncologyvu.brightcovegallery.com/detail/videos/treatment-methods/video/3880531728001/importance-of-the-nurse-patient-relationship?autoStart=true
+        http://vod.miraclechannel.ca/detail/videos/all-episodes/video/4803972939001/the-leon-show---vaccines-and-your-health?autoStart=true
+        http://video.brightcovelearning.com/detail/videos/managing-players/video/4805928382001/styling-players?autoStart=true
+    */
+};
\ No newline at end of file

From a9f07bbbbb450259aa25d47bb3ffa9bc23e5420c Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Mon, 11 Apr 2016 13:11:30 -0400
Subject: [PATCH 191/320] [domains] number of minor fixes

---
 plugins/domains/instagram.com.js       |  2 +-
 plugins/domains/mp3.zing.vn.js         | 11 ++++++++++-
 plugins/domains/nytimes.video.js       |  3 ++-
 plugins/links/promo/twitter-youtube.js | 10 +++++-----
 plugins/meta/embedurl-meta.js          |  7 ++++++-
 plugins/meta/media-detector.js         | 15 +++++++++------
 6 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/plugins/domains/instagram.com.js b/plugins/domains/instagram.com.js
index 0ecd48c0f..d042a8427 100644
--- a/plugins/domains/instagram.com.js
+++ b/plugins/domains/instagram.com.js
@@ -16,7 +16,7 @@ module.exports = {
 
     getMeta: function (og) {
 
-        var match = og.title.match(/[a-zA-Z0-9\s]+on\sInstagram/i);
+        var match = og.title.match(/[^:]+on\sInstagram/i);
 
         return {
             title: match ? match[0] : "Post on Instagram",
diff --git a/plugins/domains/mp3.zing.vn.js b/plugins/domains/mp3.zing.vn.js
index 8ce775189..aa6cd7bc8 100644
--- a/plugins/domains/mp3.zing.vn.js
+++ b/plugins/domains/mp3.zing.vn.js
@@ -2,7 +2,16 @@ module.exports = {
 
     re: /^https?:\/\/mp3\.zing\.vn\/([a-zA-Z-]+)\/[0-9a-zA-Z-]+\/(\w+)\.html/i,
 
-    mixins: ['*'],
+    mixins: [
+        "og-image",
+        "favicon",
+        "canonical",
+        "og-description",
+        "keywords",
+        "geo-url",
+        "og-site",
+        "og-title"
+    ],
 
     getLink: function(og, urlMatch) {
 
diff --git a/plugins/domains/nytimes.video.js b/plugins/domains/nytimes.video.js
index e6d60514b..d36a65aa3 100644
--- a/plugins/domains/nytimes.video.js
+++ b/plugins/domains/nytimes.video.js
@@ -24,6 +24,7 @@ module.exports = {
     tests: [
         "http://www.nytimes.com/video/nyregion/100000003880254/a-complicated-love-story.html?playlistId=1194811622241",
         "http://www.nytimes.com/video/realestate/100000003852081/block-by-block-hoboken.html?playlistId=1194811622241",
-        "http://www.nytimes.com/video/world/middleeast/100000004055530/turkey-footage-shows-plane-blast.html"
+        "http://www.nytimes.com/video/world/middleeast/100000004055530/turkey-footage-shows-plane-blast.html",
+        "http://www.nytimes.com/video/us/100000004255656/the-terminator-and-the-washing-machine.html?smid=tw-share"
     ]
 };
\ No newline at end of file
diff --git a/plugins/links/promo/twitter-youtube.js b/plugins/links/promo/twitter-youtube.js
index f54b91922..a778d1a48 100644
--- a/plugins/links/promo/twitter-youtube.js
+++ b/plugins/links/promo/twitter-youtube.js
@@ -13,11 +13,11 @@ module.exports = {
             return;
         }
 
-        var urlMatch = video_src.match(/^https?:\/\/www\.youtube\.com\/v\/([\-_a-zA-Z0-9]+)/i)
-                    || video_src.match(/^https?:\/\/www\.youtube-nocookie\.com\/v\/([\-_a-zA-Z0-9]+)/i)
-                    || video_src.match(/^https?:\/\/www\.youtube-nocookie\.com\/embed\/([\-_a-zA-Z0-9]+)/i)
-                    || video_src.match(/^https?:\/\/www\.youtube\.com\/embed\/([\-_a-zA-Z0-9]+)/i)
-                    || video_src.match(/^https?:\/\/youtube\.googleapis\.com\/v\/([\-_a-zA-Z0-9]+)/i) //youtube.googleapis.com/v/k3Cd2lvQlN4?rel=0
+        var urlMatch = video_src.match(/https?:\/\/www\.youtube\.com\/v\/([\-_a-zA-Z0-9]+)/i)
+                    || video_src.match(/https?:\/\/www\.youtube-nocookie\.com\/v\/([\-_a-zA-Z0-9]+)/i)
+                    || video_src.match(/https?:\/\/www\.youtube-nocookie\.com\/embed\/([\-_a-zA-Z0-9]+)/i)
+                    || video_src.match(/https?:\/\/www\.youtube\.com\/embed\/([\-_a-zA-Z0-9]+)/i)
+                    || video_src.match(/https?:\/\/youtube\.googleapis\.com\/v\/([\-_a-zA-Z0-9]+)/i) //youtube.googleapis.com/v/k3Cd2lvQlN4?rel=0
                     || video_src.match(/https?:\/\/www.youtube\.com\/watch\?v=([\-_a-zA-Z0-9]+)/i)
                     || video_src.match(/https?:\/\/youtu\.be\/([\-_a-zA-Z0-9]+)/i);
 
diff --git a/plugins/meta/embedurl-meta.js b/plugins/meta/embedurl-meta.js
index d22e196e3..ec0830006 100644
--- a/plugins/meta/embedurl-meta.js
+++ b/plugins/meta/embedurl-meta.js
@@ -1,10 +1,15 @@
 module.exports = {
 
+	lowestPriority: true,
+
     getMeta: function(schemaVideoObject) {
 
         return {
             duration: schemaVideoObject.duration,
-            date: schemaVideoObject.uploadDate
+            date: schemaVideoObject.uploadDate || schemaVideoObject.datePublished || schemaVideoObject.dateCreated,
+            // title and description are useful e.g. for Yahoo! Screen
+            title: schemaVideoObject.name,
+            description: schemaVideoObject.description
         };
     }
 };
\ No newline at end of file
diff --git a/plugins/meta/media-detector.js b/plugins/meta/media-detector.js
index bca43b6ae..d42b4ee96 100644
--- a/plugins/meta/media-detector.js
+++ b/plugins/meta/media-detector.js
@@ -12,18 +12,21 @@ module.exports = {
 
                 has_player = true;
             }
+            
+        } else {
+            if (meta.video_src || meta.video_type) {
+                has_player = true;
+            }
+            if (meta.medium === 'video') {
+                has_player = true;
+            }
         }
+
         if (meta.twitter) {
             if (meta.twitter.player || meta.twitter.stream) {
                 has_player = true;
             }
         }
-        if (meta.video_src || meta.video_type) {
-            has_player = true;
-        }
-        if (meta.medium === 'video') {
-            has_player = true;
-        }
 
         if (has_player) {
             return {

From 98a20c9286005c54affc2e3b94136b2eea72d263 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Mon, 11 Apr 2016 13:12:35 -0400
Subject: [PATCH 192/320] [core] return code 415 for unsupported MIME types

---
 lib/plugins/system/htmlparser/htmlparser.js | 24 +++++++++++----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/lib/plugins/system/htmlparser/htmlparser.js b/lib/plugins/system/htmlparser/htmlparser.js
index 2a542f4d2..db043277a 100644
--- a/lib/plugins/system/htmlparser/htmlparser.js
+++ b/lib/plugins/system/htmlparser/htmlparser.js
@@ -73,23 +73,25 @@ module.exports = {
             });
     },
 
-    getLink: function(url, __nonHtmlContentData) {
+    getLink: function(url, __nonHtmlContentData, cb) {
         var nonHtmlContentType = __nonHtmlContentData.type;
         var nonHtmlContentLength = __nonHtmlContentData.content_length;
 
         // HEADS UP: do not ever remove the below check for 'javascript' or 'flash' in content type
         // if left allowed, it'll make apps vulnerable for XSS attacks as such files will be rendered as regular embeds
-        if (nonHtmlContentType.indexOf('javascript') !== -1 || nonHtmlContentType.indexOf('flash') !== -1) {
-            return;
+        if (/javascript|flash|application\/json|text\/xml|application\/xml/i.test(nonHtmlContentType)) {
+            return cb({
+                responseStatusCode: 415
+            });
+        } else {
+            return cb(null, {
+                href: url,
+                type: nonHtmlContentType,
+                content_length: parseInt(nonHtmlContentLength, 10),
+                rel: CONFIG.R.file
+                // client-side iframely.js will also properly render video/mp4 and image files this way
+            });
         }
-
-        return {
-            href: url,
-            type: nonHtmlContentType,
-            content_length: parseInt(nonHtmlContentLength, 10),
-            rel: CONFIG.R.file
-            // client-side iframely.js will also properly render video/mp4 and image files this way
-        };
     }
 
 };
\ No newline at end of file

From d3ef5c9799cb56de37de432c6967d8c294d11c20 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Tue, 12 Apr 2016 11:33:04 -0400
Subject: [PATCH 193/320] [brightcove] ease in-page requirements

---
 plugins/links/promo/brightcove-in-page-promo.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugins/links/promo/brightcove-in-page-promo.js b/plugins/links/promo/brightcove-in-page-promo.js
index cf568f1d6..31299d125 100644
--- a/plugins/links/promo/brightcove-in-page-promo.js
+++ b/plugins/links/promo/brightcove-in-page-promo.js
@@ -22,22 +22,21 @@ module.exports = {
                     <script src="//players.brightcove.net/1125911414/VJ949r8Fg_default/index.min.js"></script>
         */
 
-        var $video = cheerio('video.video-js[id*="video-js-"]');
+        var $video = cheerio('video.video-js');
 
         if ($video.length == 1) {
 
             var embed = $video.attr('data-embed');
-            var id = $video.attr('id');
             var account = $video.attr('data-account');
             var player = $video.attr('data-player');
             var video_id = $video.attr('data-video-id');
 
             // Let's validate
-            if (!embed || !id || !account || !player || !video_id) {
+            if (!embed || !account || !player || !video_id) {
                 return;
             } 
 
-            if (embed !== 'default' || id.indexOf(video_id) ==-1 || !/^\d+$/.test(account) || !/^\d+$/.test(video_id)) {
+            if (embed !== 'default' || !/^\d+$/.test(account) || !/^\d+$/.test(video_id)) {
                 return;
             }
 
@@ -50,6 +49,7 @@ module.exports = {
     /**
     * http://www.hollywoodreporter.com/video/vin-diesel-voicing-groot-guardians-615140
     * http://www.billboard.com/articles/columns/rock/6605231/eddie-van-halen-addiction-david-lee-roth-touring?mobile_redirection=false
+    * http://www.mirror.co.uk/3am/celebrity-news/stephen-fry-blasted-dangerous-views-7733815
     */
 
 };
\ No newline at end of file

From 69aa030f5941eedb6f16d60ac69c30fce626473a Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Tue, 12 Apr 2016 11:33:47 -0400
Subject: [PATCH 194/320] [domains] add Atlas charts

---
 plugins/domains/theatlas.com/theatlas.com.ejs |  1 +
 plugins/domains/theatlas.com/theatlas.com.js  | 49 +++++++++++++++++++
 2 files changed, 50 insertions(+)
 create mode 100644 plugins/domains/theatlas.com/theatlas.com.ejs
 create mode 100644 plugins/domains/theatlas.com/theatlas.com.js

diff --git a/plugins/domains/theatlas.com/theatlas.com.ejs b/plugins/domains/theatlas.com/theatlas.com.ejs
new file mode 100644
index 000000000..2b628d687
--- /dev/null
+++ b/plugins/domains/theatlas.com/theatlas.com.ejs
@@ -0,0 +1 @@
+<div class='atlas-chart' data-id='<%= id %>' data-width='<%= width %>' data-height='height'><img src='<%= thumbnail %>' style='max-width: 100%;'></div><script src='https://www.theatlas.com/javascripts/atlas.js'></script>
\ No newline at end of file
diff --git a/plugins/domains/theatlas.com/theatlas.com.js b/plugins/domains/theatlas.com/theatlas.com.js
new file mode 100644
index 000000000..00dccd2c3
--- /dev/null
+++ b/plugins/domains/theatlas.com/theatlas.com.js
@@ -0,0 +1,49 @@
+var utils = require('../../../lib/utils');
+
+module.exports = {
+
+    re: [
+        /^https?:\/\/www\.theatlas\.com\/charts\/([a-zA-Z0-9]+)/i              
+    ],    
+
+    mixins: ["*"],
+
+    getLink: function(urlMatch, twitter, options, cb) {
+
+        if (twitter.image) {
+            var links = [];
+
+            var thumbnail = twitter.image.value || twitter.image;
+
+            utils.getImageMetadata(thumbnail, options, function(error, data) {
+
+                if (error || data.error) {
+
+                    console.log ('Error getting thumbnail for Atlas: ' + error);
+
+                } else if (data.width && data.height) {
+
+                    links.push({
+                        template_context: {
+                            id: urlMatch[1],
+                            width: data.width,
+                            height: data.height,
+                            thumbnail: thumbnail
+                        },
+                        type: CONFIG.T.text_html, 
+                        rel: [CONFIG.R.app, CONFIG.R.html5, CONFIG.R.ssl, CONFIG.R.inline],
+                        'aspect-ratio': data.width / data.height
+                    });
+
+                }
+
+                cb(null, links);
+
+            });
+        }
+    },
+
+    tests: [
+        "https://www.theatlas.com/charts/4kktBbXJZ"
+    ]
+};
\ No newline at end of file

From dd6726d1ab0d68189022329f5a607b33e501b34a Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Tue, 12 Apr 2016 13:14:36 -0400
Subject: [PATCH 195/320] [domains] add HuffPost elections pollster

---
 .../elections.huffingtonpost.com.js           | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 plugins/domains/huffingtonpost.com/elections.huffingtonpost.com.js

diff --git a/plugins/domains/huffingtonpost.com/elections.huffingtonpost.com.js b/plugins/domains/huffingtonpost.com/elections.huffingtonpost.com.js
new file mode 100644
index 000000000..2c1ffa3f2
--- /dev/null
+++ b/plugins/domains/huffingtonpost.com/elections.huffingtonpost.com.js
@@ -0,0 +1,29 @@
+var utils = require('../../../lib/utils');
+
+module.exports = {
+
+    re: [
+        /^https?:\/\/elections\.huffingtonpost\.com\/pollster\/embed\/([^\/\?]+)/i,
+        /^https?:\/\/elections\.huffingtonpost\.com\/pollster\/([^\/\?]+)/i
+    ],    
+
+    mixins: ["*"],
+
+    getLink: function(urlMatch) {
+
+        return {
+            href: '//elections.huffingtonpost.com/pollster/embed/' + urlMatch[1] + '#!estimate=official',
+            type: CONFIG.T.text_html,
+            rel: [CONFIG.R.app, CONFIG.R.html5],
+            height: 400
+        }
+
+    },
+
+    tests: [
+        "http://elections.huffingtonpost.com/pollster/2016-florida-presidential-republican-primary",
+        "http://elections.huffingtonpost.com/pollster/2016-national-gop-primary",
+        "http://elections.huffingtonpost.com/pollster/2016-general-election-trump-vs-clinton",
+        "http://elections.huffingtonpost.com/pollster/embed/donald-trump-favorable-rating"
+    ]
+};
\ No newline at end of file

From f827efd32698701287abead847176985f23d61a8 Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Tue, 12 Apr 2016 21:36:37 +0300
Subject: [PATCH 196/320] [media] add 'padding-bottom' for aspect-ratio links

---
 config.js                        | 3 ++-
 lib/html-utils.js                | 4 ++++
 plugins/domains/nytimes.video.js | 3 ++-
 plugins/domains/pbs.org.js       | 4 +++-
 static/js/iframely.js            | 4 ++++
 5 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/config.js b/config.js
index 1e8a57274..d1c2bacd0 100644
--- a/config.js
+++ b/config.js
@@ -78,7 +78,8 @@
             "height",
             "min-height",
             "max-height",
-            "aspect-ratio"
+            "aspect-ratio",
+            "padding-bottom"
         ],
 
         R: {
diff --git a/lib/html-utils.js b/lib/html-utils.js
index afd67c6a0..6de6e9b61 100644
--- a/lib/html-utils.js
+++ b/lib/html-utils.js
@@ -40,6 +40,10 @@
 
                 $container.css('padding-bottom', Math.round(10000 * 100 / media["aspect-ratio"]) / 10000 + '%');
 
+                if (media["padding-bottom"]) {
+                    $container.css('padding-top', media["padding-bottom"] + 'px');
+                }
+
             } else {
 
                 if (media.height) {
diff --git a/plugins/domains/nytimes.video.js b/plugins/domains/nytimes.video.js
index d36a65aa3..3ba94c105 100644
--- a/plugins/domains/nytimes.video.js
+++ b/plugins/domains/nytimes.video.js
@@ -16,7 +16,8 @@ module.exports = {
                 href: "//graphics8.nytimes.com/video/players/offsite/index.html?videoId=" + urlMatch[1],                
                 type: CONFIG.T.text_html,
                 rel: [CONFIG.R.player, CONFIG.R.html5],
-                "aspect-ratio": 1.45 // seems to work well on diff widths                
+                "aspect-ratio": 16/9,
+                "padding-bottom": 71 + 1
             }
         }
     },
diff --git a/plugins/domains/pbs.org.js b/plugins/domains/pbs.org.js
index aaff798f2..1f633ab57 100644
--- a/plugins/domains/pbs.org.js
+++ b/plugins/domains/pbs.org.js
@@ -18,7 +18,9 @@ module.exports = {
             href: "http://player.pbs.org/viralplayer/"+ urlMatch[1],        
             type: CONFIG.T.text_html,
             rel: [CONFIG.R.player, CONFIG.R.html5],
-            "aspect-ratio": 512/376
+            "aspect-ratio": 16/9,
+            "padding-bottom": 50 + 26 + 12 + 30 + 1,
+            "max-width": 953
         };
     },
 
diff --git a/static/js/iframely.js b/static/js/iframely.js
index bb0e9f17e..be61d5cac 100644
--- a/static/js/iframely.js
+++ b/static/js/iframely.js
@@ -240,6 +240,10 @@
 
                 $container.css('padding-bottom', Math.round(1000 * 100 / media["aspect-ratio"]) / 1000 + '%');
 
+                if (media["padding-bottom"]) {
+                    $container.css('padding-top', media["padding-bottom"] + 'px');
+                }
+
             } else {
 
                 if (media.height) {

From b1f2887640df6423aa78b33b5900ac925263c5d5 Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Tue, 12 Apr 2016 22:03:57 +0300
Subject: [PATCH 197/320] [domains] slideshare.net: add padding-bottom media

---
 plugins/domains/slideshare.net.js | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/plugins/domains/slideshare.net.js b/plugins/domains/slideshare.net.js
index 249e73260..b52b1d52b 100644
--- a/plugins/domains/slideshare.net.js
+++ b/plugins/domains/slideshare.net.js
@@ -30,12 +30,6 @@ module.exports = {
         if (oembed.slide_image_baseurl && oembed.slide_image_baseurl_suffix) {
             var links = [];
 
-            var aspect = oembed.width / oembed.height;
-            // It is actually hardcoded to 4:3 + 38px for nav bar :(
-            // So we'll try to optimize it for option.maxwidth || 600px
-            // For this, we'll get the aspect of the first slide - we need it anyway
-
-
             var firstSlide = (/^\/\//.test(oembed.slide_image_baseurl) ? 'http:' : '') + oembed.slide_image_baseurl + '1' + oembed.slide_image_baseurl_suffix;
 
             utils.getImageMetadata(firstSlide, options, function(error, data) {
@@ -53,10 +47,6 @@ module.exports = {
                         width: data.width,
                         height: data.height
                     });
-
-                    var width = options.maxWidth || options.getProviderOptions('slideshare.width', 600);
-                    aspect = width / (width / (data.width / data.height) + 38);
-
                 }
 
                 var $container = $('<div>');
@@ -71,7 +61,8 @@ module.exports = {
                         href: $iframe.attr('src').replace('http:', ''),
                         type: CONFIG.T.text_html,
                         rel: [CONFIG.R.player, CONFIG.R.html5],
-                        "aspect-ratio": aspect
+                        "aspect-ratio": data.width / data.height,
+                        "padding-bottom": 38
                     });
                 }
 

From a813112e518f8a8b791533de0f9ea739bc271bd8 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Tue, 12 Apr 2016 15:59:08 -0400
Subject: [PATCH 198/320] fix padding-bottom for nbc news

---
 plugins/domains/nbcnews.com.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/domains/nbcnews.com.js b/plugins/domains/nbcnews.com.js
index 5ba7b619e..3653b97fc 100644
--- a/plugins/domains/nbcnews.com.js
+++ b/plugins/domains/nbcnews.com.js
@@ -23,7 +23,8 @@ module.exports = {
                 href: schemaVideoObject.embedURL || schemaVideoObject.embedUrl,
                 rel: [CONFIG.R.player, CONFIG.R.html5],
                 type: CONFIG.T.text_html, 
-                "aspect-ratio": 4/3 // Fixes it for NBC news
+                "aspect-ratio": 16/9,
+                'padding-bottom': 65 //ignore branding overlay of 50px- it gets removed on playback
             };
         }
     },

From fe3ae20fa1305c7fd6e31bfad50f9e653018d4a6 Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Tue, 12 Apr 2016 23:23:43 +0300
Subject: [PATCH 199/320] [domains] slideshare.net: better aspect-ration
 fallback

---
 plugins/domains/slideshare.net.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/domains/slideshare.net.js b/plugins/domains/slideshare.net.js
index b52b1d52b..8ca4418c0 100644
--- a/plugins/domains/slideshare.net.js
+++ b/plugins/domains/slideshare.net.js
@@ -61,7 +61,7 @@ module.exports = {
                         href: $iframe.attr('src').replace('http:', ''),
                         type: CONFIG.T.text_html,
                         rel: [CONFIG.R.player, CONFIG.R.html5],
-                        "aspect-ratio": data.width / data.height,
+                        "aspect-ratio": (data.width && data.height) ? data.width / data.height : oembed.width / oembed.height,
                         "padding-bottom": 38
                     });
                 }

From 76e0c21eee32950f8750d27b0610ee743a95cb76 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Wed, 13 Apr 2016 08:17:47 -0400
Subject: [PATCH 200/320] [domains] fix Metacafe

---
 plugins/domains/c-span.org.js   |  2 +-
 plugins/domains/metacafe.com.js | 22 +++++++++-------------
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/plugins/domains/c-span.org.js b/plugins/domains/c-span.org.js
index 35a8c5234..7168358e8 100644
--- a/plugins/domains/c-span.org.js
+++ b/plugins/domains/c-span.org.js
@@ -6,7 +6,7 @@ module.exports = {
         "*"
     ],
 
-    getLink: function(urlMatch, cheerio) {
+    getLink: function(urlMatch) {
 
         return {
             href: "http://www.c-span.org/video/standalone/?" + urlMatch[1] + urlMatch[2],
diff --git a/plugins/domains/metacafe.com.js b/plugins/domains/metacafe.com.js
index ca9de8f51..840f3aaea 100644
--- a/plugins/domains/metacafe.com.js
+++ b/plugins/domains/metacafe.com.js
@@ -11,27 +11,23 @@ module.exports = {
         "og-site",
         "og-title",
         "og-description",
-        "author",
-        "og-image"
+        "author"
     ],
 
-    getMeta: function(meta) {
+    getLink: function(og, urlMatch) {
 
-        return {
-            duration: meta.video.duration
-        }
-    },
-
-    getLink: function(urlMatch) {
-
-        return {
+        return [{
             href: "http://www.metacafe.com/embed/" + urlMatch[1] + "/",
-            rel: CONFIG.R.player,
+            rel: [CONFIG.R.player, CONFIG.R.autoplay],
             type: CONFIG.T.text_html,
             "aspect-ratio": 440 / 280 // There is also 
                                     // meta.video_width / meta.video_height, 
                                     // but that ratio would actually be worse than the one from embed code
-        }
+        }, {
+            href: ((og.image && og.image.url) || '').replace(/\/preview_240p_%07d\.mp4\.jpg$/, '\/preview.jpg'),
+            rel: CONFIG.R.thumbnail,
+            type: CONFIG.R.image
+        }]
     },
 
     tests: [{

From 8009d380070fa1e343afa8cb089372ce45ee390d Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Wed, 13 Apr 2016 16:24:35 +0300
Subject: [PATCH 201/320] [meta] detect unsupported encoding

---
 lib/plugins/system/meta/meta.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/plugins/system/meta/meta.js b/lib/plugins/system/meta/meta.js
index 572cd0041..fb2364f6f 100644
--- a/lib/plugins/system/meta/meta.js
+++ b/lib/plugins/system/meta/meta.js
@@ -1,5 +1,7 @@
 var HTMLMetaHandler = require('./HTMLMetaHandler');
 var cache = require('../../../cache');
+var sysUtils = require('../../../../logging');
+var iconv = require('iconv-lite');
 
 module.exports = {
 
@@ -19,7 +21,8 @@ module.exports = {
                 // Add ISO-2022-JP encoding #60
                 // https://github.com/ashtuchkin/iconv-lite/issues/60
 
-                if (meta.charset.match(/^ISO2022/gi)) {
+                if (!iconv.encodingExists(meta.charset)) {
+                    sysUtils.log('   -- Unsupported encoding: ' + meta.charset + ' in ' + url);
                     return cb({
                         responseStatusCode: 415
                     });

From c99055ff6c16c562bc82247077ee0c43ae341bd0 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Wed, 13 Apr 2016 10:04:57 -0400
Subject: [PATCH 202/320] [domains] fix inconsistencies for TODAY.com

---
 plugins/domains/today.com.js | 43 ++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 plugins/domains/today.com.js

diff --git a/plugins/domains/today.com.js b/plugins/domains/today.com.js
new file mode 100644
index 000000000..693d36af7
--- /dev/null
+++ b/plugins/domains/today.com.js
@@ -0,0 +1,43 @@
+// Have to skip Today's oEmbed as it doesn't seem reliable at the moment: 
+// The first for specific URL to oEmbed returns seemingly random video
+// Plus - videos randomly autoplay. And padding.
+
+module.exports = {
+
+    re: [
+        /^https?:\/\/www\.today\.com\/video\/([^\/\?]+\d+)/i,
+        /^https?:\/\/www\.today\.com\/video\/(today\/\d+)/i
+    ],
+
+    mixins: [
+        "og-image",
+        "favicon",
+        "canonical",
+        "dc",
+        "twitter-description",
+        "oembed-duration",
+        "keywords",
+        "og-site",
+        "twitter-title"
+    ],
+
+    getLink: function(urlMatch, oembed) {
+
+        // link to oEmbed here to make sure we do not match expired videos
+        // ex.: http://www.today.com/video/cast-of-school-of-rock-perform-youre-in-the-band-545729603874
+
+        return {
+            href: "http://www.today.com/offsite/" + urlMatch[1] + '?autoPlay=0',
+            rel: [CONFIG.R.player, CONFIG.R.html5],
+            type: CONFIG.T.text_html,
+            'aspect-ratio': 16/9,
+            'padding-bottom': 50,
+            'max-width': 1000
+        };
+    },
+
+    tests: [
+        "http://www.today.com/video/ted-cruz-explains-why-he-thinks-us-should-police-islamic-neighborhoods-650671171669"
+    ]
+
+};
\ No newline at end of file

From 6ab6f5096f93e443bf28c89547f0642b8eff2b38 Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Wed, 13 Apr 2016 17:52:56 +0300
Subject: [PATCH 203/320] [domains] ebaumsworld.com: fix re

---
 plugins/domains/ebaumsworld.com.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/domains/ebaumsworld.com.js b/plugins/domains/ebaumsworld.com.js
index 89d656b0c..e71fc1e47 100644
--- a/plugins/domains/ebaumsworld.com.js
+++ b/plugins/domains/ebaumsworld.com.js
@@ -1,7 +1,8 @@
 module.exports = {
 
     re: [
-        /^https?:\/\/www\.ebaumsworld\.com\/video\/watch\/(\d+)/i
+        /^https?:\/\/www\.ebaumsworld\.com\/video\/watch\/(\d+)/i,
+        /^https?:\/\/www\.ebaumsworld\.com\/videos\/[a-zA-Z0-9_-]+\/(\d+)/i
     ],
 
     mixins: ["*"],

From f29cf24c166eb60286656db34c33ab668a8894b0 Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Wed, 13 Apr 2016 17:52:56 +0300
Subject: [PATCH 204/320] [domains] ebaumsworld.com: fix re

---
 plugins/domains/ebaumsworld.com.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/domains/ebaumsworld.com.js b/plugins/domains/ebaumsworld.com.js
index 89d656b0c..e71fc1e47 100644
--- a/plugins/domains/ebaumsworld.com.js
+++ b/plugins/domains/ebaumsworld.com.js
@@ -1,7 +1,8 @@
 module.exports = {
 
     re: [
-        /^https?:\/\/www\.ebaumsworld\.com\/video\/watch\/(\d+)/i
+        /^https?:\/\/www\.ebaumsworld\.com\/video\/watch\/(\d+)/i,
+        /^https?:\/\/www\.ebaumsworld\.com\/videos\/[a-zA-Z0-9_-]+\/(\d+)/i
     ],
 
     mixins: ["*"],

From 6ca0d2d456495b441d28dc8d05650c562839ca38 Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Wed, 13 Apr 2016 16:24:35 +0300
Subject: [PATCH 205/320] [meta] detect unsupported encoding

---
 lib/plugins/system/meta/meta.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/plugins/system/meta/meta.js b/lib/plugins/system/meta/meta.js
index 572cd0041..fb2364f6f 100644
--- a/lib/plugins/system/meta/meta.js
+++ b/lib/plugins/system/meta/meta.js
@@ -1,5 +1,7 @@
 var HTMLMetaHandler = require('./HTMLMetaHandler');
 var cache = require('../../../cache');
+var sysUtils = require('../../../../logging');
+var iconv = require('iconv-lite');
 
 module.exports = {
 
@@ -19,7 +21,8 @@ module.exports = {
                 // Add ISO-2022-JP encoding #60
                 // https://github.com/ashtuchkin/iconv-lite/issues/60
 
-                if (meta.charset.match(/^ISO2022/gi)) {
+                if (!iconv.encodingExists(meta.charset)) {
+                    sysUtils.log('   -- Unsupported encoding: ' + meta.charset + ' in ' + url);
                     return cb({
                         responseStatusCode: 415
                     });

From 47ff0ace700b18e90b43a8db981aeaff5abd7b69 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Wed, 13 Apr 2016 11:35:37 -0400
Subject: [PATCH 206/320] what's new for v 0.9.4

---
 WHATSNEW.md | 129 ++++------------------------------------------------
 1 file changed, 8 insertions(+), 121 deletions(-)

diff --git a/WHATSNEW.md b/WHATSNEW.md
index 74fc5cc22..b26a49e61 100644
--- a/WHATSNEW.md
+++ b/WHATSNEW.md
@@ -4,6 +4,14 @@ This is the history of the Iframely changes. Updates that are older than one yea
 
 Stay tuned, either by watching [Iframely on GitHub](https://github.com/itteco/iframely) or following [Iframely on Twitter](https://twitter.com/iframely).
 
+### 2016.04.13, Version 0.9.4
+
+ - Better responsive embeds for players with fixed bottom padding: Slideshare, NBC news, TODAY.com, NY Times
+ - Added support for Deezer, vbox7.com, Libération.fr, hosted CloudApps, Knightlab's juxtapose and timeline.js, NBA, Atlas charts, HuffPost elections pollster
+ - Better support for Brightcove's newer HTML5 players
+ - Minor fixes for number of other domain parsers
+
+
 ### 2016.02.18, Version 0.9.3
 
  - Fix errors for Facebook videos where origin pages return sparadic HTTP code 500 ([#106](https://github.com/itteco/iframely/issues/106))
@@ -146,124 +154,3 @@ Starting from this version, the minimal Node.js version required for Iframely is
 - Medium stories will now have JS embeds too
 - Fix issues with caching of JSONP requests
 - Number of fixes in various other plugins
-
-
-### 2014.12.30, Version 0.7.2
-
-Happy 2015! Iframely domains whitelist is now free and is delivered to every server instance. Over 1600 domains at the moment!
-
-Other changes in this version:
-
- - New `gifv` rel for players. Following Imgur's footsteps, it is to indicate MP4 videos that represent gifs and need to be shown as looping video. 
- - New `promo` rel, to indicate that embed is attached to the URL. For example, YouTube's used by domains in Twitter cards and Open Graph videos will now be returned with a lot more options and with rel `promo`. 
- - The same `promo` approach covers all Brightcove's players used on the domains. 
- - Gfycat is a new embeds provider (with `gifv` player)
- - HBR.org, tudou.com, forgifs.com, Google Drive - also added as new providers
- - As whitelist is available to everyone now, we removed some of domains that are covered all right by generic parsers
- - Whitelist now works for hosted oEmbed domains too. It looks at oEmbed discovery and if no domain record found, adds one by API domain. It coveres, for example, all custom domains of SmugMug, WordPress and Behance.
- - Number of domains have been cleaned up. Pinterest boards, for one. 
-
- Cheerio library has been updated to a newer version. Please, `npm update`.
-
-
- Happy 2015 again! And thanks for all your support in 2014!
-
-
-
-### 2014.11.21, Version 0.7.1
-
-This version contains mostly the cleanup of the domains plugins. Some of the most significant improvements are these:
-
- - Proper handling of Imgur gifs that they changed recently
- - Gallery embed for Flickr user profile pages
- - Vine plugin uses newly introduced oEmbed endpoint. Processing time is now down to 50-70ms
- - Google Plus posts with vanity URLs are finally supported
- - Google Docs support
- - Handle Tumblr's new 12-digit post IDs
- - New or improved embed codes for C-Span, Reuters, Comedy Central, Rap Genius, Giphy, Real player cloud
-
-The package dependencies updated some libraries. Please, run `npm update` to use newer verisons.
-
-In the other news, we published [oEmbed API](http://oembedapi.com) for the use in open-source projects. Take a look.
-
-
-
-### 2014.10.15, Version 0.7.0
-
-**API Params.**
-
-This release introduces filtering parameters both in [oEmbed API](https://iframely.com/docs/oembed-api) and [Iframely API](https://iframely.com/docs/iframely-api) formats. 
-
-The optional parameters in API calls are:
-
-- `autoplay=true` or `1` - will give preference to `autoplay` media and will try to return it as primary `html`. Check for `autoplay` in primary `rel` to verify.
- - `ssl=true` or `1` - will return only embeds that can be used under HTTPs without active SSL mixed-content warnings (images and mp4 videos trigger only passive warnings and thus will be passed)
- - `html5=true` or `1`- will return only embeds that can be viewed on mobile devices or desktops without Flash plugin installed
- - `maxwidth=` in pixels will return only embeds that do not exceed the desired width
-
-**API Format changes** 
-
-The [Iframely API](https://iframely.com/docs/iframely-api) response has number of improvements.
-
-- We added a root level `html` and `rel` fields that include embed data from most appropriate link according to your filtering params. 
-- For each embed link, we also added a field `html` with the generated HTML code to simplify server-server integrations (so that [iframely.js](https://iframely.com/docs/iframelyjs) isn’t required). This does not include image MIME type.
--  Supplementary rel `ssl` is now included for all links that are SSL-proof. 
-
-These changes should be backwards-compatible. Report any compatibility issues you encounter on [GitHub](https://github.com/itteco/iframely).
-
-**Other improvements**
-
-- As usual, number of domain maintenance, including autoplay variants for YouTube, Vimeo, SoundCloud and Wistia
-- Facebook posts and Pinterest embeds can now be adjusted based on your `max-width` value
-- Added some domains, such as IMDB, Break.com, Zing.vn, Stitcher podcasts, Prostopleer
-- PDF documents embeds via Google Docs Viewer
-- Embed codes for Flash now go with `<embed>` html. To make this accurate, Flash and text/html links are double-checked for MIME-type. This involves additional HTTP request for the URL parsers and adds a little time to processing. 
-
-
-
-### 2014.08.14, Version 0.6.6 
-
-Maintenance version with number of small fixes and improvements in domain parsers and better parser for pages with several Open Graph videos.
-
-
-### 2014.07.08, Version 0.6.5
-
-Domains added:
-
- + podbean.com
- + slide.ly
- + clip.vn
- + squareup.com
- + quizlet.com
- + video.nationalgeographic.com
- + channel9.msdn.com/Events
- + c-span.org
- + indiegogo.com
- + rapgenius.com
- + vgtv.no
- + sverigesradio.se
- + medium.com
- + mixlr.com
- + twitch.tv
- + arte.tv
-
-
-Domains maintenance:
-
- * Fixed 9gag.com to find nice source image - big image or animated gif
- * Fixed pinterest.com to prevent working on non-content urls
- * Fixed thumbnail for speakerdeck.com
- * Added video embed for smugmug.com
- + Added html5 tag to text/html players domains that support it
-
-
-General improvements:
-
- + Added smart cache invalidation for iframely data per domain and plugin. Now plugin results cache will be invalidated after plugin file update or whitelist domain record update.
- * Better support for open graph arrays
- * Added support of grouped links in iframely.js
- * Improved serverside oembed html attribute generation
- + Added meta plugin to detect page media (e.g. 'player', 'reader')
- * Fix detecting correct charset when response headers charset not equals to html meta tag charset. Response header has priority now.
- + Updated iconv-lite to support more encodings. Please, run `npm update`.
- + Return 403 for non indexing content, according to [How to block Iframely API](http://iframely.com/docs/block-iframely).

From 23cb562dc32a78b4208ba83d9be0a4498fbfef2e Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Wed, 13 Apr 2016 18:40:39 +0300
Subject: [PATCH 207/320] update version to 0.9.4

---
 package.json          | 2 +-
 static/js/iframely.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index b81ba32f4..707ef992d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "iframely",
-    "version": "0.9.3",
+    "version": "0.9.4",
     
     "description": "oEmbed/2 gateway endpoint. Get embed data for various http links through one self-hosted API",
     "keywords": ["oembed", "embed", "open graph", "og", "twitter cards"],
diff --git a/static/js/iframely.js b/static/js/iframely.js
index be61d5cac..e6fa5dfcf 100644
--- a/static/js/iframely.js
+++ b/static/js/iframely.js
@@ -4,7 +4,7 @@
 
      Iframely consumer client lib.
 
-     Version 0.9.2
+     Version 0.9.4
 
      Fetches and renders iframely oebmed/2 widgets.
 

From 90b9b3764dbede85cf25b088254d6b9a2782712d Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Wed, 13 Apr 2016 17:59:17 -0400
Subject: [PATCH 208/320] [domains] cinesport have fixed their autoplay

---
 plugins/domains/cinesport.video.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/domains/cinesport.video.js b/plugins/domains/cinesport.video.js
index 44dfc084a..005641cd0 100644
--- a/plugins/domains/cinesport.video.js
+++ b/plugins/domains/cinesport.video.js
@@ -35,7 +35,7 @@ module.exports = {
             return {
                 href: href,
                 type: CONFIG.T.text_html,
-                rel: [CONFIG.R.player, CONFIG.R.autoplay, CONFIG.R.html5],
+                rel: [CONFIG.R.player, CONFIG.R.html5],
                 "aspect-ratio": 1 /  0.5725
             };
         }

From 59ffcb829bc24ab90013f0b709b4473503b5251b Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Fri, 15 Apr 2016 11:03:25 -0400
Subject: [PATCH 209/320] [domains] add RTL XL

---
 lib/plugins/system/oembed/providers.json | 9 ++++++++-
 plugins/domains/beatport.com.js          | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/lib/plugins/system/oembed/providers.json b/lib/plugins/system/oembed/providers.json
index 69990f49c..2a83c8511 100644
--- a/lib/plugins/system/oembed/providers.json
+++ b/lib/plugins/system/oembed/providers.json
@@ -436,7 +436,7 @@
     {
         "name": "cartodb.com",
         "templates": [
-            "\\w+.cartodb.com/(?:u\/[a-zA-Z0-9-]+/)?viz/[a-z0-9-]+"
+            "\\w+.cartodb\\.com/(?:u\/[a-zA-Z0-9-]+/)?viz/[a-z0-9-]+"
         ],
         "endpoint": "http://services.cartodb.com/oembed"
     },
@@ -475,5 +475,12 @@
             "(\\w+)\\.ac\\-bordeaux\\.fr/mediacad/(m/\\d+)"            
         ],
         "endpoint": "http://{1}.ac-bordeaux.fr/mediacad/default/media/display/{2}/d/j?format={format}"
+    },
+    {
+        "name": "RTL XL",
+        "templates": [
+            "rtlxl\\.nl/#!/[^\/]+/([a-zA-Z0-9-]+)"
+        ],
+        "endpoint": "http://xlapi.rtl.nl/version=1/fun=oembed?url={1}"
     }
 ]
\ No newline at end of file
diff --git a/plugins/domains/beatport.com.js b/plugins/domains/beatport.com.js
index c1539643d..688ad903e 100644
--- a/plugins/domains/beatport.com.js
+++ b/plugins/domains/beatport.com.js
@@ -10,7 +10,7 @@ module.exports = {
 
     getLink: function(og, urlMatch) {
         return [{
-            href: "http://embed.beatport.com/player/?id=" + urlMatch[2] + "&type=" + urlMatch[1],
+            href: "//embed.beatport.com/player/?id=" + urlMatch[2] + "&type=" + urlMatch[1],
             type: CONFIG.T.text_html,
             rel: CONFIG.R.player,
             height: og.video && og.video.height || 162,

From ea08b039f4fe926719f84f2e4f28ecdee6b24a9e Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Sun, 17 Apr 2016 09:46:32 -0400
Subject: [PATCH 210/320] [domains] fix Instagram titles

---
 plugins/domains/instagram.com.js | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/plugins/domains/instagram.com.js b/plugins/domains/instagram.com.js
index d042a8427..0812e49b2 100644
--- a/plugins/domains/instagram.com.js
+++ b/plugins/domains/instagram.com.js
@@ -14,13 +14,11 @@ module.exports = {
         "favicon"
     ],
 
-    getMeta: function (og) {
-
-        var match = og.title.match(/[^:]+on\sInstagram/i);
-
+    getMeta: function (og, oembed) {
+        
         return {
-            title: match ? match[0] : "Post on Instagram",
-            description: og.description
+            title: og.title ? og.title.match(/([^•]+)/i)[0] : "Post on Instagram",
+            description: oembed.title
         }
 
     },

From 0b95c25b8da0ce3e52558828147f8891f0ac23c1 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Mon, 18 Apr 2016 07:54:01 -0400
Subject: [PATCH 211/320] [domains] fix Stitcher's episodes with custom image

---
 plugins/domains/stitcher.com.js | 48 ++++++++++++++++++++-------------
 1 file changed, 29 insertions(+), 19 deletions(-)

diff --git a/plugins/domains/stitcher.com.js b/plugins/domains/stitcher.com.js
index ab4314eb2..0e98b7d2e 100644
--- a/plugins/domains/stitcher.com.js
+++ b/plugins/domains/stitcher.com.js
@@ -1,38 +1,48 @@
+var $ = require('cheerio');
+
 module.exports = {
 
     // No regexps here. We'll let it fall back to generic parsers, if no podcast is detected.
 
+    provides: "__stitcherEpisode",
+
     mixins: [
-        "og-image",
-        "favicon",
-        "canonical",
-        "og-description",
-        "keywords",
-        "og-title"
+        "*"
     ],
 
-    getLinks: function(og) {
+    getLinks: function(__stitcherEpisode, cheerio) {
+
+        var $listenLater = cheerio('#listenLater[data-eid="'+ __stitcherEpisode +'"]');
+
+        if ($listenLater.length && $listenLater.attr('data-fid')) {
+            return {
+                href: "https://app.stitcher.com/splayer/f/" + $listenLater.attr('data-fid') + "/" + __stitcherEpisode,
+                type: CONFIG.T.text_html,
+                rel: [CONFIG.R.player, CONFIG.R.html5],
+                height: 220
+                //"aspect-ratio": 220 / 150
+            };
+        }
+    },
 
+    getData: function (og) {
         var episode = og.url && og.url.match(/^https?:\/\/www\.stitcher\.com\/s\?eid=(\d+)/i);
-        var station = og.image && (og.image.value || og.image).match(/_(\d+)\.jpg$/i);
 
-        if (!episode || !station) {
-            // so it falls back to generic parsers
+        if (!episode) {
             return;
+        } else {
+            return {
+                __stitcherEpisode: episode[1]
+            }
         }
-
-        return {
-            href: "https://app.stitcher.com/splayer/f/" + station[1] + "/" + episode[1] + "?refId=iframely",
-            type: CONFIG.T.text_html,
-            rel: [CONFIG.R.player, CONFIG.R.html5],
-            "aspect-ratio": 400 / 400
-        };
-    },
+    },    
 
     tests: [{
         noFeeds: true
     },
         "http://www.stitcher.com/s?eid=35290263",
-        "http://www.stitcher.com/podcast/nodeup/episode/35312671?refid=stpr&autoplay=true"
+        "http://www.stitcher.com/podcast/nodeup/episode/35312671?refid=stpr&autoplay=true",
+        "http://www.stitcher.com/podcast/twit/the-new-screen-savers/e/tnss-49-from-russia-with-code-43809567",
+        "https://www.stitcher.com/podcast/times-the-brief/times-top-stories/e/ireland-votes-to-legalize-gay-marriage-in-historic-referendum-38202217?autoplay=true"
     ]
 };
\ No newline at end of file

From 972e49ccaffe8d89583cb374df51ddaf5d7cf6cb Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Tue, 19 Apr 2016 16:34:36 +0300
Subject: [PATCH 212/320] [package.json] update 'request' version

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 707ef992d..9025a6ff8 100644
--- a/package.json
+++ b/package.json
@@ -22,7 +22,7 @@
         "jslint":       "0.8",
         "async":        "1.4.2",
         "underscore":   "1.8.3",
-        "request":      "2.57.x",
+        "request":      "2.72.x",
         "express":      "3.2.4",
         "send":         "0.1.0",
         "connect":      "2.7.9",

From 1de7c2f90524eb4479697abc7cf8db3482b5aa6c Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Tue, 19 Apr 2016 10:40:44 -0400
Subject: [PATCH 213/320] [domains] fix Bandcamp customization for albums in
 draft state

---
 plugins/domains/bandcamp.com.js | 67 ++++++++++++++++++++-------------
 1 file changed, 40 insertions(+), 27 deletions(-)

diff --git a/plugins/domains/bandcamp.com.js b/plugins/domains/bandcamp.com.js
index 076ac46b3..3cc6bd1b3 100644
--- a/plugins/domains/bandcamp.com.js
+++ b/plugins/domains/bandcamp.com.js
@@ -27,41 +27,53 @@ module.exports = {
         };
     },
 
-    getLinks: function(meta, twitter, options) {
+    getLinks: function(meta, options) {
 
-        if (twitter.site !== 'bandcamp' || !twitter.player.value) {
+        if (!/bandcamp/i.test(meta.twitter && meta.twitter.site || meta.generator)) {
             return;
         }
         
         var params = options.getProviderOptions('bandcamp');
-        var result = null;
-
-        if (!params && meta.og && meta.og.video) {
-
-            result = [{
-                href: meta.twitter.player.value,
-                type: CONFIG.T.text_html,
-                rel: [CONFIG.R.player, CONFIG.R.twitter, CONFIG.R.html5],
-                "aspect-ratio": 1, // it will just overlay the player nicely
-                "max-width": 700
-            }, {
-                href: meta.og.video.secure_url || meta.og.video.url,
-                type: meta.og.video.type || CONFIG.T.text_html,
-                rel: [CONFIG.R.player, CONFIG.R.og, CONFIG.R.html5],
-                "max-width": 700,
-                height: meta.og.video.height
-            }];
+        var result = [];
+
+        if (!params) {
+
+            if (meta.twitter && meta.twitter.player) {
+                result.push({
+                    href: meta.twitter.player.value,
+                    type: CONFIG.T.text_html,
+                    rel: [CONFIG.R.player, CONFIG.R.twitter, CONFIG.R.html5],
+                    "aspect-ratio": 1, // it will just overlay the player nicely
+                    "max-width": 700
+                });
+            }
+
+            if (meta.og && meta.og.video) {
+                result.push({
+                    href: meta.og.video.secure_url || meta.og.video.url,
+                    type: meta.og.video.type || CONFIG.T.text_html,
+                    rel: [CONFIG.R.player, CONFIG.R.og, CONFIG.R.html5],
+                    "max-width": 700,
+                    height: meta.og.video.height
+                });
+            }
 
         } else if (params) {
 
-            var album = /album=\d+/i.test(twitter.player.value) && twitter.player.value.match(/album=(\d+)/i)[1];
-            var track = /track=\d+/i.test(twitter.player.value) && twitter.player.value.match(/track=(\d+)/i)[1];
+            var player = (meta.twitter && meta.twitter.player && meta.twitter.player.value) ||
+                        (meta.og && meta.og.video && meta.og.video.url);
+
+            if (player) {
+
+                var album = /album=\d+/i.test(player) && player.match(/album=(\d+)/i)[1];
+                var track = /track=\d+/i.test(player) && player.match(/track=(\d+)/i)[1];
 
-            result = {
-                href: 'https://bandcamp.com/EmbeddedPlayer' + (album ? '/album=' + album : '') + (track ? '/track=' + track : '') + params.get_params, // (in /../../ way)
-                rel: [CONFIG.R.player, CONFIG.R.html5],
-                type: CONFIG.T.text_html,
-                media: album ? params.media.album : params.media.track
+                result.push ({
+                    href: 'https://bandcamp.com/EmbeddedPlayer' + (album ? '/album=' + album : '') + (track ? '/track=' + track : '') + params.get_params, // (in /../../ way)
+                    rel: [CONFIG.R.player, CONFIG.R.html5],
+                    type: CONFIG.T.text_html,
+                    media: album ? params.media.album : params.media.track
+                });
             }
 
         }
@@ -79,9 +91,10 @@ module.exports = {
         "http://yancyderon.com/album/the-difference-sp",
         "http://music.freddiejoachim.com/album/begonia",
         "http://radiojuicy.com/album/rio",
-        "http://hannibalkingmusic.com/album/flowers-for-pamela",
         "http://music.freddiejoachim.com/album/patiently",
         "https://decembersongs.bandcamp.com/",
+        "http://sonsofoflaherty.bandcamp.com/album/misc-songs",
+        "http://badsheeps.bandcamp.com/album/bad-sheeps", // doesn't have twitter player when not published
         {
             skipMixins: [
                 "og-description"

From 57ff2d75de0f6debfcc4a67039ebf3808ab4bb31 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Wed, 20 Apr 2016 09:32:54 -0400
Subject: [PATCH 214/320] [domains] support NPR.org sections

---
 .../{npr.org.js => npr.org/npr.player.js}     |  3 +-
 plugins/domains/npr.org/npr.sections.js       | 36 +++++++++++++++++++
 2 files changed, 38 insertions(+), 1 deletion(-)
 rename plugins/domains/{npr.org.js => npr.org/npr.player.js} (89%)
 create mode 100644 plugins/domains/npr.org/npr.sections.js

diff --git a/plugins/domains/npr.org.js b/plugins/domains/npr.org/npr.player.js
similarity index 89%
rename from plugins/domains/npr.org.js
rename to plugins/domains/npr.org/npr.player.js
index fae0a4921..393e76283 100644
--- a/plugins/domains/npr.org.js
+++ b/plugins/domains/npr.org/npr.player.js
@@ -12,7 +12,8 @@ module.exports = {
                 href: "http://www.npr.org/player/embed/" + urlMatch[1] + "/" + urlMatch[2],
                 type: CONFIG.T.text_html,
                 rel: [CONFIG.R.player, CONFIG.R.html5],
-                height: 290
+                height: 290,
+                'max-width': 800
             };
     },
 
diff --git a/plugins/domains/npr.org/npr.sections.js b/plugins/domains/npr.org/npr.sections.js
new file mode 100644
index 000000000..e27185e53
--- /dev/null
+++ b/plugins/domains/npr.org/npr.sections.js
@@ -0,0 +1,36 @@
+module.exports = {
+
+    re: [
+        /^https?:\/\/www\.npr\.org\/sections\//i
+    ],
+
+    mixins: ["*"],
+
+    getLink: function(cheerio) {
+
+        var $button = cheerio('button[data-embed-url*="npr.org/player/embed/"]');
+
+        if ($button.length) {
+            
+            var embedURL = $button.attr('data-embed-url');
+            var urlMatch = embedURL.match(/npr\.org\/player\/embed\/(\d+)\/(\d+)/i);
+            
+            if (urlMatch) {
+                return {
+                    href: "http://www.npr.org/player/embed/" + urlMatch[1] + "/" + urlMatch[2],
+                    type: CONFIG.T.text_html,
+                    rel: [CONFIG.R.player, CONFIG.R.html5, CONFIG.R.app], // `app` prevents it from being wrapped as promo card
+                    height: 290,
+                    'max-width': 800
+                };
+            }
+        }
+
+    },
+
+    tests: [
+        "http://www.npr.org/sections/thetwo-way/2016/04/11/473874785/hundreds-protest-gerrymandering-campaign-finance-laws-on-capitols-steps",
+        "http://www.npr.org/sections/alltechconsidered/2015/04/29/401236656/libraries-make-space-for-3-d-printers-rules-are-sure-to-follow",
+        "http://www.npr.org/sections/itsallpolitics/2015/08/27/434872755/exactly-what-kind-of-socialist-is-bernie-sanders"
+    ]
+};
\ No newline at end of file

From c727c49ebe5738037a76b9766cbf02aef2d26757 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Wed, 20 Apr 2016 09:37:38 -0400
Subject: [PATCH 215/320] [domains] handle direct links to NPR players

---
 plugins/domains/npr.org/npr.player.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/domains/npr.org/npr.player.js b/plugins/domains/npr.org/npr.player.js
index 393e76283..6c729d494 100644
--- a/plugins/domains/npr.org/npr.player.js
+++ b/plugins/domains/npr.org/npr.player.js
@@ -1,7 +1,8 @@
 module.exports = {
 
     re: [
-        /^https?:\/\/www\.npr\.org\/player\/v2\/mediaPlayer\.html\?(?:[^&]+&)*id=(\d+)&m=(\d+)/i
+        /^https?:\/\/www\.npr\.org\/player\/v2\/mediaPlayer\.html\?(?:[^&]+&)*id=(\d+)&m=(\d+)/i,
+        /^https?:\/\/www\.npr\.org\/player\/embed\/(\d+)\/(\d+)/i
     ],
 
     mixins: ["*"],
@@ -19,5 +20,6 @@ module.exports = {
 
     tests: [
         "http://www.npr.org/player/v2/mediaPlayer.html?action=1&t=1&islist=false&id=368714299&m=368931763",
+        "http://www.npr.org/player/embed/473953959/473993224"
     ]
 };
\ No newline at end of file

From af10e8f018133998f2f910e10fd41dffa65f4080 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Thu, 21 Apr 2016 13:49:15 -0400
Subject: [PATCH 216/320] [domains] bring CartoDB up-to-date

Resolves #117
---
 plugins/domains/cartodb.com.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/plugins/domains/cartodb.com.js b/plugins/domains/cartodb.com.js
index 236f0005f..6de72f3c3 100644
--- a/plugins/domains/cartodb.com.js
+++ b/plugins/domains/cartodb.com.js
@@ -9,8 +9,10 @@ module.exports = {
         // no thumbnail in oembed too
         "twitter-title",
         "twitter-image",
+        "og-image",
         "oembed-author",
         "oembed-site",
+        "keywords",
         "favicon"
     ],
 
@@ -45,6 +47,7 @@ module.exports = {
         "http://team.cartodb.com/u/andrew/viz/9ee7f88c-b530-11e4-8a2b-0e018d66dc29/public_map",
         "https://team.cartodb.com/u/andrew/viz/9ee7f88c-b530-11e4-8a2b-0e018d66dc29/embed_map",
         "https://smb2stfinitesubs1.cartodb.com/viz/39e625ee-cef3-11e4-b8bb-0e0c41326911/public_map",
-        "https://twittereurope.cartodb.com/u/kike-5/viz/456350ba-377e-11e5-8b42-0e853d047bba/public_map"
+        "https://twittereurope.cartodb.com/u/kike-5/viz/456350ba-377e-11e5-8b42-0e853d047bba/public_map",
+        "https://bloomberg.cartodb.com/u/eanders/viz/6913f4cc-bd05-11e4-a444-7054d21a95e5/public_map"
     ]
 };
\ No newline at end of file

From e43ddb0c578435ebcbb4ff408aeb5635d2ea7ad4 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Thu, 21 Apr 2016 14:05:56 -0400
Subject: [PATCH 217/320] [domains] add descr for CartoDB

resolves #117
---
 plugins/domains/cartodb.com.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/plugins/domains/cartodb.com.js b/plugins/domains/cartodb.com.js
index 6de72f3c3..848feecc2 100644
--- a/plugins/domains/cartodb.com.js
+++ b/plugins/domains/cartodb.com.js
@@ -16,9 +16,10 @@ module.exports = {
         "favicon"
     ],
 
-    getMeta: function(url) {
+    getMeta: function(url, meta) {
         return {
-            canonical: url.replace(/\/embed_map/, '/public_map')
+            canonical: url.replace(/\/embed_map/, '/public_map'),
+            description: meta.og && meta.og.description && (meta.og.description.split(' — ')[0])
         };
     },
 

From 126ed37011e57f7bec906bc63347118d4d5a51f2 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Tue, 26 Apr 2016 12:36:46 -0400
Subject: [PATCH 218/320] [docs] move params doc to the cloud

---
 docs/PARAMS.md    | 62 -----------------------------------------------
 docs/PROVIDERS.md |  2 +-
 2 files changed, 1 insertion(+), 63 deletions(-)
 delete mode 100644 docs/PARAMS.md

diff --git a/docs/PARAMS.md b/docs/PARAMS.md
deleted file mode 100644
index b41cdcf73..000000000
--- a/docs/PARAMS.md
+++ /dev/null
@@ -1,62 +0,0 @@
-# Optional API parameters
-
-
-You may configure API in [your API settings](https://iframely.com/settings). Plus send filters in your query-string for each API call individually. If not given with an API call, your defaults will be used. If you haven't set up your preferences, the cloud-wide settings will be used.
-
-For paid accounts, we can also customize what embeds you get for most individual publishers. See examples at the bottom.
-
-## For individual API calls
-
-
-All below parameters are optional. If not given, you will still receive all relevant information in `rel` attributes of [Iframely API](https://iframely.com/docs/iframely-api) (not in [oEmbed](https://iframely.com/docs/oembed-api) though).
-
-
- - `iframe=true` or `iframe=1` - activates [URL shortener](https://iframely.com/docs/url-shortener) and will return the hosted iframes or [summary cards](https://iframely.com/docs).
-
- - `lazy=1` will activate [lazy-loading](https://iframely.com/docs/lazy-load) when Iframely returns a [smart iFrame](https://iframely.com/docs/iframes).
-
- - `omit_script=1` will [exclude embed.js](https://iframely.com/docs/lazy-load#omit-script) from HTML code, if you load it yourself.
-
- - `autoplay=true` or `1` - will give preference to `autoplay` media and will try to return it as primary `html`. Check for `autoplay` in primary `rel` to verify.
-
- - `ssl=true` or `1` - will return only embeds that can be used under HTTPs without active SSL mixed-content warnings (images and mp4 videos trigger only passive warnings and thus will pass this check).
-
- - `html5=true` or `1`- will return only embeds that can be viewed on mobile devices or desktops without Flash plugin installed.
-
- - `media=true` or `1`- "prefer media-only". For some publishers, Iframely knows status-like `app` embeds AND simple media, such as photos or video. This option will make Iframely return actual media in the `html` field instead of branded embeds.  It affects, for example, Instagram, Tumblr, Imgur, Pinterest (for videos), etc.
-
- - `maxwidth=` in pixels will return only embeds that do not exceed this width. It affects the rare cases of fixed-width embeds as in most cases Iframely gives the responsive embed codes. However, this parameter is important for Facebook posts and Pinterest, as it is passed into embed code of those providers to adjust its width.
-
- - `origin=` - optional tag text value that will help you later search links in your dashboard. It represents the hashtag  E.g. project or chat room name, category, app, if you got several, etc.
-
- - `align=left` - for cloud version, will skip default center aligning of Twitter, Facebook, Instagram and other app embeds. 
-
- - `callback` - name of a JavaScript function, if you’d like response to be wrapped as JSONP.
-
-
-Also, for [oEmbed API](https://iframely.com/docs/oembed-api) only:
-
- - there's `format=xml` parameter - if you'd like to get your oEmbed as XML.
-
- - But no `autoplay` parameter. oEmbed never returns the media that autoplays. However, If you're wrapping embed codes with [smart iFrames](https://iframely.com/docs/iFrames) using API with `iframe=true`, the autoplay media will be returned with a [special card](https://iframely.com/docs/widgets).
-
-
-## For individual embeds publishers
-
-Number of publishers give different embedding options. By default, Iframely provides embeds that we believe is the best fit for most common use case. But you, of course, may need it differently.
-
-In that case, Iframely team can configure the exact embeds you like for your favourite publishers. Since it's a manual process, we offer it for paid accounts only. [Send us an email](mailto:support@iframely.com) and we'll start from there. Most adjustments take less than 30 mins to manually turn around.
-
-Examples of what people often request: 
-
- - Basic image or video instead of branded embeds for Flickr or Imgur, or Instagram, or Tumblr
- - Different player UI for YouTube and Vimeo
- - "Classic" player for SoundCloud
- - Twitter: center or not, include media or not, show parent message, etc.
- - Facebook: for videos, show entire status rather than just a video
- - Show user message for Instagram embeds
- - Giphy: disable branded GIF player and use Iframely's [friendly GIFs](/docs/gifs) instead
- - Turn on support of Twitter videos (experimental)
- - Bandcamp players
- - Etc.
-
diff --git a/docs/PROVIDERS.md b/docs/PROVIDERS.md
index c112a3f3a..fb3018dff 100644
--- a/docs/PROVIDERS.md
+++ b/docs/PROVIDERS.md
@@ -4,7 +4,7 @@ Iframely follows unique approach in determining which providers it supports. Con
 
 However, consider this:
 
- - Iframely supports over [1600 domains](https://iframely.com/domains) out of the box.
+ - Iframely supports over [1800 domains](https://iframely.com/domains) out of the box.
  - This doesn't include thousands of custom domains by hosters. For example, Tumblr, WordPress, BrightCove, Wistia and Behance.
  - Plus it doesn't include (quite a lot of) domains that opted to use YouTube and Vimeo as their Twitter card or Open Graph representation.
  - Even the list of 1600+ is not set in stone due to our whitelisting approach. As we do our every-day QA cycle, some domains get added and some get removed.

From db5e5379f4ef5ff98797ef50ad15a276b22646c7 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Tue, 26 Apr 2016 12:37:22 -0400
Subject: [PATCH 219/320] [domains] bloomberg videos are now OK with ssl

---
 plugins/domains/bloomberg.video.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/domains/bloomberg.video.js b/plugins/domains/bloomberg.video.js
index 044482a4b..86703f78f 100644
--- a/plugins/domains/bloomberg.video.js
+++ b/plugins/domains/bloomberg.video.js
@@ -41,7 +41,7 @@ module.exports = {
 
         if (bmmr.bmmrId) {
             return {
-                href: 'http://www.bloomberg.com/api/embed/iframe?id=' + bmmr.bmmrId,                
+                href: '//www.bloomberg.com/api/embed/iframe?id=' + bmmr.bmmrId,                
                 type: CONFIG.T.text_html,
                 rel: [CONFIG.R.player, CONFIG.R.html5],
                 "aspect-ratio": 16 / 9

From 837b6ca0c682378827035922e4a6ef345abea334 Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Wed, 27 Apr 2016 18:24:13 +0300
Subject: [PATCH 220/320] [api] better error nandler

---
 modules/api/views.js | 48 ++++++++++++++++++--------------------------
 utils.js             | 17 +++++++++++++++-
 2 files changed, 36 insertions(+), 29 deletions(-)

diff --git a/modules/api/views.js b/modules/api/views.js
index 4419ac109..3431fb043 100644
--- a/modules/api/views.js
+++ b/modules/api/views.js
@@ -42,6 +42,21 @@ function getIntParam(req, param) {
     return v && parseInt(v);
 }
 
+function handleIframelyError(error, res, next) {
+
+    res.tryCacheError(error);
+
+    if (error == 404 || error.code == 'ENOTFOUND') {
+        return next(new utils.NotFound('Page not found'));
+    }
+
+    if (typeof error === "number") {
+        next(new utils.HttpError(error, "Requested page error: " + error));
+    } else {
+        next(new Error("Iframely error: " + error));
+    }
+}
+
 module.exports = function(app) {
 
     app.get('/iframely', function(req, res, next) {
@@ -77,14 +92,9 @@ module.exports = function(app) {
 
         ], function(error, result) {
 
-            if (error) {
 
-                res.tryCacheError(error);
-
-                if (error == 404 || error.code == 'ENOTFOUND') {
-                    return next(new utils.NotFound('Page not found'));
-                }
-                return next(new Error("Requested page error: " + error));
+            if (error) {
+                return handleIframelyError(error, res, next);
             }
 
             if (result.safe_html) {
@@ -215,13 +225,7 @@ module.exports = function(app) {
         ], function(error, html) {
 
             if (error) {
-
-                res.tryCacheError(error);
-
-                if (error == 404 || error.code == 'ENOTFOUND') {
-                    return next(new utils.NotFound('Page not found'));
-                }
-                return next(new Error("Requested page error: " + error));
+                return handleIframelyError(error, res, next);
             }
 
             var htmlArray = (html || "").match(/.{1,8191}/g) || "";
@@ -295,13 +299,7 @@ module.exports = function(app) {
         ], function(error, link) {
 
             if (error) {
-
-                res.tryCacheError(error);
-
-                if (error == 404 || error.code == 'ENOTFOUND') {
-                    return next(new utils.NotFound('Page not found'));
-                }
-                return next(new Error(error));
+                return handleIframelyError(error, res, next);
             }
 
             if (!link) {
@@ -384,13 +382,7 @@ module.exports = function(app) {
         ], function(error, result) {
 
             if (error) {
-
-                res.tryCacheError(error);
-
-                if (error == 404 || error.code == 'ENOTFOUND') {
-                    return next(new utils.NotFound('Page not found'));
-                }
-                return next(new Error(error));
+                return handleIframelyError(error, res, next);
             }
 
             iframelyCore.sortLinks(result.links);
diff --git a/utils.js b/utils.js
index ab5a37244..474d4015e 100644
--- a/utils.js
+++ b/utils.js
@@ -29,12 +29,27 @@
         this.name = this.constructor.name; //set our function’s name as error name.
         this.message = message; //set the error message
 
-    };
+    }
 
     NotFound.prototype.__proto__ = Error.prototype;
 
     exports.NotFound = NotFound;
 
+    function HttpError(code, message) {
+
+        Error.call(this); //super constructor
+        Error.captureStackTrace(this, this.constructor); //super helper method to include stack trace in error object
+
+        this.name = this.constructor.name; //set our function’s name as error name.
+        this.message = message; //set the error message
+        this.code = code; //set the error code
+
+    }
+
+    HttpError.prototype.__proto__ = Error.prototype;
+
+    exports.HttpError = HttpError;
+
     var send = require('send')
         , utils = require('connect/lib/utils')
         , parse = utils.parseUrl

From 94ae8c54946f96931a5e082751bbd61c9e90fd7f Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Fri, 29 Apr 2016 08:44:07 -0400
Subject: [PATCH 221/320] [domains] add Ranker

---
 lib/plugins/system/oembed/providers.json | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/lib/plugins/system/oembed/providers.json b/lib/plugins/system/oembed/providers.json
index 2a83c8511..4823c1ed8 100644
--- a/lib/plugins/system/oembed/providers.json
+++ b/lib/plugins/system/oembed/providers.json
@@ -482,5 +482,12 @@
             "rtlxl\\.nl/#!/[^\/]+/([a-zA-Z0-9-]+)"
         ],
         "endpoint": "http://xlapi.rtl.nl/version=1/fun=oembed?url={1}"
-    }
+    },
+    {
+        "name": "Ranker",
+        "templates": [
+            "(?:www\\.)?ranker\\.com/widget/([0-9]+)"
+        ],
+        "endpoint": "https://widget.ranker.com/oembed/{1}?for={format}"
+    }    
 ]
\ No newline at end of file

From 314f34520ff4b7f984e5bb2569c0af1f3c8e0ac7 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Fri, 29 Apr 2016 08:50:17 -0400
Subject: [PATCH 222/320] [domains] add newschoolers

---
 plugins/domains/newschoolers.com.js | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 plugins/domains/newschoolers.com.js

diff --git a/plugins/domains/newschoolers.com.js b/plugins/domains/newschoolers.com.js
new file mode 100644
index 000000000..1f3e2268e
--- /dev/null
+++ b/plugins/domains/newschoolers.com.js
@@ -0,0 +1,23 @@
+module.exports = {
+
+    re: /^https?:\/\/www\.newschoolers\.com\/videos?\/watch\/(\d+)\//i,
+
+    mixins: [
+        "*"
+    ],
+
+    getLink: function(urlMatch) {
+
+        return {
+            href: "//www.newschoolers.com/videoembed/" + urlMatch[1],
+            rel: [CONFIG.R.player, CONFIG.R.html5],
+            type: CONFIG.T.text_html,
+            'aspect-ratio': 720 / 430
+        };
+    },
+
+    tests: [
+        "http://www.newschoolers.com/videos/watch/825222/One-Of-Your-Days---Winner---Carter-Mcmilllan"
+    ]
+
+};
\ No newline at end of file

From 26529f8351fbd70e51d4afa859d1d159b0dba677 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Fri, 29 Apr 2016 11:10:37 -0400
Subject: [PATCH 223/320] [domains] return 9gag to properly handle gifs

---
 plugins/{.noneed => domains}/9gag.com.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
 rename plugins/{.noneed => domains}/9gag.com.js (85%)

diff --git a/plugins/.noneed/9gag.com.js b/plugins/domains/9gag.com.js
similarity index 85%
rename from plugins/.noneed/9gag.com.js
rename to plugins/domains/9gag.com.js
index 95e268481..8264561dd 100644
--- a/plugins/.noneed/9gag.com.js
+++ b/plugins/domains/9gag.com.js
@@ -9,15 +9,17 @@ module.exports = {
         "og-description",
         "og-site",
         "og-title",
+        "og-image", // for gif thumbnails
         "canonical"
     ],
 
     getLink: function(cheerio) {
         var image;
 
-        // Used for gifs.
+        // Used for gifs, but gifv will 404 and it will only thumbnail afterwards
         var $raw_image = cheerio('[data-image]');
         if ($raw_image.length) {
+
             image = $raw_image.attr('data-image');
 
         } else {
@@ -43,5 +45,6 @@ module.exports = {
         selector: ".badge-item-title a.badge-track"
     },
         "http://9gag.com/gag/5500821"
+        // "http://9gag.com/gag/arK0nWB" - gifv
     ]
 };

From 30bbfcbe68f9d505a1f1a00a0e3144ffe7efc381 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Fri, 29 Apr 2016 11:21:18 -0400
Subject: [PATCH 224/320] [domains] redirect Gfycat sources to canonical

---
 plugins/.noneed/gfycat.com.js   | 41 ---------------------------------
 plugins/domains/i.gfycat.com.js | 21 +++++++++++++++++
 2 files changed, 21 insertions(+), 41 deletions(-)
 delete mode 100644 plugins/.noneed/gfycat.com.js
 create mode 100644 plugins/domains/i.gfycat.com.js

diff --git a/plugins/.noneed/gfycat.com.js b/plugins/.noneed/gfycat.com.js
deleted file mode 100644
index 84084d915..000000000
--- a/plugins/.noneed/gfycat.com.js
+++ /dev/null
@@ -1,41 +0,0 @@
-module.exports = {
-
-    mixins: [
-        "favicon",
-        "keywords",
-        "twitter-title",
-        "twitter-description",
-        "twitter-image"
-    ],
-
-    getLink: function(twitter) {
-
-        var stream = twitter.player.stream;
-        if (!(stream instanceof Array)) {
-            stream = [stream];
-        }
-
-        var href;
-        stream.forEach(function(item) {
-            var url = item.value || item;
-            if (typeof url === 'string' && url.match(/\.mp4$/)) {
-                href = url;
-            }
-        });
-
-        return {
-            href: href,
-            type: CONFIG.T.video_mp4,
-            rel: [CONFIG.R.player, CONFIG.R.gifv],
-            width: twitter.player.width,
-            height: twitter.player.height
-        };
-    },
-
-    tests: [{
-        page: "http://www.reddit.com/r/gfycats",
-        selector: "a.title"
-    },
-        "http://gfycat.com/DismalUnacceptableErne"
-    ]
-};
\ No newline at end of file
diff --git a/plugins/domains/i.gfycat.com.js b/plugins/domains/i.gfycat.com.js
new file mode 100644
index 000000000..beb41212d
--- /dev/null
+++ b/plugins/domains/i.gfycat.com.js
@@ -0,0 +1,21 @@
+module.exports = {
+
+    re: [
+        /https?:\/\/(?:giant|thumbs)\.gfycat\.com\/([a-zA-Z0-9]+)(?:\-mobile)?\.(?:webm|mp4|gif)$/i
+    ],
+
+    getLink: function(urlMatch, cb) {
+
+        cb ({
+            redirect: "https://gfycat.com/" + urlMatch[1]
+        });
+    },
+
+    tests: [{
+        noFeeds: true,
+        skipMethods: ["getLink"]
+    },
+        "https://giant.gfycat.com/ObviousEuphoricHadrosaurus.webm",
+        "https://thumbs.gfycat.com/ObviousEuphoricHadrosaurus-mobile.mp4"
+    ]
+};
\ No newline at end of file

From 8449fb99a6a2f8ecd338327d365d6942584049e7 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Fri, 29 Apr 2016 12:28:22 -0400
Subject: [PATCH 225/320] [domains] remove SSL fix for Twitch.tv - no longer
 needed

---
 plugins/domains/twitch.tv.js | 41 +++++++++++++++---------------------
 1 file changed, 17 insertions(+), 24 deletions(-)

diff --git a/plugins/domains/twitch.tv.js b/plugins/domains/twitch.tv.js
index 711c9244e..b3c901015 100644
--- a/plugins/domains/twitch.tv.js
+++ b/plugins/domains/twitch.tv.js
@@ -1,34 +1,27 @@
 module.exports = {
 
+    re: [
+        /^https?:\/\/www\.twitch\.tv\/([a-zA-Z0-9_]+)$/i
+    ],
+
     mixins: [
         "*"
     ],
 
-    getLink: function (og, request, cb) {
+    getLink: function (urlMatch, og) {
 
         if (og.video && og.video.secure_url) {
-
-            request({
-                uri: og.video.secure_url,
-                followRedirect: false,
-                prepareResult: function(error, response, body, cb) {
-
-                    if (error) {
-                        return cb(error);
-                    }
-
-                    return cb (null, {
-                        href: response.headers.location ? response.headers.location.replace(/^http/, 'https') : og.video.secure_url, // ssl re-directs to non-ssl.
-                        type: og.video.type,
-                        rel: [CONFIG.R.player, CONFIG.R.autoplay],
-                        "aspect-ratio": og.video.width / og.video.height
-                    });
-
-                }
-            }, cb);
-
-        } else {
-            return cb(null);
+            return {
+                href: "//player.twitch.tv/?channel=" + urlMatch[1],
+                type: CONFIG.T.text_html,
+                rel: [CONFIG.R.player, CONFIG.R.autoplay, CONFIG.R.html5],
+                "aspect-ratio": og.video.width / og.video.height
+            };
         }
-    }
+    },
+
+    tests: [
+        "https://www.twitch.tv/imaqtpie",
+        "http://www.twitch.tv/adultswim"
+    ]
 };
\ No newline at end of file

From d87f5d96da6da817b9f398504397ca9b7a527a04 Mon Sep 17 00:00:00 2001
From: Thorsten Basse <tbasse@atlassian.com>
Date: Mon, 2 May 2016 13:57:00 +1000
Subject: [PATCH 226/320] [domains] add more detailed plugins for Spotify

---
 plugins/domains/spotify.com/spotify.album.js  | 115 ++++++++++++++++++
 plugins/domains/spotify.com/spotify.artist.js | 114 +++++++++++++++++
 plugins/domains/spotify.com/spotify.track.js  | 112 +++++++++++++++++
 3 files changed, 341 insertions(+)
 create mode 100644 plugins/domains/spotify.com/spotify.album.js
 create mode 100644 plugins/domains/spotify.com/spotify.artist.js
 create mode 100644 plugins/domains/spotify.com/spotify.track.js

diff --git a/plugins/domains/spotify.com/spotify.album.js b/plugins/domains/spotify.com/spotify.album.js
new file mode 100644
index 000000000..100fc6534
--- /dev/null
+++ b/plugins/domains/spotify.com/spotify.album.js
@@ -0,0 +1,115 @@
+var cheerio = require('cheerio');
+
+module.exports = {
+
+    highestPriority: true,
+
+    mixins: [
+        "oembed-site"
+    ],
+
+    // keep dependency on oEmbed only. Otherwise, there's redirect to relative path for "play.*" and no embeds as a result
+    // -- plugin redirect (by "htmlparser") /error/browser-not-supported.php
+
+    re: /https?:\/\/(?:open|play).spotify.com\/album\/(.*)/,
+
+    provides: 'spotify_data',
+
+    _getCoverImages: function (images) {
+        var coverImages = [];
+        images.forEach(function (image){
+          coverImages.push({
+            href: image.url,
+            type: CONFIG.T.image,
+            rel: CONFIG.R.thumbnail
+          });
+        });
+
+        return coverImages;
+    },
+
+    getLink: function(spotify_data, oembed) {
+
+        var favicon = {
+          href: "http://d2c87l0yth4zbw.cloudfront.net/i/_global/favicon.png",
+          type: CONFIG.T.image,
+          rel: CONFIG.R.icon
+        };
+
+        var thumbnail = this._getCoverImages(spotify_data.images || spotify_data.album.images);
+
+        var player;
+
+        var $container = cheerio('<div>');
+
+        try {
+            $container.html(oembed.html5 || oembed.html);
+        } catch (ex) {}
+
+        var $iframe = $container.find('iframe');
+
+        // if embed code contains <iframe>, return src
+        if ($iframe.length == 1) {
+
+            player = {
+                href: $iframe.attr('src'),
+                type: CONFIG.T.text_html,
+                rel: [CONFIG.R.player, CONFIG.R.ssl, CONFIG.R.html5],
+                 "aspect-ratio":  100 / 115 // hardcode here as otherwise there's blank space beneath the player
+            }
+        }
+
+        return thumbnail.concat([
+          favicon,
+          player
+        ]);
+
+    },
+
+    getMeta: function (spotify_data, oembed) {
+        var releaseDate = new Date(spotify_data.release_date).getFullYear();
+        releaseDate = !releaseDate ? '' : '(' + releaseDate + ')';
+
+        return {
+            site: 'Spotify',
+            title: spotify_data.name,
+            description: [
+                spotify_data.name,
+                releaseDate,
+                'by',
+                spotify_data.artists[0].name,
+                'contains',
+                spotify_data.tracks.items.length,
+                'tracks.'
+            ].join(' ')
+        }
+    },
+
+    getData: function (urlMatch, request, cb) {
+        request({
+            uri: "https://api.spotify.com/v1/albums/" + urlMatch[1],
+            json: true,
+            prepareResult: function(error, response, body, cb) {
+
+                if (error) {
+                    return cb(error);
+                }
+
+                if (body.message) {
+                    return cb(body.message);
+                }
+
+                cb(null, {
+                    spotify_data: body
+                });
+            }
+        }, cb);
+    },
+
+    tests: [
+        "https://play.spotify.com/user/1241058074/playlist/44CgBWWr6nlpy7bdZS8ZmN",
+        "http://open.spotify.com/track/6ol4ZSifr7r3Lb2a9L5ZAB",
+        "http://open.spotify.com/user/cgwest23/playlist/4SsKyjaGlrHJbRCQwpeUsz",
+        "http://open.spotify.com/album/42jcZtPYrmZJhqTbUhLApi"
+    ]
+};
diff --git a/plugins/domains/spotify.com/spotify.artist.js b/plugins/domains/spotify.com/spotify.artist.js
new file mode 100644
index 000000000..638be1130
--- /dev/null
+++ b/plugins/domains/spotify.com/spotify.artist.js
@@ -0,0 +1,114 @@
+var cheerio = require('cheerio');
+
+module.exports = {
+
+    highestPriority: true,
+
+    mixins: [
+        "oembed-site"
+    ],
+
+    // keep dependency on oEmbed only. Otherwise, there's redirect to relative path for "play.*" and no embeds as a result
+    // -- plugin redirect (by "htmlparser") /error/browser-not-supported.php
+
+    re: /https?:\/\/(?:open|play).spotify.com\/artist\/(.*)/,
+
+    provides: 'spotify_data',
+
+    _getCoverImages: function (images) {
+        var coverImages = [];
+        images.forEach(function (image){
+          coverImages.push({
+            href: image.url,
+            type: CONFIG.T.image,
+            rel: CONFIG.R.thumbnail
+          });
+        });
+
+        return coverImages;
+    },
+
+    getLink: function(spotify_data, oembed) {
+
+        var favicon = {
+          href: "http://d2c87l0yth4zbw.cloudfront.net/i/_global/favicon.png",
+          type: CONFIG.T.image,
+          rel: CONFIG.R.icon
+        };
+
+        var thumbnail = this._getCoverImages(spotify_data.images || spotify_data.album.images);
+
+        var player;
+
+        var $container = cheerio('<div>');
+
+        try {
+            $container.html(oembed.html5 || oembed.html);
+        } catch (ex) {}
+
+        var $iframe = $container.find('iframe');
+
+        // if embed code contains <iframe>, return src
+        if ($iframe.length == 1) {
+
+            player = {
+                href: $iframe.attr('src'),
+                type: CONFIG.T.text_html,
+                rel: [CONFIG.R.player, CONFIG.R.ssl, CONFIG.R.html5],
+                 "aspect-ratio":  100 / 115 // hardcode here as otherwise there's blank space beneath the player
+            }
+        }
+
+        return thumbnail.concat([
+          favicon,
+          player
+        ]);
+
+    },
+
+    getMeta: function (spotify_data, oembed) {
+        var description;
+
+        if (spotify_data) {
+          description = [
+            spotify_data.name + ' is an artist on Spotify',
+            'Genre: ' + (spotify_data.genres.length === 0 ? 'Unclassified' : spotify_data.genres.join(', ')),
+            'Followers: ' + spotify_data.followers.total
+          ].join('\n');
+        }
+
+        return {
+            site: 'Spotify',
+            title: spotify_data.name,
+            description: description || oembed.description
+        }
+    },
+
+    getData: function (urlMatch, request, cb) {
+        request({
+            uri: "https://api.spotify.com/v1/artists/" + urlMatch[1],
+            json: true,
+            prepareResult: function(error, response, body, cb) {
+
+                if (error) {
+                    return cb(error);
+                }
+
+                if (body.message) {
+                    return cb(body.message);
+                }
+
+                cb(null, {
+                    spotify_data: body
+                });
+            }
+        }, cb);
+    },
+
+    tests: [
+        "https://play.spotify.com/user/1241058074/playlist/44CgBWWr6nlpy7bdZS8ZmN",
+        "http://open.spotify.com/track/6ol4ZSifr7r3Lb2a9L5ZAB",
+        "http://open.spotify.com/user/cgwest23/playlist/4SsKyjaGlrHJbRCQwpeUsz",
+        "http://open.spotify.com/album/42jcZtPYrmZJhqTbUhLApi"
+    ]
+};
diff --git a/plugins/domains/spotify.com/spotify.track.js b/plugins/domains/spotify.com/spotify.track.js
new file mode 100644
index 000000000..4f0d7abd4
--- /dev/null
+++ b/plugins/domains/spotify.com/spotify.track.js
@@ -0,0 +1,112 @@
+var cheerio = require('cheerio');
+
+module.exports = {
+
+    highestPriority: true,
+
+    mixins: [
+        "oembed-site"
+    ],
+
+    // keep dependency on oEmbed only. Otherwise, there's redirect to relative path for "play.*" and no embeds as a result
+    // -- plugin redirect (by "htmlparser") /error/browser-not-supported.php
+
+    re: /https?:\/\/(?:open|play).spotify.com\/track\/(.*)/,
+
+    provides: 'spotify_data',
+
+    _getCoverImages: function (images) {
+        var coverImages = [];
+        images.forEach(function (image){
+          coverImages.push({
+            href: image.url,
+            type: CONFIG.T.image,
+            rel: CONFIG.R.thumbnail
+          });
+        });
+
+        return coverImages;
+    },
+
+    getLink: function(spotify_data, oembed) {
+
+        var favicon = {
+          href: "http://d2c87l0yth4zbw.cloudfront.net/i/_global/favicon.png",
+          type: CONFIG.T.image,
+          rel: CONFIG.R.icon
+        };
+
+        var thumbnail = this._getCoverImages(spotify_data.images || spotify_data.album.images);
+
+        var player;
+
+        var $container = cheerio('<div>');
+
+        try {
+            $container.html(oembed.html5 || oembed.html);
+        } catch (ex) {}
+
+        var $iframe = $container.find('iframe');
+
+        // if embed code contains <iframe>, return src
+        if ($iframe.length == 1) {
+
+            player = {
+                href: $iframe.attr('src'),
+                type: CONFIG.T.text_html,
+                rel: [CONFIG.R.player, CONFIG.R.ssl, CONFIG.R.html5],
+                "aspect-ratio":  100 / 115 // hardcode here as otherwise there's blank space beneath the player
+            }
+        }
+
+        return thumbnail.concat([
+          favicon,
+          player
+        ]);
+
+    },
+
+    getMeta: function (spotify_data, oembed) {
+        var releaseDate = new Date(spotify_data.album.released).getFullYear();
+        releaseDate = !releaseDate ? '' : '(' + releaseDate + ')';
+        return {
+            site: 'Spotify',
+            title: spotify_data.name,
+            description: [
+                'by',
+                spotify_data.artists[0].name,
+                '\non',
+                spotify_data.album.name,
+                releaseDate
+            ].join(' ')
+        }
+    },
+
+    getData: function (urlMatch, request, cb) {
+        request({
+            uri: "https://api.spotify.com/v1/tracks/" + urlMatch[1],
+            json: true,
+            prepareResult: function(error, response, body, cb) {
+
+                if (error) {
+                    return cb(error);
+                }
+
+                if (body.message) {
+                    return cb(body.message);
+                }
+
+                cb(null, {
+                    spotify_data: body
+                });
+            }
+        }, cb);
+    },
+
+    tests: [
+        "https://play.spotify.com/user/1241058074/playlist/44CgBWWr6nlpy7bdZS8ZmN",
+        "http://open.spotify.com/track/6ol4ZSifr7r3Lb2a9L5ZAB",
+        "http://open.spotify.com/user/cgwest23/playlist/4SsKyjaGlrHJbRCQwpeUsz",
+        "http://open.spotify.com/album/42jcZtPYrmZJhqTbUhLApi"
+    ]
+};

From b9216d6aa91a19968d9f55d1f8c8db847208e9d3 Mon Sep 17 00:00:00 2001
From: Thorsten Basse <tbasse@atlassian.com>
Date: Mon, 2 May 2016 14:22:54 +1000
Subject: [PATCH 227/320] [domains] add description to codepen.io plugins

---
 plugins/domains/codepen.io.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/plugins/domains/codepen.io.js b/plugins/domains/codepen.io.js
index 68a849be5..6c0baeb90 100644
--- a/plugins/domains/codepen.io.js
+++ b/plugins/domains/codepen.io.js
@@ -9,6 +9,7 @@ module.exports = {
         "oembed-author",
         "oembed-site",
         "oembed-title",
+        "description",        
         "domain-icon"
     ],
 
@@ -18,7 +19,7 @@ module.exports = {
             return { // Anonymous Pens can't be embedded
                     // return icon to avoid fallback to generic (whitelisted) parser
                 href: 'http://codepen.io/logo-pin.svg',
-                type: CONFIG.T.icon, 
+                type: CONFIG.T.icon,
                 rel: CONFIG.R.icon
             }
         }
@@ -49,4 +50,4 @@ module.exports = {
         "http://codepen.io/dudleystorey/pen/HrFBx"
     ]
 
-};
\ No newline at end of file
+};

From 57651ab388f23d81a167018bde9d21fb176d6497 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Mon, 2 May 2016 10:06:07 -0400
Subject: [PATCH 228/320] [domains] add autoplay flag for theta360 -> "WebGL
 hits a snag" way too often

---
 config.js                                    | 1 +
 plugins/domains/theta360.com/theta360.com.js | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/config.js b/config.js
index d1c2bacd0..a306f60b3 100644
--- a/config.js
+++ b/config.js
@@ -47,6 +47,7 @@
             image_png: "image/png",
             image_svg: "image/svg",
             image_gif: "image/gif",
+            image_webp: "image/webp",
             video_mp4: "video/mp4",
             video_ogg: "video/ogg",
             video_webm: "video/webm"
diff --git a/plugins/domains/theta360.com/theta360.com.js b/plugins/domains/theta360.com/theta360.com.js
index bd5ff21f3..9c6eedc3a 100644
--- a/plugins/domains/theta360.com/theta360.com.js
+++ b/plugins/domains/theta360.com/theta360.com.js
@@ -7,7 +7,6 @@ module.exports = {
         "favicon",
         "canonical",
         "og-description",
-        "media-detector",
         "og-site",
         "og-title"
     ],
@@ -15,7 +14,7 @@ module.exports = {
     getLink: function(og) {
         return {
             type: CONFIG.T.text_html,
-            rel: [CONFIG.R.player, CONFIG.R.inline, CONFIG.R.ssl],
+            rel: [CONFIG.R.player, CONFIG.R.inline, CONFIG.R.ssl, CONFIG.R.autoplay],
             template_context: {
                 title: og.title,
                 description: og.description,

From 7867864be62fe5fbb808824a949dcb3fc558e8d8 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Mon, 2 May 2016 11:47:57 -0400
Subject: [PATCH 229/320] [domains] extract players from DailyMail for direct
 share links

---
 plugins/domains/dailymail.video.js | 51 ++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)
 create mode 100644 plugins/domains/dailymail.video.js

diff --git a/plugins/domains/dailymail.video.js b/plugins/domains/dailymail.video.js
new file mode 100644
index 000000000..1beb08a0f
--- /dev/null
+++ b/plugins/domains/dailymail.video.js
@@ -0,0 +1,51 @@
+module.exports = {
+
+    // direct "share" links to players from DailyMail articles. They end with #v-1467332342001
+    re: [        
+        /https?:\/\/www\.dailymail\.co\.uk\/[^#]+#(v\-\d+)$/i
+    ],
+
+    provides: 'dailymailVideo',
+
+    mixins: [
+        "domain-icon"
+    ],
+
+    getData: function(urlMatch, cheerio) {
+
+        var $player = cheerio('#' + urlMatch[1] + ' video[data-opts]');
+        
+        if ($player.length) {
+            return {
+                dailymailVideo: JSON.parse($player.attr('data-opts'))
+            }
+        }
+    },
+
+    getMeta: function(dailymailVideo) {
+        return {
+            title: dailymailVideo.title, 
+            description: dailymailVideo.descr
+        }
+    },
+
+    getLinks: function(dailymailVideo) {
+
+        return [{
+            href: dailymailVideo.poster || dailymailVideo.thumbnail,
+            type: CONFIG.T.image,
+            rel: CONFIG.R.thumbnail
+        }, {
+            // if something is undefined - let getLinks fail to fall back to default parsers
+            href: dailymailVideo.plugins['social-share'].embedUrl, // no SSL
+            rel: [CONFIG.R.player, CONFIG.R.html5],
+            type: CONFIG.T.text_html,             
+            "aspect-ratio": 484 / 282, // taken from mp4 aspect
+            "padding-bottom": 50 + 50 + 50
+        }];
+    },    
+
+    tests: [
+        "http://www.dailymail.co.uk/tvshowbiz/article-2885993/A-look-unconventional-13-year-relationship-Helena-Bonham-Carter-Tim-Burton-movies-made.html#v-1467332342001"
+    ]
+};
\ No newline at end of file

From 207040068589b17837dea7d3eda84a50414e4957 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Mon, 2 May 2016 12:42:49 -0400
Subject: [PATCH 230/320] [domains] iFrame embeds for DailyMail videos in
 addition to mp4 from generic parsers

---
 .../dailymail.embeddedvideo.js                | 23 +++++++++++++++++++
 .../dailymail.co.uk/dailymail.galleryvideo.js | 23 +++++++++++++++++++
 .../{ => dailymail.co.uk}/dailymail.video.js  | 13 ++---------
 3 files changed, 48 insertions(+), 11 deletions(-)
 create mode 100644 plugins/domains/dailymail.co.uk/dailymail.embeddedvideo.js
 create mode 100644 plugins/domains/dailymail.co.uk/dailymail.galleryvideo.js
 rename plugins/domains/{ => dailymail.co.uk}/dailymail.video.js (77%)

diff --git a/plugins/domains/dailymail.co.uk/dailymail.embeddedvideo.js b/plugins/domains/dailymail.co.uk/dailymail.embeddedvideo.js
new file mode 100644
index 000000000..9ce3f52e3
--- /dev/null
+++ b/plugins/domains/dailymail.co.uk/dailymail.embeddedvideo.js
@@ -0,0 +1,23 @@
+module.exports = {
+
+    // direct "share" links to players from DailyMail articles. They end with #v-1467332342001
+    re: [        
+        /https?:\/\/www\.dailymail\.co\.uk\/[^#]+#(v\-\d+)$/i
+    ],
+
+    provides: 'dailymailVideoID',
+
+    mixins: ['domain-icon'],
+
+    getData: function(urlMatch) {
+        
+        return {
+            dailymailVideoID: urlMatch[1]
+        }        
+    },    
+
+    tests: [
+        "http://www.dailymail.co.uk/tvshowbiz/article-2885993/A-look-unconventional-13-year-relationship-Helena-Bonham-Carter-Tim-Burton-movies-made.html#v-1467332342001",
+        "http://www.dailymail.co.uk/news/article-3556177/Was-MH17-shot-Ukrainian-fighter-jet-BBC-documentary-claims-Boeing-777-targeted-plane.html#v-8296301435444282732"
+    ]
+};
\ No newline at end of file
diff --git a/plugins/domains/dailymail.co.uk/dailymail.galleryvideo.js b/plugins/domains/dailymail.co.uk/dailymail.galleryvideo.js
new file mode 100644
index 000000000..41384438f
--- /dev/null
+++ b/plugins/domains/dailymail.co.uk/dailymail.galleryvideo.js
@@ -0,0 +1,23 @@
+module.exports = {
+
+    re: [        
+        /https?:\/\/www\.dailymail\.co\.uk\/video\/\w+\/video\-(\d+)\//i
+    ],
+
+    provides: 'dailymailVideoID',
+
+    mixins: ['*'],
+
+    getData: function(urlMatch, og) {
+
+        if (og.video && og.video.url && /_(\d+)\.mp4$/i.test(og.video.url)) {
+            return {
+                dailymailVideoID: 'v-' + og.video.url.match(/_(\d+)\.mp4$/i)[1]
+            }
+        }
+    },    
+
+    tests: [
+        "http://www.dailymail.co.uk/video/news/video-1284607/Heart-rending-scenes-child-marriage-ceremonies-India.html"
+    ]
+};
\ No newline at end of file
diff --git a/plugins/domains/dailymail.video.js b/plugins/domains/dailymail.co.uk/dailymail.video.js
similarity index 77%
rename from plugins/domains/dailymail.video.js
rename to plugins/domains/dailymail.co.uk/dailymail.video.js
index 1beb08a0f..33884a8fe 100644
--- a/plugins/domains/dailymail.video.js
+++ b/plugins/domains/dailymail.co.uk/dailymail.video.js
@@ -1,19 +1,10 @@
 module.exports = {
 
-    // direct "share" links to players from DailyMail articles. They end with #v-1467332342001
-    re: [        
-        /https?:\/\/www\.dailymail\.co\.uk\/[^#]+#(v\-\d+)$/i
-    ],
-
     provides: 'dailymailVideo',
 
-    mixins: [
-        "domain-icon"
-    ],
-
-    getData: function(urlMatch, cheerio) {
+    getData: function(dailymailVideoID, cheerio) {
 
-        var $player = cheerio('#' + urlMatch[1] + ' video[data-opts]');
+        var $player = cheerio('#' + dailymailVideoID + ' video[data-opts]');
         
         if ($player.length) {
             return {

From befcbc894e3be4346b34295b1822218b698955a7 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Mon, 2 May 2016 14:01:30 -0400
Subject: [PATCH 231/320] [domains] better coverage for French Academies

---
 lib/plugins/system/oembed/providers.json | 9 +++++----
 plugins/domains/vk.com/vk.status.js      | 3 +--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/plugins/system/oembed/providers.json b/lib/plugins/system/oembed/providers.json
index 4823c1ed8..58ad0e376 100644
--- a/lib/plugins/system/oembed/providers.json
+++ b/lib/plugins/system/oembed/providers.json
@@ -469,12 +469,13 @@
         "endpoint": "https://v.interlude.fm/oembed?vid={1}"
     },
     {
-        "name": "Academie de Bordeaux",
+        "name": "Academie de Bordeaux etc",
         "templates": [
-            "(\\w+)\\.ac\\-bordeaux\\.fr/mediacad/default/media/display(?:[\\/a-z0-9]+)?/(m/\\d+)",
-            "(\\w+)\\.ac\\-bordeaux\\.fr/mediacad/(m/\\d+)"            
+            "([a-z0-9]+)\\.ac\\-(\\w+)\\.fr/mediacad/default/media/display(?:[\\/a-z0-9]+)?/(m/\\d+)",
+            "([a-z0-9]+)\\.ac\\-(\\w+)\\.fr/mediacad/(m/\\d+)",
+            "([a-z0-9]+)\\.ac\\-(\\w+)\\.fr/(m/\\d+)"            
         ],
-        "endpoint": "http://{1}.ac-bordeaux.fr/mediacad/default/media/display/{2}/d/j?format={format}"
+        "endpoint": "http://{1}.ac-{2}.fr/mediacad/default/media/display/{3}/d/j?format={format}"
     },
     {
         "name": "RTL XL",
diff --git a/plugins/domains/vk.com/vk.status.js b/plugins/domains/vk.com/vk.status.js
index 25b428a4d..ebf4f68d2 100644
--- a/plugins/domains/vk.com/vk.status.js
+++ b/plugins/domains/vk.com/vk.status.js
@@ -68,12 +68,11 @@ module.exports = {
                     var status = data.response[0];
                     var m = url.match(/hash=([\w-]+)/i);
 
-
                     cb(null, {
                         vk_status: {
                             date: status.date,
                             text: status.text,
-                            image: status.attachment && ((status.attachment.photo && status.attachment.photo.src) || status.attachment.video && status.attachment.video.image),
+                            image: status.attachment && ((status.attachment.photo && (status.attachment.photo.src_big || status.attachment.photo.src_big)) || status.attachment.video && status.attachment.video.image),
                             embed_hash: status.embed_hash || (m && m[1]),
                             element_id: urlMatch[2],
                             owner_id: urlMatch[1]

From a214c1b7b210418b5ad0812396d258b89208c2a3 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Mon, 2 May 2016 14:01:46 -0400
Subject: [PATCH 232/320] [general] allow oembed photo with HTML instead of URL

---
 plugins/links/oembed-photo.js | 39 ++++++++++++++++++++++++++++-------
 1 file changed, 31 insertions(+), 8 deletions(-)

diff --git a/plugins/links/oembed-photo.js b/plugins/links/oembed-photo.js
index 2f2eab76f..67164f182 100644
--- a/plugins/links/oembed-photo.js
+++ b/plugins/links/oembed-photo.js
@@ -1,17 +1,40 @@
+var cheerio = require('cheerio');
+
 module.exports = {
 
+    // this is the case of oembed photo or image, but with the html field
+    // ex: 
+    // https://be1d.ac-dijon.fr/mediacad/m/118
+    // https://flii.by/file/rk3mg02r7kf/
+
     getLink: function(oembed, whitelistRecord) {
 
-        if (oembed.type === "photo" && oembed.url && whitelistRecord.isAllowed && whitelistRecord.isAllowed('oembed.photo')) {
+        if ((oembed.type === "photo" || oembed.type === "image") && oembed.html && whitelistRecord.isAllowed && whitelistRecord.isAllowed('oembed.photo')) {
 
-            return {
-                href: oembed.url,
-                type: CONFIG.T.image,
-                rel: [CONFIG.R.image, CONFIG.R.oembed],
-                width: oembed.width,
-                height: oembed.height
+            var image = {
+                type: CONFIG.T.text_html,  // Always an iframe, either native, or hosted
+                rel:[CONFIG.R.oembed, CONFIG.R.image],
+                'aspect-ratio': oembed.width / oembed.height // have to assume it's responsive
             };
-            
+
+
+            var $container = cheerio('<div>');
+            try {
+                $container.html(oembed.html5 || oembed.html);
+            } catch (ex) {}
+
+            var $iframe = $container.find('iframe');
+
+
+            // if embed code contains <iframe>, return src
+            if ($iframe.length == 1) {
+                image.href = $iframe.attr('src');
+            } else { 
+                image.html = oembed.html || oembed.html5; // will render in an iframe
+            }
+
+            return image;
         }
+
     }
 };
\ No newline at end of file

From 5b384dc779c72712eeb2ca4cabdba9b5053eb2e0 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Mon, 2 May 2016 14:40:50 -0400
Subject: [PATCH 233/320] Revert "[general] allow oembed photo with HTML
 instead of URL"

This reverts commit a214c1b7b210418b5ad0812396d258b89208c2a3.
---
 plugins/links/oembed-photo.js | 39 +++++++----------------------------
 1 file changed, 8 insertions(+), 31 deletions(-)

diff --git a/plugins/links/oembed-photo.js b/plugins/links/oembed-photo.js
index 67164f182..2f2eab76f 100644
--- a/plugins/links/oembed-photo.js
+++ b/plugins/links/oembed-photo.js
@@ -1,40 +1,17 @@
-var cheerio = require('cheerio');
-
 module.exports = {
 
-    // this is the case of oembed photo or image, but with the html field
-    // ex: 
-    // https://be1d.ac-dijon.fr/mediacad/m/118
-    // https://flii.by/file/rk3mg02r7kf/
-
     getLink: function(oembed, whitelistRecord) {
 
-        if ((oembed.type === "photo" || oembed.type === "image") && oembed.html && whitelistRecord.isAllowed && whitelistRecord.isAllowed('oembed.photo')) {
+        if (oembed.type === "photo" && oembed.url && whitelistRecord.isAllowed && whitelistRecord.isAllowed('oembed.photo')) {
 
-            var image = {
-                type: CONFIG.T.text_html,  // Always an iframe, either native, or hosted
-                rel:[CONFIG.R.oembed, CONFIG.R.image],
-                'aspect-ratio': oembed.width / oembed.height // have to assume it's responsive
+            return {
+                href: oembed.url,
+                type: CONFIG.T.image,
+                rel: [CONFIG.R.image, CONFIG.R.oembed],
+                width: oembed.width,
+                height: oembed.height
             };
-
-
-            var $container = cheerio('<div>');
-            try {
-                $container.html(oembed.html5 || oembed.html);
-            } catch (ex) {}
-
-            var $iframe = $container.find('iframe');
-
-
-            // if embed code contains <iframe>, return src
-            if ($iframe.length == 1) {
-                image.href = $iframe.attr('src');
-            } else { 
-                image.html = oembed.html || oembed.html5; // will render in an iframe
-            }
-
-            return image;
+            
         }
-
     }
 };
\ No newline at end of file

From 52c8eab1c7698ae24ed42dcbf25c1c00aff70ccd Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Mon, 2 May 2016 14:46:43 -0400
Subject: [PATCH 234/320] [general] allow oembed photo with HTML instead of URL

---
 plugins/links/oembed-photo-html.js | 40 ++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 plugins/links/oembed-photo-html.js

diff --git a/plugins/links/oembed-photo-html.js b/plugins/links/oembed-photo-html.js
new file mode 100644
index 000000000..9dc817398
--- /dev/null
+++ b/plugins/links/oembed-photo-html.js
@@ -0,0 +1,40 @@
+var cheerio = require('cheerio');
+
+module.exports = {
+
+    // this is the case of oembed photo or image, but with the html field
+    // ex: 
+    // https://be1d.ac-dijon.fr/mediacad/m/118
+    // https://flii.by/file/rk3mg02r7kf/
+
+    getLink: function(oembed, whitelistRecord) {
+
+        if ((oembed.type === "photo" || oembed.type === "image") && oembed.html && whitelistRecord.isAllowed && whitelistRecord.isAllowed('oembed.photo')) {
+
+            var image = {
+                type: CONFIG.T.text_html,  // Always an iframe, either native, or hosted
+                rel:[CONFIG.R.oembed, CONFIG.R.image, CONFIG.R.html5],
+                'aspect-ratio': oembed.width / oembed.height // have to assume it's responsive
+            };
+
+
+            var $container = cheerio('<div>');
+            try {
+                $container.html(oembed.html5 || oembed.html);
+            } catch (ex) {}
+
+            var $iframe = $container.find('iframe');
+
+
+            // if embed code contains <iframe>, return src
+            if ($iframe.length == 1) {
+                image.href = $iframe.attr('src');
+            } else { 
+                image.html = oembed.html || oembed.html5; // will render in an iframe
+            }
+
+            return image;
+        }
+
+    }
+};
\ No newline at end of file

From 9d525a289bfcee2cb9d7f355e0a04eb0304cff43 Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Wed, 4 May 2016 18:05:00 +0300
Subject: [PATCH 235/320] [domains] twitter: use
 https://publish.twitter.com/oembed

---
 plugins/domains/twitter.status.js | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/plugins/domains/twitter.status.js b/plugins/domains/twitter.status.js
index 16c6947bb..05926c319 100644
--- a/plugins/domains/twitter.status.js
+++ b/plugins/domains/twitter.status.js
@@ -13,7 +13,7 @@ module.exports = {
 
     mixins: ['domain-icon'],
 
-    getData: function(urlMatch, request, options, cb) {
+    getData: function(url, urlMatch, request, options, cb) {
         var id = urlMatch[1];
 
         var c = options.getProviderOptions("twitter") || options.getProviderOptions("twitter.status");
@@ -53,17 +53,26 @@ module.exports = {
                     }
                 }
 
-                var url = "https://api.twitter.com/1" + (!oauth || blockExpireIn > 0 ? "" : ".1") + "/statuses/oembed.json";
+                var usePublicApi = !oauth || blockExpireIn > 0;
+
+                var apiUrl;
 
                 var qs = {
-                    id: id,
                     hide_media: c.hide_media,
                     hide_thread: c.hide_thread,
                     omit_script: c.omit_script
                 };
 
+                if (usePublicApi) {
+                    apiUrl = "https://publish.twitter.com/oembed";
+                    qs.url = url;
+                } else {
+                    apiUrl = "https://api.twitter.com/1.1/statuses/oembed.json";
+                    qs.id = id;
+                }
+
                 request(_.extend({
-                    url: url,
+                    url: apiUrl,
                     qs: qs,
                     json: true,
                     cache_key: 'twitter:oembed:' + id,
@@ -127,7 +136,7 @@ module.exports = {
 
                         cb(error, data);
                     }
-                }, (!oauth || blockExpireIn ? null : {oauth: oauth})), cb); // add oauth if 1.1, else skip it
+                }, usePublicApi ? null : {oauth: oauth}), cb); // add oauth if 1.1, else skip it
 
             }
 
@@ -144,7 +153,7 @@ module.exports = {
             oembed["max-width"] = c["max-width"];
 
             var result = {
-                twitter_oembed: oembed,                
+                twitter_oembed: oembed
             };
 
             if (c.media_only) {

From 0ab2a8d8d43bc926de9e5d9e201d106b4ecd8458 Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Wed, 4 May 2016 19:03:43 +0300
Subject: [PATCH 236/320] [providers.json] update twitter oembed endpoint

---
 lib/plugins/system/oembed/providers.json | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/lib/plugins/system/oembed/providers.json b/lib/plugins/system/oembed/providers.json
index 58ad0e376..455a10165 100644
--- a/lib/plugins/system/oembed/providers.json
+++ b/lib/plugins/system/oembed/providers.json
@@ -170,17 +170,11 @@
     {
         "name": "Twitter",
         "templates": [
-            "twitter\\.com/#?!?/?\\w+/status/(\\d+)"
-        ],
-        "endpoint": "https://api.twitter.com/1/statuses/oembed.{format}?id={1}"
-    },
-    {
-        "name": "Twitter Moments",
-        "templates": [
+            "twitter\\.com/#?!?/?\\w+/status/(\\d+)",
             "twitter\\.com/i/moments/(\\d+)"
         ],
-        "endpoint": "https://publish.twitter.com/oembed.json"
-    },    
+        "endpoint": "https://publish.twitter.com/oembed"
+    },
     {
         "name": "Gist",
         "templates": [

From 82d39efdb6dbf2ec5bab7916e5e042862c662d9b Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Wed, 4 May 2016 19:22:32 +0300
Subject: [PATCH 237/320] [domains] twitter: use urlMatch to get original url

---
 plugins/domains/twitter.status.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/domains/twitter.status.js b/plugins/domains/twitter.status.js
index 05926c319..975f6e1ea 100644
--- a/plugins/domains/twitter.status.js
+++ b/plugins/domains/twitter.status.js
@@ -13,7 +13,7 @@ module.exports = {
 
     mixins: ['domain-icon'],
 
-    getData: function(url, urlMatch, request, options, cb) {
+    getData: function(urlMatch, request, options, cb) {
         var id = urlMatch[1];
 
         var c = options.getProviderOptions("twitter") || options.getProviderOptions("twitter.status");
@@ -65,7 +65,7 @@ module.exports = {
 
                 if (usePublicApi) {
                     apiUrl = "https://publish.twitter.com/oembed";
-                    qs.url = url;
+                    qs.url = urlMatch[0];
                 } else {
                     apiUrl = "https://api.twitter.com/1.1/statuses/oembed.json";
                     qs.id = id;

From b55619d983a7e61e911eb0e57409f26493ae3643 Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Wed, 4 May 2016 19:23:07 +0300
Subject: [PATCH 238/320] [providers.json] remove twitter predefined oembed

---
 lib/plugins/system/oembed/providers.json | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/lib/plugins/system/oembed/providers.json b/lib/plugins/system/oembed/providers.json
index 455a10165..125f70867 100644
--- a/lib/plugins/system/oembed/providers.json
+++ b/lib/plugins/system/oembed/providers.json
@@ -167,14 +167,6 @@
         ],
         "endpoint": "http://public-api.wordpress.com/oembed/1.0/?format={format}&for=iframely&url={url}"
     },
-    {
-        "name": "Twitter",
-        "templates": [
-            "twitter\\.com/#?!?/?\\w+/status/(\\d+)",
-            "twitter\\.com/i/moments/(\\d+)"
-        ],
-        "endpoint": "https://publish.twitter.com/oembed"
-    },
     {
         "name": "Gist",
         "templates": [

From 39febf2cb27d2139a8ff5a29d07cfdc95abdaa3f Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Wed, 4 May 2016 19:33:37 +0300
Subject: [PATCH 239/320] [providers.json] return twitter moments endpoint

---
 lib/plugins/system/oembed/providers.json | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/lib/plugins/system/oembed/providers.json b/lib/plugins/system/oembed/providers.json
index 125f70867..757ee08c0 100644
--- a/lib/plugins/system/oembed/providers.json
+++ b/lib/plugins/system/oembed/providers.json
@@ -167,6 +167,13 @@
         ],
         "endpoint": "http://public-api.wordpress.com/oembed/1.0/?format={format}&for=iframely&url={url}"
     },
+    {
+        "name": "Twitter Moments",
+        "templates": [
+            "twitter\\.com/i/moments/(\\d+)"
+        ],
+        "endpoint": "https://publish.twitter.com/oembed"
+    },
     {
         "name": "Gist",
         "templates": [

From f201cf70bad9d133ef0149403e868c30a99ed2cf Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Wed, 4 May 2016 20:15:53 +0300
Subject: [PATCH 240/320] [utils] apply CONFIG.PROXY for 'request' in plugins

---
 lib/request.js |  3 ++-
 lib/utils.js   | 50 ++++++++++++++++++++++++++++----------------------
 2 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/lib/request.js b/lib/request.js
index 3723ec710..f8817fb01 100644
--- a/lib/request.js
+++ b/lib/request.js
@@ -2,6 +2,7 @@ var request = require('request');
 var _ = require('underscore');
 var crypto = require('crypto');
 var cache = require('./cache');
+var utils = require('./utils');
 
 var version = require('../package.json').version;
 
@@ -67,7 +68,7 @@ module.exports = function(options, callback) {
 
         } else {
 
-            request(options, function(error, response, data) {
+            request(utils.prepareRequestOptions(options), function(error, response, data) {
 
                 prepareResult(error, response, data, function(error, preparedData) {
 
diff --git a/lib/utils.js b/lib/utils.js
index 745c77820..ada79bc70 100644
--- a/lib/utils.js
+++ b/lib/utils.js
@@ -14,8 +14,33 @@ if (!GLOBAL.CONFIG) {
     GLOBAL.CONFIG = require('../config');
 }
 
+var prepareRequestOptions = exports.prepareRequestOptions = function(request_options) {
+
+    if (CONFIG.PROXY) {
+
+        var url = request_options.url;
+
+        // TODO: make 'for'.
+        var proxy = _.find(CONFIG.PROXY, function (p) {
+            return _.find(p.re, function (re) {
+                return url.match(re);
+            });
+        });
+        if (proxy) {
+            if (proxy.proxy_server) {
+                request_options.proxy = proxy.proxy_server;
+            }
+            if (proxy.user_agent && request_options.headers) {
+                request_options.headers['User-Agent'] = proxy.user_agent;
+            }
+        }
+    }
+
+    return request_options;
+};
+
 /**
- * @private
+ * @public
  * Do HTTP GET request and handle redirects
  * @param url Request uri (parsed object or string)
  * @param {Object} options
@@ -41,7 +66,7 @@ var getUrl = exports.getUrl = function(url, options) {
 
             var supportGzip = !process.version.match(/^v0\.8/);
 
-            var request_options = {
+            var r = request(prepareRequestOptions({
                 uri: url,
                 method: 'GET',
                 headers: {
@@ -53,26 +78,7 @@ var getUrl = exports.getUrl = function(url, options) {
                 timeout: options.timeout || CONFIG.RESPONSE_TIMEOUT,
                 followRedirect: options.followRedirect,
                 jar: jar
-            };
-
-            if (CONFIG.PROXY) {
-                // TODO: make 'for'.
-                var proxy = _.find(CONFIG.PROXY, function (p) {
-                    return _.find(p.re, function (re) {
-                        return url.match(re);
-                    });
-                });
-                if (proxy) {
-                    if (proxy.proxy_server) {
-                        request_options.proxy = proxy.proxy_server;
-                    }
-                    if (proxy.user_agent && request_options.headers) {
-                        request_options.headers['User-Agent'] = proxy.user_agent;
-                    }
-                }
-            }
-
-            var r = request(request_options)
+            }))
                 .on('error', function(error) {
                     req.emit('error', error);
                 })

From 89bffda00be63d3fb69bf29a2c0f99880c1ceb07 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Wed, 4 May 2016 13:27:55 -0400
Subject: [PATCH 241/320] [docs] clean up intro docs

---
 README.md     | 27 +++++++--------------------
 docs/SETUP.md | 24 ++++++++++--------------
 2 files changed, 17 insertions(+), 34 deletions(-)

diff --git a/README.md b/README.md
index 91393ce83..45b1098aa 100644
--- a/README.md
+++ b/README.md
@@ -1,38 +1,30 @@
 # Iframely API for Responsive Web Embeds
 
-Iframely is fast and simple HTTP API for responsive web embeds and semantic meta. The API covers well [over 1600 domains](https://iframely.com/try) through 150 custom domain plugins and generic parsers for [oEmbed](http://oembed.com/), [Open Graph](http://ogp.me/) and [Twitter Cards](https://dev.twitter.com/docs/cards), powered by Iframely's whitelist. 
+Iframely is fast and simple HTTP API for responsive web embeds and semantic meta. The API covers well [over 1800 domains](https://iframely.com/domains) through 200 custom domain plugins and generic parsers for [oEmbed](http://oembed.com/), [Open Graph](http://ogp.me/) and [Twitter Cards](https://dev.twitter.com/docs/cards), powered by Iframely's whitelist. 
 
-The whitelisting is manual process, and we do every-day manual regression testing to ensure integrity. [Submit your domain](https://iframely.com/qa/request), if you publish embeds.
+The whitelist file is pullled from iframely.com and is updated automatically. You can also [have your own whitelist](/docs/whitelist-format) file. The whitelisting is manual process, and we do every-day manual regression testing to ensure integrity. [Submit your domain](https://iframely.com/qa/request), if you publish embeds.
 
 HTTP API are available as [oEmbed](https://iframely.com/docs/oembed-api) or [Iframely API](https://iframely.com/docs/iframely-api) formats. To make it simple to understand, Iframely format mimics the `<head>` section of the page with its `meta` and `links` elements.
 
-In response to `url` request, APIs returns you the embeds and meta for a requested web page. Below are samples from [hosted API](https://iframely.com), just to show you the format:
+In response to `url` request, APIs returns you the embeds and meta for a requested web page. Below are data samples from [hosted API](https://iframely.com), just to show you the format:
 
 - [>> Here’s API call for Coub video](http://iframe.ly/ACcM3Y.json)
 - [>> Same one, but as oEmbed](http://iframe.ly/ACcM3Y.oembed)
 
 Iframely can also be used as Node.js library. 
+
 Requires Node version 0.10.22 and up. 
 
 ## Get started:
 
-The simplest way to see Iframely in action is by using our [Chrome plugin](https://chrome.google.com/webstore/detail/iframely-url-previews/bbafbcjnlgfbemjemgliogmfdlkocjmi). This way you will see the embeds on your (or any really) site right away (but not on GitHub due to Content-Security-Policy, sorry). 
-
-Or, [try Iframely demo with your very own or any other Twitter feed](https://iframely.com/try). Don't forget to click on results to see the embed codes.
-
 To get started with the APIs: 
 
  - There's a hosted version of these APIs at [iframely.com](https://iframely.com), if you'd rather rely on the cloud
- - [API in Iframely format](https://iframely.com/docs/iframely-api) (`iframe=true` option is only available for hosted API)
+ - [How to install & configure](https://iframely.com/docs/host) your Iframely host.  
+ - [API in Iframely format](https://iframely.com/docs/iframely-api)
  - [API in oEmbed format](https://iframely.com/docs/oembed-api)
  - [About Link Rels, Types and Media Queries](https://iframely.com/docs/links) in Iframely format (players, thumbnails, app, reader, survey, slideshow, etc)
  - [META semantics](https://iframely.com/docs/meta) Iframely API scrapes for you.
- - [How to install & configure](https://iframely.com/docs/host) your open-source host. 
-
-
-## Use APIs in your open-source project
-
-We have provided specific endpoint for the use in open source projects. Read more at [oembedapi.com](http://oembedapi.com).
 
 
 
@@ -47,12 +39,7 @@ If you see an error in our domains whitelist (you can [debug URLs here](http://i
 
 ## License & Authors
 
-MIT License. (c) 2012-2015 Itteco Software Corp. 
-
-Specifically:
-
-- [Nazar Leush](https://github.com/nleush) - _the_ author
-- [Ivan Paramonau](https://twitter.com/iparamonau) - coffee, donuts & inspiration
+MIT License. (c) 2012-2016 Itteco Software Corp. [Nazar Leush](https://github.com/nleush), [Ivan Paramonau](https://twitter.com/iparamonau)
 
 Please, check the [contributors list](https://github.com/itteco/iframely/graphs/contributors) to get to know awesome folks that also helped a lot.
 
diff --git a/docs/SETUP.md b/docs/SETUP.md
index e5ac5c680..caca31054 100644
--- a/docs/SETUP.md
+++ b/docs/SETUP.md
@@ -1,6 +1,6 @@
-# Deploy Iframely to Your Own Servers
+# Deploy Iframely on Your Own Servers
 
-The source-code of [Iframely APIs](https://iframely.com) is hosted [on GitHub](https://github.com/itteco/iframely). It's the Node.js code published under MIT license. You can start self-hosting any time, as APIs are nearly identical (except the hosted version requires API key and can output the HTML of hosted widgets via [Short URLs](https://iframely.com/docs/url-shortener)).
+The source-code of [Iframely](https://iframely.com) parsers is hosted [on GitHub](https://github.com/itteco/iframely). It's a Node.js library and server published under MIT license. You can start self-hosting any time, as APIs are nearly identical (except the hosted version requires API key and can output the HTML of [smart iFrames](https://iframely.com/docs/iframes)).
 
 Here are the instructions to get your instance of APIs up and running.
 
@@ -30,24 +30,17 @@ If you see error `../lib/kerberos.h:5:27: fatal error: gssapi/gssapi.h: No such
 
 ## Configure Iframely
 
-Please, create your local config file to adjust settings. This local config file will be ignored when you pull new versions from Git later on.
+Please create your local config file and adjust settings. This local config file will be ignored when you pull new versions from Git later on.
 
     cp config.local.js.SAMPLE config.local.js
     vi config.local.js
 
 If you support various environment configs and pass it as `NODE_ENV`, create config files that match your enviroments. For example, `config.develop.js`.
 
-Edit the sample config file as you need. You may also override any values from main config.js in your local config.
+Edit the sample config file as you need. Follow the comments put in `config.local.js.SAMPLE` for particular settings. You may also override any values from main config.js in your local config.
 
-At the very least, you need to properly configure:
 
-- `baseAppUrl` - the domain you host Iframely Gateway on. This is required for some embeds that need custom renders.
-- `CACHE_ENGINE` - the caching middleware you'd prefer to use (No Cache, Redis, Memcached or Node.js in-memory cache)
-- If you chose Redis or Memcached, you need to connect Iframely gateway with these systems
-- `allowedOrigins` - very important to list your main app's domain(s) here, and block access to others 
-
-
-There are also some provider-specific values that are required for some domain plugins to work (e.g. wheather to include media in Twitter status embeds). Please, enter your own application keys and secret tokens where applicable. Parsers for Twitter, Flickr and Tumblr won't work without the access tokens to their APIs.
+There are also some provider-specific values that are required for some domain plugins to work (e.g. Google API key for maps and YouTube). Please, enter your own application keys and secret tokens where applicable.
 
 
 Readability parser to get the HTML of the articles is optional and is turned off by default as it affects the processing time of the URLs. If need be, you can also fine-tune API response time by disabling image size detection.
@@ -58,7 +51,7 @@ Iframely has built-in cache with support of Memcached, Redis and Node.js in-memo
 
 In your local config file, define caching parameters:
 
-        CACHE_ENGINE: 'redis',
+        CACHE_ENGINE: 'memcached',
         CACHE_TTL: 0, // In milliseconds. 0 for 'never expire' to let cache engine decide itself when to evict the record
 
 
@@ -98,6 +91,9 @@ Depending on your setup, you may need to configure these pathes in your reverse
     /meta-mappings      -- optional API endpoint with available unified meta
     /supported-plugins-re.json - the list of regexps for plugins
 
+## Your self-hosted endpoints
+
+You can now access your self-hosted API on your domain as `/iframely?url=` and `/oembed?url=` with any optional [query-string parameters](https://iframely.com/docs/parameters) supported by open-source version.
 
 
 ## Update Iframely
@@ -105,7 +101,7 @@ Depending on your setup, you may need to configure these pathes in your reverse
 Please, keep Iframely up-to-date as we keep adding features or releasing fixes. 
 
 
-Custom domain plugins may be returning invalid data if your Iframely instance is obsolete. The domain plugins are error-prone due to dependencies to 3rd parties. Domain plugins do break from time to time, and we'll release hot fixes in this case. Please, follow [Iframely on Twitter](http://twitter.com/iframely) to get timely heads up when hot fixes are required.
+Custom domain plugins may be returning invalid data if your Iframely instance is obsolete. The domain plugins are error-prone due to dependencies to 3rd parties. Domain plugins do break from time to time. Keeping Iframely up-to-date is important.
 
 
 To update Iframely package to its latest version run from Iframely home directory:

From 9fa7e297d30b335481068442a678b67b379ed7cd Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Wed, 4 May 2016 20:59:41 +0300
Subject: [PATCH 242/320] [utils] bugfix

---
 lib/utils.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/utils.js b/lib/utils.js
index ada79bc70..32a974cf9 100644
--- a/lib/utils.js
+++ b/lib/utils.js
@@ -18,7 +18,7 @@ var prepareRequestOptions = exports.prepareRequestOptions = function(request_opt
 
     if (CONFIG.PROXY) {
 
-        var url = request_options.url;
+        var url = request_options.uri || request_options.url;
 
         // TODO: make 'for'.
         var proxy = _.find(CONFIG.PROXY, function (p) {

From ea927d202b835c9421bcac9b006db530974f798e Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Thu, 5 May 2016 10:25:25 -0400
Subject: [PATCH 243/320] [domains] force jpeg mime type on giphy thumbnails

---
 plugins/domains/giphy.com.js | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/plugins/domains/giphy.com.js b/plugins/domains/giphy.com.js
index a3c9255c4..c6380acf9 100644
--- a/plugins/domains/giphy.com.js
+++ b/plugins/domains/giphy.com.js
@@ -10,7 +10,7 @@ module.exports = {
         "oembed-site",
         "oembed-title",
         "keywords",
-        "twitter-image",
+        // "twitter-image",
         "favicon"
     ],
 
@@ -37,6 +37,14 @@ module.exports = {
             height: oembed.height
         });
 
+        links.push({
+            href: twitter.image && (twitter.image.src || twitter.image.url),
+            type: CONFIG.T.image, // keep it here, otherwise thumbnail may come up with GIF MIME type
+            rel: CONFIG.R.thumbnail,
+            width: oembed.width,
+            height: oembed.height
+        });        
+
         return links;
     },
 

From 7030fd797d8edbdb057e83986635c4309096c8af Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Thu, 5 May 2016 20:52:07 +0300
Subject: [PATCH 244/320] [domains] spotify: extract thumbnail plugin; reuse
 widget code

---
 plugins/domains/spotify.com/spotify.album.js  | 61 +-----------------
 plugins/domains/spotify.com/spotify.artist.js | 61 ------------------
 .../domains/{ => spotify.com}/spotify.com.js  |  4 +-
 .../domains/spotify.com/spotify.thumbnail.js  | 27 ++++++++
 plugins/domains/spotify.com/spotify.track.js  | 62 +------------------
 5 files changed, 32 insertions(+), 183 deletions(-)
 rename plugins/domains/{ => spotify.com}/spotify.com.js (97%)
 create mode 100644 plugins/domains/spotify.com/spotify.thumbnail.js

diff --git a/plugins/domains/spotify.com/spotify.album.js b/plugins/domains/spotify.com/spotify.album.js
index 100fc6534..5794edea7 100644
--- a/plugins/domains/spotify.com/spotify.album.js
+++ b/plugins/domains/spotify.com/spotify.album.js
@@ -2,12 +2,6 @@ var cheerio = require('cheerio');
 
 module.exports = {
 
-    highestPriority: true,
-
-    mixins: [
-        "oembed-site"
-    ],
-
     // keep dependency on oEmbed only. Otherwise, there's redirect to relative path for "play.*" and no embeds as a result
     // -- plugin redirect (by "htmlparser") /error/browser-not-supported.php
 
@@ -15,58 +9,8 @@ module.exports = {
 
     provides: 'spotify_data',
 
-    _getCoverImages: function (images) {
-        var coverImages = [];
-        images.forEach(function (image){
-          coverImages.push({
-            href: image.url,
-            type: CONFIG.T.image,
-            rel: CONFIG.R.thumbnail
-          });
-        });
-
-        return coverImages;
-    },
-
-    getLink: function(spotify_data, oembed) {
-
-        var favicon = {
-          href: "http://d2c87l0yth4zbw.cloudfront.net/i/_global/favicon.png",
-          type: CONFIG.T.image,
-          rel: CONFIG.R.icon
-        };
-
-        var thumbnail = this._getCoverImages(spotify_data.images || spotify_data.album.images);
-
-        var player;
-
-        var $container = cheerio('<div>');
-
-        try {
-            $container.html(oembed.html5 || oembed.html);
-        } catch (ex) {}
-
-        var $iframe = $container.find('iframe');
-
-        // if embed code contains <iframe>, return src
-        if ($iframe.length == 1) {
-
-            player = {
-                href: $iframe.attr('src'),
-                type: CONFIG.T.text_html,
-                rel: [CONFIG.R.player, CONFIG.R.ssl, CONFIG.R.html5],
-                 "aspect-ratio":  100 / 115 // hardcode here as otherwise there's blank space beneath the player
-            }
-        }
-
-        return thumbnail.concat([
-          favicon,
-          player
-        ]);
-
-    },
 
-    getMeta: function (spotify_data, oembed) {
+    getMeta: function (spotify_data) {
         var releaseDate = new Date(spotify_data.release_date).getFullYear();
         releaseDate = !releaseDate ? '' : '(' + releaseDate + ')';
 
@@ -107,9 +51,6 @@ module.exports = {
     },
 
     tests: [
-        "https://play.spotify.com/user/1241058074/playlist/44CgBWWr6nlpy7bdZS8ZmN",
-        "http://open.spotify.com/track/6ol4ZSifr7r3Lb2a9L5ZAB",
-        "http://open.spotify.com/user/cgwest23/playlist/4SsKyjaGlrHJbRCQwpeUsz",
         "http://open.spotify.com/album/42jcZtPYrmZJhqTbUhLApi"
     ]
 };
diff --git a/plugins/domains/spotify.com/spotify.artist.js b/plugins/domains/spotify.com/spotify.artist.js
index 638be1130..68b1e3c6b 100644
--- a/plugins/domains/spotify.com/spotify.artist.js
+++ b/plugins/domains/spotify.com/spotify.artist.js
@@ -2,12 +2,6 @@ var cheerio = require('cheerio');
 
 module.exports = {
 
-    highestPriority: true,
-
-    mixins: [
-        "oembed-site"
-    ],
-
     // keep dependency on oEmbed only. Otherwise, there's redirect to relative path for "play.*" and no embeds as a result
     // -- plugin redirect (by "htmlparser") /error/browser-not-supported.php
 
@@ -15,57 +9,6 @@ module.exports = {
 
     provides: 'spotify_data',
 
-    _getCoverImages: function (images) {
-        var coverImages = [];
-        images.forEach(function (image){
-          coverImages.push({
-            href: image.url,
-            type: CONFIG.T.image,
-            rel: CONFIG.R.thumbnail
-          });
-        });
-
-        return coverImages;
-    },
-
-    getLink: function(spotify_data, oembed) {
-
-        var favicon = {
-          href: "http://d2c87l0yth4zbw.cloudfront.net/i/_global/favicon.png",
-          type: CONFIG.T.image,
-          rel: CONFIG.R.icon
-        };
-
-        var thumbnail = this._getCoverImages(spotify_data.images || spotify_data.album.images);
-
-        var player;
-
-        var $container = cheerio('<div>');
-
-        try {
-            $container.html(oembed.html5 || oembed.html);
-        } catch (ex) {}
-
-        var $iframe = $container.find('iframe');
-
-        // if embed code contains <iframe>, return src
-        if ($iframe.length == 1) {
-
-            player = {
-                href: $iframe.attr('src'),
-                type: CONFIG.T.text_html,
-                rel: [CONFIG.R.player, CONFIG.R.ssl, CONFIG.R.html5],
-                 "aspect-ratio":  100 / 115 // hardcode here as otherwise there's blank space beneath the player
-            }
-        }
-
-        return thumbnail.concat([
-          favicon,
-          player
-        ]);
-
-    },
-
     getMeta: function (spotify_data, oembed) {
         var description;
 
@@ -106,9 +49,5 @@ module.exports = {
     },
 
     tests: [
-        "https://play.spotify.com/user/1241058074/playlist/44CgBWWr6nlpy7bdZS8ZmN",
-        "http://open.spotify.com/track/6ol4ZSifr7r3Lb2a9L5ZAB",
-        "http://open.spotify.com/user/cgwest23/playlist/4SsKyjaGlrHJbRCQwpeUsz",
-        "http://open.spotify.com/album/42jcZtPYrmZJhqTbUhLApi"
     ]
 };
diff --git a/plugins/domains/spotify.com.js b/plugins/domains/spotify.com/spotify.com.js
similarity index 97%
rename from plugins/domains/spotify.com.js
rename to plugins/domains/spotify.com/spotify.com.js
index ebc6177f3..c6de66efa 100644
--- a/plugins/domains/spotify.com.js
+++ b/plugins/domains/spotify.com/spotify.com.js
@@ -39,7 +39,9 @@ module.exports = {
 
     },
 
-    tests: [
+    tests: [{
+        noFeeds: true
+    },
         "https://play.spotify.com/user/1241058074/playlist/44CgBWWr6nlpy7bdZS8ZmN",
         "http://open.spotify.com/track/6ol4ZSifr7r3Lb2a9L5ZAB",
         "http://open.spotify.com/user/cgwest23/playlist/4SsKyjaGlrHJbRCQwpeUsz",
diff --git a/plugins/domains/spotify.com/spotify.thumbnail.js b/plugins/domains/spotify.com/spotify.thumbnail.js
new file mode 100644
index 000000000..501fd731e
--- /dev/null
+++ b/plugins/domains/spotify.com/spotify.thumbnail.js
@@ -0,0 +1,27 @@
+var cheerio = require('cheerio');
+
+module.exports = {
+
+    getLink: function(spotify_data) {
+
+        var images = spotify_data.images || spotify_data.album.images;
+
+        var coverImages = [];
+        images.forEach(function (image){
+            coverImages.push({
+                href: image.url,
+                type: CONFIG.T.image,
+                rel: CONFIG.R.thumbnail
+            });
+        });
+
+        return coverImages;
+    },
+
+    tests: [{
+        noFeeds: true
+    },
+        "http://open.spotify.com/track/6ol4ZSifr7r3Lb2a9L5ZAB",
+        "http://open.spotify.com/album/42jcZtPYrmZJhqTbUhLApi"
+    ]
+};
diff --git a/plugins/domains/spotify.com/spotify.track.js b/plugins/domains/spotify.com/spotify.track.js
index 4f0d7abd4..68208a2d6 100644
--- a/plugins/domains/spotify.com/spotify.track.js
+++ b/plugins/domains/spotify.com/spotify.track.js
@@ -2,12 +2,6 @@ var cheerio = require('cheerio');
 
 module.exports = {
 
-    highestPriority: true,
-
-    mixins: [
-        "oembed-site"
-    ],
-
     // keep dependency on oEmbed only. Otherwise, there's redirect to relative path for "play.*" and no embeds as a result
     // -- plugin redirect (by "htmlparser") /error/browser-not-supported.php
 
@@ -15,58 +9,7 @@ module.exports = {
 
     provides: 'spotify_data',
 
-    _getCoverImages: function (images) {
-        var coverImages = [];
-        images.forEach(function (image){
-          coverImages.push({
-            href: image.url,
-            type: CONFIG.T.image,
-            rel: CONFIG.R.thumbnail
-          });
-        });
-
-        return coverImages;
-    },
-
-    getLink: function(spotify_data, oembed) {
-
-        var favicon = {
-          href: "http://d2c87l0yth4zbw.cloudfront.net/i/_global/favicon.png",
-          type: CONFIG.T.image,
-          rel: CONFIG.R.icon
-        };
-
-        var thumbnail = this._getCoverImages(spotify_data.images || spotify_data.album.images);
-
-        var player;
-
-        var $container = cheerio('<div>');
-
-        try {
-            $container.html(oembed.html5 || oembed.html);
-        } catch (ex) {}
-
-        var $iframe = $container.find('iframe');
-
-        // if embed code contains <iframe>, return src
-        if ($iframe.length == 1) {
-
-            player = {
-                href: $iframe.attr('src'),
-                type: CONFIG.T.text_html,
-                rel: [CONFIG.R.player, CONFIG.R.ssl, CONFIG.R.html5],
-                "aspect-ratio":  100 / 115 // hardcode here as otherwise there's blank space beneath the player
-            }
-        }
-
-        return thumbnail.concat([
-          favicon,
-          player
-        ]);
-
-    },
-
-    getMeta: function (spotify_data, oembed) {
+    getMeta: function (spotify_data) {
         var releaseDate = new Date(spotify_data.album.released).getFullYear();
         releaseDate = !releaseDate ? '' : '(' + releaseDate + ')';
         return {
@@ -104,9 +47,6 @@ module.exports = {
     },
 
     tests: [
-        "https://play.spotify.com/user/1241058074/playlist/44CgBWWr6nlpy7bdZS8ZmN",
         "http://open.spotify.com/track/6ol4ZSifr7r3Lb2a9L5ZAB",
-        "http://open.spotify.com/user/cgwest23/playlist/4SsKyjaGlrHJbRCQwpeUsz",
-        "http://open.spotify.com/album/42jcZtPYrmZJhqTbUhLApi"
     ]
 };

From b24f2afe110b02dd4a6880e3f83eeaa50e8b1246 Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Thu, 5 May 2016 21:12:10 +0300
Subject: [PATCH 245/320] [domains] spotify: add tests

---
 plugins/domains/spotify.com/spotify.album.js     | 3 ++-
 plugins/domains/spotify.com/spotify.artist.js    | 1 +
 plugins/domains/spotify.com/spotify.com.js       | 3 ++-
 plugins/domains/spotify.com/spotify.thumbnail.js | 7 ++++++-
 plugins/domains/spotify.com/spotify.track.js     | 3 +++
 5 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/plugins/domains/spotify.com/spotify.album.js b/plugins/domains/spotify.com/spotify.album.js
index 5794edea7..a9ffa7a56 100644
--- a/plugins/domains/spotify.com/spotify.album.js
+++ b/plugins/domains/spotify.com/spotify.album.js
@@ -51,6 +51,7 @@ module.exports = {
     },
 
     tests: [
-        "http://open.spotify.com/album/42jcZtPYrmZJhqTbUhLApi"
+        "http://open.spotify.com/album/42jcZtPYrmZJhqTbUhLApi",
+        "https://open.spotify.com/album/3N5MQ6jJk5P0bXpsMh4biJ"
     ]
 };
diff --git a/plugins/domains/spotify.com/spotify.artist.js b/plugins/domains/spotify.com/spotify.artist.js
index 68b1e3c6b..0e0461a12 100644
--- a/plugins/domains/spotify.com/spotify.artist.js
+++ b/plugins/domains/spotify.com/spotify.artist.js
@@ -49,5 +49,6 @@ module.exports = {
     },
 
     tests: [
+        "https://play.spotify.com/artist/586uxXMyD5ObPuzjtrzO1Q"
     ]
 };
diff --git a/plugins/domains/spotify.com/spotify.com.js b/plugins/domains/spotify.com/spotify.com.js
index c6de66efa..2e1b94a78 100644
--- a/plugins/domains/spotify.com/spotify.com.js
+++ b/plugins/domains/spotify.com/spotify.com.js
@@ -45,6 +45,7 @@ module.exports = {
         "https://play.spotify.com/user/1241058074/playlist/44CgBWWr6nlpy7bdZS8ZmN",
         "http://open.spotify.com/track/6ol4ZSifr7r3Lb2a9L5ZAB",
         "http://open.spotify.com/user/cgwest23/playlist/4SsKyjaGlrHJbRCQwpeUsz",
-        "http://open.spotify.com/album/42jcZtPYrmZJhqTbUhLApi"
+        "http://open.spotify.com/album/42jcZtPYrmZJhqTbUhLApi",
+        "https://open.spotify.com/user/bradgarropy/playlist/0OV99Ep2d1DCENJRPuEtXV"
     ]
 };
\ No newline at end of file
diff --git a/plugins/domains/spotify.com/spotify.thumbnail.js b/plugins/domains/spotify.com/spotify.thumbnail.js
index 501fd731e..61b27154f 100644
--- a/plugins/domains/spotify.com/spotify.thumbnail.js
+++ b/plugins/domains/spotify.com/spotify.thumbnail.js
@@ -22,6 +22,11 @@ module.exports = {
         noFeeds: true
     },
         "http://open.spotify.com/track/6ol4ZSifr7r3Lb2a9L5ZAB",
-        "http://open.spotify.com/album/42jcZtPYrmZJhqTbUhLApi"
+        "https://open.spotify.com/track/4by34YzNiEFRESAnBXo7x4",
+        "https://open.spotify.com/track/2qZ36jzyP1u29KaeuMmRZx",
+        "http://open.spotify.com/track/7ldU6Vh9bPCbKW2zHE65dg",
+        "http://open.spotify.com/album/42jcZtPYrmZJhqTbUhLApi",
+        "https://open.spotify.com/album/3N5MQ6jJk5P0bXpsMh4biJ",
+        "https://play.spotify.com/artist/586uxXMyD5ObPuzjtrzO1Q"
     ]
 };
diff --git a/plugins/domains/spotify.com/spotify.track.js b/plugins/domains/spotify.com/spotify.track.js
index 68208a2d6..bf3a9bbe7 100644
--- a/plugins/domains/spotify.com/spotify.track.js
+++ b/plugins/domains/spotify.com/spotify.track.js
@@ -48,5 +48,8 @@ module.exports = {
 
     tests: [
         "http://open.spotify.com/track/6ol4ZSifr7r3Lb2a9L5ZAB",
+        "https://open.spotify.com/track/4by34YzNiEFRESAnBXo7x4",
+        "https://open.spotify.com/track/2qZ36jzyP1u29KaeuMmRZx",
+        "http://open.spotify.com/track/7ldU6Vh9bPCbKW2zHE65dg"
     ]
 };

From 98e140d4f546512ee99621ab38fd240ca4935880 Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Thu, 5 May 2016 21:47:43 +0300
Subject: [PATCH 246/320] [domains] spotify: add test urls

---
 plugins/domains/spotify.com/spotify.album.js  | 8 ++++++--
 plugins/domains/spotify.com/spotify.artist.js | 9 +++++++--
 plugins/domains/spotify.com/spotify.track.js  | 8 ++++++--
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/plugins/domains/spotify.com/spotify.album.js b/plugins/domains/spotify.com/spotify.album.js
index a9ffa7a56..f91d0d185 100644
--- a/plugins/domains/spotify.com/spotify.album.js
+++ b/plugins/domains/spotify.com/spotify.album.js
@@ -50,8 +50,12 @@ module.exports = {
         }, cb);
     },
 
-    tests: [
+    tests: [{
+        noFeeds: true
+    },
         "http://open.spotify.com/album/42jcZtPYrmZJhqTbUhLApi",
-        "https://open.spotify.com/album/3N5MQ6jJk5P0bXpsMh4biJ"
+        "https://open.spotify.com/album/3N5MQ6jJk5P0bXpsMh4biJ",
+        "https://play.spotify.com/album/3xqv5Al4TjgG9daEWZplIy",
+        "https://play.spotify.com/album/65GHnO5PcfuXUADdyUPL70"
     ]
 };
diff --git a/plugins/domains/spotify.com/spotify.artist.js b/plugins/domains/spotify.com/spotify.artist.js
index 0e0461a12..f7df76d60 100644
--- a/plugins/domains/spotify.com/spotify.artist.js
+++ b/plugins/domains/spotify.com/spotify.artist.js
@@ -48,7 +48,12 @@ module.exports = {
         }, cb);
     },
 
-    tests: [
-        "https://play.spotify.com/artist/586uxXMyD5ObPuzjtrzO1Q"
+    tests: [{
+        noFeeds: true
+    },
+        "https://play.spotify.com/artist/586uxXMyD5ObPuzjtrzO1Q",
+        "https://play.spotify.com/artist/1ls8tCaZ7FVugjGbQI74zW",
+        "https://play.spotify.com/artist/586eJg9tmYDLSahAhozZBo",
+        "https://play.spotify.com/artist/6RAx8RRxoHeJIqD2d0EjOa"
     ]
 };
diff --git a/plugins/domains/spotify.com/spotify.track.js b/plugins/domains/spotify.com/spotify.track.js
index bf3a9bbe7..a3f16fc4b 100644
--- a/plugins/domains/spotify.com/spotify.track.js
+++ b/plugins/domains/spotify.com/spotify.track.js
@@ -46,10 +46,14 @@ module.exports = {
         }, cb);
     },
 
-    tests: [
+    tests: [{
+        noFeeds: true
+    },
         "http://open.spotify.com/track/6ol4ZSifr7r3Lb2a9L5ZAB",
         "https://open.spotify.com/track/4by34YzNiEFRESAnBXo7x4",
         "https://open.spotify.com/track/2qZ36jzyP1u29KaeuMmRZx",
-        "http://open.spotify.com/track/7ldU6Vh9bPCbKW2zHE65dg"
+        "http://open.spotify.com/track/7ldU6Vh9bPCbKW2zHE65dg",
+        "https://play.spotify.com/track/2vN0b6d2ogn72kL75EmN3v",
+        "https://play.spotify.com/track/34zWZOSpU2V1ab0PiZCcv4"
     ]
 };

From d986ec37fb1182bf60be61a2f61d9ff6ab72d027 Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Thu, 5 May 2016 22:03:05 +0300
Subject: [PATCH 247/320] [docs] add Docker documentation

---
 docs/SETUP.md | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/docs/SETUP.md b/docs/SETUP.md
index caca31054..3abbf64a8 100644
--- a/docs/SETUP.md
+++ b/docs/SETUP.md
@@ -115,5 +115,19 @@ and restart your server afterwards. If you use [Forever](https://github.com/node
 If you fork, make sure to merge from the upstream for the newer versions.
 
 
+## Docker
+
+The Docker container will:
+
+ * Run forever start cluster.js by default
+ * Run forever start <args> if command line arguments are supplied
+ * Gracefully shutdown when receiving SIGTERM from docker stop
+
+A brief documentation:
+
+    docker build -t iframely:latest .
+    docker run -it -p 8061:8061 -v $PWD/config.local.js:/iframely/config.local.js --name iframely iframely:latest
+    docker stop iframely
+
 
 (c) 2013-2015 [Itteco Software Corp](http://itteco.com). Licensed under MIT. [Get it on Github](https://github.com/itteco/iframely)
\ No newline at end of file

From c2f0b1146e5050c02e206a4827ee9a03a61bc351 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Thu, 5 May 2016 15:44:12 -0400
Subject: [PATCH 248/320] [domains] add max-width to twitter video

---
 plugins/domains/{ => twitter.com}/twitter.status.js | 3 ++-
 plugins/domains/{ => twitter.com}/twitter.video.js  | 0
 2 files changed, 2 insertions(+), 1 deletion(-)
 rename plugins/domains/{ => twitter.com}/twitter.status.js (99%)
 rename plugins/domains/{ => twitter.com}/twitter.video.js (100%)

diff --git a/plugins/domains/twitter.status.js b/plugins/domains/twitter.com/twitter.status.js
similarity index 99%
rename from plugins/domains/twitter.status.js
rename to plugins/domains/twitter.com/twitter.status.js
index 975f6e1ea..b73c0339b 100644
--- a/plugins/domains/twitter.status.js
+++ b/plugins/domains/twitter.com/twitter.status.js
@@ -194,7 +194,8 @@ module.exports = {
                 html: html,
                 type: CONFIG.T.text_html,
                 rel: [CONFIG.R.player, CONFIG.R.inline, CONFIG.R.ssl, CONFIG.R.html5],
-                "aspect-ratio": twitter_video.width / twitter_video.height
+                "aspect-ratio": twitter_video.width / twitter_video.height,
+                "max-width": 888 // good one, Twitter!
             });
 
         } else {
diff --git a/plugins/domains/twitter.video.js b/plugins/domains/twitter.com/twitter.video.js
similarity index 100%
rename from plugins/domains/twitter.video.js
rename to plugins/domains/twitter.com/twitter.video.js

From 140a533ab877900a3a929fc1e0a11e3014e7d362 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Thu, 5 May 2016 16:00:41 -0400
Subject: [PATCH 249/320] [twitter] handle 'hide_tweet' for videos

---
 plugins/domains/twitter.com/twitter.status.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/plugins/domains/twitter.com/twitter.status.js b/plugins/domains/twitter.com/twitter.status.js
index b73c0339b..68ac3016f 100644
--- a/plugins/domains/twitter.com/twitter.status.js
+++ b/plugins/domains/twitter.com/twitter.status.js
@@ -1,6 +1,6 @@
 var async = require('async');
-var cache = require('../../lib/cache');
-var sysUtils = require('../../logging');
+var cache = require('../../../lib/cache');
+var sysUtils = require('../../../logging');
 var _ = require('underscore');
 
 module.exports = {
@@ -189,7 +189,9 @@ module.exports = {
 
         if (twitter_video) {
 
-            html = html.replace(/class="twitter-tweet"/g, 'class="twitter-video"');
+            html = html.replace(/class="twitter-tweet"/g, 
+                'class="twitter-video"' + (options.getProviderOptions('twitter.hide_tweet') ? ' data-status="hidden"': ''));
+
             links.push({
                 html: html,
                 type: CONFIG.T.text_html,

From 0f28038a5c48024ed37e766a1619f2e228e48e81 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Thu, 5 May 2016 17:16:42 -0400
Subject: [PATCH 250/320] [twitter] exclude external videos e.g. NFL

---
 plugins/domains/twitter.com/twitter.video.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/domains/twitter.com/twitter.video.js b/plugins/domains/twitter.com/twitter.video.js
index aa74a52ba..4db859d70 100644
--- a/plugins/domains/twitter.com/twitter.video.js
+++ b/plugins/domains/twitter.com/twitter.video.js
@@ -9,7 +9,9 @@ module.exports = {
     getData: function(__allow_twitter_video, og) {
 
         return {
-            twitter_video: og.video || false
+            twitter_video: (og.video && og.image && /^https?:\/\/pbs\.twimg\.com\//i.test(og.image.url || og.image.src || og.image)) ? og.video : false
+            // exclude proxy images, ex:
+            // https://twitter.com/nfl/status/648185526034395137
         }
     }
 };
\ No newline at end of file

From bc282a8a66b07c6d429052fb562530ca9e79d125 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Sun, 8 May 2016 15:27:54 -0400
Subject: [PATCH 251/320] [domains] add Tidal

---
 plugins/domains/tidal.com.js | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 plugins/domains/tidal.com.js

diff --git a/plugins/domains/tidal.com.js b/plugins/domains/tidal.com.js
new file mode 100644
index 000000000..75f79eeb4
--- /dev/null
+++ b/plugins/domains/tidal.com.js
@@ -0,0 +1,23 @@
+module.exports = {
+
+    re: [
+        /^https?:\/\/(listen\.)?tidal\.com\/(album|track|playlist)/i
+        // `video` is broken
+    ],
+
+    mixins: ["*"],
+
+    getLink: function(twitter) {
+        return {
+            href: twitter.player && twitter.player.value,
+            type: CONFIG.T.text_html,
+            rel: [CONFIG.R.app, CONFIG.R.twitter], // `player` doesn't really play
+            width: twitter.player.width,
+            height: twitter.player.height
+        };
+    },
+
+    tests: [
+        "http://tidal.com/track/56638583"
+    ]
+};
\ No newline at end of file

From f2e2b6485862a4bf3679dab98cf50e0a1ec10706 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Sun, 8 May 2016 15:28:10 -0400
Subject: [PATCH 252/320] [domains] fix NPR player rel

---
 plugins/domains/npr.org/npr.player.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/domains/npr.org/npr.player.js b/plugins/domains/npr.org/npr.player.js
index 6c729d494..f96aab068 100644
--- a/plugins/domains/npr.org/npr.player.js
+++ b/plugins/domains/npr.org/npr.player.js
@@ -12,7 +12,7 @@ module.exports = {
         return {
                 href: "http://www.npr.org/player/embed/" + urlMatch[1] + "/" + urlMatch[2],
                 type: CONFIG.T.text_html,
-                rel: [CONFIG.R.player, CONFIG.R.html5],
+                rel: [CONFIG.R.player, CONFIG.R.html5, CONFIG.R.app],
                 height: 290,
                 'max-width': 800
             };

From b55ae8af7f315a31160c1b7051988e86e7d322e8 Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Tue, 10 May 2016 18:56:47 +0300
Subject: [PATCH 253/320] [domains] sptofity.com: fix oembed provider for
 specific urls

---
 lib/plugins/system/oembed/providers.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/plugins/system/oembed/providers.json b/lib/plugins/system/oembed/providers.json
index 757ee08c0..96a1e3729 100644
--- a/lib/plugins/system/oembed/providers.json
+++ b/lib/plugins/system/oembed/providers.json
@@ -379,9 +379,9 @@
     {
         "name": "Spotify",
         "templates": [
-            "(open|embed|play)\\.spotify\\.com/.*"
+            "((?:open|embed|play)\\.spotify\\.com/[^\\?]*)\\??.*"
         ],
-        "endpoint": "https://embed.spotify.com/oembed/"
+        "endpoint": "https://embed.spotify.com/oembed/?url=https://{1}&format={format}"
     },
     {
         "name": "Issuu",

From c370282f462e79a4feaf659677d9f025b296e7a1 Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Tue, 10 May 2016 19:45:16 +0300
Subject: [PATCH 254/320] [domains] spotify.com: more uris

---
 lib/plugins/system/oembed/providers.json     | 4 ++--
 plugins/domains/spotify.com/spotify.album.js | 2 +-
 plugins/domains/spotify.com/spotify.track.js | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/plugins/system/oembed/providers.json b/lib/plugins/system/oembed/providers.json
index 96a1e3729..ee62773d5 100644
--- a/lib/plugins/system/oembed/providers.json
+++ b/lib/plugins/system/oembed/providers.json
@@ -379,9 +379,9 @@
     {
         "name": "Spotify",
         "templates": [
-            "((?:open|embed|play)\\.spotify\\.com/[^\\?]*)\\??.*"
+            "((?:open|embed|play)\\.spotify\\.com/)(?:embed/)?([^\\?]*)\\??.*"
         ],
-        "endpoint": "https://embed.spotify.com/oembed/?url=https://{1}&format={format}"
+        "endpoint": "https://embed.spotify.com/oembed/?url=https://{1}{2}&format={format}"
     },
     {
         "name": "Issuu",
diff --git a/plugins/domains/spotify.com/spotify.album.js b/plugins/domains/spotify.com/spotify.album.js
index f91d0d185..55736ce7f 100644
--- a/plugins/domains/spotify.com/spotify.album.js
+++ b/plugins/domains/spotify.com/spotify.album.js
@@ -5,7 +5,7 @@ module.exports = {
     // keep dependency on oEmbed only. Otherwise, there's redirect to relative path for "play.*" and no embeds as a result
     // -- plugin redirect (by "htmlparser") /error/browser-not-supported.php
 
-    re: /https?:\/\/(?:open|play).spotify.com\/album\/(.*)/,
+    re: /https?:\/\/(?:open|play).spotify.com\/(?:embed\/)?album\/(.*)/,
 
     provides: 'spotify_data',
 
diff --git a/plugins/domains/spotify.com/spotify.track.js b/plugins/domains/spotify.com/spotify.track.js
index a3f16fc4b..eb66b82ba 100644
--- a/plugins/domains/spotify.com/spotify.track.js
+++ b/plugins/domains/spotify.com/spotify.track.js
@@ -5,7 +5,7 @@ module.exports = {
     // keep dependency on oEmbed only. Otherwise, there's redirect to relative path for "play.*" and no embeds as a result
     // -- plugin redirect (by "htmlparser") /error/browser-not-supported.php
 
-    re: /https?:\/\/(?:open|play).spotify.com\/track\/(.*)/,
+    re: /https?:\/\/(?:open|play).spotify.com\/(?:embed\/)?track\/(.*)/,
 
     provides: 'spotify_data',
 

From 4fb25be825abcdcfef020c1060cd0a875d02a148 Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Wed, 11 May 2016 14:52:34 +0300
Subject: [PATCH 255/320] [domains] disable medium.com embed

---
 plugins/{domains => .fixme}/medium.com.js | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename plugins/{domains => .fixme}/medium.com.js (100%)

diff --git a/plugins/domains/medium.com.js b/plugins/.fixme/medium.com.js
similarity index 100%
rename from plugins/domains/medium.com.js
rename to plugins/.fixme/medium.com.js

From 4f7a0e4e6f3accfd553fee0bb9a92c973d5ee9db Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Wed, 11 May 2016 10:41:58 -0400
Subject: [PATCH 256/320] [docs] mention a way to skip iframe renders

---
 config.local.js.SAMPLE | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/config.local.js.SAMPLE b/config.local.js.SAMPLE
index 9e5f08cbe..0316d3b9d 100644
--- a/config.local.js.SAMPLE
+++ b/config.local.js.SAMPLE
@@ -8,6 +8,9 @@
         baseAppUrl: "http://yourdomain.com",
         relativeStaticUrl: "/r",
 
+        // Or just skip built-in renders altogether
+        SKIP_IFRAMELY_RENDERS: true,
+
         // For legacy reasons the response format of Iframely open-source is
         // different by default as it does not group the links array by rel.
         // In order to get the same grouped ressonse as in Cloud API,
@@ -108,13 +111,6 @@
             "twitter": {
                 "max-width": 550,
                 "min-width": 250,
-
-                // Twitter rolled back to oEmbed v 1, their 1.1+oauth endpoint is no longer in the documentation
-                // consumer_key: 'INSERT YOUR VALUE',
-                // consumer_secret: 'INSERT YOUR VALUE',
-                // access_token: 'INSERT YOUR VALUE',
-                // access_token_secret: 'INSERT YOUR VALUE',
-
                 hide_media: false,
                 hide_thread: false,
                 omit_script: false,

From 8049b40438c587230b3633028a213c23f310630d Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Wed, 11 May 2016 10:53:33 -0400
Subject: [PATCH 257/320] what's new for v0.9.5

---
 WHATSNEW.md | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/WHATSNEW.md b/WHATSNEW.md
index b26a49e61..7f9ff876d 100644
--- a/WHATSNEW.md
+++ b/WHATSNEW.md
@@ -2,7 +2,17 @@
 
 This is the history of the Iframely changes. Updates that are older than one year are not shown.
 
-Stay tuned, either by watching [Iframely on GitHub](https://github.com/itteco/iframely) or following [Iframely on Twitter](https://twitter.com/iframely).
+To stay tuned and up-to-date, watch [Iframely on GitHub](https://github.com/itteco/iframely).
+
+### 2016.05.11, Version 0.9.5
+
+Heads-up: `request` module dependency was upgraded. Please run `npm update` when deploying this version.
+
+ - Twitter plugin was switched to new oEmbed endpoint according to current docs
+ - Medium embeds were disabled as they are broken as of version's date
+ - NPR.org plugin supports links to section in addition to direct player links
+ - Minor fixes for number of other domain parsers
+
 
 ### 2016.04.13, Version 0.9.4
 

From b6252765b7242b9957dbd92accd26e55dafe1012 Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Wed, 11 May 2016 18:06:36 +0300
Subject: [PATCH 258/320] update version to 0.9.5

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 9025a6ff8..3bb457675 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "iframely",
-    "version": "0.9.4",
+    "version": "0.9.5",
     
     "description": "oEmbed/2 gateway endpoint. Get embed data for various http links through one self-hosted API",
     "keywords": ["oembed", "embed", "open graph", "og", "twitter cards"],

From 1d52794703f1be8c9be1fd815b7cb9c367cf6865 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Fri, 13 May 2016 09:56:42 -0400
Subject: [PATCH 259/320] [domains] cover more of NPR

---
 plugins/domains/npr.org/npr.sections.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugins/domains/npr.org/npr.sections.js b/plugins/domains/npr.org/npr.sections.js
index e27185e53..d87c94319 100644
--- a/plugins/domains/npr.org/npr.sections.js
+++ b/plugins/domains/npr.org/npr.sections.js
@@ -1,7 +1,8 @@
 module.exports = {
 
     re: [
-        /^https?:\/\/www\.npr\.org\/sections\//i
+        /^https?:\/\/www\.npr\.org\/sections\//i,
+        /^https?:\/\/www\.npr\.org\/\d{4}\/\d{2}\/\d{2}\/\d+\//i        
     ],
 
     mixins: ["*"],
@@ -31,6 +32,7 @@ module.exports = {
     tests: [
         "http://www.npr.org/sections/thetwo-way/2016/04/11/473874785/hundreds-protest-gerrymandering-campaign-finance-laws-on-capitols-steps",
         "http://www.npr.org/sections/alltechconsidered/2015/04/29/401236656/libraries-make-space-for-3-d-printers-rules-are-sure-to-follow",
-        "http://www.npr.org/sections/itsallpolitics/2015/08/27/434872755/exactly-what-kind-of-socialist-is-bernie-sanders"
+        "http://www.npr.org/sections/itsallpolitics/2015/08/27/434872755/exactly-what-kind-of-socialist-is-bernie-sanders",
+        "http://www.npr.org/2016/05/04/476793671/first-listen-mudcrutch-2"
     ]
 };
\ No newline at end of file

From cb8c4c5164752dfb2ad3d1da36cb3eb0eb3b4fd7 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Fri, 13 May 2016 10:17:33 -0400
Subject: [PATCH 260/320] [domains] cover Vice videos on video.vice.com as well

---
 plugins/domains/espn.com.js    |  6 +++---
 plugins/domains/vice.videos.js | 35 ++++++++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 3 deletions(-)
 create mode 100644 plugins/domains/vice.videos.js

diff --git a/plugins/domains/espn.com.js b/plugins/domains/espn.com.js
index 730817373..d6db887ee 100644
--- a/plugins/domains/espn.com.js
+++ b/plugins/domains/espn.com.js
@@ -1,9 +1,9 @@
 module.exports = {
 
     re: [
-        /https?:\/\/espn\.go\.com\/video\/clip\?id=(espn):(\d+)/i,
-        /https?:\/\/(espn)\.go\.com\/video\/clip\?id=(\d+)/i,
-        /https?:\/\/xgames\.espn\.go\.com\/(xgames)\/video\/(\d+)\//i
+        /^https?:\/\/espn\.go\.com\/video\/clip\?id=(espn):(\d+)/i,
+        /^https?:\/\/(espn)\.go\.com\/video\/clip\?id=(\d+)/i,
+        /^https?:\/\/xgames\.espn\.go\.com\/(xgames)\/video\/(\d+)\//i
     ],
 
     mixins: ["*"],
diff --git a/plugins/domains/vice.videos.js b/plugins/domains/vice.videos.js
new file mode 100644
index 000000000..0041e7bc7
--- /dev/null
+++ b/plugins/domains/vice.videos.js
@@ -0,0 +1,35 @@
+module.exports = {
+
+    re: [
+        /^https?:\/\/video\.vice\.com\/(\w{2}_\w{2})\/video\/[^\/]+\/(\w+)/i        
+    ],
+
+    provides: '__allowEmbedURL',
+
+    mixins: ["*"],
+
+    getLink: function(urlMatch, schemaVideoObject) {
+
+        // schemaVideoObject arg is here to make sure there's an embeddable vid on the page
+
+        if (schemaVideoObject.embedURL || schemaVideoObject.embedUrl) {
+            return {
+                href: 'https://video.vice.com/' + urlMatch[1] + '/embed/' + urlMatch[2],
+                type: CONFIG.T.text_html,
+                rel: [CONFIG.R.player, CONFIG.R.html5],
+                "aspect-ratio": 560 / 315
+            };
+        }
+    },
+
+    getData: function (urlMatch) {
+            // this extracts proper meta from SchemaVideo microformat, but does not white-list embedURL automatically
+            return {
+                __allowEmbedURL: true
+            };        
+    },
+
+    tests: [
+        "https://video.vice.com/en_us/video/what-it-means-to-be-a-drum-major-scene/5733a7bc93a621680434f5a0?latest=1"
+    ]
+};
\ No newline at end of file

From c77fa7c7439b2c859df99fe6be3469d930913e01 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Wed, 18 May 2016 16:19:06 -0400
Subject: [PATCH 261/320] [general] and 4 years later we finally have automatic
 validation for Ooyala without the need for whitelist

---
 plugins/links/promo/ooyala.js | 68 +++++++++++++++++++++++++++++++++++
 1 file changed, 68 insertions(+)
 create mode 100644 plugins/links/promo/ooyala.js

diff --git a/plugins/links/promo/ooyala.js b/plugins/links/promo/ooyala.js
new file mode 100644
index 000000000..c6134a8cf
--- /dev/null
+++ b/plugins/links/promo/ooyala.js
@@ -0,0 +1,68 @@
+module.exports = {
+
+    provides: '__ooyalaPlayer',
+
+    getData: function(meta, whitelistRecord) {
+
+        // do not process if there is a whitelist record for this domain
+        if (!whitelistRecord.isDefault) {return;}
+        
+        var video_src = (meta.twitter && meta.twitter.player && meta.twitter.player.value) || (meta.og && meta.og.video && meta.og.video.url);
+
+        if (!video_src || video_src instanceof Array || !/^https?:\/\/player\.ooyala\.com\/(?:tframe\.html|player\.swf)/i.test(video_src)) {
+            return;
+        }
+        
+        var urlMatch = video_src.match(/^https?:\/\/player\.ooyala\.com\/(?:tframe\.html|player\.swf)\?(?:embedCode|ec)=([_a-zA-Z0-9\-]+)/);
+
+        if (urlMatch) {
+            return {
+                __ooyalaPlayer: {
+                    embedCode: urlMatch[1],
+                    pbid: /&pbid=/.test(video_src) ? video_src.match(/pbid=([_a-zA-Z0-9\-]+)/)[1] : null,
+                    width: (meta.twitter && meta.twitter.player && meta.twitter.player.width) || (meta.og && meta.og.video && meta.og.video.width),
+                    height: (meta.twitter && meta.twitter.player && meta.twitter.player.height) || (meta.og && meta.og.video && meta.og.video.height)
+                }
+            };
+        } 
+    },
+
+    getLink: function(__ooyalaPlayer, request, cb) {
+
+        request({
+            uri: "http://player.ooyala.com/nuplayer?embedCode=" + __ooyalaPlayer.embedCode,
+            method: 'HEAD',
+            headers: {
+                'Accept-Encoding': 'gzip, deflate, sdch', // this is required for head request to return content_length
+                'Connection': 'close'
+            },
+
+            prepareResult: function(error, response, body, cb) {
+
+                if (error) {
+                    return cb(error);
+                }
+
+                if (response.statusCode !== 200 || !response.headers || !response.headers['content-length'] || response.headers['content-length'] < 1000) {
+                    return cb("ooyala video isn't valid: " + __ooyalaPlayer.embedCode);
+                } else {
+                    return cb(null, {
+                        href: "https://player.ooyala.com/tframe.html?embedCode=" + __ooyalaPlayer.embedCode + '&keepEmbedCode=true' 
+                            + (__ooyalaPlayer.pbid ? '&pbid=' + __ooyalaPlayer.pbid : ''),
+                        rel: [CONFIG.R.player, CONFIG.R.html5, 'ivan'],
+                        type: CONFIG.T.text_html,
+                        "aspect-ratio": __ooyalaPlayer.width && __ooyalaPlayer.height ? __ooyalaPlayer.width / __ooyalaPlayer.height : CONFIG.DEFAULT_ASPECT_RATIO
+                    });
+                }
+            }
+        }, cb);
+    }
+
+    // gazzillion of examples. 
+    // http://www.torontofc.ca/video/2015/06/24/bacardi-match-highlights-mtl-vs-tor-june-24-2014
+    // http://www.theverge.com/2013/8/5/4588634/moto-x-hands-on-review-video
+    // http://www.revolutionsoccer.net/post/2016/01/26/outside-box-1-entrance-physicals-and-first-day-back?autoplay=true
+    // http://www.vox.com/explains/2014/4/23/5643382/how-bitcoin-is-like-the-internet-in-the-80s
+    // http://www.polygon.com/2013/10/23/4947500/cooperatives-pokemon-x-and-y
+    // http://www.orlandocitysc.com/post/2016/05/16/barber-shop-darwin-cer-n?autoplay=true
+};
\ No newline at end of file

From 6c3956028412d82263de374659fe5ffaa5074418 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Wed, 18 May 2016 16:50:08 -0400
Subject: [PATCH 262/320] remove debug info

---
 plugins/links/promo/ooyala.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/links/promo/ooyala.js b/plugins/links/promo/ooyala.js
index c6134a8cf..bc34b26f0 100644
--- a/plugins/links/promo/ooyala.js
+++ b/plugins/links/promo/ooyala.js
@@ -49,7 +49,7 @@ module.exports = {
                     return cb(null, {
                         href: "https://player.ooyala.com/tframe.html?embedCode=" + __ooyalaPlayer.embedCode + '&keepEmbedCode=true' 
                             + (__ooyalaPlayer.pbid ? '&pbid=' + __ooyalaPlayer.pbid : ''),
-                        rel: [CONFIG.R.player, CONFIG.R.html5, 'ivan'],
+                        rel: [CONFIG.R.player, CONFIG.R.html5],
                         type: CONFIG.T.text_html,
                         "aspect-ratio": __ooyalaPlayer.width && __ooyalaPlayer.height ? __ooyalaPlayer.width / __ooyalaPlayer.height : CONFIG.DEFAULT_ASPECT_RATIO
                     });

From be9fc8f583ef5f4fbaa7dd7a73165c8ff97b96ce Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Fri, 20 May 2016 13:04:30 -0400
Subject: [PATCH 263/320] [domains] reply with 415 when no google maps key
 configured

---
 plugins/domains/google.com/google.maps.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/domains/google.com/google.maps.js b/plugins/domains/google.com/google.maps.js
index f97b04c83..96d0131ec 100644
--- a/plugins/domains/google.com/google.maps.js
+++ b/plugins/domains/google.com/google.maps.js
@@ -113,7 +113,9 @@ module.exports = {
     getData: function(url, urlMatch, options, cb) {
 
         if (!options.getProviderOptions('google.maps_key')) {
-            return cb (new Error ("No google.maps_key configured"));
+            return cb ({
+                responseStatusCode: 415
+            });
         }
 
         var gmap = {};

From ecb24e0c57450793b049ba85eab87a2d1206a991 Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Fri, 20 May 2016 21:29:12 +0300
Subject: [PATCH 264/320] [domains] youtube.com: allow refresh cached api data

---
 lib/request.js                               | 79 +++++++++++---------
 plugins/domains/youtube.com/youtube.video.js |  1 +
 2 files changed, 46 insertions(+), 34 deletions(-)

diff --git a/lib/request.js b/lib/request.js
index f8817fb01..eb7f63640 100644
--- a/lib/request.js
+++ b/lib/request.js
@@ -33,6 +33,7 @@ module.exports = function(options, callback) {
         console.error('cached request call error: prepareResult not a function');
     }
 
+    var refresh = options.refresh;
     var prepareResult = options.prepareResult;
     var useCacheOnly = options.useCacheOnly;
     var ttl = options.ttl;
@@ -44,11 +45,54 @@ module.exports = function(options, callback) {
     delete options.ttl;
     delete options.cache_key;
     delete options.new_cache_key;
+    delete options.refresh;
 
     var prefix = CONFIG.API_REQUEST_CACHE_PREFIX ? (CONFIG.API_REQUEST_CACHE_PREFIX + ':') : '';
 
     var key = 'req:' + prefix + (cache_key || hash(JSON.stringify(options)));
 
+    function doRealRequest() {
+
+        request(utils.prepareRequestOptions(options), function(error, response, data) {
+
+            prepareResult(error, response, data, function(error, preparedData) {
+
+                if (!error) {
+                    // If data prepared without error - cache it.
+                    cache.set(key, {
+                        response: {
+                            statusCode: response && response.statusCode,
+                            headers: response.headers
+                        },
+                        data: data
+                    }, {
+                        ttl: ttl || CONFIG.API_REQUEST_CACHE_TTL
+                    });
+
+                    // temp cache migration, set new key as well
+                    if (new_cache_key) {
+                        cache.set('req:' + prefix + new_cache_key, {
+                            response: {
+                                statusCode: response && response.statusCode,
+                                headers: response.headers
+                            },
+                            data: data
+                        }, {
+                            ttl: ttl || CONFIG.API_REQUEST_CACHE_TTL
+                        });
+                    }
+                }
+
+                // Send prepared data up.
+                callback(error, preparedData);
+            });
+        });
+    }
+
+    if (refresh) {
+        return doRealRequest();
+    }
+
     cache.get(key, function(error, data) {
 
         if (!error && data) {
@@ -68,40 +112,7 @@ module.exports = function(options, callback) {
 
         } else {
 
-            request(utils.prepareRequestOptions(options), function(error, response, data) {
-
-                prepareResult(error, response, data, function(error, preparedData) {
-
-                    if (!error) {
-                        // If data prepared without error - cache it.
-                        cache.set(key, {
-                            response: {
-                                statusCode: response && response.statusCode,
-                                headers: response.headers
-                            },
-                            data: data
-                        }, {
-                            ttl: ttl || CONFIG.API_REQUEST_CACHE_TTL
-                        });
-
-                        // temp cache migration, set new key as well
-                        if (new_cache_key) {
-                            cache.set('req:' + prefix + new_cache_key, {
-                                response: {
-                                    statusCode: response && response.statusCode,
-                                    headers: response.headers
-                                },
-                                data: data
-                            }, {
-                                ttl: ttl || CONFIG.API_REQUEST_CACHE_TTL
-                            });
-                        }
-                    }
-
-                    // Send prepared data up.
-                    callback(error, preparedData);
-                });
-            });
+            doRealRequest();
         }
     });
 };
\ No newline at end of file
diff --git a/plugins/domains/youtube.com/youtube.video.js b/plugins/domains/youtube.com/youtube.video.js
index da921750d..544972a66 100644
--- a/plugins/domains/youtube.com/youtube.video.js
+++ b/plugins/domains/youtube.com/youtube.video.js
@@ -30,6 +30,7 @@ module.exports = {
             uri: statsUri,
             cache_key: "youtube:gdata:" + urlMatch[1],
             json: true,
+            refresh: options.refresh,
             prepareResult: function(error, b, data, cb) {
 
                 if (error) {

From aabb354b4da6892d5cc1295a2eac772f00894d34 Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Fri, 20 May 2016 21:44:30 +0300
Subject: [PATCH 265/320] [core] pass refresh for request plugin wrapper

---
 lib/core.js                                  | 10 +++++++++-
 plugins/domains/youtube.com/youtube.video.js |  1 -
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/lib/core.js b/lib/core.js
index f8456166e..bc4ac823f 100644
--- a/lib/core.js
+++ b/lib/core.js
@@ -1204,6 +1204,14 @@
             options.totalTimer = utils.createTimer();
         }
 
+        function requestWrapperWithParams(r_options, callback) {
+            // Override 'refresh' only if present from caller and not present in plugin.
+            if (!('refresh' in r_options) && ('refresh' in options)) {
+                r_options.refresh = options.refresh;
+            }
+            requestWrapper(r_options, callback);
+        }
+
         var requiredPlugins = pluginsSet.initialPlugins,
             pluginsUrlMatches = pluginsSet.pluginsUrlMatches,
             usedDomains = pluginsSet.usedDomains,
@@ -1214,7 +1222,7 @@
                 url: uri,
                 cb: true,
                 options: options,
-                request: requestWrapper
+                request: requestWrapperWithParams
             },
 
             pluginsContexts = {},
diff --git a/plugins/domains/youtube.com/youtube.video.js b/plugins/domains/youtube.com/youtube.video.js
index 544972a66..da921750d 100644
--- a/plugins/domains/youtube.com/youtube.video.js
+++ b/plugins/domains/youtube.com/youtube.video.js
@@ -30,7 +30,6 @@ module.exports = {
             uri: statsUri,
             cache_key: "youtube:gdata:" + urlMatch[1],
             json: true,
-            refresh: options.refresh,
             prepareResult: function(error, b, data, cb) {
 
                 if (error) {

From 1f5d2885373cc377892ffa8a8283c32578ec59ef Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Fri, 20 May 2016 15:31:44 -0400
Subject: [PATCH 266/320] [domains] Medium is back

---
 plugins/{.fixme => domains}/medium.com.js | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename plugins/{.fixme => domains}/medium.com.js (100%)

diff --git a/plugins/.fixme/medium.com.js b/plugins/domains/medium.com.js
similarity index 100%
rename from plugins/.fixme/medium.com.js
rename to plugins/domains/medium.com.js

From e0800fdec29e7b591f1cbee5c66dd6f5399338ea Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Mon, 23 May 2016 13:06:40 -0400
Subject: [PATCH 267/320] [docs] fix comma in config sample

closes #123
---
 config.local.js.SAMPLE | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/config.local.js.SAMPLE b/config.local.js.SAMPLE
index 0316d3b9d..fb4c08bcc 100644
--- a/config.local.js.SAMPLE
+++ b/config.local.js.SAMPLE
@@ -101,10 +101,14 @@
             }
         }],
 
+        /*
+        // Configure use of HTTP proxies as needed
         PROXY: [{
             re: [/^https?:\/\/www\.domain\.com/],
-            proxy_server: 'http://1.2.3.4:8080'
-        }]
+            proxy_server: 'http://1.2.3.4:8080',
+            // user_agent: 'CHANGE YOUR AGENT'
+        }],
+        */
 
         // Customize API calls to 3rd parties. At the very least - configure required keys.
         providerOptions: {

From 3d328b22cf2904f7e165c2f9248b7e9aea641f07 Mon Sep 17 00:00:00 2001
From: Adam Hooper <adam@adamhooper.com>
Date: Wed, 25 May 2016 11:35:00 -0400
Subject: [PATCH 268/320] Update elections.huffingtonpost.com/pollster

---
 .../elections.huffingtonpost.com.js                   | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/plugins/domains/huffingtonpost.com/elections.huffingtonpost.com.js b/plugins/domains/huffingtonpost.com/elections.huffingtonpost.com.js
index 2c1ffa3f2..9a9fb1384 100644
--- a/plugins/domains/huffingtonpost.com/elections.huffingtonpost.com.js
+++ b/plugins/domains/huffingtonpost.com/elections.huffingtonpost.com.js
@@ -3,8 +3,7 @@ var utils = require('../../../lib/utils');
 module.exports = {
 
     re: [
-        /^https?:\/\/elections\.huffingtonpost\.com\/pollster\/embed\/([^\/\?]+)/i,
-        /^https?:\/\/elections\.huffingtonpost\.com\/pollster\/([^\/\?]+)/i
+        /^https?:\/\/elections\.huffingtonpost\.com\/pollster\/(?:embed\/)?([-a-z0-9]+)(?:\/edit)?(.*)/i
     ],    
 
     mixins: ["*"],
@@ -12,10 +11,10 @@ module.exports = {
     getLink: function(urlMatch) {
 
         return {
-            href: '//elections.huffingtonpost.com/pollster/embed/' + urlMatch[1] + '#!estimate=official',
+            href: '//elections.huffingtonpost.com/pollster/embed/' + urlMatch[1] + urlMatch[2],
             type: CONFIG.T.text_html,
-            rel: [CONFIG.R.app, CONFIG.R.html5],
-            height: 400
+            rel: [CONFIG.R.app, CONFIG.R.html5, CONFIG.R.ssl],
+            height: 500
         }
 
     },
@@ -26,4 +25,4 @@ module.exports = {
         "http://elections.huffingtonpost.com/pollster/2016-general-election-trump-vs-clinton",
         "http://elections.huffingtonpost.com/pollster/embed/donald-trump-favorable-rating"
     ]
-};
\ No newline at end of file
+};

From 0ba534085b6289d0383d8a2062adcc7f853b6362 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Thu, 26 May 2016 09:16:53 -0400
Subject: [PATCH 269/320] [domains] add ssl for naver

---
 plugins/domains/tvcast.naver.com.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/domains/tvcast.naver.com.js b/plugins/domains/tvcast.naver.com.js
index 573e1de83..6eb66661b 100644
--- a/plugins/domains/tvcast.naver.com.js
+++ b/plugins/domains/tvcast.naver.com.js
@@ -44,7 +44,7 @@ module.exports = {
         if ($iframe.length == 1) {
 
             return {
-                href: $iframe.attr('src').replace(/isAutoPlay=true/, 'isAutoPlay=false'),
+                href: $iframe.attr('src').replace(/isAutoPlay=true/, 'isAutoPlay=false').replace(/^http:\/\//, '//'),
                 type: CONFIG.T.text_html,
                 rel: [CONFIG.R.player, CONFIG.R.html5],
                 "aspect-ratio": $iframe.attr('height') && $iframe.attr('width') ? $iframe.attr('width') / $iframe.attr('height') : CONFIG.DEFAULT_ASPECT_RATIO

From 1fcfe6c8f174fb210c45eeb8e0046de66da90250 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Thu, 26 May 2016 09:17:51 -0400
Subject: [PATCH 270/320] [youtube] detect rejected videos + better aspect in
 some cases

---
 plugins/domains/youtube.com/youtube.video.js | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/plugins/domains/youtube.com/youtube.video.js b/plugins/domains/youtube.com/youtube.video.js
index da921750d..7324a349b 100644
--- a/plugins/domains/youtube.com/youtube.video.js
+++ b/plugins/domains/youtube.com/youtube.video.js
@@ -69,7 +69,8 @@ module.exports = {
 
                         hd: entry.contentDetails && entry.contentDetails.definition == "hd",
                         playerHtml: entry.player && entry.player.embedHtml,
-                        embeddable: entry.status ? entry.status.embeddable : true
+                        embeddable: entry.status ? entry.status.embeddable: true,
+                        uploadStatus: entry.status && entry.status.uploadStatus
                     };
 
                     if (entry.snippet && entry.snippet.thumbnails ) {
@@ -80,9 +81,13 @@ module.exports = {
                         gdata.duration = duration;
                     }
 
-                    cb(null, {
-                        youtube_video_gdata: gdata
-                    });
+                    if (gdata.uploadStatus === "rejected") {
+                        cb({responseStatusCode: 410});
+                    } else {
+                        cb(null, {
+                            youtube_video_gdata: gdata
+                        });
+                    }
 
                 } else if (data.error && (data.error.code == 400 || data.error.code == 429)) {
 
@@ -146,7 +151,7 @@ module.exports = {
         var autoplay = params + (params.indexOf ('?') > -1 ? "&": "?") + "autoplay=1";
 
         // Detect widescreen videos. YouTube API used to have issues with returing proper aspect-ratio.
-        var widescreen = youtube_video_gdata.hd; 
+        var widescreen = youtube_video_gdata.hd || youtube_video_gdata.thumbnails.maxres != null; 
 
         if (!widescreen && youtube_video_gdata.playerHtml) { // maybe still widescreen
             var $container = cheerio('<div>');

From 631ed08bed898f0f8d8e81613a69074b67b39fcd Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Thu, 26 May 2016 10:29:44 -0400
Subject: [PATCH 271/320] [ooyala] autoplay option, better v3 detect and
 aspect-ratio

---
 plugins/links/promo/ooyala.js | 55 +++++++++++++++++++++++++----------
 1 file changed, 39 insertions(+), 16 deletions(-)

diff --git a/plugins/links/promo/ooyala.js b/plugins/links/promo/ooyala.js
index bc34b26f0..8999bcedf 100644
--- a/plugins/links/promo/ooyala.js
+++ b/plugins/links/promo/ooyala.js
@@ -19,7 +19,7 @@ module.exports = {
             return {
                 __ooyalaPlayer: {
                     embedCode: urlMatch[1],
-                    pbid: /&pbid=/.test(video_src) ? video_src.match(/pbid=([_a-zA-Z0-9\-]+)/)[1] : null,
+                    pbid: /&(pbid|player)=/.test(video_src) ? video_src.match(/(?:pbid|player)=([_a-zA-Z0-9\-]+)/)[1] : null,
                     width: (meta.twitter && meta.twitter.player && meta.twitter.player.width) || (meta.og && meta.og.video && meta.og.video.width),
                     height: (meta.twitter && meta.twitter.player && meta.twitter.player.height) || (meta.og && meta.og.video && meta.og.video.height)
                 }
@@ -46,23 +46,46 @@ module.exports = {
                 if (response.statusCode !== 200 || !response.headers || !response.headers['content-length'] || response.headers['content-length'] < 1000) {
                     return cb("ooyala video isn't valid: " + __ooyalaPlayer.embedCode);
                 } else {
-                    return cb(null, {
-                        href: "https://player.ooyala.com/tframe.html?embedCode=" + __ooyalaPlayer.embedCode + '&keepEmbedCode=true' 
-                            + (__ooyalaPlayer.pbid ? '&pbid=' + __ooyalaPlayer.pbid : ''),
-                        rel: [CONFIG.R.player, CONFIG.R.html5],
-                        type: CONFIG.T.text_html,
-                        "aspect-ratio": __ooyalaPlayer.width && __ooyalaPlayer.height ? __ooyalaPlayer.width / __ooyalaPlayer.height : CONFIG.DEFAULT_ASPECT_RATIO
-                    });
+
+                    var aspect = __ooyalaPlayer.width && __ooyalaPlayer.height && (__ooyalaPlayer.width / __ooyalaPlayer.height < 1.5) ? 4 / 3 : 16/9;
+                    var rel = [CONFIG.R.player];
+                    var href = 'https://player.ooyala.com/';
+                    var type = CONFIG.T.text_html;
+
+                    if (__ooyalaPlayer.pbid) {
+                        href = href + 'tframe.html?embedCode=' + __ooyalaPlayer.embedCode + '&keepEmbedCode=true' + '&pbid=' + __ooyalaPlayer.pbid;
+                        rel.push(CONFIG.R.html5);
+                    } else {
+                        href = href + 'player.swf?embedCode=' + __ooyalaPlayer.embedCode + '&keepEmbedCode=true';
+                        type = CONFIG.T.flash;
+                    }
+
+                    return cb(null, [{
+                        href: href,
+                        rel: rel,
+                        type: type,
+                        'aspect-ratio': aspect
+                    }, {
+                        href: type === CONFIG.T.text_html ? href + '&options[autoplay]=true' : href + '&autoplay=1',
+                        rel: rel.concat(CONFIG.R.autoplay),
+                        type: type,
+                        'aspect-ratio': aspect
+                    }]);
                 }
             }
         }, cb);
-    }
+    },
 
-    // gazzillion of examples. 
-    // http://www.torontofc.ca/video/2015/06/24/bacardi-match-highlights-mtl-vs-tor-june-24-2014
-    // http://www.theverge.com/2013/8/5/4588634/moto-x-hands-on-review-video
-    // http://www.revolutionsoccer.net/post/2016/01/26/outside-box-1-entrance-physicals-and-first-day-back?autoplay=true
-    // http://www.vox.com/explains/2014/4/23/5643382/how-bitcoin-is-like-the-internet-in-the-80s
-    // http://www.polygon.com/2013/10/23/4947500/cooperatives-pokemon-x-and-y
-    // http://www.orlandocitysc.com/post/2016/05/16/barber-shop-darwin-cer-n?autoplay=true
+    tests: [
+        "http://www.torontofc.ca/video/2015/06/24/bacardi-match-highlights-mtl-vs-tor-june-24-2014",
+        "http://www.theverge.com/2013/8/5/4588634/moto-x-hands-on-review-video",
+        "http://www.revolutionsoccer.net/post/2016/01/26/outside-box-1-entrance-physicals-and-first-day-back?autoplay=true",
+        "http://www.vox.com/explains/2014/4/23/5643382/how-bitcoin-is-like-the-internet-in-the-80s",
+        "http://www.polygon.com/2013/10/23/4947500/cooperatives-pokemon-x-and-y",
+        "http://www.orlandocitysc.com/post/2016/05/16/barber-shop-darwin-cer-n?autoplay=true",
+        "https://www.rei.com/video/2015/10/07/how-to-size-snowboard-boots.html",
+        "http://www.thisisinsider.com/cheesy-breakfast-potatoes-2016-5",
+        "http://www.unotv.com/videoblogs/tecnologia/gadgets-tecnologia-apps/detalle/javier-matuk-20-enero-como-te-gustaria-mesas-pinball-futuro-986876/",
+        "http://www.livescience.com/54668-spacex-lands-again-first-stage-on-droneship-despite-extreme-velocities-video.html"
+    ]
 };
\ No newline at end of file

From fd10f4825ada54f6574beee766160b0537235cf4 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Thu, 26 May 2016 11:00:38 -0400
Subject: [PATCH 272/320] [domains] fix some mail.ru

---
 plugins/domains/mail.ru.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/plugins/domains/mail.ru.js b/plugins/domains/mail.ru.js
index 91dbb88f4..a5f9e4ab5 100644
--- a/plugins/domains/mail.ru.js
+++ b/plugins/domains/mail.ru.js
@@ -10,12 +10,12 @@ module.exports = {
 
     getLink: function(og, url) {
 
-        if (og.type !== 'video.other') {
+        if (og.type !== 'video.other' | !og.url) {
             return;
         }
 
         return {
-                href: '//videoapi.my.mail.ru/videos/embed/' + url.replace(/^https?:\/\/my\.mail\.ru\//, ''),
+                href: '//videoapi.my.mail.ru/videos/embed/' + og.url.replace(/^https?:\/\/my\.mail\.ru\/(video\/)?/, ''),
                 type: CONFIG.T.text_html,
                 rel: [CONFIG.R.player, CONFIG.R.ssl, CONFIG.R.html5],
                 "aspect-ratio": 626 / 367
@@ -26,6 +26,7 @@ module.exports = {
         "http://my.mail.ru/mail/ee.vlz/video/22396/44907.html",
         "http://my.mail.ru/mail/stryukova_lv/video/6177/1029.html",
         "http://my.mail.ru/mail/shiniavskii/video/_myvideo/4.html",
-        "https://my.mail.ru/inbox/wwf00/video/11/46.html"
+        "https://my.mail.ru/inbox/wwf00/video/11/46.html",
+        "https://my.mail.ru/mail/opymooquf98/video/13/89.html"
     ]
 };
\ No newline at end of file

From cf72eec7d13adbd32131f3d97bb458e92ede4c00 Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Thu, 26 May 2016 18:05:42 +0300
Subject: [PATCH 273/320] [domains] fix tests for squareup.com

---
 plugins/domains/squareup.com.js | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/plugins/domains/squareup.com.js b/plugins/domains/squareup.com.js
index 6cfeb10eb..5862df79f 100644
--- a/plugins/domains/squareup.com.js
+++ b/plugins/domains/squareup.com.js
@@ -1,6 +1,9 @@
 module.exports = {
 
-    re: /^https:\/\/squareup\.com\/market\/[\w-]+\/[\w-]+/i,
+    re: [
+        /^https:\/\/squareup\.com\/market\/[\w-]+\/[\w-]+/i,
+        /^https:\/\/squareup\.com\/store\/[\w-]+\/item\/[\w-]+/i
+    ],
 
     mixins: [
         "og-image",
@@ -30,6 +33,13 @@ module.exports = {
     tests: [{
         page: "https://squareup.com/market/categories/home?hl=en-UA",
         selector: '.item-element-content'
+    }, {
+        skipMixins: [
+            "og-product",
+            "canonical",
+            "og-description",
+            "keywords"
+        ]
     },
         "https://squareup.com/market/mobile-concepts/spider-coffee-table?hl=en-UA"
     ]

From 1b398172759a3f3bb4891e7994ff1b3903bf6d5a Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Thu, 26 May 2016 18:05:59 +0300
Subject: [PATCH 274/320] [domains] fix tests for wasu.cn

---
 plugins/domains/wasu.cn.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/domains/wasu.cn.js b/plugins/domains/wasu.cn.js
index 5d47f0ed1..1d18be6da 100644
--- a/plugins/domains/wasu.cn.js
+++ b/plugins/domains/wasu.cn.js
@@ -23,11 +23,11 @@ module.exports = {
 
     tests: [{
         page: 'http://www.wasu.cn/',
-        selector: '.block a',
+        selector: '.pic_img a',
         getUrl: function(url) {
             if (url.match(re)) return url;
         }
     },
-        'http://www.wasu.cn/Play/show/id/5039416'
+        'http://www.wasu.cn/Play/show/id/7473137'
     ]
 };
\ No newline at end of file

From 117e92385af11055e2dd86b0b9628660a042eaff Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Thu, 26 May 2016 18:42:56 +0300
Subject: [PATCH 275/320] [domains] fix guardian.video

---
 plugins/domains/theguardian.com/guardian.video.js | 6 ++++--
 plugins/links/promo/og-youtube.js                 | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/plugins/domains/theguardian.com/guardian.video.js b/plugins/domains/theguardian.com/guardian.video.js
index a5f52110b..176a57c68 100644
--- a/plugins/domains/theguardian.com/guardian.video.js
+++ b/plugins/domains/theguardian.com/guardian.video.js
@@ -8,10 +8,12 @@ module.exports = {
 
     getLink: function(og) {
 
-        if (og.type === 'video' && og.video && og.video.url) {
+        var video = og.video && (og.video.url || og.video.secure_url);
+
+        if (video) {
 
             return {
-                href: og.video.url.replace(/https?:\/\/www\.theguardian\.com\//, "https://embed.theguardian.com/embed/video/"),
+                href: video.replace(/https?:\/\/www\.theguardian\.com\//, "https://embed.theguardian.com/embed/video/"),
                 type: CONFIG.T.text_html,
                 rel: [CONFIG.R.player, CONFIG.R.html5],
                 "aspect-ratio": 560 / 315
diff --git a/plugins/links/promo/og-youtube.js b/plugins/links/promo/og-youtube.js
index 8aee03cfb..8442d9c8d 100644
--- a/plugins/links/promo/og-youtube.js
+++ b/plugins/links/promo/og-youtube.js
@@ -7,7 +7,7 @@ module.exports = {
         // do not process if there is a whitelist record for this domain as processing will take longer
         if (!whitelistRecord.isDefault && whitelistRecord.isAllowed && whitelistRecord.isAllowed('og.video')) {return;}
         
-        var video_src = (og.video && og.video.url) || (og.video && og.video.iframe) || og.video;
+        var video_src = (og.video && og.video.url || og.video.secure_url) || (og.video && og.video.iframe) || og.video;
         if (!video_src || /youtube\.com|vimeo\.com|dailymotion\.com/.test(url) || video_src instanceof Array) {
             return;
         }

From 90e1975812821acceb6987437184c6f724b87beb Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Thu, 26 May 2016 11:43:46 -0400
Subject: [PATCH 276/320] [domains] easier support for hosted iHeart radio

---
 plugins/domains/bandcamp.com.js             |  2 +-
 plugins/links/promo/hosted-via-canonical.js | 25 +++++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 plugins/links/promo/hosted-via-canonical.js

diff --git a/plugins/domains/bandcamp.com.js b/plugins/domains/bandcamp.com.js
index 3cc6bd1b3..5a3469c7e 100644
--- a/plugins/domains/bandcamp.com.js
+++ b/plugins/domains/bandcamp.com.js
@@ -3,7 +3,7 @@ module.exports = {
     re: [
         /^https?:\/\/[a-z0-9-]+\.bandcamp\.com\/(album|track)\/(\w+)/i,
         /^https?:\/\/[a-z0-9-]+\.bandcamp\.com/i,
-        /^https?:\/\/([a-z-\.]+)\/(album|track)\/([a-z-]+)/
+        /^https?:\/\/([a-z-\.]+)\/(album|track)\/([a-z0-9-]+)/
     ],
 
     mixins: [
diff --git a/plugins/links/promo/hosted-via-canonical.js b/plugins/links/promo/hosted-via-canonical.js
new file mode 100644
index 000000000..e23a2132c
--- /dev/null
+++ b/plugins/links/promo/hosted-via-canonical.js
@@ -0,0 +1,25 @@
+module.exports = {
+
+    getLink: function(url, meta, options, cb) {
+
+        var canonical = (meta.canonical && meta.canonical.href) || meta.canonical || (meta.og && meta.og.url);
+
+        // Redirect to canonical for known domains
+        if (canonical && url !== canonical && (
+                canonical.match(/^https?:\/\/news\.iheart\.com\/media\/play\/\d+/i)                
+            )) {
+
+            // Do not redirect to url from redirects history.
+            if (!options.redirectsHistory || options.redirectsHistory.indexOf(canonical) === -1) {
+
+                return cb({
+                    redirect: canonical
+                });
+            }
+        }
+
+        cb(null);
+    }
+
+    // ex. http://www.espn1530.com/media/play/27017084/
+};
\ No newline at end of file

From 71652dfc6742865733877b6c55799894329c2c65 Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Thu, 26 May 2016 18:44:42 +0300
Subject: [PATCH 277/320] bugfix

---
 plugins/links/promo/og-youtube.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/links/promo/og-youtube.js b/plugins/links/promo/og-youtube.js
index 8442d9c8d..691b66f17 100644
--- a/plugins/links/promo/og-youtube.js
+++ b/plugins/links/promo/og-youtube.js
@@ -7,7 +7,7 @@ module.exports = {
         // do not process if there is a whitelist record for this domain as processing will take longer
         if (!whitelistRecord.isDefault && whitelistRecord.isAllowed && whitelistRecord.isAllowed('og.video')) {return;}
         
-        var video_src = (og.video && og.video.url || og.video.secure_url) || (og.video && og.video.iframe) || og.video;
+        var video_src = (og.video && (og.video.url || og.video.secure_url)) || (og.video && og.video.iframe) || og.video;
         if (!video_src || /youtube\.com|vimeo\.com|dailymotion\.com/.test(url) || video_src instanceof Array) {
             return;
         }

From 8442c0ea045c013c39a9eea0ee94a29ec60a73e0 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Thu, 26 May 2016 12:14:01 -0400
Subject: [PATCH 278/320] [domains] fix weird playback issues on cbsnews

---
 plugins/domains/cbsnews.com.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/domains/cbsnews.com.js b/plugins/domains/cbsnews.com.js
index 7148aa995..8195b8028 100644
--- a/plugins/domains/cbsnews.com.js
+++ b/plugins/domains/cbsnews.com.js
@@ -38,7 +38,7 @@ module.exports = {
 
             return {
                 href: result.embedURL.replace(/&amp;/g, '&') + '&autoplay=true',
-                type: CONFIG.T.flash,
+                type: CONFIG.T.text_html, // it's actually not, but without it the playback glitches from time to time
                 rel: [CONFIG.R.player, CONFIG.R.autoplay],
                 'aspect-ratio': result.width / result.height
             };

From 2340b9bd17c89ca7cb2c48719adbaf2507305c32 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Thu, 26 May 2016 12:24:32 -0400
Subject: [PATCH 279/320] [domains] disable Aljazeera - broken atm

---
 plugins/{domains => .fixme}/america.aljazeera.com.js | 0
 plugins/links/promo/twitter-youtube.js               | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename plugins/{domains => .fixme}/america.aljazeera.com.js (100%)

diff --git a/plugins/domains/america.aljazeera.com.js b/plugins/.fixme/america.aljazeera.com.js
similarity index 100%
rename from plugins/domains/america.aljazeera.com.js
rename to plugins/.fixme/america.aljazeera.com.js
diff --git a/plugins/links/promo/twitter-youtube.js b/plugins/links/promo/twitter-youtube.js
index a778d1a48..27fbe2021 100644
--- a/plugins/links/promo/twitter-youtube.js
+++ b/plugins/links/promo/twitter-youtube.js
@@ -9,7 +9,7 @@ module.exports = {
         if (!whitelistRecord.isDefault && whitelistRecord.isAllowed && whitelistRecord.isAllowed('twitter.player')) {return;}
 
         var video_src = (twitter.player && twitter.player.value) || twitter.player;
-        if (!video_src || /youtube\.com|vimeo\.com|dailymotion\.com/.test(url)) {
+        if (!video_src || typeof video_src !== "String" || /youtube\.com|vimeo\.com|dailymotion\.com/.test(url)) {
             return;
         }
 

From 42fe9bb9c8c88dbc4e0314798b480fcca618fbf7 Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Thu, 26 May 2016 19:35:00 +0300
Subject: [PATCH 280/320] [tests] fix some test feeds

---
 plugins/domains/theonion.video.js |  8 +++++---
 plugins/domains/v.ku6.com.js      |  4 ++--
 plugins/domains/v.qq.com.js       | 23 ++++++++++++++++-------
 plugins/domains/youku.com.js      |  2 +-
 4 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/plugins/domains/theonion.video.js b/plugins/domains/theonion.video.js
index cec7468ac..43fc8c4fb 100644
--- a/plugins/domains/theonion.video.js
+++ b/plugins/domains/theonion.video.js
@@ -17,7 +17,9 @@ module.exports = {
     },
 
     tests: [{
-        page: "http://www.theonion.com/video/",
-        selector: ".title h1 a"
-    }]
+        page: "http://www.onionstudios.com/videos/popular/the-onion",
+        selector: ".item>a"
+    },
+        "http://www.onionstudios.com/videos/tips-for-throwing-an-anniversary-party-4004"
+    ]
 };
\ No newline at end of file
diff --git a/plugins/domains/v.ku6.com.js b/plugins/domains/v.ku6.com.js
index 282f0c9e8..d312136f9 100644
--- a/plugins/domains/v.ku6.com.js
+++ b/plugins/domains/v.ku6.com.js
@@ -20,8 +20,8 @@ module.exports = {
     },
 
     tests: [{
-        page: 'http://www.ku6.com/',
-        selector: '.l_vlist .ckl_a',
+        page: 'http://www.ku6.com',
+        selector: '.md-li>a',
         skipMixins: [
             "favicon"
         ]
diff --git a/plugins/domains/v.qq.com.js b/plugins/domains/v.qq.com.js
index da9b5dcb7..2436c4d3f 100644
--- a/plugins/domains/v.qq.com.js
+++ b/plugins/domains/v.qq.com.js
@@ -1,10 +1,14 @@
+var _ = require('underscore');
+
+var res = [
+    /^https?:\/\/v\.qq\.com\/page\/\w\/\w\/\w\/(\w+)\.html$/i,
+    /^https?:\/\/v\.qq\.com\/\w+\/page\/\w\/\w\/\w\/(\w+)\.html$/i,
+    /^https?:\/\/v\.qq\.com\/\w+\/\w\/\w+\.html\?vid=(\w+)$/i
+];
+
 module.exports = {
 
-    re: [
-        /^https?:\/\/v\.qq\.com\/page\/\w\/\w\/\w\/(\w+)\.html$/i,
-        /^https?:\/\/v\.qq\.com\/\w+\/page\/\w\/\w\/\w\/(\w+)\.html$/i,
-        /^https?:\/\/v\.qq\.com\/\w+\/\w\/\w+\.html\?vid=(\w+)$/i
-    ],
+    re: res,
 
     mixins: [
         "favicon",
@@ -27,8 +31,13 @@ module.exports = {
     },
 
     tests: [{
-        page: "http://v.qq.com/games/list/501_50101/0/1_0.html",
-        selector: "a.mod_poster_160"
+        page: "http://v.qq.com/index.html",
+        selector: "a.figure",
+        getUrl: function(url) {
+            return _.find(res, function(r) {
+                return url.match(r);
+            }) && url;
+        }
     }, {
         skipMixins: ['canonical', 'description', 'keywords']
     },
diff --git a/plugins/domains/youku.com.js b/plugins/domains/youku.com.js
index c1ea95220..e4da684f6 100644
--- a/plugins/domains/youku.com.js
+++ b/plugins/domains/youku.com.js
@@ -24,7 +24,7 @@ module.exports = {
 
     tests: [{
         page: "http://www.youku.com/",
-        selector: ".v-meta-entry a.btn-small"
+        selector: ".p-thumb>a"
     },
         "http://v.youku.com/v_show/id_XNDkwNjg2NzQw.html?f=18736842"
     ]

From d048548d8d94bcfa1f1fb2b98e4e9ec57f116260 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Thu, 26 May 2016 12:45:32 -0400
Subject: [PATCH 281/320] [domains] fix thumbnails for Time videos

---
 plugins/domains/time.com.js | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/plugins/domains/time.com.js b/plugins/domains/time.com.js
index 7a9d23939..7b4499569 100644
--- a/plugins/domains/time.com.js
+++ b/plugins/domains/time.com.js
@@ -1,14 +1,9 @@
 module.exports = {
 
-    re: /http:\/\/content\.time\.com\/time\/video\/player\/.+/i,
+    re: /^http:\/\/content\.time\.com\/time\/video\/player\/.+/i,
 
     mixins: [
-        "twitter-image",
-        "favicon",
-        "canonical",
-        "twitter-description",
-        "og-site",
-        "twitter-title"
+        "*"
     ],
 
     getLink: function(twitter) {

From 7e8e897b306bdf69b6a325ea3fab247177b4a14c Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Thu, 26 May 2016 19:49:31 +0300
Subject: [PATCH 282/320] [tests] try fix medium.com test feeds

---
 plugins/domains/medium.com.js | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/plugins/domains/medium.com.js b/plugins/domains/medium.com.js
index 6767e37dd..90384bcbb 100644
--- a/plugins/domains/medium.com.js
+++ b/plugins/domains/medium.com.js
@@ -1,6 +1,8 @@
+var re = /^https:\/\/medium\.com\/@?[\w-]+/i;
+
 module.exports = {
 
-    re: /^https:\/\/medium\.com\/@?[\w-]+/i,
+    re: re,
 
     mixins: [
         "og-image",
@@ -48,10 +50,16 @@ module.exports = {
 
     tests: [{
         page: 'https://medium.com/top-100',
-        selector: '.link--secondary'
+        selector: 'article>a',
+        getUrl: function(url) {
+            return url.match(re) && url;
+        }
     }, {
         page: 'https://medium.com/top-100',
-        selector: '.block-title a'
+        selector: '.postMetaInline-feedSummary>a',
+        getUrl: function(url) {
+            return url.match(re) && url;
+        }
     }, {
         skipMixins: [
             "media-detector" // as plugin covers not only articles

From 1143d6d85588e6dea2659a30e1e340e86b888772 Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Thu, 26 May 2016 19:51:31 +0300
Subject: [PATCH 283/320] [tests] fix medium.com tests

---
 plugins/domains/medium.com.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/domains/medium.com.js b/plugins/domains/medium.com.js
index 90384bcbb..98cabab29 100644
--- a/plugins/domains/medium.com.js
+++ b/plugins/domains/medium.com.js
@@ -66,6 +66,6 @@ module.exports = {
         ]
     },
         "https://medium.com/@startswithabang",
-        "https://medium.com/better-humans"
+        "https://medium.com/hackerpreneur-magazine/nobody-s-heard-of-you-and-that-s-okay-82792dfecc12#.31za23rhx"
     ]
 };
\ No newline at end of file

From 103d636a196089b2f0d7ea6010e8235f6c39a326 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Thu, 26 May 2016 13:02:26 -0400
Subject: [PATCH 284/320] [domains] clean up obsolete plugins from fixme folder

---
 plugins/.fixme/deezer.com.js                  |  29 -----
 .../selector/marketplace.firefox.com.js       | 108 ------------------
 plugins/.fixme/selector/ocremix.org.js        | 104 -----------------
 .../theoatmeal.com/theoatmeal.blog.js         |  33 ------
 .../theoatmeal.com/theoatmeal.comics.js       |  42 -------
 .../wikimedia.org/wikimedia.article.js        |  51 ---------
 .../wikimedia.org/wikimedia.picture.js        |  72 ------------
 .../wikipedia.org/wikipedia.article.js        |  13 ---
 .../wikipedia.org/wikipedia.picture.js        |  16 ---
 9 files changed, 468 deletions(-)
 delete mode 100644 plugins/.fixme/deezer.com.js
 delete mode 100644 plugins/.fixme/selector/marketplace.firefox.com.js
 delete mode 100644 plugins/.fixme/selector/ocremix.org.js
 delete mode 100644 plugins/.fixme/selector/theoatmeal.com/theoatmeal.blog.js
 delete mode 100644 plugins/.fixme/selector/theoatmeal.com/theoatmeal.comics.js
 delete mode 100644 plugins/.fixme/selector/wikimedia.org/wikimedia.article.js
 delete mode 100644 plugins/.fixme/selector/wikimedia.org/wikimedia.picture.js
 delete mode 100644 plugins/.fixme/selector/wikipedia.org/wikipedia.article.js
 delete mode 100644 plugins/.fixme/selector/wikipedia.org/wikipedia.picture.js

diff --git a/plugins/.fixme/deezer.com.js b/plugins/.fixme/deezer.com.js
deleted file mode 100644
index 76929415a..000000000
--- a/plugins/.fixme/deezer.com.js
+++ /dev/null
@@ -1,29 +0,0 @@
-module.exports = {
-
-    mixins: [
-        "og-image",
-        "favicon",
-        "canonical",
-        "twitter-description",
-        "media-detector",
-        "og-site",
-        "twitter-title"
-    ],
-
-    getLink: function(twitter) {
-        return {
-            href: twitter.player.value,
-            rel: [CONFIG.R.player, CONFIG.R.ssl, CONFIG.R.html5],
-            type: CONFIG.T.text_html,
-            height: twitter.player.height
-        };
-    },
-
-    tests: [{
-        noFeeds: true
-    },
-        "http://www.deezer.com/playlist/151196621",
-        "http://www.deezer.com/album/8983161"
-    ]
-
-};
\ No newline at end of file
diff --git a/plugins/.fixme/selector/marketplace.firefox.com.js b/plugins/.fixme/selector/marketplace.firefox.com.js
deleted file mode 100644
index f67ebdec6..000000000
--- a/plugins/.fixme/selector/marketplace.firefox.com.js
+++ /dev/null
@@ -1,108 +0,0 @@
-var jQuery = require("jquery");
-
-// API reference:
-// https://firefox-marketplace-api.readthedocs.org/en/latest/topics/apps.html
-
-module.exports = {
-
-    re: /^https?:\/\/marketplace\.firefox\.com\/(?:api\/v1\/(?:apps|fireplace)\/)?app\/([-_%\.a-z0-9]+)/i,
-
-    getData: function (urlMatch, request, cb) {
-        var infoUri = "https://marketplace.firefox.com/api/v1/fireplace/app/"+urlMatch[1]+"/";
-
-        request({
-            uri: infoUri,
-            qs: {
-                format: 'JSON'
-            },
-            json: true,
-            prepareResult: function(error, b, data, cb) {
-
-                if (error) {
-                    return cb(error);
-                }
-
-                if (data.app_type) {
-
-                    cb(null, {
-                        firefox_marketplace_data: data
-                    });
-                }
-                else {
-                    cb(infoUri + (data.reason ? " says "+data.reason : " returned no data"));
-                }
-            }
-        }, cb);
-    },
-
-    getMeta: function (firefox_marketplace_data) {
-        return {
-            title:            firefox_marketplace_data.name,
-            date:             firefox_marketplace_data.created,
-            author:           firefox_marketplace_data.current_version.developer_name,
-            description:      jQuery('<div>'+firefox_marketplace_data.description+'</div>').text(),
-            canonical:        "https://marketplace.firefox.com/app/"+firefox_marketplace_data.slug
-            /*,
-            support_url:      firefox_marketplace_data.support_url,
-            homepage:         firefox_marketplace_data.homepage,
-            ratings_count:    firefox_marketplace_data.ratings.count,
-            ratings_average:  firefox_marketplace_data.ratings.average,
-            weekly_downloads: firefox_marketplace_data.weekly_downloads
-            */
-        };
-    },
-
-    getLinks: function(firefox_marketplace_data) {
-        var links = [];
-        var key;
-        for (key in firefox_marketplace_data.icons) {
-            var icon_size = parseInt(key,10);
-            links.push({
-                href:   firefox_marketplace_data.icons[key],
-                type:   CONFIG.T.image_png,
-                rel:    CONFIG.R.icon,
-                width:  icon_size,
-                height: icon_size
-            });
-        }
-
-        firefox_marketplace_data.previews.forEach(function (preview) {
-            links.push({
-                href:  preview.image_url,
-                type:  preview.filetype || CONFIG.T.image_png,
-                rel:   CONFIG.R.image,
-                title: preview.caption
-            });
-            
-            links.push({
-                href:  preview.thumbnail_url,
-                type:  CONFIG.T.image_png,
-                rel:   CONFIG.R.thumbnail,
-                title: preview.caption
-            });
-        });
-
-        var img = firefox_marketplace_data.previews && firefox_marketplace_data.previews.length && firefox_marketplace_data.previews[0].image_url;
-
-        links.push({
-            type:  CONFIG.T.text_html,
-            rel:   [CONFIG.R.thumbnail, CONFIG.R.inline],
-            html:
-                (img ? '<p><img src="' + img + '"></p>' : '') +
-                    '<p>' + firefox_marketplace_data.description + (firefox_marketplace_data.current_version.release_notes ?
-                    '</p>\n<h3>Release Notes</h3>\n<p>' + firefox_marketplace_data.current_version.release_notes + '</p>' :
-                    '</p>')
-        });
-
-        return links;
-    },
-
-    tests: [
-        "https://marketplace.firefox.com/app/pasjanssolitaire?src=all-popular",
-        "https://marketplace.firefox.com/app/wikipedia?src=all-popular",
-        "https://marketplace.firefox.com/app/soundcloud?src=all-popular",
-        {
-            noFeeds: true
-        }
-    ]
-};
diff --git a/plugins/.fixme/selector/ocremix.org.js b/plugins/.fixme/selector/ocremix.org.js
deleted file mode 100644
index b678e81b2..000000000
--- a/plugins/.fixme/selector/ocremix.org.js
+++ /dev/null
@@ -1,104 +0,0 @@
-var URL = require('url');
-
-module.exports = {
-
-    re: [
-        /https?:\/\/(?:www\.)?ocremix\.org\/remix\/OCR(\d+)\/?(?:[\?#].*)?$/i
-    ],
-
-    mixins: [
-        'favicon'
-    ],
-
-    provides: 'ocremix_meta',
-
-    getData: function(url, urlMatch, $selector) {
-        var main = $selector('#panel-main');
-        var remix = $selector('h1').clone();
-        var meta = main.find("ul strong");
-        var game = meta.filter(function () { return $selector.text(this) === 'Game'; }).next('a');
-        var remixers = meta.filter(function () { return $selector.text(this) === 'ReMixer(s)'; }).nextAll('a');
-        var composers = meta.filter(function () { return $selector.text(this) === 'Composer(s)'; }).nextAll('a');
-        var songs = meta.filter(function () { return $selector.text(this) === 'Song(s)'; }).nextAll('a');
-        var youtube_url = $selector("#ytplayer").attr("data");
-        var body = main.children("div").first().clone();
-
-        // thumbnail hotlinking forbidden:
-        body.find('a[href^="/game/"] img').parents('div').first().remove();
-        body.children("div").first().remove();
-
-        remix.children('*').remove();
-        remix = remix.text().trim().replace(/^'(.*)'$/,'$1');
-
-        var data = {
-            ocremix_meta: {
-                remix:     remix,
-                url:       "http://ocremix.org/remix/OCR" + urlMatch[1] + "/",
-                game:      game.text(),
-                game_url:  URL.resolve(url, game.attr('href')),
-                remixers:  parseLinks(remixers),
-                composers: parseLinks(composers),
-                songs:     parseLinks(songs)
-            },
-            readability_data: {
-                html: body.html()
-            }
-        };
-
-        if (youtube_url) {
-            youtube_url = URL.parse(URL.resolve(url, youtube_url)).path.split(/[\/\?&#]/g)[2];
-            if (youtube_url) {
-                data.ocremix_meta.youtube_url = "//www.youtube.com/embed/" + youtube_url;
-            }
-        }
-
-        function parseLinks (elements) {
-            return elements.toArray().map(function (element) {
-                element = $selector(element);
-                return {
-                    name: element.text(),
-                    url:  URL.resolve(url, element.attr('href'))
-                };
-            });
-        }
-
-        return data;
-    },
-    
-    getMeta: function (ocremix_meta) {
-        var meta = {
-            title:     ocremix_meta.game + " '" + ocremix_meta.remix + "'",
-            canonical: ocremix_meta.url,
-            author:    ocremix_meta.remixers.map(function (remixer) { return remixer.name; }).join(', ')
-        };
-
-        if (ocremix_meta.remixers.length === 1) {
-            meta.author_url = ocremix_meta.remixers[0].url;
-        }
-
-        return meta;
-    },
-
-    getLink: function (ocremix_meta) {
-        var links = [];
-        
-        if (ocremix_meta.youtube_url) {
-            links.push({
-                href: ocremix_meta.youtube_url,
-                rel:  CONFIG.R.player,
-                type: CONFIG.T.text_html
-            });
-        }
-
-        return links;
-    },
-
-    tests: [{
-        page: "http://ocremix.org/remixes/?&offset=0&sort=datedesc",
-        selector: "td:nth-child(1) a"
-    },
-        "http://ocremix.org/remix/OCR00673/",
-        "http://ocremix.org/remix/OCR01452/",
-        "http://ocremix.org/remix/OCR02605/"
-    ]
-};
diff --git a/plugins/.fixme/selector/theoatmeal.com/theoatmeal.blog.js b/plugins/.fixme/selector/theoatmeal.com/theoatmeal.blog.js
deleted file mode 100644
index de8f031dc..000000000
--- a/plugins/.fixme/selector/theoatmeal.com/theoatmeal.blog.js
+++ /dev/null
@@ -1,33 +0,0 @@
-module.exports = {
-
-    re: /^http:\/\/theoatmeal\.com\/blog\/[a-z0-9_-]+/i,
-
-    mixins: [
-        "html-title",
-
-        "image_src",
-        "favicon"
-    ],
-
-    getLink: function(cheerio, __readabilityEnabled) {
-
-        var $body = cheerio('.post_body');
-        var text = $body.text();
-
-        return {
-            html: $body.html(),
-            type: CONFIG.T.safe_html,
-            rel: [CONFIG.R.reader, CONFIG.R.inline]
-        };
-    },
-
-    tests: [{
-        page: "http://theoatmeal.com/blog",
-        selector: "a.arrow_right"
-    },
-        "http://theoatmeal.com/blog/fathers_day2013",
-        {
-            skipMethods: ["getLink"]
-        }
-    ]
-};
\ No newline at end of file
diff --git a/plugins/.fixme/selector/theoatmeal.com/theoatmeal.comics.js b/plugins/.fixme/selector/theoatmeal.com/theoatmeal.comics.js
deleted file mode 100644
index b918cfa2b..000000000
--- a/plugins/.fixme/selector/theoatmeal.com/theoatmeal.comics.js
+++ /dev/null
@@ -1,42 +0,0 @@
-var re = /^http:\/\/theoatmeal\.com\/comics\/[a-z0-9_-]+/i;
-
-module.exports = {
-
-    re: re,
-
-    mixins: [
-        "image_src",
-        "favicon"
-    ],
-
-    getMeta: function(meta, __readabilityEnabled) {
-        return {
-            title: meta["html-title"].replace(" - The Oatmeal", "")
-        };
-    },
-
-    getLink: function(cheerio, __readabilityEnabled) {
-
-        var $comic = cheerio('#comic');
-
-        $comic.find('#content_footer2').remove();
-
-        return {
-            html: $comic.html(),
-            type: CONFIG.T.text_html,
-            rel: [CONFIG.R.reader, CONFIG.R.inline]
-        };
-    },
-
-    tests: [{
-        page: "http://theoatmeal.com/comics",
-        selector: "a.arrow_right",
-        getUrl: function(url) {
-            if (url.match(re)) {
-                return url;
-            }
-        }
-    },
-        "http://theoatmeal.com/comics/air_mattress"
-    ]
-};
\ No newline at end of file
diff --git a/plugins/.fixme/selector/wikimedia.org/wikimedia.article.js b/plugins/.fixme/selector/wikimedia.org/wikimedia.article.js
deleted file mode 100644
index a7abf239a..000000000
--- a/plugins/.fixme/selector/wikimedia.org/wikimedia.article.js
+++ /dev/null
@@ -1,51 +0,0 @@
-module.exports = {
-
-    mixins: [
-        "copyright",
-        "favicon"
-    ],
-
-    getMeta: function(cheerio, __readabilityEnabled) {
-        return  {
-            title: cheerio("#firstHeading").text()
-        }
-    },
-
-    getLinks: function(cheerio, __readabilityEnabled) {
-
-        var links = [];
-
-        var $img = cheerio(".tright .thumbimage");
-
-        if ($img.length) {
-            links.push ({
-                href: $img.attr('src'),
-                type: CONFIG.T.image,
-                rel: CONFIG.R.thumbnail,
-                width: $img.attr('width'),
-                height: $img.attr('height')
-            });
-        }
-
-        var $html = cheerio("#bodyContent");
-
-        links.push ({
-            html: $html.html(),
-            type: CONFIG.T.text_html,
-            rel: [CONFIG.R.reader, CONFIG.R.inline]
-        });
-
-        return links;
-    },
-
-    tests: [
-        "http://commons.wikimedia.org/wiki/Commons:Welcome",
-        "http://commons.wikimedia.org/wiki/Main_Page",
-        {
-            noFeeds: true,
-            skipMethods: [
-                "getLink"
-            ]
-        }
-    ]
-};
\ No newline at end of file
diff --git a/plugins/.fixme/selector/wikimedia.org/wikimedia.picture.js b/plugins/.fixme/selector/wikimedia.org/wikimedia.picture.js
deleted file mode 100644
index 48a90ea79..000000000
--- a/plugins/.fixme/selector/wikimedia.org/wikimedia.picture.js
+++ /dev/null
@@ -1,72 +0,0 @@
-module.exports = {
-
-    re: /\/wiki\/File:/i,
-
-    mixins: [
-        "copyright",
-        "favicon"
-    ],
-
-    getMeta: function(cheerio) {
-        return  {
-            title: cheerio("#firstHeading").text().replace(/^[^:]:/, "").replace(/\.\w+$/, ""),
-            description: cheerio("td.description").text(),
-            date: cheerio("time.dtstart[datetime]").attr("datetime"),
-            author: cheerio("#fileinfotpl_aut").next().text()
-        }
-    },
-
-    getLinks: function(cheerio) {
-
-        var links = [];
-
-        var $imgs = cheerio('.mw-thumbnail-link');
-
-        if ($imgs.length) {
-            $imgs.each(function() {
-                var $img = cheerio(this);
-
-                var width, height;
-
-                var dims = $img.text().match(/([\d,.]+)\s+×\s+([\d,.]+)/);
-
-                if (dims) {
-                    width = dims[1].replace(/[,.]/g, "");
-                    height = dims[2].replace(/[,.]/g, "");
-                }
-
-                links.push({
-                    href: $img.attr('href'),
-                    type: CONFIG.T.image,
-                    rel: width && width > 500 ? CONFIG.R.image : CONFIG.R.thumbnail,
-                    width: width,
-                    height: height
-                });
-            });
-        }
-
-        var $img = cheerio(".fullImageLink img");
-        if ($img.length) {
-
-            var width = $img.attr('width');
-            var height = $img.attr('height');
-
-            links.push({
-                href: $img.attr('src'),
-                type: CONFIG.T.image,
-                rel: width && width > 500 ? CONFIG.R.image : CONFIG.R.thumbnail,
-                width: width,
-                height: height
-            });
-        }
-
-        return links;
-    },
-
-    tests: [{
-        page: "http://commons.wikimedia.org/wiki/Commons:Picture_of_the_day",
-        selector: "a.image"
-    },
-        "http://commons.wikimedia.org/wiki/File:Common_Pierrot_Castalius_rosimon_by_kadavoor.JPG"
-    ]
-};
\ No newline at end of file
diff --git a/plugins/.fixme/selector/wikipedia.org/wikipedia.article.js b/plugins/.fixme/selector/wikipedia.org/wikipedia.article.js
deleted file mode 100644
index a8709e086..000000000
--- a/plugins/.fixme/selector/wikipedia.org/wikipedia.article.js
+++ /dev/null
@@ -1,13 +0,0 @@
-module.exports = {
-
-    mixins: [
-        "wikimedia.article"
-    ],
-
-    tests: [{
-        page: "http://en.wikipedia.org/wiki/Wikipedia:Featured_articles",
-        selector: "tr:nth-child(3) a"
-    },
-        "http://en.wikipedia.org/wiki/Comparison_of_European_road_signs"
-    ]
-};
\ No newline at end of file
diff --git a/plugins/.fixme/selector/wikipedia.org/wikipedia.picture.js b/plugins/.fixme/selector/wikipedia.org/wikipedia.picture.js
deleted file mode 100644
index ceca36c2f..000000000
--- a/plugins/.fixme/selector/wikipedia.org/wikipedia.picture.js
+++ /dev/null
@@ -1,16 +0,0 @@
-module.exports = {
-
-    re: /http:\/\/\w+\.wikipedia\.org\/wiki\/File:/i,
-
-    mixins: [
-        "wikimedia.picture"
-    ],
-
-    tests: [{
-        page: "http://en.wikipedia.org/wiki/Wikipedia:Featured_pictures",
-        selector: "dd a.image"
-    },
-        "http://en.wikipedia.org/wiki/File:F-16_June_2008.jpg",
-        "http://en.wikipedia.org/wiki/File:Morning_Energy_-_Ardrossan_Wind_Farm_From_Portencross_-_geograph.org.uk_-_1088264.jpg"
-    ]
-};
\ No newline at end of file

From 897f6c7391e0df0ee6cf57d9b49f4ad957afd8a7 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Thu, 26 May 2016 13:53:36 -0400
Subject: [PATCH 285/320] [tests] fix couple tests

---
 plugins/domains/npr.org/npr.sections.js | 4 ++--
 plugins/domains/podbean.com.js          | 3 +--
 plugins/domains/w.soundcloud.com.js     | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/plugins/domains/npr.org/npr.sections.js b/plugins/domains/npr.org/npr.sections.js
index d87c94319..f7ea5ef06 100644
--- a/plugins/domains/npr.org/npr.sections.js
+++ b/plugins/domains/npr.org/npr.sections.js
@@ -32,7 +32,7 @@ module.exports = {
     tests: [
         "http://www.npr.org/sections/thetwo-way/2016/04/11/473874785/hundreds-protest-gerrymandering-campaign-finance-laws-on-capitols-steps",
         "http://www.npr.org/sections/alltechconsidered/2015/04/29/401236656/libraries-make-space-for-3-d-printers-rules-are-sure-to-follow",
-        "http://www.npr.org/sections/itsallpolitics/2015/08/27/434872755/exactly-what-kind-of-socialist-is-bernie-sanders",
-        "http://www.npr.org/2016/05/04/476793671/first-listen-mudcrutch-2"
+        "http://www.npr.org/sections/itsallpolitics/2015/08/27/434872755/exactly-what-kind-of-socialist-is-bernie-sanders"
+        // "http://www.npr.org/2016/05/04/476793671/first-listen-mudcrutch-2"
     ]
 };
\ No newline at end of file
diff --git a/plugins/domains/podbean.com.js b/plugins/domains/podbean.com.js
index 109ef4495..a935583fb 100644
--- a/plugins/domains/podbean.com.js
+++ b/plugins/domains/podbean.com.js
@@ -40,7 +40,6 @@ module.exports = {
     }, {
         pageWithFeed: 'http://anfieldindex.podbean.com'
     },
-        "http://realenglishconversations.podbean.com/e/english-podcast-17-our-personal-story-real-english-conversations/",
-        "http://thehashtaghunter.podbean.com/e/law-of-attraction/"
+        "http://realenglishconversations.podbean.com/e/english-podcast-17-our-personal-story-real-english-conversations/"
     ]
 };
\ No newline at end of file
diff --git a/plugins/domains/w.soundcloud.com.js b/plugins/domains/w.soundcloud.com.js
index c7ccc3282..b1720fc2d 100644
--- a/plugins/domains/w.soundcloud.com.js
+++ b/plugins/domains/w.soundcloud.com.js
@@ -4,7 +4,7 @@ module.exports = {
         /^https:?\/\/w\.soundcloud\.com\/player\/?\?\/?url=(https:\/\/api\.soundcloud\.com\/tracks\/\d+)$/i
     ],
 
-    getLink: function(urlMatch, cb) {
+    getData: function(urlMatch, cb) {
 
         cb ({
             redirect: urlMatch[1]

From e8a0032ef670045039c705879a4e507be885c110 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Thu, 26 May 2016 13:58:35 -0400
Subject: [PATCH 286/320] [domains] MyVideo.de no more

---
 plugins/{domains => .fixme}/myvideo.de.js | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename plugins/{domains => .fixme}/myvideo.de.js (100%)

diff --git a/plugins/domains/myvideo.de.js b/plugins/.fixme/myvideo.de.js
similarity index 100%
rename from plugins/domains/myvideo.de.js
rename to plugins/.fixme/myvideo.de.js

From 0af1b3dac5c3171de057fc6ae7a9e9d863276a12 Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Thu, 26 May 2016 20:59:19 +0300
Subject: [PATCH 287/320] [oembed] Reformat oembed uri to escape not allowed
 get param characters

---
 lib/plugins/system/oembed/oembedUtils.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/plugins/system/oembed/oembedUtils.js b/lib/plugins/system/oembed/oembedUtils.js
index 581c594d1..3296a2589 100644
--- a/lib/plugins/system/oembed/oembedUtils.js
+++ b/lib/plugins/system/oembed/oembedUtils.js
@@ -161,6 +161,11 @@ module.exports.getOembed = function(uri, options, callback) {
                 return cb(null, data);
             }
 
+            // Reformat uri to escape not allowed get param characters.
+            var urlObj = urlLib.parse(uri, true);
+            delete urlObj.search;
+            uri = urlLib.format(urlObj);
+
             getUrl(uri, {
                 maxRedirects: 3
             })

From 8b1427f1fd557b977f1e85ad1f4956e1110adf54 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Thu, 26 May 2016 16:16:59 -0400
Subject: [PATCH 288/320] [domains] fix spotify tests

---
 plugins/domains/bandcamp.com.js                  | 2 +-
 plugins/domains/spotify.com/spotify.artist.js    | 2 --
 plugins/domains/spotify.com/spotify.thumbnail.js | 2 --
 plugins/domains/spotify.com/spotify.track.js     | 2 --
 4 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/plugins/domains/bandcamp.com.js b/plugins/domains/bandcamp.com.js
index 5a3469c7e..9b9710787 100644
--- a/plugins/domains/bandcamp.com.js
+++ b/plugins/domains/bandcamp.com.js
@@ -3,7 +3,7 @@ module.exports = {
     re: [
         /^https?:\/\/[a-z0-9-]+\.bandcamp\.com\/(album|track)\/(\w+)/i,
         /^https?:\/\/[a-z0-9-]+\.bandcamp\.com/i,
-        /^https?:\/\/([a-z-\.]+)\/(album|track)\/([a-z0-9-]+)/
+        /^https?:\/\/([a-z-\.]+)\/(album|track)\/([a-z-]+)/i // watch out for overlay with play.spotify.com which has digits
     ],
 
     mixins: [
diff --git a/plugins/domains/spotify.com/spotify.artist.js b/plugins/domains/spotify.com/spotify.artist.js
index f7df76d60..168b9cfc2 100644
--- a/plugins/domains/spotify.com/spotify.artist.js
+++ b/plugins/domains/spotify.com/spotify.artist.js
@@ -1,5 +1,3 @@
-var cheerio = require('cheerio');
-
 module.exports = {
 
     // keep dependency on oEmbed only. Otherwise, there's redirect to relative path for "play.*" and no embeds as a result
diff --git a/plugins/domains/spotify.com/spotify.thumbnail.js b/plugins/domains/spotify.com/spotify.thumbnail.js
index 61b27154f..aec8645c5 100644
--- a/plugins/domains/spotify.com/spotify.thumbnail.js
+++ b/plugins/domains/spotify.com/spotify.thumbnail.js
@@ -1,5 +1,3 @@
-var cheerio = require('cheerio');
-
 module.exports = {
 
     getLink: function(spotify_data) {
diff --git a/plugins/domains/spotify.com/spotify.track.js b/plugins/domains/spotify.com/spotify.track.js
index eb66b82ba..18147e044 100644
--- a/plugins/domains/spotify.com/spotify.track.js
+++ b/plugins/domains/spotify.com/spotify.track.js
@@ -1,5 +1,3 @@
-var cheerio = require('cheerio');
-
 module.exports = {
 
     // keep dependency on oEmbed only. Otherwise, there's redirect to relative path for "play.*" and no embeds as a result

From 6d3740d1459f79d696d7e092ab3f6dd5f05c1ab3 Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Fri, 27 May 2016 15:25:36 +0300
Subject: [PATCH 289/320] [domains] youtube.video - prevent possible undefined
 errors

---
 plugins/domains/youtube.com/youtube.video.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugins/domains/youtube.com/youtube.video.js b/plugins/domains/youtube.com/youtube.video.js
index 7324a349b..d8d8b926f 100644
--- a/plugins/domains/youtube.com/youtube.video.js
+++ b/plugins/domains/youtube.com/youtube.video.js
@@ -151,7 +151,7 @@ module.exports = {
         var autoplay = params + (params.indexOf ('?') > -1 ? "&": "?") + "autoplay=1";
 
         // Detect widescreen videos. YouTube API used to have issues with returing proper aspect-ratio.
-        var widescreen = youtube_video_gdata.hd || youtube_video_gdata.thumbnails.maxres != null; 
+        var widescreen = youtube_video_gdata.hd || (youtube_video_gdata.thumbnails && youtube_video_gdata.thumbnails.maxres != null);
 
         if (!widescreen && youtube_video_gdata.playerHtml) { // maybe still widescreen
             var $container = cheerio('<div>');
@@ -169,7 +169,7 @@ module.exports = {
         
 
         var links = [{
-            href: youtube_video_gdata.thumbnails.mq && youtube_video_gdata.thumbnails.mq.url,
+            href: youtube_video_gdata.thumbnails && youtube_video_gdata.thumbnails.mq && youtube_video_gdata.thumbnails.mq.url,
             rel: CONFIG.R.thumbnail,
             type: CONFIG.T.image_jpeg,
             width: 320,
@@ -192,7 +192,7 @@ module.exports = {
             });
         }
 
-        if (youtube_video_gdata.thumbnails.maxres) {
+        if (youtube_video_gdata.thumbnails && youtube_video_gdata.thumbnails.maxres) {
             links.push({
                 href: youtube_video_gdata.thumbnails.maxres.url,
                 rel: CONFIG.R.thumbnail,
@@ -206,7 +206,7 @@ module.exports = {
 
         if (!widescreen) {
             links.push({
-                href: youtube_video_gdata.thumbnails.hq && youtube_video_gdata.thumbnails.hq.url,
+                href: youtube_video_gdata.thumbnails && youtube_video_gdata.thumbnails.hq && youtube_video_gdata.thumbnails.hq.url,
                 rel: CONFIG.R.thumbnail,
                 type: CONFIG.T.image_jpeg,
                 width: 480,

From 17e3d104fec7d688c26a27a5a2d237446659d3ac Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Fri, 27 May 2016 16:02:44 +0300
Subject: [PATCH 290/320] [domains] time.com - fix twitter-player override

---
 plugins/domains/time.com.js | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/plugins/domains/time.com.js b/plugins/domains/time.com.js
index 7b4499569..3690f44df 100644
--- a/plugins/domains/time.com.js
+++ b/plugins/domains/time.com.js
@@ -3,7 +3,13 @@ module.exports = {
     re: /^http:\/\/content\.time\.com\/time\/video\/player\/.+/i,
 
     mixins: [
-        "*"
+        "favicon",
+        "canonical",
+        "keywords",
+        "og-site",
+        "twitter-description",
+        "twitter-title",
+        "media-detector"
     ],
 
     getLink: function(twitter) {
@@ -16,7 +22,8 @@ module.exports = {
     },
 
     tests: [{
-        noFeeds: true
+        noFeeds: true,
+        skipMixins: ['keywords']
     },
         "http://content.time.com/time/video/player/0,32068,3295741285001_2167317,00.html",
         "http://content.time.com/time/video/player/0,32068,3293479731001_2167328,00.html",

From 5b9054ec006cc8f6e309b6d5f38b154d3a6cf563 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Fri, 27 May 2016 09:54:45 -0400
Subject: [PATCH 291/320] [domains] better fix for Time ssl issues

---
 plugins/domains/time.com.js | 29 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/plugins/domains/time.com.js b/plugins/domains/time.com.js
index 3690f44df..a7e77d753 100644
--- a/plugins/domains/time.com.js
+++ b/plugins/domains/time.com.js
@@ -1,24 +1,19 @@
 module.exports = {
 
-    re: /^http:\/\/content\.time\.com\/time\/video\/player\/.+/i,
-
     mixins: [
-        "favicon",
-        "canonical",
-        "keywords",
-        "og-site",
-        "twitter-description",
-        "twitter-title",
-        "media-detector"
+        "*"
     ],
 
     getLink: function(twitter) {
-        return {
-            href: twitter.player.value.replace(/^https:/, 'http:'),
-            rel: [CONFIG.R.player, CONFIG.R.html5, CONFIG.R.twitter],
-            type: CONFIG.T.text_html,
-            'aspect-ratio': twitter.player.width / twitter.player.height
-        };
+
+        if (twitter.player && twitter.player.value) {
+            return {
+                href: twitter.player.value.replace(/^https:/, 'http:'), // there's a 302 to non-ssl
+                rel: [CONFIG.R.player, CONFIG.R.html5, CONFIG.R.twitter],
+                type: CONFIG.T.text_html,
+                'aspect-ratio': twitter.player.width / twitter.player.height
+            };
+        }
     },
 
     tests: [{
@@ -27,6 +22,8 @@ module.exports = {
     },
         "http://content.time.com/time/video/player/0,32068,3295741285001_2167317,00.html",
         "http://content.time.com/time/video/player/0,32068,3293479731001_2167328,00.html",
-        "http://content.time.com/time/video/player/0,32068,2560009369001_2147974,00.html"
+        "http://content.time.com/time/video/player/0,32068,2560009369001_2147974,00.html",
+        "http://techland.time.com/2013/08/02/30-second-tech-trick-how-to-speed-up-a-slow-iphone-or-ipad/",
+        "http://nation.time.com/2014/01/03/new-yorks-snowfall-in-thirty-seven-seconds/"
     ]
 };
\ No newline at end of file

From ef9026a652c0b5f541ce87c59974be139edfccca Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Fri, 27 May 2016 11:14:36 -0400
Subject: [PATCH 292/320] [domains] fix a typo

---
 plugins/links/promo/twitter-youtube.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/links/promo/twitter-youtube.js b/plugins/links/promo/twitter-youtube.js
index 27fbe2021..c984e04b9 100644
--- a/plugins/links/promo/twitter-youtube.js
+++ b/plugins/links/promo/twitter-youtube.js
@@ -9,7 +9,7 @@ module.exports = {
         if (!whitelistRecord.isDefault && whitelistRecord.isAllowed && whitelistRecord.isAllowed('twitter.player')) {return;}
 
         var video_src = (twitter.player && twitter.player.value) || twitter.player;
-        if (!video_src || typeof video_src !== "String" || /youtube\.com|vimeo\.com|dailymotion\.com/.test(url)) {
+        if (!video_src || typeof video_src !== "string" || /youtube\.com|vimeo\.com|dailymotion\.com/.test(url)) {
             return;
         }
 

From 728c9305b6d0cefe0f308f252dcd7784f55a8874 Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Mon, 30 May 2016 16:27:46 +0300
Subject: [PATCH 293/320] minor bugfixes: check type

---
 plugins/links/promo/hosted-via-canonical.js | 1 +
 plugins/meta/canonical.js                   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/links/promo/hosted-via-canonical.js b/plugins/links/promo/hosted-via-canonical.js
index e23a2132c..343dfb785 100644
--- a/plugins/links/promo/hosted-via-canonical.js
+++ b/plugins/links/promo/hosted-via-canonical.js
@@ -6,6 +6,7 @@ module.exports = {
 
         // Redirect to canonical for known domains
         if (canonical && url !== canonical && (
+                canonical.match &&
                 canonical.match(/^https?:\/\/news\.iheart\.com\/media\/play\/\d+/i)                
             )) {
 
diff --git a/plugins/meta/canonical.js b/plugins/meta/canonical.js
index 304df3b2c..da788fdd6 100644
--- a/plugins/meta/canonical.js
+++ b/plugins/meta/canonical.js
@@ -8,7 +8,7 @@ module.exports = {
 
         var canonical = (meta.canonical && meta.canonical.href || meta.canonical) || (meta.og && meta.og.url) || (meta.twitter && meta.twitter.url);
 
-        if (canonical) {
+        if (canonical && typeof canonical === 'string') {
 
             canonical = urlLib.resolve(url, canonical);
 

From 7da4633a34cc87e58ade18dc5c963a15141b5a47 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Mon, 30 May 2016 09:47:30 -0400
Subject: [PATCH 294/320] [brightcove] pass autoplay flag from whitelist

---
 plugins/domains/brightcove.com/players.brightcove.net.js | 9 +++++++--
 plugins/links/promo/brightcove-allow-in-page.js          | 2 +-
 plugins/links/promo/brightcove-in-page-promo.js          | 2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/plugins/domains/brightcove.com/players.brightcove.net.js b/plugins/domains/brightcove.com/players.brightcove.net.js
index e5b4c427f..1f652c8bb 100644
--- a/plugins/domains/brightcove.com/players.brightcove.net.js
+++ b/plugins/domains/brightcove.com/players.brightcove.net.js
@@ -9,11 +9,16 @@ module.exports = {
     ],
 
     //HTML parser will 404 if BC account or player does not exist.
-    getLink: function(urlMatch) {
+    getLink: function(url, urlMatch) {
+
+        var rel = [CONFIG.R.player, CONFIG.R.html5];
+
+        // this comes from `brightcove-in-page-promo` only and follows whitelistRecord
+        if (/&autoplay=true/.test(url)) {rel.push(CONFIG.R.autoplay);}
 
         return {
             href: '//players.brightcove.net/' + urlMatch[1] + '/' + urlMatch[2] + '_default/index.html?videoId=' + urlMatch[3] + '&for=embed',
-            rel: [CONFIG.R.player, CONFIG.R.html5],
+            rel: rel,
             type: CONFIG.T.text_html,
             // aspect-ratio not known, use default...
         };
diff --git a/plugins/links/promo/brightcove-allow-in-page.js b/plugins/links/promo/brightcove-allow-in-page.js
index 73878323c..43a4b0b18 100644
--- a/plugins/links/promo/brightcove-allow-in-page.js
+++ b/plugins/links/promo/brightcove-allow-in-page.js
@@ -9,7 +9,7 @@ module.exports = {
         if (whitelistRecord.isAllowed('html-meta.brightcoveInPage')) {
 
             return {
-                __allowBrightcoveInPage: true
+                __allowBrightcoveInPage: whitelistRecord.isAllowed('html-meta.brightcoveInPage', 'autoplay') ? 'autoplay': true
             };
         }
     }
diff --git a/plugins/links/promo/brightcove-in-page-promo.js b/plugins/links/promo/brightcove-in-page-promo.js
index 31299d125..9dc0235fc 100644
--- a/plugins/links/promo/brightcove-in-page-promo.js
+++ b/plugins/links/promo/brightcove-in-page-promo.js
@@ -41,7 +41,7 @@ module.exports = {
             }
 
             return {
-                __promoUri: 'https://players.brightcove.net/' + account + '/' + player + '_' + embed + '/index.html?videoId=' + video_id
+                __promoUri: 'https://players.brightcove.net/' + account + '/' + player + '_' + embed + '/index.html?videoId=' + video_id + (__allowBrightcoveInPage === 'autoplay' ? '&autoplay=true' : '')
             }
         }
     },

From f318a78ca7b4ed85301a0bdc5726f1f0f44087c3 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Mon, 30 May 2016 11:13:31 -0400
Subject: [PATCH 295/320] [twitter] support for timelines and users

---
 config.local.js.SAMPLE                   | 10 +++++++++-
 lib/plugins/system/oembed/providers.json | 18 +++++++++++++++++-
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/config.local.js.SAMPLE b/config.local.js.SAMPLE
index fb4c08bcc..1eed75065 100644
--- a/config.local.js.SAMPLE
+++ b/config.local.js.SAMPLE
@@ -97,7 +97,15 @@
             params: {
                 show_posts: 0,
                 show_facepile: 0,
-                "maxwidth": 600
+                maxwidth: 600
+            }
+        }, {
+            // match i=user or i=moment or i=timeline to configure these types invidually
+            // see params spec at https://dev.twitter.com/web/embedded-timelines/oembed
+            re: [/^https?:\/\/publish\.twitter\.com\/oembed\?i=user/i],
+            params: {
+                limit: 1,
+                maxwidth: 600
             }
         }],
 
diff --git a/lib/plugins/system/oembed/providers.json b/lib/plugins/system/oembed/providers.json
index ee62773d5..e34be90e0 100644
--- a/lib/plugins/system/oembed/providers.json
+++ b/lib/plugins/system/oembed/providers.json
@@ -172,7 +172,23 @@
         "templates": [
             "twitter\\.com/i/moments/(\\d+)"
         ],
-        "endpoint": "https://publish.twitter.com/oembed"
+        "endpoint": "https://publish.twitter.com/oembed?i=moment&url={url}"
+    },
+    {
+        "name": "Twitter Timelines",
+        "templates": [
+            "twitter\\.com/(\\w+)/timelines/(\\d+)",
+            "twitter\\.com/(\\w+)/lists/(\\w+)",
+             "twitter\\.com/(\\w+)/likes"
+        ],
+        "endpoint": "https://publish.twitter.com/oembed?i=timeline&url={url}"
+    },
+    {
+        "name": "Twitter Users",
+        "templates": [
+            "twitter\\.com/(\\w+)$"
+        ],
+        "endpoint": "https://publish.twitter.com/oembed?i=user&url={url}"
     },
     {
         "name": "Gist",

From 52b3c41f60728f42aefe7133c64bb754224be7b8 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Mon, 30 May 2016 11:36:14 -0400
Subject: [PATCH 296/320] [domains] fix centering for timelines

---
 .../domains/twitter.com/twitter.center-fix.js | 42 +++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 plugins/domains/twitter.com/twitter.center-fix.js

diff --git a/plugins/domains/twitter.com/twitter.center-fix.js b/plugins/domains/twitter.com/twitter.center-fix.js
new file mode 100644
index 000000000..be6ef9776
--- /dev/null
+++ b/plugins/domains/twitter.com/twitter.center-fix.js
@@ -0,0 +1,42 @@
+module.exports = {
+
+    // remove this plugin when Twitter fixes centering
+
+    re: [
+        /^https?:\/\/twitter\.com\/\w+\/(?:timelines?|moments?|likes?)\/(\d+)/i,
+        /^https?:\/\/twitter\.com\/\w+$/i,
+        /^https?:\/\/twitter\.com\/\w+\/(?:timelines?|moments?|likes?|lists?)\//i,
+    ],
+
+    mixins: [
+        'domain-icon',
+        'oembed-site',
+        'html-title',
+        'description',
+        'og-image',
+        'canonical'
+    ],
+
+    getLink: function(oembed, options) {
+
+        var html = oembed.html;
+
+        if (options.getProviderOptions('twitter.center', true)) {
+            html = '<div align="center">' + html + '</div>';
+        }
+
+        return {
+            html: html,
+            rel: [CONFIG.R.reader, CONFIG.R.html5, CONFIG.R.ssl, CONFIG.R.inline],
+            type: CONFIG.T.text_html,
+            'max-width': oembed.width
+        }
+    },
+
+    tests: [
+        "https://twitter.com/potus",
+        "https://twitter.com/i/moments/737260069209972736",
+        "https://twitter.com/TwitterDev/timelines/539487832448843776",
+        "https://twitter.com/TwitterDev/lists/national-parks"
+    ]
+};
\ No newline at end of file

From 1327158b41a044c6c199a57f4144c412cc66cdf0 Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Mon, 30 May 2016 18:45:40 +0300
Subject: [PATCH 297/320] [validators] do not wait check favicon, use only
 cached data

---
 lib/cache.js                                  | 21 +++++++++++++++++++
 .../validators/async/20_checkFavicon.js       |  3 ++-
 lib/utils.js                                  |  1 +
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/lib/cache.js b/lib/cache.js
index 6a62b33e5..4cda83640 100644
--- a/lib/cache.js
+++ b/lib/cache.js
@@ -36,13 +36,34 @@
             options = null;
         }
 
+        var doNotWaitFunctionIfNoCache = options && options.doNotWaitFunctionIfNoCache;
+
         var exec = function() {
+
+            if (doNotWaitFunctionIfNoCache) {
+                callback(null, null);
+            }
+
             func(function(error, data) {
+
                 if (error) {
+
+                    if (doNotWaitFunctionIfNoCache) {
+                        // Stop.
+                        return;
+                    }
+
                     callback(error);
 
                 } else {
+
                     cache.set(key, data, options);
+
+                    if (doNotWaitFunctionIfNoCache) {
+                        // Stop.
+                        return;
+                    }
+
                     callback(error, data);
                 }
             });
diff --git a/lib/plugins/validators/async/20_checkFavicon.js b/lib/plugins/validators/async/20_checkFavicon.js
index 3dc4d6b45..8e2998ba6 100644
--- a/lib/plugins/validators/async/20_checkFavicon.js
+++ b/lib/plugins/validators/async/20_checkFavicon.js
@@ -37,7 +37,8 @@ module.exports = {
             if (error) {
                 // Unknown error.
                 link.error = error;
-            } else {
+            } else if (data) {
+
                 if (data.code != 200) {
                     // Image not found or other error. Exclude link from results.                    
                     link.error = data.code;
diff --git a/lib/utils.js b/lib/utils.js
index 32a974cf9..1f52592e9 100644
--- a/lib/utils.js
+++ b/lib/utils.js
@@ -371,6 +371,7 @@ exports.getUriStatus = function(uri, options, callback) {
 
     }, {
         disableCache: options.disableCache,
+        doNotWaitFunctionIfNoCache: true,
         ttl: CONFIG.IMAGE_META_CACHE_TTL || CONFIG.CACHE_TTL
     }, callback);
 };

From aad2979dcc665ab8e0a8cc486fb69211a9cdbf18 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Mon, 30 May 2016 12:14:23 -0400
Subject: [PATCH 298/320] [domains] Ooyala is slow - allow all players from a
 domain after the first check

---
 plugins/links/promo/ooyala.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/links/promo/ooyala.js b/plugins/links/promo/ooyala.js
index 8999bcedf..822231f64 100644
--- a/plugins/links/promo/ooyala.js
+++ b/plugins/links/promo/ooyala.js
@@ -27,10 +27,12 @@ module.exports = {
         } 
     },
 
-    getLink: function(__ooyalaPlayer, request, cb) {
+    getLink: function(__ooyalaPlayer, url, request, cb) {
 
         request({
             uri: "http://player.ooyala.com/nuplayer?embedCode=" + __ooyalaPlayer.embedCode,
+            // Ooyala is really slow - allow all players from a domain after the first check
+            cache_key: 'ooyala:domain:' + url.replace(/^https?:\/\//i, '').split('/')[0].toLowerCase(),
             method: 'HEAD',
             headers: {
                 'Accept-Encoding': 'gzip, deflate, sdch', // this is required for head request to return content_length

From 262b912edc891eca0189a0c089da048688447ff1 Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Mon, 30 May 2016 19:42:00 +0300
Subject: [PATCH 299/320] [validators] always check default favicon path
 generated by iframely

---
 lib/plugins/validators/async/20_checkFavicon.js | 5 +++++
 lib/utils.js                                    | 2 +-
 plugins/links/favicon.js                        | 5 ++++-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/lib/plugins/validators/async/20_checkFavicon.js b/lib/plugins/validators/async/20_checkFavicon.js
index 8e2998ba6..e667c8084 100644
--- a/lib/plugins/validators/async/20_checkFavicon.js
+++ b/lib/plugins/validators/async/20_checkFavicon.js
@@ -1,5 +1,6 @@
 var utils = require('../../../utils');
 var urlLib = require('url');
+var _ = require('underscore');
 
 module.exports = {
 
@@ -30,6 +31,10 @@ module.exports = {
         // Need this for // case (no protocol).
         var uri = urlLib.resolve(url, link.href);
 
+        if (!link._imageStatus || !link._imageStatus.forceSyncCheck) {
+            options = _.extend({doNotWaitFunctionIfNoCache: true}, options);
+        }
+
         utils.getUriStatus(uri, options, function(error, data) {
 
             error = error || (data && data.error);
diff --git a/lib/utils.js b/lib/utils.js
index 1f52592e9..5a461e897 100644
--- a/lib/utils.js
+++ b/lib/utils.js
@@ -371,7 +371,7 @@ exports.getUriStatus = function(uri, options, callback) {
 
     }, {
         disableCache: options.disableCache,
-        doNotWaitFunctionIfNoCache: true,
+        doNotWaitFunctionIfNoCache: options.doNotWaitFunctionIfNoCache,
         ttl: CONFIG.IMAGE_META_CACHE_TTL || CONFIG.CACHE_TTL
     }, callback);
 };
diff --git a/plugins/links/favicon.js b/plugins/links/favicon.js
index a8968e0c6..9bf2d07ff 100644
--- a/plugins/links/favicon.js
+++ b/plugins/links/favicon.js
@@ -53,7 +53,10 @@ module.exports = {
             links.push({
                 href: '/favicon.ico',
                 type: CONFIG.T.image,
-                rel: CONFIG.R.icon
+                rel: CONFIG.R.icon,
+                _imageStatus: {
+                    forceSyncCheck: true
+                }
             });
         }
 

From ce1868036252360ffbece9114407b14328f64dba Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Mon, 30 May 2016 13:27:12 -0400
Subject: [PATCH 300/320] [twitter] no need for centering fix if no maxwidth

---
 .../twitter.com/{twitter.center-fix.js => twitter.timelines.js} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename plugins/domains/twitter.com/{twitter.center-fix.js => twitter.timelines.js} (92%)

diff --git a/plugins/domains/twitter.com/twitter.center-fix.js b/plugins/domains/twitter.com/twitter.timelines.js
similarity index 92%
rename from plugins/domains/twitter.com/twitter.center-fix.js
rename to plugins/domains/twitter.com/twitter.timelines.js
index be6ef9776..1c5884f79 100644
--- a/plugins/domains/twitter.com/twitter.center-fix.js
+++ b/plugins/domains/twitter.com/twitter.timelines.js
@@ -21,7 +21,7 @@ module.exports = {
 
         var html = oembed.html;
 
-        if (options.getProviderOptions('twitter.center', true)) {
+        if (options.getProviderOptions('twitter.center', true) && oembed.width) {
             html = '<div align="center">' + html + '</div>';
         }
 

From 01dff6b8a0f651d2a4b63a2db8f86c85a8ad53f6 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Mon, 30 May 2016 20:34:35 -0400
Subject: [PATCH 301/320] [domains] return support of Google Drive videos
 (x-frame-options workaround)

---
 plugins/domains/google.com/docs.google.com.js | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/plugins/domains/google.com/docs.google.com.js b/plugins/domains/google.com/docs.google.com.js
index 48142eac1..95bb84d21 100644
--- a/plugins/domains/google.com/docs.google.com.js
+++ b/plugins/domains/google.com/docs.google.com.js
@@ -3,7 +3,7 @@ module.exports = {
     provides: "schemaFileObject",
 
     re: [
-        /https:\/\/(?:docs|drive)\.google\.com\/(forms|document|presentation|spreadsheets|file)\/d\//i
+        /https:\/\/(?:docs|drive)\.google\.com\/(forms|document|presentation|spreadsheets|file)\/d\/([a-zA-Z0-9_-]+)/i
     ],
 
     mixins: [
@@ -39,22 +39,26 @@ module.exports = {
             };            
 
             if (schemaFileObject.playerType) {
-                // file.rel.push(CONFIG.R.player);
+
+                // HEADS UP: 
                 // There is a problem with player as embedURL: x-frame-options is SAMEORIGIN
-                return;
-            } 
+                file.href = "https://drive.google.com/file/d/" + urlMatch[2] + "/preview";
+                file.rel.push(CONFIG.R.player);
+                // use default aspect
 
-            if (urlMatch[1] === "forms" || urlMatch[1] === "document" || (urlMatch[1] === "file" && /\.pdf$/i.test(schemaFileObject.name))) {
+            } else if (urlMatch[1] === "forms" || urlMatch[1] === "document" || urlMatch[1] === "file") {
                 file["aspect-ratio"] = 1 / Math.sqrt(2); // A4 portrait
                 // "App" to prevent Google Forms be presented as Player through Twitter-player mixin as Player prevails on Readers
                 file.rel.push (urlMatch[1] === "forms" ? CONFIG.R.app : CONFIG.R.reader); 
 
+            /// } else if (urlMatch[1] === "file" && schemaFileObject.playerType) {
+
             } else if (urlMatch[1] === "spreadsheets" ) {
                 file["aspect-ratio"] = Math.sqrt(2); // A4 landscape
                 file.rel.push (CONFIG.R.reader);
 
-            } else {
-                file["aspect-ratio"] = 4/3;
+            } else { // presentation                
+                // file["aspect-ratio"] = 4/3; // use default aspect ratio
                 file.rel.push (CONFIG.R.player);
             }
 

From c34d47a69cf822454416879dc1e587c765205c42 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Mon, 30 May 2016 21:10:56 -0400
Subject: [PATCH 302/320] [domains] a bit better quizlet support

---
 plugins/domains/quizlet.com.js | 37 ++++++++++++++++++++--------------
 1 file changed, 22 insertions(+), 15 deletions(-)

diff --git a/plugins/domains/quizlet.com.js b/plugins/domains/quizlet.com.js
index c160f339d..90d65d957 100644
--- a/plugins/domains/quizlet.com.js
+++ b/plugins/domains/quizlet.com.js
@@ -1,6 +1,8 @@
 module.exports = {
 
-    re: /^https?:\/\/quizlet\.com\/(\d+)\/[\w-]+\//i,
+    re: [
+        /^https?:\/\/quizlet\.com\/(\d+)\/([\w-]+)\/?/i
+    ],
 
     mixins: [
         "*"
@@ -16,26 +18,31 @@ module.exports = {
             'spacerace'
         ];
 
-        return bits.map(function(bit) {
-            var rel = [CONFIG.R.survey];
-            if (bit === 'speller') {
-                rel.push(CONFIG.R.autoplay);
-            }
-            return {
-                href: 'https://quizlet.com/' + urlMatch[1]+ '/' + bit + '/embedv2',
-                type: CONFIG.T.text_html,
-                rel: rel,
-                'min-width': 100,
-                'min-height': 100
-            }
-        });
+        var bit ='flashcards';
+        if (/^flashcards|learn|scatter|speller|test|spacerace|gravity$/i.test(urlMatch[2])) {
+            bit = urlMatch[2];
+        }
+
+        return {
+            href: 'https://quizlet.com/' + urlMatch[1]+ '/' + bit + '/embedv2',
+            type: CONFIG.T.text_html,
+            rel: CONFIG.R.survey,
+            'min-width': 100,
+            'min-height': 100
+        }
+
     },
 
     tests: [{
         page: 'http://quizlet.com/subject/math/?sortBy=mostRecent',
         selector: '.SearchResult-link'
     },
-        "http://quizlet.com/43729824/conceptual-physics-final-review-part-1-flash-cards/"
+        "http://quizlet.com/43729824/conceptual-physics-final-review-part-1-flash-cards/",
+        "https://quizlet.com/74274924/flashcards",
+        "https://quizlet.com/141059966/learn",
+        "https://quizlet.com/43729824/scatter",
+        "https://quizlet.com/43729824/gravity",
+        "https://quizlet.com/43729824/test"
     ]
 
 };
\ No newline at end of file

From f476edd541769eae352c637796a45b04634aa577 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Tue, 31 May 2016 11:22:00 -0400
Subject: [PATCH 303/320] [domains] prefer iFrame embeds for screencast

---
 plugins/domains/screencast.com.js | 60 ++++++++++++++++++-------------
 1 file changed, 36 insertions(+), 24 deletions(-)

diff --git a/plugins/domains/screencast.com.js b/plugins/domains/screencast.com.js
index 91fb6e3ce..ed1d153df 100644
--- a/plugins/domains/screencast.com.js
+++ b/plugins/domains/screencast.com.js
@@ -1,7 +1,8 @@
 module.exports = {
 
     re: [
-        /^https?:\/\/screencast\.com\/t\//i
+        /^https?:\/\/(www\.)?screencast\.com\/t\//i,
+        /^https?:\/\/(www\.)?screencast\.com\/users\//i        
     ],
 
     mixins: [
@@ -11,16 +12,10 @@ module.exports = {
     getLink: function(cheerio) {
 
         var $el = cheerio('img.embeddedObject');
-        var isImage = true;
         var result;
         
-        if (!$el.length) {
-            isImage = false;
-            $el = cheerio('#scPlayer');
-        }
+        if ($el.length) {
 
-        if (isImage) {
-    
             result = {
                 href: $el.attr('src'),
                 type: CONFIG.T.image,
@@ -29,28 +24,45 @@ module.exports = {
                 height: $el.attr('height')
             }; 
 
-        } else {
+        } else { // let's try iFrame
 
-            var flashVars = cheerio('#scPlayer param[name="flashVars"]').attr('value');
-        
-            result = {
-                href: $el.attr('data') + '?'+ flashVars,
-                type: $el.attr('type'),
-                rel: CONFIG.R.player,
-                "aspect-ratio": $el.attr('width') / $el.attr('height')
-            }
+            $el = cheerio('iframe.embeddedObject');
+
+            if ($el.length) {
+
+                result = {
+                    href: $el.attr('src').replace(/^http:/i, ''),
+                    type: CONFIG.T.text_html,
+                    rel: [CONFIG.R.player, CONFIG.R.html5],
+                    "aspect-ratio": $el.attr('width') / $el.attr('height')
+                }                
+            
+            } else { // OK, it's older Flash player then
+
+                $el = cheerio('#scPlayer');
+
+                if ($el.length) {
+                    var flashVars = cheerio('#scPlayer param[name="flashVars"]').attr('value');
+
+                    result = {
+                        href: $el.attr('data') + '?'+ flashVars,
+                        type: $el.attr('type'),
+                        rel: CONFIG.R.player,
+                        "aspect-ratio": $el.attr('width') / $el.attr('height')
+                    }
+                }
+            }            
+            
         }
 
         return result;
     },
 
     tests: [ 
-        "http://screencast.com/t/kg3Waazl1q",
-        "http://screencast.com/t/t1sxDFYO",
-        "http://screencast.com/t/pZ9CEcsnj75",
-        "http://screencast.com/t/MjA4M2ViMT",
-        {
-            skipMixins: ['description']
-        }
+        "http://screencast.com/t/kg3Waazl1q",       // image
+        "http://screencast.com/t/t1sxDFYO",         // image
+        "http://screencast.com/t/pZ9CEcsnj75",      // Flash
+        "http://screencast.com/t/MjA4M2ViMT",       // iFrame
+        "http://www.screencast.com/t/F8c0F6CLK3"    // iFrame
     ]
 };

From d8bd96a9d82241f237b4dd085cd2719215d6f968 Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Wed, 1 Jun 2016 15:32:59 +0300
Subject: [PATCH 304/320] [utils] encodeText: remove 'REPLACEMENT CHARACTER'

---
 lib/utils.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/utils.js b/lib/utils.js
index 5a461e897..bfa67b389 100644
--- a/lib/utils.js
+++ b/lib/utils.js
@@ -179,7 +179,10 @@ exports.getCharset = function(string, doNotParse) {
 exports.encodeText = function(charset, text) {
     try {
         var b = iconv.encode(text, "ISO8859-1");
-        return iconv.decode(b, charset || "UTF-8");
+        text = iconv.decode(b, charset || "UTF-8");
+        // Remove 'REPLACEMENT CHARACTER'.
+        text = text.replace(/\uFFFD/ig, '');
+        return text;
     } catch(e) {
         return text;
     }

From ccc6da71e1b66b09a81febf570aa8d06a9f2950b Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Wed, 1 Jun 2016 16:37:05 +0300
Subject: [PATCH 305/320] [utils] encodeText: remove 'REPLACEMENT CHARACTER' -
 only at string end

---
 lib/utils.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/utils.js b/lib/utils.js
index bfa67b389..563f0fa1f 100644
--- a/lib/utils.js
+++ b/lib/utils.js
@@ -181,7 +181,7 @@ exports.encodeText = function(charset, text) {
         var b = iconv.encode(text, "ISO8859-1");
         text = iconv.decode(b, charset || "UTF-8");
         // Remove 'REPLACEMENT CHARACTER'.
-        text = text.replace(/\uFFFD/ig, '');
+        text = text.replace(/\uFFFD$/ig, '');
         return text;
     } catch(e) {
         return text;

From 4ed2f36d69037d56f40bcdd65f4ef601d521c983 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Wed, 1 Jun 2016 12:33:45 -0400
Subject: [PATCH 306/320] [domains] support for hosted Droplr

---
 plugins/links/oembed-photo.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/links/oembed-photo.js b/plugins/links/oembed-photo.js
index 2f2eab76f..f722eb590 100644
--- a/plugins/links/oembed-photo.js
+++ b/plugins/links/oembed-photo.js
@@ -2,7 +2,7 @@ module.exports = {
 
     getLink: function(oembed, whitelistRecord) {
 
-        if (oembed.type === "photo" && oembed.url && whitelistRecord.isAllowed && whitelistRecord.isAllowed('oembed.photo')) {
+        if ((oembed.type === "photo" || oembed.type === "image") && oembed.url && whitelistRecord.isAllowed && whitelistRecord.isAllowed('oembed.photo')) {
 
             return {
                 href: oembed.url,

From 50bd5f9135c45391943315eef779c7afe3ea3f6c Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Thu, 2 Jun 2016 17:51:48 -0400
Subject: [PATCH 307/320] [domains] also support viceland.com for Vice videos

---
 plugins/domains/vice.videos.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/plugins/domains/vice.videos.js b/plugins/domains/vice.videos.js
index 0041e7bc7..76688d330 100644
--- a/plugins/domains/vice.videos.js
+++ b/plugins/domains/vice.videos.js
@@ -1,7 +1,7 @@
 module.exports = {
 
     re: [
-        /^https?:\/\/video\.vice\.com\/(\w{2}_\w{2})\/video\/[^\/]+\/(\w+)/i        
+        /^https?:\/\/(?:www\.)?(video\.vice|viceland)\.com\/(\w{2}_\w{2})\/video\/[^\/]+\/(\w+)/i        
     ],
 
     provides: '__allowEmbedURL',
@@ -14,7 +14,7 @@ module.exports = {
 
         if (schemaVideoObject.embedURL || schemaVideoObject.embedUrl) {
             return {
-                href: 'https://video.vice.com/' + urlMatch[1] + '/embed/' + urlMatch[2],
+                href: 'https://video.vice.com/' + urlMatch[2] + '/embed/' + urlMatch[3],
                 type: CONFIG.T.text_html,
                 rel: [CONFIG.R.player, CONFIG.R.html5],
                 "aspect-ratio": 560 / 315
@@ -30,6 +30,7 @@ module.exports = {
     },
 
     tests: [
-        "https://video.vice.com/en_us/video/what-it-means-to-be-a-drum-major-scene/5733a7bc93a621680434f5a0?latest=1"
+        "https://video.vice.com/en_us/video/what-it-means-to-be-a-drum-major-scene/5733a7bc93a621680434f5a0?latest=1",
+        "https://www.viceland.com/en_us/video/luzira-upper-prison/57210eb733a2543d47103401"
     ]
 };
\ No newline at end of file

From bc952b865c47c2571a67909e1b20698b3a1be7a4 Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Fri, 3 Jun 2016 15:36:27 +0300
Subject: [PATCH 308/320] [whitelist] use gzip to retrieve whitelist file

---
 lib/whitelist.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/whitelist.js b/lib/whitelist.js
index 050eb325c..5770f565c 100644
--- a/lib/whitelist.js
+++ b/lib/whitelist.js
@@ -331,7 +331,8 @@
                 qs: {
                     domain: CONFIG.baseAppUrl && CONFIG.baseAppUrl.replace(/.+\/\//, ''),
                     v: CONFIG.VERSION
-                }
+                },
+                gzip: true
             }, function(error, r, newWhitelist) {
 
                 if (error) {

From 57ad9c87c58cef63e029e979ff078529f78cc7b3 Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Fri, 3 Jun 2016 16:41:37 +0300
Subject: [PATCH 309/320] [core] use gzip for api requests

---
 lib/request.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/request.js b/lib/request.js
index eb7f63640..ced8f68d2 100644
--- a/lib/request.js
+++ b/lib/request.js
@@ -47,6 +47,8 @@ module.exports = function(options, callback) {
     delete options.new_cache_key;
     delete options.refresh;
 
+    options.gzip = true;
+
     var prefix = CONFIG.API_REQUEST_CACHE_PREFIX ? (CONFIG.API_REQUEST_CACHE_PREFIX + ':') : '';
 
     var key = 'req:' + prefix + (cache_key || hash(JSON.stringify(options)));

From 07e937c8437cee23c32adadab3dbceab5a90911e Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Fri, 3 Jun 2016 20:39:15 +0300
Subject: [PATCH 310/320] [whitelist] do not reload whitelist if not changed
 (304 response)

---
 lib/whitelist.js | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/lib/whitelist.js b/lib/whitelist.js
index 5770f565c..b28efe00d 100644
--- a/lib/whitelist.js
+++ b/lib/whitelist.js
@@ -4,9 +4,11 @@
         fs = require('fs'),
         path = require('path'),
         _ = require('underscore'),
-        request = require('request');
+        request = require('request'),
+        logging = require('../logging');
 
     var whitelistObject = {domains: {}};
+    var whitelistObjectEtag;
     var currentWhitelistFilename;
     var WHITELIST_DIR = path.resolve(__dirname, '../whitelist');
 
@@ -221,7 +223,7 @@
 
         addWildcard();
 
-        console.log('Whitelist activated. Domains, including blacklisted:', _.keys(data.domains).length);
+        logging.log('Whitelist activated. Domains, including blacklisted:', _.keys(data.domains).length);
     }
 
     function readWhitelist(filename) {
@@ -323,9 +325,9 @@
 
         if (!currentWhitelistFilename && CONFIG.WHITELIST_URL && CONFIG.WHITELIST_URL_RELOAD_PERIOD) {
 
-            console.log("Loading whitelist from " + CONFIG.WHITELIST_URL);
+            logging.log("Loading whitelist from " + CONFIG.WHITELIST_URL);
 
-            request({
+            var options = {
                 uri: CONFIG.WHITELIST_URL,
                 json: true,
                 qs: {
@@ -333,15 +335,26 @@
                     v: CONFIG.VERSION
                 },
                 gzip: true
-            }, function(error, r, newWhitelist) {
+            };
+
+            if (whitelistObjectEtag) {
+                options.headers = {
+                    'If-None-Match': whitelistObjectEtag
+                };
+            }
+
+            request(options, function(error, r, newWhitelist) {
 
                 if (error) {
                     console.error('Error loading whitelist from ' + CONFIG.WHITELIST_URL + ' : ' + error);
                 } else if (r.statusCode === 500) {
                     console.error('Error loading whitelist from ' + CONFIG.WHITELIST_URL + ' : ' + newWhitelist);
+                } else if (r.statusCode === 304) {
+                    logging.log('Whitelist respond: 304 (not modified)');
                 } else if (typeof newWhitelist === 'string') {
                     console.error('Error loading whitelist from ' + CONFIG.WHITELIST_URL + ' : incorrect data: ' + newWhitelist);
                 } else {
+                    whitelistObjectEtag = r.headers['etag'];
                     applyParsedWhitelist(newWhitelist);
                 }
 

From e253f23df6f1bd12a22e96364450d3424bc1c917 Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Mon, 6 Jun 2016 17:07:52 +0300
Subject: [PATCH 311/320] [whitelist] improve etag check for whitelist.json
 request

---
 lib/whitelist.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/whitelist.js b/lib/whitelist.js
index b28efe00d..14f83496b 100644
--- a/lib/whitelist.js
+++ b/lib/whitelist.js
@@ -339,6 +339,7 @@
 
             if (whitelistObjectEtag) {
                 options.headers = {
+                    'X-If-None-Match': whitelistObjectEtag,
                     'If-None-Match': whitelistObjectEtag
                 };
             }
@@ -351,10 +352,10 @@
                     console.error('Error loading whitelist from ' + CONFIG.WHITELIST_URL + ' : ' + newWhitelist);
                 } else if (r.statusCode === 304) {
                     logging.log('Whitelist respond: 304 (not modified)');
-                } else if (typeof newWhitelist === 'string') {
+                } else if (!newWhitelist || typeof newWhitelist === 'string') {
                     console.error('Error loading whitelist from ' + CONFIG.WHITELIST_URL + ' : incorrect data: ' + newWhitelist);
                 } else {
-                    whitelistObjectEtag = r.headers['etag'];
+                    whitelistObjectEtag = r.headers['etag'] || r.headers['x-etag'];
                     applyParsedWhitelist(newWhitelist);
                 }
 

From f969622fd75e6a43edf4490dc234ad8c1d823776 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Mon, 6 Jun 2016 12:28:46 -0400
Subject: [PATCH 312/320] [domains] re-direct gfycat details to canonical

---
 plugins/domains/i.gfycat.com.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugins/domains/i.gfycat.com.js b/plugins/domains/i.gfycat.com.js
index beb41212d..c9d882b4c 100644
--- a/plugins/domains/i.gfycat.com.js
+++ b/plugins/domains/i.gfycat.com.js
@@ -1,7 +1,8 @@
 module.exports = {
 
     re: [
-        /https?:\/\/(?:giant|thumbs)\.gfycat\.com\/([a-zA-Z0-9]+)(?:\-mobile)?\.(?:webm|mp4|gif)$/i
+        /https?:\/\/(?:giant|thumbs)\.gfycat\.com\/([a-zA-Z0-9]+)(?:\-mobile)?\.(?:webm|mp4|gif)$/i,
+        /https?:\/\/gfycat\.com\/detail\/([a-zA-Z0-9]+)$/i        
     ],
 
     getLink: function(urlMatch, cb) {
@@ -16,6 +17,7 @@ module.exports = {
         skipMethods: ["getLink"]
     },
         "https://giant.gfycat.com/ObviousEuphoricHadrosaurus.webm",
-        "https://thumbs.gfycat.com/ObviousEuphoricHadrosaurus-mobile.mp4"
+        "https://thumbs.gfycat.com/ObviousEuphoricHadrosaurus-mobile.mp4",
+        "https://gfycat.com/detail/ImmaculateWastefulCanine"
     ]
 };
\ No newline at end of file

From 1ad44d8f23d1d7515e3c3855d69e0901b15cb40b Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Mon, 6 Jun 2016 21:27:36 +0300
Subject: [PATCH 313/320] [whitelist] rollback tests

---
 lib/whitelist.js | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/lib/whitelist.js b/lib/whitelist.js
index 14f83496b..b38afc65e 100644
--- a/lib/whitelist.js
+++ b/lib/whitelist.js
@@ -8,7 +8,6 @@
         logging = require('../logging');
 
     var whitelistObject = {domains: {}};
-    var whitelistObjectEtag;
     var currentWhitelistFilename;
     var WHITELIST_DIR = path.resolve(__dirname, '../whitelist');
 
@@ -337,13 +336,6 @@
                 gzip: true
             };
 
-            if (whitelistObjectEtag) {
-                options.headers = {
-                    'X-If-None-Match': whitelistObjectEtag,
-                    'If-None-Match': whitelistObjectEtag
-                };
-            }
-
             request(options, function(error, r, newWhitelist) {
 
                 if (error) {
@@ -355,7 +347,6 @@
                 } else if (!newWhitelist || typeof newWhitelist === 'string') {
                     console.error('Error loading whitelist from ' + CONFIG.WHITELIST_URL + ' : incorrect data: ' + newWhitelist);
                 } else {
-                    whitelistObjectEtag = r.headers['etag'] || r.headers['x-etag'];
                     applyParsedWhitelist(newWhitelist);
                 }
 

From df88b6dc3a37b1b55931da53b26b472733346707 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Tue, 7 Jun 2016 12:36:56 -0400
Subject: [PATCH 314/320] [domains] good-bye Poll Everywhere

---
 lib/plugins/system/oembed/providers.json | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/lib/plugins/system/oembed/providers.json b/lib/plugins/system/oembed/providers.json
index e34be90e0..9b51a56f1 100644
--- a/lib/plugins/system/oembed/providers.json
+++ b/lib/plugins/system/oembed/providers.json
@@ -115,15 +115,6 @@
         ],
         "endpoint": "http://www.collegehumor.com/oembed.{format}"
     },
-    {
-        "name": "Poll Everywhere",
-        "templates": [
-            "www\\.polleverywhere\\.com/polls/.*",
-            "www\\.polleverywhere\\.com/multiple_choice_polls/.*",
-            "www\\.polleverywhere\\.com/free_text_polls/.*"
-        ],
-        "endpoint": "http://www.polleverywhere.com/services/oembed/"
-    },
     {
         "name": "My Opera",
         "templates": [
@@ -179,7 +170,7 @@
         "templates": [
             "twitter\\.com/(\\w+)/timelines/(\\d+)",
             "twitter\\.com/(\\w+)/lists/(\\w+)",
-             "twitter\\.com/(\\w+)/likes"
+            "twitter\\.com/(\\w+)/likes"
         ],
         "endpoint": "https://publish.twitter.com/oembed?i=timeline&url={url}"
     },

From 51cc468eba54dc3e06b900d66fb0f711308bd40a Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Wed, 8 Jun 2016 10:08:23 -0400
Subject: [PATCH 315/320] [domains] adding plot.ly

---
 plugins/domains/plot.ly/plot.ly.ejs |  2 ++
 plugins/domains/plot.ly/plot.ly.js  | 32 +++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+)
 create mode 100644 plugins/domains/plot.ly/plot.ly.ejs
 create mode 100644 plugins/domains/plot.ly/plot.ly.js

diff --git a/plugins/domains/plot.ly/plot.ly.ejs b/plugins/domains/plot.ly/plot.ly.ejs
new file mode 100644
index 000000000..2057308a3
--- /dev/null
+++ b/plugins/domains/plot.ly/plot.ly.ejs
@@ -0,0 +1,2 @@
+<a href="<%= url %>" target="_blank" style="display: block; text-align: center;"><img src="<%= img_src %>"/></a>
+<script data-plotly="<%= id %>"  src="https://plot.ly/embed.js" async></script>
\ No newline at end of file
diff --git a/plugins/domains/plot.ly/plot.ly.js b/plugins/domains/plot.ly/plot.ly.js
new file mode 100644
index 000000000..1eed02d6c
--- /dev/null
+++ b/plugins/domains/plot.ly/plot.ly.js
@@ -0,0 +1,32 @@
+module.exports = {
+
+    re: /^https?:\/\/plot\.ly\/~(\w+)\/(\d+)/i,
+
+    mixins: [
+        "*"
+    ],
+
+    getLink: function(url, urlMatch, twitter) {
+        var img_src = twitter.image.src || twitter.image;
+
+        if (twitter.card === 'photo' && img_src && /^https?:\/\/plot\.ly\/~/i.test(img_src)) {
+            
+            return {
+                template_context: {
+                    url: url,
+                    id: urlMatch[1] + ':' + urlMatch[2],
+                    img_src: twitter.image,
+                },
+                type: CONFIG.T.text_html,
+                rel: [CONFIG.R.app, CONFIG.R.inline, CONFIG.R.ssl, CONFIG.R.html5]
+            }
+        }
+
+    },
+
+    tests: [
+        "https://plot.ly/~Vox/17/cumulative-emissions-from-fossil-fuel-and-cement-1870-2013/",
+        "https://plot.ly/~jbatucan/2/col2/",
+        "https://plot.ly/~avnerkantor/203/"
+    ]
+};
\ No newline at end of file

From 658281fc942ff3578025ed30eae73db1da5b296c Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Thu, 9 Jun 2016 18:01:05 +0300
Subject: [PATCH 316/320] [whitelist] better whitelist request

---
 lib/whitelist.js | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/lib/whitelist.js b/lib/whitelist.js
index b38afc65e..2084662d0 100644
--- a/lib/whitelist.js
+++ b/lib/whitelist.js
@@ -8,6 +8,7 @@
         logging = require('../logging');
 
     var whitelistObject = {domains: {}};
+    var whitelistLastModified;
     var currentWhitelistFilename;
     var WHITELIST_DIR = path.resolve(__dirname, '../whitelist');
 
@@ -333,9 +334,17 @@
                     domain: CONFIG.baseAppUrl && CONFIG.baseAppUrl.replace(/.+\/\//, ''),
                     v: CONFIG.VERSION
                 },
+                headers: {
+                    // Prevent caching.
+                    'Cache-Control': 'no-cache'
+                },
                 gzip: true
             };
 
+            if (whitelistLastModified) {
+                options.headers['If-Modified-Since'] = whitelistLastModified;
+            }
+
             request(options, function(error, r, newWhitelist) {
 
                 if (error) {
@@ -347,6 +356,9 @@
                 } else if (!newWhitelist || typeof newWhitelist === 'string') {
                     console.error('Error loading whitelist from ' + CONFIG.WHITELIST_URL + ' : incorrect data: ' + newWhitelist);
                 } else {
+
+                    whitelistLastModified = r.headers['last-modified'];
+
                     applyParsedWhitelist(newWhitelist);
                 }
 

From b4c1a1955f82a8eae89d820faeedbb27478227ca Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Thu, 9 Jun 2016 13:47:37 -0400
Subject: [PATCH 317/320] [google maps] support waypoints for directions

---
 plugins/domains/google.com/google.maps.js | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/plugins/domains/google.com/google.maps.js b/plugins/domains/google.com/google.maps.js
index 96d0131ec..8d051a5de 100644
--- a/plugins/domains/google.com/google.maps.js
+++ b/plugins/domains/google.com/google.maps.js
@@ -10,6 +10,10 @@ module.exports = {
 
         // directions
         // https://www.google.com/maps/dir/41.1744197,-73.0089647/Church+of+Christ,+2+Drew+Circle,+Trumbull,+CT+06611/@41.171124,-73.145653,12z/data=!3m1!4b1!4m9!4m8!1m0!1m5!1m1!1s0x89e80968e8b48d6f:0xf267c1e26968b542!2m2!1d-73.194478!2d41.251582!3e1?hl=en-US
+
+        // one waypoint:        https://www.google.co.in/maps/dir/Red+Fort,+Netaji+Subhash+Marg,+Chandni+Chowk,+New+Delhi,+Delhi/Fatehpuri,+New+Delhi,+Delhi/Delhi+Gate,+New+Delhi,+Delhi/@28.648602,77.214052,14z/data=!3m1!4b1!4m20!4m19!1m5!1m1!1s0x390cfce26ec085ef:0x441e32f4fa5002fb!2m2!1d77.2410203!2d28.6561592!1m5!1m1!1s0x390cfd12465a7def:0xc97043c5bb5c08ba!2m2!1d77.2214745!2d28.6563683!1m5!1m1!1s0x390cfcd8811f60ed:0x5c53287ad4d4f7e6!2m2!1d77.2417726!2d28.6405645!3e0?hl=en
+        // multiple waypoints:  https://www.google.com/maps/dir/LOTAN+CHOLE+KULCHEY+WALA,+Govind+Ki+Gali,+Dariya+Ganj,+New+Delhi,+Delhi+110002,+India/Dr+Shroff+Charity+Eye+Hospital,+5027,+Kedarnath+Road,+Beside+Vani+Prakashan,+Daryaganj,+New+Delhi,+Delhi+110002,+India/SC-4B,+Basant+Rd,+Delhi+110055,+India/3113,+Sang+Trashan+Marg,+Kaseru+Walan,+Paharganj,+New+Delhi,+Delhi+110055,+India/@28.6426793,77.2198618,15z/data=!3m1!4b1!4m26!4m25!1m5!1m1!1s0x390cfcd91fe43afd:0xef6845b4da489dd1!2m2!1d77.2434193!2d28.6415535!1m5!1m1!1s0x390cfcdf9fb395bb:0x7d8962875ec3432e!2m2!1d77.2420112!2d28.645873!1m5!1m1!1s0x390cfd4744055f3f:0x6a3ea6a5a658cc3e!2m2!1d77.2164889!2d28.6394484!1m5!1m1!1s0x390cfd4193df763b:0xc93187db8d27b07e!2m2!1d77.21275!2d28.644072!3e2
+        /^https?:\/\/(?:www\.)?google\.(?:com?\.)?[a-z]+\/maps\/(dir\/[^\/]+)\/([^@\?]+)\/(@[^\/]+)/i,
         /^https?:\/\/(?:www\.)?google\.(?:com?\.)?[a-z]+\/maps\/(dir\/[^\/]+)\/([^\/\?]+)\/?(@[^\/]+)?/i,
 
         // search
@@ -62,7 +66,7 @@ module.exports = {
         var map = "https://www.google.com/maps/embed/v1/" + gmap.mode + "?key=" + api_key;
 
         if (gmap.q && gmap.mode != 'streetview') {
-            map = map + (gmap.mode == "directions" ? "&destination=" : "&q=") + gmap.q;
+            map = map + (gmap.mode == "directions" ? "&destination=" : "&q=") + gmap.q + (gmap.waypoints ? '&waypoints=' + gmap.waypoints : '');
         }
 
         if (gmap.origin) {
@@ -141,6 +145,16 @@ module.exports = {
         // Search query is always returned by urlMatch, even if empty
         gmap.q = urlMatch[2];
 
+        if (/\//i.test(gmap.q)) { // directions with waypoints, the last one is the destination
+            var waypoints = gmap.q.split('/');
+            gmap.q = waypoints[waypoints.length - 1];
+            gmap.waypoints = '';
+            for (i = 0; i < waypoints.length-1; i++) {
+                gmap.waypoints += (i == 0 ? '' : '|') + waypoints[i];
+
+            }            
+        }
+
         // Coordinates - if given: urlMatch[3]
         if (urlMatch.length > 3 && urlMatch[3]) {
 

From d77233d1a801ef535f3de5dad22594912f974002 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Thu, 9 Jun 2016 13:56:47 -0400
Subject: [PATCH 318/320] [google maps] allow directions mode without
 destination point

---
 plugins/domains/google.com/google.maps.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/plugins/domains/google.com/google.maps.js b/plugins/domains/google.com/google.maps.js
index 8d051a5de..900994503 100644
--- a/plugins/domains/google.com/google.maps.js
+++ b/plugins/domains/google.com/google.maps.js
@@ -24,7 +24,11 @@ module.exports = {
         // https://www.google.com.br/maps/@-23.5812118,-46.6308331,13z?hl=pt-BR
         // https://www.google.com.br/maps/@-23.5812118,-46.6308331,7627m/data=!3m1!1e3?hl=pt-BR
         /^https?:\/\/(?:www\.)?google\.(?:com?\.)?[a-z]+\/(maps)\/()(@[^\/\?]+)/i, // empty search string as urlMatch[2]
-        /^https?:\/\/(?:www\.)?google\.(?:com?\.)?[a-z]+\/(maps)\/place\/()(@[^\/\?]+)/i, // empty search string as urlMatch[2]        
+        /^https?:\/\/(?:www\.)?google\.(?:com?\.)?[a-z]+\/(maps)\/place\/()(@[^\/\?]+)/i, // empty search string as urlMatch[2]
+
+        // directions, but actually a view
+        // https://www.google.nl/maps/dir/52.3389833,5.5608613//@52.3352336,5.5477077,15z
+        /^https?:\/\/(?:www\.)?google\.(?:com?\.)?[a-z]+\/(maps)\/dir\/(?:[^\/]+)\/()\/(@[^\/\?]+)/i, // empty search string
 
         // street view
         // https://www.google.ca/maps/place/1+Wellington+St,+Ottawa,+ON+K1A+0A6/@45.425013,-75.695273,3a,75y,221.72h,76.43t/data=!3m5!1e1!3m3!1s5EpfU65PIZKcX26GbqBpVA!2e0!3e5!4m2!3m1!1s0x4cce04ff23c99f1d:0x4275051b90152635!6m1!1e1?hl=en

From 9523545ecfb032a625fdd224612733536174ad1c Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Fri, 10 Jun 2016 08:21:30 -0400
Subject: [PATCH 319/320] what's new for v0.9.6

---
 WHATSNEW.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/WHATSNEW.md b/WHATSNEW.md
index 7f9ff876d..a52d21329 100644
--- a/WHATSNEW.md
+++ b/WHATSNEW.md
@@ -4,6 +4,11 @@ This is the history of the Iframely changes. Updates that are older than one yea
 
 To stay tuned and up-to-date, watch [Iframely on GitHub](https://github.com/itteco/iframely).
 
+### 2016.06.10, Version 0.9.6
+
+ - Maintenance for many domain plugins: minor fixes and better coverage
+ - Added Plot.ly
+
 ### 2016.05.11, Version 0.9.5
 
 Heads-up: `request` module dependency was upgraded. Please run `npm update` when deploying this version.

From 4bda2b099e667771b8439e053560de5732b453bf Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Fri, 10 Jun 2016 15:38:47 +0300
Subject: [PATCH 320/320] update to 0.9.6

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 3bb457675..94a3cd13e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "iframely",
-    "version": "0.9.5",
+    "version": "0.9.6",
     
     "description": "oEmbed/2 gateway endpoint. Get embed data for various http links through one self-hosted API",
     "keywords": ["oembed", "embed", "open graph", "og", "twitter cards"],