From 842c23a1192fb4fc03155c8cbe44f452b13bf062 Mon Sep 17 00:00:00 2001
From: syeopite <syeopite@syeopite.dev>
Date: Thu, 24 Jun 2021 08:58:25 -0700
Subject: [PATCH] Fix merge conflicts

---
 src/invidious/routes/search.cr |   8 +-
 src/invidious/search.cr        |   8 +-
 src/invidious/views/search.ecr | 220 +++++++++++++++++----------------
 3 files changed, 116 insertions(+), 120 deletions(-)

diff --git a/src/invidious/routes/search.cr b/src/invidious/routes/search.cr
index 513904b8..d98c8926 100644
--- a/src/invidious/routes/search.cr
+++ b/src/invidious/routes/search.cr
@@ -52,17 +52,11 @@ class Invidious::Routes::Search < Invidious::Routes::BaseRoute
       user = env.get? "user"
 
       begin
-        search_query, count, videos, operators = process_search_query(query, page, user, region: region)
+        search_query, count, items, operators = process_search_query(env.params.query, query, page, user, region: nil)
       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
diff --git a/src/invidious/search.cr b/src/invidious/search.cr
index b2b0eee0..b26a4158 100644
--- a/src/invidious/search.cr
+++ b/src/invidious/search.cr
@@ -182,7 +182,7 @@ def process_search_query(url_params, query, page, user, region)
   sort = "relevance"
   subscriptions = nil
 
-  # operators = url_params.split(" ").select { |a| a.match(/\w+:[\,]+/) }
+  # operators = query.split(" ").select { |a| a.match(/\w+:[\w,]+/) }
   url_params.each do |operator|
     key, value = operator
 
@@ -237,14 +237,14 @@ def process_search_query(url_params, query, page, user, region)
   items.each do |i|
     if i.is_a? Category
       i.contents.each do |cate_items|
-        if cate_items.is_a? (SearchVideo | SearchPlaylist | SearchChannel)
+        if cate_items.is_a?(SearchVideo | SearchPlaylist | SearchChannel)
           extracted_items << cate_items
         end
       end
     else
       extracted_items << i
     end
-  end 
+  end
 
-  {search_query, count, extracted_items, url_params}
+  {search_query, count, items, url_params}
 end
diff --git a/src/invidious/views/search.ecr b/src/invidious/views/search.ecr
index 6afbee95..896ceda6 100644
--- a/src/invidious/views/search.ecr
+++ b/src/invidious/views/search.ecr
@@ -15,123 +15,125 @@
         <div id="filters" class="pure-g h-box">
         <!-- Grabs all search filters. This is to make sure we don't accidently overwrite something within the
             search query later on-->
+        <% filter_params = env.request.query_params.to_s.gsub(/q=.+?(?=&|$)/, "") %>
+        <% base_url = "/search?q=#{HTML.escape(query.not_nil!)}" %>
 
-      <% filter_params = env.request.query_params.to_s.gsub(/q=.+?(?=&|$)/, "") %>
-      <% base_url = "/search?q=#{HTML.escape(query.not_nil!)}" %>
-
-      <div class="pure-u-1-3 pure-u-md-1-5 filter-catagory" id="filter-date">
-          <b><%= translate(locale, "date") %></b>
-          <hr/>
-          <ul class="pure-menu-list">
-              <% ["hour", "today", "week", "month", "year"].each do |date| %>
-                  <li class="pure-menu-item">
-                      <% if operator_hash.fetch("date", "all") == date %>
-                          <a style="color: inherit;" href="<%= base_url + "#{filter_params.gsub(/&date=[a-z]+/, "")}"%>">
-                              <b><%= translate(locale, date) %></b>
-                              <i class="remove-filter icon ion-md-close"></i>
-                          </a>
-                      <% else %>
-                          <a href="<%= base_url + "#{filter_params.gsub(/&date=[a-z]+/, "")}&date=#{date}"%>">
-                              <%= translate(locale, date) %>
-                          </a>
-                      <% end %>
-                  </li>
-              <% end %>
-          </ul>
-      </div>
+        <div class="pure-u-1-3 pure-u-md-1-5 filter-catagory" id="filter-date">
+            <b><%= translate(locale, "date") %></b>
+            <hr/>
+            <ul class="pure-menu-list">
+                <% ["hour", "today", "week", "month", "year"].each do |date| %>
+                    <li class="pure-menu-item">
+                        <% if operators.fetch("date", "all") == date %>
+                            <a style="color: inherit;" href="<%= base_url + "#{filter_params.gsub(/&date=[a-z]+/, "")}"%>">
+                                <b><%= translate(locale, date) %></b>
+                                <i class="remove-filter icon ion-md-close"></i>
+                            </a>
+                        <% else %>
+                            <a href="<%= base_url + "#{filter_params.gsub(/&date=[a-z]+/, "")}&date=#{date}"%>">
+                                <%= translate(locale, date) %>
+                            </a>
+                        <% end %>
+                    </li>
+                <% end %>
+            </ul>
+        </div>
 
