Browse Source

Use content instead of source and scrub it

merge-requests/3529/head
Ekaterina Vaartis 2 years ago
parent
commit
411fde6e66
2 changed files with 5 additions and 9 deletions
  1. +4
    -8
      lib/mix/tasks/pleroma/search/meilisearch.ex
  2. +1
    -1
      lib/pleroma/search/meilisearch.ex

+ 4
- 8
lib/mix/tasks/pleroma/search/meilisearch.ex View File

@@ -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

+ 1
- 1
lib/pleroma/search/meilisearch.ex View File

@@ -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()
}


Loading…
Cancel
Save