Possibly fix misdetections as livestreams

lavalink-devs · Sep 25, 2024 · e4ec766 · e4ec766
1 parent b3fde19
commit e4ec766
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 19 deletions.
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
@@ -350,12 +350,7 @@ public AudioItem loadVideo(@NotNull YoutubeAudioSourceManager source,
             author = "Unknown artist";
         }
 
-        TemporalInfo temporalInfo = TemporalInfo.fromRawData(
-            !playabilityStatus.get("liveStreamability").isNull(),
-            videoDetails.get("lengthSeconds"),
-            videoDetails.get("isLive").asBoolean(false)
-        );
-
+        TemporalInfo temporalInfo = TemporalInfo.fromRawData(playabilityStatus, videoDetails);
         return buildAudioTrack(source, videoDetails, title, author, temporalInfo.durationMillis, videoId, temporalInfo.isActiveStream);
     }
 

diff --git a/common/src/main/java/dev/lavalink/youtube/track/TemporalInfo.java b/common/src/main/java/dev/lavalink/youtube/track/TemporalInfo.java
@@ -15,22 +15,26 @@ private TemporalInfo(boolean isActiveStream, long durationMillis) {
         this.durationMillis = durationMillis;
     }
 
+    // normal video? but has liveStreamability: PRRBJOn_n-Y
+    // livestream: jfKfPfyJRdk
+
     @NotNull
-    public static TemporalInfo fromRawData(boolean hasLivestreamability, JsonBrowser durationSecondsField, boolean isLive) {
-        long durationValue = durationSecondsField.asLong(0L);
+    public static TemporalInfo fromRawData(JsonBrowser playabilityStatus, JsonBrowser videoDetails) {
+        JsonBrowser durationField = videoDetails.get("lengthSeconds");
+        long durationValue = durationField.asLong(0L);
+
+        boolean hasLivestreamability = !playabilityStatus.get("liveStreamability").isNull();
+        boolean isLive = videoDetails.get("isLive").asBoolean(false)
+            || videoDetails.get("isLiveContent").asBoolean(false);
 
         if (hasLivestreamability) {
             // Premieres have duration information, but act as a normal stream. When we play it, we don't know the
             // current position of it since YouTube doesn't provide such information, so assume duration is unknown.
             durationValue = 0;
         }
 
-        // VODs are not really live streams, even though the response JSON indicates that it is.
-        // If it is actually live, then duration is also missing or 0.
-        boolean isActiveStream = hasLivestreamability || isLive;
-
         return new TemporalInfo(
-            isActiveStream,
+            (isLive || hasLivestreamability) && durationValue == 0,
             durationValue == 0 ? DURATION_MS_UNKNOWN : Units.secondsToMillis(durationValue)
         );
     }

diff --git a/v2/build.gradle.kts b/v2/build.gradle.kts
@@ -14,6 +14,7 @@ base {
 dependencies {
     api(projects.common)
     compileOnly(libs.lavaplayer.v2)
+
     implementation(libs.rhino.engine)
     implementation(libs.nanojson)
     compileOnly(libs.slf4j)

diff --git a/v2/src/main/java/dev/lavalink/youtube/clients/skeleton/ThumbnailNonMusicClient.java b/v2/src/main/java/dev/lavalink/youtube/clients/skeleton/ThumbnailNonMusicClient.java
@@ -101,12 +101,7 @@ public AudioItem loadVideo(@NotNull YoutubeAudioSourceManager source,
             author = "Unknown artist";
         }
 
-        TemporalInfo temporalInfo = TemporalInfo.fromRawData(
-            !playabilityStatus.get("liveStreamability").isNull(),
-            videoDetails.get("lengthSeconds"),
-            false
-        );
-
+        TemporalInfo temporalInfo = TemporalInfo.fromRawData(playabilityStatus, videoDetails);
         String thumbnailUrl = ThumbnailTools.getYouTubeThumbnail(videoDetails, videoId);
 
         AudioTrackInfo info = new AudioTrackInfo(title, author, temporalInfo.durationMillis, videoId, temporalInfo.isActiveStream, WATCH_URL + videoId, thumbnailUrl, null);