xmoj-script 1.1.49 → 1.1.52

package/.github/workflows/Prerelease.yml

@@ -34,7 +34,7 @@ jobs:
         id: get_version
         run: node ./Update/GetVersion.js
       - id: create_release
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         env:
           GITHUB_TOKEN: ${{ steps.generate_token.outputs.token }}
         with:

package/.github/workflows/Release.yml

@@ -27,7 +27,7 @@ jobs:
         id: get_version
         run: node ./Update/GetVersion.js
       - id: create_release
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         env:
           GITHUB_TOKEN: ${{ steps.generate_token.outputs.token }}
         with:

package/.github/workflows/merge.yml

@@ -1,13 +1,13 @@
-name: Sitemap merge
+name: Merge changes to extern-contrib
 on:
   push:
     branches:
-      - create-pull-request/patch
+      - dev
   workflow_dispatch:
 jobs:
   create_pull_request:
     name: 'Create PR'
-    if: github.ref == 'refs/heads/beta'
+    if: github.ref == 'refs/heads/extern-contrib'
     runs-on: ubuntu-latest
     permissions:
       pull-requests: write
@@ -27,7 +27,7 @@ jobs:
             
             if (pulls.data.length < 1) {
               await github.rest.pulls.create({
-                title: '[Sitemap] Merge sitemap into dev',
+                title: 'Merge dev into extern-contrib',
                 owner: owner,
                 repo: repo,
                 head: context.ref,

package/.idea/XMOJ-Script.iml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/.tmp" />
+      <excludeFolder url="file://$MODULE_DIR$/temp" />
+      <excludeFolder url="file://$MODULE_DIR$/tmp" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

package/.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/XMOJ-Script.iml" filepath="$PROJECT_DIR$/.idea/XMOJ-Script.iml" />
+    </modules>
+  </component>
+</project>

package/Update.json

@@ -1354,6 +1354,43 @@
                 }
             ],
             "Notes": "No release notes were provided for this release."
+        },
+        "1.1.50": {
+            "UpdateDate": 1710576508444,
+            "Prerelease": false,
+            "UpdateContents": [
+                {
+                    "PR": 485,
+                    "Description": "and I am so frustrated I actually make another code contribution"
+                },
+                {
+                    "PR": 486,
+                    "Description": "fix showsource"
+                }
+            ],
+            "Notes": "No release notes were provided for this release."
+        },
+        "1.1.51": {
+            "UpdateDate": 1710641069919,
+            "Prerelease": true,
+            "UpdateContents": [
+                {
+                    "PR": 491,
+                    "Description": "Update ticket email"
+                }
+            ],
+            "Notes": "No release notes were provided for this release."
+        },
+        "1.1.52": {
+            "UpdateDate": 1711848297024,
+            "Prerelease": true,
+            "UpdateContents": [
+                {
+                    "PR": 493,
+                    "Description": "Make the dismiss button work + improve showsource"
+                }
+            ],
+            "Notes": "No release notes were provided for this release."
         }
     }
 }

package/XMOJ.user.js

@@ -1,6 +1,6 @@
 // ==UserScript==
 // @name         XMOJ
-// @version      1.1.49
+// @version      1.1.52
 // @description  XMOJ增强脚本
 // @author       @XMOJ-Script-dev, @langningchen and the community
 // @namespace    https://github/langningchen
@@ -21,7 +21,7 @@
 // @grant        GM_setValue
 // @grant        GM_getValue
 // @homepage     https://www.xmoj-bbs.tech/
-// @supportURL   https://bugs.xmoj-bbs.tech
+// @supportURL   https://xmojscript.zohodesk.com/portal/zh/newticket
 // @connect      api.xmoj-bbs.tech
 // @connect      challenges.cloudflare.com
 // @connect      cppinsights.io
@@ -934,6 +934,7 @@ async function main() {
                                 let ToastDismissButton = document.createElement("button");
                                 ToastDismissButton.type = "button";
                                 ToastDismissButton.classList.add("btn", "btn-secondary", "btn-sm", "me-2");
+                                ToastDismissButton.setAttribute("data-bs-dismiss", "toast");
                                 ToastDismissButton.innerText = "忽略";
                                 ToastDismissButton.addEventListener("click", () => {
                                     RequestAPI("ReadMailMention", {
@@ -3567,7 +3568,7 @@ int main()
                         .then((Response) => {
                             return Response.text();
                         }).then((Response) => {
-                            Code = Response;
+                            Code = Response.replace("\n<!--not cached-->\n", "");
                         });
                 } else {
                     if (localStorage.getItem("UserScript-LastUploadedStdTime") === undefined || new Date().getTime() - localStorage.getItem("UserScript-LastUploadedStdTime") > 1000 * 60 * 60 * 24 * 30) {
@@ -4608,4 +4609,4 @@ int main()
     }
 }
 
-main();
+main();

package/package.json

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