Page MenuHomePhorge
Files F85629949

No OneTemporary
Actions

Size
5 KB
Referenced Files
None
Subscribers
None

View Options

diff --git a/lib/pleroma/workers/search_indexing_worker.ex b/lib/pleroma/workers/search_indexing_worker.ex
index 43b7bad1e..70a8d42d0 100644
--- a/lib/pleroma/workers/search_indexing_worker.ex
+++ b/lib/pleroma/workers/search_indexing_worker.ex
@@ -1,21 +1,25 @@
defmodule Pleroma.Workers.SearchIndexingWorker do
use Pleroma.Workers.WorkerHelper, queue: "search_indexing"
@impl Oban.Worker
def perform(%Job{args: %{"op" => "add_to_index", "activity" => activity_id}}) do
activity = Pleroma.Activity.get_by_id_with_object(activity_id)
search_module = Pleroma.Config.get([Pleroma.Search, :module])
search_module.add_to_index(activity)
+
+ :ok
end
def perform(%Job{args: %{"op" => "remove_from_index", "object" => object_id}}) do
object = Pleroma.Object.get_by_id(object_id)
search_module = Pleroma.Config.get([Pleroma.Search, :module])
search_module.remove_from_index(object)
+
+ :ok
end
end
diff --git a/test/pleroma/search/meilisearch_test.exs b/test/pleroma/search/meilisearch_test.exs
index 251388ea2..da614577f 100644
--- a/test/pleroma/search/meilisearch_test.exs
+++ b/test/pleroma/search/meilisearch_test.exs
@@ -1,108 +1,125 @@
# Pleroma: A lightweight social networking server
# Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Search.MeilisearchTest do
require Pleroma.Constants
use Pleroma.DataCase
+ use Oban.Testing, repo: Pleroma.Repo
import Pleroma.Factory
import Tesla.Mock
import Mock
alias Pleroma.Search.Meilisearch
alias Pleroma.Web.CommonAPI
+ alias Pleroma.Workers.SearchIndexingWorker
setup_all do
Tesla.Mock.mock_global(fn env -> apply(HttpRequestMock, :request, [env]) end)
:ok
end
describe "meilisearch" do
setup do: clear_config([Pleroma.Search, :module], Meilisearch)
setup_with_mocks(
[
{Meilisearch, [:passthrough],
[
add_to_index: fn a -> passthrough([a]) end,
- remove_from_index: fn a -> passthrough([a]) end
+ remove_from_index: fn a -> passthrough([a]) end,
+ meili_put: fn u, a -> passthrough([u, a]) end
]}
],
context,
do: {:ok, context}
)
test "indexes a local post on creation" do
user = insert(:user)
mock_global(fn
- %{method: :post, url: "http://127.0.0.1:7700/indexes/objects/documents", body: body} ->
+ %{method: :put, url: "http://127.0.0.1:7700/indexes/objects/documents", body: body} ->
assert match?(
[%{"content" => "guys i just don&#39;t wanna leave the swamp"}],
Jason.decode!(body)
)
json(%{updateId: 1})
end)
{:ok, activity} =
CommonAPI.post(user, %{
status: "guys i just don't wanna leave the swamp",
visibility: "public"
})
+ args = %{"op" => "add_to_index", "activity" => activity.id}
+
+ assert_enqueued(
+ worker: SearchIndexingWorker,
+ args: args
+ )
+
+ assert :ok = perform_job(SearchIndexingWorker, args)
+
assert_called(Meilisearch.add_to_index(activity))
end
test "doesn't index posts that are not public" do
user = insert(:user)
Enum.each(["unlisted", "private", "direct"], fn visiblity ->
- {:ok, _} =
+ {:ok, activity} =
CommonAPI.post(user, %{
status: "guys i just don't wanna leave the swamp",
visibility: visiblity
})
+
+ Meilisearch.add_to_index(activity)
+ assert_not_called(Meilisearch.meili_put(:_))
end)
history = call_history(Meilisearch)
assert Enum.count(history) == 3
-
- Enum.each(history, fn {_, _, return} ->
- assert is_nil(return)
- end)
end
test "deletes posts from index when deleted locally" do
user = insert(:user)
mock_global(fn
- %{method: :post, url: "http://127.0.0.1:7700/indexes/objects/documents", body: body} ->
+ %{method: :put, url: "http://127.0.0.1:7700/indexes/objects/documents", body: body} ->
assert match?(
[%{"content" => "guys i just don&#39;t wanna leave the swamp"}],
Jason.decode!(body)
)
json(%{updateId: 1})
%{method: :delete, url: "http://127.0.0.1:7700/indexes/objects/documents/" <> id} ->
assert String.length(id) > 1
json(%{updateId: 2})
end)
{:ok, activity} =
CommonAPI.post(user, %{
status: "guys i just don't wanna leave the swamp",
visibility: "public"
})
- assert_called(Meilisearch.add_to_index(activity))
+ args = %{"op" => "add_to_index", "activity" => activity.id}
+ assert_enqueued(worker: SearchIndexingWorker, args: args)
+ assert :ok = perform_job(SearchIndexingWorker, args)
{:ok, _} = CommonAPI.delete(activity.id, user)
+ delete_args = %{"op" => "remove_from_index", "object" => activity.object.id}
+ assert_enqueued(worker: SearchIndexingWorker, args: delete_args)
+ assert :ok = perform_job(SearchIndexingWorker, delete_args)
+
assert_called(Meilisearch.remove_from_index(:_))
end
end
end

File Metadata

Mime Type
text/x-diff
Expires
Sun, Aug 9, 7:49 AM (1 d, 16 h)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
1724340
Default Alt Text
(5 KB)

Event Timeline