Merge b2f5b1eb68 into bad92093bf

assets/js/player.js

@@ -351,12 +351,7 @@ if (video_data.params.save_player_pos) {
     const rememberedTime = get_video_time();
     let lastUpdated = 0;
 
-    if(!hasTimeParam) {
-      if (rememberedTime >= video_data.length_seconds - 20)
-        set_seconds_after_start(0);
-      else
-        set_seconds_after_start(rememberedTime);
-    }
+    if(!hasTimeParam) set_seconds_after_start(rememberedTime);
 
     player.on('timeupdate', function () {
         const raw = player.currentTime();

spec/invidious/videos/regular_videos_extract_spec.cr

@@ -67,7 +67,7 @@ Spectator.describe "parse_video_info" do
     # Video metadata
 
     expect(info["genre"].as_s).to eq("Entertainment")
-    expect(info["genreUcid"].as_s?).to be_nil
+    expect(info["genreUcid"].as_s).to be_empty
     expect(info["license"].as_s).to be_empty
 
     # Author infos
@@ -151,7 +151,7 @@ Spectator.describe "parse_video_info" do
     # Video metadata
 
     expect(info["genre"].as_s).to eq("Music")
-    expect(info["genreUcid"].as_s?).to be_nil
+    expect(info["genreUcid"].as_s).to be_empty
     expect(info["license"].as_s).to be_empty
 
     # Author infos

spec/invidious/videos/scheduled_live_extract_spec.cr

@@ -94,7 +94,7 @@ Spectator.describe "parse_video_info" do
     # Video metadata
 
     expect(info["genre"].as_s).to eq("Entertainment")
-    expect(info["genreUcid"].as_s?).to be_nil
+    expect(info["genreUcid"].as_s).to be_empty
     expect(info["license"].as_s).to be_empty
 
     # Author infos

src/invidious/channels/about.cr

@@ -72,7 +72,6 @@ def get_about_info(ucid, locale) : AboutChannel
 
     # Raises a KeyError on failure.
     banners = initdata["header"]["c4TabbedHeaderRenderer"]?.try &.["banner"]?.try &.["thumbnails"]?
-    banners ||= initdata.dig?("header", "pageHeaderRenderer", "content", "pageHeaderViewModel", "banner", "imageBannerViewModel", "image", "sources")
     banner = banners.try &.[-1]?.try &.["url"].as_s?
 
     # if banner.includes? "channels/c4/default_banner"
@@ -148,17 +147,9 @@ def get_about_info(ucid, locale) : AboutChannel
     end
   end
 
-  sub_count = 0
-
-  if (metadata_rows = initdata.dig?("header", "pageHeaderRenderer", "content", "pageHeaderViewModel", "metadata", "contentMetadataViewModel", "metadataRows").try &.as_a)
-    metadata_rows.each do |row|
-      metadata_part = row.dig?("metadataParts").try &.as_a.find { |i| i.dig?("text", "content").try &.as_s.includes?("subscribers") }
-      if !metadata_part.nil?
-        sub_count = short_text_to_number(metadata_part.dig("text", "content").as_s.split(" ")[0]).to_i32
-      end
-      break if sub_count != 0
-    end
-  end
+  sub_count = initdata
+    .dig?("header", "c4TabbedHeaderRenderer", "subscriberCountText", "simpleText").try &.as_s?
+    .try { |text| short_text_to_number(text.split(" ")[0]).to_i32 } || 0
 
   AboutChannel.new(
     ucid: ucid,

src/invidious/http_server/utils.cr

@@ -11,12 +11,11 @@ module Invidious::HttpServer
       params = url.query_params
       params["host"] = url.host.not_nil! # Should never be nil, in theory
       params["region"] = region if !region.nil?
-      url.query_params = params
 
       if absolute
-        return "#{HOST_URL}#{url.request_target}"
+        return "#{HOST_URL}#{url.request_target}?#{params}"
       else
-        return url.request_target
+        return "#{url.request_target}?#{params}"
       end
     end
 

src/invidious/jsonify/api_v1/video_json.cr

@@ -114,31 +114,25 @@ module Invidious::JSONify::APIv1
 
               json.field "projectionType", fmt["projectionType"]
 
-              height = fmt["height"]?.try &.as_i
-              width = fmt["width"]?.try &.as_i
-
-              fps = fmt["fps"]?.try &.as_i
-
-              if fps
-                json.field "fps", fps
-              end
-
-              if height && width
-                json.field "size", "#{width}x#{height}"
-                json.field "resolution", "#{height}p"
-
-                quality_label = "#{width > height ? height : width}p"
-
-                if fps && fps > 30
-                  quality_label += fps.to_s
-                end
-
-                json.field "qualityLabel", quality_label
-              end
-
               if fmt_info = Invidious::Videos::Formats.itag_to_metadata?(fmt["itag"])
+                fps = fmt_info["fps"]?.try &.to_i || fmt["fps"]?.try &.as_i || 30
+                json.field "fps", fps
                 json.field "container", fmt_info["ext"]
                 json.field "encoding", fmt_info["vcodec"]? || fmt_info["acodec"]
+
+                if fmt_info["height"]?
+                  json.field "resolution", "#{fmt_info["height"]}p"
+
+                  quality_label = "#{fmt_info["height"]}p"
+                  if fps > 30
+                    quality_label += "60"
+                  end
+                  json.field "qualityLabel", quality_label
+
+                  if fmt_info["width"]?
+                    json.field "size", "#{fmt_info["width"]}x#{fmt_info["height"]}"
+                  end
+                end
               end
 
               # Livestream chunk infos
@@ -169,31 +163,26 @@ module Invidious::JSONify::APIv1
 
               json.field "bitrate", fmt["bitrate"].as_i.to_s if fmt["bitrate"]?
 
-              height = fmt["height"]?.try &.as_i
-              width = fmt["width"]?.try &.as_i
-
-              fps = fmt["fps"]?.try &.as_i
-
-              if fps
+              fmt_info = Invidious::Videos::Formats.itag_to_metadata?(fmt["itag"])
+              if fmt_info
+                fps = fmt_info["fps"]?.try &.to_i || fmt["fps"]?.try &.as_i || 30
                 json.field "fps", fps
-              end
-
-              if height && width
-                json.field "size", "#{width}x#{height}"
-                json.field "resolution", "#{height}p"
-
-                quality_label = "#{width > height ? height : width}p"
-
-                if fps && fps > 30
-                  quality_label += fps.to_s
-                end
-
-                json.field "qualityLabel", quality_label
-              end
-
-              if fmt_info = Invidious::Videos::Formats.itag_to_metadata?(fmt["itag"])
                 json.field "container", fmt_info["ext"]
                 json.field "encoding", fmt_info["vcodec"]? || fmt_info["acodec"]
+
+                if fmt_info["height"]?
+                  json.field "resolution", "#{fmt_info["height"]}p"
+
+                  quality_label = "#{fmt_info["height"]}p"
+                  if fps > 30
+                    quality_label += "60"
+                  end
+                  json.field "qualityLabel", quality_label
+
+                  if fmt_info["width"]?
+                    json.field "size", "#{fmt_info["width"]}x#{fmt_info["height"]}"
+                  end
+                end
               end
             end
           end

src/invidious/playlists.cr

@@ -366,8 +366,6 @@ def fetch_playlist(plid : String)
 
     if text.includes? "video"
       video_count = text.gsub(/\D/, "").to_i? || 0
-    elsif text.includes? "episode"
-      video_count = text.gsub(/\D/, "").to_i? || 0
     elsif text.includes? "view"
       views = text.gsub(/\D/, "").to_i64? || 0_i64
     else

src/invidious/routes/api/v1/misc.cr

@@ -74,9 +74,7 @@ module Invidious::Routes::API::V1::Misc
       response = playlist.to_json(offset, video_id: video_id)
       json_response = JSON.parse(response)
 
-      if json_response["videos"].as_a.empty?
-        json_response = JSON.parse(response)
-      elsif json_response["videos"].as_a[0]["index"] != offset
+      if json_response["videos"].as_a[0]["index"] != offset
         offset = json_response["videos"].as_a[0]["index"].as_i
         lookback = offset < 50 ? offset : 50
         response = playlist.to_json(offset - lookback)

src/invidious/routes/api/v1/videos.cr

@@ -141,11 +141,7 @@ module Invidious::Routes::API::V1::Videos
           end
         end
       else
-        uri = URI.parse(url)
-        query_params = uri.query_params
-        query_params["fmt"] = "vtt"
-        uri.query_params = query_params
-        webvtt = YT_POOL.client &.get(uri.request_target).body
+        webvtt = YT_POOL.client &.get("#{url}&fmt=vtt").body
 
         if webvtt.starts_with?("<?xml")
           webvtt = caption.timedtext_to_vtt(webvtt)

src/invidious/routes/preferences.cr

@@ -214,7 +214,7 @@ module Invidious::Routes::PreferencesRoute
         statistics_enabled ||= "off"
         CONFIG.statistics_enabled = statistics_enabled == "on"
 
-        CONFIG.modified_source_code_url = env.params.body["modified_source_code_url"]?.presence
+        CONFIG.modified_source_code_url = env.params.body["modified_source_code_url"]?.try &.as(String)
 
         File.write("config/config.yml", CONFIG.to_yaml)
       end

src/invidious/videos.cr

@@ -250,7 +250,7 @@ struct Video
   end
 
   def genre_url : String?
-    info["genreUcid"].try &.as_s? ? "/channel/#{info["genreUcid"]}" : nil
+    info["genreUcid"]? ? "/channel/#{info["genreUcid"]}" : nil
   end
 
   def is_vr : Bool?

src/invidious/videos/parser.cr

@@ -424,7 +424,7 @@ def parse_video_info(video_id : String, player_response : Hash(String, JSON::Any
     "shortDescription" => JSON::Any.new(short_description.try &.as_s || nil),
     # Video metadata
     "genre"     => JSON::Any.new(genre.try &.as_s || ""),
-    "genreUcid" => JSON::Any.new(genre_ucid.try &.as_s?),
+    "genreUcid" => JSON::Any.new(genre_ucid.try &.as_s || ""),
     "license"   => JSON::Any.new(license.try &.as_s || ""),
     # Music section
     "music" => JSON.parse(music_list.to_json),

src/invidious/views/user/preferences.ecr

@@ -310,7 +310,7 @@
 
                 <div class="pure-control-group">
                     <label for="modified_source_code_url"><%= translate(locale, "adminprefs_modified_source_code_url_label") %></label>
-                    <input name="modified_source_code_url" id="modified_source_code_url" type="url" value="<%= CONFIG.modified_source_code_url %>">
+                    <input name="modified_source_code_url" id="modified_source_code_url" type="input" <% if CONFIG.modified_source_code_url %>checked<% end %>>
                 </div>
             <% end %>