pleroma

commit: cb656938ca85f44efc6d5a4d4c21050de0fca9f5
parent: ef1718a045065ec800dbd2b60879a28eb82caad8
Author: kaniini <ariadne@dereferenced.org>
Date:   Wed, 27 Nov 2019 16:46:41 +0000

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
Diffstat:
M
lib/pleroma/web/mastodon_api/views/account_view.ex
4
++--
M
test/web/mastodon_api/views/account_view_test.exs
8
++++++++

2 files changed, 10 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
@@ -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
diff --git a/test/web/mastodon_api/views/account_view_test.exs b/test/web/mastodon_api/views/account_view_test.exs
@@ -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 =