From b789bf28da38e79ce5aee665b90df7c8861d9fc4 Mon Sep 17 00:00:00 2001
From: Zhu Chenrui <boomzero_zcr@outlook.com>
Date: Fri, 25 Jul 2025 19:46:29 +0800
Subject: [PATCH 01/17] Update Update.json

Signed-off-by: Zhu Chenrui <boomzero_zcr@outlook.com>
---
 Update.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Update.json b/Update.json
index 8674920b..e4384e5b 100644
--- a/Update.json
+++ b/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": [
@@ -2949,4 +2949,4 @@
             "Notes": "No release notes were provided for this release."
         }
     }
-}
\ No newline at end of file
+}

From 6adac8da5181731071e8d7fad87fe9552e93c96f Mon Sep 17 00:00:00 2001
From: Zhu Chenrui <boomzero_zcr@outlook.com>
Date: Sun, 24 Aug 2025 11:07:02 +0800
Subject: [PATCH 02/17] Parse release notes from comment block

(cherry picked from commit c7137ff7122b2307b9ea78a24de240b3bd00c6ab)
---
 .github/workflows/UpdateToRelease.yml |  4 +++-
 .github/workflows/UpdateVersion.yml   |  4 +++-
 CONTRIBUTING.md                       |  1 +
 Update/UpdateToRelease.js             | 10 +++++++++-
 Update/UpdateVersion.js               | 13 ++++++++++++-
 5 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/UpdateToRelease.yml b/.github/workflows/UpdateToRelease.yml
index ba950e34..e401f757 100644
--- a/.github/workflows/UpdateToRelease.yml
+++ b/.github/workflows/UpdateToRelease.yml
@@ -5,6 +5,7 @@ on:
       - opened
       - reopened
       - synchronize
+      - edited
     branches:
       - master
 jobs:
@@ -24,7 +25,8 @@ jobs:
             gh pr comment ${{ github.event.pull_request.number }} --body "请向\`dev\`分支提交pull request, 本pull request将被自动关闭"
             gh pr close ${{ github.event.pull_request.number }}
           else
-            node ./Update/UpdateToRelease.js ${{ secrets.GITHUB_TOKEN }} ${{ github.event.number }}
+            node ./Update/UpdateToRelease.js ${{ secrets.GITHUB_TOKEN }} ${{ github.event.number }} "$PR_BODY"
           fi
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          PR_BODY: ${{ github.event.pull_request.body }}
diff --git a/.github/workflows/UpdateVersion.yml b/.github/workflows/UpdateVersion.yml
index 8ab253d5..b71fbb1f 100644
--- a/.github/workflows/UpdateVersion.yml
+++ b/.github/workflows/UpdateVersion.yml
@@ -23,4 +23,6 @@ jobs:
           private-key: ${{ secrets.APP_PRIVATE_KEY }}
       - uses: actions/checkout@v5
       - name: Update version
-        run: node ./Update/UpdateVersion.js ${{ steps.generate_token.outputs.token }} ${{ github.event.number }} "${{ github.event.pull_request.title }}"
+        env:
+          PR_BODY: ${{ github.event.pull_request.body }}
+        run: node ./Update/UpdateVersion.js ${{ steps.generate_token.outputs.token }} ${{ github.event.number }} "${{ github.event.pull_request.title }}" "$PR_BODY"
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index d357e825..0f5c6e14 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -18,3 +18,4 @@ We believe that you must be excited to contribute to our repo, but first, please
 - Be patient. We are a small team and may not be able to review your PR immediately.
 - Please be considerate towards the developers and other users when raising issues or presenting pull requests.
 - Respect our decision(s), and do not be upset or abusive if your submission is not used.
+- For release pull requests, include an HTML comment block starting with `<!-- release-notes` and ending with `-->` in the PR description. The automation will extract that block into the release notes.
diff --git a/Update/UpdateToRelease.js b/Update/UpdateToRelease.js
index 37256782..c675452c 100644
--- a/Update/UpdateToRelease.js
+++ b/Update/UpdateToRelease.js
@@ -3,6 +3,13 @@ import {execSync} from "child_process";
 
 var GithubToken = process.argv[2];
 var PRNumber = process.argv[3];
+function extractReleaseNotes(body) {
+    const match = body
+        .replace(/\r\n/g, "\n")
+        .match(/<!--\s*release[- ]notes\s*([\s\S]*?)-->/i);
+    return match ? match[1].trim() : "";
+}
+var CurrentNotes = extractReleaseNotes(String(process.argv[4] || ""));
 process.env.GITHUB_TOKEN = GithubToken;
 execSync("gh pr checkout " + PRNumber);
 console.info("PR #" + PRNumber + " has been checked out.");
@@ -45,6 +52,7 @@ console.log("Last JSON version  : " + LastJSONVersion);
 console.log("Last PR            : " + LastPR);
 console.log("Last type          : " + LastType);
 console.log("npm version        : " + NpmVersion);
