X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fuser.ex;h=869a3eb1b5b77352b41b3920da7072ab488a2eeb;hb=6a184115a2431727b5039c1c726a8afc5eef228c;hp=7d065ae90161c378d6de30a2b0d49066de4a516c;hpb=fca7390c698fc82a41eb820bc5490fb09ddc4ea2;p=akkoma

diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
index 7d065ae90..869a3eb1b 100644
--- a/lib/pleroma/user.ex
+++ b/lib/pleroma/user.ex
@@ -6,6 +6,7 @@ defmodule Pleroma.User do
   alias Comeonin.Pbkdf2
   alias Pleroma.Web.{OStatus, Websub}
   alias Pleroma.Web.ActivityPub.ActivityPub
+  alias Pleroma.Web.ActivityPub.Utils
 
   schema "users" do
     field :bio, :string
@@ -126,7 +127,7 @@ defmodule Pleroma.User do
       { :ok, follower } = follower
       |> follow_changeset(%{following: following})
       |> Repo.update
-      { :ok, follower, ActivityPub.fetch_latest_follow(follower, followed)}
+      { :ok, follower, Utils.fetch_latest_follow(follower, followed)}
     else
       {:error, "Not subscribed!"}
     end
@@ -136,9 +137,13 @@ defmodule Pleroma.User do
     Enum.member?(follower.following, User.ap_followers(followed))
   end
 
+  def get_by_ap_id(ap_id) do
+    Repo.get_by(User, ap_id: ap_id)
+  end
+
   def get_cached_by_ap_id(ap_id) do
     key = "ap_id:#{ap_id}"
-    Cachex.get!(:user_cache, key, fallback: fn(_) -> Repo.get_by(User, ap_id: ap_id) end)
+    Cachex.get!(:user_cache, key, fallback: fn(_) -> get_by_ap_id(ap_id) end)
   end
 
   def get_cached_by_nickname(nickname) do