xmoj-script 1.1.46 → 1.1.48

package/.github/workflows/merge.yml

@@ -0,0 +1,51 @@
+name: Sitemap merge
+on:
+  push:
+    branches:
+      - create-pull-request/patch
+  workflow_dispatch:
+jobs:
+  create_pull_request:
+    name: 'Create PR'
+    if: github.ref == 'refs/heads/beta'
+    runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
+    steps:
+      - name: 'Create PR'
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const { repo, owner } = context.repo;
+            const pulls = await github.rest.pulls.list({
+              owner: owner,
+              repo: repo,
+              head: context.ref,
+              base: 'dev',
+              state: 'open',
+            });
+            
+            if (pulls.data.length < 1) {
+              await github.rest.pulls.create({
+                title: '[Sitemap] Merge sitemap into dev',
+                owner: owner,
+                repo: repo,
+                head: context.ref,
+                base: 'dev',
+                body: [
+                  'This PR is auto-generated by',
+                  '[actions/github-script](https://github.com/actions/github-script)',
+                ].join('\n'),
+              });
+            } else {
+              const existingPR = pulls.data[0];
+              await github.rest.pulls.update({
+                owner: owner,
+                repo: repo,
+                pull_number: existingPR.number,
+                body: [
+                  existingPR.body,
+                  `Updated by Job ${context.job}`,
+                ].join('\n'),
+              });
+            }

package/Update/UpdateToRelease.js

@@ -11,19 +11,6 @@ const JSONFileName = "./Update.json";
 const JSFileName = "./XMOJ.user.js";
 var JSONFileContent = readFileSync(JSONFileName, "utf8");
 var JSFileContent = readFileSync(JSFileName, "utf8");
-var JSONObject = JSON.parse(JSONFileContent);
-
-var LastJSONVersion = Object.keys(JSONObject.UpdateHistory)[Object.keys(JSONObject.UpdateHistory).length - 1];
-var LastJSVersion = JSFileContent.match(/@version\s+(\d+\.\d+\.\d+)/)[1];
-var NpmVersion = execSync("jq -r '.version' package.json").toString().trim();
-var LastVersion = LastJSVersion.split(".");
-var LastPR = JSONObject.UpdateHistory[LastJSONVersion].UpdateContents[0].PR;
-var LastType = JSONObject.UpdateHistory[LastJSONVersion].Prerelease ? "Prerelease" : "Release";
-console.log("Last JS version    : " + LastJSVersion);
-console.log("Last JSON version  : " + LastJSONVersion);
-console.log("Last PR            : " + LastPR);
-console.log("Last type          : " + LastType);
-console.log("npm version        : " + NpmVersion);
 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')) {
@@ -45,15 +32,27 @@ if (JSONFileContent.includes('//!ci-no-touch')) {
     console.log('I won\'t touch this. Exiting process.');
     process.exit(0);
 }
+var JSONObject = JSON.parse(JSONFileContent);
+
+var LastJSONVersion = Object.keys(JSONObject.UpdateHistory)[Object.keys(JSONObject.UpdateHistory).length - 1];
+var LastJSVersion = JSFileContent.match(/@version\s+(\d+\.\d+\.\d+)/)[1];
+var NpmVersion = execSync("jq -r '.version' package.json").toString().trim();
+var LastVersion = LastJSVersion.split(".");
+var LastPR = JSONObject.UpdateHistory[LastJSONVersion].UpdateContents[0].PR;
+var LastType = JSONObject.UpdateHistory[LastJSONVersion].Prerelease ? "Prerelease" : "Release";
+console.log("Last JS version    : " + LastJSVersion);
+console.log("Last JSON version  : " + LastJSONVersion);
+console.log("Last PR            : " + LastPR);
+console.log("Last type          : " + LastType);
+console.log("npm version        : " + NpmVersion);
+
 if (LastJSONVersion != LastJSVersion) {
     console.error("XMOJ.user.js and Update.json have different patch versions.");
     process.exit(1);
 }
 if (LastType == "Release") {
     console.error("Last release is not a prerelease.");
-    execSync("gh pr comment " + PRNumber + " --body \"请重新提交PR, 谢谢");
-    execSync("gh pr close " + PRNumber);
-    process.exit(1);
+    process.exit(0);
 }
 
 if (LastJSVersion != NpmVersion) {

package/Update/UpdateVersion.js

@@ -11,6 +11,19 @@ const JSONFileName = "./Update.json";
 const JSFileName = "./XMOJ.user.js";
 var JSONFileContent = readFileSync(JSONFileName, "utf8");
 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("Pushed to GitHub.");
+    console.log('I won\'t touch this. Exiting process.');
+    process.exit(0);
+}
 var JSONObject = JSON.parse(JSONFileContent);
 
 var LastJSONVersion = Object.keys(JSONObject.UpdateHistory)[Object.keys(JSONObject.UpdateHistory).length - 1];
