From: sadposter <hannah+pleroma@coffee-and-dreams.uk>
Date: Tue, 14 Dec 2021 15:02:11 +0000 (+0000)
Subject: fix empty queries returning 50 results
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=d1bb10c88e151f837f3b875f13304e6439925b87;p=akkoma

fix empty queries returning 50 results
---

diff --git a/lib/pleroma/elasticsearch/store.ex b/lib/pleroma/elasticsearch/store.ex
index f8d9090d7..5f2acd420 100644
--- a/lib/pleroma/elasticsearch/store.ex
+++ b/lib/pleroma/elasticsearch/store.ex
@@ -142,6 +142,8 @@ defmodule Pleroma.Elasticsearch do
 
   def bulk_post(_, :hashtags), do: {:ok, nil}
 
+  def search(_, _, _, :skip), do: []
+
   def search(:raw, index, type, q) do
     with {:ok, raw_results} <- Elastix.Search.search(url(), index, [type], q) do
       results =
diff --git a/lib/pleroma/search/elasticsearch.ex b/lib/pleroma/search/elasticsearch.ex
index 145bdec7b..eabd2a852 100644
--- a/lib/pleroma/search/elasticsearch.ex
+++ b/lib/pleroma/search/elasticsearch.ex
@@ -8,45 +8,63 @@ defmodule Pleroma.Search.Elasticsearch do
   alias Pleroma.Web.Endpoint
 
   def es_query(:activity, query) do
-    %{
-      size: 50,
-      terminate_after: 50,
-      timeout: "5s",
-      sort: [
-        %{"_timestamp" => "desc"}
-      ],
-      query: %{
-        bool: %{
-          must: Parsers.Activity.parse(query)
+    must = Parsers.Activity.parse(query)
+
+    if must == [] do
+      :skip
+    else
+      %{
+        size: 50,
+        terminate_after: 50,
+        timeout: "5s",
+        sort: [
+          %{"_timestamp" => "desc"}
+        ],
+        query: %{
+          bool: %{
+            must: must
+          }
         }
       }
-    }
+    end
   end
 
   def es_query(:user, query) do
-    %{
-      size: 50,
-      terminate_after: 50,
-      timeout: "5s",
-      query: %{
-        bool: %{
-          must: Parsers.User.parse(query)
+    must = Parsers.User.parse(query)
+
+    if must == [] do
+      :skip
+    else
+      %{
+        size: 50,
+        terminate_after: 50,
+        timeout: "5s",
+        query: %{
+          bool: %{
+            must: must
+          }
         }
       }
-    }
+    end
   end
 
   def es_query(:hashtag, query) do
-    %{
-      size: 50,
-      terminate_after: 50,
-      timeout: "5s",
-      query: %{
-        bool: %{
-          must: Parsers.Hashtag.parse(query)
+    must = Parsers.Hashtag.parse(query)
+
+    if must == [] do
+      :skip
+    else
+      %{
+        size: 50,
+        terminate_after: 50,
+        timeout: "5s",
+        query: %{
+          bool: %{
+            must: Parsers.Hashtag.parse(query)
+          }
         }
       }
-    }
+    end
   end
 
   @impl Pleroma.Search