Merge pull request #401 from CnCNet/develop

Develop

Author: Sneer-ra2

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

@@ -36,6 +36,9 @@ public static function createSpawnStruct($qmMatch, QmMatchPlayer $qmPlayer, $lad
 
         srand($qmMatch->seed); // Seed the RNG for possibly random boolean options
 
+        $isObserver = $qmPlayer->is_observer == 1;
+        $notAllowedToChat = !$qmPlayer->player->user->getIsAllowedToChat();
+
         $spawnStruct["spawn"]["Settings"] = array_filter(
             [
                 "UIGameMode" =>     $qmMap->game_mode,
@@ -52,7 +55,7 @@ public static function createSpawnStruct($qmMatch, QmMatchPlayer $qmPlayer, $lad
                 "Color" =>          $qmPlayer->color,
                 "MyIndex" =>        $qmPlayer->color,
                 "IsSpectator" =>    "False",
-                "DisableChat" =>    $qmPlayer->player->user->getIsAllowedToChat() ? "False" : "True",
+                "DisableChat" => ($isObserver || $notAllowedToChat) ? "True" : "False",
                 // Filter null values
             ],
             function ($var)

cncnet-api/app/Models/Game.php

@@ -116,12 +116,7 @@ public function observers()
 
     public function players()
     {
-        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', false)
             ->with('player');
     }

cncnet-api/app/Models/User.php

@@ -431,7 +431,7 @@ public function getEffectiveUserRatingForLadder($ladderId)
      */
     public function getLiveUserTier($history)
     {
-        $userRating = $this->getOrCreateLiveUserRating();
+        $userRating = $this->getEffectiveUserRatingForLadder($history->ladder);
         return UserRatingService::getTierByLadderRules($userRating->rating, $history->ladder);
     }