Browse Source

User: Never return nil for user follower counts.

feature/compile_get
lain 4 years ago
parent
commit
f36724efb1
2 changed files with 10 additions and 2 deletions
  1. +2
    -2
      lib/pleroma/user.ex
  2. +8
    -0
      test/user_test.exs

+ 2
- 2
lib/pleroma/user.ex View File

@@ -178,8 +178,8 @@ defmodule Pleroma.User do
def ap_following(%User{} = user), do: "#{ap_id(user)}/following"

def user_info(%User{} = user, args \\ %{}) do
following_count = Map.get(args, :following_count, user.following_count)
follower_count = Map.get(args, :follower_count, user.follower_count)
following_count = Map.get(args, :following_count, user.following_count) || 0
follower_count = Map.get(args, :follower_count, user.follower_count) || 0

%{
note_count: user.note_count,


+ 8
- 0
test/user_test.exs View File

@@ -1347,6 +1347,14 @@ defmodule Pleroma.UserTest do
assert User.user_info(user).follower_count == 2
end

test "with nil follower count fields, 0 will be returned" do
user = insert(:user, follower_count: nil, following_count: nil)
user_info = User.user_info(user)

assert user_info.follower_count == 0
assert user_info.following_count == 0
end

describe "list_inactive_users_query/1" do
defp days_ago(days) do
NaiveDateTime.add(


Loading…
Cancel
Save