@@ -339,6 +353,7 @@ def template_youtube_comments(comments, locale, thin_mode, is_replies = false)
#{author_name}
+ #{sponsor_icon}
#{text}" if run["strikethrough"]?
text = "#{text}" if run["italics"]?
+ # check for custom emojis
+ if run["emoji"]?
+ if run["emoji"]["isCustomEmoji"]?.try &.as_bool
+ if emojiImage = run.dig?("emoji", "image")
+ emojiAlt = emojiImage.dig?("accessibility", "accessibilityData", "label").try &.as_s || text
+ emojiThumb = emojiImage["thumbnails"][0]
+ text = String.build do |str|
+ str << %(![) << emojiAlt <<]()
)
+ end
+ else
+ # Hide deleted channel emoji
+ text = ""
+ end
+ end
+ end
+
text
end
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/routes/video_playback.cr b/src/invidious/routes/video_playback.cr
index 1e932d11..9641e01a 100644
--- a/src/invidious/routes/video_playback.cr
+++ b/src/invidious/routes/video_playback.cr
@@ -256,7 +256,7 @@ module Invidious::Routes::VideoPlayback
return error_template(400, "Invalid video ID")
end
- if itag.nil? || itag <= 0 || itag >= 1000
+ if !itag.nil? && (itag <= 0 || itag >= 1000)
return error_template(400, "Invalid itag")
end
@@ -277,7 +277,11 @@ module Invidious::Routes::VideoPlayback
return error_template(500, ex)
end
- fmt = video.fmt_stream.find(nil) { |f| f["itag"].as_i == itag } || video.adaptive_fmts.find(nil) { |f| f["itag"].as_i == itag }
+ if itag.nil?
+ fmt = video.fmt_stream[-1]?
+ else
+ fmt = video.fmt_stream.find(nil) { |f| f["itag"].as_i == itag } || video.adaptive_fmts.find(nil) { |f| f["itag"].as_i == itag }
+ end
url = fmt.try &.["url"]?.try &.as_s
if !url
diff --git a/src/invidious/videos.cr b/src/invidious/videos.cr
index 436ac82d..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["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..7cfc7ea7 100644
--- a/src/invidious/videos/parser.cr
+++ b/src/invidious/videos/parser.cr
@@ -325,17 +325,25 @@ def parse_video_info(video_id : String, player_response : Hash(String, JSON::Any
album = nil
music_license = nil
+ # 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|
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 3133ca40..71115257 100644
--- a/src/invidious/views/watch.ecr
+++ b/src/invidious/views/watch.ecr
@@ -248,9 +248,9 @@ we're going to need to do it here in order to allow for translations.
#{child["contentHtml"]}
END_HTML @@ -675,6 +690,27 @@ def content_to_comment_html(content, video_id : String? = "") text = "
<% video.music.each do |music| %>
-
<% end %>
<%= translate(locale, "Artist: ") %><%= music.artist %>
-<%= translate(locale, "Album: ") %><%= music.album %>
-<%= translate(locale, "License: ") %><%= music.license %>
+<%= translate(locale, "Song: ") %><%= music.song %>
+<%= translate(locale, "Artist: ") %><%= music.artist %>
+<%= translate(locale, "Album: ") %><%= music.album %>