mirrors/pleroma
1
0
Fork 0
mirror of https://git.pleroma.social/pleroma/pleroma.git synced 2024-12-22 16:16:34 +00:00
Code Issues Projects Releases Wiki Activity

Rework task indexing to share code with the main module

Browse source 
The code in the main module now scrubs new posts too
This commit is contained in:
Ekaterina Vaartis 2021-08-22 22:53:18 +03:00
parent 3dedadf192
commit 35e9192ced
2 changed files with 34 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
lib/mix/tasks/pleroma/search/meilisearch.ex
View file

@ -51,40 +51,9 @@ defmodule Mix.Tasks.Pleroma.Search.Meilisearch do
),
timeout: :infinity
)
|> Stream.map(&Pleroma.Search.Meilisearch.object_to_search_data/1)
|> Stream.filter(fn o -> not is_nil(o) end)
|> Stream.chunk_every(chunk_size)
|> Stream.map(fn objects ->
Enum.map(objects, fn object ->
data = object.data
content_str =
case data["content"] do
[nil | rest] -> to_string(rest)
str -> str
end
{:ok, published, _} = DateTime.from_iso8601(data["published"])
content =
with {:ok, scrubbed} <- FastSanitize.strip_tags(content_str),
trimmed <- String.trim(scrubbed) do
trimmed
end
# Only index if there is anything in the string. If there is a single symbol,
# it's probably a dot from mastodon posts with just the picture
if String.length(content) > 1 do
%{
id: object.id,
content: content,
ap: data["id"],
published: published |> DateTime.to_unix()
}
else
nil
end
end)
|> Enum.filter(fn o -> not is_nil(o) end)
end)
|> Stream.transform(0, fn objects, acc ->
new_acc = acc + Enum.count(objects)

46
lib/pleroma/search/meilisearch.ex
View file

@ -39,28 +39,46 @@ defmodule Pleroma.Search.Meilisearch do
end
end
def add_to_index(activity) do
object = activity.object
if activity.data["type"] == "Create" and not is_nil(object) and object.data["type"] == "Note" and
def object_to_search_data(object) do
if not is_nil(object) and object.data["type"] == "Note" and
Pleroma.Constants.as_public() in object.data["to"] do
data = object.data
endpoint = Pleroma.Config.get([Pleroma.Search.Meilisearch, :url])
content_str =
case data["content"] do
[nil | rest] -> to_string(rest)
str -> str
end
{:ok, published, _} = DateTime.from_iso8601(data["published"])
content =
with {:ok, scrubbed} <- FastSanitize.strip_tags(content_str),
trimmed <- String.trim(scrubbed) do
trimmed
end
if String.length(content) > 1 do
{:ok, published, _} = DateTime.from_iso8601(data["published"])
%{
id: object.id,
content: content,
ap: data["id"],
published: published |> DateTime.to_unix()
}
end
end
end
def add_to_index(activity) do
maybe_search_data = object_to_search_data(activity)
if activity.data["type"] == "Create" and maybe_search_data do
endpoint = Pleroma.Config.get([Pleroma.Search.Meilisearch, :url])
{:ok, result} =
Pleroma.HTTP.post(
"#{endpoint}/indexes/objects/documents",
Jason.encode!([
%{
id: object.id,
content: data["content"] |> Pleroma.HTML.filter_tags(),
ap: data["id"],
published: published |> DateTime.to_unix()
}
])
Jason.encode!([maybe_search_data])
)
if not Map.has_key?(Jason.decode!(result.body), "updateId") do