fix: 修复已结束比赛提交回退功能失效 #1017

Update.json

@@ -2937,7 +2937,7 @@
             ],
             "Notes": "No release notes were provided for this release."
         },
-        "1.10.0": {
+        "1.999990.0": {
             "UpdateDate": 1753443146018,
             "Prerelease": false,
             "UpdateContents": [
@@ -3729,4 +3729,4 @@
             "Notes": "### 修复提交界面不显示验证码\n\n评测队列繁忙时 XMOJ 会启用图片验证码，但提交界面是脚本自行渲染的，服务端的验证码字段被丢弃，导致提交静默失败。现在提交界面会显示验证码图片与输入框（点击图片可更换），并在提交时携带验证码。\n\n另新增 `AutoCaptcha` 开关（默认开启）：在浏览器本地用模板匹配识别 4 位数字验证码，不联网、不调用任何 AI 服务。把握不大时会留空由您填写，不会填错。"
         }
     }
-}
+}

XMOJ.user.js

@@ -4474,6 +4474,20 @@ async function main() {
                     }
 
                     PassCheck.addEventListener("click", async () => {
+    ErrorElement.style.display = "none";
+    document.querySelector("#Submit").disabled = true;
+    document.querySelector("#Submit").value = "正在提交...";
+    let o2Switch = "&enable_O2=on";
+    if (!document.querySelector("#enable_O2").checked) o2Switch = "";
+
+    const response = await fetch("https://www.xmoj.tech/submit.php", {
+        "headers": {
+            "content-type": "application/x-www-form-urlencoded"
+        },
+        "referrer": location.href,
+        "method": "POST",
+        "body": (SearchParams.get("id") != null ? "id=" + SearchParams.get("id") : "cid=" + SearchParams.get("cid") + "&pid=" + SearchParams.get("pid")) + "&language=1&" + "source=" + encodeURIComponent(CodeMirrorElement.getValue()) + o2Switch
+    });
                         // This is the request that actually reaches submit.php, so the captcha is checked
                         // here as well as in the 提交 handler above.
                         if (CaptchaIsMissing()) return;
@@ -4571,25 +4585,91 @@ async function main() {
                                         }
                                         console.log(await Response.text());
                                     });
