Develop to main (#398)

* 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

* bug fixes

---------

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

Author: alexp8

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

@@ -225,13 +225,13 @@ public function getLadderGame(Request $request, $date = null, $cncnetGame = null
         }
         else
         {
-            $allGameReports = $game->report()->get();
+            $allGameReports = $game->report;
             $userIsMod = false;
         }
 
         if ($reportId !== null)
         {
-            $gameReport = $game->allReports()->where('game_reports.id', '=', $reportId)->first();
+            $gameReport = $game->allReports->where('id', $reportId)->first();
         }
         else
         {

cncnet-api/app/Models/Game.php

@@ -108,15 +108,9 @@ public function gameClips()
 
     public function observers()
     {
-        if (!$this->report)
-        {
-            return collect();
-        }
-
-        return PlayerGameReport::where('game_report_id', $this->report->id)
+        return $this->hasMany(PlayerGameReport::class, 'game_report_id', 'game_report_id')
             ->where('spectator', true)
-            ->with(['player', 'user'])
-            ->get();
+            ->with(['player', 'user']);
     }
 
 
@@ -126,7 +120,7 @@ public function players()
         {
             return collect();
         }
-        
+
         return PlayerGameReport::where('game_report_id', $this->report->id)
             ->where('spectator', false)
             ->with('player');