Page MenuHomePhorge
Files F85651069

No OneTemporary
Actions

Size
1 KB
Referenced Files
None
Subscribers
None

View Options

diff --git a/lib/pleroma/search.ex b/lib/pleroma/search.ex
index 2c7a60c48..7eb88672b 100644
--- a/lib/pleroma/search.ex
+++ b/lib/pleroma/search.ex
@@ -1,41 +1,48 @@
defmodule Pleroma.Search do
alias Pleroma.Activity
alias Pleroma.Object
alias Pleroma.Web.ActivityPub.Visibility
alias Pleroma.Workers.SearchIndexingWorker
@spec add_to_index(Activity.t()) :: :ok | :error
- def add_to_index(%Pleroma.Activity{id: activity_id, object: %Object{} = object} = activity) do
+ def add_to_index(%Activity{id: activity_id, object: %Object{} = object} = activity) do
with {_, true} <- {:indexable, indexable?(activity)},
{_, "public"} <- {:visibility, Visibility.get_visibility(object)},
{:ok, %Oban.Job{}} <-
SearchIndexingWorker.enqueue("add_to_index", %{"activity" => activity_id}) do
:ok
else
{:indexable, false} -> :ok
{:visibility, _} -> :ok
_ -> :error
end
end
+ def add_to_index(%Activity{id: activity_id}) do
+ case Activity.get_by_id_with_object(activity_id) do
+ %Activity{} = preloaded -> add_to_index(preloaded)
+ _ -> :ok
+ end
+ end
+
@spec remove_from_index(Object.t()) :: :ok | :error
def remove_from_index(%Pleroma.Object{id: object_id}) do
case SearchIndexingWorker.enqueue("remove_from_index", %{"object" => object_id}) do
{:ok, %Oban.Job{}} -> :ok
_ -> :error
end
end
def search(query, options) do
search_module = Pleroma.Config.get([Pleroma.Search, :module])
search_module.search(options[:for_user], query, options)
end
def healthcheck_endpoints do
search_module = Pleroma.Config.get([Pleroma.Search, :module])
search_module.healthcheck_endpoints
end
- defp indexable?(%Activity{object: %Object{}, data: %{"type" => "Create"}}), do: true
+ defp indexable?(%Activity{data: %{"type" => "Create"}}), do: true
defp indexable?(_), do: false
end

File Metadata

Mime Type
text/x-diff
Expires
Sun, Aug 30, 11:32 AM (1 d, 15 h)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
1737944
Default Alt Text
(1 KB)

Event Timeline