Always throw on bad playabilityStatus if status != null, TVHTML5EMBED…

…DED's isEmbedded() should return true.
lavalink-devs · Sep 22, 2024 · f64f795 · f64f795
1 parent 9981e45
commit f64f795
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/common/src/main/java/dev/lavalink/youtube/clients/TvHtml5Embedded.java b/common/src/main/java/dev/lavalink/youtube/clients/TvHtml5Embedded.java
@@ -77,6 +77,11 @@ protected void extractPlaylistTracks(@NotNull JsonBrowser json,
         }
     }
 
+    @Override
+    public boolean isEmbedded() {
+        return true;
+    }
+
     @Override
     @NotNull
     public String getPlayerParams() {

diff --git a/common/src/main/java/dev/lavalink/youtube/clients/skeleton/NonMusicClient.java b/common/src/main/java/dev/lavalink/youtube/clients/skeleton/NonMusicClient.java
@@ -106,7 +106,8 @@ protected JsonBrowser loadTrackInfoFromInnertube(@NotNull YoutubeAudioSourceMana
 
         JsonBrowser json = loadJsonResponse(httpInterface, request, "player api response");
         JsonBrowser playabilityJson = json.get("playabilityStatus");
-        PlayabilityStatus playabilityStatus = getPlayabilityStatus(playabilityJson, false);
+        // fix: Make this method throw if a status was supplied (typically when we recurse).
+        PlayabilityStatus playabilityStatus = getPlayabilityStatus(playabilityJson, status != null);
 
         // All other branches should've been caught by getPlayabilityStatus().
         // An exception will be thrown if we can't handle it.