From 3de92b337db9388152caf0e931cfbb07822198df Mon Sep 17 00:00:00 2001 From: Samantaz Fox Date: Mon, 14 Jun 2021 17:10:02 +0200 Subject: [PATCH] Use if/else instead of return in search route --- src/invidious/routes/search.cr | 41 +++++++++++++++++----------------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/src/invidious/routes/search.cr b/src/invidious/routes/search.cr index cb05435e..513904b8 100644 --- a/src/invidious/routes/search.cr +++ b/src/invidious/routes/search.cr @@ -45,27 +45,26 @@ class Invidious::Routes::Search < Invidious::Routes::BaseRoute # Display the full page search box implemented in #1977 env.set "search", "" 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 - - 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