diff options
| author | kaniini <ariadne@dereferenced.org> | 2019-08-03 18:55:09 +0000 |
|---|---|---|
| committer | kaniini <ariadne@dereferenced.org> | 2019-08-03 18:55:09 +0000 |
| commit | 86fffe9c275632d0ec0148df11e74c38cbdc7233 (patch) | |
| tree | 5773ba32d64564fed70162f0b30c8fa7b12f3443 | |
| parent | 4ae0a6652f2aaa04c8f96a7bfb4ffe35c8bfdeaf (diff) | |
| parent | 1fce56c7dffb84917b6943cc5919ed76e06932a5 (diff) | |
| download | pleroma-86fffe9c275632d0ec0148df11e74c38cbdc7233.tar.gz | |
Merge branch 'patch-2' into 'develop'
Add preferredUsername to service actors so Mastodon can resolve them
See merge request pleroma/pleroma!1526
| -rw-r--r-- | lib/pleroma/web/activity_pub/views/user_view.ex | 2 |
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 639519e0a..06c9e1c71 100644 --- 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) |