Add one more alias for twapi twkn.

[akkoma] / lib / pleroma / web / web_finger / web_finger.ex

diff --git a/lib/pleroma/web/web_finger/web_finger.ex b/lib/pleroma/web/web_finger/web_finger.ex
index 5fa69c2c825b0179eeabd9bad069dcae87056f54..e8b738c960fa1d7c7844b14b531917c1dc7d5b1f 100644 (file)
--- a/lib/pleroma/web/web_finger/web_finger.ex
+++ b/lib/pleroma/web/web_finger/web_finger.ex
@@ -1,15 +1,17 @@
 defmodule Pleroma.Web.WebFinger do
-  alias Pleroma.XmlBuilder
-  alias Pleroma.{Repo, User}
+  @httpoison Application.get_env(:pleroma, :httpoison)
+
+  alias Pleroma.{Repo, User, XmlBuilder}
+  alias Pleroma.Web
   alias Pleroma.Web.{XML, Salmon, OStatus}
   require Logger
 
-  def host_meta() do
-    base_url  = Pleroma.Web.base_url
+  def host_meta do
+    base_url  = Web.base_url
     {
-      :XRD, %{ xmlns: "http://docs.oasis-open.org/ns/xri/xrd-1.0" },
+      :XRD, %{xmlns: "http://docs.oasis-open.org/ns/xri/xrd-1.0"},
       {
-        :Link, %{ rel: "lrdd", type: "application/xrd+xml", template: "#{base_url}/.well-known/webfinger?resource={uri}"  }
+        :Link, %{rel: "lrdd", type: "application/xrd+xml", template: "#{base_url}/.well-known/webfinger?resource={uri}"}
       }
     }
     |> XmlBuilder.to_doc
@@ -80,7 +82,7 @@ defmodule Pleroma.Web.WebFinger do
     {:ok, data}
   end
 
-  def finger(account, getter \\ &HTTPoison.get/3) do
+  def finger(account, getter \\ &@httpoison.get/3) do
     domain = with [_name, domain] <- String.split(account, "@") do
                domain
              else _e ->
@@ -101,8 +103,8 @@ defmodule Pleroma.Web.WebFinger do
       {:ok, data}
     else
       e ->
-        Logger.debug("Couldn't finger #{account}.")
-        Logger.debug(inspect(e))
+        Logger.debug(fn -> "Couldn't finger #{account}." end)
+        Logger.debug(fn -> inspect(e) end)
         {:error, e}
     end
   end