logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma
commit: a2ca3b86053d0f74106bc65fddd7073d12423bbe
parent: 36448d6483c7f53266052e72bd39b04558478410
Author: Roger Braun <roger@rogerbraun.net>
Date:   Wed, 10 May 2017 18:45:38 +0200

Add option to keep id for follows.

Diffstat:

Mlib/pleroma/web/activity_pub/activity_pub.ex4+++-
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 @@ -218,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, @@ -227,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)