Merge branch 'iv-org:master' into master

README.md

@@ -149,7 +149,7 @@ Weblate also allows you to log-in with major SSO providers like Github, Gitlab,
 - [CloudTube](https://sr.ht/~cadence/tube/): A JavaScript-rich alternate YouTube player.
 - [PeerTubeify](https://gitlab.com/Cha_de_L/peertubeify): On YouTube, displays a link to the same video on PeerTube, if it exists.
 - [MusicPiped](https://github.com/deep-gaurav/MusicPiped): A material design music player that streams music from YouTube.
-- [HoloPlay](https://github.com/stephane-r/HoloPlay): Funny Android application connecting on Invidious API's with search, playlists and favorites.
+- [HoloPlay](https://github.com/stephane-r/holoplay-wa): Progressive Web App connecting on Invidious API's with search, playlists and favorites.
 - [WatchTube](https://github.com/WatchTubeTeam/WatchTube): Powerful YouTube client for Apple Watch.
 - [Yattee](https://github.com/yattee/yattee): Alternative YouTube frontend for iPhone, iPad, Mac and Apple TV.
 - [TubiTui](https://codeberg.org/777/TubiTui): A lightweight, libre, TUI-based YouTube client.

assets/css/default.css

@@ -583,3 +583,7 @@ p,
 
 /* Wider settings name to less word wrap */
 .pure-form-aligned .pure-control-group label { width: 19em; }
+
+.channel-emoji {
+  margin: 0 2px;
+}

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`",
@@ -405,6 +406,7 @@
     "YouTube comment permalink": "YouTube comment permalink",
     "permalink": "permalink",
     "`x` marked it with a ❤": "`x` marked it with a ❤",
+    "Channel Sponsor": "Channel Sponsor",
     "Audio mode": "Audio mode",
     "Video mode": "Video mode",
     "Playlists": "Playlists",

src/invidious/channels/community.cr

@@ -1,3 +1,5 @@
+private IMAGE_QUALITIES = {320, 560, 640, 1280, 2000}
+
 # TODO: Add "sort_by"
 def fetch_channel_community(ucid, continuation, locale, format, thin_mode)
   response = YT_POOL.client &.get("/channel/#{ucid}/community?gl=US&hl=en")
@@ -108,6 +110,8 @@ def fetch_channel_community(ucid, continuation, locale, format, thin_mode)
               like_count = post["actionButtons"]["commentActionButtonsRenderer"]["likeButton"]["toggleButtonRenderer"]["accessibilityData"]["accessibilityData"]["label"]
                 .try &.as_s.gsub(/\D/, "").to_i? || 0
 
+              reply_count = short_text_to_number(post.dig?("actionButtons", "commentActionButtonsRenderer", "replyButton", "buttonRenderer", "text", "simpleText").try &.as_s || "0")
+
               json.field "content", html_to_content(content_html)
               json.field "contentHtml", content_html
 
@@ -115,6 +119,7 @@ def fetch_channel_community(ucid, continuation, locale, format, thin_mode)
               json.field "publishedText", translate(locale, "`x` ago", recode_date(published, locale))
 
               json.field "likeCount", like_count
+              json.field "replyCount", reply_count
               json.field "commentId", post["postId"]? || post["commentId"]? || ""
               json.field "authorIsChannelOwner", post["authorEndpoint"]["browseEndpoint"]["browseId"] == ucid
 
@@ -174,9 +179,7 @@ def fetch_channel_community(ucid, continuation, locale, format, thin_mode)
                           aspect_ratio = (width.to_f / height.to_f)
                           url = thumbnail["url"].as_s.gsub(/=w\d+-h\d+(-p)?(-nd)?(-df)?(-rwa)?/, "=s640")
 
-                          qualities = {320, 560, 640, 1280, 2000}
-
-                          qualities.each do |quality|
+                          IMAGE_QUALITIES.each do |quality|
                             json.object do
                               json.field "url", url.gsub(/=s\d+/, "=s#{quality}")
                               json.field "width", quality
@@ -185,10 +188,39 @@ def fetch_channel_community(ucid, continuation, locale, format, thin_mode)
                           end
                         end
                       end
-                      # TODO
-                      # when .has_key?("pollRenderer")
-                      #   attachment = attachment["pollRenderer"]
-                      #   json.field "type", "poll"
+                    when .has_key?("pollRenderer")
+                      attachment = attachment["pollRenderer"]
+                      json.field "type", "poll"
+                      json.field "totalVotes", short_text_to_number(attachment["totalVotes"]["simpleText"].as_s.split(" ")[0])
+                      json.field "choices" do
+                        json.array do
+                          attachment["choices"].as_a.each do |choice|
+                            json.object do
+                              json.field "text", choice.dig("text", "runs", 0, "text").as_s
+                              # A choice can have an image associated with it.
+                              # Ex post: https://www.youtube.com/post/UgkxD4XavXUD4NQiddJXXdohbwOwcVqrH9Re
+                              if choice["image"]?
+                                thumbnail = choice["image"]["thumbnails"][0].as_h
+                                width = thumbnail["width"].as_i
+                                height = thumbnail["height"].as_i
+                                aspect_ratio = (width.to_f / height.to_f)
+                                url = thumbnail["url"].as_s.gsub(/=w\d+-h\d+(-p)?(-nd)?(-df)?(-rwa)?/, "=s640")
+                                json.field "image" do
+                                  json.array do
+                                    IMAGE_QUALITIES.each do |quality|
+                                      json.object do
+                                        json.field "url", url.gsub(/=s\d+/, "=s#{quality}")
+                                        json.field "width", quality
+                                        json.field "height", (quality / aspect_ratio).ceil.to_i
+                                      end
+                                    end
+                                  end
+                                end
+                              end
+                            end
+                          end
+                        end
+                      end
                     when .has_key?("postMultiImageRenderer")
                       attachment = attachment["postMultiImageRenderer"]
                       json.field "type", "multiImage"
@@ -202,9 +234,7 @@ def fetch_channel_community(ucid, continuation, locale, format, thin_mode)
                               aspect_ratio = (width.to_f / height.to_f)
                               url = thumbnail["url"].as_s.gsub(/=w\d+-h\d+(-p)?(-nd)?(-df)?(-rwa)?/, "=s640")
 
-                              qualities = {320, 560, 640, 1280, 2000}
-
-                              qualities.each do |quality|
+                              IMAGE_QUALITIES.each do |quality|
                                 json.object do
                                   json.field "url", url.gsub(/=s\d+/, "=s#{quality}")
                                   json.field "width", quality

src/invidious/comments.cr

@@ -182,7 +182,11 @@ def fetch_youtube_comments(id, cursor, format, locale, thin_mode, region, sort_b
               json.field "contentHtml", content_html
 
               json.field "isPinned", (node_comment["pinnedCommentBadge"]? != nil)
-
+              json.field "isSponsor", (node_comment["sponsorCommentBadge"]? != nil)
+              if node_comment["sponsorCommentBadge"]?
+                # Sponsor icon thumbnails always have one object and there's only ever the url property in it
+                json.field "sponsorIconUrl", node_comment.dig("sponsorCommentBadge", "sponsorCommentBadgeRenderer", "customBadge", "thumbnails", 0, "url").to_s
+              end
               json.field "published", published.to_unix
               json.field "publishedText", translate(locale, "`x` ago", recode_date(published, locale))
 
@@ -324,11 +328,21 @@ def template_youtube_comments(comments, locale, thin_mode, is_replies = false)
       end
 
       author_name = HTML.escape(child["author"].as_s)
+      sponsor_icon = ""
       if child["verified"]?.try &.as_bool && child["authorIsChannelOwner"]?.try &.as_bool
         author_name += "&nbsp;<i class=\"icon ion ion-md-checkmark-circle\"></i>"
       elsif child["verified"]?.try &.as_bool
         author_name += "&nbsp;<i class=\"icon ion ion-md-checkmark\"></i>"
       end
+
+      if child["isSponsor"]?.try &.as_bool
+        sponsor_icon = String.build do |str|
+          str << %(<img alt="" )
+          str << %(src="/ggpht) << URI.parse(child["sponsorIconUrl"].as_s).request_target << "\" "
+          str << %(title=") << translate(locale, "Channel Sponsor") << "\" "
+          str << %(width="16" height="16" />)
+        end
+      end
       html << <<-END_HTML
       <div class="pure-g" style="width:100%">
         <div class="channel-profile pure-u-4-24 pure-u-md-2-24">
@@ -339,6 +353,7 @@ def template_youtube_comments(comments, locale, thin_mode, is_replies = false)
             <b>
               <a class="#{child["authorIsChannelOwner"] == true ? "channel-owner" : ""}" href="#{child["authorUrl"]}">#{author_name}</a>
             </b>
+            #{sponsor_icon}
             <p style="white-space:pre-wrap">#{child["contentHtml"]}</p>
       END_HTML
 
@@ -675,6 +690,27 @@ def content_to_comment_html(content, video_id : String? = "")
     text = "<s>#{text}</s>" if run["strikethrough"]?
     text = "<i>#{text}</i>" 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 << %(<img alt=") << emojiAlt << "\" "
+            str << %(src="/ggpht) << URI.parse(emojiThumb["url"].as_s).request_target << "\" "
+            str << %(title=") << emojiAlt << "\" "
+            str << %(width=") << emojiThumb["width"] << "\" "
+            str << %(height=") << emojiThumb["height"] << "\" "
+            str << %(class="channel-emoji"/>)
+          end
+        else
+          # Hide deleted channel emoji
+          text = ""
+        end
+      end
+    end
+
     text
   end
 

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|

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

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
 

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

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

src/invidious/views/watch.ecr

@@ -248,9 +248,9 @@ 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>
                         </div>
                     <% end %>
                 </div>