Merge pull request #1533 from Lan2Play/feature/3-3-0

Milestone 3.3.0

Author: Mawiguk0

src/.phpstorm.meta.php

@@ -42,7 +42,8 @@ class Event extends Model
         'private_participants',
         'matchmaking_enabled',
         'tournaments_freebies',
-        'tournaments_staff'
+        'tournaments_staff',
+        'tickettype_hide_policy'
     ];
 
     public const STATUS_PUBLISHED = 'PUBLISHED';

src/_ide_helper.php

@@ -2,11 +2,11 @@
 
 namespace App;
 
-use Exception;
-use Illuminate\Http\Request;
-use App\MatchMaking;
 use App\EventTournament;
+use App\MatchMaking;
 use App\MatchReplay;
+use Exception;
+use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Storage;
 use Auth;
 
@@ -18,6 +18,7 @@ public static function getGameMatchApiHandlerSelectArray()
             "0" => "None",
             "1" => "Get5",
             "2" => "PugSharp",
+            "3" => "PugSharp 2v2",
         );
         return $return;
     }
@@ -29,6 +30,8 @@ public function getGameMatchApiHandler($matchApiHandlerId): IGameMatchApiHandler
                 return new Get5MatchApiHandler();
             case "2":
                 return new PugSharpMatchApiHandler();
+            case "3":
+                return new PugSharpMatchApiHandler2v2();
             default:
                 throw new Exception("MatchApiHandler \"" . GameMatchApiHandler::getGameMatchApiHandlerSelectArray()[$matchApiHandlerId] . "\" is not able to execute commands.");
         }
@@ -534,3 +537,235 @@ public function uploaddemo(Request $request, MatchMaking $match = null, EventTou
         return false;
     }
 }
