first draft of leniency checker

qbreader · Oct 3, 2024 · 3567c73 · 3567c73
1 parent 417da4b
commit 3567c73
Show file tree

Hide file tree

Showing 11 changed files with 84 additions and 16 deletions.
diff --git a/Web.config b/Web.config
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<configuration>
+  <!--
+    For a description of web.config changes see http://go.microsoft.com/fwlink/?LinkId=235367.
+
+    The following attributes can be set on the <httpRuntime> tag.
+      <system.Web>
+        <httpRuntime targetFramework="4.8.1" />
+      </system.Web>
+  -->
+  <system.web>
+    <compilation debug="false" targetFramework="4.8.1"/>
+    <pages controlRenderingCompatibilityVersion="4.0"/>
+  </system.web>
+</configuration>
diff --git a/client/multiplayer/room.html b/client/multiplayer/room.html
@@ -178,6 +178,7 @@ <h1 id="funny-toast-text" class="me-auto text-danger"></h1>
                     <div class="mb-2"></div>
                     <label for="reading-speed">Reading speed: <span id="reading-speed-display">50</span><br></label>
                     <input class="form-range" id="reading-speed" type="range" min="0" max="100" step="5">
+
                     <div>
                         View more settings <a href="/settings">here</a>.
                     </div>

diff --git a/client/multiplayer/room.jsx b/client/multiplayer/room.jsx
@@ -72,6 +72,7 @@ socket.onmessage = function (event) {
     case 'reveal-answer': return revealAnswer(data);
     case 'set-categories': return setCategories(data);
     case 'set-difficulties': return setDifficulties(data);
+    case 'set-leniency': return setLeniency(data);
     case 'set-reading-speed': return setReadingSpeed(data);
     case 'set-packet-numbers': return setPacketNumbers(data);
     case 'set-set-name': return setSetName(data);
@@ -208,6 +209,9 @@ function connectionAcknowledged ({
   document.getElementById('reading-speed').value = settings.readingSpeed;
   document.getElementById('reading-speed-display').textContent = settings.readingSpeed;
 
+  document.getElementById('leniency').value = settings.leniency;
+  document.getElementById('leniency-display').textContent = settings.leniency;
+
   document.getElementById('toggle-rebuzz').checked = settings.rebuzz;
 
   document.getElementById('toggle-skip').checked = settings.skip;
@@ -576,6 +580,12 @@ function setReadingSpeed ({ username, value }) {
   document.getElementById('reading-speed-display').textContent = value;
 }
 
+function setLeniency ({ username, value }) {
+  logEvent(username, `changed the leniency to ${value}`);
+  document.getElementById('leniency').value = value;
+  document.getElementById('leniency-display').textContent = value;
+}
+
 function setSetName ({ username, value }) {
   logEvent(username, value.length > 0 ? `changed set name to ${value}` : 'cleared set name');
   document.getElementById('set-name').value = value;
@@ -824,13 +834,20 @@ document.getElementById('pause').addEventListener('click', function () {
   socket.send(JSON.stringify({ type: 'pause', pausedTime }));
 });
 
-document.getElementById('reading-speed').addEventListener('change', function () {
-  socket.send(JSON.stringify({ type: 'set-reading-speed', value: this.value }));
+document.getElementById('leniency').addEventListener('input', function () {
+  document.getElementById('leniency-display').textContent = this.value;
+});
+
+document.getElementById('leniency').addEventListener('change', function () {
+  socket.send(JSON.stringify({ type: 'set-leniency', value: this.value }));
 });
 
 document.getElementById('reading-speed').addEventListener('input', function () {
   document.getElementById('reading-speed-display').textContent = this.value;
 });
+document.getElementById('reading-speed').addEventListener('change', function () {
+  socket.send(JSON.stringify({ type: 'set-reading-speed', value: this.value }));
+});
 
 document.getElementById('report-question-submit').addEventListener('click', function () {
   api.reportQuestion(

diff --git a/client/scripts/api/index.js b/client/scripts/api/index.js
@@ -9,12 +9,12 @@ export default class api {
         * directedPrompt: String | null
     * }>}
     */
-  static async checkAnswer (answerline, givenAnswer) {
+  static async checkAnswer (answerline, givenAnswer, strictness = null) {
     if (givenAnswer === '') {
       return { directive: 'reject', directedPrompt: null };
     }
 
-    return await fetch('/api/check-answer?' + new URLSearchParams({ answerline, givenAnswer }))
+    return await fetch('/api/check-answer?' + new URLSearchParams({ answerline, givenAnswer, ...(strictness && { strictness }) }))
       .then(response => response.json());
   }
 

diff --git a/client/scripts/utilities/index.js b/client/scripts/utilities/index.js
@@ -225,8 +225,8 @@ function rangeToArray (string, max = 0) {
 
   const tokens = string.split(',');
   const ranges = [];
-  for (let i = 0; i < tokens.length; i++) {
-    const range = tokens[i].trim().split('-');
+  for (const element of tokens) {
+    const range = element.trim().split('-');
     if (range.length === 1) {
       ranges.push([parseInt(range[0]), parseInt(range[0])]);
     } else {
@@ -235,8 +235,8 @@ function rangeToArray (string, max = 0) {
   }
 
   const array = [];
-  for (let i = 0; i < ranges.length; i++) {
-    for (let j = ranges[i][0]; j <= ranges[i][1]; j++) {
+  for (const element of ranges) {
+    for (let j = element[0]; j <= element[1]; j++) {
       array.push(j);
     }
   }

diff --git a/client/singleplayer/bonuses.html b/client/singleplayer/bonuses.html
@@ -104,9 +104,13 @@ <h1 id="funny-toast-text" class="me-auto text-danger"></h1>
                 <div class="mt-2" id="general-settings">
                     <div class="text-center mb-2">
                         <button class="btn btn-danger" id="category-select-button" data-bs-target="#category-modal"
-                            data-bs-toggle="modal" type="button">Categories</button>
+                                data-bs-toggle="modal" type="button">
+                            Categories
+                        </button>
                         <button class="btn btn-warning" id="clear-stats" type="button">Clear Stats</button>
                     </div>
+                    <label for="question-length">Leniency: <span id="leniency-display">7</span><br></label>
+                    <input class="form-range" id="leniency" type="range" min="0" max="20" step="1">
                     <div class="form-check form-switch">
                         <input class="form-check-input" id="toggle-select-by-set-name" type="checkbox" role="switch">
                         <label class="form-check-label" for="toggle-select-by-set-name">Select by set name</label>
@@ -119,6 +123,7 @@ <h1 id="funny-toast-text" class="me-auto text-danger"></h1>
                         <input class="form-check-input" id="toggle-standard-only" type="checkbox" role="switch">
                         <label class="form-check-label" for="toggle-standard-only">Standard format only</label>
                     </div>
+
                     <hr>
                     <div class="form-check form-switch">
                         <input class="form-check-input" id="type-to-answer" type="checkbox" role="switch" checked>

diff --git a/client/singleplayer/bonuses.jsx b/client/singleplayer/bonuses.jsx
@@ -61,12 +61,17 @@ const categoryManager = new CategoryManager(query.categories, query.subcategorie
 const settings = window.localStorage.getItem('singleplayer-bonus-settings')
   ? JSON.parse(window.localStorage.getItem('singleplayer-bonus-settings'))
   : {
+      leniency: 7,
       selectBySetName: false,
       showHistory: true,
       typeToAnswer: true
     };
 
 // Load query and settings first so user doesn't see the default settings
+if (settings.leniency) {
+  document.getElementById('leniency').value = settings.leniency;
+  document.getElementById('leniency-display').textContent = settings.leniency;
+}
 if (settings.selectBySetName) {
   document.getElementById('difficulty-settings').classList.add('d-none');
   document.getElementById('set-settings').classList.remove('d-none');
@@ -261,7 +266,7 @@ async function getRandomBonus ({ alternateSubcategories, categories, difficultie
 }
 
 async function giveAnswer (givenAnswer) {
-  const { directive, directedPrompt } = await api.checkAnswer(bonuses[questionNumber - 1].answers[currentBonusPart], givenAnswer);
+  const { directive, directedPrompt } = await api.checkAnswer(bonuses[questionNumber - 1].answers[currentBonusPart], givenAnswer, settings.leniency);
 
   switch (directive) {
     case 'accept':
@@ -479,6 +484,12 @@ document.getElementById('toggle-settings').addEventListener('click', function ()
   document.getElementById('settings').classList.toggle('d-lg-none');
 });
 
+document.getElementById('leniency').addEventListener('input', function () {
+  settings.leniency = this.value;
+  document.getElementById('leniency-display').textContent = this.value;
+  window.localStorage.setItem('singleplayer-tossup-settings', JSON.stringify(settings));
+});
+
 document.getElementById('toggle-select-by-set-name').addEventListener('click', function () {
   this.blur();
   settings.selectBySetName = this.checked;
@@ -525,6 +536,8 @@ document.getElementById('toggle-three-part-bonuses').addEventListener('click', f
 
 document.getElementById('type-to-answer').addEventListener('click', function () {
   this.blur();
+  document.getElementById('leniency').disabled = !this.checked;
+  document.getElementById('leniency-display').disabled = !this.checked;
   settings.typeToAnswer = this.checked;
   window.localStorage.setItem('singleplayer-bonus-settings', JSON.stringify(settings));
 });

diff --git a/client/singleplayer/tossups.html b/client/singleplayer/tossups.html
@@ -99,6 +99,7 @@ <h1 id="funny-toast-text" class="me-auto text-danger"></h1>
                 </div>
                 <div id="difficulty-settings">
                     <div class="mb-2" id="difficulty-dropdown-root"></div>
+
                     <section>
                         Year range: <span class="sliderValue0" id="year-range-a">2010</span> - <span class="sliderValue1"
                             id="year-range-b">2024</span>
@@ -143,6 +144,9 @@ <h1 id="funny-toast-text" class="me-auto text-danger"></h1>
                     <div class="mb-2"></div>
                     <label for="reading-speed">Reading speed: <span id="reading-speed-display">50</span><br></label>
                     <input class="form-range" id="reading-speed" type="range" min="0" max="100" step="5">
+                    <div class="mb-2"></div>
+                    <label for="question-length">Leniency: <span id="leniency-display">7</span><br></label>
+                    <input class="form-range" id="leniency" type="range" min="0" max="20" step="1">
                     <div>
                         View more settings <a href="/settings">here</a>.
                     </div>

diff --git a/client/singleplayer/tossups.jsx b/client/singleplayer/tossups.jsx
@@ -84,6 +84,7 @@ const categoryManager = new CategoryManager(query.categories, query.subcategorie
 const settings = window.localStorage.getItem('singleplayer-tossup-settings')
   ? JSON.parse(window.localStorage.getItem('singleplayer-tossup-settings'))
   : {
+      leniency: 7,
       readingSpeed: 50,
       rebuzz: false,
       selectBySetName: false,
@@ -93,6 +94,10 @@ const settings = window.localStorage.getItem('singleplayer-tossup-settings')
     };
 
 // Load query and settings first so user doesn't see the default settings
+if (settings.leniency) {
+  document.getElementById('leniency-display').textContent = settings.leniency;
+  document.getElementById('leniency').value = settings.leniency;
+}
 if (settings.readingSpeed) {
   document.getElementById('reading-speed-display').textContent = settings.readingSpeed;
   document.getElementById('reading-speed').value = settings.readingSpeed;
@@ -273,7 +278,7 @@ function clearStats () {
 async function giveAnswer (givenAnswer) {
   currentlyBuzzing = false;
 
-  const { directive, directedPrompt } = await api.checkAnswer(tossups[questionNumber - 1].answer, givenAnswer);
+  const { directive, directedPrompt } = await api.checkAnswer(tossups[questionNumber - 1].answer, givenAnswer, settings.leniency);
 
   switch (directive) {
     case 'accept': {
@@ -415,7 +420,7 @@ function readQuestion (expectedReadTime) {
     }
 
     // calculate time needed before reading next word
-    let time = Math.log(word.length) + 1;
+    let time = Math.log(word.length || 1) + 1;
     if ((word.endsWith('.') && word.charCodeAt(word.length - 2) > 96 && word.charCodeAt(word.length - 2) < 123) ||
             word.slice(-2) === '.\u201d' || word.slice(-2) === '!\u201d' || word.slice(-2) === '?\u201d') { time += 2; } else if (word.endsWith(',') || word.slice(-2) === ',\u201d') { time += 0.75; } else if (word === '(*)') { time = 0; }
 
@@ -596,6 +601,12 @@ document.getElementById('reading-speed').addEventListener('input', function () {
   window.localStorage.setItem('singleplayer-tossup-settings', JSON.stringify(settings));
 });
 
+document.getElementById('leniency').addEventListener('input', function () {
+  settings.leniency = this.value;
+  document.getElementById('leniency-display').textContent = this.value;
+  window.localStorage.setItem('singleplayer-tossup-settings', JSON.stringify(settings));
+});
+
 document.getElementById('report-question-submit').addEventListener('click', function () {
   api.reportQuestion(
     document.getElementById('report-question-id').value,
@@ -712,6 +723,8 @@ document.getElementById('toggle-timer').addEventListener('click', function () {
 document.getElementById('type-to-answer').addEventListener('click', function () {
   this.blur();
   settings.typeToAnswer = this.checked;
+  document.getElementById('leniency').disabled = !this.checked;
+  document.getElementById('leniency-display').disabled = !this.checked;
   document.getElementById('toggle-rebuzz').disabled = !this.checked;
   window.localStorage.setItem('singleplayer-tossup-settings', JSON.stringify(settings));
 });

diff --git a/routes/api/check-answer.js b/routes/api/check-answer.js
@@ -4,8 +4,8 @@ import checkAnswer from 'qb-answer-checker';
 const router = Router();
 
 router.get('/', (req, res) => {
-  const { answerline, givenAnswer } = req.query;
-  const { directive, directedPrompt } = checkAnswer(answerline, givenAnswer);
+  const { answerline, givenAnswer, strictness } = req.query;
+  const { directive, directedPrompt } = checkAnswer(answerline, givenAnswer, strictness);
   res.header('Access-Control-Allow-Origin', '*');
   res.json({ directive, directedPrompt });
 });

diff --git a/types.js b/types.js
@@ -7,7 +7,7 @@ import { ObjectId } from 'mongodb';
  * @typedef {object} Question
  * @property {ObjectId} _id
  * @property {string} category
- * @property {number} difficulty
+ * @property {0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10} difficulty
  * @property {string} subcategory
  * @property {number} number
  *
@@ -61,5 +61,5 @@ import { ObjectId } from 'mongodb';
  * @property {ObjectId} _id
  * @property {string} name
  * @property {number} year
- * @property {number} difficulty
+ * @property {0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10} difficulty
  */