Develop to main (#423)

* add debug logs in PodiumController

* filter out observers from players_in queue count

* Add back missing cache to player stat views, tweak cache to 10 mins (#418)

* remvoe yuri check (#419)

* remvoe yuri check

* just remove the commented code for now, if need it later, fetch from git history

* optimize getRecentLadderGames

* Update cncnet-api/app/Http/Services/LadderService.php

Co-authored-by: Copilot <[email protected]>

* Hotfix for the faction policy service.

* Fixed getRecentLadderGames.

* monitor duration

* removing caching from getRecentLadderGames

* add more details in the duration log in matchMeUp

* revert max connections back to 500

* Add a missing index on games table

* fix missing faction icons

* feature/audit log (#411)

* first commit

* Update cncnet-api/app/Models/UserSettings.php

Co-authored-by: Copilot <[email protected]>

* remove old api, and add twitch profile to the  get active matches

* implement getActivitylogOptions

* create migration, implement activity logging

* add LogsActivity to qmMap

* null check just in case

---------

Co-authored-by: Copilot <[email protected]>

---------

Co-authored-by: Grant Bartlett <[email protected]>
Co-authored-by: Copilot <[email protected]>
Co-authored-by: Sneer <[email protected]>
Co-authored-by: rohs <[email protected]>

Author: 5 people

.gitignore

@@ -269,4 +269,5 @@ cncnet-api/database/migrations/2022_05_14_214858_createDummyTestAccounts.php
 /.backup.env
 docker-compose.test.yml
 cncnet-api/.bash_history
-**/debugging/
+**/debugging/
+**/vendor/

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

@@ -30,9 +30,32 @@
 use Illuminate\Validation\ValidationException;
 use App\Models\IpAddressHistory;
 use App\Models\QmUserId;
+use Spatie\Activitylog\Models\Activity;
 
 class AdminController extends Controller
 {
+    /**
+     * Show audit log events with filtering.
+     */
+    public function getAuditLog(Request $request)
+    {
+        if (!$request->user() || !$request->user()->isAdmin()) {
+            abort(403);
+        }
+
+        $query = Activity::query();
+
+        if ($request->filled('model_type')) {
+            $query->where('subject_type', $request->input('model_type'));
+        }
+        if ($request->filled('event')) {
+            $query->where('event', $request->input('event'));
+        }
+
+        $activities = $query->with('causer')->orderByDesc('created_at')->paginate(30);
+
+        return view('admin.audit-log', compact('activities'));
+    }
     /**
      * Show all observer users and allow add/remove.
      */

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

@@ -111,61 +111,14 @@ private function getStats(Ladder|string $ladder, int $tierId = 1)
         ];
     }
 
-    /**
-     * Fetch details about games thare are currently in match
-     */
-    public function getActiveMatches(Request $request, $ladderAbbrev = null)
-    {
-        $games = [];
-        if ($ladderAbbrev == "all")
-        {
-            $ladders = \App\Models\Ladder::query()
-                ->where('private', '=', false)
-                ->with([
-                    'current_history' => function ($q)
-                    {
-                    },
-                ])
-                ->with([
-                    'sides',
-                    'recent_spawned_matches',
-                    'recent_spawned_matches.players',
-                    'recent_spawned_matches.players.clan:id,short',
-                    'recent_spawned_matches.players.player:id,username',
-                    'recent_spawned_matches.map',
-                ])
-                ->get();
-
-            foreach ($ladders as $ladder)
-            {
-                $results = $this->getActiveMatchesByLadder($ladder);
-
-                foreach ($results as $key => $val)
-                {
-                    $games[$ladder->abbreviation][$key] = $val;
-                }
-            }
-        }
-        else
-        {
-            $results = $this->getActiveMatchesByLadder($ladderAbbrev);
-
-            foreach ($results as $key => $val)
-            {
-                $games[$ladderAbbrev][$key] = $val;
-            }
-        }
-
-        return $games;
-    }
-
     /**
      * This V2 function will return the data as json array, where each object in the array is an object.
      * V1 returns array of strings.
      */
-    public function getActiveMatchesV2(Request $request, string $ladderAbbrev)
+    public function getActiveMatches(Request $request, string $ladderAbbrev)
     {
         $games = [];
+
         if ($ladderAbbrev == "all")
         {
             $ladders = Ladder::query()
@@ -178,14 +131,15 @@ public function getActiveMatchesV2(Request $request, string $ladderAbbrev)
                     'recent_spawned_matches',
                     'recent_spawned_matches.players',
                     'recent_spawned_matches.players.clan:id,short',
-                    'recent_spawned_matches.players.player:id,username',
+                    'recent_spawned_matches.players.player:id,user_id,username',
+                    'recent_spawned_matches.players.player.user:id,twitch_profile',
                     'recent_spawned_matches.map',
                 ])
                 ->get();
 
             $ladders->each(function (Ladder $ladder) use (&$games)
             {
-                $games[$ladder->abbreviation] = $this->getActiveMatchesByLadderV2($ladder);
+                $games[$ladder->abbreviation] = $this->getActiveMatchesByLadder($ladder);
             });
         }
         else
@@ -200,61 +154,19 @@ public function getActiveMatchesV2(Request $request, string $ladderAbbrev)
                     'recent_spawned_matches',
                     'recent_spawned_matches.players',
                     'recent_spawned_matches.players.clan:id,short',
-                    'recent_spawned_matches.players.player:id,username',
+                    'recent_spawned_matches.players.player:id,user_id,username',
+                    'recent_spawned_matches.players.player.user:id,twitch_profile',
                     'recent_spawned_matches.map',
                 ])
                 ->first();
 
