add extra filters

lib/pleroma/elasticsearch/store.ex

@@ -2,6 +2,10 @@ defmodule Pleroma.Elasticsearch do
   alias Pleroma.Activity
   alias Pleroma.Elasticsearch.DocumentMappings
 
+  @searchable [
+    "hashtag", "instance", "user"
+  ]
+
   defp url do
     Pleroma.Config.get([:elasticsearch, :url])
   end
@@ -34,12 +38,82 @@ def bulk_post(data, :activities) do
     )
   end
 
+  defp parse_term(t) do
+    if String.contains?(t, ":") and !String.starts_with?(t, "\"") do
+      [field, query] = String.split(t, ":")
+      if Enum.member?(@searchable, field) do
+        {field, query}
+      else
+        {"content", query}
+      end
+    else
+        {"content", t}
+    end
+  end
+
+  defp search_user(params, q) do
+    if q["user"] != nil do
+      params ++ [%{match: %{user: %{
+        query: Enum.join(q["user"], " "),
+        operator: "OR"
+      }}}]
+    else
+      params
+    end
+  end
+
+  defp search_instance(params, q) do
+    if q["instance"] != nil do 
+      params ++ [%{match: %{instance: %{
+        query: Enum.join(q["instance"], " "),
+        operator: "OR"
+      }}}]
+    else
+      params
+    end
+  end
+
+  defp search_content(params, q) do
+    if q["content"] != nil do
+      params ++ [%{match: %{content: %{
+        query: Enum.join(q["content"], " "),
+        operator: "AND"
+      }}}]
+    else
+      params
+    end
+ end
+ 
+  defp to_es(q) do
+    []
+    |> search_content(q)
+    |> search_instance(q)
+    |> search_user(q)
+  end
+
+  defp parse(query) do
+    String.split(query, " ")
+    |> Enum.map(&parse_term/1)
+    |> Enum.reduce(%{}, fn {field, query}, acc ->
+        Map.put(acc, field,
+            Map.get(acc, field, []) ++ [query]
+        )
+    end)
+    |> to_es()
+  end
+    
   def search(query) do
+    q = %{query: %{
+      bool: %{
+        must: parse(query)
+      }
+    }}
+    IO.inspect(q)
     Elastix.Search.search(
         url(),
         "activities",
         ["activity"],
-        %{query: %{term: %{content: query}}}
+        q
     )
   end
 end

lib/pleroma/web/mastodon_api/controllers/search_controller.ex

@@ -56,9 +56,9 @@ defp do_search(version, %{assigns: %{user: user}} = conn, %{q: query} = params)
   defp elasticsearch_search(%{assigns: %{user: user}} = conn, query, options) do
     with {:ok, raw_results} <- Pleroma.Elasticsearch.search(query) do
       results = raw_results
-      |> Map.get(:body)
-      |> Map.get("hits")
-      |> Map.get("hits")
+      |> Map.get(:body, %{})
+      |> Map.get("hits", %{})
+      |> Map.get("hits", [])
       |> Enum.map(fn result -> result["_id"] end)
       |> Pleroma.Activity.all_by_ids_with_object()