X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fpleroma%2Ffollowing_relationship.ex;h=b8cb3bf0372a3960fcbbc484e77956553fcd86ca;hb=5ebffd5224729413e53a55ddda9a1f86224d7d73;hp=cc381af53f1e47986d70bdfbe0b272044829edb4;hpb=8b9742ecf546c37695229d54f0a0b3ed4edd66e1;p=akkoma diff --git a/lib/pleroma/following_relationship.ex b/lib/pleroma/following_relationship.ex index cc381af53..b8cb3bf03 100644 --- a/lib/pleroma/following_relationship.ex +++ b/lib/pleroma/following_relationship.ex @@ -30,24 +30,9 @@ defmodule Pleroma.FollowingRelationship do end def get(%User{} = follower, %User{} = following) do - following_relationship = - __MODULE__ - |> where(follower_id: ^follower.id, following_id: ^following.id) - |> Repo.one() - - case {following_relationship, following.local} do - {nil, false} -> - case Pleroma.Web.ActivityPub.Utils.fetch_latest_follow(follower, following) do - %{data: %{"state" => state}} when state in ["pending", "accept"] -> - %{state: state} - - _ -> - nil - end - - {following_relationship, _} -> - following_relationship - end + __MODULE__ + |> where(follower_id: ^follower.id, following_id: ^following.id) + |> Repo.one() end def update(follower, following, "reject"), do: unfollow(follower, following)