Cycles: Pleroma.Application.user_agent/0 --> Pleroma.Web.Endpoint.user_agent/0

Reduce cycles on lib/pleroma/application.ex

7 files changed, 21 insertions, 21 deletions

diff --git a/lib/pleroma/application.ex b/lib/pleroma/application.ex
index 29ac34826..8cc53b720 100644
--- a/lib/pleroma/application.ex
+++ b/lib/pleroma/application.ex
@@ -13,22 +13,6 @@ defmodule Pleroma.Application do
 
   @mix_env Mix.env()
 
-  def user_agent do
-    if Process.whereis(Pleroma.Web.Endpoint) do
-      case Config.get([:http, :user_agent], :default) do
-        :default ->
-          info = "#{Pleroma.Web.Endpoint.url()} <#{Config.get([:instance, :email], "")}>"
-          Pleroma.Project.named_version() <> "; " <> info
-
-        custom ->
-          custom
-      end
-    else
-      # fallback, if endpoint is not started yet
-      "Pleroma Data Loader"
-    end
-  end
-
   # See http://elixir-lang.org/docs/stable/elixir/Application.html
   # for more information on OTP Applications
   def start(_type, _args) do
diff --git a/lib/pleroma/http/request_builder.ex b/lib/pleroma/http/request_builder.ex
index 631c927af..cf23bc189 100644
--- a/lib/pleroma/http/request_builder.ex
+++ b/lib/pleroma/http/request_builder.ex
@@ -36,7 +36,7 @@ defmodule Pleroma.HTTP.RequestBuilder do
     headers_list =
       with true <- Pleroma.Config.get([:http, :send_user_agent]),
            nil <- Enum.find(headers, fn {key, _val} -> String.downcase(key) == "user-agent" end) do
-        [{"user-agent", Pleroma.Application.user_agent()} | headers]
+        [{"user-agent", Pleroma.Web.Endpoint.user_agent()} | headers]
       else
         _ ->
           headers
diff --git a/lib/pleroma/reverse_proxy.ex b/lib/pleroma/reverse_proxy.ex
index 406f7e2b8..9132a08da 100644
--- a/lib/pleroma/reverse_proxy.ex
+++ b/lib/pleroma/reverse_proxy.ex
@@ -292,7 +292,7 @@ defmodule Pleroma.ReverseProxy do
       headers,
       "user-agent",
       0,
-      {"user-agent", Pleroma.Application.user_agent()}
+      {"user-agent", Pleroma.Web.Endpoint.user_agent()}
     )
   end
 
diff --git a/lib/pleroma/web/endpoint.ex b/lib/pleroma/web/endpoint.ex
index 8e274de88..6a3f2daa2 100644
--- a/lib/pleroma/web/endpoint.ex
+++ b/lib/pleroma/web/endpoint.ex
@@ -198,4 +198,20 @@ defmodule Pleroma.Web.Endpoint do
   def websocket_url do
     String.replace_leading(url(), "http", "ws")
   end
+
+  def user_agent do
+    if Process.whereis(__MODULE__) do
+      case Config.get([:http, :user_agent], :default) do
+        :default ->
+          info = "#{url()} <#{Config.get([:instance, :email], "")}>"
+          Pleroma.Project.named_version() <> "; " <> info
+
+        custom ->
+          custom
+      end
+    else
+      # fallback, if endpoint is not started yet
+      "Pleroma Data Loader"
+    end
+  end
 end
diff --git a/lib/pleroma/web/rich_media/helpers.ex b/lib/pleroma/web/rich_media/helpers.ex
index 566fc8c8a..06053d7f2 100644
--- a/lib/pleroma/web/rich_media/helpers.ex
+++ b/lib/pleroma/web/rich_media/helpers.ex
@@ -79,7 +79,7 @@ defmodule Pleroma.Web.RichMedia.Helpers do
   def fetch_data_for_activity(_), do: %{}
 
   def rich_media_get(url) do
-    headers = [{"user-agent", Pleroma.Application.user_agent() <> "; Bot"}]
+    headers = [{"user-agent", Pleroma.Web.Endpoint.user_agent() <> "; Bot"}]
 
     head_check =
       case Pleroma.HTTP.head(url, headers, @options) do
diff --git a/test/pleroma/http/request_builder_test.exs b/test/pleroma/http/request_builder_test.exs
index e9b0c4a8a..a39dd8248 100644
--- a/test/pleroma/http/request_builder_test.exs
+++ b/test/pleroma/http/request_builder_test.exs
@@ -18,7 +18,7 @@ defmodule Pleroma.HTTP.RequestBuilderTest do
       clear_config([:http, :user_agent], :default)
 
       assert RequestBuilder.headers(%Request{}, []) == %Request{
-               headers: [{"user-agent", Pleroma.Application.user_agent()}]
+               headers: [{"user-agent", Pleroma.Web.Endpoint.user_agent()}]
              }
     end
 
diff --git a/test/pleroma/reverse_proxy_test.exs b/test/pleroma/reverse_proxy_test.exs
index a4dd8e99a..4c0100f69 100644
--- a/test/pleroma/reverse_proxy_test.exs
+++ b/test/pleroma/reverse_proxy_test.exs
@@ -63,7 +63,7 @@ defmodule Pleroma.ReverseProxyTest do
       |> Plug.Conn.put_req_header("user-agent", "fake/1.0")
       |> ReverseProxy.call("/user-agent")
 
-    assert json_response(conn, 200) == %{"user-agent" => Pleroma.Application.user_agent()}
+    assert json_response(conn, 200) == %{"user-agent" => Pleroma.Web.Endpoint.user_agent()}
   end
 
   test "closed connection", %{conn: conn} do