From 2fa6adf7057a764cfac6e0c0a49b644ab883b59b Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Fri, 31 Aug 2018 20:31:49 -0600 Subject: [PATCH 1/4] Update admin report view --- resources/views/admin/reports/show.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/admin/reports/show.blade.php b/resources/views/admin/reports/show.blade.php index e943d7131..fab2346e3 100644 --- a/resources/views/admin/reports/show.blade.php +++ b/resources/views/admin/reports/show.blade.php @@ -8,7 +8,7 @@
Reported: {{$report->reported()->url()}}
-
Reported by: {{$report->reporter->username}} admin
+
Reported by: {{$report->reporter->username}}

Message: {{$report->message ?? 'No message provided.'}} From 1e839d251772999b8683951854332307148bf53c Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sat, 1 Sep 2018 21:35:32 -0600 Subject: [PATCH 2/4] Update AdminReportController --- .../Admin/AdminReportController.php | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/app/Http/Controllers/Admin/AdminReportController.php b/app/Http/Controllers/Admin/AdminReportController.php index 537c72be0..8e0bd69cb 100644 --- a/app/Http/Controllers/Admin/AdminReportController.php +++ b/app/Http/Controllers/Admin/AdminReportController.php @@ -81,4 +81,35 @@ trait AdminReportController return $this; } + + protected function actionMap() + { + return [ + '1' => 'ignore', + '2' => 'cw', + '3' => 'unlist', + '4' => 'delete', + '5' => 'shadowban', + '6' => 'ban' + ]; + } + + public function bulkUpdateReport(Request $request) + { + $this->validate($request, [ + 'action' => 'required|integer|min:1|max:10', + 'ids' => 'required|array' + ]); + $action = $this->actionMap()[$request->input('action')]; + $ids = $request->input('ids'); + $reports = Report::whereIn('id', $ids)->whereNull('admin_seen')->get(); + foreach($reports as $report) { + $this->handleReportAction($report, $action); + } + $res = [ + 'message' => 'Success', + 'code' => 200 + ]; + return response()->json($res); + } } From 18d171530dfa1b92a0b75297e69206b7a49cd479 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sat, 1 Sep 2018 21:50:27 -0600 Subject: [PATCH 3/4] Update web routes --- routes/web.php | 1 + 1 file changed, 1 insertion(+) diff --git a/routes/web.php b/routes/web.php index 9f8bb6b1b..a7b43c2f2 100644 --- a/routes/web.php +++ b/routes/web.php @@ -7,6 +7,7 @@ Route::domain(config('pixelfed.domain.admin'))->prefix('i/admin')->group(functio Route::get('reports', 'AdminController@reports')->name('admin.reports'); Route::get('reports/show/{id}', 'AdminController@showReport'); Route::post('reports/show/{id}', 'AdminController@updateReport'); + Route::post('reports/bulk', 'AdminController@bulkUpdateReport'); Route::redirect('statuses', '/statuses/list'); Route::get('statuses/list', 'AdminController@statuses')->name('admin.statuses'); Route::get('statuses/show/{id}', 'AdminController@showStatus'); From a9b7117db9d9a438be06ca9d28c040cb1f11a3f0 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sat, 1 Sep 2018 21:50:54 -0600 Subject: [PATCH 4/4] Add bulk report actions --- resources/views/admin/reports/home.blade.php | 114 ++++++++++++++++++- 1 file changed, 111 insertions(+), 3 deletions(-) diff --git a/resources/views/admin/reports/home.blade.php b/resources/views/admin/reports/home.blade.php index bb0c3acbd..3a48393aa 100644 --- a/resources/views/admin/reports/home.blade.php +++ b/resources/views/admin/reports/home.blade.php @@ -17,9 +17,39 @@


+
+
+ + + 0 + + items selected + + + + + Apply + + +
+
+ - + + @@ -31,11 +61,18 @@ @foreach($reports as $report) - + @@ -54,9 +91,80 @@ @endsection +@push('styles') + +@endpush + @push('scripts')
+
+
+ + +
+
+
# Reporter Type
+ +
+ + +
+
{{$report->id}} - + + {{$report->reporter->username}} {{$report->type}} {{str_limit($report->reported()->url(), 25)}}