diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-08-07 22:14:02 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-08-07 22:14:02 +0000 |
| commit | b18234e04c76daa564e0d8157dcd09566485da24 (patch) | |
| tree | b132f78f3ad828eb4c228e869c2ed1a198a0b105 /lib | |
| parent | aa718ab8f6f290f2efb12354aff68b95e84125a4 (diff) | |
| parent | 9c0da1009aa2100a206fae13f88ea9faddcd6bbd (diff) | |
| download | pleroma-b18234e04c76daa564e0d8157dcd09566485da24.tar.gz | |
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
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/mastodon_api/views/account_view.ex | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/pleroma/web/mastodon_api/views/account_view.ex b/lib/pleroma/web/mastodon_api/views/account_view.ex index b2b06eeb9..de084fd6e 100644 --- a/lib/pleroma/web/mastodon_api/views/account_view.ex +++ b/lib/pleroma/web/mastodon_api/views/account_view.ex @@ -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, |