Use correct domain for fqn and InstanceView
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
This commit is contained in:
parent
e3ea311cd5
commit
5ff3783d01
@ -2252,7 +2252,7 @@ defmodule Pleroma.User do
|
||||
if String.contains?(user.nickname, "@") do
|
||||
user.nickname
|
||||
else
|
||||
%{host: host} = URI.parse(user.ap_id)
|
||||
host = Pleroma.Web.WebFinger.domain()
|
||||
user.nickname <> "@" <> host
|
||||
end
|
||||
end
|
||||
|
@ -14,7 +14,7 @@ defmodule Pleroma.Web.MastodonAPI.InstanceView do
|
||||
instance = Config.get(:instance)
|
||||
|
||||
%{
|
||||
uri: Pleroma.Web.Endpoint.url(),
|
||||
uri: Pleroma.Web.WebFinger.domain(),
|
||||
title: Keyword.get(instance, :name),
|
||||
description: Keyword.get(instance, :description),
|
||||
short_description: Keyword.get(instance, :short_description),
|
||||
|
@ -96,7 +96,7 @@ defmodule Pleroma.Web.WebFinger do
|
||||
|> XmlBuilder.to_doc()
|
||||
end
|
||||
|
||||
defp domain do
|
||||
def domain do
|
||||
Pleroma.Config.get([__MODULE__, :domain]) || Pleroma.Web.Endpoint.host()
|
||||
end
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user