3 files changed, 15 insertions, 6 deletions
diff --git a/lib/pleroma/config.ex b/lib/pleroma/config.ex
index 2e15a3719..34ed2be5e 100644
--- a/lib/pleroma/config.ex
+++ b/lib/pleroma/config.ex
@@ -99,4 +99,14 @@ defmodule Pleroma.Config do
   def oauth_consumer_strategies, do: get([:auth, :oauth_consumer_strategies], [])
 
   def oauth_consumer_enabled?, do: oauth_consumer_strategies() != []
+
+  def uri do
+    key = Module.concat(["Pleroma.Web.Endpoint"])
+    url = get([key, :url]) |> Map.new()
+    struct(URI, url)
+  end
+
+  def url, do: URI.to_string(uri())
+
+  def host, do: uri().host
 end
diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
index 4c697cb1b..ed62da21d 100644
--- a/lib/pleroma/user.ex
+++ b/lib/pleroma/user.ex
@@ -33,7 +33,6 @@ defmodule Pleroma.User do
   alias Pleroma.Web.ActivityPub.Utils
   alias Pleroma.Web.CommonAPI
   alias Pleroma.Web.CommonAPI.Utils, as: CommonUtils
-  alias Pleroma.Web.Endpoint
   alias Pleroma.Web.OAuth
   alias Pleroma.Web.RelMe
   alias Pleroma.Workers.BackgroundWorker
@@ -359,7 +358,7 @@ defmodule Pleroma.User do
 
       _ ->
         unless options[:no_default] do
-          Config.get([:assets, :default_user_avatar], "#{Endpoint.url()}/images/avi.png")
+          Config.get([:assets, :default_user_avatar], "#{Config.url()}/images/avi.png")
         end
     end
   end
@@ -367,12 +366,12 @@ defmodule Pleroma.User do
   def banner_url(user, options \\ []) do
     case user.banner do
       %{"url" => [%{"href" => href} | _]} -> href
-      _ -> !options[:no_default] && "#{Endpoint.url()}/images/banner.png"
+      _ -> !options[:no_default] && "#{Config.url()}/images/banner.png"
     end
   end
 
   # Should probably be renamed or removed
-  def ap_id(%User{nickname: nickname}), do: "#{Endpoint.url()}/users/#{nickname}"
+  def ap_id(%User{nickname: nickname}), do: "#{Config.url()}/users/#{nickname}"
 
   def ap_followers(%User{follower_address: fa}) when is_binary(fa), do: fa
   def ap_followers(%User{} = user), do: "#{ap_id(user)}/followers"
@@ -1162,7 +1161,7 @@ defmodule Pleroma.User do
   @spec get_by_nickname(String.t()) :: User.t() | nil
   def get_by_nickname(nickname) do
     Repo.get_by(User, nickname: nickname) ||
-      if Regex.match?(~r(@#{Pleroma.Web.Endpoint.host()})i, nickname) do
+      if Regex.match?(~r(@#{Config.host()})i, nickname) do
         Repo.get_by(User, nickname: local_nickname(nickname))
       end
   end
diff --git a/lib/pleroma/web/views/email_view.ex b/lib/pleroma/web/views/email_view.ex
index f7659b994..84c37e1b2 100644
--- a/lib/pleroma/web/views/email_view.ex
+++ b/lib/pleroma/web/views/email_view.ex
@@ -18,6 +18,6 @@ defmodule Pleroma.Web.EmailView do
   end
 
   def admin_user_url(%{id: id}) do
-    Pleroma.Web.Endpoint.url() <> "/pleroma/admin/#/users/" <> id
+    Pleroma.Config.url() <> "/pleroma/admin/#/users/" <> id
   end
 end