Develop to main (#397)

* Duplicate handling.

* Added page of list with active duplicates.

* Full IP-check for confirmed duplicates.

* Simplification.

* Removed comment.

* Small update.

* Added database migration.

* Added unit test.

* track observers

* move comment

* update image.php

* fix null pointer (#379)

* Develop (#380) (#381)

* Duplicate handling.

* Added page of list with active duplicates.

* Full IP-check for confirmed duplicates.

* Simplification.

* Removed comment.

* Small update.

* Added database migration.

* Added unit test.

* track observers

* move comment

* update image.php

* fix null pointer (#379)

---------

Co-authored-by: Sneer <[email protected]>
Co-authored-by: Sneer-ra2 <[email protected]>

* add more logs (#382)

* add more logs

* update log

* Fix for createPlayer.

* fix bug where disconnect gave everyone minus points (#385)

* fix bug where disconnect gave everyone minus points

* fix ladder info map issue

* Improved naming on elo page.

* Improved description for duplicate reason.

* bug fix

* Database migration for user ratings. Player details and tooltip adjustments.

* Updated admin rating page.

* Quick fix.

* Simplified conditions.

* Fixed user settings update.

* new implementation (#390)

* verify observer is streaming on twitch (#384)

* Show bans from duplicates. (#389)

Co-authored-by: Alex Peterson <[email protected]>

* bug fix (#392)

* quick fix

* Feature/track observers (#395)

* bug fix

* logging updates, 2v2 match bug fix, observer code

* filter out spectator in point rewards

* fix typo

---------

Co-authored-by: Sneer <[email protected]>
Co-authored-by: Sneer-ra2 <[email protected]>

Author: alexp8

cncnet-api/app/Http/Controllers/ApiLadderController.php

@@ -351,7 +351,7 @@ public function awardClanPoints($gameReport, $history)
         $clanGameReports = collect();
 
         // Find the winning clan report
-        $winningClanReport = $gameReport->playerGameReports()->where('won', 1)->groupBy("clan_id")->first();
+        $winningClanReport = $gameReport->playerGameReports()->where('won', 1)->where('spectator', 0)->groupBy("clan_id")->first();
 
         if ($winningClanReport != null)
         {
@@ -486,7 +486,7 @@ public function getWinningTeamFromReports($playerGameReports): ?string
     {
         foreach ($playerGameReports as $pgr)
         {
-            if ($pgr->won)
+            if ($pgr->won && $pgr->spectator == false)
             {
                 return $pgr->team;
             }
@@ -495,7 +495,7 @@ public function getWinningTeamFromReports($playerGameReports): ?string
         // Step 2: Fallback — no winner marked; use a non-defeated player (disconnected game case)
         foreach ($playerGameReports as $pgr)
         {
-            if (!$pgr->defeated && !$pgr->disconnected)
+            if (!$pgr->defeated && !$pgr->disconnected && $pgr->spectator == false)
             {
                 Log::info("Fallback to 'defeated' logic for disconnected game.", [
                     'game_id' => $pgr->game_id,
@@ -549,6 +549,11 @@ public function awardTeamPoints(GameReport $gameReport, LadderHistory $history)
 
         foreach ($playerGameReports as $playerGR)
         {
+            if ($playerGR->spectator == true)
+            {
+                continue;
+            }
+
             $ally_average = 0;
             $ally_points = 0;
             $ally_count = 0;
@@ -565,6 +570,11 @@ public function awardTeamPoints(GameReport $gameReport, LadderHistory $history)
             // gather points from teammates and enemies, strength of team vs enemy will factor in points awarded/lost
             foreach ($playerGameReports as $otherPlayerGameReport)
             {
+                if ($otherPlayerGameReport->spectator == true)
+                {
+                    continue;
+                }
+
                 $other = $this->playerService->findUserRatingByPlayerId($otherPlayerGameReport->player_id);
                 $players[] = $other;
 
@@ -706,6 +716,11 @@ public function awardPlayerPoints(GameReport $gameReport, LadderHistory $history
 
         foreach ($playerGameReports as $playerGR)
         {
+            if ($playerGR->spectator == true)
+            {
+                continue;
+            }
+
             $ally_average = 0;
             $ally_points = 0;
             $ally_count = 0;
@@ -716,6 +731,11 @@ public function awardPlayerPoints(GameReport $gameReport, LadderHistory $history
 
             foreach ($playerGameReports as $pgr)
             {
+                if ($pgr->spectator == true)
+                {
+                    continue;
+                }
+                
                 $other = $this->playerService->findUserRatingByPlayerId($pgr->player_id);
                 $players[] = $other;