From d09b8e3a065302de8dc05df608f05cacdef2ca54 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Tue, 22 Apr 2014 18:15:40 -0400
Subject: [PATCH 01/43] Fix Dribble (switched to SSL), and following its
 example - future-proof all domains with https regexps

---
 plugins/domains/56.com.js                     |  4 ++--
 plugins/domains/9gag.com.js                   |  2 +-
 plugins/domains/about.me.js                   |  2 +-
 plugins/domains/angel.co/angel.co.js          |  2 +-
 plugins/domains/bandcamp.com.js               |  4 ++--
 plugins/domains/behance.net.js                |  4 ++--
 plugins/domains/brightcove.com.js             |  2 +-
 plugins/domains/cnn.com/cnn.video.js          |  2 +-
 plugins/domains/codepen.io.js                 |  2 +-
 .../collegehumor.com/collegehumor.picture.js  |  2 +-
 .../collegehumor.com/collegehumor.video.js    |  2 +-
 plugins/domains/dribbble.com.js               |  2 +-
 plugins/domains/ebaumsworld.com.js            |  2 +-
 plugins/domains/ec.europa.eu.js               |  2 +-
 .../funnyordie.com/funnyordie.video.js        |  2 +-
 plugins/domains/gawker.js                     | 20 +++++++++----------
 plugins/domains/gogoyoko.com.js               |  2 +-
 .../huffingtonpost.com/huffingtonpost.live.js |  6 +++---
 plugins/domains/instagram.com.js              |  4 ++--
 plugins/domains/jsfiddle.net.js               |  2 +-
 plugins/domains/live.wsj.com.js               |  2 +-
 plugins/domains/lockerz.com.js                |  2 +-
 plugins/domains/lolwall.co.js                 |  2 +-
 plugins/domains/magnatune.com.js              |  2 +-
 plugins/domains/mail.ru.js                    |  2 +-
 plugins/domains/mixbit.com.js                 |  2 +-
 plugins/domains/myvideo.de.js                 |  2 +-
 plugins/domains/pbs.org.js                    |  2 +-
 plugins/domains/prezi.com.js                  |  2 +-
 plugins/domains/reuters.com.js                |  2 +-
 plugins/domains/screencast.com.js             |  2 +-
 plugins/domains/ted.com.js                    |  2 +-
 .../theglobeandmail.com/globe.video.js        |  2 +-
 .../domains/theguardian.com/guardian.video.js |  2 +-
 .../domains/theonion.com/theonion.video.js    |  2 +-
 plugins/domains/tindeck.com.js                |  2 +-
 .../travelchannel.com/travelchannel.video.js  |  2 +-
 plugins/domains/tumblr.com/tumblr.api.js      |  4 ++--
 plugins/domains/tumblr.com/tumblr.text.js     |  4 ++--
 plugins/domains/tumblr.com/tumblr.video.js    |  4 ++--
 plugins/domains/twitter.status.js             |  2 +-
 plugins/domains/v.qq.com.js                   |  6 +++---
 plugins/domains/vevo.com.js                   |  4 ++--
 plugins/domains/video.mit.edu.js              |  2 +-
 plugins/domains/videos.nymag.com.js           |  4 ++--
 plugins/domains/vube.com.js                   |  2 +-
 plugins/domains/yfrog.com.js                  |  2 +-
 plugins/links/og-youtube.js                   |  2 +-
 48 files changed, 70 insertions(+), 70 deletions(-)

