Update nodeinfo2: Fix the way "active users count" is computed

Previously, only users having MAM messages stored where counted.
Now we count all users who have established a connexion with the server.
This commit is contained in:
pitchum 2020-11-18 11:35:20 +01:00 committed by root
parent 5609860818
commit a5e45d737e

View File

@ -45,11 +45,9 @@ per_account_storage_usage() {
user_activity() { user_activity() {
days_back=${1:-30} days_back=${1:-30}
sql="select count(distinct username) sql="select count(distinct l.username)
from archive from last l
where peer not like 'irc%' where to_timestamp(cast(l.seconds as int)) > current_timestamp - interval '${days_back} days'
and kind = 'chat'
and created_at > current_timestamp - interval '${days_back} days'
and username not in ('r.giskard', 'lisa.simpson', 'bart.simpson')" and username not in ('r.giskard', 'lisa.simpson', 'bart.simpson')"
psql -U ejabberd -h localhost ejabberd -c "${sql}" -t | grep -v '^$' | awk '{print $1}' psql -U ejabberd -h localhost ejabberd -c "${sql}" -t | grep -v '^$' | awk '{print $1}'