mirrors/nadeko_invidious
1
0
Fork 0
mirror of https://git.nadeko.net/Fijxu/invidious.git synced 2025-12-19 03:18:50 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Multiple search fixes

Browse Source 
* Remove percent-encoding of the search query when calling youtube API, as it
  breaks UTF-8
* Empty search redirects to /search, not /
* Show the fullscreen search "home page" (from #1977) at /search
* Allow 'region=' parameter to be passed to /search
* Other minor fixes
This commit is contained in:
Samantaz Fox
2021-06-13 21:40:11 +02:00
parent fe64e6dbf2
commit a2f5342a83
3 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/invidious/routes/search.cr
View File

@@ -20,15 +20,17 @@ class Invidious::Routes::Search < Invidious::Routes::BaseRoute
query = env.params.query["search_query"]?
query ||= env.params.query["q"]?
query ||= ""
page = env.params.query["page"]?.try &.to_i?
page ||= 1
page = env.params.query["page"]?
if query
env.redirect "/search?q=#{URI.encode_www_form(query)}&page=#{page}"
if query && !query.empty?
if page && !page.empty?
env.redirect "/search?q=" + URI.encode_www_form(query) + "&page=" + page
else
env.redirect "/search?q=" + URI.encode_www_form(query)
end
else
env.redirect "/"
env.redirect "/search"
end
end
@@ -38,9 +40,13 @@ class Invidious::Routes::Search < Invidious::Routes::BaseRoute
query = env.params.query["search_query"]?
query ||= env.params.query["q"]?
query ||= ""
return env.redirect "/" if query.empty?
if !query || query.empty?
# Display the full page search box implemented in #1977
env.set "search", ""
templated "search_homepage", navbar_search: false
return
end
page = env.params.query["page"]?.try &.to_i?
page ||= 1
@@ -48,7 +54,7 @@ class Invidious::Routes::Search < Invidious::Routes::BaseRoute
user = env.get? "user"
begin
search_query, count, videos, operators = process_search_query(query, page, user, region: nil)
search_query, count, videos, operators = process_search_query(query, page, user, region: region)
rescue ex
return error_template(500, ex)
end