Use if/else instead of return in search route
This commit is contained in:
parent
a2f5342a83
commit
3de92b337d
1 changed files with 20 additions and 21 deletions
|
@ -45,27 +45,26 @@ class Invidious::Routes::Search < Invidious::Routes::BaseRoute
|
||||||
# Display the full page search box implemented in #1977
|
# Display the full page search box implemented in #1977
|
||||||
env.set "search", ""
|
env.set "search", ""
|
||||||
templated "search_homepage", navbar_search: false
|
templated "search_homepage", navbar_search: false
|
||||||
return
|
else
|
||||||
|
page = env.params.query["page"]?.try &.to_i?
|
||||||
|
page ||= 1
|
||||||
|
|
||||||
|
user = env.get? "user"
|
||||||
|
|
||||||
|
begin
|
||||||
|
search_query, count, videos, operators = process_search_query(query, page, user, region: region)
|
||||||
|
rescue ex
|
||||||
|
return error_template(500, ex)
|
||||||
|
end
|
||||||
|
|
||||||
|
operator_hash = {} of String => String
|
||||||
|
operators.each do |operator|
|
||||||
|
key, value = operator.downcase.split(":")
|
||||||
|
operator_hash[key] = value
|
||||||
|
end
|
||||||
|
|
||||||
|
env.set "search", query
|
||||||
|
templated "search"
|
||||||
end
|
end
|
||||||
|
|
||||||
page = env.params.query["page"]?.try &.to_i?
|
|
||||||
page ||= 1
|
|
||||||
|
|
||||||
user = env.get? "user"
|
|
||||||
|
|
||||||
begin
|
|
||||||
search_query, count, videos, operators = process_search_query(query, page, user, region: region)
|
|
||||||
rescue ex
|
|
||||||
return error_template(500, ex)
|
|
||||||
end
|
|
||||||
|
|
||||||
operator_hash = {} of String => String
|
|
||||||
operators.each do |operator|
|
|
||||||
key, value = operator.downcase.split(":")
|
|
||||||
operator_hash[key] = value
|
|
||||||
end
|
|
||||||
|
|
||||||
env.set "search", query
|
|
||||||
templated "search"
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue