active matches V2 API

alexp8 · alexp8 · commit e02d92b8dec5 · 2025-05-17T16:51:30.000-04:00
diff --git a/cncnet-api/app/Helpers/SiteHelper.php b/cncnet-api/app/Helpers/SiteHelper.php
@@ -6,6 +6,7 @@
 use Carbon\Carbon;
 use Exception;
 use Illuminate\Support\Facades\Log;
+use App\Models\Map;
 
 class SiteHelper
 {
@@ -61,6 +62,28 @@ public static function getMapPreviewUrl($history, $map, $hash)
         }
     }
 
+    public static function getMapPreviewUrlV2(string $game, Map $map)
+    {
+        try {
+            if (!$map) {
+                return "";
+            }
+    
+            $description = $map->description ?? '';
+            $imageHash = $map->image_hash ?: $map->hash;
+    
+            if (!$imageHash) {
+                return "";
+            }
+    
+            return "https://ladder.cncnet.org/images/maps/{$game}/{$imageHash}.png";
+        } catch (Exception $ex) {
+            Log::info("Error fetching map preview url for map='$description', ladder='$game'");
+            return "";
+        }
+    }
+    
+
     public static function getEmojiByMonth()
     {
         $now = Carbon::now();
diff --git a/cncnet-api/app/Http/Controllers/ApiQuickMatchController.php b/cncnet-api/app/Http/Controllers/ApiQuickMatchController.php
@@ -6,6 +6,7 @@
 use App\Helpers\AIHelper;
 use App\Helpers\GameHelper;
 use App\Helpers\LeagueHelper;
+use App\Helpers\SiteHelper;
 use App\Http\Services\LadderService;
 use App\Http\Services\PlayerService;
 use App\Http\Services\QuickMatchService;
@@ -57,7 +58,8 @@ public function statsRequest(Request $request, string $ladderAbbrev = null, int
             $ladders = \App\Models\Ladder::query()
                 ->where('private', '=', false)
                 ->with([
-                    'current_history' => function($q) {
+                    'current_history' => function ($q)
+                    {
                         $q->with([
                             'queued_players'
                         ]);
@@ -97,14 +99,15 @@ public function statsRequest(Request $request, string $ladderAbbrev = null, int
             }
 
             return $allStats;
-        } 
-        else 
+        }
+        else
         {
             return $this->getStats($ladderAbbrev, $tierId);
         }
     }
 
-    private function getStats(Ladder|string $ladder, int $tierId = 1) {
+    private function getStats(Ladder|string $ladder, int $tierId = 1)
+    {
         $ladder = is_string($ladder) ? $this->ladderService->getLadderByGame($ladder) : $ladder;
         $history = $ladder->current_history;
         $qmStats = $this->statsService->getQmStats($history, $tierId);
@@ -131,7 +134,8 @@ public function getActiveMatches(Request $request, $ladderAbbrev = null)
             $ladders = \App\Models\Ladder::query()
                 ->where('private', '=', false)
                 ->with([
-                    'current_history' => function($q) {
+                    'current_history' => function ($q)
+                    {
                     },
                 ])
                 ->with([
@@ -167,6 +171,58 @@ public function getActiveMatches(Request $request, $ladderAbbrev = null)
         return $games;
     }
 
+    /**
+     * This V2 function will return the data as json array, where each object in the array is an object.
+     * V1 returns array of strings.
+     */
+    public function getActiveMatchesV2(Request $request, string $ladderAbbrev)
+    {
+        $games = [];
+        if ($ladderAbbrev == "all")
+        {
+            $ladders = Ladder::query()
+                ->where('private', '=', false)
+                ->with([
+                    'current_history' => function ()
+                    {
+                    },
+                    'sides',
+                    'recent_spawned_matches',
+                    'recent_spawned_matches.players',
+                    'recent_spawned_matches.players.clan:id,short',
+                    'recent_spawned_matches.players.player:id,username',
+                    'recent_spawned_matches.map',
+                ])
+                ->get();
+
+            $ladders->each(function (Ladder $ladder) use (&$games)
+            {
+                $games[$ladder->abbreviation] = $this->getActiveMatchesByLadderV2($ladder);
+            });
+        }
+        else
+        {
+            $ladder = Ladder::query()
+                ->where('abbreviation', '=', $ladderAbbrev)
+                ->with([
+                    'current_history' => function ($q)
+                    {
+                    },
+                    'sides',
+                    'recent_spawned_matches',
+                    'recent_spawned_matches.players',
+                    'recent_spawned_matches.players.clan:id,short',
+                    'recent_spawned_matches.players.player:id,username',
+                    'recent_spawned_matches.map',
+                ])
+                ->first();
+
+            $games[$ladder->abbreviation] = $this->getActiveMatchesByLadderV2($ladder);
+        }
+
+        return $games;
+    }
+
     private function getActiveMatchesByLadder(Ladder|string $ladder)
     {
         $ladder = is_string($ladder) ? $this->ladderService->getLadderByGame($ladder) : $ladder;
@@ -210,6 +266,58 @@ private function getActiveMatchesByLadder(Ladder|string $ladder)
         return $games;
     }
 
+    private function getActiveMatchesByLadderV2(Ladder $ladder)
+    {
+        $sides = $ladder->sides->pluck('name', 'local_id')->toArray();
+
+        if ($ladder == null)
+        {
+            abort(400, "Invalid ladder provided");
+        }
+
+        //get all recent QMs that whose games have spawned. (state_type_id == 5)
+        $qms = $ladder->recent_spawned_matches;
+
+        $games = [];
+
+        foreach ($qms as $qm) //iterate over every active quick match
+        {
+            $dt = $qm->created_at;
+
+            //get the player data pertaining to this quick match
+            $qmPlayers = $qm->players;
+
+            $playersData = [];
+            if ($ladder->clans_allowed)
+            {
+                $playersData = $this->getActiveClanMatchesData($sides, $qmPlayers);
+            }
+            else if ($ladder->ladder_type == Ladder::TWO_VS_TWO) // 2v2
+            {
+                $playersData = $this->getTeamActivePlayerMatchesDataV2($sides, $qmPlayers, $qm->created_at);
+            }
+            else
+            {
+                $playersData = $this->getActivePlayerMatchesDataV2($sides, $qmPlayers, $qm->created_at);
+            }
+
+            $duration = Carbon::now()->diff($dt);
+            $duration_formatted = $duration->format('%i mins %s sec');
+
+            $games[] = [
+                "ladderName" => $ladder->name,
+                "ladderType" => $ladder->ladder_type,
+                "players" => $playersData,
+                "gameDuration" => $duration_formatted,
+                "mapName" => trim($qm->map->description),
+                "mapHash" => $qm->map->map->hash,
+                "mapUrl" => SiteHelper::getMapPreviewUrlV2($ladder->game, $qm->map->map)
+            ];
+        }
+
+        return $games;
+    }
+
     private function getActiveClanMatchesData($sides, $players)
     {
         $clans = [];
@@ -243,7 +351,7 @@ private function getActiveClanMatchesData($sides, $players)
             $i = 0;
             foreach ($players as $player)
             {
-                $playersString .= '['. $player->clan->short .']' . $player->name . " (" . ($sides[$player->actual_side] ?? '') . ")";
+                $playersString .= '[' . $player->clan->short . ']' . $player->name . " (" . ($sides[$player->actual_side] ?? '') . ")";
 
                 if ($i < count($players) - 1)
                     $playersString .= " and ";
@@ -279,12 +387,33 @@ private function getActivePlayerMatchesData($sides, $players, $created_at)
         return $playersString;
     }
 
+    /**
+     * @return an array containing every player's name and their faction
+     */
+    private function getActivePlayerMatchesDataV2(array $sides, $qmPlayers, $created_at)
+    {
+        $dt = new DateTime($created_at);
+        $showRealNames = abs(Carbon::now()->diffInSeconds($dt)) > 120;
+
+        return collect($qmPlayers)
+            ->values()
+            ->map(function ($qmPlayer, $index) use ($sides, $showRealNames)
+            {
+                return [
+                    "playerName" => $showRealNames ? $qmPlayer->player->username : "Player" . ($index + 1),
+                    "playerFaction" => $sides[$qmPlayer->actual_side] ?? '',
+                    "playerColor" => $qmPlayer->color
+                ];
+            })
+            ->all();
+    }
+
     /**
      * returns a 'pretty' message describing the players on each team
      * 
      * should probably return a json array with the data but we are where we are
      */
-    private function getTeamActivePlayerMatchesData($sides, $players, $created_at) // TODO will this logic work for clan ladder?
+    private function getTeamActivePlayerMatchesData($sides, $players, $created_at)
     {
         $playersString = "";
         $dt = new DateTime($created_at);
@@ -304,7 +433,7 @@ private function getTeamActivePlayerMatchesData($sides, $players, $created_at) /
             {
                 $playerName = "Player" . ($playerNum + 1);
                 if (abs(Carbon::now()->diffInSeconds($dt)) > 60) //only show real player name if 1 min has passed
-                { 
+                {
                     $playerName = $player->player->username;
                 }
                 $playersString .= $playerName . " (" . ($sides[$player->actual_side] ?? '') . ")";
@@ -325,6 +454,27 @@ private function getTeamActivePlayerMatchesData($sides, $players, $created_at) /
         return $playersString;
     }
 
+    private function getTeamActivePlayerMatchesDataV2(array $sides, $qmPlayers, $created_at)
+    {
+        $dt = new DateTime($created_at);
+        $showRealNames = abs(Carbon::now()->diffInSeconds($dt)) > 120;
+
+        return collect($qmPlayers)
+            ->groupBy('team')
+            ->flatten()
+            ->values()
+            ->map(function ($qmPlayer, $index) use ($sides, $showRealNames)
+            {
+                return [
+                    "teamId" => $qmPlayer->team,
+                    "playerName" => $showRealNames ? $qmPlayer->player->username : "Player" . ($index + 1),
+                    "playerFaction" => $sides[$qmPlayer->actual_side] ?? '',
+                    "playerColor" => $qmPlayer->color
+                ];
+            })
+            ->all();
+    }
+
     public function mapListRequest(Request $request, $ladderAbbrev = null)
     {
         return \App\Models\QmMap::findMapsByLadder($this->ladderService->getLadderByGame($ladderAbbrev)->id);
diff --git a/cncnet-api/routes/api.php b/cncnet-api/routes/api.php
@@ -76,6 +76,7 @@
         Route::get('/qm/ladder/{ladderAbbrev}/stats', [\App\Http\Controllers\ApiQuickMatchController::class, 'statsRequest']);
         Route::get('/qm/ladder/{ladderAbbrev}/stats/{tierId}', [\App\Http\Controllers\ApiQuickMatchController::class, 'statsRequest']);
         Route::get('/qm/ladder/{ladderAbbrev}/current_matches', [\App\Http\Controllers\ApiQuickMatchController::class, 'getActiveMatches']);
+        Route::get('/qm/ladder/{ladderAbbrev}/active_matches', [\App\Http\Controllers\ApiQuickMatchController::class, 'getActiveMatchesV2']);
         Route::get('/qm/ladder/{ladderAbbrev}/erroredGames', [\App\Http\Controllers\ApiQuickMatchController::class, 'getErroredGames']);
         Route::get('/qm/ladder/{ladderAbbrev}/{hours}/recentlyWashedGames', [\App\Http\Controllers\ApiQuickMatchController::class, 'getRecentLadderWashedGamesCount']);
     });
