diff options
| author | kaniini <ariadne@dereferenced.org> | 2019-08-10 18:59:24 +0000 |
|---|---|---|
| committer | kaniini <ariadne@dereferenced.org> | 2019-08-10 18:59:24 +0000 |
| commit | 17d5564a9ce23eddf89ee809ccf74bd95c3a0b34 (patch) | |
| tree | 7f06092a81cabcceb6c02cf5698c1ca4bd6d8754 /lib | |
| parent | 708e7f09423eb28c97a8007b9b11bb7b94c9e296 (diff) | |
| parent | 84808e1697c3b557e4a01104389e78c63cb53528 (diff) | |
| download | pleroma-17d5564a9ce23eddf89ee809ccf74bd95c3a0b34.tar.gz | |
Merge branch 'fix/hide-follows-counters' into 'develop'
Mastodon API: Set follower/following counters to 0 when hiding followers/following is enabled
See merge request pleroma/pleroma!1544
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/mastodon_api/views/account_view.ex | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/lib/pleroma/web/mastodon_api/views/account_view.ex b/lib/pleroma/web/mastodon_api/views/account_view.ex index de084fd6e..72c092f25 100644 --- a/lib/pleroma/web/mastodon_api/views/account_view.ex +++ b/lib/pleroma/web/mastodon_api/views/account_view.ex @@ -72,6 +72,13 @@ defmodule Pleroma.Web.MastodonAPI.AccountView do image = User.avatar_url(user) |> MediaProxy.url() header = User.banner_url(user) |> MediaProxy.url() user_info = User.get_cached_user_info(user) + + following_count = + ((!user.info.hide_follows or opts[:for] == user) && user_info.following_count) || 0 + + followers_count = + ((!user.info.hide_followers or opts[:for] == user) && user_info.follower_count) || 0 + bot = (user.info.source_data["type"] || "Person") in ["Application", "Service"] emojis = @@ -102,8 +109,8 @@ defmodule Pleroma.Web.MastodonAPI.AccountView do display_name: display_name, locked: user_info.locked, created_at: Utils.to_masto_date(user.inserted_at), - followers_count: user_info.follower_count, - following_count: user_info.following_count, + followers_count: followers_count, + following_count: following_count, statuses_count: user_info.note_count, note: bio || "", url: User.profile_url(user), |