refactor: simplify suspension method, better support for permanent suspensions

This commit is contained in:
2022-08-19 01:13:40 +01:00
parent 1ed2a0f5e1
commit 0f4ce2d7b0
2 changed files with 17 additions and 19 deletions

View File

@@ -471,14 +471,18 @@ class UserController extends Controller
$this->authorize('create', [Ban::class, $user]);
$this->disable();
if (!$suspensionService->isSuspended($user)) {
if ($suspensionService->isSuspended($user))
{
return redirect()
->back()
->with('error', __('Account already suspended.'));
}
$suspensionService->suspend($user, $request->reason, $user, $request->suspensionType);
$request->session()->flash('success', __('Account suspended.'));
} else {
$request->session()->flash('error', __('Account already suspended!'));
if ($request->suspensionType = "on") {
$suspensionService->suspend($user, $request->reason, $request->duration);
}
else {
$suspensionService->suspend($user, $request->reason);
}
return redirect()->back();