xmoj-script 1.2.75 → 1.3.2

package/AddonScript.js

@@ -1 +1,6 @@
-console.log("AddonScript.js has loaded.");
+/*
+DO NOT MODIFY THIS FILE,
+IT IS KEPT HERE FOR BACKWARD COMPATIBILITY ONLY
+ */
+
+console.warn("Please update XMOJ-Script!");

package/Update/UpdateToRelease.js

@@ -58,7 +58,7 @@ if (LastType == "Release") {
 if (LastJSVersion != NpmVersion) {
     console.warn("Assuming you manually ran npm version.");
 } else {
-    execSync("npm version patch");
+    execSync("npm version minor");
 }
 var CurrentVersion = execSync("jq -r '.version' package.json").toString().trim();
 console.log("Current version    : " + CurrentVersion);

package/Update/UpdateVersion.js

@@ -14,6 +14,12 @@ var JSFileContent = readFileSync(JSFileName, "utf8");
 execSync("git config --global user.email \"github-actions[bot]@users.noreply.github.com\"");
 execSync("git config --global user.name \"github-actions[bot]\"");
 if (JSONFileContent.includes('//!ci-no-touch')) {
+    var updatedContent = JSONFileContent.replace('//!ci-no-touch', '');
+    writeFileSync(JSONFileName, updatedContent, "utf8");
+    execSync("git config pull.rebase false");
+    execSync("git pull");
+    execSync("git commit -a -m \"remove //!ci-no-touch\"");
+    execSync("git push -f");
     console.log('I won\'t touch this. Exiting process.');
     process.exit(0);
 }

package/Update.json

@@ -2703,6 +2703,43 @@
                 }
             ],
             "Notes": "No release notes were provided for this release."
+        },
+        "1.3.0": {
+            "UpdateDate": 1738976786495,
+            "Prerelease": false,
+            "UpdateContents": [
+                {
+                    "PR": 762,
+                    "Description": "讨论回复跳转优化"
+                },
+                {
+                    "PR": 767,
+                    "Description": "进入讨论后给出题目的链接 "
+                }
+            ],
+            "Notes": "If you are curious why the version number is v1.3.0, it's because we changed our versioning strategy! Click <a href=\"https://github.com/orgs/XMOJ-Script-dev/discussions/771\"> here </a> for more details."
+        },
+        "1.3.1": {
+            "UpdateDate": 1739060055956,
+            "Prerelease": true,
+            "UpdateContents": [
+                {
+                    "PR": 774,
+                    "Description": "Fix code scanning alert - DOM text reinterpreted as HTML"
+                }
+            ],
+            "Notes": "No release notes were provided for this release."
+        },
+        "1.3.2": {
+            "UpdateDate": 1739187728351,
+            "Prerelease": true,
+            "UpdateContents": [
+                {
+                    "PR": 778,
+                    "Description": "Change how we load addonscript (transition from GitHub pages to Cloudflare KV) + Fix *that* console error"
+                }
+            ],
+            "Notes": "No release notes were provided for this release."
         }
     }
 }

package/XMOJ.user.js

@@ -1,6 +1,6 @@
 // ==UserScript==
 // @name         XMOJ
-// @version      1.2.75
+// @version      1.3.2
 // @description  XMOJ增强脚本
 // @author       @XMOJ-Script-dev, @langningchen and the community
 // @namespace    https://github/langningchen
@@ -41,6 +41,19 @@
 const CaptchaSiteKey = "0x4AAAAAAALBT58IhyDViNmv";
 const AdminUserList = ["zhuchenrui2", "shanwenxiao", "admin"];
 
+let escapeHTML = (str) => {
+    return str.replace(/[&<>"']/g, function (match) {
+        const escape = {
+            '&': '&amp;',
+            '<': '&lt;',
+            '>': '&gt;',
+            '"': '&quot;',
+            "'": '&#39;'
+        };
+        return escape[match];
+    });
+};
+
 let PurifyHTML = (Input) => {
     try {
         return DOMPurify.sanitize(Input, {
@@ -452,10 +465,7 @@ let RequestAPI = (Action, Data, CallBack) => {
                 try {
                     CallBack(JSON.parse(Response.responseText));
                 } catch (Error) {
-                    console.log(Response.responseText);
-                    CallBack({
-                        "Success": false, "Message": "JSON解析错误：" + Error, "Data": null
-                    });
+                    console.error(Response.responseText);
                 }
             }
         });
@@ -1140,14 +1150,13 @@ async function main() {
                             new bootstrap.Modal(document.getElementById("UpdateModal")).show();
                         }
                     });
-                fetch(ServerURL + "/AddonScript.js", {cache: "no-cache"})
-                    .then((Response) => {
-                        return Response.text();
-                    })
-                    .then((Response) => {
-                        eval(Response);
-                    });
-
+                RequestAPI("GetAddOnScript", {}, (Response) => {
+                    if (Response.Success) {
+                        eval(Response.Data["Script"]);
+                    } else {
+                        console.warn("Fetch AddOnScript failed: " + Response.Message);
+                    }
+                });
                 let ToastContainer = document.createElement("div");
                 ToastContainer.classList.add("toast-container", "position-fixed", "bottom-0", "end-0", "p-3");
                 document.body.appendChild(ToastContainer);
@@ -3979,7 +3988,7 @@ int main()
                     Temp = document.querySelector("#problemstatus > tbody").children;
                     for (let i = 0; i < Temp.length; i++) {
                         if (Temp[i].children[5].children[0] != null) {
-                            Temp[i].children[1].innerHTML = `<a href="${Temp[i].children[5].children[0].href}">${Temp[i].children[1].innerText.trim()}</a>`;
+                            Temp[i].children[1].innerHTML = `<a href="${Temp[i].children[5].children[0].href}">${escapeHTML(Temp[i].children[1].innerText.trim())}</a>`;
                         }
                         GetUsernameHTML(Temp[i].children[2], Temp[i].children[2].innerText);
                         Temp[i].children[3].remove();

package/package.json

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