From d8e23d34b63b8f4f34da5c6b4bddf6eb46a3a828 Mon Sep 17 00:00:00 2001
From: ChunkyProgrammer <78101139+ChunkyProgrammer@users.noreply.github.com>
Date: Tue, 7 Mar 2023 11:38:09 -0500
Subject: [PATCH 1/4] add song title for music tracks

---
 locales/en-US.json                         |  1 +
 src/invidious/jsonify/api_v1/video_json.cr | 15 +++++++++++++++
 src/invidious/videos.cr                    |  2 +-
 src/invidious/videos/music.cr              |  3 ++-
 src/invidious/videos/parser.cr             |  5 ++++-
 src/invidious/views/watch.ecr              |  7 ++++---
 6 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/locales/en-US.json b/locales/en-US.json
index 86b83a23..65a81ab7 100644
--- a/locales/en-US.json
+++ b/locales/en-US.json
@@ -190,6 +190,7 @@
     "Blacklisted regions: ": "Blacklisted regions: ",
     "Music in this video": "Music in this video",
     "Artist: ": "Artist: ",
+    "Song: ": "Song: ",
     "Album: ": "Album: ",
     "Shared `x`": "Shared `x`",
     "Premieres in `x`": "Premieres in `x`",
diff --git a/src/invidious/jsonify/api_v1/video_json.cr b/src/invidious/jsonify/api_v1/video_json.cr
index a2b1a35c..fe4b5223 100644
--- a/src/invidious/jsonify/api_v1/video_json.cr
+++ b/src/invidious/jsonify/api_v1/video_json.cr
@@ -197,6 +197,21 @@ module Invidious::JSONify::APIv1
         end
       end
 
+      if !video.music.empty?
+        json.field "musicTracks" do
+          json.array do
+            video.music.each do |music|
+              json.object do
+                json.field "song", music.song
+                json.field "artist", music.artist
+                json.field "album", music.album
+                json.field "license", music.license
+              end
+            end
+          end
+        end
+      end
+
       json.field "recommendedVideos" do
         json.array do
           video.related_videos.each do |rv|
diff --git a/src/invidious/videos.cr b/src/invidious/videos.cr
index 436ac82d..86f5ada4 100644
--- a/src/invidious/videos.cr
+++ b/src/invidious/videos.cr
@@ -249,7 +249,7 @@ struct Video
 
   def music : Array(VideoMusic)
     info["music"].as_a.map { |music_json|
-      VideoMusic.new(music_json["album"].as_s, music_json["artist"].as_s, music_json["license"].as_s)
+      VideoMusic.new(music_json["song"].as_s, music_json["album"].as_s, music_json["artist"].as_s, music_json["license"].as_s)
     }
   end
 
diff --git a/src/invidious/videos/music.cr b/src/invidious/videos/music.cr
index 402ae46f..08d88a3e 100644
--- a/src/invidious/videos/music.cr
+++ b/src/invidious/videos/music.cr
@@ -3,10 +3,11 @@ require "json"
 struct VideoMusic
   include JSON::Serializable
 
+  property song : String
   property album : String
   property artist : String
   property license : String
 
-  def initialize(@album : String, @artist : String, @license : String)
+  def initialize(@song : String, @album : String, @artist : String, @license : String)
   end
 end
