mirror of
https://github.com/pixelfed/pixelfed.git
synced 2024-11-29 17:53:16 +00:00
Update AdminController
This commit is contained in:
Daniel Supernault
parent
65be6bdd51
commit
41abe9d261
2 changed files with 384 additions and 360 deletions
|
|
@ -4,11 +4,7 @@ namespace App\Http\Controllers;
|
|||
|
||||
use App\{
|
||||
Contact,
|
||||
FailedJob,
|
||||
Hashtag,
|
||||
Instance,
|
||||
Media,
|
||||
Like,
|
||||
Newsroom,
|
||||
OauthClient,
|
||||
Profile,
|
||||
|
|
@ -27,8 +23,8 @@ use App\Http\Controllers\Admin\{
|
|||
AdminSettingsController,
|
||||
AdminSupportController
|
||||
};
|
||||
use App\Util\Lexer\PrettyNumber;
|
||||
use Illuminate\Validation\Rule;
|
||||
use App\Services\AdminStatsService;
|
||||
|
||||
class AdminController extends Controller
|
||||
{
|
||||
|
|
@ -46,67 +42,7 @@ class AdminController extends Controller
|
|||
|
||||
public function home()
|
||||
{
|
||||
$day = config('database.default') == 'pgsql' ? 'DATE_PART(\'day\',' : 'day(';
|
||||
|
||||
$recent = Cache::remember('admin:dashboard:home:data:15min', now()->addMinutes(15), function() use ($day) {
|
||||
return [
|
||||
'contact' => [
|
||||
'count' => PrettyNumber::convert(Contact::whereNull('read_at')->count()),
|
||||
'graph' => Contact::selectRaw('count(*) as count, '.$day.'created_at) as d')->groupBy('d')->whereNull('read_at')->whereBetween('created_at',[now()->subDays(14), now()])->orderBy('d')->pluck('count')
|
||||
],
|
||||
'failedjobs' => [
|
||||
'count' => PrettyNumber::convert(FailedJob::where('failed_at', '>=', \Carbon\Carbon::now()->subDay())->count()),
|
||||
'graph' => FailedJob::selectRaw('count(*) as count, '.$day.'failed_at) as d')->groupBy('d')->whereBetween('failed_at',[now()->subDays(14), now()])->orderBy('d')->pluck('count')
|
||||
],
|
||||
'reports' => [
|
||||
'count' => PrettyNumber::convert(Report::whereNull('admin_seen')->count()),
|
||||
'graph' => Report::selectRaw('count(*) as count, '.$day.'created_at) as d')->whereBetween('created_at',[now()->subDays(14), now()])->groupBy('d')->orderBy('d')->pluck('count')
|
||||
],
|
||||
'statuses' => [
|
||||
'count' => PrettyNumber::convert(Status::whereNull('in_reply_to_id')->whereNull('reblog_of_id')->count()),
|
||||
'graph' => Status::selectRaw('count(*) as count, '.$day.'created_at) as day')->whereBetween('created_at',[now()->subDays(14), now()])->groupBy('day')->orderBy('day')->pluck('count')
|
||||
],
|
||||
'replies' => [
|
||||
'count' => PrettyNumber::convert(Status::whereNotNull('in_reply_to_id')->count()),
|
||||
'graph' => Status::whereNotNull('in_reply_to_id')->selectRaw('count(*) as count, '.$day.'created_at) as day')->whereBetween('created_at',[now()->subDays(14), now()])->groupBy('day')->orderBy('day')->pluck('count')
|
||||
],
|
||||
'shares' => [
|
||||
'count' => PrettyNumber::convert(Status::whereNotNull('reblog_of_id')->count()),
|
||||
'graph' => Status::whereNotNull('reblog_of_id')->selectRaw('count(*) as count, '.$day.'created_at) as day')->whereBetween('created_at',[now()->subDays(14), now()])->groupBy('day')->orderBy('day')->pluck('count')
|
||||
],
|
||||
'likes' => [
|
||||
'count' => PrettyNumber::convert(Like::count()),
|
||||
'graph' => Like::selectRaw('count(*) as count, '.$day.'created_at) as day')->whereBetween('created_at',[now()->subDays(14), now()])->groupBy('day')->orderBy('day')->pluck('count')
|
||||
],
|
||||
'profiles' => [
|
||||
'count' => PrettyNumber::convert(Profile::count()),
|
||||
'graph' => Profile::selectRaw('count(*) as count, '.$day.'created_at) as day')->whereBetween('created_at',[now()->subDays(14), now()])->groupBy('day')->orderBy('day')->pluck('count')
|
||||
],
|
||||
];
|
||||
});
|
||||
|
||||
$longer = Cache::remember('admin:dashboard:home:data:24hr', now()->addHours(24), function() use ($day) {
|
||||
return [
|
||||
'users' => [
|
||||
'count' => PrettyNumber::convert(User::count()),
|
||||
'graph' => User::selectRaw('count(*) as count, '.$day.'created_at) as day')->whereBetween('created_at',[now()->subDays(14), now()])->groupBy('day')->orderBy('day')->pluck('count')
|
||||
],
|
||||
'instances' => [
|
||||
'count' => PrettyNumber::convert(Instance::count()),
|
||||
'graph' => Instance::selectRaw('count(*) as count, '.$day.'created_at) as day')->whereBetween('created_at',[now()->subDays(28), now()])->groupBy('day')->orderBy('day')->pluck('count')
|
||||
],
|
||||
'media' => [
|
||||
'count' => PrettyNumber::convert(Media::count()),
|
||||
'graph' => Media::selectRaw('count(*) as count, '.$day.'created_at) as day')->whereBetween('created_at',[now()->subDays(14), now()])->groupBy('day')->orderBy('day')->pluck('count')
|
||||
],
|
||||
'storage' => [
|
||||
'count' => Media::sum('size'),
|
||||
'graph' => Media::selectRaw('sum(size) as count, '.$day.'created_at) as day')->whereBetween('created_at',[now()->subDays(14), now()])->groupBy('day')->orderBy('day')->pluck('count')
|
||||
]
|
||||
];
|
||||
});
|
||||
|
||||
$data = array_merge($recent, $longer);
|
||||
$data = AdminStatsService::get();
|
||||
return view('admin.home', compact('data'));
|
||||
}
|
||||
|
||||
|
|
@ -114,7 +50,10 @@ class AdminController extends Controller
|
|||
{
|
||||
$col = $request->query('col') ?? 'id';
|
||||
$dir = $request->query('dir') ?? 'desc';
|
||||
$users = User::select('id', 'username', 'status')->withCount('statuses')->orderBy($col, $dir)->simplePaginate(10);
|
||||
$users = User::select('id', 'username', 'status')
|
||||
->withCount('statuses')
|
||||
->orderBy($col, $dir)
|
||||
->simplePaginate(10);
|
||||
|
||||
return view('admin.users.home', compact('users'));
|
||||
}
|
||||
|
|
@ -169,27 +108,19 @@ class AdminController extends Controller
|
|||
'filter' => [
|
||||
'nullable',
|
||||
'string',
|
||||
Rule::in(['id','username','statuses_count','followers_count','likes_count'])
|
||||
],
|
||||
'order' => [
|
||||
'nullable',
|
||||
'string',
|
||||
Rule::in(['asc','desc'])
|
||||
],
|
||||
'layout' => [
|
||||
'nullable',
|
||||
'string',
|
||||
Rule::in(['card','list'])
|
||||
Rule::in(['all', 'local', 'remote'])
|
||||
],
|
||||
'limit' => 'nullable|integer|min:1|max:50'
|
||||
]);
|
||||
$search = $request->input('search');
|
||||
$filter = $request->input('filter');
|
||||
$order = $request->input('order') ?? 'desc';
|
||||
$limit = $request->input('limit') ?? 12;
|
||||
$limit = 12;
|
||||
if($search) {
|
||||
$profiles = Profile::select('id','username')->where('username','like', "%$search%")->orderBy('id','desc')->simplePaginate($limit);
|
||||
} else if($filter && $order) {
|
||||
$profiles = Profile::select('id','username')
|
||||
->where('username', 'like', "%$search%")
|
||||
->orderBy('id','desc')
|
||||
->simplePaginate($limit);
|
||||
} else if($filter) {
|
||||
$profiles = Profile::select('id','username')->withCount(['likes','statuses','followers'])->orderBy($filter, $order)->simplePaginate($limit);
|
||||
} else {
|
||||
$profiles = Profile::select('id','username')->orderBy('id','desc')->simplePaginate($limit);
|
||||
|
|
|
|||
93
app/Services/AdminStatsService.php
Normal file
93
app/Services/AdminStatsService.php
Normal file
|
|
@ -0,0 +1,93 @@
|
|||
<?php
|
||||
|
||||
namespace App\Services;
|
||||
|
||||
use Cache;
|
||||
use App\Util\Lexer\PrettyNumber;
|
||||
use App\{
|
||||
Contact,
|
||||
FailedJob,
|
||||
Hashtag,
|
||||
Instance,
|
||||
Media,
|
||||
Like,
|
||||
Profile,
|
||||
Report,
|
||||
Status,
|
||||
User
|
||||
};
|
||||
|
||||
class AdminStatsService
|
||||
{
|
||||
public static function get()
|
||||
{
|
||||
return array_merge(self::recentData(), self::additionalData());
|
||||
}
|
||||
|
||||
protected static function recentData()
|
||||
{
|
||||
$day = config('database.default') == 'pgsql' ? 'DATE_PART(\'day\',' : 'day(';
|
||||
return Cache::remember('admin:dashboard:home:data:15min', now()->addMinutes(15), function() use ($day) {
|
||||
return [
|
||||
'contact' => [
|
||||
'count' => PrettyNumber::convert(Contact::whereNull('read_at')->count()),
|
||||
'graph' => Contact::selectRaw('count(*) as count, '.$day.'created_at) as d')->groupBy('d')->whereNull('read_at')->whereBetween('created_at',[now()->subDays(14), now()])->orderBy('d')->pluck('count')
|
||||
],
|
||||
'failedjobs' => [
|
||||
'count' => PrettyNumber::convert(FailedJob::where('failed_at', '>=', \Carbon\Carbon::now()->subDay())->count()),
|
||||
'graph' => FailedJob::selectRaw('count(*) as count, '.$day.'failed_at) as d')->groupBy('d')->whereBetween('failed_at',[now()->subDays(14), now()])->orderBy('d')->pluck('count')
|
||||
],
|
||||
'reports' => [
|
||||
'count' => PrettyNumber::convert(Report::whereNull('admin_seen')->count()),
|
||||
'graph' => Report::selectRaw('count(*) as count, '.$day.'created_at) as d')->whereBetween('created_at',[now()->subDays(14), now()])->groupBy('d')->orderBy('d')->pluck('count')
|
||||
],
|
||||
'statuses' => [
|
||||
'count' => PrettyNumber::convert(Status::whereNull('in_reply_to_id')->whereNull('reblog_of_id')->count()),
|
||||
'graph' => Status::selectRaw('count(*) as count, '.$day.'created_at) as day')->whereBetween('created_at',[now()->subDays(14), now()])->groupBy('day')->orderBy('day')->pluck('count')
|
||||
],
|
||||
'replies' => [
|
||||
'count' => PrettyNumber::convert(Status::whereNotNull('in_reply_to_id')->count()),
|
||||
'graph' => Status::whereNotNull('in_reply_to_id')->selectRaw('count(*) as count, '.$day.'created_at) as day')->whereBetween('created_at',[now()->subDays(14), now()])->groupBy('day')->orderBy('day')->pluck('count')
|
||||
],
|
||||
'shares' => [
|
||||
'count' => PrettyNumber::convert(Status::whereNotNull('reblog_of_id')->count()),
|
||||
'graph' => Status::whereNotNull('reblog_of_id')->selectRaw('count(*) as count, '.$day.'created_at) as day')->whereBetween('created_at',[now()->subDays(14), now()])->groupBy('day')->orderBy('day')->pluck('count')
|
||||
],
|
||||
'likes' => [
|
||||
'count' => PrettyNumber::convert(Like::count()),
|
||||
'graph' => Like::selectRaw('count(*) as count, '.$day.'created_at) as day')->whereBetween('created_at',[now()->subDays(14), now()])->groupBy('day')->orderBy('day')->pluck('count')
|
||||
],
|
||||
'profiles' => [
|
||||
'count' => PrettyNumber::convert(Profile::count()),
|
||||
'graph' => Profile::selectRaw('count(*) as count, '.$day.'created_at) as day')->whereBetween('created_at',[now()->subDays(14), now()])->groupBy('day')->orderBy('day')->pluck('count')
|
||||
],
|
||||
];
|
||||
});
|
||||
}
|
||||
|
||||
protected static function additionalData()
|
||||
{
|
||||
$day = config('database.default') == 'pgsql' ? 'DATE_PART(\'day\',' : 'day(';
|
||||
return Cache::remember('admin:dashboard:home:data:24hr', now()->addHours(24), function() use ($day) {
|
||||
return [
|
||||
'users' => [
|
||||
'count' => PrettyNumber::convert(User::count()),
|
||||
'graph' => User::selectRaw('count(*) as count, '.$day.'created_at) as day')->whereBetween('created_at',[now()->subDays(14), now()])->groupBy('day')->orderBy('day')->pluck('count')
|
||||
],
|
||||
'instances' => [
|
||||
'count' => PrettyNumber::convert(Instance::count()),
|
||||
'graph' => Instance::selectRaw('count(*) as count, '.$day.'created_at) as day')->whereBetween('created_at',[now()->subDays(28), now()])->groupBy('day')->orderBy('day')->pluck('count')
|
||||
],
|
||||
'media' => [
|
||||
'count' => PrettyNumber::convert(Media::count()),
|
||||
'graph' => Media::selectRaw('count(*) as count, '.$day.'created_at) as day')->whereBetween('created_at',[now()->subDays(14), now()])->groupBy('day')->orderBy('day')->pluck('count')
|
||||
],
|
||||
'storage' => [
|
||||
'count' => Media::sum('size'),
|
||||
'graph' => Media::selectRaw('sum(size) as count, '.$day.'created_at) as day')->whereBetween('created_at',[now()->subDays(14), now()])->groupBy('day')->orderBy('day')->pluck('count')
|
||||
]
|
||||
];
|
||||
});
|
||||
}
|
||||
|
||||
}
|
||||
Loading…
Reference in a new issue