pleroma

commit: 86fffe9c275632d0ec0148df11e74c38cbdc7233
parent: 4ae0a6652f2aaa04c8f96a7bfb4ffe35c8bfdeaf
Author: kaniini <ariadne@dereferenced.org>
Date:   Sat,  3 Aug 2019 18:55:09 +0000

Merge branch 'patch-2' into 'develop'

Add preferredUsername to service actors so Mastodon can resolve them

See merge request pleroma/pleroma!1526
Diffstat:
M
lib/pleroma/web/activity_pub/views/user_view.ex
2
+-

1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/pleroma/web/activity_pub/views/user_view.ex b/lib/pleroma/web/activity_pub/views/user_view.ex
@@ -65,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)