X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fuser.ex;h=c77704db0c9b0184f78d072548b719a079b58cb5;hb=18cd04ade576969b25e96733dddb8255fbf13a6d;hp=a10b43b780b93183fa507260397307470e249f6b;hpb=30650e5bc610810d129bf02891a73ac11340710b;p=akkoma

diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
index a10b43b78..c77704db0 100644
--- a/lib/pleroma/user.ex
+++ b/lib/pleroma/user.ex
@@ -16,12 +16,7 @@ defmodule Pleroma.User do
   end
 
   def ap_id(%User{nickname: nickname}) do
-    host =
-      Application.get_env(:pleroma, Pleroma.Web.Endpoint)
-      |> Keyword.fetch!(:url)
-      |> Keyword.fetch!(:host)
-
-    "https://#{host}/users/#{nickname}"
+    "#{Pleroma.Web.base_url}/users/#{nickname}"
   end
 
   def ap_followers(%User{} = user) do
@@ -53,4 +48,8 @@ defmodule Pleroma.User do
     |> follow_changeset(%{following: following})
     |> Repo.update
   end
+
+  def following?(%User{} = follower, %User{} = followed) do
+    Enum.member?(follower.following, User.ap_followers(followed))
+  end
 end