diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/invidious.cr | 17 | ||||
| -rw-r--r-- | src/invidious/helpers/handlers.cr | 2 |
2 files changed, 9 insertions, 10 deletions
diff --git a/src/invidious.cr b/src/invidious.cr index f7a7876f..19029fd7 100644 --- a/src/invidious.cr +++ b/src/invidious.cr @@ -3661,7 +3661,10 @@ get "/api/v1/storyboards/:id" do |env| end_time = storyboard[:interval].milliseconds storyboard[:storyboard_count].times do |i| - url = storyboard[:url].gsub("$M", i).gsub("https://i9.ytimg.com", HOST_URL) + url = storyboard[:url] + authority = /(i\d?).ytimg.com/.match(url).not_nil![1]? + url = storyboard[:url].gsub("$M", i).gsub(%r(https://i\d?.ytimg.com/sb/), "") + url = "#{HOST_URL}/sb/#{authority}/#{url}" storyboard[:storyboard_height].times do |j| storyboard[:storyboard_width].times do |k| @@ -5527,14 +5530,14 @@ get "/ggpht/*" do |env| end end -options "/sb/:id/:storyboard/:index" do |env| - env.response.headers.delete("Content-Type") +options "/sb/:authority/:id/:storyboard/:index" do |env| env.response.headers["Access-Control-Allow-Origin"] = "*" env.response.headers["Access-Control-Allow-Methods"] = "GET, OPTIONS" env.response.headers["Access-Control-Allow-Headers"] = "Content-Type, Range" end -get "/sb/:id/:storyboard/:index" do |env| +get "/sb/:authority/:id/:storyboard/:index" do |env| + authority = env.params.url["authority"] id = env.params.url["id"] storyboard = env.params.url["storyboard"] index = env.params.url["index"] @@ -5543,11 +5546,7 @@ get "/sb/:id/:storyboard/:index" do |env| headers = HTTP::Headers.new - if storyboard.starts_with? "storyboard_live" - headers[":authority"] = "i.ytimg.com" - else - headers[":authority"] = "i9.ytimg.com" - end + headers[":authority"] = "#{authority}.ytimg.com" REQUEST_HEADERS_WHITELIST.each do |header| if env.request.headers[header]? diff --git a/src/invidious/helpers/handlers.cr b/src/invidious/helpers/handlers.cr index d0b6c5a3..045b6701 100644 --- a/src/invidious/helpers/handlers.cr +++ b/src/invidious/helpers/handlers.cr @@ -61,7 +61,7 @@ class Kemal::ExceptionHandler end class FilteredCompressHandler < Kemal::Handler - exclude ["/videoplayback", "/videoplayback/*", "/vi/*", "/ggpht/*", "/api/v1/auth/notifications"] + exclude ["/videoplayback", "/videoplayback/*", "/vi/*", "/sb/*", "/ggpht/*", "/api/v1/auth/notifications"] exclude ["/api/v1/auth/notifications", "/data_control"], "POST" def call(env) |