Develop to main with bug fix (#393)

* 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)

---------

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

Author: alexp8

cncnet-api/app/Http/Services/GameService.php

@@ -142,6 +142,8 @@ public function saveGameStats($result, $gameId, $playerId, $ladder, $cncnetGame)
 
                 $qmPlayer = $game->qmMatch->findQmPlayerByPlayerId($playerHere->id);
                 $playerGameReports[$id]->team = $qmPlayer?->team;
+
+                // Note: YR spawner is not currently producing stats.dmp for observers. Impact: a player game report won't be created for the observer, so this current qmPlayer check won't ever be an observer
                 $playerGameReports[$id]->spectator = $qmPlayer?->is_observer ?? false;
 
                 if ($isClanLadderGame)
@@ -230,8 +232,8 @@ public function saveGameStats($result, $gameId, $playerId, $ladder, $cncnetGame)
                         $playerGameReports[$cid]->local_team_id = $cid;
                         break;
 
-                    case "SPC": // ?? this does not work, observer is not even uploading a stats.dmp
-                        // $playerGameReports[$cid]->spectator = $value["value"];
+                    case "SPC":
+                        $playerGameReports[$cid]->spectator = $value["value"];
                         break;
 
                     case "LCN": // TS lost connection

cncnet-api/app/Http/Services/PlayerService.php

@@ -80,7 +80,7 @@ public function findUserRatingByPlayerId($pid)
     {
         $player = Player::find($pid);
         $user = $player->user;
-        $userRating = $user->getEffectiveUserRating();
+        $userRating = $user->getEffectiveUserRatingForLadder($player->ladder_id);
 
         return $userRating;
     }