pleroma

commit: 39d3df86c8e2ee05d409865ebc866c543a604ad9
parent 6b9a347353ff08aff1c4667567e36f3802fcaf29
Author: marcin mikołajczak <git@mkljczk.pl>
Date:   Thu, 21 Dec 2023 00:10:30 +0100

Use consistent terminology

Signed-off-by: marcin mikołajczak <git@mkljczk.pl>

Diffstat:
M
lib/pleroma/user.ex
2
+-
M
lib/pleroma/web/mastodon_api/views/instance_view.ex
2
+-
M
lib/pleroma/web/web_finger.ex
6
+++---

3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
@@ -2252,7 +2252,7 @@ defmodule Pleroma.User do
     if String.contains?(user.nickname, "@") do
       user.nickname
     else
-      host = Pleroma.Web.WebFinger.domain()
+      host = Pleroma.Web.WebFinger.host()
       user.nickname <> "@" <> host
     end
   end
diff --git a/lib/pleroma/web/mastodon_api/views/instance_view.ex b/lib/pleroma/web/mastodon_api/views/instance_view.ex
@@ -14,7 +14,7 @@ defmodule Pleroma.Web.MastodonAPI.InstanceView do
     instance = Config.get(:instance)
 
     %{
-      uri: Pleroma.Web.WebFinger.domain(),
+      uri: Pleroma.Web.WebFinger.host(),
       title: Keyword.get(instance, :name),
       description: Keyword.get(instance, :description),
       short_description: Keyword.get(instance, :short_description),
diff --git a/lib/pleroma/web/web_finger.ex b/lib/pleroma/web/web_finger.ex
@@ -70,7 +70,7 @@ defmodule Pleroma.Web.WebFinger do
 
   def represent_user(user, "JSON") do
     %{
-      "subject" => "acct:#{user.nickname}@#{domain()}",
+      "subject" => "acct:#{user.nickname}@#{host()}",
       "aliases" => gather_aliases(user),
       "links" => gather_links(user)
     }
@@ -90,13 +90,13 @@ defmodule Pleroma.Web.WebFinger do
       :XRD,
       %{xmlns: "http://docs.oasis-open.org/ns/xri/xrd-1.0"},
       [
-        {:Subject, "acct:#{user.nickname}@#{domain()}"}
+        {:Subject, "acct:#{user.nickname}@#{host()}"}
       ] ++ aliases ++ links
     }
     |> XmlBuilder.to_doc()
   end
 
-  def domain do
+  def host do
     Pleroma.Config.get([__MODULE__, :domain]) || Pleroma.Web.Endpoint.host()
   end