Merge pull request #3627 from iBicha/feature/latest-version-optional-itag

Co-authored-by: Samantaz Fox <coding@samantaz.fr>
This commit is contained in:
Émilien Devos (perso) 2023-03-15 20:07:06 +01:00 committed by GitHub
commit a6d21cb211
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -256,7 +256,7 @@ module Invidious::Routes::VideoPlayback
return error_template(400, "Invalid video ID") return error_template(400, "Invalid video ID")
end end
if itag.nil? || itag <= 0 || itag >= 1000 if !itag.nil? && (itag <= 0 || itag >= 1000)
return error_template(400, "Invalid itag") return error_template(400, "Invalid itag")
end end
@ -277,7 +277,11 @@ module Invidious::Routes::VideoPlayback
return error_template(500, ex) return error_template(500, ex)
end end
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 } 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 url = fmt.try &.["url"]?.try &.as_s
if !url if !url