From a2ca3b86053d0f74106bc65fddd7073d12423bbe Mon Sep 17 00:00:00 2001
From: Roger Braun <roger@rogerbraun.net>
Date: Wed, 10 May 2017 18:45:38 +0200
Subject: [PATCH] Add option to keep id for follows.
---
lib/pleroma/web/activity_pub/activity_pub.ex | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
index a5d8af995..75a34c580 100644
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -218,7 +218,7 @@ def announce(%User{ap_id: ap_id} = user, %Object{data: %{"id" => id}} = object,
{: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,
@@ -227,6 +227,8 @@ def follow(%User{ap_id: follower_id, local: actor_local}, %User{ap_id: followed_
"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)