-
-                                }
-                                if (UtilityEnabled("DebugMode")) {
-                                    console.log("Submission failed! Response:", text);
-                                }
-                                ErrorElement.style.display = "block";
-                                ErrorMessage.style.color = "red";
-                                try { _xmoj_disposeErrorMessageEditors(); } catch (e) {
-                                    console.error(e);
-                                    if (UtilityEnabled("DebugMode")) {
-                                        SmartAlert("XMOJ-Script internal error!\n\n" + e + "\n\n" + "If you see this message, please report it to the developer.\nDon't forget to include console logs and a way to reproduce the error!\n\nDon't want to see this message? Disable DebugMode.");
+                                    if (response.redirected) {
+                                        location.href = response.url;
+                                        return;
                                     }
-                                }
-                                ErrorMessage.innerText = "提交失败！请关闭脚本后重试！";
-                                Submit.disabled = false;
-                                Submit.value = "提交";
-                            }
-                        })
-                    });
+                                    const text = await response.text();
+                                    if ((text.indexOf("没有这个比赛！") !== -1 || text.indexOf("比赛已结束") !== -1) && new URL(location.href).searchParams.get("pid") !== null) {
+                                        // Credit: https://github.com/boomzero/quicksubmit/blob/main/index.ts (GPL-3.0)
+                                        const cid = new URL(location.href).searchParams.get("cid");
+                                        const pidIndex = new URL(location.href).searchParams.get("pid");
+                                        const contestReq = await fetch("https://www.xmoj.tech/contest.php?cid=" + cid);
+                                        const res = await contestReq.text();
+                                        if (contestReq.status !== 200 || res.indexOf("比赛尚未开始或私有，不能查看题目。") !== -1) {
+                                            console.error("Failed to get contest page!");
+                                            _xmoj_disposeErrorMessageEditors();
+                                            ErrorElement.style.display = "block";
+                                            ErrorMessage.style.color = "red";
+                                            ErrorMessage.innerText = "无法获取比赛信息，请手动提交。";
+                                            Submit.disabled = false; Submit.value = "提交";
+                                            return;
+                                        }
+                                        const parser = new DOMParser();
+                                                                                const dom = parser.parseFromString(res, "text/html");
+                                        const rows = dom.querySelector("#problemset > tbody").rows;
+                                        const contestProblems = [];
+
+                                        for (let i = 0; i < rows.length; i++) {
+                                            const cell = rows[i].children[1];
+                                            const textContent = cell.textContent.trim();
+                                            const match = textContent.match(/\d+/);
+                                            contestProblems.push(match ? match[0] : null);
+                                        }
+
+                                        const rPID = contestProblems[parseInt(pidIndex)];
+                                        if (!rPID) {
+                                            _xmoj_disposeErrorMessageEditors();
+                                            ErrorElement.style.display = "block";
+                                            ErrorMessage.style.color = "red";
+                                            ErrorMessage.innerText = "无法解析真实题目 ID，请手动提交。";
+                                            Submit.disabled = false;
+                                            Submit.value = "提交";
+                                            return;
+                                        }
+
+                                    _xmoj_disposeErrorMessageEditors();
+                                    ErrorElement.style.display = "block";
+                                    ErrorMessage.style.color = "orange";
+                                    ErrorMessage.innerText = "比赛已结束，正在尝试向题目 " + rPID + " 提交…";
+                                    console.log("比赛已结束，正在尝试向题目 " + rPID + " 提交");
+
+                                    let o2Switch2 = "&enable_O2=on";
+                                    if (!document.querySelector("#enable_O2").checked) o2Switch2 = "";
+
+                                    const retryResp = await fetch("https://www.xmoj.tech/submit.php", {
+                                            "headers": {
+                                                "content-type": "application/x-www-form-urlencoded"
+                                            },
+                                            "referrer": location.href,
+                                            "method": "POST",
+                                            "body": "id=" + rPID + "&language=1&source=" + encodeURIComponent(CodeMirrorElement.getValue()) + o2Switch2
+                                    });
+                                if (retryResp.redirected) {
+                                    location.href = retryResp.url;
+                                    return;
+                                    const retryText = await retryResp.text();
+                                    let errorMsg = "提交失败，请重试。";
+                                    try {
+                                            const dom2 = new DOMParser().parseFromString(retryText, "text/html");
+                                            const jumbotron = dom2.querySelector(".jumbotron");
+                                            if (jumbotron) {
+                                                errorMsg = jumbotron.textContent.trim();
+                                            } else {
+                                                const textOnly = retryText.replace(/<[^>]*>/g, "").trim();
+                                                errorMsg = textOnly.substring(0, 100) || errorMsg;
+                                            }
+                                    } catch (_) {
+                                            // 解析失败则使用默认信息
+                                    }
+
+                                _xmoj_disposeErrorMessageEditors();
+                                    ErrorElement.style.display = "block";
+                                    ErrorMessage.style.color = "red";
+                                    ErrorMessage.innerText = "❌ 回退提交失败：" + errorMsg;
+                                    Submit.disabled = false;
+                                    Submit.value = "提交";
+                                    return;
 
                     Submit.addEventListener("click", async () => {
                         PassCheck.style.display = "none";

ads.txt

@@ -0,0 +1 @@
+google.com, pub-6214673028530012, DIRECT, f08c47fec0942fa0

index.html

@@ -1,7 +1,6 @@
 <!DOCTYPE html>
 <html>
 <link rel="icon" href="favicon.ico">
-
 <head>
     <script type="text/javascript">
     (function(c,l,a,r,i,t,y){