Schema overhaul

client/admin/category-reports.js

@@ -2,7 +2,7 @@ function TossupCard({
   tossup
 }) {
   const _id = tossup._id;
-  const packetName = tossup.packetName;
+  const packetName = tossup.packet.name;
   function onClick() {
     document.getElementById('question-id').value = _id;
     document.getElementById('question-type').textContent = 'tossup';
@@ -15,7 +15,7 @@ function TossupCard({
     className: "card-header d-flex justify-content-between clickable",
     "data-bs-toggle": "collapse",
     "data-bs-target": `#question-${_id}`
-  }, /*#__PURE__*/React.createElement("b", null, tossup.setName, " | ", tossup.category, " | ", tossup.subcategory, " ", tossup.alternate_subcategory ? ' (' + tossup.alternate_subcategory + ')' : '', " | ", tossup.difficulty), /*#__PURE__*/React.createElement("b", null, "Packet ", tossup.packetNumber, " | Question ", tossup.questionNumber)), /*#__PURE__*/React.createElement("div", {
+  }, /*#__PURE__*/React.createElement("b", null, tossup.set.name, " | ", tossup.category, " | ", tossup.subcategory, " ", tossup.alternate_subcategory ? ' (' + tossup.alternate_subcategory + ')' : '', " | ", tossup.difficulty), /*#__PURE__*/React.createElement("b", null, "Packet ", tossup.packet.number, " | Question ", tossup.questionNumber)), /*#__PURE__*/React.createElement("div", {
     className: "card-container collapse show",
     id: `question-${_id}`
   }, /*#__PURE__*/React.createElement("div", {
@@ -48,7 +48,7 @@ function BonusCard({
   bonus
 }) {
   const _id = bonus._id;
-  const packetName = bonus.packetName;
+  const packetName = bonus.packet.name;
   const bonusLength = bonus.parts.length;
   const indices = [];
   for (let i = 0; i < bonusLength; i++) {
@@ -70,7 +70,7 @@ function BonusCard({
     className: "card-header d-flex justify-content-between clickable",
     "data-bs-toggle": "collapse",
     "data-bs-target": `#question-${_id}`
-  }, /*#__PURE__*/React.createElement("b", null, bonus.setName, " | ", bonus.category, " | ", bonus.subcategory, " ", bonus.alternate_subcategory ? ' (' + bonus.alternate_subcategory + ')' : '', " | ", bonus.difficulty), /*#__PURE__*/React.createElement("b", null, "Packet ", bonus.packetNumber, " | Question ", bonus.questionNumber)), /*#__PURE__*/React.createElement("div", {
+  }, /*#__PURE__*/React.createElement("b", null, bonus.set.name, " | ", bonus.category, " | ", bonus.subcategory, " ", bonus.alternate_subcategory ? ' (' + bonus.alternate_subcategory + ')' : '', " | ", bonus.difficulty), /*#__PURE__*/React.createElement("b", null, "Packet ", bonus.packet.number, " | Question ", bonus.questionNumber)), /*#__PURE__*/React.createElement("div", {
     className: "card-container collapse show",
     id: `question-${_id}`
   }, /*#__PURE__*/React.createElement("div", {

client/admin/category-reports.jsx

@@ -1,6 +1,6 @@
 function TossupCard({ tossup }) {
     const _id = tossup._id;
-    const packetName = tossup.packetName;
+    const packetName = tossup.packet.name;
 
     function onClick() {
         document.getElementById('question-id').value = _id;
@@ -14,10 +14,10 @@ function TossupCard({ tossup }) {
         <div className="card my-2">
             <div className="card-header d-flex justify-content-between clickable" data-bs-toggle="collapse" data-bs-target={`#question-${_id}`}>
                 <b>
-                    {tossup.setName} | {tossup.category} | {tossup.subcategory} {tossup.alternate_subcategory ? ' (' + tossup.alternate_subcategory + ')' : ''} | {tossup.difficulty}
+                    {tossup.set.name} | {tossup.category} | {tossup.subcategory} {tossup.alternate_subcategory ? ' (' + tossup.alternate_subcategory + ')' : ''} | {tossup.difficulty}
                 </b>
                 <b>
-                    Packet {tossup.packetNumber} | Question {tossup.questionNumber}
+                    Packet {tossup.packet.number} | Question {tossup.questionNumber}
                 </b>
             </div>
             <div className="card-container collapse show" id={`question-${_id}`}>
@@ -44,7 +44,7 @@ function TossupCard({ tossup }) {
 
 function BonusCard({ bonus }) {
     const _id = bonus._id;
-    const packetName = bonus.packetName;
+    const packetName = bonus.packet.name;
     const bonusLength = bonus.parts.length;
     const indices = [];
 
@@ -68,10 +68,10 @@ function BonusCard({ bonus }) {
         <div className="card my-2">
             <div className="card-header d-flex justify-content-between clickable" data-bs-toggle="collapse" data-bs-target={`#question-${_id}`}>
                 <b>
-                    {bonus.setName} | {bonus.category} | {bonus.subcategory} {bonus.alternate_subcategory ? ' (' + bonus.alternate_subcategory + ')' : ''} | {bonus.difficulty}
+                    {bonus.set.name} | {bonus.category} | {bonus.subcategory} {bonus.alternate_subcategory ? ' (' + bonus.alternate_subcategory + ')' : ''} | {bonus.difficulty}
                 </b>
                 <b>
-                    Packet {bonus.packetNumber} | Question {bonus.questionNumber}
+                    Packet {bonus.packet.number} | Question {bonus.questionNumber}
                 </b>
             </div>
             <div className="card-container collapse show" id={`question-${_id}`}>

client/admin/geoword/protests.js

@@ -61,14 +61,14 @@ fetch('/api/admin/geoword/protests?' + new URLSearchParams({ packetName, divisio
     });
 
 document.getElementById('resolve-protest-submit').addEventListener('click', () => {
-    const id = document.getElementById('resolve-protest-id').value;
+    const _id = document.getElementById('resolve-protest-id').value;
     const decision = document.getElementById('resolve-protest-decision').value;
     const reason = document.getElementById('resolve-protest-reason').value;
 
     fetch('/api/admin/geoword/resolve-protest', {
         method: 'POST',
         headers: { 'Content-Type': 'application/json' },
-        body: JSON.stringify({ id, decision, reason }),
+        body: JSON.stringify({ buzz_id: _id, decision, reason }),
     }).then(response => {
         if (response.status === 200) {
             window.location.reload();

client/database/index.js

@@ -61,14 +61,14 @@ function downloadBonusesAsCSV(bonuses, filename = 'bonuses.csv') {
 function downloadQuestionsAsText(tossups, bonuses, filename = 'data.txt') {
   let textdata = '';
   for (let tossup of tossups) {
-    textdata += `${tossup.setName} Packet ${tossup.packetNumber}\n`;
+    textdata += `${tossup.set.name} Packet ${tossup.packet.number}\n`;
     textdata += `Question ID: ${tossup._id}\n`;
     textdata += `${tossup.questionNumber}. ${tossup.question}\n`;
     textdata += `ANSWER: ${tossup.answer}\n`;
     textdata += `<${tossup.category} / ${tossup.subcategory}>\n\n`;
   }
   for (let bonus of bonuses) {
-    textdata += `${bonus.setName} Packet ${bonus.packetNumber}\n`;
+    textdata += `${bonus.set.name} Packet ${bonus.packet.number}\n`;
     textdata += `Question ID: ${bonus._id}\n`;
     textdata += `${bonus.questionNumber}. ${bonus.leadin}\n`;
     for (let i = 0; i < bonus.parts.length; i++) {
@@ -142,7 +142,7 @@ function TossupCard({
   showCardFooter
 }) {
   const _id = tossup._id;
-  const packetName = tossup.packetName;
+  const packetName = tossup.packet.name;
   function clickToCopy() {
     let textdata = `${tossup.question}\nANSWER: ${tossup.answer}`;
     if (tossup.category && tossup.subcategory && tossup.category !== tossup.subcategory) {
@@ -227,11 +227,11 @@ function TossupCard({
   }, /*#__PURE__*/React.createElement("b", {
     className: "clickable",
     onClick: clickToCopy
-  }, tossup.setName, " | ", tossup.category, " | ", tossup.subcategory, " ", tossup.alternate_subcategory ? ' (' + tossup.alternate_subcategory + ')' : '', " | ", tossup.difficulty), /*#__PURE__*/React.createElement("b", {
+  }, tossup.set.name, " | ", tossup.category, " | ", tossup.subcategory, " ", tossup.alternate_subcategory ? ' (' + tossup.alternate_subcategory + ')' : '', " | ", tossup.difficulty), /*#__PURE__*/React.createElement("b", {
     className: "clickable",
     "data-bs-toggle": "collapse",
     "data-bs-target": `#question-${_id}`
-  }, "Packet ", tossup.packetNumber, " | Question ", tossup.questionNumber)), /*#__PURE__*/React.createElement("div", {
+  }, "Packet ", tossup.packet.number, " | Question ", tossup.questionNumber)), /*#__PURE__*/React.createElement("div", {
     className: "card-container collapse show",
     id: `question-${_id}`
   }, /*#__PURE__*/React.createElement("div", {
@@ -269,7 +269,7 @@ function BonusCard({
   showCardFooter
 }) {
   const _id = bonus._id;
-  const packetName = bonus.packetName;
+  const packetName = bonus.packet.name;
   const bonusLength = bonus.parts.length;
   const indices = [];
   for (let i = 0; i < bonusLength; i++) {
@@ -361,11 +361,11 @@ function BonusCard({
   }, /*#__PURE__*/React.createElement("b", {
     className: "clickable",
     onClick: clickToCopy
-  }, bonus.setName, " | ", bonus.category, " | ", bonus.subcategory, " ", bonus.alternate_subcategory ? ' (' + bonus.alternate_subcategory + ')' : '', " | ", bonus.difficulty), /*#__PURE__*/React.createElement("b", {
+  }, bonus.set.name, " | ", bonus.category, " | ", bonus.subcategory, " ", bonus.alternate_subcategory ? ' (' + bonus.alternate_subcategory + ')' : '', " | ", bonus.difficulty), /*#__PURE__*/React.createElement("b", {
     className: "clickable",
     "data-bs-toggle": "collapse",
     "data-bs-target": `#question-${_id}`
-  }, "Packet ", bonus.packetNumber, " | Question ", bonus.questionNumber)), /*#__PURE__*/React.createElement("div", {
+  }, "Packet ", bonus.packet.number, " | Question ", bonus.questionNumber)), /*#__PURE__*/React.createElement("div", {
     className: "card-container collapse show",
     id: `question-${_id}`
   }, /*#__PURE__*/React.createElement("div", {

client/database/index.jsx

@@ -152,15 +152,15 @@ function downloadBonusesAsCSV(bonuses, filename = 'bonuses.csv') {
 function downloadQuestionsAsText(tossups, bonuses, filename = 'data.txt') {
     let textdata = '';
     for (let tossup of tossups) {
-        textdata += `${tossup.setName} Packet ${tossup.packetNumber}\n`;
+        textdata += `${tossup.set.name} Packet ${tossup.packet.number}\n`;
         textdata += `Question ID: ${tossup._id}\n`;
         textdata += `${tossup.questionNumber}. ${tossup.question}\n`;
         textdata += `ANSWER: ${tossup.answer}\n`;
         textdata += `<${tossup.category} / ${tossup.subcategory}>\n\n`;
     }
 
     for (let bonus of bonuses) {
-        textdata += `${bonus.setName} Packet ${bonus.packetNumber}\n`;
+        textdata += `${bonus.set.name} Packet ${bonus.packet.number}\n`;
         textdata += `Question ID: ${bonus._id}\n`;
         textdata += `${bonus.questionNumber}. ${bonus.leadin}\n`;
         for (let i = 0; i < bonus.parts.length; i++) {
@@ -235,7 +235,7 @@ function highlightBonusQuery({ bonus, regExp, searchType = 'all' }) {
 
 function TossupCard({ tossup, highlightedTossup, showCardFooter }) {
     const _id = tossup._id;
-    const packetName = tossup.packetName;
+    const packetName = tossup.packet.name;
 
     function clickToCopy() {
         let textdata = `${tossup.question}\nANSWER: ${tossup.answer}`;
@@ -326,10 +326,10 @@ function TossupCard({ tossup, highlightedTossup, showCardFooter }) {
         <div className="card my-2">
             <div className="card-header d-flex justify-content-between">
                 <b className="clickable" onClick={clickToCopy}>
-                    {tossup.setName} | {tossup.category} | {tossup.subcategory} {tossup.alternate_subcategory ? ' (' + tossup.alternate_subcategory + ')' : ''} | {tossup.difficulty}
+                    {tossup.set.name} | {tossup.category} | {tossup.subcategory} {tossup.alternate_subcategory ? ' (' + tossup.alternate_subcategory + ')' : ''} | {tossup.difficulty}
                 </b>
                 <b className="clickable" data-bs-toggle="collapse" data-bs-target={`#question-${_id}`}>
-                    Packet {tossup.packetNumber} | Question {tossup.questionNumber}
+                    Packet {tossup.packet.number} | Question {tossup.questionNumber}
                 </b>
             </div>
             <div className="card-container collapse show" id={`question-${_id}`}>
@@ -358,7 +358,7 @@ function TossupCard({ tossup, highlightedTossup, showCardFooter }) {
 
 function BonusCard({ bonus, highlightedBonus, showCardFooter }) {
     const _id = bonus._id;
-    const packetName = bonus.packetName;
+    const packetName = bonus.packet.name;
     const bonusLength = bonus.parts.length;
     const indices = [];
 
@@ -456,10 +456,10 @@ function BonusCard({ bonus, highlightedBonus, showCardFooter }) {
         <div className="card my-2">
             <div className="card-header d-flex justify-content-between">
                 <b className="clickable" onClick={clickToCopy}>
-                    {bonus.setName} | {bonus.category} | {bonus.subcategory} {bonus.alternate_subcategory ? ' (' + bonus.alternate_subcategory + ')' : ''} | {bonus.difficulty}
+                    {bonus.set.name} | {bonus.category} | {bonus.subcategory} {bonus.alternate_subcategory ? ' (' + bonus.alternate_subcategory + ')' : ''} | {bonus.difficulty}
                 </b>
                 <b className="clickable" data-bs-toggle="collapse" data-bs-target={`#question-${_id}`}>
-                    Packet {bonus.packetNumber} | Question {bonus.questionNumber}
+                    Packet {bonus.packet.number} | Question {bonus.questionNumber}
                 </b>
             </div>
             <div className="card-container collapse show" id={`question-${_id}`}>

client/multiplayer/room.js

@@ -256,8 +256,8 @@ const socketOnConnectionAcknowledged = async (message) => {
     }
 
     tossup = message.tossup;
-    document.getElementById('set-name-info').textContent = message.tossup?.setName ?? '';
-    document.getElementById('packet-number-info').textContent = message.tossup?.packetNumber ?? '-';
+    document.getElementById('set-name-info').textContent = message.tossup?.set.name ?? '';
+    document.getElementById('packet-number-info').textContent = message.tossup?.packet.number ?? '-';
     document.getElementById('question-number-info').textContent = message.tossup?.questionNumber ?? '-';
 
     document.getElementById('chat').disabled = message.public;
@@ -435,9 +435,9 @@ const socketOnNext = (message) => {
 
     tossup = message.tossup;
 
-    document.getElementById('set-name-info').textContent = tossup?.setName ?? '';
+    document.getElementById('set-name-info').textContent = tossup?.set.name ?? '';
     document.getElementById('question-number-info').textContent = tossup?.questionNumber ?? '-';
-    document.getElementById('packet-number-info').textContent = tossup?.packetNumber ?? '-';
+    document.getElementById('packet-number-info').textContent = tossup?.packet.number ?? '-';
 
     document.getElementById('options').classList.add('d-none');
     showSkipButton();
@@ -475,9 +475,9 @@ const socketOnStart = (message) => {
 
     tossup = message.tossup;
 
-    document.getElementById('set-name-info').textContent = tossup?.setName ?? '';
+    document.getElementById('set-name-info').textContent = tossup?.set.name ?? '';
     document.getElementById('question-number-info').textContent = tossup?.questionNumber ?? '-';
-    document.getElementById('packet-number-info').textContent = tossup?.packetNumber ?? '-';
+    document.getElementById('packet-number-info').textContent = tossup?.packet.number ?? '-';
 };
 
 // Ping server every 45 seconds to prevent socket disconnection

client/singleplayer/bonuses.js

@@ -107,8 +107,8 @@ async function advanceQuestion() {
             return false;
         }
 
-        query.setName = questions[0].setName;
-        query.packetNumbers = [questions[0].packetNumber];
+        query.setName = questions[0].set.name;
+        query.packetNumbers = [questions[0].packet.number];
         document.getElementById('question-number-info').textContent = questions[0].questionNumber;
         questionNumber = 1;
     }

client/singleplayer/tossups.js

@@ -131,8 +131,8 @@ async function advanceQuestion() {
             return false;
         }
 
-        query.setName = questions[0].setName;
-        query.packetNumbers = [questions[0].packetNumber];
+        query.setName = questions[0].set.name;
+        query.packetNumbers = [questions[0].packet.number];
 
         questionText = questions[0].question;
         questionTextSplit = questionText.split(' ').filter(word => word !== '');

client/user/stats/tossups.js

@@ -16,8 +16,8 @@ function fetchTossupStats({ difficulties = '', setName = '', includeMultiplayer
                     <p>Celerity: ${data.bestBuzz.celerity}</p>
                     <div class="card mb-2">
                         <div class="card-header">
-                            <b>${tossup.setName} | ${tossup.category} | ${tossup.subcategory} ${tossup.alternate_subcategory ? ' (' + tossup.alternate_subcategory + ')' : ''} | ${tossup.difficulty}</b>
-                            <b class="float-end">Packet ${tossup.packetNumber} | Question ${tossup.questionNumber}</b>
+                            <b>${tossup.set.name} | ${tossup.category} | ${tossup.subcategory} ${tossup.alternate_subcategory ? ' (' + tossup.alternate_subcategory + ')' : ''} | ${tossup.difficulty}</b>
+                            <b class="float-end">Packet ${tossup.packet.number} | Question ${tossup.questionNumber}</b>
                         </div>
                         <div class="card-container" id="question-${tossup._id}">
                             <div class="card-body">
@@ -26,7 +26,7 @@ function fetchTossupStats({ difficulties = '', setName = '', includeMultiplayer
                                 <div><b>ANSWER:</b> ${tossup.formatted_answer ?? tossup.answer}</div>
                             </div>
                             <div class="card-footer">
-                                <small class="text-muted">${tossup.packetName ? 'Packet ' + tossup.packetName : '&nbsp;'}</small>
+                                <small class="text-muted">${tossup.packet.name ? 'Packet ' + tossup.packet.name : '&nbsp;'}</small>
                                 <small class="text-muted float-end">
                                     <a href="#" onClick={onClick} id="report-question-${tossup._id}" data-bs-toggle="modal" data-bs-target="#report-question-modal">
                                         Report Question