moon
/
spc-pleroma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use correct domain for fqn and InstanceView 

Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
This commit is contained in:
marcin mikołajczak 2022-11-22 23:34:23 +01:00
parent e3ea311cd5
commit 5ff3783d01
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/pleroma/user.ex
View File

@ -2252,7 +2252,7 @@ def full_nickname(%User{} = user) do
if String.contains?(user.nickname, "@") do if String.contains?(user.nickname, "@") do
user.nickname user.nickname
else else
%{host: host} = URI.parse(user.ap_id) host = Pleroma.Web.WebFinger.domain()
user.nickname <> "@" <> host user.nickname <> "@" <> host
end end
end end

2
lib/pleroma/web/mastodon_api/views/instance_view.ex
View File

@ -14,7 +14,7 @@ def render("show.json", _) do
instance = Config.get(:instance) instance = Config.get(:instance)
%{ %{
uri: Pleroma.Web.Endpoint.url(), uri: Pleroma.Web.WebFinger.domain(),
title: Keyword.get(instance, :name), title: Keyword.get(instance, :name),
description: Keyword.get(instance, :description), description: Keyword.get(instance, :description),
short_description: Keyword.get(instance, :short_description), short_description: Keyword.get(instance, :short_description),

2
lib/pleroma/web/web_finger.ex
View File

@ -96,7 +96,7 @@ def represent_user(user, "XML") do
|> XmlBuilder.to_doc() |> XmlBuilder.to_doc()
end end
defp domain do def domain do
Pleroma.Config.get([__MODULE__, :domain]) || Pleroma.Web.Endpoint.host() Pleroma.Config.get([__MODULE__, :domain]) || Pleroma.Web.Endpoint.host()
end end