From 642878b81b6d8e798008656420f82cb1ce16c9e6 Mon Sep 17 00:00:00 2001
From: Mayel de Borniol <git@mayel.space>
Date: Mon, 15 Jan 2024 14:43:06 +0000
Subject: [PATCH] https://github.com/bonfire-networks/bonfire-app/issues/765

---
 lib/search.ex             | 22 ++++++++++++++--------
 lib/web/form_live.sface   |  8 +++++---
 lib/web/live_handler.ex   | 25 ++++++++++++++++++++++++-
 lib/web/search_live.sface |  4 ++--
 4 files changed, 45 insertions(+), 14 deletions(-)

diff --git a/lib/search.ex b/lib/search.ex
index 7e3d5de..c448439 100644
--- a/lib/search.ex
+++ b/lib/search.ex
@@ -22,13 +22,15 @@ defmodule Bonfire.Search do
 
   defp none(e, _) do
     debug(e)
-    []
+    nil
   end
 
   def run_search_db(search, types, opts) do
     limit = opts[:limit] || 20
 
     do_search_db(opts[:query] || base_query(), search, types, opts ++ [skip_boundary_check: true])
+    |> debug()
+    # |> Bonfire.Tag.Tags.search_hashtagged_query(search, opts) # TODO: use do_search_db like other types
     |> where([p], is_nil(p.deleted_at))
     # |> limit(^limit)
     |> debug()
@@ -68,10 +70,12 @@ defmodule Bonfire.Search do
   defp maybe_order_override(query, text, _several) do
     query
     |> Ecto.Query.exclude(:order_by)
-    |> order_by([post_content: pc, profile: p, character: c], [
+    |> order_by([named: n, post_content: pc, profile: p, character: c], [
       {:desc,
        fragment(
-         "(? <% ?)::int + (? <% ?)::int + (? <% ?)::int + (? <% ?)::int",
+         "(? <% ?)::int + (? <% ?)::int + (? <% ?)::int + (? <% ?)::int + (? <% ?)::int + (? <% ?)::int",
+         ^text,
+         n.name,
          ^text,
          pc.name,
          ^text,
@@ -79,7 +83,9 @@ defmodule Bonfire.Search do
          ^text,
          c.username,
          ^text,
-         p.name
+         p.name,
+         ^text,
+         p.summary
        )}
     ])
   end
@@ -99,7 +105,7 @@ defmodule Bonfire.Search do
     case Types.maybe_to_module(type) do
       nil ->
         debug(type, "not a module")
-        []
+        query
 
       mod ->
         do_search_db(query, search, mod, opts)
@@ -117,10 +123,10 @@ defmodule Bonfire.Search do
         [:search_query, :search],
         [search, Keyword.put(opts, :query, query)],
         &none/2
-      )
+      ) || query
     else
       debug("no module, so skip searching ")
-      []
+      query
     end
   end
 
@@ -148,6 +154,6 @@ defmodule Bonfire.Search do
 
   def default_types(_opts) do
     # TODO: make default types generated/configurable
-    [Bonfire.Data.Identity.User, Bonfire.Data.Social.Post]
+    [Bonfire.Data.Identity.User, Bonfire.Data.Social.Post, Bonfire.Tag.Tagged]
   end
 end
diff --git a/lib/web/form_live.sface b/lib/web/form_live.sface
index 186f720..fd5c0f7 100644
--- a/lib/web/form_live.sface
+++ b/lib/web/form_live.sface
@@ -3,13 +3,15 @@
   <form
     class="w-full"
     role="search"
-    phx-change={if @__context__[:current_view] == Bonfire.Search.Web.SearchLive,
-      do: "Bonfire.Search:search"}
     phx-submit={if @__context__[:current_view] != Bonfire.Search.Web.SearchLive,
-      do: "Bonfire.Search:go_search"}
+      do: "Bonfire.Search:go_search",
+      else: "Bonfire.Search:search"}
     action="/search"
     method="GET"
   >
+    <!-- phx-change={if @__context__[:current_view] == Bonfire.Search.Web.SearchLive,
+      do: "Bonfire.Search:search"} -->
+
     <span class="sr-only">{e(@search_placeholder, l("Search"))}</span>
     <div class="relative w-full rounded">
       <input type="hidden" name="search_limit" value={e(@search_limit, "")}>
diff --git a/lib/web/live_handler.ex b/lib/web/live_handler.ex
index 2536328..b3f0d3c 100644
--- a/lib/web/live_handler.ex
+++ b/lib/web/live_handler.ex
@@ -80,14 +80,37 @@ defmodule Bonfire.Search.LiveHandler do
           []
       end
 
+    # tagged =
+    #   with hashtags when is_list(hashtags) <-
+    #          Bonfire.Tag.Tags.search_hashtag(
+    #            q
+    #            #  fetch_collection: :async
+    #          )
+    #          |> debug("got_hashtags") do
+    #     hashtags
+    #     # {:noreply, socket |> redirect_to(path(federated_object_or_character))}
+    #   else
+    #     _ ->
+    #       []
+    #   end
+
     {num_hits, hits, facets} =
       do_search(q, facet_filters, opts)
       |> debug("did_search1")
 
+    # + length(tagged)
+    num_hits = (num_hits || 0) + length(by_link_or_username)
+
+    # ++ tagged 
+    hits =
+      (by_link_or_username ++ hits)
+      |> Enum.uniq_by(&Enums.id/1)
+      |> debug("search2 merged")
+
     {:noreply,
      assign_global(socket,
        selected_facets: facet_filters,
-       hits: (by_link_or_username ++ hits) |> Enum.uniq_by(&Enums.id/1),
+       hits: hits,
        facets: facets || e(socket.assigns, :facets, nil),
        num_hits: num_hits,
        search: q
diff --git a/lib/web/search_live.sface b/lib/web/search_live.sface
index 1304b36..1a688c4 100644
--- a/lib/web/search_live.sface
+++ b/lib/web/search_live.sface
@@ -39,7 +39,7 @@
         </div>
       </LiveRedirect>
       {!-- POSTS --}
-      <LiveRedirect
+      <!-- <LiveRedirect
         class="flex flex-1 pt-4 text-base capitalize hover:bg-base-content hover:bg-opacity-10 place-content-center"
         to={"/search?facet[index_type]=Bonfire.Data.Social.Post&s=" <> e(assigns, :search, "")}
       >
@@ -49,7 +49,7 @@
         }>
           {l("Posts")}
         </div>
-      </LiveRedirect>
+      </LiveRedirect> -->
     </nav>
     <Bonfire.Search.Web.ResultsLive hits={e(@hits, [])} />
   </div>