projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
36448d6
)
Add option to keep id for follows.
author
Roger Braun
<roger@rogerbraun.net>
Wed, 10 May 2017 16:45:38 +0000
(18:45 +0200)
committer
Roger Braun
<roger@rogerbraun.net>
Wed, 10 May 2017 16:45:38 +0000
(18:45 +0200)
lib/pleroma/web/activity_pub/activity_pub.ex
patch
|
blob
|
history
diff --git
a/lib/pleroma/web/activity_pub/activity_pub.ex
b/lib/pleroma/web/activity_pub/activity_pub.ex
index a5d8af995fdb12ec7181630a990e49c3e4f6d5db..75a34c58096ae4f65665590ebd9d691ef62b1b3a 100644
(file)
--- 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
{: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,
data = %{
"type" => "Follow",
"actor" => follower_id,
@@
-227,6
+227,8
@@
defmodule Pleroma.Web.ActivityPub.ActivityPub do
"published" => make_date()
}
"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)
with {:ok, activity} <- insert(data, local) do
if actor_local do
Pleroma.Web.Federator.enqueue(:publish, activity)