assume tossup.question contains powermark bolding

qbreader · Apr 29, 2024 · 0811a4e · 0811a4e
1 parent 7aa95c4
commit 0811a4e
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 36 deletions.
diff --git a/client/admin/category-reports.js b/client/admin/category-reports.js
@@ -54,7 +54,6 @@ function TossupCard({
     const reason = tossup.reports.map(report => report.description).join('; ') || 'None given';
     document.getElementById('report-reason').value = reason;
   }
-  const powerParts = tossup.question.split('(*)');
   return /*#__PURE__*/React.createElement("div", {
     className: "card my-2"
   }, /*#__PURE__*/React.createElement("div", {
@@ -68,7 +67,7 @@ function TossupCard({
     className: "card-body"
   }, /*#__PURE__*/React.createElement("span", {
     dangerouslySetInnerHTML: {
-      __html: powerParts.length > 1 ? '<b>' + powerParts[0] + '(*)</b>' + powerParts[1] : tossup.question
+      __html: tossup.question
     }
   }), /*#__PURE__*/React.createElement("hr", {
     className: "my-3"
@@ -241,4 +240,4 @@ document.getElementById('new-category').addEventListener('input', function () {
   }
 });
 const root = ReactDOM.createRoot(document.getElementById('root'));
-root.render( /*#__PURE__*/React.createElement(Reports, null));
+root.render( /*#__PURE__*/React.createElement(Reports, null));
diff --git a/client/admin/category-reports.jsx b/client/admin/category-reports.jsx
@@ -59,8 +59,6 @@ function TossupCard({ tossup }) {
         document.getElementById('report-reason').value = reason;
     }
 
-    const powerParts = tossup.question.split('(*)');
-
     return (
         <div className="card my-2">
             <div className="card-header d-flex justify-content-between clickable" data-bs-toggle="collapse" data-bs-target={`#question-${_id}`}>
@@ -73,9 +71,7 @@ function TossupCard({ tossup }) {
             </div>
             <div className="card-container collapse show" id={`question-${_id}`}>
                 <div className="card-body">
-                    <span dangerouslySetInnerHTML={{
-                        __html: powerParts.length > 1 ? '<b>' + powerParts[0] + '(*)</b>' + powerParts[1] : tossup.question,
-                    }}></span>
+                    <span dangerouslySetInnerHTML={{ __html: tossup.question }}></span>
                     <hr className="my-3"></hr>
                     <div><b>ANSWER:</b> <span dangerouslySetInnerHTML={{ __html: tossup?.answer }}></span></div>
                 </div>

diff --git a/client/database/index.js b/client/database/index.js
@@ -316,7 +316,6 @@ function TossupCard({
       console.error('Error:', error);
     });
   }
-  const powerParts = highlightedTossup.question.split('(*)');
   return /*#__PURE__*/React.createElement("div", {
     className: "card my-2"
   }, /*#__PURE__*/React.createElement("div", {
@@ -338,7 +337,7 @@ function TossupCard({
     }
   }, /*#__PURE__*/React.createElement("span", {
     dangerouslySetInnerHTML: {
-      __html: powerParts.length > 1 ? '<b>' + powerParts[0] + '(*)</b>' + powerParts[1] : highlightedTossup.question
+      __html: highlightedTossup.question
     }
   }), /*#__PURE__*/React.createElement("hr", {
     className: "my-3"
@@ -1344,4 +1343,4 @@ function QueryForm() {
   }));
 }
 const root = ReactDOM.createRoot(document.getElementById('root'));
-root.render( /*#__PURE__*/React.createElement(QueryForm, null));
+root.render( /*#__PURE__*/React.createElement(QueryForm, null));
diff --git a/client/database/index.jsx b/client/database/index.jsx
@@ -461,8 +461,6 @@ function TossupCard({ tossup, highlightedTossup, hideAnswerline, showCardFooter,
             });
     }
 
-    const powerParts = highlightedTossup.question.split('(*)');
-
     return (
         <div className="card my-2">
             <div className="card-header d-flex justify-content-between">
@@ -475,9 +473,7 @@ function TossupCard({ tossup, highlightedTossup, hideAnswerline, showCardFooter,
             </div>
             <div className="card-container collapse show" id={`question-${_id}`}>
                 <div className="card-body" style={{ 'fontSize': `${fontSize}px` }}>
-                    <span dangerouslySetInnerHTML={{
-                        __html: powerParts.length > 1 ? '<b>' + powerParts[0] + '(*)</b>' + powerParts[1] : highlightedTossup.question,
-                    }}></span>
+                    <span dangerouslySetInnerHTML={{ __html: highlightedTossup.question }}></span>
                     <hr className="my-3"></hr>
                     <div>
                         <b>ANSWER:</b> <span dangerouslySetInnerHTML={{ __html: hideAnswerline ? '' : highlightedTossup?.answer }}></span>

diff --git a/client/multiplayer/room.js b/client/multiplayer/room.js
@@ -147,20 +147,10 @@ socket.onmessage = function (event) {
         break;
 
     case 'reveal-answer': {
+        document.getElementById('question').innerHTML = tossup.question;
         document.getElementById('answer').innerHTML = 'ANSWER: ' + data.answer;
         document.getElementById('pause').disabled = true;
         showNextButton();
-
-        question = document.getElementById('question').innerHTML;
-        if (powermarkPosition) {
-            question = question.slice(0, powermarkPosition) + '(*) ' + question.slice(powermarkPosition);
-        }
-        const powerParts = question.split('(*)');
-        if (powerParts.length > 1) {
-            document.getElementById('question').innerHTML = `<b>${powerParts[0]}(*)</b>${powerParts[1]}`;
-        } else {
-            document.getElementById('question').textContent = question;
-        }
         break;
     }
 

diff --git a/client/singleplayer/tossups.js b/client/singleplayer/tossups.js
@@ -196,7 +196,7 @@ async function advanceQuestion() {
         } while (!isValidCategory(questions[questionNumber - 1], query.categories, query.subcategories));
 
         if (Object.keys(questions[0]).length > 0) {
-            questionText = questions[questionNumber - 1].question;
+            questionText = questions[questionNumber - 1].question_sanitized;
             questionTextSplit = questionText.split(' ').filter(word => word !== '');
             document.getElementById('question-number-info').textContent = questionNumber;
         }
@@ -469,13 +469,8 @@ function readQuestion(expectedReadTime) {
 
 
 function revealQuestion() {
+    document.getElementById('question').innerHTML = questions[questionNumber - 1].question;
     document.getElementById('answer').innerHTML = 'ANSWER: ' + questions[questionNumber - 1].answer;
-    let question = (document.getElementById('question').innerHTML);
-    if (powermarkPosition)
-        question = question.slice(0, powermarkPosition) + '(*) ' + question.slice(powermarkPosition);
-
-    const powerParts = (question + questionTextSplit.join(' ')).split('(*)');
-    document.getElementById('question').innerHTML = `${powerParts.length > 1 ? '<b>' + powerParts[0] + '(*)</b>' + powerParts[1] : powerParts[0]}`;
 
     document.getElementById('buzz').disabled = true;
     document.getElementById('buzz').textContent = 'Buzz';

diff --git a/client/utilities.js b/client/utilities.js
@@ -168,7 +168,6 @@ const createTossupCard = (function () {
         questionCounter++;
 
         const { question, answer, category, subcategory, alternate_subcategory, set, packet, number, _id } = tossup;
-        const powerParts = question.replace(/<\/?b>/g, '').split('(*)');
 
         // append a card containing the question to the history element
         const card = document.createElement('div');
@@ -186,7 +185,7 @@ const createTossupCard = (function () {
             </div>
             <div class="card-container collapse" id="question-${questionCounter}">
                 <div class="card-body">
-                    ${powerParts.length > 1 ? '<b>' + escapeHTML(powerParts[0]) + '(*)</b>' + escapeHTML(powerParts[1]) : escapeHTML(question)}
+                    ${question}
                     <a class="user-select-none" href="#" id="report-question-${_id}" data-bs-toggle="modal" data-bs-target="#report-question-modal">Report Question</a>
                     <hr></hr>
                     <div>ANSWER: ${answer}</div>