Fix report api

2 files changed, 9 insertions, 2 deletions

diff --git a/lib/pleroma/web/activity_pub/utils.ex b/lib/pleroma/web/activity_pub/utils.ex
index dacacb83b..22057e703 100644
--- a/lib/pleroma/web/activity_pub/utils.ex
+++ b/lib/pleroma/web/activity_pub/utils.ex
@@ -695,6 +695,11 @@ defmodule Pleroma.Web.ActivityPub.Utils do
     Enum.map(statuses || [], &build_flag_object/1)
   end
 
+  defp build_flag_object(%Activity{} = activity) do
+    object = Object.normalize(activity, fetch: false)
+    build_flag_object(object)
+  end
+
   defp build_flag_object(%Object{data: data}) do
     actor = User.get_by_ap_id(data["actor"])
     id = data["id"]
diff --git a/lib/pleroma/web/admin_api/report.ex b/lib/pleroma/web/admin_api/report.ex
index 6856bfcb3..c79bee27e 100644
--- a/lib/pleroma/web/admin_api/report.ex
+++ b/lib/pleroma/web/admin_api/report.ex
@@ -18,10 +18,12 @@ defmodule Pleroma.Web.AdminAPI.Report do
       |> Enum.reject(&is_nil(&1))
       |> Enum.map(fn
         act when is_map(act) ->
-          Activity.get_by_ap_id_with_object(act["id"]) || make_fake_activity(act, user)
+          Activity.get_create_by_object_ap_id_with_object(act["id"]) ||
+            Activity.get_by_ap_id_with_object(act["id"]) || make_fake_activity(act, user)
 
         act when is_binary(act) ->
-          Activity.get_by_ap_id_with_object(act)
+          Activity.get_create_by_object_ap_id_with_object(act) ||
+            Activity.get_by_ap_id_with_object(act)
       end)
 
     %{report: report, user: user, account: account, statuses: statuses}