4 files changed, 18 insertions, 19 deletions
diff --git a/lib/mix/tasks/pleroma/database.ex b/lib/mix/tasks/pleroma/database.ex
index a973beaa9..41a36851e 100644
--- a/lib/mix/tasks/pleroma/database.ex
+++ b/lib/mix/tasks/pleroma/database.ex
@@ -33,7 +33,7 @@ defmodule Mix.Tasks.Pleroma.Database do
     Logger.info("Removing embedded objects")
 
     Repo.query!(
-      "update activities set data = safe_jsonb_set(data, '{object}'::text[], data->'object'->'id') where data->'object'->>'id' is not null;",
+      "update objects set data = safe_jsonb_set(data, '{object}'::text[], data->'object'->'id') where data->'object'->>'id' is not null;",
       [],
       timeout: :infinity
     )
diff --git a/lib/pleroma/activity.ex b/lib/pleroma/activity.ex
index 4106feef6..30d8f7092 100644
--- a/lib/pleroma/activity.ex
+++ b/lib/pleroma/activity.ex
@@ -26,7 +26,7 @@ defmodule Pleroma.Activity do
 
   @cachex Pleroma.Config.get([:cachex, :provider], Cachex)
 
-  schema "activities" do
+  schema "objects" do
     field(:data, :map)
     field(:local, :boolean, default: true)
     field(:actor, :string)
diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
index 9f51a3062..3b7ff0554 100644
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -1161,7 +1161,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
   defp restrict_instance(query, %{instance: instance}) when is_binary(instance) do
     from(
       activity in query,
-      where: fragment("split_part(actor::text, '/'::text, 3) = ?", ^instance)
+      where: fragment("split_part(?::text, '/'::text, 3) = ?", activity.actor, ^instance)
     )
   end
 
diff --git a/lib/pleroma/web/activity_pub/utils.ex b/lib/pleroma/web/activity_pub/utils.ex
index c1f6b2b49..d5f0a3245 100644
--- a/lib/pleroma/web/activity_pub/utils.ex
+++ b/lib/pleroma/web/activity_pub/utils.ex
@@ -712,9 +712,10 @@ defmodule Pleroma.Web.ActivityPub.Utils do
 
   defp build_flag_object(%{statuses: statuses}) do
     Enum.map(statuses || [], &build_flag_object/1)
+    |> Enum.reject(&is_nil/1)
   end
 
-  defp build_flag_object(%Activity{data: %{"id" => id}, object: %{data: data}}) do
+  defp build_flag_object(%Activity{data: %{"id" => id, "type" => "Create"}, object: %{data: data}}) do
     activity_actor = User.get_by_ap_id(data["actor"])
 
     %{
@@ -730,28 +731,26 @@ defmodule Pleroma.Web.ActivityPub.Utils do
     }
   end
 
-  defp build_flag_object(act) when is_map(act) or is_binary(act) do
-    id =
-      case act do
-        %Activity{} = act -> act.data["id"]
-        act when is_map(act) -> act["id"]
-        act when is_binary(act) -> act
-      end
+  defp build_flag_object(%{data: %{"id" => id}}), do: build_flag_object(id)
+  defp build_flag_object(%{"id" => id}), do: build_flag_object(id)
 
-    case Activity.get_by_ap_id_with_object(id) do
-      %Activity{} = activity ->
+  defp build_flag_object(ap_id) when is_binary(ap_id) do
+    case Activity.get_by_ap_id_with_object(ap_id) do
+      %Activity{data: %{"type" => "Create"}} = activity ->
         build_flag_object(activity)
 
-      nil ->
-        if activity = Activity.get_by_object_ap_id_with_object(id) do
-          build_flag_object(activity)
-        else
-          %{"id" => id, "deleted" => true}
+      _ ->
+        case Activity.get_by_object_ap_id_with_object(ap_id) do
+          %Activity{data: %{"type" => "Create"}} = activity ->
+            build_flag_object(activity)
+
+          _ ->
+            %{"id" => ap_id, "deleted" => true}
         end
     end
   end
 
-  defp build_flag_object(_), do: []
+  defp build_flag_object(_), do: nil
 
   #### Report-related helpers
   def get_reports(params, page, page_size) do