Merge branch 'patch-2' into 'develop'
Add preferredUsername to service actors so Mastodon can resolve them See merge request pleroma/pleroma!1526
This commit is contained in:
commit
86fffe9c27
@ -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)
|
||||
|
Loading…
Reference in New Issue
Block a user