-            $games[$ladder->abbreviation] = $this->getActiveMatchesByLadderV2($ladder);
+            $games[$ladder->abbreviation] = $this->getActiveMatchesByLadder($ladder);
         }
 
         return $games;
     }
 
-    private function getActiveMatchesByLadder(Ladder|string $ladder)
-    {
-        $ladder = is_string($ladder) ? $this->ladderService->getLadderByGame($ladder) : $ladder;
-        $sides = $ladder->sides->pluck('name', 'local_id')->toArray();
-
-        if ($ladder == null)
-            abort(400, "Invalid ladder provided");
-
-        //get all recent QMs that whose games have spawned. (state_type_id == 5)
-        $qms = $ladder->recent_spawned_matches;
-
-        $games = [];
-
-        foreach ($qms as $qm) //iterate over every active quick match
-        {
-            $map = trim($qm->map->description);
-            $dt = $qm->created_at;
-
-            //get the player data pertaining to this quick match
-            $players = $qm->players;
-
-            $playersString = "";
-            if ($ladder->clans_allowed)
-            {
-                $playersString = $this->getActiveClanMatchesData($sides, $players);
-            }
-            else if ($ladder->ladder_type == \App\Models\Ladder::TWO_VS_TWO) // 2v2
-            {
-                $playersString = $this->getTeamActivePlayerMatchesData($sides, $players, $qm->created_at);
-            }
-            else
-            {
-                $playersString = $this->getActivePlayerMatchesData($sides, $players, $qm->created_at);
-            }
-
-            $duration = Carbon::now()->diff($dt);
-            $duration_formatted = $duration->format('%i mins %s sec');
-            $games[] = $playersString . " on " . $map . " (" . $duration_formatted . ")";
-        }
-
-        return $games;
-    }
-
-    private function getActiveMatchesByLadderV2(Ladder $ladder)
+    private function getActiveMatchesByLadder(Ladder $ladder)
     {
         $sides = $ladder->sides->pluck('name', 'local_id')->toArray();
 
@@ -282,11 +194,11 @@ private function getActiveMatchesByLadderV2(Ladder $ladder)
             }
             else if ($ladder->ladder_type == Ladder::TWO_VS_TWO) // 2v2
             {
-                $playersData = $this->getTeamActivePlayerMatchesDataV2($sides, $qmPlayers, $qm->created_at);
+                $playersData = $this->getTeamActivePlayerMatchesData($sides, $qmPlayers, $qm->created_at);
             }
             else
             {
-                $playersData = $this->getActivePlayerMatchesDataV2($sides, $qmPlayers, $qm->created_at);
+                $playersData = $this->getActivePlayerMatchesData($sides, $qmPlayers, $qm->created_at);
             }
 
             $duration = Carbon::now()->diff($dt);
@@ -356,29 +268,10 @@ private function getActiveClanMatchesData($sides, $players)
         return $playersString;
     }
 
-    private function getActivePlayerMatchesData($sides, $players, $created_at)
-    {
-        $playersString = "";
-        $dt = new DateTime($created_at);
-        for ($i = 0; $i < count($players); $i++)
-        {
-            $player = $players[$i];
-            $playerName = "Player" . ($i + 1);
-            if (abs(Carbon::now()->diffInSeconds($dt)) > 120) //only show real player name if 2mins has passed
-                $playerName = $player->player->username;
-
-            $playersString .= $playerName . " (" . ($sides[$player->actual_side] ?? '') . ")";
-
-            if ($i < count($players) - 1)
-                $playersString .= " vs ";
-        }
-        return $playersString;
-    }
-
     /**
      * @return an array containing every player's name and their faction
      */
-    private function getActivePlayerMatchesDataV2(array $sides, $qmPlayers, $created_at)
+    private function getActivePlayerMatchesData(array $sides, $qmPlayers, $created_at)
     {
         $dt = new DateTime($created_at);
         $showRealNames = abs(Carbon::now()->diffInSeconds($dt)) > 120;
@@ -390,74 +283,32 @@ private function getActivePlayerMatchesDataV2(array $sides, $qmPlayers, $created
                 return [
                     "playerName" => $showRealNames ? $qmPlayer->player->username : "Player" . ($index + 1),
                     "playerFaction" => $sides[$qmPlayer->actual_side] ?? '',
-                    "playerColor" => $qmPlayer->color
+                    "playerColor" => $qmPlayer->color,
+                    "twitchProfile" => $qmPlayer->player?->user?->twitch_profile
                 ];
             })
             ->all();
     }
 
