xmoj-script 2.4.7 → 2.5.2

package/Update.json

@@ -3157,6 +3157,63 @@
                 }
             ],
             "Notes": "funny"
+        },
+        "2.5.0": {
+            "UpdateDate": 1759568103629,
+            "Prerelease": false,
+            "UpdateContents": [
+                {
+                    "PR": 861,
+                    "Description": "Update CSS selector"
+                },
+                {
+                    "PR": 863,
+                    "Description": "修复“NaN年前“"
+                },
+                {
+                    "PR": 865,
+                    "Description": "删除获取数据功能"
+                },
+                {
+                    "PR": 866,
+                    "Description": "比赛题目页面里左侧栏加入题目序号列表"
+                },
+                {
+                    "PR": 869,
+                    "Description": "Update CSS selector (again...)"
+                },
+                {
+                    "PR": 871,
+                    "Description": "Add tooltip for ProblemSwitcher"
+                },
+                {
+                    "PR": 872,
+                    "Description": "修复获取数据"
+                }
+            ],
+            "Notes": "XMOJ-Script 2.5.0 新增了比赛题目切换器，方便您在题目之间快速切换。此功能默认启用，您也可以在设置中禁用它。本版本还修复了一个导致时间显示为“NaN年前”的错误, 更新了一些 CSS selector，以适应 XMOJ 网站的最新变化."
+        },
+        "2.5.1": {
+            "UpdateDate": 1759830659949,
+            "Prerelease": true,
+            "UpdateContents": [
+                {
+                    "PR": 876,
+                    "Description": "refactor: simplify SubmitLink selection by querying all anchors and finding by text"
+                }
+            ],
+            "Notes": "No release notes were provided for this release."
+        },
+        "2.5.2": {
+            "UpdateDate": 1759845614758,
+            "Prerelease": true,
+            "UpdateContents": [
+                {
+                    "PR": 877,
+                    "Description": "fix: problem PID 可能为 null"
+                }
+            ],
+            "Notes": "No release notes were provided for this release."
         }
     }
 }

package/XMOJ.user.js

@@ -1,6 +1,6 @@
 // ==UserScript==
 // @name         XMOJ
-// @version      2.4.7
+// @version      2.5.2
 // @description  XMOJ增强脚本
 // @author       @XMOJ-Script-dev, @langningchen and the community
 // @namespace    https://github/langningchen
@@ -1645,7 +1645,28 @@ async function main() {
                 } else if (location.pathname == "/problem.php") {
                     await RenderMathJax();
                     if (SearchParams.get("cid") != null && UtilityEnabled("ProblemSwitcher")) {
-                        document.getElementsByTagName("h2")[0].innerHTML += " (" + localStorage.getItem("UserScript-Contest-" + SearchParams.get("cid") + "-Problem-" + SearchParams.get("pid") + "-PID") + ")";
+                        let pid = localStorage.getItem("UserScript-Contest-" + SearchParams.get("cid") + "-Problem-" + SearchParams.get("pid") + "-PID");
+                        if (!pid) {
+                            const contestReq = await fetch("https://www.xmoj.tech/contest.php?cid=" + SearchParams.get("cid"));
+                            const res = await contestReq.text();
+                            if (contestReq.status === 200 && res.indexOf("比赛尚未开始或私有，不能查看题目。") === -1) {
+                                const parser = new DOMParser();
+                                const dom = parser.parseFromString(res, "text/html");
+                                const rows = (dom.querySelector("#problemset > tbody")).rows;
+                                for (let i = 0; i < rows.length; i++) {
+                                    let problemIdText = rows[i].children[1].innerText; // Get the text content
+                                    let match = problemIdText.match(/\d+/); // Extract the number
+                                    if (match) {
+                                        let extractedPid = match[0];
+                                        localStorage.setItem("UserScript-Contest-" + SearchParams.get("cid") + "-Problem-" + i + "-PID", extractedPid);
+                                    }
+                                }
+                                pid = localStorage.getItem("UserScript-Contest-" + SearchParams.get("cid") + "-Problem-" + SearchParams.get("pid") + "-PID");
+                            }
+                        }
+                        if (pid) {
+                            document.getElementsByTagName("h2")[0].innerHTML += " (" + pid + ")";
+                        }
                         let ContestProblemList = localStorage.getItem("UserScript-Contest-" + SearchParams.get("cid") + "-ProblemList");
                         if (ContestProblemList == null) {
                             const contestReq = await fetch("https://www.xmoj.tech/contest.php?cid=" + SearchParams.get("cid"));
@@ -1710,25 +1731,8 @@ async function main() {
                             document.querySelector("body > div > div.mt-3 > center").lastElementChild.style.marginLeft = "10px";
                         }
                         //修复提交按钮
-                        let SubmitLink = document.querySelector('.mt-3 > center:nth-child(1) > a:nth-child(12)');
-                        if (SubmitLink == null) { //a special type of problem
-                            SubmitLink = document.querySelector('.mt-3 > center:nth-child(1) > a:nth-child(10)');
-                        }
-                        if (SubmitLink == null) {
-                            SubmitLink = document.querySelector('.mt-3 > center:nth-child(1) > a:nth-child(11)');
-                        }
-                        if (SubmitLink == null) {
-                            SubmitLink = document.querySelector('.mt-3 > center:nth-child(1) > a:nth-child(13)');
-                        }
-                        if (SubmitLink == null) {
-                            SubmitLink = document.querySelector('.mt-3 > center:nth-child(1) > a:nth-child(9)');
-                        }
-                        if (SubmitLink == null) { //为什么这个破东西老是换位置
-                            SubmitLink = document.querySelector('.mt-3 > center:nth-child(1) > a:nth-child(7)');
-                        }
-                        if (SubmitLink == null) { //tmd又换位置
-                            SubmitLink = document.querySelector('.mt-3 > center:nth-child(1) > a:nth-child(8)');
-                        }
+                        const links = document.querySelectorAll('.mt-3 > center:nth-child(1) > a');
+                        const SubmitLink = Array.from(links).find(a => a.textContent.trim() === '提交');
                         let SubmitButton = document.createElement('button');
                         SubmitButton.id = 'SubmitButton';
                         SubmitButton.className = 'btn btn-outline-secondary';
@@ -1744,8 +1748,7 @@ async function main() {
                         // Remove the button's outer []
                         let str = document.querySelector('.mt-3 > center:nth-child(1)').innerHTML;
                         let target = SubmitButton.outerHTML;
-                        let result = str.replace(new RegExp(`(.?)${target}(.?)`, 'g'), target);
-                        document.querySelector('.mt-3 > center:nth-child(1)').innerHTML = result;
+                        document.querySelector('.mt-3 > center:nth-child(1)').innerHTML = str.replace(new RegExp(`(.?)${target}(.?)`, 'g'), target);
                         document.querySelector('html body.placeholder-glow div.container div.mt-3 center button#SubmitButton.btn.btn-outline-secondary').onclick = function () {
                             window.location.href = SubmitLink.href;
                             console.log(SubmitLink.href);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xmoj-script",
-  "version": "2.4.7",
+  "version": "2.5.2",
   "description": "an improvement script for xmoj.tech",
   "main": "AddonScript.js",
   "scripts": {