mirror/pixelfed
1
0
Fork 1
mirror of https://github.com/pixelfed/pixelfed.git synced 2025-02-23 22:50:46 +00:00
Code Issues Releases Wiki Activity

AdminStatsService: do not count deleted users

Browse source
This commit is contained in:
Rm Yakovenko 2025-02-02 07:10:57 +00:00
parent 509a50b8e0
commit efcf836e6d
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/Services/AdminStatsService.php
View file

@ -90,7 +90,6 @@ class AdminStatsService
protected static function additionalData() protected static function additionalData()
{ {
$day = config('database.default') == 'pgsql' ? 'DATE_PART(\'day\',' : 'day(';
$ttl = now()->addHours(24); $ttl = now()->addHours(24);
return Cache::remember('admin:dashboard:home:data:v0:24hr', $ttl, function () { return Cache::remember('admin:dashboard:home:data:v0:24hr', $ttl, function () {
@ -99,8 +98,8 @@ class AdminStatsService
'statuses' => PrettyNumber::convert(intval(StatusService::totalLocalStatuses())), 'statuses' => PrettyNumber::convert(intval(StatusService::totalLocalStatuses())),
'statuses_monthly' => PrettyNumber::convert(Status::where('created_at', '>', now()->subMonth())->count()), 'statuses_monthly' => PrettyNumber::convert(Status::where('created_at', '>', now()->subMonth())->count()),
'profiles' => PrettyNumber::convert(Profile::count()), 'profiles' => PrettyNumber::convert(Profile::count()),
'users' => PrettyNumber::convert(User::count()), 'users' => PrettyNumber::convert(User::whereNull('status')->count()),
'users_monthly' => PrettyNumber::convert(User::where('created_at', '>', now()->subMonth())->count()), 'users_monthly' => PrettyNumber::convert(User::where('created_at', '>', now()->subMonth())->whereNull('status')->count()),
'instances' => PrettyNumber::convert(Instance::count()), 'instances' => PrettyNumber::convert(Instance::count()),
'media' => PrettyNumber::convert(Media::count()), 'media' => PrettyNumber::convert(Media::count()),
'storage' => Media::sum('size'), 'storage' => Media::sum('size'),
@ -116,7 +115,7 @@ class AdminStatsService
return [ return [
'statuses' => PrettyNumber::convert(intval(StatusService::totalLocalStatuses())), 'statuses' => PrettyNumber::convert(intval(StatusService::totalLocalStatuses())),
'profiles' => PrettyNumber::convert(Profile::count()), 'profiles' => PrettyNumber::convert(Profile::count()),
'users' => PrettyNumber::convert(User::count()), 'users' => PrettyNumber::convert(User::whereNull('status')->count()),
'instances' => PrettyNumber::convert(Instance::count()), 'instances' => PrettyNumber::convert(Instance::count()),
]; ];
}); });