logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma git clone https://hacktivis.me/git/pleroma.git
commit: b8c3dfc78c2230bb5af220a22663608b0f6c8339
parent f687befb93a9ad2c3dc61f47bdbb717cb1421ad5
Author: lain <lain@soykaf.club>
Date:   Tue, 15 Dec 2020 11:32:49 +0000

Merge branch 'chore/refactor-hide-counts' into 'develop'

Minor refactoring of the logic for hiding followers/following counts.

See merge request pleroma/pleroma!3202

Diffstat:

Mlib/pleroma/web/mastodon_api/views/account_view.ex16++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/lib/pleroma/web/mastodon_api/views/account_view.ex b/lib/pleroma/web/mastodon_api/views/account_view.ex @@ -187,18 +187,14 @@ defmodule Pleroma.Web.MastodonAPI.AccountView do header_static = User.banner_url(user) |> MediaProxy.preview_url(static: true) following_count = - if !user.hide_follows_count or !user.hide_follows or opts[:for] == user do - user.following_count || 0 - else - 0 - end + if !user.hide_follows_count or !user.hide_follows or opts[:for] == user, + do: user.following_count, + else: 0 followers_count = - if !user.hide_followers_count or !user.hide_followers or opts[:for] == user do - user.follower_count || 0 - else - 0 - end + if !user.hide_followers_count or !user.hide_followers or opts[:for] == user, + do: user.follower_count, + else: 0 bot = user.actor_type == "Service"