diff options
| author | kaniini <nenolod@gmail.com> | 2019-03-14 02:00:47 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2019-03-14 02:00:47 +0000 |
| commit | 86871c8a04e8667dc86e9ef372701109ed853d00 (patch) | |
| tree | 65e23e6b8bca32170a989a0ceb952c551c78fbc5 /lib | |
| parent | 4e72762322a5616ce426df62888ee3bc7af19dc8 (diff) | |
| parent | f3964f4024d5f5c0738e1ca8ce44742330bc0a80 (diff) | |
| download | pleroma-86871c8a04e8667dc86e9ef372701109ed853d00.tar.gz | |
Merge branch 'feature/add-local-to-users-admin-api' into 'develop'
Add "local" & "tags" to users admin API
See merge request pleroma/pleroma!932
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/mastodon_api/views/admin/account_view.ex | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/pleroma/web/mastodon_api/views/admin/account_view.ex b/lib/pleroma/web/mastodon_api/views/admin/account_view.ex index 5ce017124..787b049a3 100644 --- a/lib/pleroma/web/mastodon_api/views/admin/account_view.ex +++ b/lib/pleroma/web/mastodon_api/views/admin/account_view.ex @@ -21,7 +21,9 @@ defmodule Pleroma.Web.MastodonAPI.Admin.AccountView do "id" => user.id, "nickname" => user.nickname, "deactivated" => user.info.deactivated, - "roles" => Info.roles(user.info) + "local" => user.local, + "roles" => Info.roles(user.info), + "tags" => user.tags || [] } end end |