aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThibaut Girka <thib.pleroma-6b5f@sitedethib.com>2019-08-03 18:37:20 +0000
committerThibaut Girka <thib.pleroma-6b5f@sitedethib.com>2019-08-03 18:37:20 +0000
commit1fce56c7dffb84917b6943cc5919ed76e06932a5 (patch)
tree50b2eb21321d5a160e56d752dfa5c6408e6fb580
parent16cfb89240f9f56752ba8d91d84ce81a70f8d6cf (diff)
downloadpleroma-1fce56c7dffb84917b6943cc5919ed76e06932a5.tar.gz
Refactor
-rw-r--r--lib/pleroma/web/activity_pub/views/user_view.ex3
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/pleroma/web/activity_pub/views/user_view.ex b/lib/pleroma/web/activity_pub/views/user_view.ex
index 8fe38927f..06c9e1c71 100644
--- a/lib/pleroma/web/activity_pub/views/user_view.ex
+++ b/lib/pleroma/web/activity_pub/views/user_view.ex
@@ -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)