diff options
| author | kaniini <nenolod@gmail.com> | 2018-12-31 15:49:34 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2018-12-31 15:49:34 +0000 |
| commit | 90e157ef803296989b41d1fbfb5096b39320f75d (patch) | |
| tree | 01132d60a3977cdf69b224025280e6e06fcef07d /lib | |
| parent | 1b1e92866742e75de84201b079ffee48c769886e (diff) | |
| parent | b43d630f307110b5fa552c28c9fa0ebae09e85f2 (diff) | |
| download | pleroma-90e157ef803296989b41d1fbfb5096b39320f75d.tar.gz | |
Merge branch 'features/admin-api-user-views' into 'develop'
User/Account views: Add rights.admin
Closes #472
See merge request pleroma/pleroma!589
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/mastodon_api/mastodon_api_controller.ex | 3 | ||||
| -rw-r--r-- | lib/pleroma/web/twitter_api/views/user_view.ex | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex index 11fcd1c11..95d0f849c 100644 --- a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex +++ b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex @@ -964,7 +964,8 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do max_toot_chars: limit }, rights: %{ - delete_others_notice: !!user.info.is_moderator + delete_others_notice: !!user.info.is_moderator, + admin: !!user.info.is_admin }, compose: %{ me: "#{user.id}", diff --git a/lib/pleroma/web/twitter_api/views/user_view.ex b/lib/pleroma/web/twitter_api/views/user_view.ex index 40db0b117..a8cf83613 100644 --- a/lib/pleroma/web/twitter_api/views/user_view.ex +++ b/lib/pleroma/web/twitter_api/views/user_view.ex @@ -96,7 +96,8 @@ defmodule Pleroma.Web.TwitterAPI.UserView do "profile_image_url_profile_size" => image, "profile_image_url_original" => image, "rights" => %{ - "delete_others_notice" => !!user.info.is_moderator + "delete_others_notice" => !!user.info.is_moderator, + "admin" => !!user.info.is_admin }, "screen_name" => user.nickname, "statuses_count" => user_info[:note_count], |