diff --git a/app/Http/Controllers/Admin/AdminUserController.php b/app/Http/Controllers/Admin/AdminUserController.php index 0103a5b8d..a5f19f4dc 100644 --- a/app/Http/Controllers/Admin/AdminUserController.php +++ b/app/Http/Controllers/Admin/AdminUserController.php @@ -267,4 +267,18 @@ trait AdminUserController $request->session()->flash('status', $msg); return redirect('/i/admin/users/modtools/' . $profile->user_id); } + + public function userModLogDelete(Request $request, $id) + { + $this->validate($request, [ + 'mid' => 'required|integer|exists:mod_logs,id' + ]); + $user = User::findOrFail($id); + $uid = $request->user()->id; + $mid = $request->input('mid'); + $ml = ModLog::whereUserId($uid)->findOrFail($mid)->delete(); + $msg = "Successfully deleted modlog comment!"; + $request->session()->flash('status', $msg); + return redirect('/i/admin/users/modlogs/' . $user->id); + } } \ No newline at end of file diff --git a/app/ModLog.php b/app/ModLog.php index d99b259f3..0e0b2b5e4 100644 --- a/app/ModLog.php +++ b/app/ModLog.php @@ -18,13 +18,25 @@ class ModLog extends Model $msg = 'Unknown action'; switch ($this->action) { - case 'admin.user.message': - $msg = "Sent Email Message"; + case 'admin.user.mail': + $msg = "Sent Message"; break; case 'admin.user.action.cw.warn': $msg = "Sent CW reminder"; break; + + case 'admin.user.edit': + $msg = "Changed Profile"; + break; + + case 'admin.user.moderate': + $msg = "Moderation"; + break; + + case 'admin.user.delete': + $msg = "Deleted Account"; + break; default: $msg = 'Unknown action'; diff --git a/resources/views/admin/users/modlogs.blade.php b/resources/views/admin/users/modlogs.blade.php index adbdadd82..007c9266f 100644 --- a/resources/views/admin/users/modlogs.blade.php +++ b/resources/views/admin/users/modlogs.blade.php @@ -78,13 +78,13 @@ @if($logs->count() > 0)
@foreach($logs as $log) -
+
@if($log->message != null)
-
+
@if($log->user_id != Auth::id())

{{$log->message}}

@@ -103,17 +103,33 @@
+ @if($log->user_id == Auth::id()) +
+
+ @csrf + + +
+
+ @endif
@else -
-

{{$log->created_at->diffForHumans()}}

-

{{$log->actionToText()}}

-

- by: {{$log->user_username}} -

-
-
- +
+
+ +
+
+

{{$log->created_at->diffForHumans()}}

+

{{$log->actionToText()}}

+

+ by: {{$log->user_username}} +

+
+
+ +
@endif
diff --git a/routes/web.php b/routes/web.php index 28417f1df..8fa1bcfca 100644 --- a/routes/web.php +++ b/routes/web.php @@ -25,6 +25,7 @@ Route::domain(config('pixelfed.domain.admin'))->prefix('i/admin')->group(functio Route::get('users/modtools/{id}', 'AdminController@userModTools'); Route::get('users/modlogs/{id}', 'AdminController@userModLogs'); Route::post('users/modlogs/{id}', 'AdminController@userModLogsMessage'); + Route::post('users/modlogs/{id}/delete', 'AdminController@userModLogDelete'); Route::get('users/delete/{id}', 'AdminController@userDelete'); Route::post('users/delete/{id}', 'AdminController@userDeleteProcess'); Route::post('users/moderation/update', 'AdminController@userModerate');