further refactoring of slot null checks to optional chaining

Corsace · Oct 3, 2024 · c514efc · c514efc
1 parent eeeaebd
commit c514efc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/BanchoBot/functions/tournaments/matchup/areAllPlayersInAssignedSlots.ts b/BanchoBot/functions/tournaments/matchup/areAllPlayersInAssignedSlots.ts
@@ -1,5 +1,5 @@
 import { BanchoLobby, BanchoLobbyPlayer } from "bancho.js";
 
 export default function areAllPlayersInAssignedSlots (mpLobby: BanchoLobby, playersPlaying: BanchoLobbyPlayer[] | undefined) {
-    return !playersPlaying || playersPlaying.every(p => mpLobby.slots.some(s => s !== null && s.user.id === p.user.id));
+    return !playersPlaying || playersPlaying.every(p => mpLobby.slots.some(s => s?.user.id === p.user.id));
 }
diff --git a/BanchoBot/functions/tournaments/matchup/runMatchup.ts b/BanchoBot/functions/tournaments/matchup/runMatchup.ts
@@ -478,12 +478,12 @@ async function runMatchupListeners (matchup: Matchup, mpLobby: BanchoLobby, mpCh
         if (
             (
                 matchup.stage!.stageType === StageType.Qualifiers &&
-                matchup.teams!.some(team => !mpLobby.slots.some(m => m !== null && m.user.id.toString() === team.captain.osu.userID))
+                matchup.teams!.some(team => !mpLobby.slots.some(m => m?.user.id.toString() === team.captain.osu.userID))
             ) ||
             (
                 matchup.stage!.stageType !== StageType.Qualifiers &&
-                !mpLobby.slots.some(m => m !== null && m.user.id.toString() === matchup.team1!.captain.osu.userID) &&
-                !mpLobby.slots.some(m => m !== null && m.user.id.toString() === matchup.team2!.captain.osu.userID)
+                !mpLobby.slots.some(m => m?.user.id.toString() === matchup.team1!.captain.osu.userID) &&
+                !mpLobby.slots.some(m => m?.user.id.toString() === matchup.team2!.captain.osu.userID)
             )
         ) {
             await mpChannel.sendMessage(`${newPlayer.user.username} waiting for all ${matchup.stage!.tournament.matchupSize === 1 ? "players" : "captains"} to be here before matchup starts`);