mirror of https://github.com/iv-org/invidious.git
Allow thumbnail queries with QUIC disabled
This commit is contained in:
parent
814c9e6c3a
commit
83556bace2
|
@ -223,7 +223,17 @@ module Invidious::Routes::Images
|
||||||
id = env.params.url["id"]
|
id = env.params.url["id"]
|
||||||
name = env.params.url["name"]
|
name = env.params.url["name"]
|
||||||
|
|
||||||
headers = HTTP::Headers{":authority" => "i.ytimg.com"}
|
headers = (
|
||||||
|
{% unless flag?(:disable_quic) %}
|
||||||
|
if CONFIG.use_quic
|
||||||
|
HTTP::Headers{":authority" => "i.ytimg.com"}
|
||||||
|
else
|
||||||
|
HTTP::Headers.new
|
||||||
|
end
|
||||||
|
{% else %}
|
||||||
|
HTTP::Headers.new
|
||||||
|
{% end %}
|
||||||
|
)
|
||||||
|
|
||||||
if name == "maxres.jpg"
|
if name == "maxres.jpg"
|
||||||
build_thumbnails(id).each do |thumb|
|
build_thumbnails(id).each do |thumb|
|
||||||
|
@ -233,6 +243,7 @@ module Invidious::Routes::Images
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
url = "/vi/#{id}/#{name}"
|
url = "/vi/#{id}/#{name}"
|
||||||
|
|
||||||
REQUEST_HEADERS_WHITELIST.each do |header|
|
REQUEST_HEADERS_WHITELIST.each do |header|
|
||||||
|
@ -241,8 +252,7 @@ module Invidious::Routes::Images
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
begin
|
request_proc = ->(response : HTTP::Client::Response) {
|
||||||
YT_POOL.client &.get(url, headers) do |response|
|
|
||||||
env.response.status_code = response.status_code
|
env.response.status_code = response.status_code
|
||||||
response.headers.each do |key, value|
|
response.headers.each do |key, value|
|
||||||
if !RESPONSE_HEADERS_BLACKLIST.includes?(key.downcase)
|
if !RESPONSE_HEADERS_BLACKLIST.includes?(key.downcase)
|
||||||
|
@ -254,12 +264,31 @@ module Invidious::Routes::Images
|
||||||
|
|
||||||
if response.status_code >= 300 && response.status_code != 404
|
if response.status_code >= 300 && response.status_code != 404
|
||||||
env.response.headers.delete("Transfer-Encoding")
|
env.response.headers.delete("Transfer-Encoding")
|
||||||
break
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
proxy_file(response, env)
|
proxy_file(response, env)
|
||||||
|
}
|
||||||
|
|
||||||
|
begin
|
||||||
|
{% unless flag?(:disable_quic) %}
|
||||||
|
if CONFIG.use_quic
|
||||||
|
YT_POOL.client &.get(url, headers) do |resp|
|
||||||
|
return request_proc.call(resp)
|
||||||
end
|
end
|
||||||
|
else
|
||||||
|
HTTP::Client.get("https://i.ytimg.com#{url}") do |resp|
|
||||||
|
return request_proc.call(resp)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
{% else %}
|
||||||
|
# This can likely be optimized into a (small) pool sometime in the future.
|
||||||
|
HTTP::Client.get("https://i.ytimg.com#{url}") do |resp|
|
||||||
|
return request_proc.call(resp)
|
||||||
|
end
|
||||||
|
{% end %}
|
||||||
rescue ex
|
rescue ex
|
||||||
end
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue