diff options
author | eugenijm <eugenijm@protonmail.com> | 2019-02-28 08:31:33 +0300 |
---|---|---|
committer | eugenijm <eugenijm@protonmail.com> | 2019-02-28 09:08:34 +0300 |
commit | 6b11011039dca5090c3a7b7b2a01f32b666be380 (patch) | |
tree | f13e7c71af2a4d8ee44656cb2d755ac176d81ae4 /lib | |
parent | 14bc6bd40f0ea7879cd75444939669ee6e6ac85c (diff) | |
download | pleroma-6b11011039dca5090c3a7b7b2a01f32b666be380.tar.gz |
Added deactivated to the user view
Diffstat (limited to 'lib')
-rw-r--r-- | lib/pleroma/web/twitter_api/views/user_view.ex | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/lib/pleroma/web/twitter_api/views/user_view.ex b/lib/pleroma/web/twitter_api/views/user_view.ex index c5034cf36..22f33e0b5 100644 --- a/lib/pleroma/web/twitter_api/views/user_view.ex +++ b/lib/pleroma/web/twitter_api/views/user_view.ex @@ -132,6 +132,7 @@ defmodule Pleroma.Web.TwitterAPI.UserView do "confirmation_pending" => user_info.confirmation_pending, "tags" => user.tags } + |> maybe_with_activation_status(user, for_user) |> maybe_with_follow_request_count(user, for_user) } @@ -148,6 +149,12 @@ defmodule Pleroma.Web.TwitterAPI.UserView do end end + defp maybe_with_activation_status(data, user, %User{info: %{is_admin: true}}) do + Map.put(data, "deactivated", user.info.deactivated) + end + + defp maybe_with_activation_status(data, _, _), do: data + defp maybe_with_follow_request_count(data, %User{id: id, info: %{locked: true}} = user, %User{ id: id }) do |