Merge pull request #455 from CnCNet/develop

Sneer-ra2 · web-flow · commit 1a4573a7d0d5 · 2025-11-26T12:05:44.000+01:00
Points fix, RA2 2v2 Elo
diff --git a/.gitignore b/.gitignore
@@ -273,4 +273,8 @@ cncnet-api/.bash_history
 **/vendor/
 
 # Claude Code local settings
-.claude/settings.local.json
+.claude/settings.local.json
+
+# PR description (generated by /pr-description command)
+PR_DESCRIPTION.md
+pr-description.md
diff --git a/cncnet-api/app/Extensions/Qm/Matchup/ClanMatchupHandler.php b/cncnet-api/app/Extensions/Qm/Matchup/ClanMatchupHandler.php
@@ -25,10 +25,14 @@ public function matchup(): void
         # Fetch all entries who are currently in queue for this ladder
         $allQMQueueEntries = $this->quickMatchService->fetchQmQueueEntry($this->history);
 
-        // get all observers from qm queue entries
-        $observersQmQueueEntries = $allQMQueueEntries->filter(function($qmQueueEntry) {
-            return $qmQueueEntry->qmPlayer->isObserver();
-        });
+        // get all observers from qm queue entries (maximum of one observer per match)
+        // Prioritize observers who have been waiting the longest
+        $observersQmQueueEntries = $allQMQueueEntries
+            ->filter(function($qmQueueEntry) {
+                return $qmQueueEntry->qmPlayer->isObserver();
+            })
+            ->sortBy('created_at')
+            ->take(1);
         $this->matchHasObservers = $observersQmQueueEntries->count() > 0;
 
         Log::info("ClanMatchupHandler ** Players Per Clan Required: " . $playerCountPerClanRequired);
diff --git a/cncnet-api/app/Extensions/Qm/Matchup/PlayerMatchupHandler.php b/cncnet-api/app/Extensions/Qm/Matchup/PlayerMatchupHandler.php
@@ -82,8 +82,12 @@ public function matchup(): void
             return;
         }
 
-        // Add observers to the match if there is any
-        $observers = $opponents->filter(fn (QmQueueEntry $qmQueueEntry) => $qmQueueEntry->qmPlayer->isObserver());
+        // Add observers to the match if there is any (maximum of one observer per match)
+        // Prioritize observers who have been waiting the longest
+        $observers = $opponents
+            ->filter(fn (QmQueueEntry $qmQueueEntry) => $qmQueueEntry->qmPlayer->isObserver())
+            ->sortBy('created_at')
+            ->take(1);
         if ($observers->count() > 0)
         {
             $this->matchHasObservers = true;
diff --git a/cncnet-api/app/Extensions/Qm/Matchup/TeamMatchupHandler.php b/cncnet-api/app/Extensions/Qm/Matchup/TeamMatchupHandler.php
@@ -96,8 +96,12 @@ public function matchup(): void
             return;
         }
 
-        // Add observers to the match if there is any
-        $observers = $opponents->filter(fn(QmQueueEntry $qmQueueEntry) => $qmQueueEntry->qmPlayer?->isObserver());
+        // Add observers to the match if there is any (maximum of one observer per match)
+        // Prioritize observers who have been waiting the longest
+        $observers = $opponents
+            ->filter(fn(QmQueueEntry $qmQueueEntry) => $qmQueueEntry->qmPlayer?->isObserver())
+            ->sortBy('created_at')
+            ->take(1);
         if ($observers->count() > 0)
         {
             $this->matchHasObservers = true;
diff --git a/cncnet-api/app/Http/Controllers/ApiLadderController.php b/cncnet-api/app/Http/Controllers/ApiLadderController.php
@@ -493,15 +493,18 @@ public function getWinningTeamFromReports($playerGameReports): ?string
         }
 
         // Step 2: Fallback — no winner marked; use a non-defeated player (disconnected game case)
