Commit af27e4df authored by Haelwenn's avatar Haelwenn

Merge branch 'bugfix/1670-user-count' into 'develop'

Stats: Ignore internal users for user count.

Closes #1670

See merge request pleroma/pleroma!2414
parents 28f8fcf8 f5bda09d
......@@ -45,11 +45,11 @@ def get_peers do
def init(_args) do
{:ok, get_stat_data()}
{:ok, calculate_stat_data()}
def handle_call(:force_update, _from, _state) do
new_stats = get_stat_data()
new_stats = calculate_stat_data()
{:reply, new_stats, new_stats}
......@@ -58,12 +58,12 @@ def handle_call(:get_state, _from, state) do
def handle_cast(:run_update, _state) do
new_stats = get_stat_data()
new_stats = calculate_stat_data()
{:noreply, new_stats}
defp get_stat_data do
def calculate_stat_data do
peers =
u in User,
......@@ -77,7 +77,15 @@ defp get_stat_data do
status_count = Repo.aggregate({local: true}), :sum, :note_count)
user_count = Repo.aggregate({local: true, active: true}), :count, :id)
users_query =
from(u in User,
where: u.deactivated != true,
where: u.local == true,
where: not is_nil(u.nickname),
where: not u.invisible
user_count = Repo.aggregate(users_query, :count, :id)
peers: peers,
......@@ -2,11 +2,21 @@
# Copyright © 2017-2020 Pleroma Authors <>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.StateTest do
defmodule Pleroma.StatsTest do
use Pleroma.DataCase
import Pleroma.Factory
alias Pleroma.Web.CommonAPI
describe "user count" do
test "it ignores internal users" do
_user = insert(:user, local: true)
_internal = insert(:user, local: true, nickname: nil)
_internal = Pleroma.Web.ActivityPub.Relay.get_actor()
assert match?(%{stats: %{user_count: 1}}, Pleroma.Stats.calculate_stat_data())
describe "status visibility count" do
test "on new status" do
user = insert(: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