Small cleanup

eltoder · Feb 4, 2025 · cf6ecda · cf6ecda
1 parent f54093a
commit cf6ecda
Show file tree

Hide file tree

Showing 10 changed files with 27 additions and 29 deletions.
diff --git a/.prettierrc b/.prettierrc
@@ -1,5 +1,6 @@
 {
   "tabWidth": 2,
   "useTabs": false,
+  "trailingComma": "es5",
   "proseWrap": "always"
 }
diff --git a/database.rules.json b/database.rules.json
@@ -52,7 +52,7 @@
         "events": {
           "$eventId": {
             ".write": "!data.exists() && newData.exists() && auth != null && root.hasChild('games/' + $gameId + '/users/' + auth.uid) && root.child('games/' + $gameId + '/status').val() == 'ingame'",
-            ".validate": "newData.hasChildren(['user', 'time', 'c1', 'c2', 'c3']) && (newData.hasChild('c4') == (root.child('games/' + $gameId + '/mode').val().matches(/^ultraset|ultrachain|ultra9|ghostset$/))) && (newData.hasChildren(['c5', 'c6']) == (root.child('games/' + $gameId + '/mode').val() == 'ghostset'))",
+            ".validate": "newData.hasChildren(['user', 'time', 'c1', 'c2', 'c3']) && (newData.hasChild('c4') == root.child('games/' + $gameId + '/mode').val().matches(/^ultraset|ultrachain|ultra9|ghostset$/)) && (newData.hasChildren(['c5', 'c6']) == (root.child('games/' + $gameId + '/mode').val() == 'ghostset'))",
             "user": {
               ".validate": "newData.isString() && newData.val() == auth.uid"
             },

diff --git a/functions/src/game.ts b/functions/src/game.ts
@@ -11,18 +11,9 @@ interface GameEvent {
   c6?: string;
 }
 
-export type GameMode =
-  | "normal"
-  | "junior"
-  | "setchain"
-  | "ultraset"
-  | "ultrachain"
-  | "ultra9"
-  | "megaset"
-  | "ghostset"
-  | "memory";
+export type GameMode = keyof typeof modes;
 
-type SetType = "Set" | "UltraSet" | "GhostSet";
+type SetType = keyof typeof setTypes;
 
 interface GameModeInfo {
   setType: SetType;
@@ -241,7 +232,7 @@ const setTypes = {
   },
 };
 
-const modes: Record<string, GameModeInfo> = {
+export const modes = {
   normal: {
     setType: "Set",
     traits: 4,
@@ -287,7 +278,7 @@ const modes: Record<string, GameModeInfo> = {
     traits: 4,
     chain: 0,
   },
-};
+} satisfies Record<string, GameModeInfo>;
 
 /**
  * Compute remaining cards (arbitrary order) left in the deck after some
@@ -298,7 +289,7 @@ export function replayEvents(
   gameMode: GameMode
 ) {
   if (!modes.hasOwnProperty(gameMode)) {
-    throw new Error(`invalid gameMode: ${gameMode}`);
+    throw new Error(`Invalid gameMode: ${gameMode}`);
   }
   const events: GameEvent[] = [];
   gameData.child("events").forEach((e) => {

diff --git a/functions/src/index.ts b/functions/src/index.ts
@@ -21,7 +21,7 @@ const stripe = !functions.config().stripe
       apiVersion: "2020-08-27",
     });
 
-import { generateSeed, replayEvents, findSet, GameMode } from "./game";
+import { generateSeed, replayEvents, findSet, GameMode, modes } from "./game";
 
 const MAX_GAME_ID_LENGTH = 64;
 const MAX_UNFINISHED_GAMES_PER_HOUR = 4;
@@ -237,6 +237,12 @@ export const createGame = functions.https.onCall(async (data, context) => {
         'argument `access` given value "public" or "private".'
     );
   }
+  if (!modes.hasOwnProperty(mode)) {
+    throw new functions.https.HttpsError(
+      "invalid-argument",
+      `Invalid gameMode: ${mode}`
+    );
+  }
   if (enableHint && access !== "private") {
     throw new functions.https.HttpsError(
       "invalid-argument",

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -29,7 +29,7 @@
   "devDependencies": {
     "@google-cloud/pubsub": "^2.19.0",
     "cross-env": "^7.0.3",
-    "prettier": "2.6.0"
+    "prettier": "^3.4.2"
   },
   "eslintConfig": {
     "extends": "react-app"

diff --git a/public/index.html b/public/index.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
   <head>
     <title>Set with Friends</title>

diff --git a/src/game.js b/src/game.js
@@ -394,7 +394,7 @@ export const modes = {
   setchain: {
     name: "Set-Chain",
     color: "teal",
-    description: "In every Set, you have to use 1 card from the previous Set.",
+    description: "In every Set you have to use 1 card from the previous Set.",
     setType: "Set",
     traits: 4,
     chain: 1,
@@ -414,7 +414,7 @@ export const modes = {
     name: "UltraSet-Chain",
     color: "orange",
     description:
-      "In every UltraSet, you have to use one pair from the previous Set.",
+      "In every UltraSet you have to use 2 cards from the previous Set.",
     setType: "UltraSet",
     traits: 4,
     chain: 2,

diff --git a/src/pages/GamePage.js b/src/pages/GamePage.js
@@ -432,8 +432,8 @@ function GamePage({ match }) {
                   game.status === "done"
                     ? game.endedAt
                     : !answer && history.length > 0
-                    ? history[history.length - 1].time
-                    : 0
+                      ? history[history.length - 1].time
+                      : 0
                 }
               />
             </Box>

diff --git a/src/pages/ProfilePage.js b/src/pages/ProfilePage.js
@@ -38,8 +38,8 @@ const datasetVariants = {
 };
 
 const gameModes = {
-  ...modes,
   all: { name: "All Modes" },
+  ...modes,
 };
 
 const useStyles = makeStyles((theme) => ({