iv-org
/
invidious
mirror of https://github.com/iv-org/invidious.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix typo in 404 handler

This commit is contained in:
Omar Roth 2019-04-17 14:46:00 -05:00
parent b6fff53b21
commit 25359e5320
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/invidious.cr
View File

@ -4678,10 +4678,11 @@ end
error 404 do |env| error 404 do |env|
if md = env.request.path.match(/^\/(?<id>([a-zA-Z0-9_-]{11})|(\w+))$/) if md = env.request.path.match(/^\/(?<id>([a-zA-Z0-9_-]{11})|(\w+))$/)
id = md["id"] item = md["id"]
# Check if item is branding URL e.g. https://youtube.com/gaming
client = make_client(YT_URL) client = make_client(YT_URL)
response = client.get("/#{id}") response = client.get("/#{item}")
if response.status_code == 301 if response.status_code == 301
response = client.get(response.headers["Location"]) response = client.get(response.headers["Location"])
@ -4701,13 +4702,14 @@ error 404 do |env|
end end
params = params.join("&") params = params.join("&")
url = "/watch?v=#{id}" url = "/watch?v=#{item}"
if !params.empty? if !params.empty?
url += "&#{params}" url += "&#{params}"
end end
client = make_client(YT_URL) # Check if item is video ID
if client.head("/#{id}").status_code == 404 client = make_client(URI.parse("https://youtu.be"))
if client.head("/#{item}").status_code != 404
env.response.headers["Location"] = url env.response.headers["Location"] = url
halt env, status_code: 302 halt env, status_code: 302
end end