Merge branch 'fix/mastoapi-liked' into 'develop'

[akkoma] / lib / pleroma / web / activity_pub / utils.ex

diff --git a/lib/pleroma/web/activity_pub/utils.ex b/lib/pleroma/web/activity_pub/utils.ex
index 9881b7bbbc6b9886e243e7b218eb067187ecff25..2e9ffe41c40f5b2fa33049d94f7544cd450af5a0 100644 (file)
--- a/lib/pleroma/web/activity_pub/utils.ex
+++ b/lib/pleroma/web/activity_pub/utils.ex
@@ -209,12 +209,12 @@ defmodule Pleroma.Web.ActivityPub.Utils do
   """
   def insert_full_object(%{"object" => %{"type" => type} = object_data})
       when is_map(object_data) and type in @supported_object_types do
-    with {:ok, _} <- Object.create(object_data) do
-      :ok
+    with {:ok, object} <- Object.create(object_data) do
+      {:ok, object}
     end
   end
 
-  def insert_full_object(_), do: :ok
+  def insert_full_object(_), do: {:ok, nil}
 
   def update_object_in_activities(%{data: %{"id" => id}} = object) do
     # TODO
@@ -623,6 +623,7 @@ defmodule Pleroma.Web.ActivityPub.Utils do
   def make_flag_data(params, additional) do
     status_ap_ids =
       Enum.map(params.statuses || [], fn
+        %Activity{} = act -> act.data["id"]
         act when is_map(act) -> act["id"]
         act when is_binary(act) -> act
       end)