diff --git a/src/Http/Controllers/Admin/BanCharController.php b/src/Http/Controllers/Admin/BanCharController.php index de1803e..1ea635a 100755 --- a/src/Http/Controllers/Admin/BanCharController.php +++ b/src/Http/Controllers/Admin/BanCharController.php @@ -9,10 +9,18 @@ use Illuminate\Support\Carbon; use Illuminate\Routing\Controller; use PbbgIo\Titan\Http\Requests\BannedCharRequest; - +use PbbgIo\Titan\Support\BanUserService; class BanCharController extends Controller { + + private $banService; + + public function __construct(BanUserService $banService) + { + $this->banService = $banService; + } + /** * Show the form for creating a new resource. * @return Response @@ -30,17 +38,20 @@ public function create() */ public function store(BannedCharRequest $request) { + $bannedChar = $this->banService->setUser(Character::findOrFail($request->bannable_id)) + ->setReason($request->reason) + ->setBanUntil($request->ban_until) + ->setForever($request->forever == 'on') + ->placeBan(); - $char = Character::findOrFail($request->bannable_id); - - if($char->placeBan($request->reason, $request->ban_until, $request->forever == 'on')) + if($bannedChar) { - flash()->success($char->display_name . ' has been banned'); - return redirect()->route('admin.banchar.edit'); + flash()->success($bannedChar->bannable->name . ' has been banned'); + return redirect()->route('admin.banchar.edit', $bannedChar->id); } else { - flash()->success('There was an error banning that player'); + flash()->success('There was an error banning that character'); return redirect()->back(); } } diff --git a/src/Http/Controllers/Admin/BanUserController.php b/src/Http/Controllers/Admin/BanUserController.php index c9895a0..566031b 100755 --- a/src/Http/Controllers/Admin/BanUserController.php +++ b/src/Http/Controllers/Admin/BanUserController.php @@ -9,9 +9,18 @@ use Illuminate\Support\Carbon; use Illuminate\Routing\Controller; use PbbgIo\Titan\Http\Requests\BannedUserRequest; +use PbbgIo\Titan\Support\BanUserService; class BanUserController extends Controller { + + private $banService; + + public function __construct(BanUserService $banService) + { + $this->banService = $banService; + } + /** * Show the form for creating a new resource. * @return Response @@ -29,12 +38,16 @@ public function create() */ public function store(BannedUserRequest $request) { - $user = User::findOrFail($request->bannable_id); + $bannedUser = $this->banService->setUser(User::findOrFail($request->bannable_id)) + ->setReason($request->reason) + ->setBanUntil($request->ban_until) + ->setForever($request->forever == 'on') + ->placeBan(); - if($user->placeBan($request->reason, $request->ban_until, $request->forever == 'on')) + if($bannedUser) { - flash()->success($user->name . ' has been banned'); - return redirect()->route('admin.banuser.edit'); + flash()->success($bannedUser->bannable->name . ' has been banned'); + return redirect()->route('admin.banuser.edit', $bannedUser->id); } else { diff --git a/src/Providers/BanUserServiceProvider.php b/src/Providers/BanUserServiceProvider.php index ac10c68..54481f1 100644 --- a/src/Providers/BanUserServiceProvider.php +++ b/src/Providers/BanUserServiceProvider.php @@ -48,7 +48,7 @@ protected function registerConfig() private function loadMiddleware() { - app('router')->pushMiddlewareToGroup('auth', PlayableNotBannedMiddleware::class); + app('router')->pushMiddlewareToGroup('web', PlayableNotBannedMiddleware::class); } private function validatorExtensions()