xmoj-script 1.1.41 → 1.1.43

package/.github/workflows/sitemap-automation.yml

@@ -1,40 +1,45 @@
-name: Generate sitemap 
+name: Generate xml sitemap
 
 on:
   push:
     branches: [ dev ]
-
 jobs:
-  sitemap_job:
+  UpdateVersion:
+    permissions:
+      contents: write
     runs-on: ubuntu-latest
     name: Generate a sitemap
     steps:
     - name: Checkout the repo
-      uses: actions/checkout@v4
+      uses: actions/checkout@v2
       with:
-        fetch-depth: 0 
-    
-    - name: Generate the sitemap
+        fetch-depth: 0
+    - name: Generate new sitemap
       id: sitemap
-      uses: cicirello/generate-sitemap@v1
+      uses: cicirello/generate-sitemap@v1.6.1
       with:
-        exclude-paths: /404.html
+        additional-extensions: user.js
+        sitemap-format: xml
+        drop-html-extension: true
         base-url-path: https://xmoj-bbs.tech/
-    
+        exclude-paths: /404.html    
+    - name: Create PR to dev branch
+      uses: peter-evans/create-pull-request@v6
+      with:
+        signoff: true
+        reviewers: PythonSmall-Q, zhouyiqing0304
+        assignees: PythonSmall-Q, zhouyiqing0304
+        title: "自动更新sitemap"
+        body: > 
+          Sitemap Updated! Please merge me!.
+
     - name: Output stats
       run: |
         echo "sitemap-path = ${{ steps.sitemap.outputs.sitemap-path }}"
         echo "url-count = ${{ steps.sitemap.outputs.url-count }}"
         echo "excluded-count = ${{ steps.sitemap.outputs.excluded-count }}"
-    
-    - name: Create Pull Request
-      uses: peter-evans/create-pull-request@v5.0.2
-      with:
-        title: "Automated sitemap update"
-        body: > 
-          Automated changes in sitemap.xml.
-        commit-message: "Automated sitemap update."
-        author: PythonSmall-Q <seanoj_noreply@yeah.net>
-        committer: PythonSmall-Q <seanoj_noreply@yeah.net>
-        branch: create-pull-request/sitemap
-        delete-branch: true
+    - name: Check outputs
+      if: ${{ steps.cpr.outputs.pull-request-number }}
+      run: |
+        echo "Pull Request Number - ${{ steps.cpr.outputs.pull-request-number }}"
+        echo "Pull Request URL - ${{ steps.cpr.outputs.pull-request-url }}"    

package/Update.json

@@ -1257,7 +1257,7 @@
         },
         "1.1.41": {
             "UpdateDate": 1706867272746,
-            "Prerelease": true,
+            "Prerelease": false,
             "UpdateContents": [
                 {
                     "PR": 429,
@@ -1265,6 +1265,28 @@
                 }
             ],
             "Notes": "No release notes were provided for this release."
+        },
+        "1.1.42": {
+            "UpdateDate": 1707642572244,
+            "Prerelease": true,
+            "UpdateContents": [
+                {
+                    "PR": 445,
+                    "Description": "fix  [Bug] 右上角用户名点击后无反应 "
+                }
+            ],
+            "Notes": "Popper.js is so stupid..."
+        },
+        "1.1.43": {
+            "UpdateDate": 1707715028113,
+            "Prerelease": true,
+            "UpdateContents": [
+                {
+                    "PR": 447,
+                    "Description": "fix the unpkg-cdn option"
+                }
+            ],
+            "Notes": "No release notes were provided for this release."
         }
     }
 }

package/XMOJ.user.js

@@ -1,6 +1,6 @@
 // ==UserScript==
 // @name         XMOJ
-// @version      1.1.41
+// @version      1.1.43
 // @description  XMOJ增强脚本
 // @author       @XMOJ-Script-dev, @langningchen and the community
 // @namespace    https://github/langningchen
@@ -402,6 +402,7 @@ let ServerURL = (UtilityEnabled("DebugMode") ? "https://ghpages.xmoj-bbs.tech/"
 let CurrentUsername = document.querySelector("#profile").innerText;
 CurrentUsername = CurrentUsername.replaceAll(/[^a-zA-Z0-9]/g, "");
 let IsAdmin = AdminUserList.indexOf(CurrentUsername) !== -1;
+
 async function main() {
     if (location.href.startsWith('http://')) {
         //use https
@@ -488,11 +489,6 @@ async function main() {
                     document.querySelector("html").setAttribute("data-bs-theme", "light");
                 }
                 var resources = [
-                    {
-                        type: 'script',
-                        src: 'https://cdn.bootcdn.net/ajax/libs/popper.js/2.11.7/umd/popper.min.js',
-                        isModule: true
-                    },
                     {
                         type: 'link',
                         href: 'https://cdn.bootcdn.net/ajax/libs/codemirror/6.65.7/codemirror.min.css',
@@ -515,13 +511,13 @@ async function main() {
                     },
                     {
                         type: 'script',
-                        src: 'https://cdn.bootcdn.net/ajax/libs/twitter-bootstrap/5.3.0-alpha3/js/bootstrap.min.js',
+                        src: 'https://cdn.bootcdn.net/ajax/libs/twitter-bootstrap/5.3.0-alpha3/js/bootstrap.bundle.min.js',
                         isModule: true
                     }
                 ];
                 if (UtilityEnabled("UnpkgCdn")) {
-                    resources[0].src = 'https://unpkg.com/@popperjs/core@2.11.8/dist/umd/popper.min.js';
-                    resources[4].href = 'https://unpkg.com/bootstrap@5.3.0-alpha3/dist/css/bootstrap.min.css';
+                    resources[3].href = 'https://unpkg.com/bootstrap@5.3.0-alpha3/dist/css/bootstrap.min.css';
+                    resources[4].src = 'https://unpkg.com/bootstrap@5.3.0-alpha3/dist/js/bootstrap.bundle.min.js';
                 }
                 let loadResources = async () => {
                     let promises = resources.map(resource => {

package/index.html

@@ -3,6 +3,8 @@
 <link rel="icon" href="favicon.ico">
 
 <head>
+    <script async src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js?client=ca-pub-6214673028530012"
+     crossorigin="anonymous"></script>
     <meta name="viewport" content="width=device-width">
     <link href="https://cdn.bootcdn.net/ajax/libs/twitter-bootstrap/5.2.3/css/bootstrap.min.css" rel="stylesheet">
     <script src="https://cdn.bootcdn.net/ajax/libs/twitter-bootstrap/5.2.3/js/bootstrap.min.js"></script>

package/package.json

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