+        // Have observed matches where disconnected=true on players who did not disconnect, but were in a dc'd game due to another player dc'ing
         foreach ($playerGameReports as $pgr)
         {
-            if (!$pgr->defeated && !$pgr->disconnected && $pgr->spectator == false)
+            if (!$pgr->defeated && $pgr->spectator == false)
             {
                 Log::info("Fallback to 'defeated' logic for disconnected game.", [
                     'game_id' => $pgr->game_id,
                     'game_report_id' => $pgr->gameReport->id,
                     'player_id' => $pgr->player_id,
                     'team' => $pgr->team,
+                    'defeated' => $pgr->defeated,
+                    'disconnected' => $pgr->disconnected,
                 ]);
                 return $pgr->team;
             }
@@ -677,7 +680,21 @@ public function awardTeamPoints(GameReport $gameReport, LadderHistory $history)
             // Get correct cache type
             $cache = $playerGR->player->playerCache($history->id);
 
-            if ($playerGR->points < 0 && ($cache === null || $cache->points < 0))
+            // Prevent players from going below zero total points
+            if ($cache !== null && ($cache->points + $playerGR->points) < 0)
+            {
+                // Cap the loss: set game points to negative of current total
+                // Example: if cache = 10, set game points to -10, so new total = 10 + (-10) = 0
+                $playerGR->points = -1 * $cache->points;
+            }
+            elseif ($cache === null && $playerGR->points < 0)
+            {
+                // No cache exists, don't allow negative points
+                $playerGR->points = 0;
+            }
+
+            // Safety check: losers should NEVER get positive points. An edge case has been observed where players with negative or very low pts, earned ~+1 pts when winning, lets prevent that.
+            if (!$playerGRTeamWonTheGame && !$playerGR->draw && $playerGR->points > 0)
             {
                 $playerGR->points = 0;
             }
@@ -824,7 +841,21 @@ public function awardPlayerPoints(GameReport $gameReport, LadderHistory $history
             // Get correct cache type
             $cache = $playerGR->player->playerCache($history->id);
 
-            if ($playerGR->points < 0 && ($cache === null || $cache->points < 0))
+            // Prevent players from going below zero total points
+            if ($cache !== null && ($cache->points + $playerGR->points) < 0)
+            {
+                // Cap the loss: set game points to negative of current total
+                // Example: if cache = 10, set game points to -10, so new total = 10 + (-10) = 0
+                $playerGR->points = -1 * $cache->points;
+            }
+            elseif ($cache === null && $playerGR->points < 0)
+            {
+                // No cache exists, don't allow negative points
+                $playerGR->points = 0;
+            }
+
+            // Safety check: losers should NEVER get positive points
+            if (!$playerGR->wonOrDisco() && !$playerGR->draw && $playerGR->points > 0)
             {
                 $playerGR->points = 0;
             }
diff --git a/cncnet-api/app/Http/Controllers/RankingController.php b/cncnet-api/app/Http/Controllers/RankingController.php
@@ -12,7 +12,7 @@ class RankingController extends Controller
 {
     public function getIndex(Request $request)
     {
-        $gameModes = ["Blitz", "Blitz 2v2", "Red Alert", "Red Alert 2", "Yuri's Revenge"];
+        $gameModes = ["Blitz", "Blitz 2v2", "Red Alert", "Red Alert 2", "Red Alert 2 2v2", "Yuri's Revenge"];
 
         $players = ["Active", "New", "All time best", "All players" ];
         $upsets = ["All time", "Last 12 month", "Last 30 days"];
@@ -23,6 +23,7 @@ public function getIndex(Request $request)
             GameHelper::$GAME_BLITZ . "-2v2",
             GameHelper::$GAME_RA,
             GameHelper::$GAME_RA2,
+            GameHelper::$GAME_RA2 . "-2v2",
             GameHelper::$GAME_YR,
         ];
 
diff --git a/cncnet-api/app/Http/Services/LadderService.php b/cncnet-api/app/Http/Services/LadderService.php
@@ -280,7 +280,7 @@ function ($q) use ($search)
                 $filterBy == 'games',
                 function ($q) use ($orderBy)
                 {
-                    return $q->orderBy("games", $orderBy ?? 'desc');
+                    return $q->orderBy("games", in_array($orderBy, ['asc', 'desc']) ? $orderBy : 'desc');
                 },
                 function ($q)
                 {
@@ -315,7 +315,7 @@ function ($q) use ($search)
                 $filterBy == 'games',
                 function ($q) use ($orderBy)
                 {
-                    return $q->orderBy("games", $orderBy ?? 'desc');
+                    return $q->orderBy("games", in_array($orderBy, ['asc', 'desc']) ? $orderBy : 'desc');
                 },
                 function ($q)
                 {
@@ -730,7 +730,8 @@ public function undoCache($gameReport)
             $pc->mark();
             $pc->points -= $playerGR->points;
             $pc->games--;
-            if ($playerGR->won)
+            // Use points > 0 instead of won flag to handle 2v2 cases where a player dies but team wins
+            if ($playerGR->points > 0)
                 $pc->wins--;
 
             $pc->save();
@@ -799,7 +800,8 @@ private function saveClanCache($playerGameReport, $history)
 
         $clanCache->points += $playerGameReport->points;
         $clanCache->games++;
-        if ($playerGameReport->won)
+        // Use points > 0 instead of won flag to handle 2v2 cases where a player dies but team wins
+        if ($playerGameReport->points > 0)
             $clanCache->wins++;
 
         $clanCache->save();
@@ -826,7 +828,8 @@ private function savePlayerCache($playerGameReport, $history)
 
         $pc->points += $playerGameReport->points;
         $pc->games++;
-        if ($playerGameReport->won)
+        // Use points > 0 instead of won flag to handle 2v2 cases where a player dies but team wins
+        if ($playerGameReport->points > 0)
             $pc->wins++;
 
         $pc->save();
diff --git a/cncnet-api/app/Http/Services/QuickMatchService.php b/cncnet-api/app/Http/Services/QuickMatchService.php
@@ -1017,15 +1017,23 @@ private function set1v1QmSpawns($otherQmQueueEntries, $qmMatch, $qmPlayer, $expe
                 $p2OppColors = $p1Colors;
             }
 
+            Log::debug('QuickMatchService ** Colors prefs', [
+                'player'          => $qmPlayer->player->username,
+                'p1Colors'        => $p1Colors,
+                'p1OppColors'     => $p1OppColors,
+                'p2Colors'        => $p2Colors,
+                'p2OppColors'     => $p2OppColors,
+            ]);
             $bothHaveColorPrefs = is_array($p1Colors) && is_array($p2Colors) && is_array($p1OppColors) && is_array($p2OppColors);
+            Log::debug("QuickMatchService ** Both have colors prefs: " . $bothHaveColorPrefs . "   Match has observer: " . $matchHasObserver . "   qmPlayer is observer: " . $qmPlayer->isObserver());
         }
 
         if (!$matchHasObserver && $bothHaveColorPrefs)
         {
             // Determine best matching colors.
             [$p1Color, $p2Color] = $this->setColors($p1Colors, $p1OppColors, $p2Colors, $p2OppColors);
             $colorsArr = [$p1Color, $p2Color];
-            if ($qmPlayer->isObserver() == false)
+            if (!$qmPlayer->isObserver())
             {
                 $qmPlayer->color = $colorsArr[$i];
                 $qmPlayer->location = $spawnOrder[$i] - 1;
diff --git a/cncnet-api/app/Http/Services/StatsService.php b/cncnet-api/app/Http/Services/StatsService.php
@@ -391,7 +391,8 @@ public function getPlayerMatchups($player, $history)
                         $matchupResults[$opponentName]["total"] = 0;
                     }
 
-                    if ($pgr->won)
+                    // Use points > 0 instead of won flag to handle DCs and 2v2 cases correctly
+                    if ($pgr->points > 0)
                     {
                         $matchupResults[$opponentName]["won"] = $matchupResults[$opponentName]["won"] + 1;
                     }
@@ -489,8 +490,8 @@ public function getTeamMatchups($player, $history)
                     // Initialize matchup stats if not already set
                     $matchupResults[$teammateName] ??= ["won" => 0, "lost" => 0, "total" => 0];
 
-                    // Update win/loss count
-                    if ($myPlayerGameReport->won || $teamMatePlayerGameReport->won)
+                    // Update win/loss count - use points > 0 to handle DCs and cases where both players die but team wins
+                    if ($myPlayerGameReport->points > 0 || $teamMatePlayerGameReport->points > 0)
                     {
                         $matchupResults[$teammateName]["won"]++;
                     }
diff --git a/cncnet-api/resources/views/ladders/components/_games-player-row.blade.php b/cncnet-api/resources/views/ladders/components/_games-player-row.blade.php
@@ -28,9 +28,11 @@
                     @php $playerStats2 = \App\Models\Stats2::where("id", $playerGameReport->stats->id)->first(); @endphp
                     @php $playerCountry = $playerStats2->faction($history->ladder, $playerGameReport->stats->cty); @endphp
 
-                    <div class="game-status status-{{ $playerGameReport->won ? 'won' : 'lost' }}">
+                    {{-- Check points > 0 in addition to won flag because in team games (2v2), a player may have won=false
+                         if they died during the match, but their team still won and they received positive points --}}
+                    <div class="game-status status-{{ ($playerGameReport->won || $playerGameReport->points > 0) ? 'won' : 'lost' }}">
                         <span class="status-text">
-                            {{ $playerGameReport->won == true ? 'Won' : 'Lost' }}
+                            {{ ($playerGameReport->won == true || $playerGameReport->points > 0) ? 'Won' : 'Lost' }}
                         </span>
 
                         <span class="points">

Original file line number	Diff line number	Diff line change
`@@ -82,8 +82,12 @@ public function matchup(): void`
`82`	`82`	`return;`
`83`	`83`	`}`
`84`	`84`
`85`		`- // Add observers to the match if there is any`
`86`		`- $observers = $opponents->filter(fn (QmQueueEntry $qmQueueEntry) => $qmQueueEntry->qmPlayer->isObserver());`
	`85`	`+ // Add observers to the match if there is any (maximum of one observer per match)`
	`86`	`+ // Prioritize observers who have been waiting the longest`
	`87`	`+ $observers = $opponents`
	`88`	`+ ->filter(fn (QmQueueEntry $qmQueueEntry) => $qmQueueEntry->qmPlayer->isObserver())`
	`89`	`+ ->sortBy('created_at')`
	`90`	`+ ->take(1);`
`87`	`91`	`if ($observers->count() > 0)`
`88`	`92`	`{`
`89`	`93`	`$this->matchHasObservers = true;`
Original file line number	Diff line number	Diff line change
`@@ -96,8 +96,12 @@ public function matchup(): void`
`96`	`96`	`return;`
`97`	`97`	`}`
`98`	`98`
`99`		`- // Add observers to the match if there is any`
`100`		`- $observers = $opponents->filter(fn(QmQueueEntry $qmQueueEntry) => $qmQueueEntry->qmPlayer?->isObserver());`
	`99`	`+ // Add observers to the match if there is any (maximum of one observer per match)`
	`100`	`+ // Prioritize observers who have been waiting the longest`
	`101`	`+ $observers = $opponents`
	`102`	`+ ->filter(fn(QmQueueEntry $qmQueueEntry) => $qmQueueEntry->qmPlayer?->isObserver())`
	`103`	`+ ->sortBy('created_at')`
	`104`	`+ ->take(1);`
`101`	`105`	`if ($observers->count() > 0)`
`102`	`106`	`{`
`103`	`107`	`$this->matchHasObservers = true;`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ class RankingController extends Controller`
`12`	`12`	`{`
`13`	`13`	`public function getIndex(Request $request)`
`14`	`14`	`{`
`15`		`- $gameModes = ["Blitz", "Blitz 2v2", "Red Alert", "Red Alert 2", "Yuri's Revenge"];`
	`15`	`+ $gameModes = ["Blitz", "Blitz 2v2", "Red Alert", "Red Alert 2", "Red Alert 2 2v2", "Yuri's Revenge"];`
`16`	`16`
`17`	`17`	`$players = ["Active", "New", "All time best", "All players" ];`
`18`	`18`	`$upsets = ["All time", "Last 12 month", "Last 30 days"];`
`@@ -23,6 +23,7 @@ public function getIndex(Request $request)`
`23`	`23`	`GameHelper::$GAME_BLITZ . "-2v2",`
`24`	`24`	`GameHelper::$GAME_RA,`
`25`	`25`	`GameHelper::$GAME_RA2,`
	`26`	`+ GameHelper::$GAME_RA2 . "-2v2",`
`26`	`27`	`GameHelper::$GAME_YR,`
`27`	`28`	`];`
`28`	`29`
Original file line number	Diff line number	Diff line change
`@@ -1017,15 +1017,23 @@ private function set1v1QmSpawns($otherQmQueueEntries, $qmMatch, $qmPlayer, $expe`
`1017`	`1017`	`$p2OppColors = $p1Colors;`
`1018`	`1018`	`}`
`1019`	`1019`
	`1020`	`+ Log::debug('QuickMatchService ** Colors prefs', [`
	`1021`	`+ 'player' => $qmPlayer->player->username,`
	`1022`	`+ 'p1Colors' => $p1Colors,`
	`1023`	`+ 'p1OppColors' => $p1OppColors,`
	`1024`	`+ 'p2Colors' => $p2Colors,`
	`1025`	`+ 'p2OppColors' => $p2OppColors,`
	`1026`	`+ ]);`
`1020`	`1027`	`$bothHaveColorPrefs = is_array($p1Colors) && is_array($p2Colors) && is_array($p1OppColors) && is_array($p2OppColors);`
	`1028`	`+ Log::debug("QuickMatchService ** Both have colors prefs: " . $bothHaveColorPrefs . " Match has observer: " . $matchHasObserver . " qmPlayer is observer: " . $qmPlayer->isObserver());`
`1021`	`1029`	`}`
`1022`	`1030`
`1023`	`1031`	`if (!$matchHasObserver && $bothHaveColorPrefs)`
`1024`	`1032`	`{`
`1025`	`1033`	`// Determine best matching colors.`
`1026`	`1034`	`[$p1Color, $p2Color] = $this->setColors($p1Colors, $p1OppColors, $p2Colors, $p2OppColors);`
`1027`	`1035`	`$colorsArr = [$p1Color, $p2Color];`
`1028`		`- if ($qmPlayer->isObserver() == false)`
	`1036`	`+ if (!$qmPlayer->isObserver())`
`1029`	`1037`	`{`
`1030`	`1038`	`$qmPlayer->color = $colorsArr[$i];`
`1031`	`1039`	`$qmPlayer->location = $spawnOrder[$i] - 1;`
Original file line number	Diff line number	Diff line change
`@@ -391,7 +391,8 @@ public function getPlayerMatchups($player, $history)`
`391`	`391`	`$matchupResults[$opponentName]["total"] = 0;`
`392`	`392`	`}`
`393`	`393`
`394`		`- if ($pgr->won)`
	`394`	`+ // Use points > 0 instead of won flag to handle DCs and 2v2 cases correctly`
	`395`	`+ if ($pgr->points > 0)`
`395`	`396`	`{`
`396`	`397`	`$matchupResults[$opponentName]["won"] = $matchupResults[$opponentName]["won"] + 1;`
`397`	`398`	`}`
`@@ -489,8 +490,8 @@ public function getTeamMatchups($player, $history)`
`489`	`490`	`// Initialize matchup stats if not already set`
`490`	`491`	`$matchupResults[$teammateName] ??= ["won" => 0, "lost" => 0, "total" => 0];`
`491`	`492`
`492`		`- // Update win/loss count`
`493`		`- if ($myPlayerGameReport->won \|\| $teamMatePlayerGameReport->won)`
	`493`	`+ // Update win/loss count - use points > 0 to handle DCs and cases where both players die but team wins`
	`494`	`+ if ($myPlayerGameReport->points > 0 \|\| $teamMatePlayerGameReport->points > 0)`
`494`	`495`	`{`
`495`	`496`	`$matchupResults[$teammateName]["won"]++;`
`496`	`497`	`}`