Merge pull request #86 from ekzhang/develop

Release 3.0.2
ekzhang · Feb 4, 2021 · 64eea75 · 64eea75
2 parents cb8c54f + 1b1c209
commit 64eea75
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/functions/src/index.ts b/functions/src/index.ts
@@ -41,12 +41,11 @@ export const finishGame = functions.https.onCall(async (data, context) => {
     .database()
     .ref(`games/${gameId}/mode`)
     .once("value");
-  const { lastSet, deck, finalTime } = replayEvents(
-    gameData,
-    gameModeRef.val()
-  );
+  const gameMode = gameModeRef.val() || "normal";
+
+  const { lastSet, deck, finalTime } = replayEvents(gameData, gameMode);
 
-  if (findSet(Array.from(deck), gameModeRef.val(), lastSet)) {
+  if (findSet(Array.from(deck), gameMode, lastSet)) {
     throw new functions.https.HttpsError(
       "failed-precondition",
       "The requested game has not yet ended."