diff --git a/src/invidious/routes/embed.cr b/src/invidious/routes/embed.cr index c63316f4f..26c9ba7f1 100644 --- a/src/invidious/routes/embed.cr +++ b/src/invidious/routes/embed.cr @@ -181,14 +181,14 @@ module Invidious::Routes::Embed captions = video.captions - preferred_captions = captions.select { |caption| + preferred_captions = captions.select do |caption| params.preferred_captions.includes?(caption.name) || params.preferred_captions.includes?(caption.language_code.split("-")[0]) - } - preferred_captions.sort_by! { |caption| + end + preferred_captions.sort_by! do |caption| (params.preferred_captions.index(caption.name) || params.preferred_captions.index(caption.language_code.split("-")[0])).not_nil! - } + end captions = captions - preferred_captions aspect_ratio = nil diff --git a/src/invidious/routes/watch.cr b/src/invidious/routes/watch.cr index 4c1815038..4575dae28 100644 --- a/src/invidious/routes/watch.cr +++ b/src/invidious/routes/watch.cr @@ -145,14 +145,14 @@ module Invidious::Routes::Watch captions = video.captions - preferred_captions = captions.select { |caption| + preferred_captions = captions.select do |caption| params.preferred_captions.includes?(caption.name) || params.preferred_captions.includes?(caption.language_code.split("-")[0]) - } - preferred_captions.sort_by! { |caption| + end + preferred_captions.sort_by! do |caption| (params.preferred_captions.index(caption.name) || params.preferred_captions.index(caption.language_code.split("-")[0])).not_nil! - } + end captions = captions - preferred_captions aspect_ratio = "16:9" diff --git a/src/invidious/videos.cr b/src/invidious/videos.cr index 4f07f4bbd..7081a7dd3 100644 --- a/src/invidious/videos.cr +++ b/src/invidious/videos.cr @@ -182,14 +182,14 @@ struct Video end def music : Array(VideoMusic) - info["music"].as_a.map { |music_json| + info["music"].as_a.map do |music_json| VideoMusic.new( music_json["song"].as_s, music_json["album"].as_s, music_json["artist"].as_s, music_json["license"].as_s ) - } + end end # Macros defining getters/setters for various types of data diff --git a/src/invidious/yt_backend/extractors.cr b/src/invidious/yt_backend/extractors.cr index d9f810166..22c184eee 100644 --- a/src/invidious/yt_backend/extractors.cr +++ b/src/invidious/yt_backend/extractors.cr @@ -673,9 +673,9 @@ private module Parsers video_count = thumbnail_view_model.dig("overlays").as_a .compact_map(&.dig?("thumbnailOverlayBadgeViewModel", "thumbnailBadges").try &.as_a) .flatten - .find(nil, &.dig?("thumbnailBadgeViewModel", "text").try { |node| + .find(nil, &.dig?("thumbnailBadgeViewModel", "text").try do |node| {"episodes", "videos"}.any? { |str| node.as_s.ends_with?(str) } - }) + end) .try &.dig("thumbnailBadgeViewModel", "text").as_s.to_i(strict: false) metadata = item_contents.dig("metadata", "lockupMetadataViewModel")