From 8b88e2a6e2b3a777ca99bf94676ab47f2d4cc0ea Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Wed, 22 Apr 2020 15:31:37 +0200
Subject: [PATCH 1/2] Stats: Ignore internal users for user count.
---
lib/pleroma/stats.ex | 19 ++++++++++++++-----
test/{stat_test.exs => stats_test.exs} | 13 ++++++++++++-
2 files changed, 26 insertions(+), 6 deletions(-)
rename test/{stat_test.exs => stats_test.exs} (84%)
diff --git a/lib/pleroma/stats.ex b/lib/pleroma/stats.ex
index 4446562ac..6763786a7 100644
--- a/lib/pleroma/stats.ex
+++ b/lib/pleroma/stats.ex
@@ -45,11 +45,11 @@ defmodule Pleroma.Stats do
end
def init(_args) do
- {:ok, get_stat_data()}
+ {:ok, calculate_stat_data()}
end
def handle_call(:force_update, _from, _state) do
- new_stats = get_stat_data()
+ new_stats = calculate_stat_data()
{:reply, new_stats, new_stats}
end
@@ -58,12 +58,12 @@ defmodule Pleroma.Stats do
end
def handle_cast(:run_update, _state) do
- new_stats = get_stat_data()
+ new_stats = calculate_stat_data()
{:noreply, new_stats}
end
- defp get_stat_data do
+ def calculate_stat_data do
peers =
from(
u in User,
@@ -77,7 +77,16 @@ defmodule Pleroma.Stats do
status_count = Repo.aggregate(User.Query.build(%{local: true}), :sum, :note_count)
- user_count = Repo.aggregate(User.Query.build(%{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: fragment("? not like 'internal.%'", u.nickname),
+ where: fragment("? not like '%/relay'", u.ap_id)
+ )
+
+ user_count = Repo.aggregate(users_query, :count, :id)
%{
peers: peers,
diff --git a/test/stat_test.exs b/test/stats_test.exs
similarity index 84%
rename from test/stat_test.exs
rename to test/stats_test.exs
index bccc1c8d0..73c7c1495 100644
--- a/test/stat_test.exs
+++ b/test/stats_test.exs
@@ -2,11 +2,22 @@
# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
# 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 = insert(:user, local: true, nickname: "internal.dude")
+ _internal = Pleroma.Web.ActivityPub.Relay.get_actor()
+
+ assert match?(%{stats: %{user_count: 1}}, Pleroma.Stats.calculate_stat_data())
+ end
+ end
+
describe "status visibility count" do
test "on new status" do
user = insert(:user)
From f5bda09de648a6de3151c8614005ebc70447facb Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Wed, 22 Apr 2020 19:02:22 +0200
Subject: [PATCH 2/2] Stats: Use `invisible` property for filtering.
---
lib/pleroma/stats.ex | 3 +--
test/stats_test.exs | 1 -
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/lib/pleroma/stats.ex b/lib/pleroma/stats.ex
index 6763786a7..8d2809bbb 100644
--- a/lib/pleroma/stats.ex
+++ b/lib/pleroma/stats.ex
@@ -82,8 +82,7 @@ defmodule Pleroma.Stats do
where: u.deactivated != true,
where: u.local == true,
where: not is_nil(u.nickname),
- where: fragment("? not like 'internal.%'", u.nickname),
- where: fragment("? not like '%/relay'", u.ap_id)
+ where: not u.invisible
)
user_count = Repo.aggregate(users_query, :count, :id)
diff --git a/test/stats_test.exs b/test/stats_test.exs
index 73c7c1495..c1aeb2c7f 100644
--- a/test/stats_test.exs
+++ b/test/stats_test.exs
@@ -11,7 +11,6 @@ defmodule Pleroma.StatsTest do
test "it ignores internal users" do
_user = insert(:user, local: true)
_internal = insert(:user, local: true, nickname: nil)
- _internal = insert(:user, local: true, nickname: "internal.dude")
_internal = Pleroma.Web.ActivityPub.Relay.get_actor()
assert match?(%{stats: %{user_count: 1}}, Pleroma.Stats.calculate_stat_data())