pleroma

commit: 5a9ea98baf1d64a1ba61b0f88b2b0e0334bd5ca3
parent 30ded8876ace53e7cf39f94579746d27ea94cdea
Author: Alexander Strizhakov <alex.strizhakov@gmail.com>
Date:   Thu,  4 Mar 2021 19:14:00 +0300

XML WebFinger user representation correct domain

Diffstat:
M
lib/pleroma/web/web_finger.ex
10
++++++----

1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/lib/pleroma/web/web_finger.ex b/lib/pleroma/web/web_finger.ex
@@ -71,10 +71,8 @@ defmodule Pleroma.Web.WebFinger do
   def represent_user(user, "JSON") do
     {:ok, user} = User.ensure_keys_present(user)
 
-    domain = Pleroma.Config.get([__MODULE__, :domain]) || Pleroma.Web.Endpoint.host()
-
     %{
-      "subject" => "acct:#{user.nickname}@#{domain}",
+      "subject" => "acct:#{user.nickname}@#{domain()}",
       "aliases" => gather_aliases(user),
       "links" => gather_links(user)
     }
@@ -94,12 +92,16 @@ defmodule Pleroma.Web.WebFinger do
       :XRD,
       %{xmlns: "http://docs.oasis-open.org/ns/xri/xrd-1.0"},
       [
-        {:Subject, "acct:#{user.nickname}@#{Pleroma.Web.Endpoint.host()}"}
+        {:Subject, "acct:#{user.nickname}@#{domain()}"}
       ] ++ aliases ++ links
     }
     |> XmlBuilder.to_doc()
   end
 
+  defp domain do
+    Pleroma.Config.get([__MODULE__, :domain]) || Pleroma.Web.Endpoint.host()
+  end
+
   defp webfinger_from_xml(body) do
     with {:ok, doc} <- XML.parse_document(body) do
       subject = XML.string_from_xpath("//Subject", doc)