diff --git a/src/invidious/videos/parser.cr b/src/invidious/videos/parser.cr
index cf43f1be..1a8c25e4 100644
--- a/src/invidious/videos/parser.cr
+++ b/src/invidious/videos/parser.cr
@@ -322,6 +322,7 @@ def parse_video_info(video_id : String, player_response : Hash(String, JSON::Any
 
   music_desclist.try &.as_a.each do |music_desc|
     artist = nil
+    song = nil
     album = nil
     music_license = nil
 
@@ -329,13 +330,15 @@ def parse_video_info(video_id : String, player_response : Hash(String, JSON::Any
       desc_title = extract_text(desc.dig?("infoRowRenderer", "title"))
       if desc_title == "ARTIST"
         artist = extract_text(desc.dig?("infoRowRenderer", "defaultMetadata"))
+      elsif desc_title == "SONG"
+        song = extract_text(desc.dig?("infoRowRenderer", "defaultMetadata"))
       elsif desc_title == "ALBUM"
         album = extract_text(desc.dig?("infoRowRenderer", "defaultMetadata"))
       elsif desc_title == "LICENSES"
         music_license = extract_text(desc.dig?("infoRowRenderer", "expandedMetadata"))
       end
     end
-    music_list << VideoMusic.new(album.to_s, artist.to_s, music_license.to_s)
+    music_list << VideoMusic.new(song.to_s, album.to_s, artist.to_s, music_license.to_s)
   end
 
   # Author infos
diff --git a/src/invidious/views/watch.ecr b/src/invidious/views/watch.ecr
index 666eb3b0..01b30f7a 100644
--- a/src/invidious/views/watch.ecr
+++ b/src/invidious/views/watch.ecr
@@ -248,9 +248,10 @@ we're going to need to do it here in order to allow for translations.
                 <div id="music-description-box">
                     <% video.music.each do |music| %>
                         <div class="music-item">
-                            <p id="music-artist"><%= translate(locale, "Artist: ") %><%= music.artist %></p>
-                            <p id="music-album"><%= translate(locale, "Album: ") %><%= music.album %></p>
-                            <p id="music-license"><%= translate(locale, "License: ") %><%= music.license %></p>
+                            <p class="music-song"><%= translate(locale, "Song: ") %><%= music.song %></p>
+                            <p class="music-artist"><%= translate(locale, "Artist: ") %><%= music.artist %></p>
+                            <p class="music-album"><%= translate(locale, "Album: ") %><%= music.album %></p>
+                            <p class="music-license"><%= translate(locale, "License: ") %><%= music.license %></p>
                         </div>
                     <% end %>
                 </div>

From 742c951bc9fdc6eb1e5687104e67500fb778e0ea Mon Sep 17 00:00:00 2001
From: ChunkyProgrammer <78101139+ChunkyProgrammer@users.noreply.github.com>
Date: Tue, 7 Mar 2023 13:06:15 -0500
Subject: [PATCH 2/4] support videos with multiple songs

---
 src/invidious/videos/parser.cr | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/invidious/videos/parser.cr b/src/invidious/videos/parser.cr
index 1a8c25e4..722c90e8 100644
--- a/src/invidious/videos/parser.cr
+++ b/src/invidious/videos/parser.cr
@@ -322,10 +322,17 @@ def parse_video_info(video_id : String, player_response : Hash(String, JSON::Any
 
   music_desclist.try &.as_a.each do |music_desc|
     artist = nil
-    song = nil
     album = nil
     music_license = nil
 
+    # used when multiple songs
+    song = music_desc.dig?("carouselLockupRenderer", "videoLockup", "compactVideoRenderer", "title", "simpleText")
+
+    # used when multiple songs and the song has a link
+    if !song
+      song = music_desc.dig("carouselLockupRenderer", "videoLockup", "compactVideoRenderer", "title", "runs", 0, "text")
+    end
+
     music_desc.dig?("carouselLockupRenderer", "infoRows").try &.as_a.each do |desc|
       desc_title = extract_text(desc.dig?("infoRowRenderer", "title"))
       if desc_title == "ARTIST"

From e3081ef1a93973fe10ba8508ad31d257d641350e Mon Sep 17 00:00:00 2001
From: ChunkyProgrammer <78101139+ChunkyProgrammer@users.noreply.github.com>
Date: Tue, 7 Mar 2023 14:23:08 -0500
Subject: [PATCH 3/4] Apply style change suggestions

Co-authored-by: Samantaz Fox <coding@samantaz.fr>
---
 src/invidious/videos.cr        |  7 ++++++-
 src/invidious/videos/parser.cr | 10 ++++------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/invidious/videos.cr b/src/invidious/videos.cr
index 86f5ada4..0038a97a 100644
--- a/src/invidious/videos.cr
+++ b/src/invidious/videos.cr
@@ -249,7 +249,12 @@ struct Video
 
   def music : Array(VideoMusic)
     info["music"].as_a.map { |music_json|
-      VideoMusic.new(music_json["song"].as_s, music_json["album"].as_s, music_json["artist"].as_s, music_json["license"].as_s)
+      VideoMusic.new(
+        music_json["song"].as_s,
+        music_json["album"].as_s,
+        music_json["artist"].as_s,
+        music_json["license"].as_s
+      )
     }
   end
 
diff --git a/src/invidious/videos/parser.cr b/src/invidious/videos/parser.cr
index 722c90e8..7cfc7ea7 100644
--- a/src/invidious/videos/parser.cr
+++ b/src/invidious/videos/parser.cr
@@ -325,12 +325,10 @@ def parse_video_info(video_id : String, player_response : Hash(String, JSON::Any
     album = nil
     music_license = nil
 
-    # used when multiple songs
-    song = music_desc.dig?("carouselLockupRenderer", "videoLockup", "compactVideoRenderer", "title", "simpleText")
-
-    # used when multiple songs and the song has a link
-    if !song
-      song = music_desc.dig("carouselLockupRenderer", "videoLockup", "compactVideoRenderer", "title", "runs", 0, "text")
+    # Used when the video has multiple songs
+    if song_title = music_desc.dig?("carouselLockupRenderer", "videoLockup", "compactVideoRenderer", "title")
+      # "simpleText" for plain text / "runs" when song has a link
+      song = song_title["simpleText"]? || song_title.dig("runs", 0, "text")
     end
 
     music_desc.dig?("carouselLockupRenderer", "infoRows").try &.as_a.each do |desc|

From ffcc837c2adcb4faac104c08c32060a475730e2b Mon Sep 17 00:00:00 2001
From: ChunkyProgrammer <78101139+ChunkyProgrammer@users.noreply.github.com>
Date: Sun, 12 Mar 2023 18:50:01 -0400
Subject: [PATCH 4/4] remove music license

---
 src/invidious/views/watch.ecr | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/invidious/views/watch.ecr b/src/invidious/views/watch.ecr
index 01b30f7a..ce92a546 100644
--- a/src/invidious/views/watch.ecr
+++ b/src/invidious/views/watch.ecr
@@ -251,7 +251,6 @@ we're going to need to do it here in order to allow for translations.
                             <p class="music-song"><%= translate(locale, "Song: ") %><%= music.song %></p>
                             <p class="music-artist"><%= translate(locale, "Artist: ") %><%= music.artist %></p>
                             <p class="music-album"><%= translate(locale, "Album: ") %><%= music.album %></p>
-                            <p class="music-license"><%= translate(locale, "License: ") %><%= music.license %></p>
                         </div>
                     <% end %>
                 </div>