alyssa
/
pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Transmogrifier: Use Containment.get_actor to get actors.

This commit is contained in:
lain 2019-08-27 12:22:30 -05:00
parent 3da65292b3
commit c30cc039e4
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/pleroma/object.ex
View File

@ -230,8 +230,4 @@ def increase_vote_count(ap_id, name) do
_ -> :noop
end
end
def get_ap_id(%{"id" => id}), do: id
def get_ap_id(id) when is_binary(id), do: id
def get_ap_id(_), do: {:error, "Object is not a string and has no id."}
end

6
lib/pleroma/web/activity_pub/transmogrifier.ex
View File

@ -464,8 +464,10 @@ def handle_incoming(
%{"type" => "Follow", "object" => followed, "actor" => follower, "id" => id} = data,
_options
) do
with %User{local: true} = followed <- User.get_cached_by_ap_id(Object.get_ap_id(followed)),
{:ok, %User{} = follower} <- User.get_or_fetch_by_ap_id(Object.get_ap_id(follower)),
with %User{local: true} = followed <-
User.get_cached_by_ap_id(Containment.get_actor(%{"actor" => followed})),
{:ok, %User{} = follower} <-
User.get_or_fetch_by_ap_id(Containment.get_actor(%{"actor" => follower})),
{:ok, activity} <- ActivityPub.follow(follower, followed, id, false) do
with deny_follow_blocked <- Pleroma.Config.get([:user, :deny_follow_blocked]),
{_, false} <- {:user_blocked, User.blocks?(followed, follower) && deny_follow_blocked},