xmoj-script 1.1.1 → 1.1.3

package/.github/workflows/Prerelease.yml

@@ -17,9 +17,17 @@ jobs:
         with:
           app-id: ${{ secrets.APP_ID }}
           private-key: ${{ secrets.APP_PRIVATE_KEY }}
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 16
+          registry-url: https://registry.npmjs.org/
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
+      - name: Publish to npm
+        run: npm publish
+        env:
+          NODE_AUTH_TOKEN: ${{secrets.npm_token}}
       - name: Get version
         env:
           GITHUB_TOKEN: ${{ steps.generate_token.outputs.token }}
@@ -36,8 +44,8 @@ jobs:
           prerelease: true
           files: XMOJ.user.js
           target_commitish: ${{ github.sha }}
-      - uses: actions/configure-pages@v3
+      - uses: actions/configure-pages@v4
       - uses: actions/upload-pages-artifact@v2
         with:
           path: .
-      - uses: actions/deploy-pages@v2
+      - uses: actions/deploy-pages@v3

package/.github/workflows/Release.yml

@@ -16,9 +16,17 @@ jobs:
         with:
           app-id: ${{ secrets.APP_ID }}
           private-key: ${{ secrets.APP_PRIVATE_KEY }}
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 16
+          registry-url: https://registry.npmjs.org/
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
+      - name: Publish to npm
+        run: npm publish
+        env:
+          NODE_AUTH_TOKEN: ${{secrets.npm_token}}
       - name: Get version
         id: get_version
         run: node ./Update/GetVersion.js
@@ -38,8 +46,8 @@ jobs:
           accountId: 89969bdf9d5ab8202f8ad8b8ae2c40b8
           projectName: xmoj-script
           directory: .
-      - uses: actions/configure-pages@v3
+      - uses: actions/configure-pages@v4
       - uses: actions/upload-pages-artifact@v2
         with:
           path: .
-      - uses: actions/deploy-pages@v2
+      - uses: actions/deploy-pages@v3

package/README.md

