aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorrinpatch <rinpatch@sdf.org>2019-04-28 19:42:43 +0300
committerrinpatch <rinpatch@sdf.org>2019-04-28 19:42:43 +0300
commit61ca2f7a4ed1bfa5b5ae4da5b28ca3c546b1e141 (patch)
treedfb1ca1c6ca009c159150afb6a9035f2e8519d9d /lib
parent002ea343f8c6dc9669bce91942f835a2c7cc6ae7 (diff)
downloadpleroma-61ca2f7a4ed1bfa5b5ae4da5b28ca3c546b1e141.tar.gz
Fix `rights` in TwitterAPI's user entity being present only for
Admins/Moderators In !1093 I reused `maybe_with_role` for `rights` object, however I missed that `maybe_with_role` is called only for admins/moderators.
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/web/twitter_api/views/user_view.ex7
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]))