4 files changed, 12 insertions, 18 deletions

diff --git a/frontend/src/api/Maps.tsx b/frontend/src/api/Maps.tsx
index b6a6bad..2209788 100644
--- a/frontend/src/api/Maps.tsx
+++ b/frontend/src/api/Maps.tsx
@@ -76,11 +76,10 @@ export const delete_map_discussion = async (token: string, map_id: string, discu
 };
 
 export const post_record = async (token: string, run: UploadRunContent): Promise<string> => {
-  if (run.partner_demo && run.partner_id) {
+  if (run.partner_demo) {
     const response = await axios.postForm(url(`maps/${run.map_id}/record`), {
       "host_demo": run.host_demo,
       "partner_demo": run.partner_demo,
-      "partner_id": run.partner_id,
     }, {
       headers: {
         "Authorization": token,
diff --git a/frontend/src/components/Sidebar.tsx b/frontend/src/components/Sidebar.tsx
index c5c91db..5757183 100644
--- a/frontend/src/components/Sidebar.tsx
+++ b/frontend/src/components/Sidebar.tsx
@@ -154,7 +154,7 @@ const Sidebar: React.FC<SidebarProps> = ({ setToken, profile, setProfile, onUplo
 
           {
             profile && profile.profile ?
-              <button id='upload-run' className='submit-run-button' onClick={() => onUploadRun()}><img src={UploadIcon} alt="upload" /><span>Submit&nbsp;a&nbsp;Run</span></button>
+              <button id='upload-run' className='submit-run-button' onClick={() => onUploadRun()}><img src={UploadIcon} alt="upload" /><span>Upload&nbsp;Record</span></button>
               : 
               <span></span>
           }
diff --git a/frontend/src/components/UploadRunDialog.tsx b/frontend/src/components/UploadRunDialog.tsx
index f3258e8..a92a5fb 100644
--- a/frontend/src/components/UploadRunDialog.tsx
+++ b/frontend/src/components/UploadRunDialog.tsx
@@ -18,8 +18,12 @@ interface UploadRunDialogProps {
 }
 
 const UploadRunDialog: React.FC<UploadRunDialogProps> = ({ token, open, onClose, games }) => {
+
+  const [confirmMessage, setConfirmMessage] = React.useState<string>("Are you sure you want to upload this demo?");
+
   const { message, MessageDialogComponent } = useMessage();
-  const { confirm, ConfirmDialogComponent } = useConfirm("Upload demo?", "Are you sure you want to upload this demo?");
+  const { confirm, ConfirmDialogComponent } = useConfirm("Upload demo?", confirmMessage);
+
 
   const navigate = useNavigate();
 
@@ -27,7 +31,6 @@ const UploadRunDialog: React.FC<UploadRunDialogProps> = ({ token, open, onClose,
     map_id: 0,
     host_demo: null,
     partner_demo: null,
-    partner_id: undefined,
   });
 
   const [currentMap, setCurrentMap] = React.useState<string>("");
@@ -65,7 +68,6 @@ const UploadRunDialog: React.FC<UploadRunDialogProps> = ({ token, open, onClose,
       map_id: gameMaps[0].id,
       host_demo: null,
       partner_demo: null,
-      partner_id: undefined,
     });
     _set_current_map(gameMaps[0].name);
     setSelectedGameID(parseInt(game_id) - 1);
@@ -98,9 +100,6 @@ const UploadRunDialog: React.FC<UploadRunDialogProps> = ({ token, open, onClose,
         } else if (uploadRunContent.partner_demo === null) {
           message("Error", "You must select a partner demo to upload.")
           return
-        } else if (uploadRunContent.partner_id === undefined) {
-          message("Error", "You must specify your partner.")
-          return
         }
       } else {
         if (uploadRunContent.host_demo === null) {
@@ -109,18 +108,20 @@ const UploadRunDialog: React.FC<UploadRunDialogProps> = ({ token, open, onClose,
         }
       }
       const demo = SourceDemoParser.default()
-        .setOptions({ packets: true })
+        .setOptions({ packets: true, header: true })
         .parse(await uploadRunContent.host_demo.arrayBuffer());
       const scoreboard = demo.findPacket<NetMessages.SvcUserMessage>((message) => {
         return message instanceof NetMessages.SvcUserMessage && message.userMessage instanceof ScoreboardTempUpdate;
       })
 
       if (!scoreboard) {
-        message("Error", "Error while processing demo: Unable to get scoreboard result. Is this not a CM demo?")
+        message("Error", "Error while processing demo: Unable to get scoreboard result. Either there is a demo that is corrupt or haven't been recorded in challenge mode.")
         return
       }
       const { portalScore, timeScore } = scoreboard.userMessage?.as<ScoreboardTempUpdate>() ?? {};
-      console.log(`Portal count: ${portalScore}. Ticks: ${timeScore}.`);
+      console.log(`Map Name: ${demo.mapName}. Portal count: ${portalScore}. Ticks: ${timeScore}.`);
+
+      setConfirmMessage(`Map Name: ${demo.mapName}\nPortal count: ${portalScore}\nTicks: ${timeScore}\n\nAre you sure you want to upload this demo?`)
       
       const userConfirmed = await confirm();
 
@@ -190,11 +191,6 @@ const UploadRunDialog: React.FC<UploadRunDialogProps> = ({ token, open, onClose,
                           <>
                             <span>Partner Demo</span>
                             <input type="file" name="partner_demo" id="partner_demo" accept=".dem" onChange={(e) => _handle_file_change(e, false)} />
-                            <span>Partner ID</span>
-                            <input type="text" name="partner_id" id="partner_id" onChange={(e) => setUploadRunContent({
-                              ...uploadRunContent,
-                              partner_id: e.target.value,
-                            })} />
                           </>
                         )
                       }
diff --git a/frontend/src/types/Content.tsx b/frontend/src/types/Content.tsx
index e6e0cb1..42a6917 100644
--- a/frontend/src/types/Content.tsx
+++ b/frontend/src/types/Content.tsx
@@ -21,5 +21,4 @@ export interface UploadRunContent {
   map_id: number;
   host_demo: File | null;
   partner_demo: File | null;
-  partner_id?: string;
 };