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

Fix toggle_theme when visiting preferences with JS disabled

This commit is contained in:
Omar Roth 2019-06-04 19:58:56 -05:00
parent d6ec441c8e
commit 352e409a6e
No known key found for this signature in database
GPG Key ID: B8254FB7EC3D37F2
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/invidious.cr
View File

@ -1487,7 +1487,7 @@ end
get "/toggle_theme" do |env| get "/toggle_theme" do |env|
locale = LOCALES[env.get("preferences").as(Preferences).locale]? locale = LOCALES[env.get("preferences").as(Preferences).locale]?
referer = get_referer(env) referer = get_referer(env, unroll: false)
redirect = env.params.query["redirect"]? redirect = env.params.query["redirect"]?
redirect ||= "true" redirect ||= "true"

4
src/invidious/helpers/utils.cr
View File

@ -243,7 +243,7 @@ def make_host_url(config, kemal_config)
return "#{scheme}#{host}#{port}" return "#{scheme}#{host}#{port}"
end end
def get_referer(env, fallback = "/") def get_referer(env, fallback = "/", unroll = true)
referer = env.params.query["referer"]? referer = env.params.query["referer"]?
referer ||= env.request.headers["referer"]? referer ||= env.request.headers["referer"]?
referer ||= fallback referer ||= fallback
@ -251,6 +251,7 @@ def get_referer(env, fallback = "/")
referer = URI.parse(referer) referer = URI.parse(referer)
# "Unroll" nested referrers # "Unroll" nested referrers
if unroll
loop do loop do
if referer.query if referer.query
params = HTTP::Params.parse(referer.query.not_nil!) params = HTTP::Params.parse(referer.query.not_nil!)
@ -263,6 +264,7 @@ def get_referer(env, fallback = "/")
break break
end end
end end
end
referer = referer.full_path referer = referer.full_path
referer = "/" + referer.lstrip("\/\\") referer = "/" + referer.lstrip("\/\\")