From 1c3a4e710ba820f43208a75045c03d61e914359a Mon Sep 17 00:00:00 2001
From: wb9688 <wb9688@users.noreply.github.com>
Date: Wed, 26 Feb 2020 16:03:06 +0100
Subject: [PATCH] Check if there are no related streams in getAgeLimit()

---
 .../extractors/YoutubeStreamExtractor.java    | 25 +++++++------------
 1 file changed, 9 insertions(+), 16 deletions(-)

diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeStreamExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeStreamExtractor.java
index b5d03edcc..516dc1817 100644
--- a/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeStreamExtractor.java
+++ b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeStreamExtractor.java
@@ -100,8 +100,6 @@ public class YoutubeStreamExtractor extends StreamExtractor {
     @Nonnull
     private List<SubtitlesInfo> subtitlesInfos = new ArrayList<>();
 
-    private boolean isAgeRestricted;
-
     public YoutubeStreamExtractor(StreamingService service, LinkHandler linkHandler) {
         super(service, linkHandler);
     }
@@ -261,17 +259,14 @@ public class YoutubeStreamExtractor extends StreamExtractor {
     }
 
     @Override
-    public int getAgeLimit() throws ParsingException {
+    public int getAgeLimit() {
         assertPageFetched();
-        if (!isAgeRestricted) {
+        if (initialData.getObject("contents").getObject("twoColumnWatchNextResults")
+                .getObject("secondaryResults") == null) {
+            return 18;
+        } else {
             return NO_AGE_LIMIT;
         }
-        try {
-            return Integer.valueOf(doc.select("meta[property=\"og:restrictions:age\"]")
-                    .attr(CONTENT).replace("+", ""));
-        } catch (Exception e) {
-            throw new ParsingException("Could not get age restriction");
-        }
     }
 
     @Override
@@ -578,7 +573,7 @@ public class YoutubeStreamExtractor extends StreamExtractor {
     @Override
     public StreamInfoItem getNextStream() throws ExtractionException {
         assertPageFetched();
-        if (isAgeRestricted) {
+        if (getAgeLimit() == 18) {
             return null;
         }
         try {
@@ -599,7 +594,7 @@ public class YoutubeStreamExtractor extends StreamExtractor {
     @Override
     public StreamInfoItemsCollector getRelatedStreams() throws ExtractionException {
         assertPageFetched();
-        if (isAgeRestricted) {
+        if (getAgeLimit() == 18) {
             return null;
         }
         try {
@@ -678,18 +673,16 @@ public class YoutubeStreamExtractor extends StreamExtractor {
 
         final String playerUrl;
         // Check if the video is age restricted
-        if (!doc.select("meta[property=\"og:restrictions:age\"]").isEmpty()) {
+        if (getAgeLimit() == 18) {
             final EmbeddedInfo info = getEmbeddedInfo();
             final String videoInfoUrl = getVideoInfoUrl(getId(), info.sts);
             final String infoPageResponse = downloader.get(videoInfoUrl, getExtractorLocalization()).responseBody();
             videoInfoPage.putAll(Parser.compatParseMap(infoPageResponse));
             playerUrl = info.url;
-            isAgeRestricted = true;
         } else {
             final JsonObject ytPlayerConfig = getPlayerConfig();
             playerArgs = getPlayerArgs(ytPlayerConfig);
             playerUrl = getPlayerUrl(ytPlayerConfig);
-            isAgeRestricted = false;
         }
         playerResponse = getPlayerResponse();
         initialData = YoutubeParsingHelper.getInitialData(pageHtml);
@@ -869,7 +862,7 @@ public class YoutubeStreamExtractor extends StreamExtractor {
     @Nonnull
     private List<SubtitlesInfo> getAvailableSubtitlesInfo() {
         // If the video is age restricted getPlayerConfig will fail
-        if (isAgeRestricted) return Collections.emptyList();
+        if (getAgeLimit() == 18) return Collections.emptyList();
 
         final JsonObject captions;
         if (!playerResponse.has("captions")) {