fix: properly check if video is age restricted

fent · Nov 16, 2020 · d3a5a69 · d3a5a69
1 parent ea63582
commit d3a5a69
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/lib/info.js b/lib/info.js
@@ -122,7 +122,7 @@ const pipeline = async(args, retryOptions, isValid, endpoints) => {
   let info;
   for (let func of endpoints) {
     try {
-      const newInfo = await retryFunc(func, args, retryOptions);
+      const newInfo = await retryFunc(func, args.concat([info]), retryOptions);
       if (newInfo.player_response) {
         newInfo.player_response.videoDetails = assign(
           info && info.player_response && info.player_response.videoDetails,
@@ -270,7 +270,7 @@ const getJSONWatchPage = async(id, options) => {
  */
 const EMBED_URL = 'https://www.youtube.com/embed/';
 const getEmbedURL = (id, options) => `${EMBED_URL + id}?hl=${options.lang || 'en'}`;
-const getEmbedPage = async(id, options) => {
+const getEmbedPage = async(id, options, watchPageInfo) => {
   const embedUrl = getEmbedURL(id, options);
   let body = await miniget(embedUrl, options.requestOptions).text();
   let jsonStr = utils.between(body, /(['"])PLAYER_(CONFIG|VARS)\1:\s?/, '</script>');
@@ -280,7 +280,9 @@ const getEmbedPage = async(id, options) => {
   let config = parseJSON('embed config', utils.cutAfterJSON(jsonStr));
   let info = config.args || config;
   info.player_response = findPlayerResponse('embed `player_response`', info);
-  info.player_response.videoDetails = Object.assign({}, info.player_response.videoDetails, { age_restricted: true });
+  info.player_response.videoDetails = Object.assign({}, info.player_response.videoDetails, {
+    age_restricted: watchPageInfo && !!utils.playError(watchPageInfo.player_response, ['LOGIN_REQUIRED']),
+  });
   info.html5player = getHTML5player(body);
   return info;
 };

diff --git a/test/info-test.js b/test/info-test.js
@@ -409,6 +409,7 @@ describe('ytdl.getInfo()', () => {
           assert.ok(info.html5player);
           assert.ok(info.formats.length);
           assert.ok(info.formats[0].url);
+          assert.ok(!info.videoDetails.age_restricted);
         });
       });
     });
@@ -441,6 +442,7 @@ describe('ytdl.getInfo()', () => {
           assert.ok(info.html5player);
           assert.ok(info.formats.length);
           assert.ok(info.formats[0].url);
+          assert.ok(!info.videoDetails.age_restricted);
         });
       });
     });