Otherkin.Club
/
pleroma
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Refactor

develop
Thibaut Girka 2019-08-03 18:37:20 +00:00
parent 16cfb89240
commit 1fce56c7df
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/pleroma/web/activity_pub/views/user_view.ex
View File

@ -57,7 +57,6 @@ defmodule Pleroma.Web.ActivityPub.UserView do
},
"endpoints" => endpoints
}
|> Map.merge(if user.nickname == nil do %{} else %{ "preferredUsername" => user.nickname})
|> Map.merge(Utils.make_json_ld_header())
end
@ -66,7 +65,7 @@ defmodule Pleroma.Web.ActivityPub.UserView do
do: render("service.json", %{user: user})
def render("user.json", %{user: %User{nickname: "internal." <> _} = user}),
do: render("service.json", %{user: user})
do: render("service.json", %{user: user}) |> Map.put("preferredUsername", user.nickname)
def render("user.json", %{user: user}) do
{:ok, user} = User.ensure_keys_present(user)