Skip to content
This repository has been archived by the owner on May 20, 2020. It is now read-only.

Corrected middleware in BanUserServiceProvider #23

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 18 additions & 7 deletions src/Http/Controllers/Admin/BanCharController.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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();
}
}
Expand Down
21 changes: 17 additions & 4 deletions src/Http/Controllers/Admin/BanUserController.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
{
Expand Down
2 changes: 1 addition & 1 deletion src/Providers/BanUserServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down