+
+
+class PugSharpMatchApiHandler2v2 implements IGameMatchApiHandler
+{
+    private $result;
+
+    public function __construct()
+    {
+        $this->result = new \stdClass();
+        $this->result->maplist = array(
+            "de_rooftop",
+            "de_overpass",
+            "de_vertigo",
+            "de_nuke",
+            "de_inferno"
+        );
+        $this->result->max_rounds = 16;
+        $this->result->max_overtime_rounds = 6;
+    }
+
+    public function getuserthirdpartyrequirements()
+    {
+        $return = array(
+            "thirdpartyid" => "steamid",
+            "thirdpartyname" => "steamname",
+        );
+        return $return;
+    }
+
+    public function addteam($name)
+    {
+        if (!isset($this->result->team1)) {
+            $this->result->team1 = new \stdClass();
+            $this->result->team1->name = $name;
+            $this->result->team1->tag = $name;
+        } elseif (!isset($this->result->team2)) {
+            $this->result->team2 = new \stdClass();
+            $this->result->team2->name = $name;
+            $this->result->team2->tag = $name;
+        } else {
+            throw new Exception("MatchApiHandler for PugSharp does not support more than 2 Teams!");
+        }
+    }
+
+    public function addplayer($teamName, $thirdpartyid, $thirdpartyname, $userid, $username)
+    {
+        $team = null;
+
+        if ($teamName == $this->result->team1->name) {
+            $team = $this->result->team1;
+        } elseif ($teamName == $this->result->team2->name) {
+            $team = $this->result->team2;
+        }
+
+        if (!isset($team->players)) {
+            $team->players = new \stdClass();
+        }
+
+        $team->players->{$thirdpartyid} = $thirdpartyname;
+    }
+
+    public function getconfig($matchid, $nummaps, $players_per_team, $apiurl, $apikey)
+    {
+        $this->result->matchid = "$matchid";
+        $this->result->num_maps = intval($nummaps);
+        $this->result->players_per_team = intval($players_per_team);
+        $this->result->min_players_to_ready = intval($players_per_team);
+
+        if ($apikey != null && $apiurl != null) {
+            $this->result->eventula_apistats_url = $apiurl;
+            $this->result->eventula_demo_upload_url = $apiurl . "demo";
+        }
+
+        return $this->result;
+    }
+
+
+    public function authorizeserver(Request $request, GameServer $gameserver)
+    {
+        if (auth('sanctum')->user()->id != $gameserver->id) {
+            return false;
+        } else {
+            return true;
+        }
+    }
+
+
+
+
+    public function golive(Request $request, MatchMaking $match = null, EventTournament $tournament = null, ?int $challongematchid, int $mapnumber)
+    {
+        if ($match != null && $tournament == null) {
+            if (!$match->setStatus('LIVE')) {
+                return false;
+            }
+            return true;
+        }
+        if ($match == null && $tournament != null && $challongematchid != null) {
+            //tournament stuff
+            return true;
+        }
+        return false;
+    }
+
+    public function updateround(Request $request, MatchMaking $match = null, EventTournament $tournament = null, ?int $challongematchid, int $mapnumber)
+    {
+
+        if ($match != null && $tournament == null) {
+            $loop = 1;
+            foreach ($match->teams as $team) {
+                $team->team_score = $request->{"team" . $loop . "score"};
+                if (!$team->save()) {
+                    return false;
+                }
+                $loop++;
+            }
+            return true;
+        }
+        if ($match == null && $tournament != null && $challongematchid != null) {
+            $tournament->updateMatchScores($challongematchid, $request->{"team1score"}, $request->{"team2score"});
+            return true;
+        }
+        return false;
+    }
+    public function updateplayer(Request $request, MatchMaking $match = null, EventTournament $tournament = null, ?int $challongematchid, int $mapnumber, string $player)
+    {
+        if ($match != null && $tournament == null) {
+            //matchmaking stuff
+            return true;
+        }
+        if ($match == null && $tournament != null && $challongematchid != null) {
+            //tournament stuff
+            return true;
+        }
+        return false;
+    }
+
+    public function finalizemap(Request $request, MatchMaking $match = null, EventTournament $tournament = null, ?int $challongematchid, int $mapnumber)
+    {
+        if ($match != null && $tournament == null) {
+            if (!$this->updateround($request, $match, null, null, $mapnumber)) {
+                return false;
+            }
+            return true;
+        }
+        if ($match == null && $tournament != null && $challongematchid != null) {
+            if (($mapnumber + 1) == $tournament->getnummaps($challongematchid)) {
+                $tournament->updateMatch($challongematchid, $request->{"team1score"}, $request->{"team2score"});
+                return true;
+            }
+            if (!$this->updateround($request, null, $tournament, $challongematchid, $mapnumber)) {
+                return false;
+            }
+            return true;
+        }
+        return false;
+    }
+    public function finalize(Request $request, MatchMaking $match = null, EventTournament $tournament = null, ?int $challongematchid)
+    {
+        if ($match != null && $tournament == null) {
+            if (!$match->setStatus('COMPLETE')) {
+                return false;
+            }
+            return true;
+        }
+        if ($match == null && $tournament != null && $challongematchid != null) {
+            //tournament stuff
+
+        }
+        return false;
+    }
+
+    public function freeserver(Request $request, MatchMaking $match = null, EventTournament $tournament = null, ?int $challongematchid)
+    {
+        if ($match != null && $tournament == null) {
+
+            if (!$match->matchMakingServer->delete()) {
+                return false;
+            }
+            return true;
+        }
+        if ($match == null && $tournament != null && $challongematchid != null) {
+
+            $evtms = EventTournamentMatchServer::where(['challonge_match_id' => $challongematchid])->first();
+
+            if (isset($evtms)) {
+                if (!$evtms->delete()) {
+                    return false;
+                }
+            }
+            return true;
+        }
+        return false;
+    }
+
+    public function uploaddemo(Request $request, MatchMaking $match = null, EventTournament $tournament = null, ?int $challongematchid)
+    {
+        $demoname = str_replace(' ', '_', $request->headers->get('PugSharp-DemoName'));
+
+        if ($match != null && $tournament == null) {
+            $destinationPathDemo =  MatchReplay::createReplayPath($match->game, $demoname);
+
+            if (Storage::disk('public')->put($destinationPathDemo, $request->getContent()) == false) {
+                return false;
+            }
+
+            $replay = new MatchReplay();
+            $replay->name = $demoname;
+            $replay->matchmaking_id = $match->id;
+            if (!$replay->save()) {
+                return false;
+            }
+            return true;
+        }
+        if ($match == null && $tournament != null && $challongematchid != null) {
+            $destinationPathDemo =  MatchReplay::createReplayPath($tournament->game, $demoname);
+
+            if (Storage::disk('public')->put($destinationPathDemo, $request->getContent()) == false) {
+                return false;
+            }
+
+            $replay = new MatchReplay();
+            $replay->name = $demoname;
+            $replay->challonge_match_id = $challongematchid;
+            if (!$replay->save()) {
+                return false;
+            }
+            return true;
+        }
+        return false;
+    }
+}

src/app/Event.php

@@ -57,9 +57,9 @@ public function store(Request $request)
             'desc_short'    => 'required',
             'desc_long'     => 'required',
             'end_date'      => 'required|date_format:m/d/Y',
-            'end_time'      => 'required|date_format:H:i',
+            'end_time'      => 'required|date_format:H:i,G:i',
             'start_date'    => 'required|date_format:m/d/Y',
-            'start_time'    => 'required|date_format:H:i',
+            'start_time'    => 'required|date_format:H:i,G:i',
             'capacity'      => 'required|integer',
             'venue'         => 'exists:event_venues,id',
         ];
