xmoj-script 1.1.45 → 1.1.47

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@v6
+        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/.github/workflows/sitemap-automation.yml

@@ -16,7 +16,7 @@ jobs:
         fetch-depth: 0
     - name: Generate new sitemap
       id: sitemap
-      uses: cicirello/generate-sitemap@v1.6.1
+      uses: cicirello/generate-sitemap@v1.10.0
       with:
         additional-extensions: user.js
         sitemap-format: xml

package/Update/UpdateToRelease.js

@@ -11,6 +11,27 @@ 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 push origin --delete actions/temp || true");
+    execSync("git checkout -b actions/temp");
+    execSync("git commit -a -m \"remove //!ci-no-touch\"");
+    execSync("git push -u origin actions/temp -f");
+    console.warn("Pushed to actions/temp.");
+
+    var PRNumber = execSync("gh pr create --title \"Update to release " + CurrentVersion + "\" --body \"Update to release " + CurrentVersion + "\" --base dev --head actions/temp").toString().split("/")[6].trim();
+    console.warn("PR #" + PRNumber + " has been created.");
+
+    execSync("gh pr merge " + PRNumber + " --merge --auto");
+    console.warn("PR #" + PRNumber + " has enabled auto merge.");
+    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];
@@ -25,24 +46,14 @@ console.log("Last PR            : " + LastPR);
 console.log("Last type          : " + LastType);
 console.log("npm version        : " + NpmVersion);
 
-if (JSONFileContent.includes('//ci-no-touch')) {
-    var updatedContent = JSONFileContent.replace('//ci-no-touch', '');
-    writeFileSync(JSONFileName, updatedContent, "utf8");
-    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);
 }
 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);
 }
-execSync("git config --global user.email \"github-actions[bot]@users.noreply.github.com\"");
-execSync("git config --global user.name \"github-actions[bot]\"");
 
 if (LastJSVersion != NpmVersion) {
     console.warn("Assuming you manually ran npm version.");

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,13 +39,6 @@ console.log("Last PR            : " + LastPR);
 console.log("Last description   : " + LastDescription);
 console.log("Last release online: " + LastReleaseVersionOnline);
 console.log("npm version        : " + NpmVersion);
-
-if (JSONFileContent.includes('//ci-no-touch')) {
-    var updatedContent = JSONFileContent.replace('//ci-no-touch', '');
-    writeFileSync(JSONFileName, updatedContent, "utf8");
-    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

@@ -1309,6 +1309,40 @@
                 }
             ],
             "Notes": "No release notes were provided for this release."
+        },
+        "1.1.46": {
+            "UpdateDate": 1708137046736,
+            "Prerelease": false,
+            "UpdateContents": [
+                {
+                    "PR": 445,
+                    "Description": "fix  [Bug] 右上角用户名点击后无反应 "
+                },
+                {
+                    "PR": 447,
+                    "Description": "fix the unpkg-cdn option"
+                },
+                {
+                    "PR": 449,
+                    "Description": "regression!"
+                },
+                {
+                    "PR": 454,
+                    "Description": "fix #400 + //ci-no-touch"
+                }
+            ],
+            "Notes": "A lot of QoL improvements!"
+        },
+        "1.1.47": {
+            "UpdateDate": 1708774235039,
+            "Prerelease": true,
+            "UpdateContents": [
+                {
+                    "PR": 476,
+                    "Description": "新增下载项并且允许管理员用户直接获取标程"
+                }
+            ],
+            "Notes": "No release notes were provided for this release."
         }
     }
 }

package/XMOJ.user.js

@@ -1,6 +1,6 @@
 // ==UserScript==
 // @name         XMOJ
-// @version      1.1.45
+// @version      1.1.47
 // @description  XMOJ增强脚本
 // @author       @XMOJ-Script-dev, @langningchen and the community
 // @namespace    https://github/langningchen
@@ -1631,7 +1631,7 @@ async function main() {
                                     TempHTML += "</a>";
                                     if (Points[SolutionID] != undefined) {
                                         TempHTML += "<span style=\"margin-left: 5px\" class=\"badge text-bg-info\">" + Points[SolutionID] + "</span>";
-                                        if (Points[SolutionID].substring(0, Points[SolutionID].length - 1) >= 50) {
+                                        if ((Points[SolutionID].substring(0, Points[SolutionID].length - 1) >= 50)||(IsAdmin)) {
                                             TempHTML += `<a href="https://www.xmoj.tech/showsource.php?pid=${PID}&ByUserScript=1" class="ms-1 link-secondary">查看标程</a>`;
                                         }
                                     }
@@ -3412,6 +3412,10 @@ int main()
                         "Name": "Visual Studio Code",
                         "Image": "https://code.visualstudio.com/favicon.ico",
                         "URL": "https://code.visualstudio.com/Download"
+                    }, {
+                        "Name": "Microsoft Visual Studio",
+                        "Image": "https://visualstudio.microsoft.com/wp-content/uploads/2021/10/Product-Icon.svg",
+                        "URL": "https://visualstudio.microsoft.com/zh-hans/"
                     }, {
                         "Name": "Lazarus",
                         "Image": "https://a.fsdn.com/allura/p/lazarus/icon",
@@ -3428,6 +3432,14 @@ int main()
                         "Name": "VirtualBox",
                         "Image": "https://www.virtualbox.org/graphics/vbox_logo2_gradient.png",
                         "URL": "https://www.virtualbox.org/wiki/Downloads"
+                    }, {
+                        "Name": "VMware Workstation Pro",
+                        "Image": "https://www.vmware.com/content/dam/digitalmarketing/vmware/en/images/gallery/thumbnails/tn-vmware-workstation-pro.png",
+                        "URL": "https://www.vmware.com/go/getworkstation-win"
+                    }, {
+                        "Name": "VMware Workstation Pro - Product Key",
+                        "Image": "https://www.vmware.com/content/dam/digitalmarketing/vmware/en/images/gallery/illustrations/illu-tech-laptop-whtbg.png",
+                        "URL": "https://raw.githubusercontent.com/zhouyiqing0304/VMware-Workstation-Pro-Action-Keys/main/README.md"
                     }, {
                         "Name": "MinGW",
                         "Image": "https://www.mingw-w64.org/logo.svg",
@@ -4607,4 +4619,4 @@ int main()
     }
 }
 
-main();
+main();

package/package.json

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