Browse Source

Merge branch 'bugfix/1442-dont-return-nil-for-following-count' into 'develop'

User: Never return nil for user follower counts.

Closes #1442

See merge request pleroma/pleroma!2017
feature/compile_get
kaniini 4 years ago
parent
commit
cb656938ca
2 changed files with 10 additions and 2 deletions
  1. +2
    -2
      lib/pleroma/web/mastodon_api/views/account_view.ex
  2. +8
    -0
      test/web/mastodon_api/views/account_view_test.exs

+ 2
- 2
lib/pleroma/web/mastodon_api/views/account_view.ex View File

@@ -74,14 +74,14 @@ defmodule Pleroma.Web.MastodonAPI.AccountView do

following_count =
if !user.hide_follows_count or !user.hide_follows or opts[:for] == user do
user.following_count
user.following_count || 0
else
0
end

followers_count =
if !user.hide_followers_count or !user.hide_followers or opts[:for] == user do
user.follower_count
user.follower_count || 0
else
0
end


+ 8
- 0
test/web/mastodon_api/views/account_view_test.exs View File

@@ -375,6 +375,14 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do
refute result.display_name == "<marquee> username </marquee>"
end

test "never display nil user follow counts" do
user = insert(:user, following_count: 0, follower_count: 0)
result = AccountView.render("show.json", %{user: user})

assert result.following_count == 0
assert result.followers_count == 0
end

describe "hiding follows/following" do
test "shows when follows/followers stats are hidden and sets follow/follower count to 0" do
user =


Loading…
Cancel
Save