@@ -70,9 +70,9 @@ public function store(Request $request)
             'end_date.required'         => 'End date is required',
             'end_time.required'         => 'End date is required',
             'end_date.date_format'      => 'End Date must be m/d/Y format',
-            'end_time.date_format'      => 'End Time must be H:i format',
+            'end_time.date_format'      => 'End Time must be H:i or G:i format (e.g., 07:00 or 7:00)',
             'start_date.date_format'    => 'Start Date must be m/d/Y format',
-            'start_time.date_format'    => 'Start Time must be H:i format',
+            'start_time.date_format'    => 'Start Time must be H:i or G:i format (e.g., 07:00 or 7:00)',
             'desc_short.required'       => 'Short Description is required',
             'desc_long.required'        => 'Long Description is required',
             'capacity.required'         => 'Capacity is required',
@@ -99,6 +99,7 @@ public function store(Request $request)
         $event->matchmaking_enabled         = (bool)$request->matchmaking_enabled;
         $event->tournaments_freebies        = (bool)$request->tournaments_freebies;
         $event->tournaments_staff           = (bool)$request->tournaments_staff;
+        $event->ticket_hide_policy          = (int)$request->ticket_hide_policy;
         if (!$event->save()) {
             Session::flash('alert-danger', 'Cannot Save Event!');
             return Redirect::to('admin/events/' . $event->slug);
@@ -121,9 +122,9 @@ public function update(Event $event, Request $request)
         $rules = [
             'event_name'        => 'filled',
             'end_date'          => 'filled|date_format:m/d/Y',
-            'end_time'          => 'filled|date_format:H:i',
+            'end_time'          => 'filled|date_format:H:i,G:i',
             'start_date'        => 'filled|date_format:m/d/Y',
-            'start_time'        => 'filled|date_format:H:i',
+            'start_time'        => 'filled|date_format:H:i,G:i',
             'status'            => 'in:draft,preview,published,private,registeredonly',
             'capacity'          => 'filled|integer',
             'venue'             => 'exists:event_venues,id',
@@ -133,11 +134,11 @@ public function update(Event $event, Request $request)
             'end_date.filled'           => 'A End Date cannot be empty',
             'end_date.date_format'      => 'A End Date must be m/d/Y format',
             'end_time.filled'           => 'A End Time cannot be empty',
-            'end_time.date_format'      => 'A End Time must be H:i formate',
+            'end_time.date_format'      => 'A End Time must be H:i or G:i format (e.g., 07:00 or 7:00)',
             'start_date.filled'         => 'A Start Date cannot be empty',
-            'end_date.date_format'      => 'A Start Date must be m/d/Y format',
+            'start_date.date_format'    => 'A Start Date must be m/d/Y format',
             'start_time.filled'         => 'A Start Time cannot be empty',
-            'end_time.date_format'      => 'A Start Time must be H:i format',
+            'start_time.date_format'    => 'A Start Time must be H:i or G:i format (e.g., 07:00 or 7:00)',
             'status.in'                 => 'Status must be draft, preview, published or private',
             'capacity.filled'           => 'Capacity is required',
             'capacity.integer'          => 'Capacity must be a integer',
@@ -205,6 +206,10 @@ public function update(Event $event, Request $request)
             $event->event_venue_id              = @$request->venue;
         }
 
+        if (isset($request->ticket_hide_policy)) {
+            $event->ticket_hide_policy = $request->ticket_hide_policy;
+        }
+
         if (!$event->save()) {
             Session::flash('alert-danger', 'Cannot update Event!');
             return Redirect::to('admin/events/' . $event->slug);
@@ -314,4 +319,25 @@ public function freeStaff(Request $request, Event $event)
         Session::flash('alert-success', 'Successfully added Staff!');
         return Redirect::to('admin/events/' . $event->slug . '/tickets');
     }
+
+    /**
+     * Seperate method for updating the ticket hide policy because this is not called from the event show page.
+     * @param Event $event to update the ticket Policy for
+     * @param Request $request containing the ticket_hide_policy to set
+     * @return RedirectResponse
+     * @throws \Illuminate\Validation\ValidationException
+     */
+    public function updateTicketHidePolicy(Event $event, Request $request) {
+        $rules = [
+            'ticket_hide_policy' => 'required|integer|min:-1|max:15'
+        ];
+
+        $this->validate($request, $rules);
+
+        $event->tickettype_hide_policy = $request->ticket_hide_policy;
+        if (!$event->save()) {
+            Session::flash('alert-danger', 'Cannot update Ticket Hide Policy!');
+        }
+        return Redirect::back();
+    }
 }