projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into feature/releases
[akkoma]
/
lib
/
pleroma
/
stats.ex
diff --git
a/lib/pleroma/stats.ex
b/lib/pleroma/stats.ex
index 83b896a16a8d875f5324fe5b2a34d8f5e9cd8038..5b242927b07758063bcb36a2670866a365c05018 100644
(file)
--- a/
lib/pleroma/stats.ex
+++ b/
lib/pleroma/stats.ex
@@
-1,6
+1,11
@@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
defmodule Pleroma.Stats do
import Ecto.Query
defmodule Pleroma.Stats do
import Ecto.Query
- alias Pleroma.{User, Repo, Activity}
+ alias Pleroma.Repo
+ alias Pleroma.User
def start_link do
agent = Agent.start_link(fn -> {[], %{}} end, name: __MODULE__)
def start_link do
agent = Agent.start_link(fn -> {[], %{}} end, name: __MODULE__)
@@
-19,7
+24,7
@@
defmodule Pleroma.Stats do
def schedule_update do
spawn(fn ->
# 1 hour
def schedule_update do
spawn(fn ->
# 1 hour
- Process.sleep(1000 * 60 * 60
* 1
)
+ Process.sleep(1000 * 60 * 60)
schedule_update()
end)
schedule_update()
end)
@@
-29,19
+34,23
@@
defmodule Pleroma.Stats do
def update_stats do
peers =
from(
def update_stats do
peers =
from(
- u in
Pleroma.
User,
- select: fragment("distinct
?->'host'", u.info
),
+ u in User,
+ select: fragment("distinct
split_part(?, '@', 2)", u.nickname
),
where: u.local != ^true
)
|> Repo.all()
where: u.local != ^true
)
|> Repo.all()
+ |> Enum.filter(& &1)
domain_count = Enum.count(peers)
status_query =
domain_count = Enum.count(peers)
status_query =
- from(u in User.local_user_query(), select: fragment("sum((?->>'note_count')::int)", u.info))
+ from(u in User.Query.build(%{local: true}),
+ select: fragment("sum((?->>'note_count')::int)", u.info)
+ )
status_count = Repo.one(status_query)
status_count = Repo.one(status_query)
- user_count = Repo.aggregate(User.local_user_query(), :count, :id)
+
+ user_count = Repo.aggregate(User.Query.build(%{local: true, active: true}), :count, :id)
Agent.update(__MODULE__, fn _ ->
{peers, %{domain_count: domain_count, status_count: status_count, user_count: user_count}}
Agent.update(__MODULE__, fn _ ->
{peers, %{domain_count: domain_count, status_count: status_count, user_count: user_count}}