Commit cb656938 authored by kaniini's avatar kaniini

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 !2017
parents ef1718a0 50b15276
Pipeline #20513 passed with stages
in 50 minutes and 37 seconds
......@@ -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
......
......@@ -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 =
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment