diff options
| author | lain <lain@soykaf.club> | 2020-06-09 12:59:14 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-06-09 12:59:14 +0000 |
| commit | 1b746cfbbb55cd3411e809ead246c752a43361d0 (patch) | |
| tree | c9b778867189c2587be1e78bc2e7f805318d2352 /lib | |
| parent | 674efb0ad2b34cbd4bbb32d414a2c8fa8719cc02 (diff) | |
| parent | 3dd1de61a78f9571a1d886411d70cd52584e084a (diff) | |
| download | pleroma-1b746cfbbb55cd3411e809ead246c752a43361d0.tar.gz pleroma-1b746cfbbb55cd3411e809ead246c752a43361d0.zip | |
Merge branch 'add-url-to-admin-account-view' into 'develop'
Add `url` field to AdminAPI.AccountView
See merge request pleroma/pleroma!2633
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/admin_api/views/account_view.ex | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/pleroma/web/admin_api/views/account_view.ex b/lib/pleroma/web/admin_api/views/account_view.ex index 120159527..e1e929632 100644 --- a/lib/pleroma/web/admin_api/views/account_view.ex +++ b/lib/pleroma/web/admin_api/views/account_view.ex @@ -76,7 +76,8 @@ defmodule Pleroma.Web.AdminAPI.AccountView do "local" => user.local, "roles" => User.roles(user), "tags" => user.tags || [], - "confirmation_pending" => user.confirmation_pending + "confirmation_pending" => user.confirmation_pending, + "url" => user.uri || user.ap_id } end |