Skip to content

Commit abf0c33

Browse files
squads: don't allow ineligible users into squad (#718)
Co-authored-by: recursivetree <recursivetreemail@gmail.com>
1 parent 7eef0a7 commit abf0c33

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

src/Http/Controllers/Squads/ApplicationsController.php

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,10 @@ public function show(Squad $squad, int $id)
6464
*/
6565
public function store(Request $request, Squad $squad)
6666
{
67+
if(!$squad->isUserEligible(auth()->user())) {
68+
return redirect()->back()->with('error','You are not eligible for this squad!');
69+
}
70+
6771
// in case the squad is manual and does not contain any moderator
6872
// applications are self-approved.
6973
if ($squad->type == 'manual' && $squad->moderators->isEmpty()) {
@@ -108,6 +112,10 @@ public function approve(Squad $squad, int $id)
108112
{
109113
$application = SquadApplication::with('squad', 'user')->find($id);
110114

115+
if(!$squad->isUserEligible($application->user)) {
116+
return redirect()->back()->with('error','The applicant is not eligible for this squad!');
117+
}
118+
111119
$squad->members()->save($application->user);
112120

113121
$message = sprintf('Approved application from %s into squad %s.',

0 commit comments

Comments
 (0)