-      <div class="pure-u-1-3 pure-u-md-1-5 filter-catagory" id="filter-content_type">
-          <b><%= translate(locale, "content_type") %></b>
-          <hr/>
-          <ul class="pure-menu-list">
-              <% ["video", "channel", "playlist", "movie", "show"].each do |content_type| %>
-                  <li class="pure-menu-item">
-                      <% if operator_hash.fetch("content_type", "all") == content_type %>
-                          <a style="color: inherit;" href="<%= base_url + "#{filter_params.gsub(/&content_type=[a-z]+/, "")}"%>">
-                              <b><%= translate(locale, content_type) %></b>
-                              <i class="remove-filter icon ion-md-close"></i>
-                          </a>
-                      <% else %>
-                          <a href="<%= base_url + "#{filter_params.gsub(/&content_type=[a-z]+/, "")}&content_type=#{content_type}"%>">
-                              <%= translate(locale, content_type) %>
-                          </a>
-                      <% end %>
-                  </li>
-              <% end %>
-          </ul>
-      </div>
+        <div class="pure-u-1-3 pure-u-md-1-5 filter-catagory" id="filter-content_type">
+            <b><%= translate(locale, "content_type") %></b>
+            <hr/>
+            <ul class="pure-menu-list">
+                <% ["video", "channel", "playlist", "movie", "show"].each do |content_type| %>
+                    <li class="pure-menu-item">
+                        <% if operators.fetch("content_type", "all") == content_type %>
+                            <a style="color: inherit;" href="<%= base_url + "#{filter_params.gsub(/&content_type=[a-z]+/, "")}"%>">
+                                <b><%= translate(locale, content_type) %></b>
+                                <i class="remove-filter icon ion-md-close"></i>
+                            </a>
+                        <% else %>
+                            <a href="<%= base_url + "#{filter_params.gsub(/&content_type=[a-z]+/, "")}&content_type=#{content_type}"%>">
+                                <%= translate(locale, content_type) %>
+                            </a>
+                        <% end %>
+                    </li>
+                <% end %>
+            </ul>
+        </div>
 
-      <div class="pure-u-1-3 pure-u-md-1-5 filter-catagory" id="filter-duration">
-          <b><%= translate(locale, "duration") %></b>
-          <hr/>
-          <ul class="pure-menu-list">
-              <% ["short", "long"].each do |duration| %>
-                  <li class="pure-menu-item">
-                      <% if operator_hash.fetch("duration", "all") == duration %>
-                          <a style="color: inherit;" href="<%= base_url + "#{filter_params.gsub(/&duration=[a-z]+/, "")}"%>">
-                              <b><%= translate(locale, duration) %></b>
-                              <i class="remove-filter icon ion-md-close"></i>
-                          </a>
-                      <% else %>
-                          <a href="<%= base_url + "#{filter_params.gsub(/&duration=[a-z]+/, "")}&duration=#{duration}"%>">
-                              <%= translate(locale, duration) %>
-                          </a>
-                      <% end %>
-                  </li>
-              <% end %>
-          </ul>
-      </div>
+        <div class="pure-u-1-3 pure-u-md-1-5 filter-catagory" id="filter-duration">
+            <b><%= translate(locale, "duration") %></b>
+            <hr/>
+            <ul class="pure-menu-list">
+                <% ["short", "long"].each do |duration| %>
+                    <li class="pure-menu-item">
+                        <% if operators.fetch("duration", "all") == duration %>
+                            <a style="color: inherit;" href="<%= base_url + "#{filter_params.gsub(/&duration=[a-z]+/, "")}"%>">
+                                <b><%= translate(locale, duration) %></b>
+                                <i class="remove-filter icon ion-md-close"></i>
+                            </a>
+                        <% else %>
+                            <a href="<%= base_url + "#{filter_params.gsub(/&duration=[a-z]+/, "")}&duration=#{duration}"%>">
+                                <%= translate(locale, duration) %>
+                            </a>
+                        <% end %>
+                    </li>
+                <% end %>
+            </ul>
+        </div>
 
