AkkomaGang/akkoma
AkkomaGang/akkoma
15
66
Fork 94
Code Issues 176 Pull requests 15 Projects 2 Releases 16 Packages Wiki Activity

Make search result order match the order of objects received from Meilisearch #579

Open
AdamK2003 wants to merge 1 commit from AdamK2003/akkoma:meilisearch-result-order into develop
pull from: AdamK2003/akkoma:meilisearch-result-order
merge into: AkkomaGang:develop
Conversation 1 Commits 1 Files changed 1 +7 -2
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 7dd439807f - Show all commits

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

@ -90,7 +90,7 @@ def search(user, query, options \\ []) do
hits = result["hits"] |> Enum.map(& &1["ap"]) hits = result["hits"] |> Enum.map(& &1["ap"])
try do try do
hits fetched = hits
|> Activity.create_by_object_ap_id() |> Activity.create_by_object_ap_id()
|> Activity.with_preloaded_object() |> Activity.with_preloaded_object()
|> Activity.with_preloaded_object() |> Activity.with_preloaded_object()
@ -99,8 +99,13 @@ def search(user, query, options \\ []) do
|> maybe_restrict_author(author) |> maybe_restrict_author(author)
|> maybe_restrict_blocked(user) |> maybe_restrict_blocked(user)
|> maybe_fetch(user, query) |> maybe_fetch(user, query)
|> order_by([object: obj], desc: obj.data["published"]) # |> order_by([object: obj], desc: obj.data["published"])
|> Pleroma.Repo.all() |> Pleroma.Repo.all()
for hit <- hits do
Enum.find(fetched, fn object -> object.data["object"] == hit end)
end
rescue rescue
_ -> maybe_fetch([], user, query) _ -> maybe_fetch([], user, query)
end end