Page MenuHomePhorge
Files F85830350

No OneTemporary
Actions

Authored By
Unknown
Size
5 KB
Referenced Files
None
Subscribers
None

View Options

diff --git a/lib/mix/tasks/pleroma/search/meilisearch.ex b/lib/mix/tasks/pleroma/search/meilisearch.ex
index 2dd9c0a62..dcecbd7cf 100644
--- a/lib/mix/tasks/pleroma/search/meilisearch.ex
+++ b/lib/mix/tasks/pleroma/search/meilisearch.ex
@@ -1,88 +1,97 @@
# Pleroma: A lightweight social networking server
# Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Mix.Tasks.Pleroma.Search.Meilisearch do
require Logger
require Pleroma.Constants
import Mix.Pleroma
import Ecto.Query
def run(["index"]) do
start_pleroma()
endpoint = Pleroma.Config.get([Pleroma.Search.Meilisearch, :url])
{:ok, _} =
Pleroma.HTTP.post(
"#{endpoint}/indexes/objects/settings/ranking-rules",
Jason.encode!([
"desc(published)",
"typo",
"words",
"proximity",
"attribute",
"wordsPosition",
"exactness"
])
)
chunk_size = 100_000
Pleroma.Repo.transaction(
fn ->
Pleroma.Repo.stream(
from(Pleroma.Object,
# Only index public posts which are notes and have some text
where:
fragment("data->>'type' = 'Note'") and
fragment("LENGTH(data->>'source') > 0") and
fragment("data->'to' \\? ?", ^Pleroma.Constants.as_public()),
- order_by: fragment("data->'published' DESC")
+ order_by: [desc: fragment("data->'published'")]
),
timeout: :infinity
)
|> Stream.chunk_every(chunk_size)
|> Stream.transform(0, fn objects, acc ->
new_acc = acc + Enum.count(objects)
IO.puts("Indexed #{new_acc} entries")
{[objects], new_acc}
end)
|> Stream.map(fn objects ->
Enum.map(objects, fn object ->
data = object.data
{:ok, published, _} = DateTime.from_iso8601(data["published"])
%{
id: object.id,
source: data["source"],
ap: data["id"],
published: published |> DateTime.to_unix()
}
end)
end)
|> Stream.each(fn objects ->
- {:ok, _} =
+ {:ok, result} =
Pleroma.HTTP.post(
"#{endpoint}/indexes/objects/documents",
Jason.encode!(objects)
)
+
+ if not Map.has_key?(Jason.decode!(result.body), "updateId") do
+ IO.puts("Failed to index: #{result}")
+ end
end)
|> Stream.run()
end,
timeout: :infinity
)
end
def run(["clear"]) do
start_pleroma()
endpoint = Pleroma.Config.get([Pleroma.Search.Meilisearch, :url])
- {:ok, _} = Pleroma.HTTP.request(:delete, "#{endpoint}/indexes/objects/documents", "", [], [])
+ {: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
end
end
diff --git a/lib/pleroma/search/meilisearch.ex b/lib/pleroma/search/meilisearch.ex
index dbe6b2d67..9fdb0a07f 100644
--- a/lib/pleroma/search/meilisearch.ex
+++ b/lib/pleroma/search/meilisearch.ex
@@ -1,75 +1,84 @@
defmodule Pleroma.Search.Meilisearch do
require Logger
require Pleroma.Constants
alias Pleroma.Activity
import Pleroma.Activity.Search
import Ecto.Query
def search(user, query, options \\ []) do
limit = Enum.min([Keyword.get(options, :limit), 40])
offset = Keyword.get(options, :offset, 0)
author = Keyword.get(options, :author)
endpoint = Pleroma.Config.get([Pleroma.Search.Meilisearch, :url])
{:ok, result} =
Pleroma.HTTP.post(
"#{endpoint}/indexes/objects/search",
Jason.encode!(%{q: query, offset: offset, limit: limit})
)
hits = Jason.decode!(result.body)["hits"] |> Enum.map(& &1["ap"])
try do
hits
|> Activity.create_by_object_ap_id()
|> Activity.with_preloaded_object()
|> Activity.with_preloaded_object()
|> Activity.restrict_deactivated_users()
|> maybe_restrict_local(user)
|> maybe_restrict_author(author)
|> maybe_restrict_blocked(user)
|> maybe_fetch(user, query)
- |> order_by([activity], desc: activity.id)
+ |> order_by([object: obj], desc: obj.data["published"])
|> Pleroma.Repo.all()
rescue
_ -> maybe_fetch([], user, query)
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
Pleroma.Constants.as_public() in object.data["to"] do
data = object.data
endpoint = Pleroma.Config.get([Pleroma.Search.Meilisearch, :url])
+ {:ok, published, _} = DateTime.from_iso8601(data["published"])
+
{:ok, result} =
Pleroma.HTTP.post(
"#{endpoint}/indexes/objects/documents",
- Jason.encode!([%{id: object.id, source: data["source"], ap: data["id"]}])
+ Jason.encode!([
+ %{
+ id: object.id,
+ source: data["source"],
+ ap: data["id"],
+ published: published |> DateTime.to_unix()
+ }
+ ])
)
if not Map.has_key?(Jason.decode!(result.body), "updateId") do
Logger.error("Failed to add activity #{activity.id} to index: #{result.body}")
end
end
end
def remove_from_index(object) do
endpoint = Pleroma.Config.get([Pleroma.Search.Meilisearch, :url])
{:ok, _} =
Pleroma.HTTP.request(
:delete,
"#{endpoint}/indexes/objects/documents/#{object.id}",
"",
[],
[]
)
end
end

File Metadata

Mime Type
text/x-diff
Expires
Sun, Nov 1, 3:50 AM (17 h, 49 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
1802378
Default Alt Text
(5 KB)

Event Timeline