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