Fetch user on externalprofile if we don't know him

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

diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
index e25555adf822e1506f0408f19a1b479c33b0e2e1..75a34c58096ae4f65665590ebd9d691ef62b1b3a 100644 (file)
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -2,21 +2,27 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
   alias Pleroma.{Activity, Repo, Object, Upload, User, Web}
   alias Ecto.{Changeset, UUID}
   import Ecto.Query
+  require Logger
 
   def insert(map, local \\ true) when is_map(map) do
     map = map
     |> Map.put_new_lazy("id", &generate_activity_id/0)
     |> Map.put_new_lazy("published", &make_date/0)
 
-    map = if is_map(map["object"]) do
-      object = Map.put_new_lazy(map["object"], "id", &generate_object_id/0)
-      Repo.insert!(%Object{data: object})
-      Map.put(map, "object", object)
-    else
-      map
-    end
+    with %Activity{} = activity <- Activity.get_by_ap_id(map["id"]) do
+      Logger.debug(fn -> "Already have activity, #{activity.id}, not inserting." end)
+      {:ok, activity}
+    else _e ->
+      map = if is_map(map["object"]) do
+        object = Map.put_new_lazy(map["object"], "id", &generate_object_id/0)
+        Repo.insert!(%Object{data: object})
+        Map.put(map, "object", object)
+      else
+        map
+      end
 
-    Repo.insert(%Activity{data: map, local: local})
+      Repo.insert(%Activity{data: map, local: local})
+    end
   end
 
   def create(to, actor, context, object, additional \\ %{}, published \\ nil, local \\ true) do
@@ -212,7 +218,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
     {:ok, activity, object}
   end
 
-  def follow(%User{ap_id: follower_id, local: actor_local}, %User{ap_id: followed_id}, local \\ true) do
+  def follow(%User{ap_id: follower_id, local: actor_local}, %User{ap_id: followed_id}, activity_id \\ nil, local \\ true) do
     data = %{
       "type" => "Follow",
       "actor" => follower_id,
@@ -221,6 +227,8 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
       "published" => make_date()
     }
 
+    data = if activity_id, do: Map.put(data, "id", activity_id), else: data
+
     with {:ok, activity} <- insert(data, local) do
       if actor_local do
         Pleroma.Web.Federator.enqueue(:publish, activity)