From 592955a895fff4003e62155b08209490625d156d Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Wed, 26 Jun 2024 11:04:52 -0400
Subject: [PATCH] Improve add_to_index/1 when there is no Object

---
 lib/pleroma/search.ex | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

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
@@ -5,7 +5,7 @@ defmodule Pleroma.Search do
   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{}} <-
@@ -18,6 +18,13 @@ defmodule Pleroma.Search do
     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
@@ -36,6 +43,6 @@ defmodule Pleroma.Search do
     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