aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/twitter_api
diff options
context:
space:
mode:
authorkaniini <nenolod@gmail.com>2019-03-03 15:48:00 +0000
committerkaniini <nenolod@gmail.com>2019-03-03 15:48:00 +0000
commitdfdbb6f125090d55de1afd755cd55f2e1f7e77bc (patch)
tree25370c9f95e2e8e9b17ef5b7015d95ce16bd034c /lib/pleroma/web/twitter_api
parent9b63fda9c70f0fd3030ada951f3514221ae2e3aa (diff)
parentd5418e9ff78785c48bc94fbc8cb146ffe90c1fc5 (diff)
downloadpleroma-dfdbb6f125090d55de1afd755cd55f2e1f7e77bc.tar.gz
Merge branch 'remove-follow-request-count' into 'develop'
Remove follow_request_count as it's not needed for FE anymore. See merge request pleroma/pleroma!886
Diffstat (limited to 'lib/pleroma/web/twitter_api')
-rw-r--r--lib/pleroma/web/twitter_api/views/user_view.ex9
1 files changed, 0 insertions, 9 deletions
diff --git a/lib/pleroma/web/twitter_api/views/user_view.ex b/lib/pleroma/web/twitter_api/views/user_view.ex
index 22f33e0b5..e72ce977c 100644
--- a/lib/pleroma/web/twitter_api/views/user_view.ex
+++ b/lib/pleroma/web/twitter_api/views/user_view.ex
@@ -133,7 +133,6 @@ defmodule Pleroma.Web.TwitterAPI.UserView do
"tags" => user.tags
}
|> maybe_with_activation_status(user, for_user)
- |> maybe_with_follow_request_count(user, for_user)
}
data =
@@ -155,14 +154,6 @@ defmodule Pleroma.Web.TwitterAPI.UserView do
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
- Map.put(data, "follow_request_count", user.info.follow_request_count)
- end
-
- defp maybe_with_follow_request_count(data, _, _), do: data
-
defp maybe_with_role(data, %User{id: id} = user, %User{id: id}) do
Map.merge(data, %{"role" => role(user), "show_role" => user.info.show_role})
end