Skip to content
Snippets Groups Projects
Commit 7e873756 authored by kaniini's avatar kaniini
Browse files

activitypub transmogrifier: use fetch_latest_follow to verify a follow object exists

parent 7cf3cf77
Branches
No related tags found
No related merge requests found
......@@ -171,12 +171,16 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
with %User{} = followed <- User.get_or_fetch_by_ap_id(actor),
{:ok, follow_activity} <- get_follow_activity(follow_object),
%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
if not User.following?(follower, followed) do
{:ok, follower} = User.follow(follower, followed)
end
{:ok, activity}
else
_e -> :error
end
end
......@@ -186,10 +190,14 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
with %User{} = followed <- User.get_or_fetch_by_ap_id(actor),
{:ok, follow_activity} <- get_follow_activity(follow_object),
%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
User.unfollow(follower, followed)
{:ok, activity}
else
_e -> :error
end
end
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment