소스 검색

Use content instead of source and scrub it

merge-requests/3529/head
Ekaterina Vaartis 2 년 전
부모
커밋
411fde6e66
2개의 변경된 파일5개의 추가작업 그리고 9개의 파일을 삭제
  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 파일 보기

@@ -37,7 +37,7 @@ defmodule Mix.Tasks.Pleroma.Search.Meilisearch do
# Only index public posts which are notes and have some text # Only index public posts which are notes and have some text
where: where:
fragment("data->>'type' = 'Note'") and fragment("data->>'type' = 'Note'") and
fragment("LENGTH(data->>'source') > 0") and
fragment("LENGTH(data->>'content') > 0") and
fragment("data->'to' \\? ?", ^Pleroma.Constants.as_public()), fragment("data->'to' \\? ?", ^Pleroma.Constants.as_public()),
order_by: [desc: fragment("data->'published'")] order_by: [desc: fragment("data->'published'")]
), ),
@@ -56,10 +56,11 @@ defmodule Mix.Tasks.Pleroma.Search.Meilisearch do
data = object.data data = object.data


{:ok, published, _} = DateTime.from_iso8601(data["published"]) {:ok, published, _} = DateTime.from_iso8601(data["published"])
{:ok, content} = FastSanitize.strip_tags(data["content"])


%{ %{
id: object.id, id: object.id,
source: data["source"],
content: content,
ap: data["id"], ap: data["id"],
published: published |> DateTime.to_unix() published: published |> DateTime.to_unix()
} }
@@ -87,11 +88,6 @@ defmodule Mix.Tasks.Pleroma.Search.Meilisearch do


endpoint = Pleroma.Config.get([Pleroma.Search.Meilisearch, :url]) 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
end end

+ 1
- 1
lib/pleroma/search/meilisearch.ex 파일 보기

@@ -56,7 +56,7 @@ defmodule Pleroma.Search.Meilisearch do
Jason.encode!([ Jason.encode!([
%{ %{
id: object.id, id: object.id,
source: data["source"],
content: data["content"] |> Pleroma.HTML.filter_tags(),
ap: data["id"], ap: data["id"],
published: published |> DateTime.to_unix() published: published |> DateTime.to_unix()
} }


불러오는 중...
취소
저장