nrd.li/akkoma
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

activitypub transmogrifier: use fetch_latest_follow to verify a follow object exists

Browse source
This commit is contained in:
William Pitcock 2018-05-26 11:07:04 +00:00
parent 7cf3cf77cf
commit 7e873756e7
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/pleroma/web/activity_pub/transmogrifier.ex
View file

@ -171,12 +171,16 @@ def handle_incoming(
with %User{} = followed <- User.get_or_fetch_by_ap_id(actor), with %User{} = followed <- User.get_or_fetch_by_ap_id(actor),
{:ok, follow_activity} <- get_follow_activity(follow_object), {:ok, follow_activity} <- get_follow_activity(follow_object),
%User{local: true} = follower <- User.get_cached_by_ap_id(follow_activity["actor"]), %User{local: true} = follower <- User.get_cached_by_ap_id(follow_activity["actor"]),
follow_activity <- Utils.fetch_latest_follow(follower, followed),
false <- is_nil(follow_activity),
{:ok, activity} <- ActivityPub.insert(data, true) do {:ok, activity} <- ActivityPub.insert(data, true) do
if not User.following?(follower, followed) do if not User.following?(follower, followed) do
{:ok, follower} = User.follow(follower, followed) {:ok, follower} = User.follow(follower, followed)
end end
{:ok, activity} {:ok, activity}
else
_e -> :error
end end
end end
@ -186,10 +190,14 @@ def handle_incoming(
with %User{} = followed <- User.get_or_fetch_by_ap_id(actor), with %User{} = followed <- User.get_or_fetch_by_ap_id(actor),
{:ok, follow_activity} <- get_follow_activity(follow_object), {:ok, follow_activity} <- get_follow_activity(follow_object),
%User{local: true} = follower <- User.get_cached_by_ap_id(follow_activity["actor"]), %User{local: true} = follower <- User.get_cached_by_ap_id(follow_activity["actor"]),
follow_activity <- Utils.fetch_latest_follow(follower, followed),
false <- is_nil(follow_activity),
{:ok, activity} <- ActivityPub.insert(data, true) do {:ok, activity} <- ActivityPub.insert(data, true) do
User.unfollow(follower, followed) User.unfollow(follower, followed)
{:ok, activity} {:ok, activity}
else
_e -> :error
end end
end end