Separate live chat from comments extractor

Author: Ecomont

extractor/src/main/java/org/schabi/newpipe/extractor/comments/CommentsExtractor.java

@@ -31,6 +31,14 @@ public boolean isLiveChat() throws ExtractionException {
         return false;
     }
 
+    /**
+     * @apiNote Warning: This method is experimental and may get removed in a future release.
+     * Configures this extractor to fetch live chat messages using the given continuation.
+     */
+    public void setLiveChatContinuation(final String continuation) {
+        // no-op by default
+    }
+
     /**
      * @return the total number of comments
      */

extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeCommentsExtractor.java

@@ -65,7 +65,7 @@ public YoutubeCommentsExtractor(
     public InfoItemsPage<CommentsInfoItem> getInitialPage()
             throws IOException, ExtractionException {
 
-        if (commentsDisabled && liveChatContinuation != null) {
+        if (liveChatContinuation != null) {
             return fetchLiveChat(liveChatContinuation);
         }
 
@@ -209,8 +209,7 @@ private Page getNextPage(final String continuation) throws ParsingException {
     public InfoItemsPage<CommentsInfoItem> getPage(final Page page)
             throws IOException, ExtractionException {
 
-        if ("live_chat".equals(page.getUrl())
-                || (commentsDisabled && liveChatContinuation != null)) {
+        if ("live_chat".equals(page.getUrl()) || liveChatContinuation != null) {
             isLiveStream = true;
             return fetchLiveChat(page.getId());
         }
@@ -376,8 +375,6 @@ public void onFetchPage(@Nonnull final Downloader downloader)
         final String initialToken = findInitialCommentsToken(nextResponse);
 
         if (initialToken == null) {
-            // Try to extract live chat continuation for live streams
-            findLiveChatContinuation(nextResponse);
             return;
         }
 
@@ -393,24 +390,11 @@ public void onFetchPage(@Nonnull final Downloader downloader)
     }
 
     /**
-     * Tries to extract a live chat continuation token from the next response.
-     * This is used when regular comments are disabled on a live stream.
+     * Configures this extractor to fetch live chat messages.
      */
-    private void findLiveChatContinuation(final JsonObject nextResponse) {
-        try {
-            final JsonObject liveChatRenderer = nextResponse
-                    .getObject("contents")
-                    .getObject("twoColumnWatchNextResults")
-                    .getObject("conversationBar")
-                    .getObject("liveChatRenderer");
-            liveChatContinuation = liveChatRenderer
-                    .getArray("continuations")
-                    .getObject(0)
-                    .getObject("reloadContinuationData")
-                    .getString("continuation");
-        } catch (final Exception e) {
-            liveChatContinuation = null;
-        }
+    @Override
+    public void setLiveChatContinuation(final String continuation) {
+        this.liveChatContinuation = continuation;
     }
 
     /**

extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeStreamExtractor.java

@@ -879,6 +879,26 @@ public void onFetchPage(@Nonnull final Downloader downloader)
                         .done())
                 .getBytes(StandardCharsets.UTF_8);
         nextResponse = getJsonPostResponse(NEXT, nextBody, localization);
+
+        // Check for live chat availability
+        findLiveChatContinuation(nextResponse);
+    }
+
+    private void findLiveChatContinuation(final JsonObject response) {
+        try {
+            final JsonObject liveChatRenderer = response
+                    .getObject("contents")
+                    .getObject("twoColumnWatchNextResults")
+                    .getObject("conversationBar")
+                    .getObject("liveChatRenderer");
+            liveChatContinuation = liveChatRenderer
+                    .getArray("continuations")
+                    .getObject(0)
+                    .getObject("reloadContinuationData")
+                    .getString("continuation");
+        } catch (final Exception e) {
+            liveChatContinuation = null;
+        }
     }
 
     private static void checkPlayabilityStatus(@Nonnull final JsonObject playabilityStatus)

extractor/src/main/java/org/schabi/newpipe/extractor/stream/StreamExtractor.java

@@ -56,6 +56,22 @@ public StreamExtractor(final StreamingService service, final LinkHandler linkHan
         super(service, linkHandler);
     }
 
+    /**
+     * @return {@code true} if this stream has a live chat available
+     */
+    public boolean hasLiveChat() {
+        return liveChatContinuation != null;
+    }
+
+    /**
+     * @return the live chat continuation token, or {@code null} if not available
+     */
+    public String getLiveChatContinuation() {
+        return liveChatContinuation;
+    }
+
+    protected String liveChatContinuation = null;
+
     /**
      * The original textual date provided by the service. Should be used as a fallback if
      * {@link #getUploadDate()} isn't provided by the service, or it fails for some reason.

extractor/src/main/java/org/schabi/newpipe/extractor/stream/StreamInfo.java

@@ -353,6 +353,12 @@ private static void extractOptionalData(final StreamInfo streamInfo,
         } catch (final Exception e) {
             streamInfo.addError(e);
         }
+        try {
+            streamInfo.setLiveChat(extractor.hasLiveChat());
+            streamInfo.setLiveChatContinuation(extractor.getLiveChatContinuation());
+        } catch (final Exception e) {
+            streamInfo.addError(e);
+        }
 
         streamInfo.setRelatedItems(ExtractorHelper.getRelatedItemsOrLogError(streamInfo,
                 extractor));
@@ -406,6 +412,8 @@ private static void extractOptionalData(final StreamInfo streamInfo,
     private boolean shortFormContent = false;
     @Nonnull
     private ContentAvailability contentAvailability = ContentAvailability.AVAILABLE;
+    private boolean liveChat = false;
+    private String liveChatContinuation = null;
 
     /**
      * Preview frames, e.g. for the storyboard / seekbar thumbnail preview
@@ -761,4 +769,20 @@ public ContentAvailability getContentAvailability() {
     public void setContentAvailability(@Nonnull final ContentAvailability availability) {
         this.contentAvailability = availability;
     }
+
+    public boolean hasLiveChat() {
+        return liveChat;
+    }
+
+    public void setLiveChat(final boolean liveChat) {
+        this.liveChat = liveChat;
+    }
+
+    public String getLiveChatContinuation() {
+        return liveChatContinuation;
+    }
+
+    public void setLiveChatContinuation(final String liveChatContinuation) {
+        this.liveChatContinuation = liveChatContinuation;
+    }
 }