xmoj-script 1.2.54 → 1.2.56

package/Update.json

@@ -2420,6 +2420,28 @@
                 }
             ],
             "Notes": "No release notes were provided for this release."
+        },
+        "1.2.55": {
+            "UpdateDate": 1723461779306,
+            "Prerelease": true,
+            "UpdateContents": [
+                {
+                    "PR": 698,
+                    "Description": "Set turnstile theme and language"
+                }
+            ],
+            "Notes": "No release notes were provided for this release."
+        },
+        "1.2.56": {
+            "UpdateDate": 1723956966458,
+            "Prerelease": true,
+            "UpdateContents": [
+                {
+                    "PR": 704,
+                    "Description": "登录界面优化"
+                }
+            ],
+            "Notes": "No release notes were provided for this release."
         }
     }
 }

package/XMOJ.user.js

@@ -1,6 +1,6 @@
 // ==UserScript==
 // @name         XMOJ
-// @version      1.2.54
+// @version      1.2.56
 // @description  XMOJ增强脚本
 // @author       @XMOJ-Script-dev, @langningchen and the community
 // @namespace    https://github/langningchen
@@ -878,10 +878,15 @@ async function main() {
                     }
                     if (UtilityEnabled("ResetType")) {
                         if (document.querySelector("#profile") != undefined && document.querySelector("#profile").innerHTML == "登录") {
-                            if (document.querySelector("#navbar > ul.nav.navbar-nav.navbar-right > li > ul").childNodes.length == 3) {
-                                document.querySelector("#navbar > ul.nav.navbar-nav.navbar-right > li > ul").childNodes[3].remove();
-                            }
-                        } else if (document.querySelector("#navbar > ul.nav.navbar-nav.navbar-right > li > ul > li:nth-child(3) > a > span") != undefined && document.querySelector("#navbar > ul.nav.navbar-nav.navbar-right > li > ul > li:nth-child(3) > a > span").innerText != "个人中心") {
+                                let PopupUL = document.querySelector("#navbar > ul.nav.navbar-nav.navbar-right > li > ul");
+                                PopupUL.innerHTML = `<li class="dropdown-item">登录</li>`;
+                                PopupUL.children[0].addEventListener("click", () => {
+                                    location.href = "https://www.xmoj.tech/loginpage.php";
+                                });
+                                let parentLi = document.querySelector("#navbar > ul.nav.navbar-nav.navbar-right > li");
+                                document.addEventListener("click", (event) => { if (!parentLi.contains(event.target) && PopupUL.style.display === 'block') {hideDropdownItems();}});
+                        }
+                        else if (document.querySelector("#navbar > ul.nav.navbar-nav.navbar-right > li > ul > li:nth-child(3) > a > span") != undefined && document.querySelector("#navbar > ul.nav.navbar-nav.navbar-right > li > ul > li:nth-child(3) > a > span").innerText != "个人中心") {
                             let PopupUL = document.querySelector("#navbar > ul.nav.navbar-nav.navbar-right > li > ul");
                             PopupUL.innerHTML = `<li class="dropdown-item">修改帐号</li>
                                              <li class="dropdown-item">个人中心</li>
@@ -2754,8 +2759,8 @@ async function main() {
                         ErrorElement.style.display = "none";
                         document.querySelector("#Submit").disabled = true;
                         document.querySelector("#Submit").value = "正在提交...";
-                        let o2Switch="&enable_O2=on";
-                        if(!document.querySelector("#enable_O2").checked)o2Switch="";
+                        let o2Switch = "&enable_O2=on";
+                        if (!document.querySelector("#enable_O2").checked) o2Switch = "";
                         await fetch("https://www.xmoj.tech/submit.php", {
                             "headers": {
                                 "content-type": "application/x-www-form-urlencoded"
@@ -2803,8 +2808,8 @@ async function main() {
                                     ErrorMessage.style.color = "red";
                                     ErrorMessage.innerText = "比赛已结束, 正在尝试像题目 " + rPID + " 提交";
                                     console.log("比赛已结束, 正在尝试像题目 " + rPID + " 提交");
-                                    let o2Switch="&enable_O2=on";
-                                    if(!document.querySelector("#enable_O2").checked)o2Switch="";
+                                    let o2Switch = "&enable_O2=on";
+                                    if (!document.querySelector("#enable_O2").checked) o2Switch = "";
                                     await fetch("https://www.xmoj.tech/submit.php", {
                                         "headers": {
                                             "content-type": "application/x-www-form-urlencoded"
@@ -4682,6 +4687,7 @@ int main()
                                 let CaptchaSecretKey = "";
                                 unsafeWindow.CaptchaLoadedCallback = () => {
                                     turnstile.render("#CaptchaContainer", {
+                                        theme: UtilityEnabled("DarkMode") ? "dark" : "light", language: "zh-cn",
                                         sitekey: CaptchaSiteKey, callback: function (CaptchaSecretKeyValue) {
                                             CaptchaSecretKey = CaptchaSecretKeyValue;
                                             SubmitElement.disabled = false;

package/package.json

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