-    /**
-     * returns a 'pretty' message describing the players on each team
-     * 
-     * should probably return a json array with the data but we are where we are
-     */
-    private function getTeamActivePlayerMatchesData($sides, $players, $created_at)
-    {
-        $playersString = "";
-        $dt = new DateTime($created_at);
-        $teams = [];
-
-        foreach ($players as $player)
-        {
-            $teams[$player->team][] = $player;
-        }
-
-        $teamCount = 0;
-        $playerNum = 0;
-        foreach ($teams as $teamId => $teammates)
-        {
-            $teammateNum = 0;
-            foreach ($teammates as $player)
-            {
-                $playerName = "Player" . ($playerNum + 1);
-                if (abs(Carbon::now()->diffInSeconds($dt)) > 60) //only show real player name if 1 min has passed
-                {
-                    $playerName = $player->player->username;
-                }
-                $playersString .= $playerName . " (" . ($sides[$player->actual_side] ?? '') . ")";
-
-                if ($teammateNum < count($teammates) - 1) // if not last player on the team append ' and '
-                    $playersString .= " and ";
-
-                $teammateNum++;
-                $playerNum++;
-            }
-
-            if ($teamCount < count($teams) - 1) // if not last team append ' vs '
-                $playersString .= " vs ";
-
-            $teamCount++;
-        }
-
-        return $playersString;
-    }
-
-    private function getTeamActivePlayerMatchesDataV2(array $sides, $qmPlayers, $created_at)
+    private function getTeamActivePlayerMatchesData(array $sides, $qmPlayers, $created_at)
     {
         $dt = new DateTime($created_at);
-        $showRealNames = abs(Carbon::now()->diffInSeconds($dt)) > 120;
+        $showRealNames = abs(Carbon::now()->diffInSeconds($dt)) > 90;
 
         return collect($qmPlayers)
             ->groupBy('team')
             ->flatten()
             ->values()
             ->map(function ($qmPlayer, $index) use ($sides, $showRealNames)
             {
+                $useRealName = $showRealNames || $qmPlayer->team === "observer";
+                $faction = $qmPlayer->team === "observer" ? "Observer" : $sides[$qmPlayer->actual_side] ?? '';
                 return [
                     "teamId" => $qmPlayer->team,
-                    "playerName" => $showRealNames ? $qmPlayer->player->username : "Player" . ($index + 1),
-                    "playerFaction" => $sides[$qmPlayer->actual_side] ?? '',
-                    "playerColor" => $qmPlayer->color
+                    "playerName" => $useRealName ? $qmPlayer->player->username : "Player" . ($index + 1),
+                    "playerFaction" => $faction,
+                    "playerColor" => $qmPlayer->color,
+                    "twitchProfile" => $qmPlayer->player->user->twitch_profile
                 ];
             })
             ->all();

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

@@ -1218,6 +1218,12 @@ public function createTeamQmMatch(LadderHistory $history, Collection $maps, Coll
         $this->setTeamSpawns('A', $spawns[0], $teamAPlayers, $qmMatch, $colors);
         $this->setTeamSpawns('B', $spawns[1], $teamBPlayers, $qmMatch, $colors);
 
+        // Set observers' team to 'observer'
+        foreach ($observers->values() as $observer) {
+            $qmObserver = $observer->qmPlayer;
+            $qmObserver->team = 'observer';
+            $qmObserver->save();
+        }
         $this->setObserversSpawns($observers, $qmMatch, $colors);
 
         return $qmMatch;

cncnet-api/app/Models/Ban.php

@@ -5,13 +5,29 @@
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\Log;
+use Spatie\Activitylog\LogOptions;
+use Spatie\Activitylog\Traits\LogsActivity;
 
 class Ban extends Model
 {
+    use LogsActivity;
 
+    public function getActivitylogOptions(): LogOptions
+    {
+        return LogOptions::defaults()
+            ->logOnly(['*'])
+            ->logOnlyDirty()
+            ->dontSubmitEmptyLogs();
+    }
 
     public $fillable = [
-        'admin_id', 'user_id', 'ban_type', 'internal_note', 'plubic_reason', 'expires', 'ip_address_id'
+        'admin_id',
+        'user_id',
+        'ban_type',
+        'internal_note',
+        'plubic_reason',
+        'expires',
+        'ip_address_id'
     ];
 
     protected $casts = [

cncnet-api/app/Models/Map.php

@@ -4,14 +4,25 @@
 
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
+use Spatie\Activitylog\Traits\LogsActivity;
+use \Spatie\Activitylog\LogOptions;
 
 class Map extends Model
 {
-    use HasFactory;
+    use LogsActivity, HasFactory;
+
     protected $table = 'maps';
     protected $fillable = ['name', 'hash', 'ladder_id', 'spawn_count'];
     public $timestamps = false;
 
+    public function getActivitylogOptions(): LogOptions
+    {
+        return LogOptions::defaults()
+            ->logOnly(['name', 'hash', 'image_path', 'description'])
+            ->logOnlyDirty()
+            ->dontSubmitEmptyLogs();
+    }
+
     public function qmMaps()
     {
         return $this->hasMany(QmMap::class);