+console.log("Current notes      : " + (CurrentNotes || "No release notes were provided for this release."));
 
 if (LastJSONVersion != LastJSVersion) {
     console.error("XMOJ.user.js and Update.json have different patch versions.");
@@ -67,7 +75,7 @@ JSONObject.UpdateHistory[CurrentVersion] = {
     "UpdateDate": Date.now(),
     "Prerelease": false,
     "UpdateContents": [],
-    "Notes": "No release notes were provided for this release."
+    "Notes": CurrentNotes || "No release notes were provided for this release."
 };
 
 for (var i = Object.keys(JSONObject.UpdateHistory).length - 2; i >= 0; i--) {
diff --git a/Update/UpdateVersion.js b/Update/UpdateVersion.js
index 1fab8e5e..840ec2b8 100644
--- a/Update/UpdateVersion.js
+++ b/Update/UpdateVersion.js
@@ -47,6 +47,13 @@ execSync("git config --global user.email \"github-actions[bot]@users.noreply.git
 execSync("git config --global user.name \"github-actions[bot]\"");
 var CurrentPR = Number(PRNumber);
 var CurrentDescription = String(process.argv[4]);
+function extractReleaseNotes(body) {
+    const match = body
+        .replace(/\r\n/g, "\n")
+        .match(/<!--\s*release[- ]notes\s*([\s\S]*?)-->/i);
+    return match ? match[1].trim() : "";
+}
+var CurrentNotes = extractReleaseNotes(String(process.argv[5] || ""));
 if (LastJSVersion != NpmVersion) {
     console.warn("Assuming you manually ran npm version.");
 } else if (!(LastPR == CurrentPR && NpmVersion == LastJSVersion)) {
@@ -58,6 +65,7 @@ var CurrentVersion = execSync("jq -r '.version' package.json").toString().trim()
 console.log("Current version    : " + CurrentVersion);
 console.log("Current PR         : " + CurrentPR);
 console.log("Current description: " + CurrentDescription);
+console.log("Current notes      : " + (CurrentNotes || "No release notes were provided for this release."));
 
 var ChangedFileList = execSync("gh pr diff " + CurrentPR + " --name-only").toString().trim().split("\n");
 console.log("Changed files      : " + ChangedFileList.join(", "));
@@ -67,6 +75,9 @@ if (LastPR == CurrentPR && NpmVersion == LastJSVersion) {
     console.warn("Warning: PR is the same as last version.");
     JSONObject.UpdateHistory[LastJSVersion].UpdateDate = Date.now();
     JSONObject.UpdateHistory[LastJSVersion].UpdateContents[0].Description = CurrentDescription;
+    if (CurrentNotes) {
+        JSONObject.UpdateHistory[LastJSVersion].Notes = CurrentNotes;
+    }
     CommitMessage = "Update time and description of " + LastJSVersion;
 } else if (ChangedFileList.indexOf("XMOJ.user.js") == -1) {
     console.warn("XMOJ.user.js is not changed, so the version should not be updated.");
@@ -79,7 +90,7 @@ if (LastPR == CurrentPR && NpmVersion == LastJSVersion) {
             "PR": CurrentPR,
             "Description": CurrentDescription
         }],
-        "Notes": "No release notes were provided for this release."
+        "Notes": CurrentNotes || "No release notes were provided for this release."
     };
     writeFileSync(JSFileName, JSFileContent.replace(/@version(\s+)\d+\.\d+\.\d+/, "@version$1" + CurrentVersion), "utf8");
     console.warn("XMOJ.user.js has been updated.");

From f86a45eeda019268fdabb67f03000f616a31da95 Mon Sep 17 00:00:00 2001
From: Zhu Chenrui <boomzero_zcr@outlook.com>
Date: Sun, 24 Aug 2025 11:36:00 +0800
Subject: [PATCH 03/17] Update bug.yml

Signed-off-by: Zhu Chenrui <boomzero_zcr@outlook.com>
(cherry picked from commit 07d7590955a2913e422e500613f140f7619ff364)

Update feature.yml

Signed-off-by: Zhu Chenrui <boomzero_zcr@outlook.com>
(cherry picked from commit 1a99430f1edf90e782b984b956dcb78efd6e88db)

Update docs.yml

Signed-off-by: Zhu Chenrui <boomzero_zcr@outlook.com>
(cherry picked from commit 6017bcf99acdb37c877633c4f13f9851393fa1af)
---
 .github/ISSUE_TEMPLATE/bug.yml     | 1 +
 .github/ISSUE_TEMPLATE/docs.yml    | 1 +
 .github/ISSUE_TEMPLATE/feature.yml | 1 +
 3 files changed, 3 insertions(+)

diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml
index 9e03a313..bf1f6784 100644
--- a/.github/ISSUE_TEMPLATE/bug.yml
+++ b/.github/ISSUE_TEMPLATE/bug.yml
@@ -1,6 +1,7 @@
 name: 综合 Bug 反馈
 description: 有功能有问题
 labels: bug, needs-triage
+type: Bug
 # assignees: PythonSmall-Q, boomzero, shihongxi
 title: "[Bug]"
 body:
diff --git a/.github/ISSUE_TEMPLATE/docs.yml b/.github/ISSUE_TEMPLATE/docs.yml
index 8152f0a9..982e8c57 100644
--- a/.github/ISSUE_TEMPLATE/docs.yml
+++ b/.github/ISSUE_TEMPLATE/docs.yml
@@ -1,6 +1,7 @@
 name: 帮助文档反馈
 description: 帮助文档有问题
 labels: docs, needs-triage
+type: Task
 title: "[Docs]"
 body:
 - type: checkboxes
diff --git a/.github/ISSUE_TEMPLATE/feature.yml b/.github/ISSUE_TEMPLATE/feature.yml
index 9fbae4f5..90d3177d 100644
--- a/.github/ISSUE_TEMPLATE/feature.yml
+++ b/.github/ISSUE_TEMPLATE/feature.yml
@@ -1,6 +1,7 @@
 name: 新功能提案
 description: 对已有功能的大幅度修改，或添加一个新内容或选项
 labels: enhancement, needs-triage
+type: Feature
 #assignees: PythonSmall-Q, boomzero, shihongxi
 title: "[Feature Request]"
 body:

From 54d39cf3357e0e94ce95c50559de1a735b272872 Mon Sep 17 00:00:00 2001
From: Shan Wenxiao <seanoj_noreply@yeah.net>
Date: Sat, 7 Feb 2026 09:14:08 +0800
Subject: [PATCH 04/17] Update GitHub Actions workflow to skip bot triggers

Signed-off-by: Shan Wenxiao <seanoj_noreply@yeah.net>
---
 .github/workflows/UpdateToRelease.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/UpdateToRelease.yml b/.github/workflows/UpdateToRelease.yml
index e401f757..5f82aa0f 100644
--- a/.github/workflows/UpdateToRelease.yml
+++ b/.github/workflows/UpdateToRelease.yml
@@ -11,11 +11,13 @@ on:
 jobs:
   UpdateToRelease:
     runs-on: ubuntu-latest
+    # 添加条件：如果是 bot 触发的则跳过，避免无限循环
+    if: github.event.pull_request.user.login != 'github-actions[bot]'
     permissions:
       pull-requests: write
       contents: write
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 0
       - name: Update to release
@@ -25,7 +27,7 @@ jobs:
             gh pr comment ${{ github.event.pull_request.number }} --body "请向\`dev\`分支提交pull request, 本pull request将被自动关闭"
             gh pr close ${{ github.event.pull_request.number }}
           else
-            node ./Update/UpdateToRelease.js ${{ secrets.GITHUB_TOKEN }} ${{ github.event.number }} "$PR_BODY"
+            node ./Update/UpdateToRelease.js ${{ secrets.GITHUB_TOKEN }} ${{ github.event.pull_request.number }} "$PR_BODY"
           fi
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

From 27863a74aad62f6ed0dd7d9b2a4da6bfc3ec0270 Mon Sep 17 00:00:00 2001
From: boomzero <thomas_rainbowfish@icloud.com>
Date: Wed, 11 Feb 2026 20:59:12 +0800
Subject: [PATCH 05/17] Prevent UpdateVersion from running if last commit was
 by github-actions[bot]

This prevents infinite loops where the bot commits version updates,
which triggers the workflow again, causing another commit.

Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
---
 Update/UpdateVersion.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/Update/UpdateVersion.js b/Update/UpdateVersion.js
index 840ec2b8..cd744cd8 100644
--- a/Update/UpdateVersion.js
+++ b/Update/UpdateVersion.js
@@ -7,6 +7,14 @@ process.env.GITHUB_TOKEN = GithubToken;
 execSync("gh pr checkout " + PRNumber);
 console.info("PR #" + PRNumber + " has been checked out.");
 
+// Check if the last commit was made by github-actions[bot]
+const lastCommitAuthor = execSync("git log -1 --pretty=format:'%an'").toString().trim();
+console.log("Last commit author: " + lastCommitAuthor);
+if (lastCommitAuthor === "github-actions[bot]") {
+    console.log("Last commit was made by github-actions[bot]. Skipping to prevent infinite loop.");
+    process.exit(0);
+}
+
 const JSONFileName = "./Update.json";
 const JSFileName = "./XMOJ.user.js";
 var JSONFileContent = readFileSync(JSONFileName, "utf8");

From fab65934b678092f505e2c20c02d2ff4cc707788 Mon Sep 17 00:00:00 2001
From: boomzero <thomas_rainbowfish@icloud.com>
Date: Mon, 23 Feb 2026 20:06:47 +0800
Subject: [PATCH 06/17] Allow metadata updates on edited PRs after bot version
 commit

The last-commit-author guard now only exits for non-edited events,
so PR title/body changes still update Update.json metadata even
when the branch tip is a github-actions[bot] commit.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 .github/workflows/UpdateVersion.yml | 2 +-
 Update/UpdateVersion.js             | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/UpdateVersion.yml b/.github/workflows/UpdateVersion.yml
index 74a49224..b8409176 100644
--- a/.github/workflows/UpdateVersion.yml
+++ b/.github/workflows/UpdateVersion.yml
@@ -26,4 +26,4 @@ jobs:
       - name: Update version
         env:
           PR_BODY: ${{ github.event.pull_request.body }}
-        run: node ./Update/UpdateVersion.js ${{ steps.generate_token.outputs.token }} ${{ github.event.number }} "${{ github.event.pull_request.title }}" "$PR_BODY"
+        run: node ./Update/UpdateVersion.js ${{ steps.generate_token.outputs.token }} ${{ github.event.number }} "${{ github.event.pull_request.title }}" "$PR_BODY" "${{ github.event.action }}"
diff --git a/Update/UpdateVersion.js b/Update/UpdateVersion.js
index cd744cd8..891d2c46 100644
--- a/Update/UpdateVersion.js
+++ b/Update/UpdateVersion.js
@@ -8,9 +8,14 @@ execSync("gh pr checkout " + PRNumber);
 console.info("PR #" + PRNumber + " has been checked out.");
 
 // Check if the last commit was made by github-actions[bot]
+// Only skip for synchronize events (push-triggered) to prevent infinite loops.
+// For edited events (PR title/body changes), allow metadata updates even when
+// the branch tip is a bot commit.
+const eventAction = String(process.argv[6] || "");
 const lastCommitAuthor = execSync("git log -1 --pretty=format:'%an'").toString().trim();
 console.log("Last commit author: " + lastCommitAuthor);
-if (lastCommitAuthor === "github-actions[bot]") {
+console.log("Event action       : " + eventAction);
+if (lastCommitAuthor === "github-actions[bot]" && eventAction !== "edited") {
     console.log("Last commit was made by github-actions[bot]. Skipping to prevent infinite loop.");
     process.exit(0);
 }

From 2f7e9d6a45f04f3fe3238f45ba895fe7277c9ecf Mon Sep 17 00:00:00 2001
From: boomzero <thomas_rainbowfish@icloud.com>
Date: Mon, 23 Feb 2026 20:06:47 +0800
Subject: [PATCH 07/17] Allow metadata updates on edited PRs after bot version
 commit

Exclude all bot actors (not just github-actions[bot]) from triggering
the UpdateVersion workflow, preventing loops from AI code review bots.
Allow edited events through the script-level guard so PR title/body
changes still update Update.json metadata.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 .github/workflows/UpdateVersion.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/UpdateVersion.yml b/.github/workflows/UpdateVersion.yml
index b8409176..6112841f 100644
--- a/.github/workflows/UpdateVersion.yml
+++ b/.github/workflows/UpdateVersion.yml
@@ -14,7 +14,7 @@ jobs:
       pull-requests: write
       contents: write
     runs-on: ubuntu-latest
-    if: github.event.pull_request.head.repo.full_name == github.repository && github.actor != 'github-actions[bot]'
+    if: github.event.pull_request.head.repo.full_name == github.repository && !endsWith(github.actor, '[bot]')
     steps:
       - name: Generate a token
         id: generate_token

From d833b40adaecccc9bfa497f5dd9acbd799b12ad1 Mon Sep 17 00:00:00 2001
From: Shan Wenxiao <seanoj_noreply@yeah.net>
Date: Sun, 3 May 2026 18:51:30 +0800
Subject: [PATCH 08/17] Add Google Ads script to index.html

Signed-off-by: Shan Wenxiao <seanoj_noreply@yeah.net>
---
 index.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/index.html b/index.html
index 522de611..a7d15a45 100644
--- a/index.html
+++ b/index.html
@@ -1,7 +1,8 @@
 <!DOCTYPE html>
 <html>
 <link rel="icon" href="favicon.ico">
-
+<script async src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js?client=ca-pub-6214673028530012"
+     crossorigin="anonymous"></script>
 <head>
     <script type="text/javascript">
     (function(c,l,a,r,i,t,y){

From bdd5dc740139ecb3c7c3b21b7a671d3e212d087e Mon Sep 17 00:00:00 2001
From: Shan Wenxiao <seanoj_noreply@yeah.net>
Date: Sun, 3 May 2026 18:52:08 +0800
Subject: [PATCH 09/17] Remove Google Ads script from index.html

Removed Google Ads script from the HTML file.

Signed-off-by: Shan Wenxiao <seanoj_noreply@yeah.net>
---
 index.html | 2 --
 1 file changed, 2 deletions(-)

diff --git a/index.html b/index.html
index a7d15a45..512b78fd 100644
--- a/index.html
+++ b/index.html
@@ -1,8 +1,6 @@
 <!DOCTYPE html>
 <html>
 <link rel="icon" href="favicon.ico">
-<script async src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js?client=ca-pub-6214673028530012"
-     crossorigin="anonymous"></script>
 <head>
     <script type="text/javascript">
     (function(c,l,a,r,i,t,y){

From 21269717ebff8e91f0f673de62c076e0958f7223 Mon Sep 17 00:00:00 2001
From: Shan Wenxiao <seanoj_noreply@yeah.net>
Date: Sun, 3 May 2026 18:53:13 +0800
Subject: [PATCH 10/17] Add Google ad publisher entry to ads.txt

Signed-off-by: Shan Wenxiao <seanoj_noreply@yeah.net>
---
 ads.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 ads.txt

diff --git a/ads.txt b/ads.txt
new file mode 100644
index 00000000..8118328f
--- /dev/null
+++ b/ads.txt
@@ -0,0 +1 @@
+google.com, pub-6214673028530012, DIRECT, f08c47fec0942fa0

From 5fe3558460ff3ed712962d189dc15876f4014dca Mon Sep 17 00:00:00 2001
From: Feng Jiajun <kp6phnt44s@privaterelay.appleid.com>
Date: Sun, 23 Aug 2026 09:20:07 +0800
Subject: [PATCH 11/17] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=B7=B2?=
 =?UTF-8?q?=E7=BB=93=E6=9D=9F=E6=AF=94=E8=B5=9B=E6=8F=90=E4=BA=A4=E5=9B=9E?=
 =?UTF-8?q?=E9=80=80=E5=8A=9F=E8=83=BD=E5=A4=B1=E6=95=88=20#1017?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

新增回退提交后判断结果并阻断外层错误,外层处理会继续执行并覆盖为“提交失败”状态。

Signed-off-by: Feng Jiajun <kp6phnt44s@privaterelay.appleid.com>
---
 XMOJ.user.js | 125 +++++++++++++++++++++++++--------------------------
 1 file changed, 62 insertions(+), 63 deletions(-)

diff --git a/XMOJ.user.js b/XMOJ.user.js
index 69d0d77d..39fdbee0 100644
--- a/XMOJ.user.js
+++ b/XMOJ.user.js
@@ -4216,78 +4216,77 @@ async function main() {
                             } else {
                                 const text = await Response.text();
                                 if (text.indexOf("没有这个比赛！") !== -1 && new URL(location.href).searchParams.get("pid") !== null) {
-                                    // Credit: https://github.com/boomzero/quicksubmit/blob/main/index.ts
-                                    // Also licensed under GPL-3.0
-                                    const contestReq = await fetch("https://www.xmoj.tech/contest.php?cid=" + new URL(location.href).searchParams.get("cid"));
+                                    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!`);
+                                    if (contestReq.status !== 200 || res.indexOf("比赛尚未开始或私有，不能查看题目。") !== -1) {
+                                        console.error("Failed to get contest page!");
+                                        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 contestProblems = [];
-                                    const rows = (dom.querySelector(
-                                        "#problemset > tbody",
-                                    )).rows;
-                                    for (let i = 0; i < rows.length; i++) {
-                                        contestProblems.push(
-                                            rows[i].children[1].textContent.substring(2, 6).replaceAll(
-                                                "\t",
-                                                "",
-                                            ),
-                                        );
-                                    }
-                                    rPID = contestProblems[new URL(location.href).searchParams.get("pid")];
-                                    if (UtilityEnabled("DebugMode")) {
-                                        console.log("Contest Problems:", contestProblems);
-                                        console.log("Real PID:", rPID);
-                                    }
+    
+                                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) {
                                     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.");
-                                        }
-                                    }
-                                    ErrorMessage.innerText = "比赛已结束, 正在尝试向题目 " + rPID + " 提交";
-                                    console.log("比赛已结束, 正在尝试向题目 " + rPID + " 提交");
-                                    let o2Switch = "&enable_O2=on";
-                                    if (!document.querySelector("#enable_O2").checked) o2Switch = "";
-                                    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()) + o2Switch
-                                    }).then(async (Response) => {
-                                        if (Response.redirected) {
-                                            location.href = Response.url;
-                                        }
-                                        console.log(await Response.text());
-                                    });
-
-                                }
-                                if (UtilityEnabled("DebugMode")) {
-                                    console.log("Submission failed! Response:", text);
+                                    ErrorMessage.innerText = "无法解析真实题目 ID，请手动提交。";
+                                    Submit.disabled = false;
+                                    Submit.value = "提交";
+                                    return;
                                 }
                                 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.");
-                                    }
+                                ErrorMessage.style.color = "yellow";
+                                ErrorMessage.innerText = "比赛已结束，正在尝试向题目 " + rPID + " 提交…";
+                                console.log("比赛已结束，正在尝试向题目 " + rPID + " 提交");
+                                let o2Switch = "&enable_O2=on";
+                                if (!document.querySelector("#enable_O2").checked) o2Switch = "";
+    
+                                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()) + o2Switch
+    });
+                            if (retryResp.redirected) {
+                                location.href = retryResp.url;
+                                return;
+                            } else {
+                                const retryText = await retryResp.text();
+                                if (retryText.indexOf("提交成功") !== -1 || 
+                                    retryText.indexOf("Solution") !== -1 || 
+                                    retryText.indexOf("status.php") !== -1) {
+                                ErrorMessage.style.color = "green";
+                                ErrorMessage.innerText = "✅ 回退提交成功！请查看状态。";
+                                Submit.disabled = true;
+                                Submit.value = "已提交";
+                                return;
+                                } else {
+                                    ErrorMessage.style.color = "red";
+                                    ErrorMessage.innerText = "❌ 回退提交失败：" + retryText.substring(0, 200);
+                                    Submit.disabled = false;
+                                    Submit.value = "提交";
+                                    return;
                                 }
-                                ErrorMessage.innerText = "提交失败！请关闭脚本后重试！";
-                                Submit.disabled = false;
-                                Submit.value = "提交";
                             }
+                        }
                         })
                     });
 

From 5f70e7303608cd9179a0d493ce002cad4a34c1c7 Mon Sep 17 00:00:00 2001
From: Feng Jiajun <kp6phnt44s@privaterelay.appleid.com>
Date: Sun, 23 Aug 2026 09:46:31 +0800
Subject: [PATCH 12/17] Refix
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

style: 修复 DeepScan 格式问题

Signed-off-by: Feng Jiajun <kp6phnt44s@privaterelay.appleid.com>
---
 XMOJ.user.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/XMOJ.user.js b/XMOJ.user.js
index 39fdbee0..ea79ee3e 100644
--- a/XMOJ.user.js
+++ b/XMOJ.user.js
@@ -4287,7 +4287,6 @@ async function main() {
                                 }
                             }
                         }
-                        })
                     });
 
                     Submit.addEventListener("click", async () => {

From d65ae846fd24af58101085837066e0ec0680eb11 Mon Sep 17 00:00:00 2001
From: Feng Jiajun <kp6phnt44s@privaterelay.appleid.com>
Date: Sun, 23 Aug 2026 09:49:40 +0800
Subject: [PATCH 13/17] Refix

Signed-off-by: Feng Jiajun <kp6phnt44s@privaterelay.appleid.com>
---
 XMOJ.user.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/XMOJ.user.js b/XMOJ.user.js
index ea79ee3e..345b0269 100644
--- a/XMOJ.user.js
+++ b/XMOJ.user.js
@@ -4287,7 +4287,7 @@ async function main() {
                                 }
                             }
                         }
-                    });
+                    };
 
                     Submit.addEventListener("click", async () => {
                         PassCheck.style.display = "none";

From 238bc2cfe261391f021985002b9eeed1bf9c62d9 Mon Sep 17 00:00:00 2001
From: Feng Jiajun <kp6phnt44s@privaterelay.appleid.com>
Date: Sun, 23 Aug 2026 10:20:12 +0800
Subject: [PATCH 14/17] Update?

Signed-off-by: Feng Jiajun <kp6phnt44s@privaterelay.appleid.com>
---
 XMOJ.user.js | 148 +++++++++++++++++++++++++++++----------------------
 1 file changed, 84 insertions(+), 64 deletions(-)

diff --git a/XMOJ.user.js b/XMOJ.user.js
index 0d86e0d5..734336b6 100644
--- a/XMOJ.user.js
+++ b/XMOJ.user.js
@@ -4229,48 +4229,59 @@ async function main() {
                             } else {
                                 const text = await Response.text();
                                 if (text.indexOf("没有这个比赛！") !== -1 && new URL(location.href).searchParams.get("pid") !== null) {
-                                    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!");
-                                        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) {
-                                    ErrorElement.style.display = "block";
-                                    ErrorMessage.style.color = "red";
-                                    ErrorMessage.innerText = "无法解析真实题目 ID，请手动提交。";
-                                    Submit.disabled = false;
-                                    Submit.value = "提交";
-                                    return;
-                                }
-                                ErrorElement.style.display = "block";
-                                ErrorMessage.style.color = "yellow";
-                                ErrorMessage.innerText = "比赛已结束，正在尝试向题目 " + rPID + " 提交…";
-                                console.log("比赛已结束，正在尝试向题目 " + rPID + " 提交");
-                                let o2Switch = "&enable_O2=on";
-                                if (!document.querySelector("#enable_O2").checked) o2Switch = "";
-    
-                                const retryResp = await fetch("https://www.xmoj.tech/submit.php", {
+    // 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!");
+        // 在覆盖 innerText 前销毁编辑器
+        _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 o2Switch = "&enable_O2=on";
+    if (!document.querySelector("#enable_O2").checked) o2Switch = "";
+
+    const retryResp = await fetch("https://www.xmoj.tech/submit.php", {
         "headers": {
             "content-type": "application/x-www-form-urlencoded"
         },
@@ -4278,28 +4289,37 @@ async function main() {
         "method": "POST",
         "body": "id=" + rPID + "&language=1&source=" + encodeURIComponent(CodeMirrorElement.getValue()) + o2Switch
     });
-                            if (retryResp.redirected) {
-                                location.href = retryResp.url;
-                                return;
-                            } else {
-                                const retryText = await retryResp.text();
-                                if (retryText.indexOf("提交成功") !== -1 || 
-                                    retryText.indexOf("Solution") !== -1 || 
-                                    retryText.indexOf("status.php") !== -1) {
-                                ErrorMessage.style.color = "green";
-                                ErrorMessage.innerText = "✅ 回退提交成功！请查看状态。";
-                                Submit.disabled = true;
-                                Submit.value = "已提交";
-                                return;
-                                } else {
-                                    ErrorMessage.style.color = "red";
-                                    ErrorMessage.innerText = "❌ 回退提交失败：" + retryText.substring(0, 200);
-                                    Submit.disabled = false;
-                                    Submit.value = "提交";
-                                    return;
-                                }
-                            }
-                        }
+
+    // 成功：只有服务端返回 302 重定向才视为成功（即提交被接受）
+    if (retryResp.redirected) {
+        location.href = retryResp.url;
+        return;
+    } else {
+        // 失败：从响应中提取用户友好的错误信息，而不是显示 HTML 源码
+        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 {
+                // 如果找不到 .jumbotron，去掉 HTML 标签后取前 100 个字符
+                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 () => {

From 825161e256a66b2c304bffe8efea71eec6fc3567 Mon Sep 17 00:00:00 2001
From: Feng Jiajun <kp6phnt44s@privaterelay.appleid.com>
Date: Sun, 23 Aug 2026 10:28:52 +0800
Subject: [PATCH 15/17] Update?

Signed-off-by: Feng Jiajun <kp6phnt44s@privaterelay.appleid.com>
---
 XMOJ.user.js | 201 +++++++++++++++++++++++++++------------------------
 1 file changed, 106 insertions(+), 95 deletions(-)

diff --git a/XMOJ.user.js b/XMOJ.user.js
index 734336b6..f5febc29 100644
--- a/XMOJ.user.js
+++ b/XMOJ.user.js
@@ -4211,116 +4211,127 @@ 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 = "";
-                        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
-                        }).then(async (Response) => {
-                            if (Response.redirected) {
-                                location.href = Response.url;
-                            } else {
-                                const text = await Response.text();
-                                if (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!");
-        // 在覆盖 innerText 前销毁编辑器
-        _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 + " 提交");
-
+    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 retryResp = await fetch("https://www.xmoj.tech/submit.php", {
+    const response = 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()) + o2Switch
+        "body": (SearchParams.get("id") != null ? "id=" + SearchParams.get("id") : "cid=" + SearchParams.get("cid") + "&pid=" + SearchParams.get("pid")) + "&language=1&" + "source=" + encodeURIComponent(CodeMirrorElement.getValue()) + o2Switch
     });
 
-    // 成功：只有服务端返回 302 重定向才视为成功（即提交被接受）
-    if (retryResp.redirected) {
-        location.href = retryResp.url;
+    if (response.redirected) {
+        location.href = response.url;
         return;
-    } else {
-        // 失败：从响应中提取用户友好的错误信息，而不是显示 HTML 源码
-        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 {
-                // 如果找不到 .jumbotron，去掉 HTML 标签后取前 100 个字符
-                const textOnly = retryText.replace(/<[^>]*>/g, "").trim();
-                errorMsg = textOnly.substring(0, 100) || errorMsg;
-            }
-        } catch (_) {
-            // 解析失败则使用默认信息
+    }
+
+    const text = await response.text();
+
+    // 回退处理：比赛已结束，尝试直接提交到真实题目
+    if (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 = "red";
-        ErrorMessage.innerText = "❌ 回退提交失败：" + errorMsg;
-        Submit.disabled = false;
-        Submit.value = "提交";
-        return;
+        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;
+        } else {
+            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;
+        }
     }
-}
-                    };
+
+    // 如果未进入回退分支，显示通用错误
+    if (UtilityEnabled("DebugMode")) {
+        console.log("Submission failed! Response:", text);
+    }
+    ErrorElement.style.display = "block";
+    ErrorMessage.style.color = "red";
+    ErrorMessage.innerText = "提交失败！请关闭脚本后重试！";
+    Submit.disabled = false;
+    Submit.value = "提交";
+});  // ← 这是唯一正确的结束
 
                     Submit.addEventListener("click", async () => {
                         PassCheck.style.display = "none";

From 0e0a5eb51062e4fb979261ae1ec640f91a5b788b Mon Sep 17 00:00:00 2001
From: Feng Jiajun <kp6phnt44s@privaterelay.appleid.com>
Date: Sun, 23 Aug 2026 10:44:39 +0800
Subject: [PATCH 16/17] fixed

Signed-off-by: Feng Jiajun <kp6phnt44s@privaterelay.appleid.com>
---
 XMOJ.user.js | 124 +++++++++++++++++++++++++++++----------------------
 1 file changed, 70 insertions(+), 54 deletions(-)

diff --git a/XMOJ.user.js b/XMOJ.user.js
index f5febc29..4405e750 100644
--- a/XMOJ.user.js
+++ b/XMOJ.user.js
@@ -4233,72 +4233,87 @@ async function main() {
 
     const text = await response.text();
 
-    // 回退处理：比赛已结束，尝试直接提交到真实题目
-    if (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");
+    // 回退处理：比赛已结束或不存在，尝试直接提交到真实题目
+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 contestReq = await fetch("https://www.xmoj.tech/contest.php?cid=" + cid);
+    const res = await contestReq.text();
 
-        const parser = new DOMParser();
-        const dom = parser.parseFromString(res, "text/html");
-        const rows = dom.querySelector("#problemset > tbody").rows;
-        const contestProblems = [];
+    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;
+    }
 
-        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 parser = new DOMParser();
+    const dom = parser.parseFromString(res, "text/html");
+    const rows = dom.querySelector("#problemset > tbody").rows;
+    const contestProblems = [];
 
-        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;
-        }
+    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 = "orange";
-        ErrorMessage.innerText = "比赛已结束，正在尝试向题目 " + rPID + " 提交…";
-        console.log("比赛已结束，正在尝试向题目 " + rPID + " 提交");
+        ErrorMessage.style.color = "red";
+        ErrorMessage.innerText = "无法解析真实题目 ID，请手动提交。";
+        Submit.disabled = false;
+        Submit.value = "提交";
+        return;
+    }
 
-        let o2Switch2 = "&enable_O2=on";
-        if (!document.querySelector("#enable_O2").checked) o2Switch2 = "";
+    _xmoj_disposeErrorMessageEditors();
+    ErrorElement.style.display = "block";
+    ErrorMessage.style.color = "orange";
+    ErrorMessage.innerText = "比赛已结束，正在尝试向题目 " + rPID + " 提交…";
+    console.log("比赛已结束，正在尝试向题目 " + rPID + " 提交");
 
-        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
-        });
+    let o2Switch2 = "&enable_O2=on";
+    if (!document.querySelector("#enable_O2").checked) o2Switch2 = "";
 
-        if (retryResp.redirected) {
-            location.href = retryResp.url;
+    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;
+    } else {
+        const retryText = await retryResp.text();
+        // 检查响应中是否包含成功标记
+        if (retryText.indexOf("提交成功") !== -1 ||
+            retryText.indexOf("Solution") !== -1 ||
+            retryText.indexOf("status.php") !== -1) {
+            // 提交成功，显示成功信息并禁用提交按钮
+            _xmoj_disposeErrorMessageEditors();
+            ErrorElement.style.display = "block";
+            ErrorMessage.style.color = "green";
+            ErrorMessage.innerText = "✅ 回退提交成功！请查看状态。";
+            Submit.disabled = true;
+            Submit.value = "已提交";
             return;
         } else {
-            const retryText = await retryResp.text();
+            // 真正的失败：从响应中提取错误信息
             let errorMsg = "提交失败，请重试。";
             try {
                 const dom2 = new DOMParser().parseFromString(retryText, "text/html");
@@ -4321,6 +4336,7 @@ async function main() {
             return;
         }
     }
+}
 
     // 如果未进入回退分支，显示通用错误
     if (UtilityEnabled("DebugMode")) {

From 9f07ee2b42bac70fa8e73c3d3b2b553b8857dcd5 Mon Sep 17 00:00:00 2001
From: Feng Jiajun <kp6phnt44s@privaterelay.appleid.com>
Date: Sun, 23 Aug 2026 11:02:51 +0800
Subject: [PATCH 17/17] fixed?

Signed-off-by: Feng Jiajun <kp6phnt44s@privaterelay.appleid.com>
---
 XMOJ.user.js | 66 ++++++++++++++++++++++------------------------------
 1 file changed, 28 insertions(+), 38 deletions(-)

diff --git a/XMOJ.user.js b/XMOJ.user.js
index 4405e750..b73c7b41 100644
--- a/XMOJ.user.js
+++ b/XMOJ.user.js
@@ -4295,45 +4295,35 @@ if ((text.indexOf("没有这个比赛！") !== -1 || text.indexOf("比赛已结
     });
 
     // 检查是否提交成功（重定向 或 响应含成功标记）
-    if (retryResp.redirected) {
-        location.href = retryResp.url;
-        return;
-    } else {
-        const retryText = await retryResp.text();
-        // 检查响应中是否包含成功标记
-        if (retryText.indexOf("提交成功") !== -1 ||
-            retryText.indexOf("Solution") !== -1 ||
-            retryText.indexOf("status.php") !== -1) {
-            // 提交成功，显示成功信息并禁用提交按钮
-            _xmoj_disposeErrorMessageEditors();
-            ErrorElement.style.display = "block";
-            ErrorMessage.style.color = "green";
-            ErrorMessage.innerText = "✅ 回退提交成功！请查看状态。";
-            Submit.disabled = true;
-            Submit.value = "已提交";
-            return;
+    // 检查是否提交成功（重定向 或 响应含成功标记）
+if (retryResp.redirected) {
+    location.href = retryResp.url;
+    return;
+} else {
+    const retryText = await retryResp.text();
+    // ❌ 删除这里的成功关键词判断 —— 进入 else 就是失败
+    
+    // ✅ 直接从响应中提取错误信息
+    let errorMsg = "提交失败，请重试。";
+    try {
+        const dom2 = new DOMParser().parseFromString(retryText, "text/html");
+        const jumbotron = dom2.querySelector(".jumbotron");
+        if (jumbotron) {
+            errorMsg = jumbotron.textContent.trim();
         } else {
-            // 真正的失败：从响应中提取错误信息
-            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;
+            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;
         }
     }
 }