refactor account check into recordStats

qbreader · Nov 1, 2024 · b6f28f9 · b6f28f9
1 parent 2205f93
commit b6f28f9
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 9 deletions.
diff --git a/client/multiplayer/room.jsx b/client/multiplayer/room.jsx
@@ -1,4 +1,3 @@
-import account from '../scripts/accounts.js';
 import questionStats from '../scripts/auth/question-stats.js';
 import api from '../scripts/api/index.js';
 import audio from '../audio/index.js';
@@ -332,7 +331,7 @@ async function giveAnswer ({ celerity, directive, directedPrompt, givenAnswer, p
     sortPlayerListGroup();
   }
 
-  if (directive !== 'prompt' && userId === USER_ID && await account.getUsername()) {
+  if (directive !== 'prompt' && userId === USER_ID) {
     questionStats.recordTossup(tossup, score > 0, score, perQuestionCelerity, true);
   }
 

diff --git a/client/multiplayer/room.min.js b/client/multiplayer/room.min.js
diff --git a/client/scripts/auth/question-stats.js b/client/scripts/auth/question-stats.js
@@ -1,7 +1,11 @@
 import account from '../accounts.js';
 
 export default class questionStats {
-  static recordBonus (bonus, pointsPerPart) {
+  static async recordBonus (bonus, pointsPerPart) {
+    if (!(await account.getUsername())) {
+      return;
+    }
+
     fetch('/auth/question-stats/record-bonus', {
       method: 'POST',
       headers: { 'Content-Type': 'application/json' },
@@ -14,7 +18,11 @@ export default class questionStats {
     });
   }
 
-  static recordTossup (tossup, isCorrect, pointValue, celerity, multiplayer) {
+  static async recordTossup (tossup, isCorrect, pointValue, celerity, multiplayer) {
+    if (!(await account.getUsername())) {
+      return;
+    }
+
     fetch('/auth/question-stats/record-tossup', {
       method: 'POST',
       headers: { 'Content-Type': 'application/json' },

diff --git a/client/singleplayer/tossups/index.jsx b/client/singleplayer/tossups/index.jsx
@@ -1,4 +1,3 @@
-import account from '../../scripts/accounts.js';
 import api from '../../scripts/api/index.js';
 import questionStats from '../../scripts/auth/question-stats.js';
 import audio from '../../audio/index.js';
@@ -150,7 +149,7 @@ async function next ({ packetLength, oldTossup, tossup: nextTossup, type }) {
   document.getElementById('question-number-info').textContent = nextTossup.number;
   document.getElementById('set-name-info').textContent = nextTossup.set.name;
 
-  if (type === 'next' && await account.getUsername()) {
+  if (type === 'next' && room.previous.userId === USER_ID) {
     const pointValue = room.previous.isCorrect ? (room.previous.inPower ? room.previous.powerValue : 10) : (room.previous.endOfQuestion ? 0 : room.previous.negValue);
     questionStats.recordTossup(room.previous.tossup, room.previous.isCorrect, pointValue, room.previous.celerity, false);
   }