-      <div class="pure-u-1-3 pure-u-md-1-5 filter-catagory" id="filter-features">
-          <b><%= translate(locale, "features") %></b>
-          <hr/>
-          <ul class="pure-menu-list">
-              <% ["hd", "subtitles", "creative_commons", "3d", "live", "purchased", "4k", "360", "location", "hdr"].each do |feature| %>
-                  <li class="pure-menu-item">
-                      <% if operator_hash.fetch("features", "all").includes?(feature) %>
-                          <% if operator_hash["features"].split(",").size == 1 %>
-                              <a style="color: inherit;" href="<%= base_url + "#{filter_params.gsub(/&features=[a-z]+/, "")}"%>">
-                                  <b><%= translate(locale, feature) %></b>
-                                  <i class="remove-filter icon ion-md-close"></i>
-                              </a>
-                          <% else %>
-                              <% data = filter_params.match(/.*features=.*(#{feature}(%2C|&|$)).*/).not_nil! %>
-                              <% start = data.begin(1) %>
-                              <% last =  data.end(1) %>
+        <div class="pure-u-1-3 pure-u-md-1-5 filter-catagory" id="filter-features">
+            <b><%= translate(locale, "features") %></b>
+            <hr/>
+            <ul class="pure-menu-list">
+                <% ["hd", "subtitles", "creative_commons", "3d", "live", "purchased", "4k", "360", "location", "hdr"].each do |feature| %>
+                    <li class="pure-menu-item">
+                        <% if operators.fetch("features", "all").includes?(feature) %>
+                            <% if operators["features"].split(",").size == 1 %>
+                                <a style="color: inherit;" href="<%= base_url + "#{filter_params.gsub(/&features=[a-z]+/, "")}"%>">
+                                    <b><%= translate(locale, feature) %></b>
+                                    <i class="remove-filter icon ion-md-close"></i>
+                                </a>
+                            <% else %>
+                                <% data = filter_params.match(/.*features=.*(#{feature}(%2C|&|$)).*/).not_nil! %>
+                                <% start = data.begin(1) %>
+                                <% last =  data.end(1) %>
 
-                              <a style="color: inherit;" href="<%= base_url + "#{filter_params[0...start] + filter_params[last..-1]}"%>">
-                                  <b><%= translate(locale, feature) %></b>
-                                  <i class="remove-filter icon ion-md-close"></i>
-                              </a>
-                          <% end %>
-                      <% elsif operator_hash.has_key?("features") %>
-                          <a href="<%= base_url + filter_params.gsub(/features=/, "features=#{feature},")%>">
-                              <%= translate(locale, feature) %>
-                          </a>
-                      <% else %>
-                          <a href="<%= "#{base_url}#{filter_params}&features=#{feature}"%>">
-                              <%= translate(locale, feature) %>
-                          </a>
-                      <% end %>
-                  </li>
-              <% end %>
-          </ul>
-      </div>
+                                <a style="color: inherit;" href="<%= base_url + "#{filter_params[0...start] + filter_params[last..-1]}"%>">
+                                    <b><%= translate(locale, feature) %></b>
+                                    <i class="remove-filter icon ion-md-close"></i>
+                                </a>
+                            <% end %>
+                        <% elsif operators.has_key?("features") %>
+                            <a href="<%= base_url + filter_params.gsub(/features=/, "features=#{feature},")%>">
+                                <%= translate(locale, feature) %>
+                            </a>
+                        <% else %>
+                            <a href="<%= "#{base_url}#{filter_params}&features=#{feature}"%>">
+                                <%= translate(locale, feature) %>
+                            </a>
+                        <% end %>
+                    </li>
+                <% end %>
+            </ul>
+        </div>
 
         <div class="pure-u-1-3 pure-u-md-1-5 filter-catagory" id="filter-sort">
             <b><%= translate(locale, "sort") %></b>
             <hr/>
-            <% ["relevance", "rating", "date", "views"].each do |sort| %>
-                <div class="pure-u-1 pure-md-1-5">
-                    <% if operator_hash.fetch("sort", "relevance") == sort %>
-                          <b><%= translate(locale, sort) %></b>
-                    <% else %>
-                        <a href="<%= base_url + "#{filter_params.gsub(/&sort=[a-z]+/, "")}&sort=#{sort}"%>">
-                            <%= translate(locale, sort) %>
-                        </a>
-                    <% end %>
-                </div>
-            <% end %>
+            <ul class="pure-menu-list">
+                <% ["relevance", "rating", "date", "views"].each do |sort| %>
+                    <li class="pure-menu-item">
+                        <% if operators.fetch("sort", "relevance") == sort %>
+                                <b><%= translate(locale, sort) %></b>
+                        <% else %>
+                            <a href="<%= base_url + "#{filter_params.gsub(/&sort=[a-z]+/, "")}&sort=#{sort}"%>">
+                                <%= translate(locale, sort) %>
+                            </a>
+                        <% end %>
+                    </li>
+                <% end %>
+            </ul>
+        </div>
         </div>
     </details>
 <% end %>
@@ -161,7 +163,7 @@
 </div>
 
 <div class="pure-g">
-    <% videos.each_slice(4) do |slice| %>
+    <% items.each_slice(4) do |slice| %>
         <% slice.each do |item| %>
             <%= rendered "components/item" %>
         <% end %>