Use content instead of source and scrub it

diff --git a/lib/mix/tasks/pleroma/search/meilisearch.ex b/lib/mix/tasks/pleroma/search/meilisearch.ex
index dcecbd7cfb8f65c2520571110bc28a62adf213ce..5270de25581a7dfbb2c8a379c6aacc55647dc21e 100644 (file)
--- a/lib/mix/tasks/pleroma/search/meilisearch.ex
+++ b/lib/mix/tasks/pleroma/search/meilisearch.ex
@@ -37,7 +37,7 @@ defmodule Mix.Tasks.Pleroma.Search.Meilisearch do
             # Only index public posts which are notes and have some text
             where:
               fragment("data->>'type' = 'Note'") and
-                fragment("LENGTH(data->>'source') > 0") and
+                fragment("LENGTH(data->>'content') > 0") and
                 fragment("data->'to' \\? ?", ^Pleroma.Constants.as_public()),
             order_by: [desc: fragment("data->'published'")]
           ),
@@ -56,10 +56,11 @@ defmodule Mix.Tasks.Pleroma.Search.Meilisearch do
             data = object.data
 
             {:ok, published, _} = DateTime.from_iso8601(data["published"])
+            {:ok, content} = FastSanitize.strip_tags(data["content"])
 
             %{
               id: object.id,
-              source: data["source"],
+              content: content,
               ap: data["id"],
               published: published |> DateTime.to_unix()
             }
@@ -87,11 +88,6 @@ defmodule Mix.Tasks.Pleroma.Search.Meilisearch do
 
     endpoint = Pleroma.Config.get([Pleroma.Search.Meilisearch, :url])
 
-    {:ok, result} =
-      Pleroma.HTTP.request(:delete, "#{endpoint}/indexes/objects/documents", "", [], [])
-
-    if not Map.has_key?(Jason.decode!(result.body), "updateId") do
-      IO.puts("Failed to clear: #{result}")
-    end
+    {:ok, _} = Pleroma.HTTP.request(:delete, "#{endpoint}/indexes/objects", "", [], [])
   end
 end

diff --git a/lib/pleroma/search/meilisearch.ex b/lib/pleroma/search/meilisearch.ex
index 9fdb0a07feb2bc95a7520bac63a11f85eb218386..87fdeaf5e0b30c54ba6f363a916e86557eef1692 100644 (file)
--- a/lib/pleroma/search/meilisearch.ex
+++ b/lib/pleroma/search/meilisearch.ex
@@ -56,7 +56,7 @@ defmodule Pleroma.Search.Meilisearch do
           Jason.encode!([
             %{
               id: object.id,
-              source: data["source"],
+              content: data["content"] |> Pleroma.HTML.filter_tags(),
               ap: data["id"],
               published: published |> DateTime.to_unix()
             }