Feature/detailed options review (#583)

* review vimeo

* refactor detailed options for Vimeo

* review youtube query options

* remove obsolete code for Vimeo

* fix typo

* vimeo: hide badge on showinfo

Author: iparamonau

lib/core.js

@@ -1436,18 +1436,6 @@
 
         const urlOptions = getQueryOptionsFromUrl(url);        
 
-        options.getQueryOptions = function() {
-            const requestOptions = getQueryOptionsFromEntries(new URLSearchParams(options.providerOptions || {}));
-            var query = !options.getProviderOptions('app.disable_url_options', false) 
-                        ? {...requestOptions, ...urlOptions}
-                        : {...requestOptions}
-            
-            if (query.autoplay && !query.mute && !query.muted) {
-                delete query.autoplay;
-            }
-            return query;
-        }        
-
         options.getProviderOptions = function(path, defaultValue) {
             registerProviderOptionsUsage(path);
 
@@ -1505,8 +1493,14 @@
                 }
             }
             return value;
-        }
+        };
 
+        options.digitize = function(params) {
+            return Object.keys(params).reduce((acc, k) => {
+                acc[k] = typeof params[k] === 'boolean' ? (params[k] ? 1 : 0) : params[k];
+                return acc;
+            }, {});
+        }
     }
 
     function callbackWithErrorCode(code, options, cb) {

plugins/domains/vimeo.com.js

@@ -25,17 +25,19 @@ export default {
     },
 
     getLink: function(oembed, options) {
-        var iframe = oembed.getIframe();
-        const query = options.getQueryOptions();
+        const iframe = oembed.getIframe();
 
-        var params = querystring.parse(options.getProviderOptions('vimeo.get_params', '').replace(/^\?/, ''));
-        if (query) {
-            params = {...params, ...query};
-        }
+        const get_params = querystring.parse(options.getProviderOptions('vimeo.get_params', '').replace(/^\?/, ''));
+        var providerOptions = options.getProviderOptions('_vimeo') || {};
+        delete providerOptions.showinfo;
+
+        const params = {...get_params, ...providerOptions};
 
-        if (options.getProviderOptions('players.showinfo', false)) {
-            params.title = 1;
-            params.byline = 1;
+        if (!options.getProviderOptions('_vimeo.showinfo', options.getProviderOptions('players.showinfo', true))) {
+            params.title = 0;
+            params.byline = 0;
+            params.portrait = 0;
+            params.badge = 0;
         }
 
         // Captions support:
@@ -45,10 +47,11 @@ export default {
             params.texttrack = texttrack;
         } else {
             texttrack = '';
+            delete params.texttrack;
         }
 
         // https://developer.vimeo.com/api/oembed/videos
-        var controls = options.getRequestOptions('vimeo.controls', params.controls);
+        var controls = options.getRequestOptions('_vimeo.controls', params.controls);
         if (controls == 0) {
             params.controls = false;
         } else if (params.controls) {
@@ -59,7 +62,7 @@ export default {
 
         if (oembed.thumbnail_url || !options.getProviderOptions('vimeo.disable_private', false)) {
             links.push({
-                href: iframe.replaceQuerystring(params),
+                href: iframe.replaceQuerystring(options.digitize(params)),
                 type: CONFIG.T.text_html,
                 rel: CONFIG.R.player,
                 "aspect-ratio": oembed.width / oembed.height, // ex. portrait https://vimeo.com/216098214
@@ -75,7 +78,7 @@ export default {
         }
 
         if (!oembed.thumbnail_url) {
-            links.push({message: 'Contact support to ' + (options.getProviderOptions('vimeo.disable_private', false) ? 'enable' : 'disable')+ ' Vimeos with site restrictions.'});
+            links.push({message: 'This Vimeo video has site restrictions.'});
         } else {
 
             var thumbnail = {

plugins/domains/youtube.com/youtube.video.js

@@ -158,7 +158,10 @@ export default {
 
     getLinks: function(url, youtube_video_gdata, options) {
 
-        var params = querystring.parse(options.getProviderOptions('youtube.get_params', '').replace(/^\?/, ''));
+        var get_params = querystring.parse(options.getProviderOptions('youtube.get_params', '').replace(/^\?/, ''));
+        var queryOptions = options.getProviderOptions('_youtube');
+
+        var params = {...get_params, ...queryOptions};
 
         /** Extract ?t=12m15s, ?t=123, ?start=123, ?stop=123, ?end=123
         */
@@ -204,7 +207,7 @@ export default {
         }
 
         // https://developers.google.com/youtube/player_parameters#cc_load_policy
-        var cc_load_policy = options.getRequestOptions('youtube.cc_load_policy', params.cc_load_policy);
+        var cc_load_policy = options.getRequestOptions('_youtube.cc_load_policy', options.getProviderOptions('youtube.cc_load_policy', params.cc_load_policy));
         if (cc_load_policy) {
             params.cc_load_policy = 1;
         } else if (params.cc_load_policy) {
@@ -272,7 +275,7 @@ export default {
 
         if (youtube_video_gdata.embeddable && youtube_video_gdata.ytRating !== 'ytAgeRestricted') {
 
-            var qs = querystring.stringify(params);
+            var qs = querystring.stringify(options.digitize(params));
             if (qs !== '') {qs = '?' + qs}
 
             var domain = /^https?:\/\/www\.youtube-nocookie\.com\//i.test(url) || options.getProviderOptions('youtube.nocookie', false) ? 'youtube-nocookie' : 'youtube';