refactor: 🎨 Refactor the players array into a map #176
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Began refactoring the players array
…-me-if-you-can into jsalkeld-refactor-players-map
Avatar.ts is refactored. Lobby.ts uses less object.keys
Host works properly with the map rather than an array
Changed to not in rather than in
…-me-if-you-can into jsalkeld-refactor-players-map
…-me-if-you-can into jsalkeld-refactor-players-map
Fixed the most votes logic
|
@mrjoshua520 some of my comments got resolved but I don't see any new commits am I missing something? |
There are commits waiting to be pushed but I figured I wouldn't until I got a chance to fix some of the bugs that are still in the branch |
…-me-if-you-can into jsalkeld-refactor-players-map
…-me-if-you-can into jsalkeld-refactor-players-map
…-me-if-you-can into jsalkeld-refactor-players-map
…-me-if-you-can into jsalkeld-refactor-players-map
…-me-if-you-can into jsalkeld-refactor-players-map
…-me-if-you-can into jsalkeld-refactor-players-map
…-me-if-you-can into jsalkeld-refactor-players-map
…-me-if-you-can into jsalkeld-refactor-players-map
…-me-if-you-can into jsalkeld-refactor-players-map
…-me-if-you-can into jsalkeld-refactor-players-map
…-me-if-you-can into jsalkeld-refactor-players-map
nstringham
requested changes
Jan 10, 2023
Comment on lines
14
to
+20
| const aliveUids: string[] = []; | ||
| lobbyData.players.forEach((player, playerIndex) => { | ||
| if (player.alive) { | ||
| aliveUids.push(lobbyData.uids[playerIndex]); | ||
|
|
||
| for (const uid in lobbyData.players) { | ||
| if (lobbyData.players[uid].alive) { | ||
| aliveUids.push(uid); | ||
| } | ||
| }); | ||
| } |
There was a problem hiding this comment.
this could be done functionally with filter but this is ok
functions/src/lobby.ts
Outdated
Comment on lines
231
to
246
| // get lobby data | ||
| const { players, uids } = lobbyInfo.data() as Lobby; | ||
| const { players, host } = lobbyInfo.data() as Lobby; | ||
|
|
||
| // Get position of the Player | ||
| const playerPos = uids.indexOf(auth.uid); | ||
| delete players[auth.uid]; | ||
|
|
||
| // If the last player is leaving delete the document instead | ||
| if (uids.length === 1) { | ||
| if (Object.keys(players).length === 0) { | ||
| transaction.delete(lobby); | ||
| } else { | ||
| // Remove player from the lobby | ||
| transaction.update(lobby, { | ||
| players: FieldValue.arrayRemove(players[playerPos]), | ||
| uids: FieldValue.arrayRemove(auth.uid), | ||
| // eslint-disable-next-line @typescript-eslint/no-explicit-any -- Workaround for https://github.com/googleapis/nodejs-firestore/issues/1808 | ||
| players: players satisfies Lobby["players"] as any, | ||
| host: updateHost(players) ?? host, | ||
| }); | ||
| } |
There was a problem hiding this comment.
this still looks like it has some duplicaed code with kick and ban
| let winner: Lobby["winner"]; | ||
| const alteredPlayers: Player[] = JSON.parse(JSON.stringify(currentPlayers)); | ||
| const alteredPlayers: Player[] = JSON.parse(JSON.stringify(players)); |
There was a problem hiding this comment.
I don't think you can do this anymore because Player now contains a timestamp
…-me-if-you-can into jsalkeld-refactor-players-map
…Time Slightly faster and I don't think it effects readability
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Keep in mind this refactor also removes the UID array