Merge branch 'patch-3' into 'develop'

Return profile URL when available instead of actor URI for MastodonAPI mention URL

Closes #1165

See merge request pleroma/pleroma!1541
This commit is contained in:
rinpatch 2019-08-07 22:14:02 +00:00
commit b18234e04c

View File

@ -28,7 +28,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountView do
id: to_string(user.id),
acct: user.nickname,
username: username_from_nickname(user.nickname),
url: user.ap_id
url: User.profile_url(user)
}
end
@ -106,7 +106,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountView do
following_count: user_info.following_count,
statuses_count: user_info.note_count,
note: bio || "",
url: user.ap_id,
url: User.profile_url(user),
avatar: image,
avatar_static: image,
header: header,