xmoj-script 1.1.3 → 1.1.5

package/Update/UpdateToRelease.js

@@ -43,7 +43,8 @@ console.log("Current version    : " + CurrentVersion);
 JSONObject.UpdateHistory[CurrentVersion] = {
     "UpdateDate": Date.now(),
     "Prerelease": false,
-    "UpdateContents": []
+    "UpdateContents": [],
+    "Notes": "No release notes were provided for this release."
 };
 
 for (var i = Object.keys(JSONObject.UpdateHistory).length - 2; i >= 0; i--) {
@@ -64,6 +65,7 @@ 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 pull.rebase false");
 execSync("git pull");
 execSync("git push origin --delete actions/temp || true");
 execSync("git checkout -b actions/temp");

package/Update/UpdateVersion.js

@@ -67,7 +67,8 @@ else if (ChangedFileList.indexOf("XMOJ.user.js") == -1) {
         "UpdateContents": [{
             "PR": CurrentPR,
             "Description": CurrentDescription
-        }]
+        }],
+        "Notes": "No release notes were provided for this release."
     };
     writeFileSync(JSFileName, JSFileContent.replace(/@version(\s+)\d+\.\d+\.\d+/, "@version$1" + CurrentVersion), "utf8");
     console.warn("XMOJ.user.js has been updated.");
@@ -79,6 +80,7 @@ writeFileSync(JSONFileName, JSON.stringify(JSONObject, null, 4), "utf8");
 
 console.warn("Update.json has been updated.");
 
+execSync("git config pull.rebase false");
 execSync("git pull");
 execSync("git commit -a -m \"" + CommitMessage + "\"");
 execSync("git push -f");

package/Update.json

@@ -717,6 +717,28 @@
                     "Description": "Update allowed tags in PurifyHTML function to allow the  tag"
                 }
             ]
+        },
+        "1.1.4": {
+            "UpdateDate": 1702822514246,
+            "Prerelease": true,
+            "UpdateContents": [
+                {
+                    "PR": 305,
+                    "Description": "add release notes (#303)"
+                }
+            ],
+            "Notes": "Hello, release notes! test 测试"
+        },
+        "1.1.5": {
+            "UpdateDate": 1702993420758,
+            "Prerelease": true,
+            "UpdateContents": [
+                {
+                    "PR": 310,
+                    "Description": "Add an Easter egg"
+                }
+            ],
+            "Notes": "No release notes were provided for this release."
         }
     }
 }

package/XMOJ.user.js

@@ -1,6 +1,6 @@
 // ==UserScript==
 // @name         XMOJ
-// @version      1.1.3
+// @version      1.1.5
 // @description  XMOJ增强脚本
 // @author       @XMOJ-Script-dev, @langningchen and the community
 // @namespace    https://github/langningchen
@@ -448,6 +448,7 @@ else {
             document.body.innerHTML = String(document.body.innerHTML).replaceAll("海上", "上海");
             document.body.innerHTML = String(document.body.innerHTML).replaceAll("小红", "徐师娘");
             document.body.innerHTML = String(document.body.innerHTML).replaceAll("小粉", "彩虹");
+            document.body.innerHTML = String(document.body.innerHTML).replaceAll("提交上节课的代码", "自动提交当年代码");
             document.body.innerHTML = String(document.body.innerHTML).replaceAll("高老师们", "我们");
             document.body.innerHTML = String(document.body.innerHTML).replaceAll("自高老师", "自我");
             document.title = String(document.title).replaceAll("小明", "高老师");
@@ -791,6 +792,10 @@ else {
                     UpdateDataCardSubtitle.innerHTML = GetRelativeTime(Data.UpdateDate);
                     let UpdateDataCardText = document.createElement("p"); UpdateDataCardBody.appendChild(UpdateDataCardText);
                     UpdateDataCardText.className = "card-text";
+                    //release notes
+                    if (Data.Notes != undefined){
+                        UpdateDataCardText.innerHTML = Data.ReleaseNotes;
+                    }
                     let UpdateDataCardList = document.createElement("ul"); UpdateDataCardText.appendChild(UpdateDataCardList);
                     UpdateDataCardList.className = "list-group list-group-flush";
                     for (let j = 0; j < Data.UpdateContents.length; j++) {
@@ -2475,6 +2480,10 @@ else {
                             UpdateDataCardSubtitle.innerHTML = GetRelativeTime(Data.UpdateDate);
                             let UpdateDataCardText = document.createElement("p"); UpdateDataCardBody.appendChild(UpdateDataCardText);
                             UpdateDataCardText.className = "card-text";
+                            //release notes
+                            if (Data.Notes != undefined) {
+                                UpdateDataCardText.innerHTML = Data.Notes;
+                            }
                             let UpdateDataCardList = document.createElement("ul"); UpdateDataCardText.appendChild(UpdateDataCardList);
                             UpdateDataCardList.className = "list-group list-group-flush";
                             for (let j = 0; j < Data.UpdateContents.length; j++) {

package/package.json

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