From 9a0c5bc8ae5e1bb19a33e78224bb8f5c0dfebe84 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Tue, 18 Feb 2020 00:22:47 -0700 Subject: [PATCH] Update admin dashboard --- .../Controllers/Admin/AdminUserController.php | 158 ++++++++++++++++++ app/Http/Controllers/AdminController.php | 51 +++--- app/ModLog.php | 36 ++++ app/User.php | 5 + ...020_02_14_063209_create_mod_logs_table.php | 40 +++++ 5 files changed, 258 insertions(+), 32 deletions(-) create mode 100644 app/Http/Controllers/Admin/AdminUserController.php create mode 100644 app/ModLog.php create mode 100644 database/migrations/2020_02_14_063209_create_mod_logs_table.php diff --git a/app/Http/Controllers/Admin/AdminUserController.php b/app/Http/Controllers/Admin/AdminUserController.php new file mode 100644 index 000000000..bde92e319 --- /dev/null +++ b/app/Http/Controllers/Admin/AdminUserController.php @@ -0,0 +1,158 @@ +query('col') ?? 'id'; + $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')); + } + + public function userShow(Request $request, $id) + { + $user = User::findOrFail($id); + $profile = $user->profile; + return view('admin.users.show', compact('user', 'profile')); + } + + public function userEdit(Request $request, $id) + { + $user = User::findOrFail($id); + $profile = $user->profile; + return view('admin.users.edit', compact('user', 'profile')); + } + + public function userEditSubmit(Request $request, $id) + { + $user = User::findOrFail($id); + $profile = $user->profile; + $changed = false; + + if($request->filled('name') && $request->input('name') != $user->name) { + $user->name = $profile->name = $request->input('name'); + $changed = true; + } + if($request->filled('username') && $request->input('username') != $user->username) { + $user->username = $profile->username = $request->input('username'); + $changed = true; + } + if($request->filled('email') && $request->input('email') != $user->email) { + if(filter_var($request->input('email'), FILTER_VALIDATE_EMAIL) == false) { + abort(500, 'Invalid email address'); + } + $user->email = $request->input('email'); + $changed = true; + } + if($request->input('bio') != $profile->bio) { + $profile->bio = $request->input('bio'); + $changed = true; + } + if($request->input('website') != $profile->website) { + $profile->website = $request->input('website'); + $changed = true; + } + + if($changed == true) { + $profile->save(); + $user->save(); + } + return redirect('/i/admin/users/show/' . $user->id); + } + + public function userActivity(Request $request, $id) + { + $user = User::findOrFail($id); + $profile = $user->profile; + $logs = $user->accountLog()->orderByDesc('created_at')->paginate(10); + return view('admin.users.activity', compact('user', 'profile', 'logs')); + } + + public function userMessage(Request $request, $id) + { + $user = User::findOrFail($id); + $profile = $user->profile; + return view('admin.users.message', compact('user', 'profile')); + } + + public function userMessageSend(Request $request, $id) + { + $this->validate($request, [ + 'message' => 'required|string|min:5|max:500' + ]); + $user = User::findOrFail($id); + $profile = $user->profile; + $message = $request->input('message'); + Mail::to($user->email)->send(new AdminMessage($message)); + ModLogService::boot() + ->objectUid($user->id) + ->objectId($user->id) + ->objectType('App\User::class') + ->user($request->user()) + ->action('admin.user.mail') + ->metadata([ + 'message' => $message + ]) + ->accessLevel('admin') + ->save(); + return redirect('/i/admin/users/show/' . $user->id); + } + + public function userModTools(Request $request, $id) + { + $user = User::findOrFail($id); + $profile = $user->profile; + return view('admin.users.modtools', compact('user', 'profile')); + } + + public function userModLogs(Request $request, $id) + { + $user = User::findOrFail($id); + $profile = $user->profile; + $logs = ModLog::whereObjectUid($user->id) + ->orderByDesc('created_at') + ->simplePaginate(10); + return view('admin.users.modlogs', compact('user', 'profile', 'logs')); + } + + public function userModLogsMessage(Request $request, $id) + { + $this->validate($request, [ + 'message' => 'required|string|min:5|max:500' + ]); + $user = User::findOrFail($id); + $profile = $user->profile; + $msg = $request->input('message'); + ModLogService::boot() + ->objectUid($user->id) + ->objectId($user->id) + ->objectType('App\User::class') + ->user($request->user()) + ->message($msg) + ->accessLevel('admin') + ->save(); + return redirect('/i/admin/users/modlogs/' . $user->id); + } + + public function userDelete(Request $request, $id) + { + $user = User::findOrFail($id); + $profile = $user->profile; + return view('admin.users.delete', compact('user', 'profile')); + } +} \ No newline at end of file diff --git a/app/Http/Controllers/AdminController.php b/app/Http/Controllers/AdminController.php index 921312b31..f6b693430 100644 --- a/app/Http/Controllers/AdminController.php +++ b/app/Http/Controllers/AdminController.php @@ -21,7 +21,8 @@ use App\Http\Controllers\Admin\{ AdminReportController, AdminMediaController, AdminSettingsController, - AdminSupportController + AdminSupportController, + AdminUserController }; use Illuminate\Validation\Rule; use App\Services\AdminStatsService; @@ -32,11 +33,13 @@ class AdminController extends Controller AdminDiscoverController, AdminMediaController, AdminSettingsController, - AdminInstanceController; + AdminInstanceController, + AdminUserController; public function __construct() { $this->middleware('admin'); + $this->middleware('dangerzone'); $this->middleware('twofactor'); } @@ -46,25 +49,6 @@ class AdminController extends Controller return view('admin.home', compact('data')); } - public function users(Request $request) - { - $col = $request->query('col') ?? 'id'; - $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')); - } - - public function editUser(Request $request, $id) - { - $user = User::findOrFail($id); - $profile = $user->profile; - return view('admin.users.edit', compact('user', 'profile')); - } - public function statuses(Request $request) { $statuses = Status::orderBy('id', 'desc')->simplePaginate(10); @@ -109,22 +93,25 @@ class AdminController extends Controller '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') + $profiles = Profile::select('id','username') + ->whereNull('status') + ->when($search, function($q, $search) { + return $q->where('username', 'like', "%$search%"); + })->when($filter, function($q, $filter) { + if($filter == 'local') { + return $q->whereNull('domain'); + } + if($filter == 'remote') { + return $q->whereNotNull('domain'); + } + return $q; + })->orderByDesc('id') ->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); - } return view('admin.profiles.home', compact('profiles')); } diff --git a/app/ModLog.php b/app/ModLog.php new file mode 100644 index 000000000..d99b259f3 --- /dev/null +++ b/app/ModLog.php @@ -0,0 +1,36 @@ +belongsTo(User::class, 'user_id'); + } + + public function actionToText() + { + $msg = 'Unknown action'; + + switch ($this->action) { + case 'admin.user.message': + $msg = "Sent Email Message"; + break; + + case 'admin.user.action.cw.warn': + $msg = "Sent CW reminder"; + break; + + default: + $msg = 'Unknown action'; + break; + } + + return $msg; + } +} diff --git a/app/User.php b/app/User.php index 72963400f..717c4f316 100644 --- a/app/User.php +++ b/app/User.php @@ -83,4 +83,9 @@ class User extends Authenticatable return 'profile:storage:used:' . $this->id; } + public function accountLog() + { + return $this->hasMany(AccountLog::class); + } + } diff --git a/database/migrations/2020_02_14_063209_create_mod_logs_table.php b/database/migrations/2020_02_14_063209_create_mod_logs_table.php new file mode 100644 index 000000000..9443452fe --- /dev/null +++ b/database/migrations/2020_02_14_063209_create_mod_logs_table.php @@ -0,0 +1,40 @@ +bigIncrements('id'); + $table->bigInteger('user_id')->unsigned()->index(); + $table->string('user_username')->nullable(); + $table->bigInteger('object_uid')->nullable()->unsigned()->index(); + $table->bigInteger('object_id')->nullable()->unsigned()->index(); + $table->string('object_type')->nullable()->index(); + $table->string('action')->nullable(); + $table->text('message')->nullable(); + $table->json('metadata')->nullable(); + $table->string('access_level')->default('admin')->nullable(); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('mod_logs'); + } +}