diff --git a/plugins/domains/56.com.js b/plugins/domains/56.com.js
index 6e9ab332e..b7bba45e6 100644
--- a/plugins/domains/56.com.js
+++ b/plugins/domains/56.com.js
@@ -1,8 +1,8 @@
 module.exports = {
 
     re: [
-        /^http:\/\/www\.56\.com\/\w{3}\/v_([a-zA-Z0-9]+).html/i,
-        /^http:\/\/www\.56\.com\/\w{3}\/play_[a-zA-Z0-9\-]+_vid\-([a-zA-Z0-9]+).html/i
+        /^https?:\/\/www\.56\.com\/\w{3}\/v_([a-zA-Z0-9]+).html/i,
+        /^https?:\/\/www\.56\.com\/\w{3}\/play_[a-zA-Z0-9\-]+_vid\-([a-zA-Z0-9]+).html/i
     ],
 
     mixins: [
diff --git a/plugins/domains/9gag.com.js b/plugins/domains/9gag.com.js
index dee11cae1..bdcdb600f 100644
--- a/plugins/domains/9gag.com.js
+++ b/plugins/domains/9gag.com.js
@@ -1,7 +1,7 @@
 module.exports = {
 
     re: [
-        /^http:\/\/9gag\.com\/gag\/([a-z0-9\-]+)/i
+        /^https?:\/\/9gag\.com\/gag\/([a-z0-9\-]+)/i
     ],
 
     mixins: [
diff --git a/plugins/domains/about.me.js b/plugins/domains/about.me.js
index 60804a9e2..062002a48 100644
--- a/plugins/domains/about.me.js
+++ b/plugins/domains/about.me.js
@@ -1,6 +1,6 @@
 module.exports = {
 
-    re: /http:\/\/about\.me\/([a-zA-Z0-9\-]+)/i,
+    re: /https?:\/\/about\.me\/([a-zA-Z0-9\-]+)/i,
 
     mixins: [
         "twitter-image",
diff --git a/plugins/domains/angel.co/angel.co.js b/plugins/domains/angel.co/angel.co.js
index a6fd486d1..d11c3262d 100644
--- a/plugins/domains/angel.co/angel.co.js
+++ b/plugins/domains/angel.co/angel.co.js
@@ -1,6 +1,6 @@
 module.exports = {
 
-    re: /^https:\/\/angel\.co\/([a-z-]+)/i,
+    re: /^https?:\/\/angel\.co\/([a-z-]+)/i,
 
     mixins: [
         "keywords",
diff --git a/plugins/domains/bandcamp.com.js b/plugins/domains/bandcamp.com.js
index da641ec43..309f381d7 100644
--- a/plugins/domains/bandcamp.com.js
+++ b/plugins/domains/bandcamp.com.js
@@ -1,8 +1,8 @@
 module.exports = {
 
     re: [
-        /^http:\/\/([a-z0-9-]+\.bandcamp\.com)\/(album|track)\/(\w+)/i,
-        /^http:\/\/([a-z-\.]+)\/(album|track)\/([a-z-]+)/
+        /^https?:\/\/([a-z0-9-]+\.bandcamp\.com)\/(album|track)\/(\w+)/i,
+        /^https?:\/\/([a-z-\.]+)\/(album|track)\/([a-z-]+)/
     ],
 
     mixins: [
diff --git a/plugins/domains/behance.net.js b/plugins/domains/behance.net.js
index 413d5032b..c5db75738 100644
--- a/plugins/domains/behance.net.js
+++ b/plugins/domains/behance.net.js
@@ -3,8 +3,8 @@ var jquery = require('jquery');
 module.exports = {
 
     re: [
-        /http:\/\/www\.behance\.net\/gallery\/([a-zA-Z0-9\-\(\)]+)\/([0-9]+)/i,
-        /http:\/\/([a-z-\.]+)\/gallery\/([a-zA-Z0-9\-\(\)]+)\/([0-9]+)/i,
+        /https?:\/\/www\.behance\.net\/gallery\/([a-zA-Z0-9\-\(\)]+)\/([0-9]+)/i,
+        /https?:\/\/([a-z-\.]+)\/gallery\/([a-zA-Z0-9\-\(\)]+)\/([0-9]+)/i,
     ],
 
     mixins: [
diff --git a/plugins/domains/brightcove.com.js b/plugins/domains/brightcove.com.js
index 94f12a859..80abd426b 100644
--- a/plugins/domains/brightcove.com.js
+++ b/plugins/domains/brightcove.com.js
@@ -1,7 +1,7 @@
 module.exports = {
 
     re: [
-        /^http:\/\/link\.brightcove\.com\/services\/player\/bcpid(\d+)\?/i,
+        /^https?:\/\/link\.brightcove\.com\/services\/player\/bcpid(\d+)\?/i,
         /\.(com|org)\/services\/player\/bcpid(\d+)\?/i  //the hosted players
     ],
 
diff --git a/plugins/domains/cnn.com/cnn.video.js b/plugins/domains/cnn.com/cnn.video.js
index 7b700f949..359dfc885 100644
--- a/plugins/domains/cnn.com/cnn.video.js
+++ b/plugins/domains/cnn.com/cnn.video.js
@@ -1,6 +1,6 @@
 module.exports = {
 
-    re: /^http:\/\/((edition|www)\.)?cnn\.com\/video\//i,
+    re: /^https?:\/\/((edition|www)\.)?cnn\.com\/video\//i,
 
     mixins: [
         "canonical",
diff --git a/plugins/domains/codepen.io.js b/plugins/domains/codepen.io.js
index 59ba4a7b7..c52ef8fbf 100644
--- a/plugins/domains/codepen.io.js
+++ b/plugins/domains/codepen.io.js
@@ -2,7 +2,7 @@ var jquery = require('jquery');
 
 module.exports = {
 
-    re: /http:\/\/codepen\.io\/([a-z0-9\-]+)\/(pen|details)\/([a-z0-9\-]+)/i,
+    re: /https?:\/\/codepen\.io\/([a-z0-9\-]+)\/(pen|details)\/([a-z0-9\-]+)/i,
 
     mixins: [
         "oembed-thumbnail",
diff --git a/plugins/domains/collegehumor.com/collegehumor.picture.js b/plugins/domains/collegehumor.com/collegehumor.picture.js
index 1951d8c3b..0d8bdeb39 100644
--- a/plugins/domains/collegehumor.com/collegehumor.picture.js
+++ b/plugins/domains/collegehumor.com/collegehumor.picture.js
@@ -1,4 +1,4 @@
-var re = /http:\/\/www\.collegehumor\.com\/(picture|post)\/([0-9]+)\.*/i;
+var re = /https?:\/\/www\.collegehumor\.com\/(picture|post)\/([0-9]+)\.*/i;
 
 module.exports = {
 
diff --git a/plugins/domains/collegehumor.com/collegehumor.video.js b/plugins/domains/collegehumor.com/collegehumor.video.js
index f72bc36d5..5325a3993 100644
--- a/plugins/domains/collegehumor.com/collegehumor.video.js
+++ b/plugins/domains/collegehumor.com/collegehumor.video.js
@@ -1,6 +1,6 @@
 var jquery = require('jquery');
 
-var re = /http:\/\/www\.collegehumor\.com\/(video|embed)\/([0-9]+)\.*/;
+var re = /https?:\/\/www\.collegehumor\.com\/(video|embed)\/([0-9]+)\.*/;
 
 module.exports = {
 
diff --git a/plugins/domains/dribbble.com.js b/plugins/domains/dribbble.com.js
index 65e9e248f..f19de52f8 100644
--- a/plugins/domains/dribbble.com.js
+++ b/plugins/domains/dribbble.com.js
@@ -1,7 +1,7 @@
 module.exports = {
 
     re: [
-        /^http:\/\/dribbble\.com\/shots\/([a-zA-Z0-9\-]+)/i
+        /^https?:\/\/dribbble\.com\/shots\/([a-zA-Z0-9\-]+)/i
     ],
 
     mixins: [
diff --git a/plugins/domains/ebaumsworld.com.js b/plugins/domains/ebaumsworld.com.js
index bf00fe4c8..d45739a61 100644
--- a/plugins/domains/ebaumsworld.com.js
+++ b/plugins/domains/ebaumsworld.com.js
@@ -1,7 +1,7 @@
 module.exports = {
 
     re: [
-        /^http:\/\/www\.ebaumsworld\.com\/video\/watch\/(\d+)/i
+        /^https?:\/\/www\.ebaumsworld\.com\/video\/watch\/(\d+)/i
     ],
 
     mixins: [
diff --git a/plugins/domains/ec.europa.eu.js b/plugins/domains/ec.europa.eu.js
index 4a855fd54..6673dd0e0 100644
--- a/plugins/domains/ec.europa.eu.js
+++ b/plugins/domains/ec.europa.eu.js
@@ -1,7 +1,7 @@
 module.exports = {
 
     re: [
-        /http:\/\/ec\.europa\.eu\/avservices\/(video|focus)/i
+        /https?:\/\/ec\.europa\.eu\/avservices\/(video|focus)/i
     ],
 
     mixins: [
diff --git a/plugins/domains/funnyordie.com/funnyordie.video.js b/plugins/domains/funnyordie.com/funnyordie.video.js
index e99340e0c..c398a0a32 100644
--- a/plugins/domains/funnyordie.com/funnyordie.video.js
+++ b/plugins/domains/funnyordie.com/funnyordie.video.js
@@ -1,6 +1,6 @@
 var jquery = require('jquery');
 
-var re = /^http:\/\/www\.funnyordie\.com\/videos\//i;
+var re = /^https?:\/\/www\.funnyordie\.com\/videos\//i;
 
 module.exports = {
 
diff --git a/plugins/domains/gawker.js b/plugins/domains/gawker.js
index 288db4f76..aa1e1a50a 100644
--- a/plugins/domains/gawker.js
+++ b/plugins/domains/gawker.js
@@ -3,16 +3,16 @@ module.exports = {
     notPlugin:  !(CONFIG.providerOptions.readability && CONFIG.providerOptions.readability.enabled === true),
 
     re: [
-        /^http:\/\/(\w+\.)?lifehacker\.com\/[a-z0-9\-]+/i,
-        /^http:\/\/(\w+\.)?gawker\.com\/[a-z0-9\-]+/i,
-        /^http:\/\/(\w+\.)?jezebel\.com\/[a-z0-9\-]+/i,
-        /^http:\/\/(\w+\.)?gizmodo\.com\/[a-z0-9\-]+/i,
-        /^http:\/\/(\w+\.)?deadspin\.com\/[a-z0-9\-]+/i,
-        /^http:\/\/(\w+\.)?io9\.com\/[a-z0-9\-]+/i,
-        /^http:\/\/(\w+\.)?kotaku\.com\/[a-z0-9\-]+/i,
-        /^http:\/\/(\w+\.)?jalopnik\.com\/[a-z0-9\-]+/i,
-        /^http:\/\/(\w+\.)?kinja\.com\/[a-z0-9\-]+/i,
-        /^http:\/\/(\w+\.)?cink\.hu\/[a-z0-9\-]+/i
+        /^https?:\/\/(\w+\.)?lifehacker\.com\/[a-z0-9\-]+/i,
+        /^https?:\/\/(\w+\.)?gawker\.com\/[a-z0-9\-]+/i,
+        /^https?:\/\/(\w+\.)?jezebel\.com\/[a-z0-9\-]+/i,
+        /^https?:\/\/(\w+\.)?gizmodo\.com\/[a-z0-9\-]+/i,
+        /^https?:\/\/(\w+\.)?deadspin\.com\/[a-z0-9\-]+/i,
+        /^https?:\/\/(\w+\.)?io9\.com\/[a-z0-9\-]+/i,
+        /^https?:\/\/(\w+\.)?kotaku\.com\/[a-z0-9\-]+/i,
+        /^https?:\/\/(\w+\.)?jalopnik\.com\/[a-z0-9\-]+/i,
+        /^https?:\/\/(\w+\.)?kinja\.com\/[a-z0-9\-]+/i,
+        /^https?:\/\/(\w+\.)?cink\.hu\/[a-z0-9\-]+/i
     ],
 
 
diff --git a/plugins/domains/gogoyoko.com.js b/plugins/domains/gogoyoko.com.js
index 8eb51d982..71fef5c2b 100644
--- a/plugins/domains/gogoyoko.com.js
+++ b/plugins/domains/gogoyoko.com.js
@@ -1,7 +1,7 @@
 module.exports = {
 
     re: [
-        /^http:\/\/www\.gogoyoko\.com\/song\/([0-9\-]+)/i
+        /^https?:\/\/www\.gogoyoko\.com\/song\/([0-9\-]+)/i
     ],
 
     mixins: [
diff --git a/plugins/domains/huffingtonpost.com/huffingtonpost.live.js b/plugins/domains/huffingtonpost.com/huffingtonpost.live.js
index dff581d26..02ba1388f 100644
--- a/plugins/domains/huffingtonpost.com/huffingtonpost.live.js
+++ b/plugins/domains/huffingtonpost.com/huffingtonpost.live.js
@@ -1,9 +1,9 @@
 module.exports = {
 
     re: [
-        /^http:\/\/live\.huffingtonpost\.com\/r\/archive\/segment\/[\w-]+\/(\w+)/i,
-        /^http:\/\/live\.huffingtonpost\.com\/r\/segment\/[\w-]+\/(\w+)/i,
-        /^http:\/\/live\.huffingtonpost\.com\/r\/segment\/(\w+)/i
+        /^https?:\/\/live\.huffingtonpost\.com\/r\/archive\/segment\/[\w-]+\/(\w+)/i,
+        /^https?:\/\/live\.huffingtonpost\.com\/r\/segment\/[\w-]+\/(\w+)/i,
+        /^https?:\/\/live\.huffingtonpost\.com\/r\/segment\/(\w+)/i
     ],
 
     mixins: [
diff --git a/plugins/domains/instagram.com.js b/plugins/domains/instagram.com.js
index b8a55e5bc..5a5374998 100644
--- a/plugins/domains/instagram.com.js
+++ b/plugins/domains/instagram.com.js
@@ -2,8 +2,8 @@ module.exports = {
 
     re: [
         /^https?:\/\/[\w\.]*instagram\.com\/p\/([a-zA-Z0-9_-]+)/i,
-        /^http:\/\/instagr\.am\/p\/([a-zA-Z0-9_-]+)/i,
-        /^http:\/\/instagram\.com\/p\/([a-zA-Z0-9_-]+)$/i
+        /^https?:\/\/instagr\.am\/p\/([a-zA-Z0-9_-]+)/i,
+        /^https?:\/\/instagram\.com\/p\/([a-zA-Z0-9_-]+)$/i
     ],
 
     mixins: [
diff --git a/plugins/domains/jsfiddle.net.js b/plugins/domains/jsfiddle.net.js
index 4644cd70e..0bad6ef6f 100644
--- a/plugins/domains/jsfiddle.net.js
+++ b/plugins/domains/jsfiddle.net.js
@@ -1,6 +1,6 @@
 module.exports = {
 
-    re: /(http:\/\/jsfiddle.net\/(?:\w+\/)?\w+\/).*/i,
+    re: /(https?:\/\/jsfiddle.net\/(?:\w+\/)?\w+\/).*/i,
 
     mixins: [
         "html-title",
diff --git a/plugins/domains/live.wsj.com.js b/plugins/domains/live.wsj.com.js
index f8bdf0bfc..ed4fc7392 100644
--- a/plugins/domains/live.wsj.com.js
+++ b/plugins/domains/live.wsj.com.js
@@ -1,6 +1,6 @@
 module.exports = {
 
-    re: /^http:\/\/live\.wsj\.com\/#!([\w-]+)/i,
+    re: /^https?:\/\/live\.wsj\.com\/#!([\w-]+)/i,
 
     // TODO: make redirect to allthingsd. There is better meta.
 
diff --git a/plugins/domains/lockerz.com.js b/plugins/domains/lockerz.com.js
index 8377693b3..5a5ba903c 100644
--- a/plugins/domains/lockerz.com.js
+++ b/plugins/domains/lockerz.com.js
@@ -1,7 +1,7 @@
 module.exports = {
 
     re: [
-        /^http:\/\/lockerz\.com\/u\/([^/]+\/decalz\/[^/]+\/[a-z0-9_-]+)/i
+        /^https?:\/\/lockerz\.com\/u\/([^/]+\/decalz\/[^/]+\/[a-z0-9_-]+)/i
     ],
 
     mixins: [
diff --git a/plugins/domains/lolwall.co.js b/plugins/domains/lolwall.co.js
index 2e2bcfae4..fccbee621 100644
--- a/plugins/domains/lolwall.co.js
+++ b/plugins/domains/lolwall.co.js
@@ -1,6 +1,6 @@
 module.exports = {
 
-    re: /http:\/\/www.lolwall.co\/lol\/\d+/i,
+    re: /https?:\/\/www.lolwall.co\/lol\/\d+/i,
 
     mixins: [
         "og-title",
diff --git a/plugins/domains/magnatune.com.js b/plugins/domains/magnatune.com.js
index 7986a0db5..24c81976f 100644
--- a/plugins/domains/magnatune.com.js
+++ b/plugins/domains/magnatune.com.js
@@ -4,7 +4,7 @@ var jQuery = require("jquery");
 module.exports = {
 
     re: [
-        /^http:\/\/magnatune\.com\/artists\/albums\/([-_a-z0-9]+)(?:\/(?:lofi_play)?)?(?:[\?#].*)?$/i
+        /^https?:\/\/magnatune\.com\/artists\/albums\/([-_a-z0-9]+)(?:\/(?:lofi_play)?)?(?:[\?#].*)?$/i
     ],
 
     mixins: [
diff --git a/plugins/domains/mail.ru.js b/plugins/domains/mail.ru.js
index 20261d626..e3e853f77 100644
--- a/plugins/domains/mail.ru.js
+++ b/plugins/domains/mail.ru.js
@@ -1,7 +1,7 @@
 module.exports = {
 
     re: [
-        /^http:\/\/my\.mail\.ru\/video\//i
+        /^https?:\/\/my\.mail\.ru\/video\//i
     ],
 
     mixins: [
diff --git a/plugins/domains/mixbit.com.js b/plugins/domains/mixbit.com.js
index cb4e2fb6f..b827710dd 100644
--- a/plugins/domains/mixbit.com.js
+++ b/plugins/domains/mixbit.com.js
@@ -1,6 +1,6 @@
 module.exports = {
 
-    re: /^https:\/\/mixbit\.com\/v\/(\w+)(?:\/.+)?/i,
+    re: /^https?:\/\/mixbit\.com\/v\/(\w+)(?:\/.+)?/i,
 
     getMeta: function(mixbit) {
         return {
diff --git a/plugins/domains/myvideo.de.js b/plugins/domains/myvideo.de.js
index 8c3186700..e40e57d08 100644
--- a/plugins/domains/myvideo.de.js
+++ b/plugins/domains/myvideo.de.js
@@ -1,7 +1,7 @@
 module.exports = {
 
     re: [
-        /^http:\/\/www\.myvideo\.de\/watch\/([0-9]+)/i
+        /^https?:\/\/www\.myvideo\.de\/watch\/([0-9]+)/i
     ],
 
     mixins: [
diff --git a/plugins/domains/pbs.org.js b/plugins/domains/pbs.org.js
index 959942fa9..18551096d 100644
--- a/plugins/domains/pbs.org.js
+++ b/plugins/domains/pbs.org.js
@@ -2,7 +2,7 @@ module.exports = {
 
     //http://video.pbs.org/video/1863101157/    
     re: [
-        /^http:\/\/video\.(pbs|[a-zA-Z]+)\.org\/video\/(\d+)\//i // + Powered by PBS
+        /^https?:\/\/video\.(pbs|[a-zA-Z]+)\.org\/video\/(\d+)\//i // + Powered by PBS
     ],
 
     mixins: [
diff --git a/plugins/domains/prezi.com.js b/plugins/domains/prezi.com.js
index cf68079ac..ad869d655 100644
--- a/plugins/domains/prezi.com.js
+++ b/plugins/domains/prezi.com.js
@@ -1,7 +1,7 @@
 module.exports = {
 
     re: [
-        /^http:\/\/prezi\.com\/([a-z0-9\-]+)\/([a-z0-9\-]+)/i
+        /^https?:\/\/prezi\.com\/([a-z0-9\-]+)\/([a-z0-9\-]+)/i
     ],
 
     mixins: [
diff --git a/plugins/domains/reuters.com.js b/plugins/domains/reuters.com.js
index 0d5c27089..f5507e30a 100644
--- a/plugins/domains/reuters.com.js
+++ b/plugins/domains/reuters.com.js
@@ -1,7 +1,7 @@
 module.exports = {
   
     re: [
-        /^http:\/\/www\.reuters\.com\/video\/\d{4}\/\d{2}\/\d{2}\/[a-zA-Z0-9\-]+\?videoId=(\d+)/i
+        /^https?:\/\/www\.reuters\.com\/video\/\d{4}\/\d{2}\/\d{2}\/[a-zA-Z0-9\-]+\?videoId=(\d+)/i
     ],
 
     mixins: [
diff --git a/plugins/domains/screencast.com.js b/plugins/domains/screencast.com.js
index e144f5df0..458ec65d0 100644
--- a/plugins/domains/screencast.com.js
+++ b/plugins/domains/screencast.com.js
@@ -1,7 +1,7 @@
 module.exports = {
 
     re: [
-        /^http:\/\/screencast\.com\/t\//i
+        /^https?:\/\/screencast\.com\/t\//i
     ],
 
     mixins: [
diff --git a/plugins/domains/ted.com.js b/plugins/domains/ted.com.js
index 7752a3879..e5eeb29f3 100644
--- a/plugins/domains/ted.com.js
+++ b/plugins/domains/ted.com.js
@@ -1,6 +1,6 @@
 module.exports = {
 
-    re: /^http:\/\/ted\.com\/talks\//i,
+    re: /^https?:\/\/(www\.)?ted\.com\/talks\//i,
 
     mixins: [
         "canonical",
diff --git a/plugins/domains/theglobeandmail.com/globe.video.js b/plugins/domains/theglobeandmail.com/globe.video.js
index 7c482864d..462447075 100644
--- a/plugins/domains/theglobeandmail.com/globe.video.js
+++ b/plugins/domains/theglobeandmail.com/globe.video.js
@@ -1,7 +1,7 @@
 module.exports = {
 
     re: [
-        /^http:\/\/www\.theglobeandmail\.com\/[a-z\/\-]+video\/video+/i
+        /^https?:\/\/www\.theglobeandmail\.com\/[a-z\/\-]+video\/video+/i
     ],
 
     mixins: [
diff --git a/plugins/domains/theguardian.com/guardian.video.js b/plugins/domains/theguardian.com/guardian.video.js
index 2634def23..ddc851ed5 100644
--- a/plugins/domains/theguardian.com/guardian.video.js
+++ b/plugins/domains/theguardian.com/guardian.video.js
@@ -1,6 +1,6 @@
 module.exports = {
 
-    re: /http:\/\/www\.theguardian\.com\/\w+\/video\/\d+\/\w+\/\d+\/[\w-]+/i,
+    re: /https?:\/\/www\.theguardian\.com\/\w+\/video\/\d+\/\w+\/\d+\/[\w-]+/i,
 
     mixins: [
         "canonical",
diff --git a/plugins/domains/theonion.com/theonion.video.js b/plugins/domains/theonion.com/theonion.video.js
index bff3d41f5..b34f78f9c 100644
--- a/plugins/domains/theonion.com/theonion.video.js
+++ b/plugins/domains/theonion.com/theonion.video.js
@@ -1,6 +1,6 @@
 module.exports = {
 
-    re: /^http:\/\/www\.theonion\.com\/video\/*/i,
+    re: /^https?:\/\/www\.theonion\.com\/video\/*/i,
 
     mixins: [
         "canonical",
diff --git a/plugins/domains/tindeck.com.js b/plugins/domains/tindeck.com.js
index be5f119cb..06d38b7b3 100644
--- a/plugins/domains/tindeck.com.js
+++ b/plugins/domains/tindeck.com.js
@@ -2,7 +2,7 @@ var URL = require("url");
 
 module.exports = {
 
-    re: /^http:\/\/(?:www\.)?tindeck\.com\/listen\/([-_a-z0-9]+)\/?$/i,
+    re: /^https?:\/\/(?:www\.)?tindeck\.com\/listen\/([-_a-z0-9]+)\/?$/i,
 
     mixins: [
         "og-image",
diff --git a/plugins/domains/travelchannel.com/travelchannel.video.js b/plugins/domains/travelchannel.com/travelchannel.video.js
index 17713814f..9cbdcafcb 100644
--- a/plugins/domains/travelchannel.com/travelchannel.video.js
+++ b/plugins/domains/travelchannel.com/travelchannel.video.js
@@ -1,6 +1,6 @@
 module.exports = {
 
-    re: /^http:\/\/www\.travelchannel\.com\/video\/[\w-]+/i,
+    re: /^https?:\/\/www\.travelchannel\.com\/video\/[\w-]+/i,
 
     mixins: [
         "og-title",
diff --git a/plugins/domains/tumblr.com/tumblr.api.js b/plugins/domains/tumblr.com/tumblr.api.js
index 1c579e5f6..544cd286e 100644
--- a/plugins/domains/tumblr.com/tumblr.api.js
+++ b/plugins/domains/tumblr.com/tumblr.api.js
@@ -4,8 +4,8 @@ var _ = require('underscore');
 module.exports = {
 
     re: [
-        /^http:\/\/([a-z0-9-]+\.tumblr\.com)\/(post|image)\/(\d+)(?:\/[a-z0-9-]+)?/i,
-        /^http:\/\/([a-z-\.]+)\/(post|post)\/(\d{11})(?:\/[a-z0-9-]+)?/i
+        /^https?:\/\/([a-z0-9-]+\.tumblr\.com)\/(post|image)\/(\d+)(?:\/[a-z0-9-]+)?/i,
+        /^https?:\/\/([a-z-\.]+)\/(post|post)\/(\d{11})(?:\/[a-z0-9-]+)?/i
     ],
 
     provides: 'tumblr_post',
diff --git a/plugins/domains/tumblr.com/tumblr.text.js b/plugins/domains/tumblr.com/tumblr.text.js
index eaeaa5535..838f28fa5 100644
--- a/plugins/domains/tumblr.com/tumblr.text.js
+++ b/plugins/domains/tumblr.com/tumblr.text.js
@@ -3,8 +3,8 @@ var jquery = require('jquery');
 module.exports = {
 
     re: [
-        /^http:\/\/([a-z0-9-]+\.tumblr\.com)\/(post|image)\/(\d+)(?:\/[a-z0-9-]+)?/i,
-        /^http:\/\/([a-z-\.]+)\/(post|post)\/(\d{11})(?:\/[a-z0-9-]+)?/i
+        /^https?:\/\/([a-z0-9-]+\.tumblr\.com)\/(post|image)\/(\d+)(?:\/[a-z0-9-]+)?/i,
+        /^https?:\/\/([a-z-\.]+)\/(post|post)\/(\d{11})(?:\/[a-z0-9-]+)?/i
     ],
 
     getData: function(tumblr_post) {
diff --git a/plugins/domains/tumblr.com/tumblr.video.js b/plugins/domains/tumblr.com/tumblr.video.js
index bdb1185af..ed1e1d73f 100644
--- a/plugins/domains/tumblr.com/tumblr.video.js
+++ b/plugins/domains/tumblr.com/tumblr.video.js
@@ -3,8 +3,8 @@ var jquery = require('jquery');
 module.exports = {
 
     re: [
-        /^http:\/\/([a-z0-9-]+\.tumblr\.com)\/(post|image)\/(\d+)(?:\/[a-z0-9-]+)?/i,
-        /^http:\/\/([a-z-\.]+)\/(post|post)\/(\d{11})(?:\/[a-z0-9-]+)?/i
+        /^https?:\/\/([a-z0-9-]+\.tumblr\.com)\/(post|image)\/(\d+)(?:\/[a-z0-9-]+)?/i,
+        /^https?:\/\/([a-z-\.]+)\/(post|post)\/(\d{11})(?:\/[a-z0-9-]+)?/i
     ], 
 
     getLinks: function(tumblr_post, cb) {
diff --git a/plugins/domains/twitter.status.js b/plugins/domains/twitter.status.js
index 86b9ce5b6..869fdae83 100644
--- a/plugins/domains/twitter.status.js
+++ b/plugins/domains/twitter.status.js
@@ -12,7 +12,7 @@ var url = require("url");
 module.exports = {
 
     re: [
-        /https:\/\/twitter\.com\/(\w+)\/status(?:es)?\/(\w+)/i,
+        /https?:\/\/twitter\.com\/(\w+)\/status(?:es)?\/(\w+)/i,
         /https?:\/\/pic.twitter\.com\//i
         ],
 
diff --git a/plugins/domains/v.qq.com.js b/plugins/domains/v.qq.com.js
index 7ae22a6d2..54a0dccbf 100644
--- a/plugins/domains/v.qq.com.js
+++ b/plugins/domains/v.qq.com.js
@@ -1,9 +1,9 @@
 module.exports = {
 
     re: [
-        /^http:\/\/v\.qq\.com\/page\/\w\/\w\/\w\/(\w+)\.html$/i,
-        /^http:\/\/v\.qq\.com\/\w+\/page\/\w\/\w\/\w\/(\w+)\.html$/i,
-        /^http:\/\/v\.qq\.com\/\w+\/\w\/\w+\.html\?vid=(\w+)$/i
+        /^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
     ],
 
     mixins: [
diff --git a/plugins/domains/vevo.com.js b/plugins/domains/vevo.com.js
index 127362b12..2829e595c 100644
--- a/plugins/domains/vevo.com.js
+++ b/plugins/domains/vevo.com.js
@@ -1,8 +1,8 @@
 module.exports = {
 
     re: [
-        /^http:\/\/www\.vevo\.com\/watch\/([a-zA-Z0-9\-]+)\/([a-zA-Z0-9\-]+)\/([A-Z0-9]+)/i,
-        /^http:\/\/www\.vevo\.com\/watch\/([A-Z0-9]+)/i
+        /^https?:\/\/www\.vevo\.com\/watch\/([a-zA-Z0-9\-]+)\/([a-zA-Z0-9\-]+)\/([A-Z0-9]+)/i,
+        /^https?:\/\/www\.vevo\.com\/watch\/([A-Z0-9]+)/i
     ],
 
     mixins: [
diff --git a/plugins/domains/video.mit.edu.js b/plugins/domains/video.mit.edu.js
index 582841dd8..3cea8ba97 100644
--- a/plugins/domains/video.mit.edu.js
+++ b/plugins/domains/video.mit.edu.js
@@ -1,7 +1,7 @@
 module.exports = {
 
     re: [
-        /^http:\/\/video\.mit\.edu\/watch\/[a-zA-Z\-]+\-(\d+)/i
+        /^https?:\/\/video\.mit\.edu\/watch\/[a-zA-Z\-]+\-(\d+)/i
     ],
 
     mixins: [
diff --git a/plugins/domains/videos.nymag.com.js b/plugins/domains/videos.nymag.com.js
index 25536eb7c..fd54647ce 100644
--- a/plugins/domains/videos.nymag.com.js
+++ b/plugins/domains/videos.nymag.com.js
@@ -1,8 +1,8 @@
 module.exports = {
 
     re: [
-        /^http:\/\/videos\.nymag\.com\/video\/([a-zA-Z0-9\-]+)/i,
-        /^http:\/\/videos\.nymag\.com\/list\/\w+\/video\/([a-zA-Z0-9\-]+)/i
+        /^https?:\/\/videos\.nymag\.com\/video\/([a-zA-Z0-9\-]+)/i,
+        /^https?:\/\/videos\.nymag\.com\/list\/\w+\/video\/([a-zA-Z0-9\-]+)/i
     ],
 
     mixins: [
diff --git a/plugins/domains/vube.com.js b/plugins/domains/vube.com.js
index f4c4fce93..f2422a198 100644
--- a/plugins/domains/vube.com.js
+++ b/plugins/domains/vube.com.js
@@ -1,6 +1,6 @@
 module.exports = {
 
-    re: /^http:\/\/vube\.com\/([^\/]+)\/([a-zA-Z0-9_-]+)/i,
+    re: /^https?:\/\/vube\.com\/([^\/]+)\/([a-zA-Z0-9_-]+)/i,
 
     provides: 'vube',
 
diff --git a/plugins/domains/yfrog.com.js b/plugins/domains/yfrog.com.js
index 8c1479b90..f54839116 100644
--- a/plugins/domains/yfrog.com.js
+++ b/plugins/domains/yfrog.com.js
@@ -2,7 +2,7 @@ module.exports = {
 
     re: [
         /^https?:\/\/(?:[a-z]+\.)?yfrog\.com\/([a-zA-Z0-9]+)/i,
-        /^http:\/\/twitter\.yfrog\.com\/([a-zA-Z0-9]+)/i
+        /^https?:\/\/twitter\.yfrog\.com\/([a-zA-Z0-9]+)/i
     ],
 
     mixins: [
diff --git a/plugins/links/og-youtube.js b/plugins/links/og-youtube.js
index 4f55540ad..5878700bf 100644
--- a/plugins/links/og-youtube.js
+++ b/plugins/links/og-youtube.js
@@ -2,7 +2,7 @@ module.exports = {
 
     getLink: function(og) {
 
-        if (!(og.video || og.video.url)) return;
+        if (!og.video || !og.video.url) return;
         
         var video_src = og.video.url || og.video;
 

From 9b6aa45af0c30f0f87a8f7467788cb70ed81d4d2 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Tue, 22 Apr 2014 18:18:02 -0400
Subject: [PATCH 02/43] missed some domains while ssl future-proofing

---
 plugins/domains/issuu.com.js               | 2 +-
 plugins/domains/trutv.com.js               | 2 +-
 plugins/domains/tumblr.com/tumblr.photo.js | 4 ++--
 plugins/domains/vk.com.js                  | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/plugins/domains/issuu.com.js b/plugins/domains/issuu.com.js
index aba8e3451..e4ec9d4ab 100644
--- a/plugins/domains/issuu.com.js
+++ b/plugins/domains/issuu.com.js
@@ -1,6 +1,6 @@
 module.exports = {
 
-    re: /http:\/\/issuu\.com\/[\w_.-]+\/docs\/([\w_.-]+)/i,
+    re: /https?:\/\/issuu\.com\/[\w_.-]+\/docs\/([\w_.-]+)/i,
 
     mixins: [
         "site",
diff --git a/plugins/domains/trutv.com.js b/plugins/domains/trutv.com.js
index 8355164cb..863a26a61 100644
--- a/plugins/domains/trutv.com.js
+++ b/plugins/domains/trutv.com.js
@@ -1,6 +1,6 @@
 module.exports = {
 
-    re: /http:\/\/www\.trutv\.com\/(shows\/[\w-]+\/videos\/[\w-]+)\.html/i,
+    re: /https?:\/\/www\.trutv\.com\/(shows\/[\w-]+\/videos\/[\w-]+)\.html/i,
 
     mixins: [
         "og-title",
diff --git a/plugins/domains/tumblr.com/tumblr.photo.js b/plugins/domains/tumblr.com/tumblr.photo.js
index 87ff85773..d0fcec344 100644
--- a/plugins/domains/tumblr.com/tumblr.photo.js
+++ b/plugins/domains/tumblr.com/tumblr.photo.js
@@ -3,8 +3,8 @@ var _ = require('underscore');
 module.exports = {
 
     re: [
-        /^http:\/\/([a-z0-9-]+\.tumblr\.com)\/(post|image)\/(\d+)(?:\/[a-z0-9-]+)?/i,
-        /^http:\/\/([a-z-\.]+)\/(post|post)\/(\d{11})(?:\/[a-z0-9-]+)?/i
+        /^https?:\/\/([a-z0-9-]+\.tumblr\.com)\/(post|image)\/(\d+)(?:\/[a-z0-9-]+)?/i,
+        /^https?:\/\/([a-z-\.]+)\/(post|post)\/(\d{11})(?:\/[a-z0-9-]+)?/i
     ],    
 
     getLinks: function(tumblr_post) {
diff --git a/plugins/domains/vk.com.js b/plugins/domains/vk.com.js
index 34a36ac6e..18f98dbe5 100644
--- a/plugins/domains/vk.com.js
+++ b/plugins/domains/vk.com.js
@@ -1,7 +1,7 @@
 module.exports = {
 
     re: [
-        /^http:\/\/vk\.com\/video\-/i
+        /^https?:\/\/vk\.com\/video\-/i
     ],
 
     mixins: [

From 7c163d92b3ccd68f9ec038385962d860db3c13f6 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Tue, 22 Apr 2014 18:30:54 -0400
Subject: [PATCH 03/43] [domains] fix telly & fiddler tests

---
 plugins/domains/telly.com.js   | 8 ++++----
 plugins/domains/viddler.com.js | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/plugins/domains/telly.com.js b/plugins/domains/telly.com.js
index ac5a70d85..e5029f650 100644
--- a/plugins/domains/telly.com.js
+++ b/plugins/domains/telly.com.js
@@ -9,7 +9,6 @@ module.exports = {
         "og-site",
         "og-title",
         "twitter-image",
-        "twitter-player-responsive",
         "favicon"
     ],
 
@@ -17,12 +16,13 @@ module.exports = {
         return {
             href: "https://telly.com/embed.php?guid=" + urlMatch[1] + "&autoplay=0",
             type: CONFIG.T.text_html,
-            rel: [CONFIG.R.player, CONFIG.R.twitter],
-            "aspect-ratio": meta.twitter.player.width / meta.twitter.player.height
+            rel: CONFIG.R.player,
+            "aspect-ratio": 480/360
         };
     },
 
     tests: [
-        "http://telly.com/Q84DI7"
+        "http://telly.com/Q84DI7",
+        "http://telly.com/1AUHUCN"
     ]
 };
\ No newline at end of file
diff --git a/plugins/domains/viddler.com.js b/plugins/domains/viddler.com.js
index 5f257dd15..9876eb1e6 100644
--- a/plugins/domains/viddler.com.js
+++ b/plugins/domains/viddler.com.js
@@ -22,6 +22,6 @@ module.exports = {
     },
 
     tests: [
-        "http://www.viddler.com/v/5b70e34a"
+        "http://www.viddler.com/v/3027cd1f"
     ]
 };
\ No newline at end of file

From a2d656b976b1c91667cf8b7907a6bc3570829212 Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Wed, 23 Apr 2014 15:00:26 +0300
Subject: [PATCH 04/43] remove getWhitelist method

---
 lib/core.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/lib/core.js b/lib/core.js
index 3df624090..7604948f0 100644
--- a/lib/core.js
+++ b/lib/core.js
@@ -1165,8 +1165,5 @@
     };
 
     exports.getOembed = oembedUtils.getOembed;
-    exports.getWhitelist = function() {
-        return require('./whitelist');
-    };
 
 })(exports);
\ No newline at end of file

From cb19be857f8b713cd69c37b57dcab85b0dc1204c Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Wed, 23 Apr 2014 21:01:53 +0300
Subject: [PATCH 05/43] fix global config override if using as lib

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

diff --git a/lib/utils.js b/lib/utils.js
index 4a25a3c24..8a30f0144 100644
--- a/lib/utils.js
+++ b/lib/utils.js
@@ -7,7 +7,9 @@ var imagesize = require('imagesize');
 var moment = require('moment');
 var cache = require('./cache');
 
-GLOBAL.CONFIG = require('../config');
+if (!GLOBAL.CONFIG) {
+    GLOBAL.CONFIG = require('../config');
+}
 
 /**
  * @private

From 311478b917749d1b3c067880c95ba163e69ed2f6 Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Fri, 25 Apr 2014 18:52:30 +0300
Subject: [PATCH 06/43] fix oembed xml response

---
 modules/api/views.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/api/views.js b/modules/api/views.js
index 49461f1fc..b20442ddf 100644
--- a/modules/api/views.js
+++ b/modules/api/views.js
@@ -6,6 +6,7 @@ var cache = require('../../lib/cache');
 var oembedUtils = require('../../lib/oembed');
 var whitelist = require('../../lib/whitelist');
 var pluginLoader = require('../../lib/loader/pluginLoader');
+var jsonxml = require('jsontoxml');
 
 function prepareUri(uri) {
 

From 4bbec70c118c6e871d285e39717bee351b9266fe Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Fri, 25 Apr 2014 19:10:38 +0300
Subject: [PATCH 07/43] fix rounding aspect in special case

---
 lib/plugins/validators/media.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/plugins/validators/media.js b/lib/plugins/validators/media.js
index 4160e3836..2fd8b7e6e 100644
--- a/lib/plugins/validators/media.js
+++ b/lib/plugins/validators/media.js
@@ -16,6 +16,10 @@ function makeMediaResponsive(link) {
     } else {
         m["aspect-ratio"] = 4 / 3;
     }
+
+    if (typeof m["aspect-ratio"] === 'number') {
+        m["aspect-ratio"] = Math.round(m["aspect-ratio"] * 1000) / 1000;
+    }
 }
 
 function isEmpty(obj) {

From b0b11f7d552ee0528715a04edb231af8be1a333f Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Mon, 28 Apr 2014 18:51:18 -0400
Subject: [PATCH 08/43] [Domains] Do not return rel=image for instagram videos

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

diff --git a/plugins/domains/instagram.com.js b/plugins/domains/instagram.com.js
index 5a5374998..c29b87da5 100644
--- a/plugins/domains/instagram.com.js
+++ b/plugins/domains/instagram.com.js
@@ -42,7 +42,7 @@ module.exports = {
             }, {
                 href: src + 'l',
                 type: CONFIG.T.image,
-                rel: CONFIG.R.image,
+                rel: (meta.og && meta.og.video) ? CONFIG.R.thumbnail : CONFIG.R.image,
                 width: 612,
                 height: 612
             }];

From 2a6a55d8cd17b828dbf5225ebbb8c8a892ac1ece Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Mon, 28 Apr 2014 21:10:08 -0400
Subject: [PATCH 09/43] [domains] simplify Imgur (they fixed kittens in oEmbed)

---
 plugins/domains/imgur.com.js | 57 ++++++++++++++++++------------------
 1 file changed, 28 insertions(+), 29 deletions(-)

diff --git a/plugins/domains/imgur.com.js b/plugins/domains/imgur.com.js
index c8264f623..423e13f96 100644
--- a/plugins/domains/imgur.com.js
+++ b/plugins/domains/imgur.com.js
@@ -1,11 +1,15 @@
+var jquery = require('jquery');
+
 module.exports = {
 
     re: /https?:\/\/imgur\.com\/(?:\w+\/)?(\w+).*/i,
 
     mixins: [
         "favicon",
-        "oembed-video-responsive",
-        "og-site"
+        "canonical",
+        "oembed-author",
+        "twitter-image", // both as fall back, and as thumbnails for galleries
+        "oembed-site"
     ],
 
     getMeta: function(meta) {
@@ -14,53 +18,48 @@ module.exports = {
         };
     },
 
-    getLink: function(oembed, meta) {
-
-        var links = [];
+    getLink: function(oembed) {
 
-        // processing photos. 
-        // But in some cases, oembed photo shows the kitten instead of proper image. 
-        // In this cases - fall back to twitter photo
-        if (oembed.type === "photo" && oembed.url && oembed.url === meta.twitter.image.url) {
+        if (oembed.type === "photo" && oembed.url) {
 
-            links.push({
+            return {
                 href: oembed.url.replace("http://", "//"),
                 type: CONFIG.T.image,
                 rel: [CONFIG.R.image, CONFIG.R.thumbnail, CONFIG.R.oembed],
                 width: oembed.width,
                 height: oembed.height
-            });
+            };
+        }
 
-        } else if (meta.twitter.image && meta.twitter.image.url) { // the kitten!
 
-            links.push({
-                href: meta.twitter.image.url.replace("http://", "//"),
-                type: CONFIG.T.image,
-                rel: [CONFIG.R.image, CONFIG.R.thumbnail, CONFIG.R.twitter],
-                width: meta.twitter.image.width,
-                height: meta.twitter.image.height
-            });
+        if (oembed.type == "rich") {
+            var $container = jquery('<div>');
+            try{
+                $container.html(oembed.html5 || oembed.html);
+            } catch(ex) {}
 
-        } else { // likely a gallery, push thumbnail
+            var $iframe = $container.find('iframe');
 
-            links.push({
-                href: meta.image_src,
-                type: CONFIG.T.image,
-                rel: [CONFIG.R.thumbnail, CONFIG.R.og],
-            });
+            if ($iframe.length == 1) {
+                return {
+                    href: $iframe.attr('src').replace("http://","//"),
+                    type: CONFIG.T.text_html,
+                    rel: [CONFIG.R.player, CONFIG.R.oembed],
+                    "aspect-ratio": oembed.width / oembed.height
+                };
+            }
         }
-
-        return links;
     },    
 
     tests: [{
         pageWithFeed: "http://imgur.com/"
     }, {
-        skipMixins: ["oembed-video-responsive"]
+        skipMixins: ["oembed-author"]       // Available for Galleries only
     },    
         "http://imgur.com/Ks3qs",
         "http://imgur.com/gallery/IiDwq",
+        "http://imgur.com/a/yMoaT",
         "https://imgur.com/gallery/B3X48s9",
-        "http://imgur.com/r/aww/tFKv2zQ" // kitten bomb
+        "http://imgur.com/r/aww/tFKv2zQ"    // kitten bomb before, doesn't seem to show up any longer
     ]
 };
\ No newline at end of file

From 277ab6bb9bc24794fae9d9e987a16c648c084f90 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Mon, 28 Apr 2014 22:26:37 -0400
Subject: [PATCH 10/43] [domains] thumbnail for articles on Tumblr

---
 plugins/domains/tumblr.com/tumblr.text.js | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/plugins/domains/tumblr.com/tumblr.text.js b/plugins/domains/tumblr.com/tumblr.text.js
index 838f28fa5..3d7282d7e 100644
--- a/plugins/domains/tumblr.com/tumblr.text.js
+++ b/plugins/domains/tumblr.com/tumblr.text.js
@@ -7,7 +7,24 @@ module.exports = {
         /^https?:\/\/([a-z-\.]+)\/(post|post)\/(\d{11})(?:\/[a-z0-9-]+)?/i
     ],
 
-    getData: function(tumblr_post) {
+    getLink: function (tumblr_post) {
+        if (tumblr_post.thumbnail_url) {
+            return;
+        };
+
+        var $post = jquery('<div>').html(tumblr_post.body);
+        var $images = $post.find('img');
+
+                    // Could be more than 1 image, true. 
+        return {    // But the response time will be unacceptable as post-processing will check alll image sizes.
+            href: $images[0].src,
+            title: $images[0].alt,
+            type: CONFIG.T.image,
+            rel: CONFIG.R.thumbnail
+        };
+    },
+
+    getData: function (tumblr_post) {
 
         if (tumblr_post.type !== "text") {
 
@@ -21,8 +38,8 @@ module.exports = {
     },
 
     tests: [
+        "http://blog.dribbble.com/post/83410866615",
         "http://tiffany-anc.tumblr.com/post/58056730720/truth-what-filthy-thought-are-you-thinking-right-now",
-        "http://starsshinetoobrightly.tumblr.com/post/58055596742/17",
         "http://asimpleweirdlass.tumblr.com/post/58054585454/nakakatakot-kanina-ang-dilim-sa-street-tapos",
         "http://soupsoup.tumblr.com/post/41952443284/think-of-yourself-less-of-a-journalist-and-more"
     ]

From 907c1c133e4d58467823cc0bc5e7cd4efd7367c5 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Mon, 28 Apr 2014 23:52:24 -0400
Subject: [PATCH 11/43] [domains] properly process smaller images on Flickr

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

diff --git a/plugins/domains/flickr.com/flickr.photo.js b/plugins/domains/flickr.com/flickr.photo.js
index f54236e35..29996e62e 100644
--- a/plugins/domains/flickr.com/flickr.photo.js
+++ b/plugins/domains/flickr.com/flickr.photo.js
@@ -25,7 +25,7 @@ module.exports = {
                     width: size.width,
                     height: size.height,
                     type: "image/jpeg",
-                    rel: size.width > 500 ? CONFIG.R.image : CONFIG.R.thumbnail
+                    rel: size.width >= 800 || size.label == "Original" ? CONFIG.R.image : CONFIG.R.thumbnail
                 };
             }) || [];
 

From e3d08cc0a9963dcdbc0a684147a3b8ef3eed3008 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Tue, 29 Apr 2014 00:20:10 -0400
Subject: [PATCH 12/43] [domains] support Flickr videos

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

diff --git a/plugins/domains/flickr.com/flickr.photo.js b/plugins/domains/flickr.com/flickr.photo.js
index 29996e62e..bb298310d 100644
--- a/plugins/domains/flickr.com/flickr.photo.js
+++ b/plugins/domains/flickr.com/flickr.photo.js
@@ -20,13 +20,28 @@ module.exports = {
             }
 
             var result = sizes && sizes.map(function(size) {
-                return {
-                    href: size.source.replace(/^https?:/i, ""),
-                    width: size.width,
-                    height: size.height,
-                    type: "image/jpeg",
-                    rel: size.width >= 800 || size.label == "Original" ? CONFIG.R.image : CONFIG.R.thumbnail
-                };
+
+                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 || /original/i.test(size.label) ? 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
+                    }
+
+                } 
+
             }) || [];
 
             result.push({

From 4a20737b1b9d40a246b6349c25533f58989229c6 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Tue, 29 Apr 2014 10:46:54 -0400
Subject: [PATCH 13/43] [domains] support new URL structure of Behance

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

diff --git a/plugins/domains/behance.net.js b/plugins/domains/behance.net.js
index c5db75738..cc3b18949 100644
--- a/plugins/domains/behance.net.js
+++ b/plugins/domains/behance.net.js
@@ -4,6 +4,7 @@ module.exports = {
 
     re: [
         /https?:\/\/www\.behance\.net\/gallery\/([a-zA-Z0-9\-\(\)]+)\/([0-9]+)/i,
+        /https?:\/\/www\.behance\.net\/gallery\/([0-9]+)\/([a-zA-Z0-9\-\(\)]+)/i,
         /https?:\/\/([a-z-\.]+)\/gallery\/([a-zA-Z0-9\-\(\)]+)\/([0-9]+)/i,
     ],
 

From f908ecd60be5cbcfb95ff215379e891e42913e2e Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Tue, 29 Apr 2014 11:33:29 -0400
Subject: [PATCH 14/43] [Domains] add Slidecaptain

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

diff --git a/plugins/domains/slidecaptain.com.js b/plugins/domains/slidecaptain.com.js
new file mode 100644
index 000000000..486c76aff
--- /dev/null
+++ b/plugins/domains/slidecaptain.com.js
@@ -0,0 +1,39 @@
+
+module.exports = {
+
+    re: [
+        /https?:\/\/www\.slidecaptain\.com\/flows\/([a-zA-Z0-9]+)\/([a-zA-Z0-9\-]+)/i
+    ],
+
+    mixins: [
+        "og-image",
+        "favicon",
+        "canonical",
+        "keywords",
+        "og-title"
+    ],    
+
+    getMeta: function (meta) {
+        return {
+            "site": meta["generator"]
+        }
+    },
+    
+    getLink: function(meta) {
+        if (meta.og.url) {
+
+            return {
+                href: meta.og.url + "/embed",
+                type: CONFIG.T.text_html,
+                rel: CONFIG.R.player,
+                "aspect-ratio": 4/3   // It's actually more flexible, but it'll be better handled at oEmbed endpoint this way.
+            };
+        }
+    },
+
+    tests: [
+        "http://www.slidecaptain.com/flows/51dbfee3896082260f0001f5/background-images-and-colors/embed",
+        "http://www.slidecaptain.com/flows/51dbfee3896082260f0001f5/background-images-and-colors/"
+    ]
+
+};
\ No newline at end of file

From 484e73b8b42d968e17f34fe9e8779515b0b327e1 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Wed, 30 Apr 2014 21:24:52 -0400
Subject: [PATCH 15/43] Improve oEmbed rich according to new tags in whitelist
 record

---
 lib/plugins/validators/00_init/01_qa_rels.js |  2 +-
 plugins/links/oembed-rich.js                 | 34 ++++++++++++--------
 2 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/lib/plugins/validators/00_init/01_qa_rels.js b/lib/plugins/validators/00_init/01_qa_rels.js
index 9c0b4014c..eb1920c40 100644
--- a/lib/plugins/validators/00_init/01_qa_rels.js
+++ b/lib/plugins/validators/00_init/01_qa_rels.js
@@ -16,7 +16,7 @@ module.exports = {
         var rawMeta = {};
 
         // Proxy QA tags, but ignore the ones from the config wildcard
-        if (whitelistRecord && whitelistRecord.getQATags && !whitelistRecord.isDefault) {
+        if (whitelistRecord && whitelistRecord.getQATags && !whitelistRecord.isDefault && link.rel.indexOf('allow') == -1) {
             var tags = whitelistRecord.getQATags(rawMeta, link.rel);
             link.rel = link.rel.concat(tags);
         }
diff --git a/plugins/links/oembed-rich.js b/plugins/links/oembed-rich.js
index a36810e26..c7e261682 100644
--- a/plugins/links/oembed-rich.js
+++ b/plugins/links/oembed-rich.js
@@ -9,11 +9,19 @@ module.exports = {
             return;
         }
 
-        var inline = whitelistRecord.isAllowed('oembed.rich', "reader") || whitelistRecord.isAllowed('oembed.rich', "inline");
+        var rels = [CONFIG.R.oembed];
+
+        if (whitelistRecord.isAllowed('oembed.rich', "reader")) rels.push(CONFIG.R.reader);
+        if (whitelistRecord.isAllowed('oembed.rich', "player")) rels.push(CONFIG.R.player);
+        if (rels.length == 1) rels.push(CONFIG.R.app);        
+        // if (whitelistRecord.isAllowed('oembed.rich', "responsive")) rels.push("responsive");
+        if (whitelistRecord.isAllowed('oembed.rich', "inline")) rels.push(CONFIG.R.inline);
+        rels.push ("allow"); // otherwise, rich->players get denied by oembed:video whitelist record
+
 
         var widget = {
-            type: CONFIG.T.text_html,
-            rel:[CONFIG.R.oembed, CONFIG.R.app]
+            rel: rels,
+            type: CONFIG.T.text_html
         };
 
         var $container = jquery('<div>');
@@ -23,25 +31,23 @@ module.exports = {
 
         var $iframe = $container.find('iframe');
 
-
         // if embed code contains <iframe>, return src
-        if ($iframe.length == 1) {
+        if ($iframe.length == 1 && !whitelistRecord.isAllowed('oembed.rich', "inline")) {
 
             widget.href = $iframe.attr('src');
         
         } else { 
-            widget.html = oembed.html || oembed.html5; // will render in an iframe
-
-            if (inline) {
-                widget.rel.push(CONFIG.R.inline);
-            }
+            widget.html = oembed.html || oembed.html5; // will render in an iframe, unless "inline" is in rels
         }
 
 
-        if (whitelistRecord.isAllowed('oembed.rich', 'responsive')) {
-            if (oembed.width && oembed.height) {
-                widget['aspect-ratio'] = oembed.width / oembed.height;
-            }
+        if (whitelistRecord.isAllowed('oembed.rich', "inline")) {
+            // Output exact HTML from oEmbed
+            widget.html = oembed.html5 || oembed.html;
+        }
+
+        if (whitelistRecord.isAllowed('oembed.rich', 'responsive') && oembed.width && oembed.height) {
+            widget['aspect-ratio'] = oembed.width / oembed.height;
         } else {
             widget.width = oembed.width;
             widget.height = oembed.height

From cd839c1eabdeba8603cba3579c552747e15d966e Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Thu, 1 May 2014 10:33:32 -0400
Subject: [PATCH 16/43] [domains] allow embed urls for CodePen

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

diff --git a/plugins/domains/codepen.io.js b/plugins/domains/codepen.io.js
index c52ef8fbf..5a9cdb732 100644
--- a/plugins/domains/codepen.io.js
+++ b/plugins/domains/codepen.io.js
@@ -2,7 +2,7 @@ var jquery = require('jquery');
 
 module.exports = {
 
-    re: /https?:\/\/codepen\.io\/([a-z0-9\-]+)\/(pen|details)\/([a-z0-9\-]+)/i,
+    re: /https?:\/\/codepen\.io\/([a-z0-9\-]+)\/(pen|details|full)\/([a-z0-9\-]+)/i,
 
     mixins: [
         "oembed-thumbnail",

From 054ecd19107f7d0aaf29faa6ca340d6a66041547 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Thu, 1 May 2014 11:00:42 -0400
Subject: [PATCH 17/43] [domains] As of 30 April 2014, QiK has been retired.

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

diff --git a/plugins/domains/qik.com.js b/plugins/domains/qik.com.js
deleted file mode 100644
index c1b014ebd..000000000
--- a/plugins/domains/qik.com.js
+++ /dev/null
@@ -1,41 +0,0 @@
-var jquery = require('jquery');
-
-module.exports = {
-
-    // TODO: check thumbnail.
-
-    mixins: [
-        "oembed-title",
-        "oembed-author",
-        "oembed-site",
-        "geo-url"
-    ],
-
-    getLink: function(oembed) {
-
-        var $container = jquery('<div />');
-        $container.html(oembed.html);
-        var $embed = $container.find('embed');
-
-        return [{
-            href: $embed.attr('src') + '&' + $embed.attr("FlashVars"),
-            type: CONFIG.T.flash,
-            rel: CONFIG.R.player,
-            "aspect-ratio": oembed.width / oembed.height
-        }, {
-            href: 'http://qik.com/favicon.ico',
-            type: CONFIG.T.image,
-            rel: CONFIG.R.icon
-        }]
-    },
-
-    tests: [{
-        page: "http://qik.com/video/search?order=recent&query=music",
-        selector: "h6 a"
-    },
-        "http://qik.com/video/52767028",
-        {
-            skipMixins: "geo-url"
-        }
-    ]
-};
\ No newline at end of file

From 28af48fd17402e88581b7bc7bb6e2ab4b8c06a9f Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Thu, 1 May 2014 21:08:42 -0400
Subject: [PATCH 18/43] [domains] better embed for vine (properly responsive +
 titles)

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

diff --git a/plugins/domains/vine.co.js b/plugins/domains/vine.co.js
index 78eddb427..8258f4e8b 100644
--- a/plugins/domains/vine.co.js
+++ b/plugins/domains/vine.co.js
@@ -2,12 +2,21 @@ module.exports = {
 
     mixins: [
         "twitter-image",
-        "twitter-player-responsive",
         "og-title",
         "og-site",
         "favicon"
     ],
 
+    getLinks: function (twitter) {
+
+        return {
+            href: twitter.player.value.replace("/card", "/embed/simple"),
+            type: CONFIG.T.text_html,
+            rel: CONFIG.R.player,
+            "aspect-ratio": twitter.player.width / twitter.player.height
+        }
+    },
+
     tests: [
         "https://vine.co/v/bjHh0zHdgZT",
         "https://vine.co/v/blhUa7aLYgr",

From e946b0b8ce38c4c3251e6d4b71e480ca5b41b572 Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Tue, 6 May 2014 18:08:30 +0300
Subject: [PATCH 19/43] fix tests

---
 test/main.js | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/test/main.js b/test/main.js
index 186219f67..fc5cb769a 100644
--- a/test/main.js
+++ b/test/main.js
@@ -74,22 +74,6 @@ function assertOembed(oembed) {
 vows.describe('Tests')
     .addBatch({
 
-        'qik meta': {
-            topic: function() {
-                iframely("http://qik.com/video/52767028", 'meta', this.callback);
-            },
-            'not error': notError,
-            'has meta': hasMeta
-        },
-
-        'qik oembed': {
-            topic: function() {
-                iframely("http://qik.com/video/52767028", 'oembed', this.callback);
-            },
-            'not error': notError,
-            'has valid oEmbed object': hasValidOEmbedObject
-        },
-
         'vimeo meta': {
             topic: function() {
                 iframely("https://vimeo.com/63683408", 'meta', this.callback);

From 5457121bed5d8032e53d1ad507289a1d9fb9fd47 Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Tue, 6 May 2014 22:18:20 +0300
Subject: [PATCH 20/43] add cookie jar to options to prevent some redirect
 loops

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

diff --git a/lib/core.js b/lib/core.js
index 7604948f0..31b3f14f2 100644
--- a/lib/core.js
+++ b/lib/core.js
@@ -988,6 +988,10 @@
             options = {};
         }
 
+        if (!options.jar) {
+            options.jar = request.jar();
+        }
+
         if (options.redirectsCount && options.redirectsCount > 3) {
             return cb('redirect loop');
         }

From 99104005d178d401d658dd5ff2d0fb320e27a31e Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Wed, 7 May 2014 16:33:40 +0300
Subject: [PATCH 21/43] return whitelist at api without wildcard data

---
 lib/core.js      |  2 +-
 lib/whitelist.js | 14 ++++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/lib/core.js b/lib/core.js
index 31b3f14f2..634d08c24 100644
--- a/lib/core.js
+++ b/lib/core.js
@@ -1063,7 +1063,7 @@
                 }
 
                 if (options.whitelist) {
-                    allResults.whitelist = context.whitelistRecord;
+                    allResults.whitelist = options.getWhitelistRecord && options.getWhitelistRecord(uri, true);
                 }
 
                 if (options.fetchParam) {
diff --git a/lib/whitelist.js b/lib/whitelist.js
index 81563184a..31bb4d648 100644
--- a/lib/whitelist.js
+++ b/lib/whitelist.js
@@ -69,13 +69,13 @@
         return result;
     }
 
-    whitelist.findWhitelistRecordFor = function(uri) {
+    whitelist.findWhitelistRecordFor = function(uri, disableWildcard) {
 
         if (!whitelistObject) {
             return null;
         }
 
-        var patterns = extractDomainPatterns(uri);
+        var patterns = extractDomainPatterns(uri, disableWildcard);
 
         var record, i = 0;
         while(!record && i < patterns.length) {
@@ -106,7 +106,7 @@
                 }, record);
 
                 // Override empty data with wildcard.
-                if (CONFIG.WHITELIST_WILDCARD) {
+                if (!disableWildcard && CONFIG.WHITELIST_WILDCARD) {
 
                     for(var protocolId in CONFIG.WHITELIST_WILDCARD) {
 
@@ -145,7 +145,7 @@
         }
     }
 
-    function extractDomainPatterns(uri) {
+    function extractDomainPatterns(uri, disableWildcard) {
 
         var patterns = [];
 
@@ -178,8 +178,10 @@
             patterns.push('*.' + domain);
         }
 
-        // System-wide top-level wildcard, taken from config.
-        patterns.push('*');
+        if (!disableWildcard) {
+            // System-wide top-level wildcard, taken from config.
+            patterns.push('*');
+        }
 
         return patterns;
     }

From 2bdbbbfd1c1d3ab095a09d23beab027c8332ecd7 Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Wed, 7 May 2014 17:02:08 +0300
Subject: [PATCH 22/43] prevent modifying original whitelist records

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

diff --git a/lib/whitelist.js b/lib/whitelist.js
index 31bb4d648..b914c1ccb 100644
--- a/lib/whitelist.js
+++ b/lib/whitelist.js
@@ -116,6 +116,8 @@
 
                         if (!recordProtocol) {
                             recordProtocol = record[protocolId] = {};
+                        } else {
+                            recordProtocol = _.extend({}, recordProtocol);
                         }
 
                         for(var type in protocol) {

From 118f79bbd0022c8038dc945eba481db5e6ce52eb Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Wed, 7 May 2014 13:49:18 -0400
Subject: [PATCH 23/43] [generic] Add Twitter Stream parser

---
 plugins/links/twitter-stream.js | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 plugins/links/twitter-stream.js

diff --git a/plugins/links/twitter-stream.js b/plugins/links/twitter-stream.js
new file mode 100644
index 000000000..daf61f4bd
--- /dev/null
+++ b/plugins/links/twitter-stream.js
@@ -0,0 +1,28 @@
+module.exports = {
+
+    getLink: function(twitter, whitelistRecord) {
+
+        if (twitter.player && twitter.player.stream && (!whitelistRecord || (whitelistRecord.isAllowed && whitelistRecord.isAllowed('twitter.stream')))) {
+
+            var player = {
+                href: twitter.player.stream.value || twitter.player.stream,
+                type: CONFIG.T.video_mp4,
+                rel: [CONFIG.R.player, CONFIG.R.twitter],
+            };
+
+            if (whitelistRecord.isAllowed('twitter.stream', 'responsive') && twitter.player.height) {
+                player['aspect-ratio'] = twitter.player.width / twitter.player.height;
+            } else {
+                player.width = twitter.player.width;
+                player.height = twitter.player.height;
+            }
+
+            if (whitelistRecord.isAllowed('twitter.stream', 'autoplay')) {
+                player.rel.push(CONFIG.R.autoplay);
+            }
+
+            return player;
+
+        }
+    }
+};
\ No newline at end of file

From fe754a2bc4ddec89df43a79128d86b4be96dd4c8 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Wed, 7 May 2014 14:15:40 -0400
Subject: [PATCH 24/43] [generic] twitter stream even if twitter player is
 blacklisted

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

diff --git a/plugins/links/twitter-stream.js b/plugins/links/twitter-stream.js
index daf61f4bd..30e03fbbb 100644
--- a/plugins/links/twitter-stream.js
+++ b/plugins/links/twitter-stream.js
@@ -7,7 +7,7 @@ module.exports = {
             var player = {
                 href: twitter.player.stream.value || twitter.player.stream,
                 type: CONFIG.T.video_mp4,
-                rel: [CONFIG.R.player, CONFIG.R.twitter],
+                rel: [CONFIG.R.player, CONFIG.R.twitter, "allow"],
             };
 
             if (whitelistRecord.isAllowed('twitter.stream', 'responsive') && twitter.player.height) {

From 628564fd52cff171987c95b4573786286ff18d83 Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Thu, 8 May 2014 17:34:34 +0300
Subject: [PATCH 25/43] fix cache refresh issue

---
 utils.js | 36 ++++++++++++++++++++++++++++++++----
 1 file changed, 32 insertions(+), 4 deletions(-)

diff --git a/utils.js b/utils.js
index 2c98dbec4..7c8185e7a 100644
--- a/utils.js
+++ b/utils.js
@@ -89,12 +89,38 @@
         return '"' + crypto.createHash('md5').update(value).digest("hex") + '"';
     };
 
+    function getUnifiedCacheUrl(req) {
+
+        // Remove 'refresh' param and order keys.
+
+        var urlObj = urlLib.parse(req.url, true);
+
+        var query = urlObj.query;
+
+        delete query.refresh;
+        delete urlObj.search;
+
+        var newQuery = {};
+
+        var keys = _.keys(query);
+        keys.sort();
+        keys.forEach(function(key) {
+            newQuery[key] = query[key];
+        });
+
+        urlObj.query = newQuery;
+
+        return urlLib.format(urlObj);
+    }
+
     function setResponseToCache(code, content_type, req, res, body, ttl) {
 
         if (!res.get('ETag')) {
             res.set('ETag', etag(body));
         }
 
+        var url = getUnifiedCacheUrl(req);
+
         var head = {
             statusCode: code,
             headers: {
@@ -104,7 +130,7 @@
         };
 
         var data = JSON.stringify(head) + '::' + body;
-        cache.set('urlcache:' + version + ':' + req.url, data, {ttl: ttl});
+        cache.set('urlcache:' + version + ':' + url, data, {ttl: ttl});
     }
 
     exports.cacheMiddleware = function(req, res, next) {
@@ -115,9 +141,11 @@
                 var refresh = req.query.refresh === "true";
                 if (!refresh) {
 
-                    cache.get('urlcache:' + version + ':' + req.url, function(error, data) {
+                    var url = getUnifiedCacheUrl(req);
+
+                    cache.get('urlcache:' + version + ':' + url, function(error, data) {
                         if (error) {
-                            console.error('Error getting response from cache', req.url, error);
+                            console.error('Error getting response from cache', url, error);
                         }
                         if (data) {
                             var index = data.indexOf("::");
@@ -127,7 +155,7 @@
                                 try {
                                     head = JSON.parse(headStr);
                                 } catch(ex) {
-                                    console.error('Error parsing response status from cache', req.url, headStr);
+                                    console.error('Error parsing response status from cache', url, headStr);
                                 }
 
                                 if (head) {

From b75af219cb3b64da6025349107a52d3fb4c37a45 Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Thu, 8 May 2014 18:51:14 +0300
Subject: [PATCH 26/43] bugfix

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

diff --git a/utils.js b/utils.js
index 7c8185e7a..47a6eab29 100644
--- a/utils.js
+++ b/utils.js
@@ -9,6 +9,7 @@
     var crypto = require('crypto');
     var moment = require('moment');
     var _ = require('underscore');
+    var urlLib = require('url');
 
     function NotFound(message) {
 

From 238a93b23016c78c030ea51391a0f2655eb635c0 Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Mon, 12 May 2014 19:59:31 +0300
Subject: [PATCH 27/43] return 415 error for unknown encodings

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

diff --git a/lib/plugins/system/meta/meta.js b/lib/plugins/system/meta/meta.js
index 4d56c9539..c91d8ecf3 100644
--- a/lib/plugins/system/meta/meta.js
+++ b/lib/plugins/system/meta/meta.js
@@ -14,6 +14,13 @@ module.exports = {
                 if (error) {
                     return cb(error);
                 }
+
+                if (meta.charset.match(/^(euc|ISO2022)/gi)) {
+                    return cb({
+                        responseStatusCode: 415
+                    });
+                }
+
                 cb(null, {
                     meta: meta
                 });

From ee5f973d1ce20d90a13489fd62147651a54deb35 Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Mon, 12 May 2014 20:17:10 +0300
Subject: [PATCH 28/43] exclude shift from known encodings

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

diff --git a/lib/plugins/system/meta/meta.js b/lib/plugins/system/meta/meta.js
index c91d8ecf3..826f43a24 100644
--- a/lib/plugins/system/meta/meta.js
+++ b/lib/plugins/system/meta/meta.js
@@ -15,7 +15,7 @@ module.exports = {
                     return cb(error);
                 }
 
-                if (meta.charset.match(/^(euc|ISO2022)/gi)) {
+                if (meta.charset.match(/^(euc|ISO2022|shift)/gi)) {
                     return cb({
                         responseStatusCode: 415
                     });

From 85d0f18744988a8516334242605db0e3dcf36c70 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Wed, 14 May 2014 10:54:21 -0400
Subject: [PATCH 29/43] Add X-SJIS to the list of unsupported encodings

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

diff --git a/lib/plugins/system/meta/meta.js b/lib/plugins/system/meta/meta.js
index 826f43a24..7ec4dc6bf 100644
--- a/lib/plugins/system/meta/meta.js
+++ b/lib/plugins/system/meta/meta.js
@@ -15,7 +15,7 @@ module.exports = {
                     return cb(error);
                 }
 
-                if (meta.charset.match(/^(euc|ISO2022|shift)/gi)) {
+                if (meta.charset.match(/^(euc|ISO2022|shift|X\-SJIS)/gi)) {
                     return cb({
                         responseStatusCode: 415
                     });

From 7b647ec72726d92015108ae7d6962a8795e5011e Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Wed, 14 May 2014 11:11:24 -0400
Subject: [PATCH 30/43] [general] whitelist all you tubes in twitter players

---
 plugins/links/twitter-youtube.js | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 plugins/links/twitter-youtube.js

diff --git a/plugins/links/twitter-youtube.js b/plugins/links/twitter-youtube.js
new file mode 100644
index 000000000..415c60d7e
--- /dev/null
+++ b/plugins/links/twitter-youtube.js
@@ -0,0 +1,31 @@
+module.exports = {
+
+    // e.g. http://www.kinitv.com/video/3495O8
+    getLink: function(twitter) {
+
+        if (!twitter.player || !twitter.player.value) return;
+        
+        var video_src = twitter.player.value || twitter.player;
+
+        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\.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);
+
+
+        if (urlMatch) {
+
+            var params = (CONFIG.providerOptions.youtube && CONFIG.providerOptions.youtube.get_params) ? CONFIG.providerOptions.youtube.get_params : "";
+
+            return {
+                href: "https://youtube.com/embed/" + urlMatch[1] + params,
+                type: CONFIG.T.text_html,
+                rel: CONFIG.R.player,
+                "aspect-ratio": (twitter.player.height && twitter.player.width) ? twitter.player.width / twitter.player.height : 4/3
+            }
+
+        }
+    }
+};
\ No newline at end of file

From 0af752947a3a4e04bd0681086a9244252f0fad27 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Wed, 14 May 2014 13:01:02 -0400
Subject: [PATCH 31/43] [domains] Fix & simplify Vube (they now have iframes)

---
 plugins/domains/vube.com.js | 73 ++++++++++---------------------------
 1 file changed, 20 insertions(+), 53 deletions(-)

diff --git a/plugins/domains/vube.com.js b/plugins/domains/vube.com.js
index f2422a198..4c36ab870 100644
--- a/plugins/domains/vube.com.js
+++ b/plugins/domains/vube.com.js
@@ -1,69 +1,36 @@
 module.exports = {
 
-    re: /^https?:\/\/vube\.com\/([^\/]+)\/([a-zA-Z0-9_-]+)/i,
+    mixins: [
+        "og-image",
+        "canonical",
+        "twitter-description",
+        "og-site",
+        "twitter-title",
+        "favicon"
+    ],
 
-    provides: 'vube',
+    getLink: function(meta) {
 
-    getData: function(urlMatch, request, cb) {
-        request({
-            uri: "http://vube.com/api/v2/video/" + urlMatch[2],
-            json: true
-        }, function(error, response, body) {
-            if (error) {
-                return cb(error);
-            }
-            cb(null, {
-                vube: body
-            });
-        });
-    },
-
-    getMeta: function(vube) {
-        return {
-            title: vube.title,
-            description: vube.description || vube.ucl_description,
-            author: vube.user_alias,
-            author_url: 'http://vube.com' + vube.channel_url,
-            duration: vube.duration,
-            views: vube.raw_view_count,
-            date: vube.upload_time,
-            canonical: 'http://vube.com' + vube.watch_url,
-            category: vube._links.similar_videos.title,
-            site: "Vube.com"
-        };
-    },    
+        if (!meta.og.url && !meta.twitter.url) return;         
 
-    getLinks: function(vube, urlMatch) {
+        var urlMatch = (meta.og.url || meta.twitter.url).match(/^https?:\/\/vube\.com\/([^\/]+)\/([a-zA-Z0-9_-]+)$/i);
 
-        var html = 
+        if (!urlMatch || urlMatch[1] == "tags") return;
 
-        '<script src="//m2.thestaticvube.com/web/js/assets/js/embed.js" data-swf="//m2.thestaticvube.com/web/vendor/flowplayer/flowplayer-commercial.swf" data-skin="//m2.thestaticvube.com/web/vendor/flowplayer/skin/minimalist.css">' + 
-        '<div class="flowplayer" data-origin="' + urlMatch[0] + urlMatch[1] + urlMatch[2] +'"  style="width:100%;padding-bottom:56.5%;">' +
-            '<video>' +
-            '<source type="video/mp4" src="//video.thestaticvube.com/video/4/'+ vube.public_id +'.mp4">' +
-        '</video></div></script>';
-
-        return [{
-            href: "http://vube.com/favicon.ico",
-            type: CONFIG.T.image_icon,
-            rel: CONFIG.R.icon
-        }, {
-            href: '//frame.thestaticvube.com/snap/640x360/' + vube.public_id + '.jpg',
-            type: CONFIG.T.image_jpeg,
-            rel: CONFIG.R.thumbnail
-        }, {
-            html: html,
+        return {
+            href: "http://vube.com/embed/video/" + urlMatch[2] + "?autoplay=false&fit=true",
             type: CONFIG.T.text_html,
-            rel: [CONFIG.R.player, CONFIG.R.inline],
-            "aspect-ratio": 0.565,
-            "max-width": 800
-        }];
+            rel: CONFIG.R.player, 
+            "aspect-ratio": 640/435
+        }
+
     },
 
     tests: [{
         noFeeds: true
     },
         "http://vube.com/De5tro/vE6XViQkTU/L/vote?t=s",
-        "http://vube.com/SHIBAN/u2QvJwDVmw?t=s"
+        "http://vube.com/SHIBAN/u2QvJwDVmw?t=s",
+        "http://vube.com/trending/Brigitte+Wickens/9XVTD5KoaO?n=2&t=s"
     ]
 };
\ No newline at end of file

From 9cfedfd50a5a89f5a6633e6e3fea5081fba39d4f Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Wed, 14 May 2014 13:01:31 -0400
Subject: [PATCH 32/43] [Domains] handle additional URLs for someecards

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

diff --git a/plugins/domains/someecards.com.js b/plugins/domains/someecards.com.js
index e9543bf0d..ffe4a079e 100644
--- a/plugins/domains/someecards.com.js
+++ b/plugins/domains/someecards.com.js
@@ -10,7 +10,7 @@ module.exports = {
     getLink: function (meta) {
         if (meta.twitter && meta.twitter.image) {
             return {
-                href: meta.twitter.image.url,
+                href: meta.twitter.image.url || meta.twitter.image,
                 type: CONFIG.T.image,
                 rel: [CONFIG.R.image],
                 width: meta.twitter.image.width,

From 7382a5833813367d805015202d2dbaf9d8e58fe0 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Wed, 14 May 2014 13:07:33 -0400
Subject: [PATCH 33/43] Add MS949 to the list of unsupported encodings

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

diff --git a/lib/plugins/system/meta/meta.js b/lib/plugins/system/meta/meta.js
index 7ec4dc6bf..7e088ae4a 100644
--- a/lib/plugins/system/meta/meta.js
+++ b/lib/plugins/system/meta/meta.js
@@ -15,7 +15,7 @@ module.exports = {
                     return cb(error);
                 }
 
-                if (meta.charset.match(/^(euc|ISO2022|shift|X\-SJIS)/gi)) {
+                if (meta.charset.match(/^(euc|ISO2022|shift|X\-SJIS|MS949)/gi)) {
                     return cb({
                         responseStatusCode: 415
                     });

From f7ebb6817a385edd3837b712eef86cd313df1673 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Wed, 14 May 2014 13:39:17 -0400
Subject: [PATCH 34/43] [domains] unblock blog URLs of someecards

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

diff --git a/plugins/domains/someecards.com.js b/plugins/domains/someecards.com.js
index ffe4a079e..c543a6fff 100644
--- a/plugins/domains/someecards.com.js
+++ b/plugins/domains/someecards.com.js
@@ -8,7 +8,7 @@ module.exports = {
     ],
 
     getLink: function (meta) {
-        if (meta.twitter && meta.twitter.image) {
+        if (meta.twitter && meta.twitter.card == "photo" && meta.twitter.image) {
             return {
                 href: meta.twitter.image.url || meta.twitter.image,
                 type: CONFIG.T.image,

From e22972488ea1fecbad5cf2ad720c968efeeac335 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Wed, 14 May 2014 13:54:11 -0400
Subject: [PATCH 35/43] [domains] support Globe Now videos

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

diff --git a/plugins/domains/theglobeandmail.com/globe.video.js b/plugins/domains/theglobeandmail.com/globe.video.js
index 462447075..18c65dcc9 100644
--- a/plugins/domains/theglobeandmail.com/globe.video.js
+++ b/plugins/domains/theglobeandmail.com/globe.video.js
@@ -1,7 +1,8 @@
 module.exports = {
 
     re: [
-        /^https?:\/\/www\.theglobeandmail\.com\/[a-z\/\-]+video\/video+/i
+        /^https?:\/\/www\.theglobeandmail\.com\/[a-z\/\-]+video\/video+/i,
+        /^https?:\/\/www\.theglobeandmail\.com\/video\//i
     ],
 
     mixins: [
@@ -26,6 +27,7 @@ module.exports = {
     },
 
     tests: [
+        "http://www.theglobeandmail.com/video/globe-now/video-globe-now-exploding-whale-ontario-election-dogecoin/article18394260/",
         "http://www.theglobeandmail.com/sports/sports-video/video-rodman-dont-give-us-negativity-for-n-korea/article16230684/",
         "http://www.theglobeandmail.com/report-on-business/video/video-market-view-canadas-wild-weather-how-much-will-it-cost-consumers/article16325843/"
     ]

From e4b93378e1b202b42df368f9feaa5947bc2e0d01 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Wed, 14 May 2014 14:03:10 -0400
Subject: [PATCH 36/43] [domains] more of Guardian URLs

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

diff --git a/plugins/domains/theguardian.com/guardian.video.js b/plugins/domains/theguardian.com/guardian.video.js
index ddc851ed5..f7f4461f2 100644
--- a/plugins/domains/theguardian.com/guardian.video.js
+++ b/plugins/domains/theguardian.com/guardian.video.js
@@ -1,6 +1,6 @@
 module.exports = {
 
-    re: /https?:\/\/www\.theguardian\.com\/\w+\/video\/\d+\/\w+\/\d+\/[\w-]+/i,
+    re: /https?:\/\/www\.theguardian\.com\/[\w-]+\/video\/\d+\/\w+\/\d+\/[\w-]+/i,
 
     mixins: [
         "canonical",
@@ -31,6 +31,7 @@ module.exports = {
     tests: [{
         pageWithFeed: "http://www.guardian.co.uk/world/world+content/video"
     },
-        "http://www.guardian.co.uk/world/video/2013/jun/26/julia-gillard-ousted-prime-minister-video"
+        "http://www.guardian.co.uk/world/video/2013/jun/26/julia-gillard-ousted-prime-minister-video",
+        "http://www.theguardian.com/tv-and-radio/video/2014/may/14/russian-mp-sings-protest-austria-conchita-wurst-eurovision-video"
     ]
 };
\ No newline at end of file

From d78b3765ad31fab66209ab11a4315688f8699ce1 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Wed, 14 May 2014 14:13:18 -0400
Subject: [PATCH 37/43] [domains] remove Eventbrite - embeds are not available
 any longer :\

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

diff --git a/plugins/domains/eventbrite.com.js b/plugins/domains/eventbrite.com.js
deleted file mode 100644
index c6c4569c7..000000000
--- a/plugins/domains/eventbrite.com.js
+++ /dev/null
@@ -1,40 +0,0 @@
-module.exports = {
-
-    // re: /^http:\/\/www\.eventbrite\.com\/event\/([0-9\-]+)/i,
-    re: /^https?:\/\/(\w+)?\.(eventbrite)\.(com|ca|fr|it|jp|es|co\.uk)\//i,
-
-    mixins: [
-        "canonical",
-        "og-title",
-        "og-location",
-        "og-description",
-        "og-site",
-        "og-image",
-        "keywords",
-        "favicon"
-    ],
-
-    getLinks: function(meta) {
-
-        if (!meta.canonical || !meta.og || (meta.og && !meta.og.type == "eventbriteog:event")) return;
-
-        var eventId = meta.canonical.match(/\d+$/); // Number at the end of the string
-
-        if (eventId) {
-
-            return {
-                href: "//www.eventbrite.com/tickets-external?v=2&eid=" + eventId,
-                type: CONFIG.T.text_html,
-                rel: CONFIG.R.reader,
-                "min-width": "500"
-            };
-        }
-    },
-
-    tests: [
-        "http://womenshiftdigital.eventbrite.com",
-        "http://egyptdemocracy.eventbrite.com/",
-        "http://www.eventbrite.com/e/egypt-the-struggle-for-democracy-registration-9349712241?aff=estw",
-        "https://www.eventbrite.co.uk/e/the-top-30-charity-ceos-on-social-media-launch-tickets-9069048769"
-    ]
-};
\ No newline at end of file

From 7af85f1b5824ef500c248376864b1bef64763a32 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Wed, 14 May 2014 14:16:28 -0400
Subject: [PATCH 38/43] [domains] fix thumbnails for Telly

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

diff --git a/plugins/domains/telly.com.js b/plugins/domains/telly.com.js
index e5029f650..6575eae80 100644
--- a/plugins/domains/telly.com.js
+++ b/plugins/domains/telly.com.js
@@ -8,7 +8,7 @@ module.exports = {
         "canonical",
         "og-site",
         "og-title",
-        "twitter-image",
+        "og-image",
         "favicon"
     ],
 

From c1c624bda615bed62af67cea98467e6ba30c6171 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Wed, 14 May 2014 14:20:07 -0400
Subject: [PATCH 39/43] [tests] fix Tumblr text tests when there is no images
 in a post

---
 plugins/domains/tumblr.com/tumblr.text.js | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/plugins/domains/tumblr.com/tumblr.text.js b/plugins/domains/tumblr.com/tumblr.text.js
index 3d7282d7e..9cec7f036 100644
--- a/plugins/domains/tumblr.com/tumblr.text.js
+++ b/plugins/domains/tumblr.com/tumblr.text.js
@@ -15,13 +15,15 @@ module.exports = {
         var $post = jquery('<div>').html(tumblr_post.body);
         var $images = $post.find('img');
 
-                    // Could be more than 1 image, true. 
-        return {    // But the response time will be unacceptable as post-processing will check alll image sizes.
-            href: $images[0].src,
-            title: $images[0].alt,
-            type: CONFIG.T.image,
-            rel: CONFIG.R.thumbnail
-        };
+        if ($images.length > 0) {
+                        // Could be more than 1 image, true. 
+            return {    // But the response time will be unacceptable as post-processing will check alll image sizes.
+                href: $images[0].src,
+                title: $images[0].alt,
+                type: CONFIG.T.image,
+                rel: CONFIG.R.thumbnail
+            };
+        }
     },
 
     getData: function (tumblr_post) {

From 7236a017f0dbc64255457e4ffe0e4c436e5f9cc9 Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Wed, 14 May 2014 15:01:40 -0400
Subject: [PATCH 40/43] [domains] re-enable proper Pinterest

---
 .../domains/pinterest.com/pinterest.board.js  | 30 ++++++-----------
 .../domains/pinterest.com/pinterest.icon.js   | 16 ----------
 .../domains/pinterest.com/pinterest.image.js  | 28 ++++++----------
 .../domains/pinterest.com/pinterest.user.js   | 32 +++++++------------
 4 files changed, 30 insertions(+), 76 deletions(-)
 delete mode 100644 plugins/domains/pinterest.com/pinterest.icon.js

diff --git a/plugins/domains/pinterest.com/pinterest.board.js b/plugins/domains/pinterest.com/pinterest.board.js
index 1bbe0890f..75fab24e3 100644
--- a/plugins/domains/pinterest.com/pinterest.board.js
+++ b/plugins/domains/pinterest.com/pinterest.board.js
@@ -1,26 +1,16 @@
-/************************
- Pinterest is not parser-friendly and we would violate
- their Acceptable Use Policy at http://about.pinterest.com/use/
- if we are to provide a proper embed plugin to their domain
- and thus enable you to violate the same policy.
-
- We can't let your network be blacklisted with Pinterest
- per https://en.help.pinterest.com/entries/22914692
-
- If you notice that their policy changed and we had not updated this plugin yet,
- give us a shout and we'll tweak it promptly.
- *************************/
 
 module.exports = {
 
     re: /^https?:\/\/(?:www\.)?pinterest\.com\/((?!pin)[a-z0-9]+)\/([\w\-]+)\/?(?:$|\?|#)/i,
 
-    getMeta: function() {
-        return {
-            title: "Pinterest Board",
-            site: "Pinterest"
-        };
-    },
+    mixins: [
+        "og-image",
+        "favicon",
+        "canonical",
+        "og-description",
+        "og-site",
+        "og-title"
+    ],    
 
     getLink: function(url) {
         return [{
@@ -31,11 +21,11 @@ module.exports = {
                 url: url,
                 title: "Pinterest Board",
                 type: "embedBoard",
-                width: 800,
+                width: 600,
                 height: 600,
                 pinWidth: 120
             },
-            width: 800,
+            width: 600,
             height: 600+120
         }];
     },
diff --git a/plugins/domains/pinterest.com/pinterest.icon.js b/plugins/domains/pinterest.com/pinterest.icon.js
deleted file mode 100644
index 49be6de4c..000000000
--- a/plugins/domains/pinterest.com/pinterest.icon.js
+++ /dev/null
@@ -1,16 +0,0 @@
-module.exports = {
-
-    re: /^https?:\/\/(?:www\.)?pinterest\.com\//i,
-
-    getLink: function() {
-        return {
-            href: "http://passets-ec.pinterest.com/webapp/app/desktop/images/favicon.7126dab5.png",
-            type: CONFIG.T.image_png,
-            rel: CONFIG.R.icon
-        };
-    },
-
-    tests: {
-        noTest: true
-    }
-};
\ No newline at end of file
diff --git a/plugins/domains/pinterest.com/pinterest.image.js b/plugins/domains/pinterest.com/pinterest.image.js
index 29734104f..0932aed0e 100644
--- a/plugins/domains/pinterest.com/pinterest.image.js
+++ b/plugins/domains/pinterest.com/pinterest.image.js
@@ -1,31 +1,21 @@
-/************************
- Pinterest is not parser-friendly and we would violate
- their Acceptable Use Policy at http://about.pinterest.com/use/
- if we are to provide a proper embed plugin to their domain
- and thus enable you to violate the same policy.
-
- We can't let your network be blacklisted with Pinterest
- per https://en.help.pinterest.com/entries/22914692
-
- If you notice that their policy changed and we had not updated this plugin yet,
- give us a shout and we'll tweak it promptly.
- *************************/
 
 module.exports = {
 
     re: /^https?:\/\/(?:www\.)?pinterest\.com\/pin\/(\d+)/i,
 
-    getMeta: function() {
-        return {
-            title: "Pinterest Image",
-            site: "Pinterest"
-        };
-    },
+    mixins: [
+        "og-image",
+        "favicon",
+        "canonical",
+        "og-description",
+        "og-site",
+        "og-title"
+    ],
 
     getLink: function(url) {
         return {
             type: CONFIG.T.text_html,
-            rel: CONFIG.R.reader,
+            rel: [CONFIG.R.app, CONFIG.R.inline],
             template: "pinterest.widget",
             template_context: {
                 url: url,
diff --git a/plugins/domains/pinterest.com/pinterest.user.js b/plugins/domains/pinterest.com/pinterest.user.js
index e6df5fd23..dd613d8f6 100644
--- a/plugins/domains/pinterest.com/pinterest.user.js
+++ b/plugins/domains/pinterest.com/pinterest.user.js
@@ -1,41 +1,31 @@
-/************************
- Pinterest is not parser-friendly and we would violate
- their Acceptable Use Policy at http://about.pinterest.com/use/
- if we are to provide a proper embed plugin to their domain
- and thus enable you to violate the same policy.
-
- We can't let your network be blacklisted with Pinterest
- per https://en.help.pinterest.com/entries/22914692
-
- If you notice that their policy changed and we had not updated this plugin yet,
- give us a shout and we'll tweak it promptly.
- *************************/
 
 module.exports = {
 
     re: /^https?:\/\/(?:www\.)?pinterest\.com\/((?!pin)[a-z0-9]+)\/?(?:$|\?|#)/i,
 
-    getMeta: function() {
-        return {
-            title: "Pinterest User",
-            site: "Pinterest"
-        };
-    },
+    mixins: [
+        "og-image",
+        "favicon",
+        "canonical",
+        "og-description",
+        "og-site",
+        "og-title"
+    ],    
 
     getLink: function(url) {
         return {
             type: CONFIG.T.text_html,
-            rel: CONFIG.R.reader,
+            rel: [CONFIG.R.app, CONFIG.R.inline],
             template: "pinterest.widget",
             template_context: {
                 url: url,
                 title: "Pinterest User",
                 type: "embedUser",
-                width: 800,
+                width: 600,
                 height: 600,
                 pinWidth: 120
             },
-            width: 800,
+            width: 600,
             height: 600+120
         };
     },

From 040c7d12986440384df2ac122c556e77e55a8791 Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Thu, 15 May 2014 17:32:05 +0300
Subject: [PATCH 41/43] iframely.js bug fix; add more params

---
 static/js/iframely.js | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/static/js/iframely.js b/static/js/iframely.js
index c6aee4fbd..6a206a3a7 100644
--- a/static/js/iframely.js
+++ b/static/js/iframely.js
@@ -124,12 +124,15 @@
             url: $.iframely.defaults.endpoint,
             dataType: "json",
             data: {
-                uri: uri,
+                uri: !options.url ? uri : undefined,
+                url: options.url ? uri : undefined,
                 debug: options.debug,
                 mixAllWithDomainPlugin: options.mixAllWithDomainPlugin,
                 refresh: options.refresh,
                 meta: options.meta,
-                whitelist: options.whitelist
+                whitelist: options.whitelist,
+                api_key: options.api_key,
+                origin: options.origin
             },
             success: function(data, textStatus, jqXHR) {
                 cb(null, data, jqXHR);
@@ -586,7 +589,7 @@
         if (result && options.httpsFirst) {
             result.sort(function(a, b) {
                 var sa = isHttps(a.href);
-                var sb = isHttps(a.href);
+                var sb = isHttps(b.href);
                 if (sa == sb) {
                     return 0;
                 }
@@ -610,4 +613,4 @@
         return result;
     };
 
-})( jQuery );
+})( jQuery );
\ No newline at end of file

From 590e203c218bcd831d01dafdbc716d162d39287e Mon Sep 17 00:00:00 2001
From: Ivan Paramonau <i.paramonau@gmail.com>
Date: Thu, 15 May 2014 10:48:49 -0400
Subject: [PATCH 42/43] v 0.6.3 What's New

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

diff --git a/WHATSNEW.md b/WHATSNEW.md
index 44576c2ea..dabb3ac49 100644
--- a/WHATSNEW.md
+++ b/WHATSNEW.md
@@ -5,6 +5,36 @@ This is the history of the [Iframely Gateway](http://iframely.com/gateway) chang
 Stay tuned, either by watching [Iframely on GitHub](https://github.com/itteco/iframely) or following [Iframely on Twitter](https://twitter.com/iframely).
 
 
+### 2014.05.15, Version 0.6.3
+
+
+Big ones:
+
+ + added Twitter Stream parser (mp4 videos). It is now in whitelist also. [Get your domains whitelist here](http://iframely.com/qa).
+ * re-enable proper domain plugins for Pinterest (proper titles, thumbnails, etc)
+
+
+Domains maintenance: 
+
+ * Fixed Vube (they switched to iFrames. Yay.)
+ * White-list and properly handle all YouTube players in Twitter Cards
+ * Proper thumnnails for Tumblr articles
+ * Instagram videos no longer mistakenly return `rel=image`
+ * Switched to better (and more responsive) embeds for Vine
+ * Fixed Behance to support their new URL scheme
+ * Fixes for other domains plugins: Dribbble, Telly, Fiddler
+ * Handle more URLs for: Flickr (including videos and smaller images), CodePen, Someecards, Globe and Mail, Guardian
+ - Removed plugins: QiK (retired as of April 30) and EventBrite (embeds support is inconsistent)
+
+
+Tech matters:
+
+ * add received cookie jar to options to prevent some redirect loops
+ * better handle whitelist re-loads (at some times, whitelist records were lost in transition)
+ * return 415 http code in cases where the charset's encoding is not supported yet
+
+
+
 
 ### 2014.04.16, Version 0.6.2
 

From fbd52fc00d0ee283069e5bbcb7b2de8491ed3ead Mon Sep 17 00:00:00 2001
From: Nazar Leush <n.leush@gmail.com>
Date: Thu, 15 May 2014 19:09:02 +0300
Subject: [PATCH 43/43] update version to 0.6.3

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

diff --git a/package.json b/package.json
index 0b12152fd..db2311e32 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "iframely",
-    "version": "0.6.2",
+    "version": "0.6.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"],
diff --git a/static/js/iframely.js b/static/js/iframely.js
index 6a206a3a7..24615b290 100644
--- a/static/js/iframely.js
+++ b/static/js/iframely.js
@@ -4,7 +4,7 @@
 
      Iframely consumer client lib.
 
-     Versrion 0.6.2
+     Versrion 0.6.3
 
      Fetches and renders iframely oebmed/2 widgets.