Merge branch 'dev'

Author: nleush

lib/plugins/system/oembed/providers.json

@@ -1145,9 +1145,10 @@
     {
         "name": "Everviz",
         "templates": [
-            "app.everviz.com/show/([a-zA-Z0-9])+",
-            "app.everviz.com/embed/([a-zA-Z0-9])+"
+            "app.everviz.com/show/([a-zA-Z0-9_\\-]+)",
+            "app.everviz.com/embed/([a-zA-Z0-9_\\-]+)"
         ],
-        "endpoint": "https://api.everviz.com/oembed"
+        "endpoint": "https://api.everviz.com/oembed",
+        "url": "https://app.everviz.com/embed/{1}/"
     }
 ]

plugins/domains/500px/500px.com.js

@@ -4,18 +4,26 @@ export default {
 
     mixins: ["*"],
 
-    getLinks: function(urlMatch, twitter) {
-        if (twitter.card === 'photo' && twitter.image) {
-            return {
-                template_context: {
-                    title: twitter.title + ' | ' + twitter.site,
-                    img_src: twitter.image.src,
-                    id: urlMatch[1]
-                },
-                type: CONFIG.T.text_html,
-                rel: [CONFIG.R.image, CONFIG.R.ssl, CONFIG.R.inline],
-                "aspect-ratio": twitter.image.height ? twitter.image.width / twitter.image.height : null
-            }
+    getLinks: function(urlMatch, twitter, utils, options, cb) {
+        if (twitter.image) {
+            utils.getImageMetadata(twitter.image, options, function(error, data) {
+                if (data.width && data.height) {
+                    return cb(null, {
+                        template_context: {
+                            title: twitter.title + ' | ' + twitter.site,
+                            img_src: twitter.image,
+                            id: urlMatch[1]
+                        },
+                        type: CONFIG.T.text_html,
+                        rel: [CONFIG.R.image, CONFIG.R.ssl, CONFIG.R.inline],
+                        "aspect-ratio": data.width / data.height
+                    })
+                } else {
+                    return cb();
+                }
+            });
+        } else {
+            return cb();
         }
     },
 

plugins/domains/dailymotion.com/dailymotion.com.js

@@ -10,22 +10,22 @@ export default {
         "oembed-thumbnail",
         "domain-icon",
         "og-description",
+        "og-image",
         "canonical",
         "oembed-iframe",
         "video"
     ],
 
     getLink: function (url, iframe, options) {
-        var playlistParams = querystring.parse(options.getProviderOptions('dailymotion.get_params', '').replace(/^\?/, ''));
+        var playlistParams = querystring.parse(options.getProviderOptions('dailymotion.get_params', 'mute=true').replace(/^\?/, ''));
 
         if (iframe.src && iframe.height) {
             var player = {
                 href: iframe.replaceQuerystring(playlistParams),
                 type: CONFIG.T.text_html,
                 "rel": [CONFIG.R.player, CONFIG.R.oembed],
                 "aspect-ratio": iframe.width / iframe.height,
-                scrolling: 'no',
-                autoplay: "autoplay=1"
+                autoplay: "mute=false"
             };
 
             // Do not replace direct link to custom players
@@ -70,7 +70,7 @@ export default {
 
         }
     }, {
-        skipMixins: ["video", "og-description", "canonical"],
+        skipMixins: ["video", "og-description", "og-image", "canonical"],
         skipMethods: ["getData"]
     },
         "https://www.dailymotion.com/video/x10bix2_ircam-mani-feste-2013-du-29-mai-au-30-juin-2013_creation#.Uaac62TF1XV",

plugins/domains/dailymotion.com/dailymotion.playlist.js

@@ -1,34 +1,23 @@
 export default {
-    /**
-     * Endpoint `http://www.dailymotion.com/services/oembed`
-     * does not provide oembed results for playlist url currently
-     */
 
+    // Canonical playlists are covered by oEmbed `http://www.dailymotion.com/services/oembed`
     re: [
-        /^https?:\/\/www\.dailymotion\.com\/playlist\//i,
-        /^https?:\/\/www\.dailymotion\.com\/embed\/playlist\//i,
+        /^https?:\/\/www\.dailymotion\.com\/embed\/playlist\/([a-zA-Z0-9]+)(?:\?.+)?$/i,
+        /^https?:\/\/geo\.dailymotion\.com\/player.html\?playlist=([a-zA-Z0-9]+)(?:&.+)?$/i,
     ],
 
-    mixins: [
-        "*"
-    ],
-
-    getLink: function (url) {
-        var playlistUrl = url;
-        if (url.includes('playlist') && !url.includes('embed/playlist')) {
-            playlistUrl = url.replace('playlist', 'embed/playlist')
-        }
-        return {
-            href: playlistUrl,
-            type: CONFIG.T.text_html,
-            rel: [CONFIG.R.player, CONFIG.R.iframely]
-        };
+    getData: function(urlMatch, cb, options) {
+        cb(!options.redirectsHistory
+            ? {
+                redirect: `https://www.dailymotion.com/playlist/${urlMatch[1]}`
+            } : null);
     },
 
     tests: [{
         noFeeds: true
     },
-        "https://www.dailymotion.com/playlist/x6hynp",
-        "https://www.dailymotion.com/embed/playlist/x6hynp"
+        // "https://www.dailymotion.com/playlist/x6hynp",
+        "https://www.dailymotion.com/embed/playlist/x6hynp",
+        "https://geo.dailymotion.com/player.html?playlist=x6hynp"
     ]
 };