diff options
| author | kaniini <nenolod@gmail.com> | 2019-04-28 23:05:14 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2019-04-28 23:05:14 +0000 |
| commit | 292c69481b6baff7511e28e25f51dbd723308241 (patch) | |
| tree | 31193504d4453eae41ec8d77f1558d1f8cda3a66 /lib | |
| parent | f2a4156d4969dee37c88e0d540eff04176673af7 (diff) | |
| parent | 61ca2f7a4ed1bfa5b5ae4da5b28ca3c546b1e141 (diff) | |
| download | pleroma-292c69481b6baff7511e28e25f51dbd723308241.tar.gz | |
Merge branch 'regression/rights-only-for-admin' into 'develop'
Fix `rights` in TwitterAPI's user entity being present only for Admins/Moderators
See merge request pleroma/pleroma!1102
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/twitter_api/views/user_view.ex | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/lib/pleroma/web/twitter_api/views/user_view.ex b/lib/pleroma/web/twitter_api/views/user_view.ex index 39b3f21c0..ea015b8f0 100644 --- a/lib/pleroma/web/twitter_api/views/user_view.ex +++ b/lib/pleroma/web/twitter_api/views/user_view.ex @@ -116,12 +116,7 @@ defmodule Pleroma.Web.TwitterAPI.UserView do |> maybe_with_activation_status(user, for_user) } |> maybe_with_user_settings(user, for_user) - - data = - if(user.info.is_admin || user.info.is_moderator, - do: maybe_with_role(data, user, for_user), - else: data - ) + |> maybe_with_role(user, for_user) if assigns[:token] do Map.put(data, "token", token_string(assigns[:token])) |