@@ -26,19 +39,6 @@ console.log("Last PR            : " + LastPR);
 console.log("Last description   : " + LastDescription);
 console.log("Last release online: " + LastReleaseVersionOnline);
 console.log("npm version        : " + NpmVersion);
-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("Pushed to GitHub.");
-    console.log('I won\'t touch this. Exiting process.');
-    process.exit(0);
-}
 if (LastJSONVersion != LastJSVersion) {
     console.error("XMOJ.user.js and Update.json have different patch versions.");
     process.exit(1);

package/Update.json

@@ -1331,6 +1331,17 @@
                     "Description": "fix #400 + //ci-no-touch"
                 }
             ],
+            "Notes": "A lot of QoL improvements!"
+        },
+        "1.1.48": {
+            "UpdateDate": 1709370871510,
+            "Prerelease": true,
+            "UpdateContents": [
+                {
+                    "PR": 485,
+                    "Description": "and I am so frustrated I actually make another code contribution"
+                }
+            ],
             "Notes": "No release notes were provided for this release."
         }
     }

package/XMOJ.user.js

@@ -1,6 +1,6 @@
 // ==UserScript==
 // @name         XMOJ
-// @version      1.1.46
+// @version      1.1.48
 // @description  XMOJ增强脚本
 // @author       @XMOJ-Script-dev, @langningchen and the community
 // @namespace    https://github/langningchen
@@ -1865,6 +1865,7 @@ async function main() {
                                             let ParsedDocument = new DOMParser().parseFromString(Result, "text/html");
                                             SID = ParsedDocument.querySelector("#result-tab > tbody > tr:nth-child(1) > td:nth-child(2)").innerText;
                                         });
+                                    await new Promise(r => setTimeout(r, 500));
                                     let Code = "";
                                     await fetch("https://www.xmoj.tech/getsource.php?id=" + SID)
                                         .then((Response) => {
@@ -1872,6 +1873,7 @@ async function main() {
                                         }).then((Response) => {
                                             Code = Response.substring(0, Response.indexOf("/**************************************************************")).trim();
                                         });
+                                    await new Promise(r => setTimeout(r, 500));
                                     await fetch("https://www.xmoj.tech/submit.php", {
                                         "headers": {
                                             "content-type": "application/x-www-form-urlencoded"
@@ -1880,7 +1882,6 @@ async function main() {
                                         "method": "POST",
                                         "body": "cid=" + CID + "&pid=" + i + "&" + "language=1&" + "source=" + encodeURIComponent(Code) + "&" + "enable_O2=on"
                                     });
-                                    //sleep for one second
                                     await new Promise(r => setTimeout(r, 500));
                                 }
                                 if (!Submitted) {
@@ -3565,8 +3566,6 @@ int main()
                     await fetch("https://www.xmoj.tech/getsource.php?id=" + SearchParams.get("id"))
                         .then((Response) => {
                             return Response.text();
-                        }).then((Response) => {
-                            Code = Response.substring(0, Response.indexOf("/**************************************************************")).trim();
                         });
                 } else {
                     if (localStorage.getItem("UserScript-LastUploadedStdTime") === undefined || new Date().getTime() - localStorage.getItem("UserScript-LastUploadedStdTime") > 1000 * 60 * 60 * 24 * 30) {

package/package.json

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