aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorThibaut Girka <thib.pleroma-6b5f@sitedethib.com>2019-08-03 18:28:08 +0000
committerThibaut Girka <thib.pleroma-6b5f@sitedethib.com>2019-08-03 18:28:08 +0000
commit16cfb89240f9f56752ba8d91d84ce81a70f8d6cf (patch)
tree17436f7401edb8a5522a67c3e99e4e100e0d5099 /lib
parenta187dbb326f8fa3dfe19a113f4db5ed0a95435cb (diff)
downloadpleroma-16cfb89240f9f56752ba8d91d84ce81a70f8d6cf.tar.gz
Only add `preferredUsername` to service actor json when the underlying user actually has a username
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/web/activity_pub/views/user_view.ex2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/activity_pub/views/user_view.ex b/lib/pleroma/web/activity_pub/views/user_view.ex
index 4a83ac980..8fe38927f 100644
--- a/lib/pleroma/web/activity_pub/views/user_view.ex
+++ b/lib/pleroma/web/activity_pub/views/user_view.ex
@@ -45,7 +45,6 @@ defmodule Pleroma.Web.ActivityPub.UserView do
"following" => "#{user.ap_id}/following",
"followers" => "#{user.ap_id}/followers",
"inbox" => "#{user.ap_id}/inbox",
- "preferredUsername" => user.nickname,
"name" => "Pleroma",
"summary" =>
"An internal service actor for this Pleroma instance. No user-serviceable parts inside.",
@@ -58,6 +57,7 @@ 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