UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-12-02 03:03:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update AdminController

Browse source
This commit is contained in:
Daniel Supernault 2020-01-22 22:15:11 -07:00
parent 65be6bdd51
commit 41abe9d261
No known key found for this signature in database
GPG key ID: 0DEF1C662C9033F7
2 changed files with 384 additions and 360 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

649
app/Http/Controllers/AdminController.php
View file

@ -3,405 +3,336 @@
namespace App\Http\Controllers; namespace App\Http\Controllers;
use App\{ use App\{
Contact, Contact,
FailedJob, Hashtag,
Hashtag, Newsroom,
Instance, OauthClient,
Media, Profile,
Like, Report,
Newsroom, Status,
OauthClient, User
Profile,
Report,
Status,
User
}; };
use DB, Cache; use DB, Cache;
use Carbon\Carbon; use Carbon\Carbon;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use App\Http\Controllers\Admin\{ use App\Http\Controllers\Admin\{
AdminDiscoverController, AdminDiscoverController,
AdminInstanceController, AdminInstanceController,
AdminReportController, AdminReportController,
AdminMediaController, AdminMediaController,
AdminSettingsController, AdminSettingsController,
AdminSupportController AdminSupportController
}; };
use App\Util\Lexer\PrettyNumber;
use Illuminate\Validation\Rule; use Illuminate\Validation\Rule;
use App\Services\AdminStatsService;
class AdminController extends Controller class AdminController extends Controller
{ {
use AdminReportController, use AdminReportController,
AdminDiscoverController, AdminDiscoverController,
AdminMediaController, AdminMediaController,
AdminSettingsController, AdminSettingsController,
AdminInstanceController; AdminInstanceController;
public function __construct() public function __construct()
{ {
$this->middleware('admin'); $this->middleware('admin');
$this->middleware('twofactor'); $this->middleware('twofactor');
} }
public function home() public function home()
{ {
$day = config('database.default') == 'pgsql' ? 'DATE_PART(\'day\',' : 'day('; $data = AdminStatsService::get();
return view('admin.home', compact('data'));
}
$recent = Cache::remember('admin:dashboard:home:data:15min', now()->addMinutes(15), function() use ($day) { public function users(Request $request)
return [ {
'contact' => [ $col = $request->query('col') ?? 'id';
'count' => PrettyNumber::convert(Contact::whereNull('read_at')->count()), $dir = $request->query('dir') ?? 'desc';
'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') $users = User::select('id', 'username', 'status')
], ->withCount('statuses')
'failedjobs' => [ ->orderBy($col, $dir)
'count' => PrettyNumber::convert(FailedJob::where('failed_at', '>=', \Carbon\Carbon::now()->subDay())->count()), ->simplePaginate(10);
'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 view('admin.users.home', compact('users'));
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); public function editUser(Request $request, $id)
return view('admin.home', compact('data')); {
} $user = User::findOrFail($id);
$profile = $user->profile;
return view('admin.users.edit', compact('user', 'profile'));
}
public function users(Request $request) public function statuses(Request $request)
{ {
$col = $request->query('col') ?? 'id'; $statuses = Status::orderBy('id', 'desc')->simplePaginate(10);
$dir = $request->query('dir') ?? 'desc';
$users = User::select('id', 'username', 'status')->withCount('statuses')->orderBy($col, $dir)->simplePaginate(10);
return view('admin.users.home', compact('users')); return view('admin.statuses.home', compact('statuses'));
} }
public function editUser(Request $request, $id) public function showStatus(Request $request, $id)
{ {
$user = User::findOrFail($id); $status = Status::findOrFail($id);
$profile = $user->profile;
return view('admin.users.edit', compact('user', 'profile'));
}
public function statuses(Request $request) return view('admin.statuses.show', compact('status'));
{ }
$statuses = Status::orderBy('id', 'desc')->simplePaginate(10);
return view('admin.statuses.home', compact('statuses')); public function reports(Request $request)
} {
$this->validate($request, [
'filter' => 'nullable|string|in:all,open,closed'
]);
$filter = $request->input('filter');
$reports = Report::orderBy('created_at','desc')
->when($filter, function($q, $filter) {
return $filter == 'open' ?
$q->whereNull('admin_seen') :
$q->whereNotNull('admin_seen');
})
->paginate(4);
return view('admin.reports.home', compact('reports'));
}
public function showStatus(Request $request, $id) public function showReport(Request $request, $id)
{ {
$status = Status::findOrFail($id); $report = Report::findOrFail($id);
return view('admin.reports.show', compact('report'));
}
return view('admin.statuses.show', compact('status')); public function profiles(Request $request)
} {
$this->validate($request, [
'search' => 'nullable|string|max:250',
'filter' => [
'nullable',
'string',
Rule::in(['all', 'local', 'remote'])
],
'limit' => 'nullable|integer|min:1|max:50'
]);
$search = $request->input('search');
$filter = $request->input('filter');
$limit = 12;
if($search) {
$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);
}
public function reports(Request $request) return view('admin.profiles.home', compact('profiles'));
{ }
$this->validate($request, [
'filter' => 'nullable|string|in:all,open,closed'
]);
$filter = $request->input('filter');
$reports = Report::orderBy('created_at','desc')
->when($filter, function($q, $filter) {
return $filter == 'open' ?
$q->whereNull('admin_seen') :
$q->whereNotNull('admin_seen');
})
->paginate(4);
return view('admin.reports.home', compact('reports'));
}
public function showReport(Request $request, $id) public function profileShow(Request $request, $id)
{ {
$report = Report::findOrFail($id); $profile = Profile::findOrFail($id);
return view('admin.reports.show', compact('report')); $user = $profile->user;
} return view('admin.profiles.edit', compact('profile', 'user'));
}
public function profiles(Request $request) public function appsHome(Request $request)
{ {
$this->validate($request, [ $filter = $request->input('filter');
'search' => 'nullable|string|max:250', if(in_array($filter, ['revoked'])) {
'filter' => [ $apps = OauthClient::with('user')
'nullable', ->whereNotNull('user_id')
'string', ->whereRevoked(true)
Rule::in(['id','username','statuses_count','followers_count','likes_count']) ->orderByDesc('id')
], ->paginate(10);
'order' => [ } else {
'nullable', $apps = OauthClient::with('user')
'string', ->whereNotNull('user_id')
Rule::in(['asc','desc']) ->orderByDesc('id')
], ->paginate(10);
'layout' => [ }
'nullable', return view('admin.apps.home', compact('apps'));
'string', }
Rule::in(['card','list'])
],
'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;
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')->withCount(['likes','statuses','followers'])->orderBy($filter, $order)->simplePaginate($limit);
} else {
$profiles = Profile::select('id','username')->orderBy('id','desc')->simplePaginate($limit);
}
return view('admin.profiles.home', compact('profiles')); public function hashtagsHome(Request $request)
} {
$hashtags = Hashtag::orderByDesc('id')->paginate(10);
return view('admin.hashtags.home', compact('hashtags'));
}
public function profileShow(Request $request, $id) public function messagesHome(Request $request)
{ {
$profile = Profile::findOrFail($id); $messages = Contact::orderByDesc('id')->paginate(10);
$user = $profile->user; return view('admin.messages.home', compact('messages'));
return view('admin.profiles.edit', compact('profile', 'user')); }
}
public function appsHome(Request $request) public function messagesShow(Request $request, $id)
{ {
$filter = $request->input('filter'); $message = Contact::findOrFail($id);
if(in_array($filter, ['revoked'])) { return view('admin.messages.show', compact('message'));
$apps = OauthClient::with('user') }
->whereNotNull('user_id')
->whereRevoked(true)
->orderByDesc('id')
->paginate(10);
} else {
$apps = OauthClient::with('user')
->whereNotNull('user_id')
->orderByDesc('id')
->paginate(10);
}
return view('admin.apps.home', compact('apps'));
}
public function hashtagsHome(Request $request) public function messagesMarkRead(Request $request)
{ {
$hashtags = Hashtag::orderByDesc('id')->paginate(10); $this->validate($request, [
return view('admin.hashtags.home', compact('hashtags')); 'id' => 'required|integer|min:1'
} ]);
$id = $request->input('id');
$message = Contact::findOrFail($id);
if($message->read_at) {
return;
}
$message->read_at = now();
$message->save();
return;
}
public function messagesHome(Request $request) public function newsroomHome(Request $request)
{ {
$messages = Contact::orderByDesc('id')->paginate(10); $newsroom = Newsroom::latest()->paginate(10);
return view('admin.messages.home', compact('messages')); return view('admin.newsroom.home', compact('newsroom'));
} }
public function messagesShow(Request $request, $id) public function newsroomCreate(Request $request)
{ {
$message = Contact::findOrFail($id); return view('admin.newsroom.create');
return view('admin.messages.show', compact('message')); }
}
public function messagesMarkRead(Request $request) public function newsroomEdit(Request $request, $id)
{ {
$this->validate($request, [ $news = Newsroom::findOrFail($id);
'id' => 'required|integer|min:1' return view('admin.newsroom.edit', compact('news'));
]); }
$id = $request->input('id');
$message = Contact::findOrFail($id);
if($message->read_at) {
return;
}
$message->read_at = now();
$message->save();
return;
}
public function newsroomHome(Request $request) public function newsroomDelete(Request $request, $id)
{ {
$newsroom = Newsroom::latest()->paginate(10); $news = Newsroom::findOrFail($id);
return view('admin.newsroom.home', compact('newsroom')); $news->delete();
} return redirect('/i/admin/newsroom');
}
public function newsroomCreate(Request $request) public function newsroomUpdate(Request $request, $id)
{ {
return view('admin.newsroom.create'); $this->validate($request, [
} 'title' => 'required|string|min:1|max:100',
'summary' => 'nullable|string|max:200',
'body' => 'nullable|string'
]);
$changed = false;
$changedFields = [];
$news = Newsroom::findOrFail($id);
$fields = [
'title' => 'string',
'summary' => 'string',
'body' => 'string',
'category' => 'string',
'show_timeline' => 'boolean',
'auth_only' => 'boolean',
'show_link' => 'boolean',
'force_modal' => 'boolean',
'published' => 'published'
];
foreach($fields as $field => $type) {
switch ($type) {
case 'string':
if($request->{$field} != $news->{$field}) {
if($field == 'title') {
$news->slug = str_slug($request->{$field});
}
$news->{$field} = $request->{$field};
$changed = true;
array_push($changedFields, $field);
}
break;
public function newsroomEdit(Request $request, $id) case 'boolean':
{ $state = $request->{$field} == 'on' ? true : false;
$news = Newsroom::findOrFail($id); if($state != $news->{$field}) {
return view('admin.newsroom.edit', compact('news')); $news->{$field} = $state;
} $changed = true;
array_push($changedFields, $field);
}
break;
case 'published':
$state = $request->{$field} == 'on' ? true : false;
$published = $news->published_at != null;
if($state != $published) {
$news->published_at = $state ? now() : null;
$changed = true;
array_push($changedFields, $field);
}
break;
public function newsroomDelete(Request $request, $id) }
{ }
$news = Newsroom::findOrFail($id);
$news->delete();
return redirect('/i/admin/newsroom');
}
public function newsroomUpdate(Request $request, $id) if($changed) {
{ $news->save();
$this->validate($request, [ }
'title' => 'required|string|min:1|max:100', $redirect = $news->published_at ? $news->permalink() : $news->editUrl();
'summary' => 'nullable|string|max:200', return redirect($redirect);
'body' => 'nullable|string' }
]);
$changed = false;
$changedFields = [];
$news = Newsroom::findOrFail($id);
$fields = [
'title' => 'string',
'summary' => 'string',
'body' => 'string',
'category' => 'string',
'show_timeline' => 'boolean',
'auth_only' => 'boolean',
'show_link' => 'boolean',
'force_modal' => 'boolean',
'published' => 'published'
];
foreach($fields as $field => $type) {
switch ($type) {
case 'string':
if($request->{$field} != $news->{$field}) {
if($field == 'title') {
$news->slug = str_slug($request->{$field});
}
$news->{$field} = $request->{$field};
$changed = true;
array_push($changedFields, $field);
}
break;
case 'boolean':
$state = $request->{$field} == 'on' ? true : false;
if($state != $news->{$field}) {
$news->{$field} = $state;
$changed = true;
array_push($changedFields, $field);
}
break;
case 'published':
$state = $request->{$field} == 'on' ? true : false;
$published = $news->published_at != null;
if($state != $published) {
$news->published_at = $state ? now() : null;
$changed = true;
array_push($changedFields, $field);
}
break;
}
}
if($changed) {
$news->save();
}
$redirect = $news->published_at ? $news->permalink() : $news->editUrl();
return redirect($redirect);
}
public function newsroomStore(Request $request) public function newsroomStore(Request $request)
{ {
$this->validate($request, [ $this->validate($request, [
'title' => 'required|string|min:1|max:100', 'title' => 'required|string|min:1|max:100',
'summary' => 'nullable|string|max:200', 'summary' => 'nullable|string|max:200',
'body' => 'nullable|string' 'body' => 'nullable|string'
]); ]);
$changed = false; $changed = false;
$changedFields = []; $changedFields = [];
$news = new Newsroom(); $news = new Newsroom();
$fields = [ $fields = [
'title' => 'string', 'title' => 'string',
'summary' => 'string', 'summary' => 'string',
'body' => 'string', 'body' => 'string',
'category' => 'string', 'category' => 'string',
'show_timeline' => 'boolean', 'show_timeline' => 'boolean',
'auth_only' => 'boolean', 'auth_only' => 'boolean',
'show_link' => 'boolean', 'show_link' => 'boolean',
'force_modal' => 'boolean', 'force_modal' => 'boolean',
'published' => 'published' 'published' => 'published'
]; ];
foreach($fields as $field => $type) { foreach($fields as $field => $type) {
switch ($type) { switch ($type) {
case 'string': case 'string':
if($request->{$field} != $news->{$field}) { if($request->{$field} != $news->{$field}) {
if($field == 'title') { if($field == 'title') {
$news->slug = str_slug($request->{$field}); $news->slug = str_slug($request->{$field});
} }
$news->{$field} = $request->{$field}; $news->{$field} = $request->{$field};
$changed = true; $changed = true;
array_push($changedFields, $field); array_push($changedFields, $field);
} }
break; break;
case 'boolean': case 'boolean':
$state = $request->{$field} == 'on' ? true : false; $state = $request->{$field} == 'on' ? true : false;
if($state != $news->{$field}) { if($state != $news->{$field}) {
$news->{$field} = $state; $news->{$field} = $state;
$changed = true; $changed = true;
array_push($changedFields, $field); array_push($changedFields, $field);
} }
break; break;
case 'published': case 'published':
$state = $request->{$field} == 'on' ? true : false; $state = $request->{$field} == 'on' ? true : false;
$published = $news->published_at != null; $published = $news->published_at != null;
if($state != $published) { if($state != $published) {
$news->published_at = $state ? now() : null; $news->published_at = $state ? now() : null;
$changed = true; $changed = true;
array_push($changedFields, $field); array_push($changedFields, $field);
} }
break; break;
} }
} }
if($changed) { if($changed) {
$news->save(); $news->save();
} }
$redirect = $news->published_at ? $news->permalink() : $news->editUrl(); $redirect = $news->published_at ? $news->permalink() : $news->editUrl();
return redirect($redirect); return redirect($redirect);
} }
} }

93
app/Services/AdminStatsService.php Normal file
View 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')
]
];
});
}
}