@@ -68,18 +68,17 @@
 ### 安装
 请参考 [官网介绍](https://www.xmoj-bbs.tech) 。
 
-### 加入我们
+### 贡献
 您想为我们的脚本添砖加瓦吗？快加入我们，为小明的OJ用户创造更美好的环境！（具体要求参见Code Of Conduct）
 
 小明的OJ增强脚本开发期待以您的邂逅！
 
-### 贡献
-请注意, 外部开发者应向`extern-contrib`提交 pull requests。
+> [!IMPORTANT]
+> 请注意, 外部开发者应向`extern-contrib`提交 pull requests。
 
 ### How to set up a development server
-In the 'Server/Sources' folder input your GitHub PAT and Cloudflare Turnstile Site key in 'Secrets.ts', and run:
 ```bash
-cd Server
+cd backend
 npm install 
 npx wrangler d1 execute DB --file ./Source/Initial.sql --local
 npx wrangler dev

package/SECURITY.md

@@ -4,9 +4,10 @@
 
 | 版本 | 是否支持  | 预计结束支持时间 | 停止支持原因 |
 | ------- | ------------------ | --------- | -------- | 
-| 1.0.x | :white_check_mark: | 支持 |  |
+| > 1.0.251 | :white_check_mark: | 支持 |  |
+| 1.0.x (x < 251)   | :x: | 已停止支持 | 后台 api 变动 |
 | 0.3.x   | :x: | 已停止支持 | 开发组人员变动 |
 | 0.2.x   | :x:                | 已停止支持 | 讨论功能重大更新 |
-| 0.1.x   | :x:                | 已停止支持 | 重大安全隐患 + 依赖问题(ansi_up) |
+| 0.1.x   | :x:                | 已停止支持 | 重大安全隐患 + 依赖问题 (ansi_up) |
 
 注意：在开发过程中，服务器和用户脚本可能在任何时候发生重大变动，造成非最新版本结束支持。在这种情况下，我们会尽快更新用户脚本！感谢您的谅解。

package/Update/GetVersion.js

@@ -5,15 +5,17 @@ const JSONFileName = "./Update.json";
 const JSFileName = "./XMOJ.user.js";
 var JSONFileContent = readFileSync(JSONFileName, "utf8");
 var JSFileContent = readFileSync(JSFileName, "utf8");
+var NpmVersion = execSync("jq -r '.version' package.json").toString().trim();
 
 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];
-if (LastJSONVersion != LastJSVersion) {
-    console.log("Error: XMOJ.user.js and Update.json have different versions.");
+if (LastJSONVersion != LastJSVersion || LastJSONVersion != NpmVersion || LastJSVersion != NpmVersion) {
+    console.log("Error: XMOJ.user.js and Update.json and npm have different versions.");
     console.log("XMOJ.user.js: " + LastJSVersion);
     console.log("Update.json: " + LastJSONVersion);
+    console.log("npm: " + NpmVersion);
     process.exit(1);
 }
 console.log("Latest version: " + LastJSONVersion);

package/Update/UpdateToRelease.js

@@ -15,6 +15,7 @@ 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";
@@ -22,15 +23,21 @@ console.log("Last JS version    : " + LastJSVersion);
 console.log("Last JSON version  : " + LastJSONVersion);
 console.log("Last PR            : " + LastPR);
 console.log("Last type          : " + LastType);
-if (LastJSONVersion.split(".")[2] != LastJSVersion.split(".")[2]) {
+console.log("npm version        : " + NpmVersion);
+if (LastJSONVersion != LastJSVersion) {
     console.error("XMOJ.user.js and Update.json have different patch versions.");
     process.exit(1);
 }
 
-var CurrentVersion = LastVersion[0] + "." + LastVersion[1] + "." + (parseInt(LastVersion[2]) + 1);
-if (LastType == "Release") {
-    CurrentVersion = LastJSONVersion;
+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.");
+} else {
+    execSync("npm version patch");
 }
+var CurrentVersion = execSync("jq -r '.version' package.json").toString().trim();
 console.log("Current version    : " + CurrentVersion);
 
 JSONObject.UpdateHistory[CurrentVersion] = {
@@ -57,8 +64,6 @@ var NewJSFileContent = JSFileContent.replace(/@version(\s+)\d+\.\d+\.\d+/, "@ver
 writeFileSync(JSFileName, NewJSFileContent, "utf8");
 console.warn("XMOJ.user.js has been updated.");
 
-execSync("git config --global user.email \"github-actions[bot]@users.noreply.github.com\"");
-execSync("git config --global user.name \"github-actions[bot]\"");
 execSync("git pull");
 execSync("git push origin --delete actions/temp || true");
 execSync("git checkout -b actions/temp");

package/Update/UpdateVersion.js

@@ -19,23 +19,30 @@ var LastVersion = LastJSVersion.split(".");
 var LastPR = JSONObject.UpdateHistory[LastJSONVersion].UpdateContents[0].PR;
 var LastDescription = JSONObject.UpdateHistory[LastJSONVersion].UpdateContents[0].Description;
 var LastReleaseVersionOnline = execSync("gh release list --exclude-pre-releases --limit 1").toString().trim().split("\t")[2];
+var NpmVersion = execSync("jq -r '.version' package.json").toString().trim();
 console.log("Last JS version    : " + LastJSVersion);
 console.log("Last JSON version  : " + LastJSONVersion);
 console.log("Last PR            : " + LastPR);
 console.log("Last description   : " + LastDescription);
 console.log("Last release online: " + LastReleaseVersionOnline);
+console.log("npm version        : " + NpmVersion);
 if (LastJSONVersion != LastJSVersion) {
     console.error("XMOJ.user.js and Update.json have different patch versions.");
     process.exit(1);
 }
 
-var CurrentVersion = LastVersion[0] + "." + LastVersion[1] + "." + (parseInt(LastVersion[2]) + 1);
+execSync("git config --global user.email \"github-actions[bot]@users.noreply.github.com\"");
+execSync("git config --global user.name \"github-actions[bot]\"");
 var CurrentPR = Number(PRNumber);
 var CurrentDescription = String(process.argv[4]);
-if (LastPR == CurrentPR || JSONObject.UpdateHistory[LastJSONVersion].Prerelease == false && LastReleaseVersionOnline != LastJSONVersion) {
-    CurrentVersion = LastJSONVersion;
+if (LastJSVersion != NpmVersion) {
+    console.warn("Assuming you manually ran npm version.");
+} else if(!(LastPR == CurrentPR && NpmVersion == LastJSVersion)) {
+    execSync("npm version patch");
 }
 
+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);
@@ -44,11 +51,11 @@ var ChangedFileList = execSync("gh pr diff " + CurrentPR + " --name-only").toStr
 console.log("Changed files      : " + ChangedFileList.join(", "));
 
 let CommitMessage = "";
-if (LastPR == CurrentPR) {
+if (LastPR == CurrentPR && NpmVersion == LastJSVersion) {
     console.warn("Warning: PR is the same as last version.");
-    JSONObject.UpdateHistory[CurrentVersion].UpdateDate = Date.now();
-    JSONObject.UpdateHistory[CurrentVersion].UpdateContents[0].Description = CurrentDescription;
-    CommitMessage = "Update time and description of " + CurrentVersion;
+    JSONObject.UpdateHistory[LastJSVersion].UpdateDate = Date.now();
+    JSONObject.UpdateHistory[LastJSVersion].UpdateContents[0].Description = CurrentDescription;
+    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.");
@@ -72,8 +79,6 @@ writeFileSync(JSONFileName, JSON.stringify(JSONObject, null, 4), "utf8");
 
 console.warn("Update.json has been updated.");
 
-execSync("git config --global user.email \"github-actions[bot]@users.noreply.github.com\"");
-execSync("git config --global user.name \"github-actions[bot]\"");
 execSync("git pull");
 execSync("git commit -a -m \"" + CommitMessage + "\"");
 execSync("git push -f");

package/Update.json

@@ -689,7 +689,7 @@
             ]
         },
         "1.1.1": {
-            "UpdateDate": 1702641659793,
+            "UpdateDate": 1702641844861,
             "Prerelease": true,
             "UpdateContents": [
                 {
@@ -697,6 +697,26 @@
                     "Description": "Add Docs"
                 }
             ]
+        },
+        "1.1.2": {
+            "UpdateDate": 1702687185849,
+            "Prerelease": true,
+            "UpdateContents": [
+                {
+                    "PR": 301,
+                    "Description": "改变更新架构"
+                }
+            ]
+        },
+        "1.1.3": {
+            "UpdateDate": 1702821395564,
+            "Prerelease": true,
+            "UpdateContents": [
+                {
+                    "PR": 302,
+                    "Description": "Update allowed tags in PurifyHTML function to allow the  tag"
+                }
+            ]
         }
     }
 }

package/XMOJ.user.js

@@ -1,6 +1,6 @@
 // ==UserScript==
 // @name         XMOJ
-// @version      1.1.1
+// @version      1.1.3
 // @description  XMOJ增强脚本
 // @author       @XMOJ-Script-dev, @langningchen and the community
 // @namespace    https://github/langningchen
@@ -37,10 +37,15 @@ const AdminUserList = ["zhuchenrui2", "shanwenxiao", "admin", "shihongxi"];
 
 let PurifyHTML = (Input) => {
     return DOMPurify.sanitize(Input, {
-        "ALLOWED_TAGS": ["a", "b", "blockquote", "br", "code", "dd", "del", "div", "dl", "dt", "em", "h1", "h2", "h3", "h4", "h5", "h6", "h7", "h8", "hr", "i", "img", "ins", "kbd", "li", "ol", "p", "pre", "q", "rp", "rt", "ruby", "s", "samp", "strike", "strong", "sub", "sup", "table", "tbody", "td", "tfoot", "th", "thead", "tr", "tt", "ul", "var"],
+        "ALLOWED_TAGS": ["a", "b", "big", "blockquote", "br", "code", "dd", "del", "div", "dl", "dt", "em", "h1", "h2", "h3", "h4", "h5", "h6", "h7", "h8", "hr", "i", "img", "ins", "kbd", "li", "ol", "p", "pre", "q", "rp", "rt", "ruby", "s", "samp", "strike", "strong", "sub", "sup", "table", "tbody", "td", "tfoot", "th", "thead", "tr", "tt", "ul", "var"],
         "ALLOWED_ATTR": ["abbr", "accept", "accept-charset", "accesskey", "action", "align", "alt", "axis", "border", "cellpadding", "cellspacing", "char", "charoff", "charset", "checked", "cite", "clear", "color", "cols", "colspan", "compact", "coords", "datetime", "dir", "disabled", "enctype", "for", "frame", "headers", "height", "href", "hreflang", "hspace", "ismap", "itemprop", "label", "lang", "longdesc", "maxlength", "media", "method", "multiple", "name", "nohref", "noshade", "nowrap", "prompt", "readonly", "rel", "rev", "rows", "rowspan", "rules", "scope", "selected", "shape", "size", "span", "src", "start", "summary", "tabindex", "target", "title", "type", "usemap", "valign", "value", "vspace", "width"]
     });
 }
+/**
+ * Calculates the relative time based on the input date.
+ * @param {string|Date} Input - The input date.
+ * @returns {string} The relative time in a formatted string.
+ */
 let GetRelativeTime = (Input) => {
     Input = new Date(Input);
     let Now = new Date().getTime();

package/package.json

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

package/backend/.github/.config.yml

@@ -1,21 +0,0 @@
-# Configuration for welcome - https://github.com/XMOJ-Script-dev
-
-# Configuration for new-issue-welcome - https://github.com/XMOJ-Script-dev
-
-# Comment to be posted to on first time issues
-newIssueWelcomeComment: >
-  Thanks for opening your first issue here! 欢迎你第一次来到这里开Issue！
-
-# Configuration for new-pr-welcome - https://github.com/behaviorbot/new-pr-welcome
-
-# Comment to be posted to on PRs from first time contributors in your repository
-newPRWelcomeComment: >
-  Thanks for opening this pull request! Please check out our contributing guidelines. 欢迎你像我们做出贡献！
-
-# Configuration for first-pr-merge - https://github.com/behaviorbot/first-pr-merge
-
-# Comment to be posted to on pull requests merged by a first time user
-firstPRMergeComment: >
-  Congrats on merging your first pull request! We here at behaviorbot are proud of you! 哇！你的PR审核通过了！祝贺你！
-
-# It is recommended to include as many gifs and emojis as possible!

package/backend/.github/ISSUE_TEMPLATE/bug.yml

@@ -1,30 +0,0 @@
-name: 综合 Bug 反馈
-description: 有功能有问题
-labels: bug, needs-triage
-assignees: PythonSmall-Q, boomzero, shihongxi
-title: "[Bug]"
-body:
-- type: checkboxes
-  attributes:
-    label: 检查项
-    description: 请逐个检查下列项目，并勾选确认。
-    options:
-    - label: 我已确认了XMOJ增强脚本已为最新版，且最新版未修复这个 Bug 。
-      required: true
-    - label: 我已在 [Issues 页面](https://github.com/XMOJ-Script-dev/XMOJ-Script/issues) 中搜索，确认了这一 Bug 未被提交过。
-      required: true
-- type: textarea
-  attributes:
-    label: 描述
-    description: 详细描述该 Bug 的具体表现。
-  validations:
-    required: true
-- type: textarea
-  attributes:
-    label: 重现步骤
-    description: 详细描述要怎么操作才能再次触发这个 Bug 。
-- type: textarea
-  attributes:
-    label: 控制台错误信息
-    description: 粘贴控制台错误信息，如果没有错误请忽略
-    placeholder: 请按F12并选择控制台/Console，并将其中的错误信息粘贴至此处

package/backend/.github/ISSUE_TEMPLATE/config.yml

@@ -1,5 +0,0 @@
-blank_issues_enabled: false
-contact_links:
-  - name: 提问
-    url: https://github.com/XMOJ-Script-dev/XMOJ-Script/discussions/categories/q-a
-    about: 我不想提交反馈，只是想问一些问题

package/backend/.github/ISSUE_TEMPLATE/feature.yml

@@ -1,25 +0,0 @@
-name: 新功能提案
-description: 对已有功能的大幅度修改，或添加一个新内容或选项
-labels: enhancement, needs-triage
-assignees: PythonSmall-Q, boomzero, shihongxi
-title: "[Feature Request]"
-body:
-- type: checkboxes
-  attributes:
-    label: 检查项
-    description: 请逐个检查下列项目，并勾选确认。
-    options:
-    - label: 我已确认了XMOJ增强脚本已为最新版，且最新版未实现这一功能。
-      required: true
-    - label: 我已在 [Issues 页面](https://github.com/XMOJ-Script-dev/XMOJ-Script/issues) 中搜索，确认了这一提案未被提交过。
-      required: true
-- type: textarea
-  attributes:
-    label: 描述
-    description: 详细描述你想添加的功能具体是怎样的。
-  validations:
-    required: true
-- type: textarea
-  attributes:
-    label: 原因
-    description: 详细描述你为什么需要这项功能。

package/backend/.github/dependabot.yml

@@ -1,12 +0,0 @@
-version: 2
-updates:
-  - package-ecosystem: "npm"
-    directory: "/Server"
-    target-branch: "dev"
-    schedule:
-      interval: "weekly"
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    target-branch: "dev"
-    schedule:
-      interval: "weekly"

package/backend/.github/labeler.yml

@@ -1,14 +0,0 @@
-user-script:
-  - XMOJ.user.js
-website:
-  - index.html
-  - robots.txt
-  - '*.html'
-update-script:
-  - Update/**
-server:
-  - Server/**
-GitHub-related:
-  - '.github/**'
-addon-script:
-  - AddonScript.js