From 4f2fb8dc5e2b4ca88d42565ccd811e1028e8c720 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?marcin=20miko=C5=82ajczak?= <git@mkljczk.pl>
Date: Thu, 21 Dec 2023 00:13:13 +0100
Subject: [PATCH] Use consistent terminology
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
---
 lib/pleroma/web/mastodon_api/views/instance_view.ex | 4 ++--
 lib/pleroma/web/web_finger.ex                       | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/pleroma/web/mastodon_api/views/instance_view.ex b/lib/pleroma/web/mastodon_api/views/instance_view.ex
index e03025a00a..f95b5360af 100644
--- a/lib/pleroma/web/mastodon_api/views/instance_view.ex
+++ b/lib/pleroma/web/mastodon_api/views/instance_view.ex
@@ -15,7 +15,7 @@ def render("show.json", _) do
 
     common_information(instance)
     |> Map.merge(%{
-      uri: Pleroma.Web.WebFinger.domain(),
+      uri: Pleroma.Web.WebFinger.host(),
       description: Keyword.get(instance, :description),
       short_description: Keyword.get(instance, :short_description),
       email: Keyword.get(instance, :email),
@@ -49,7 +49,7 @@ def render("show2.json", _) do
 
     common_information(instance)
     |> Map.merge(%{
-      domain: Pleroma.Web.WebFinger.domain(),
+      domain: Pleroma.Web.WebFinger.host(),
       source_url: Pleroma.Application.repository(),
       description: Keyword.get(instance, :short_description),
       usage: %{users: %{active_month: Pleroma.User.active_user_count()}},
diff --git a/lib/pleroma/web/web_finger.ex b/lib/pleroma/web/web_finger.ex
index b28fad8d1b..c6840f10b6 100644
--- a/lib/pleroma/web/web_finger.ex
+++ b/lib/pleroma/web/web_finger.ex
@@ -70,7 +70,7 @@ defp gather_aliases(%User{} = user) 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 @@ def represent_user(user, "XML") 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