xmoj-script 1.1.55 → 1.1.58

package/.github/pull_request_template.md

@@ -1,20 +1 @@
-- [ ] 我已认真阅读贡献指南 (contributing guidelines) 和社区公约 (code of conduct)，并遵循了如何参与页及格式手册页的相应规范。
-
-By making a contribution to this project, I certify that:
-
-The contribution was created in whole or in part by me and I have the right to submit it under the open source license indicated in the file; or
-
-The contribution is based upon previous work that, to the best of my knowledge, is covered under an appropriate open source license and I have the right under that license to submit that work with modifications, whether created in whole or in part by me, under the same open source license (unless I am permitted to submit under a different license), as indicated in the file; or
-
-The contribution was provided directly to me by some other person who certified 1., 2. or 3. and I have not modified it.
-
-I understand and agree that this project and the contribution are public and that a record of the contribution (including all personal information I submit with it, including my sign-off) is maintained indefinitely and may be redistributed consistent with this project or the open source license(s) involved.
-
-<!--
-这是 Pull Request 的描述页面，可拖动输入框右下角调节大小。尽管按下绿色按钮提交后，您仍可以对描述进行修改，但还请您先阅读以下注意事项。
-- 请不要删去本区域文字，或在此修改内容，因为本区域作为注释内容是不可见的。你应该点击 Preview 查看描述页效果。
-- 请勾选输入框外的 `Allow edits from maintainers` 的候选框（机器人需要修正格式），并通过蓝色高亮链接阅读、理解了指南和公约后，将上述 [ ] 替换为 [x]。
-- 若本 Pull Request 能够完全解决某个 Issue，请将该 Pull Request 与对应的 Issue 链接起来，具体做法请参见 <https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue>。
-- 请对照规范页面，检查 Commit 信息、PR 标题和下方 Compare 页面，例如：
-  - 您的修改是否波及到了其他文件，是否发生了意图之外的文件名修改（这在您启用了翻译软件的情况下较为常见），是否引入了无关文件。
--->
+- [ ] 我已认真阅读贡献指南 (contributing guidelines) 和社区公约 (code of conduct)，并遵循了如何参与页及格式手册页的相应规范。

package/.github/workflows/pr-check-ci.yml

@@ -0,0 +1,24 @@
+name: Check PR CI
+
+on:
+  schedule:
+    - cron: "*/10 * * * *"
+
+jobs:
+  check-pr-ci:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions-cool/check-pr-ci@v1
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          # filter-label: 'check-ci'
+          # filter-creator-authority: 'write'
+          filter-head-ref: 'master, dev'
+          filter-support-fork: true
+          success-review: true
+          success-review-body: 'PR passes all checks'
+          success-merge: false
+          conflict-review-body: 'PR has conflicts, please fix them first!'
+          failure-review: 'REQUEST_CHANGES'
+          failure-review-body: 'PR fails some checks'
+          failure-close: false

package/.github/workflows/similar-issue.yml

@@ -0,0 +1,17 @@
+name: Issues Similarity Analysis
+
+on:
+  issues:
+    types: [opened, edited]
+
+jobs:
+  similarity-analysis:
+    runs-on: ubuntu-latest
+    steps:
+      - name: analysis
+        uses: actions-cool/issues-similarity-analysis@v1
+        with:
+          filter-threshold: 0.75
+          title-excludes: 'bug, not, 1234'
+          comment-title: '### We have found some similar issues see'
+          comment-body: '${index}. ${similarity} #${number}'

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

@@ -1,45 +1,45 @@
-name: Generate xml sitemap
+# name: Generate xml sitemap
 
-on:
-  push:
-    branches: [ dev ]
-jobs:
-  UpdateVersion:
-    permissions:
-      contents: write
-    runs-on: ubuntu-latest
-    name: Generate a sitemap
-    steps:
-    - name: Checkout the repo
-      uses: actions/checkout@v2
-      with:
-        fetch-depth: 0
-    - name: Generate new sitemap
-      id: sitemap
-      uses: cicirello/generate-sitemap@v1.10.0
-      with:
-        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!.
+# on:
+#   push:
+#     branches: [ dev ]
+# jobs:
+#   UpdateVersion:
+#     permissions:
+#       contents: write
+#     runs-on: ubuntu-latest
+#     name: Generate a sitemap
+#     steps:
+#     - name: Checkout the repo
+#       uses: actions/checkout@v2
+#       with:
+#         fetch-depth: 0
+#     - name: Generate new sitemap
+#       id: sitemap
+#       uses: cicirello/generate-sitemap@v1.10.0
+#       with:
+#         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: 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 }}"    
+#     - 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: 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/SECURITY.md

@@ -1,13 +1,5 @@
-# 安全策略
+# Security Policy
 
-## 当前支持的版本
+## Supported Versions
 
-| 版本 | 是否支持  | 预计结束支持时间 | 停止支持原因 |
-| ------- | ------------------ | --------- | -------- | 
-| > 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) |
-
-注意：在开发过程中，服务器和用户脚本可能在任何时候发生重大变动，造成非最新版本结束支持。在这种情况下，我们会尽快更新用户脚本！感谢您的谅解。
+Only the latest stable release is supported

package/Update.json

@@ -1428,6 +1428,47 @@
                 }
             ],
             "Notes": "No release notes were provided for this release."
+        },
+        "1.1.56": {
+            "UpdateDate": 1713525771039,
+            "Prerelease": true,
+            "UpdateContents": [
+                {
+                    "PR": 505,
+                    "Description": "让 ctrl + enter 触发自动提交当年代码"
+                }
+            ],
+            "Notes": "No release notes were provided for this release."
+        },
+        "1.1.57": {
+            "UpdateDate": 1713526164395,
+            "Prerelease": false,
+            "UpdateContents": [
+                {
+                    "PR": 497,
+                    "Description": "move the main msg content into a div with flex!!! :tada:"
+                },
+                {
+                    "PR": 499,
+                    "Description": "add markdown support to short messages "
+                },
+                {
+                    "PR": 505,
+                    "Description": "让 ctrl + enter 触发自动提交当年代码"
+                }
+            ],
+            "Notes": "No release notes were provided for this release."
+        },
+        "1.1.58": {
+            "UpdateDate": 1713668825681,
+            "Prerelease": true,
+            "UpdateContents": [
+                {
+                    "PR": 514,
+                    "Description": "支持跳转到讨论编号 修改讨论区用户界面 在讨论区Page过大时自动跳转 在讨论区最后一页自动删除"
+                }
+            ],
+            "Notes": "No release notes were provided for this release."
         }
     }
 }

package/XMOJ.user.js

@@ -1,6 +1,6 @@
 // ==UserScript==
 // @name         XMOJ
-// @version      1.1.55
+// @version      1.1.58
 // @description  XMOJ增强脚本
 // @author       @XMOJ-Script-dev, @langningchen and the community
 // @namespace    https://github/langningchen
@@ -1842,8 +1842,12 @@ async function main() {
                                 AutoCheatButton.disabled = false;
                                 if (Submitted) location.reload(); else AutoCheatButton.innerHTML = "自动提交当年代码";
                             });
+                            document.addEventListener("keydown", (Event) => {
+                                if (Event.code === 'Enter' && Event.ctrlKey) {
+                                    AutoCheatButton.click();
+                                }
+                            });
                         }
-
                         if (UtilityEnabled("OpenAllProblem")) {
                             let OpenAllButton = document.createElement("button");
                             OpenAllButton.className = "btn btn-outline-secondary";
@@ -3807,8 +3811,23 @@ int main()
                     if (location.pathname == "/discuss3/discuss.php") {
                         let ProblemID = parseInt(SearchParams.get("pid"));
                         let Page = Number(SearchParams.get("page")) || 1;
-                        document.querySelector("body > div > div").innerHTML = `<h3>讨论列表${(isNaN(ProblemID) ? "" : ` - 题目` + ProblemID)}</h3>
-                    <button id="NewPost" type="button" class="btn btn-primary">发布新讨论</button>
+                        document.querySelector("body > div > div").innerHTML = ` <div style="text-align:center"><h1>讨论列表${(isNaN(ProblemID) ? "" : ` - 题目` + ProblemID)}</h1></div>
+            <div class="row">
+                <div class="col-md-5">
+                    <form action="discuss.php" >
+                    <div style="text-align:right">
+                        <button id="NewPost" type="button" class="btn btn-primary">发布新讨论</button>
+                    </div>
+                    </form>
+                </div>
+                <div class="col-md-3" style="display: inline">
+                    <form action="thread.php" class="input-group">
+                        <input class="form-control" type="number" name="tid" placeholder="讨论编号" min="1">
+                        <button class="btn btn-outline-secondary" type="submit">跳转</button>
+                    </form>
+                </div style="display: inline">
+            </div>
+            <h><br></h>
                     <nav>
                     <ul class="pagination justify-content-center" id="DiscussPagination">
                     <li class="page-item"><a class="page-link" href="#"><span>&laquo;</span></a></li>
@@ -3864,7 +3883,7 @@ int main()
                             }, async (ResponseData) => {
                                 if (ResponseData.Success == true) {
                                     ErrorElement.style.display = "none";
-                                    if (!Silent) {
+                                    if(!Silent) {
                                         DiscussPagination.children[0].children[0].href = "https://www.xmoj.tech/discuss3/discuss.php?" + (isNaN(ProblemID) ? "" : "pid=" + ProblemID + "&") + "page=1";
                                         DiscussPagination.children[1].children[0].href = "https://www.xmoj.tech/discuss3/discuss.php?" + (isNaN(ProblemID) ? "" : "pid=" + ProblemID + "&") + "page=" + (Page - 1);
                                         DiscussPagination.children[2].children[0].href = "https://www.xmoj.tech/discuss3/discuss.php?" + (isNaN(ProblemID) ? "" : "pid=" + ProblemID + "&") + "page=" + Page;
@@ -3883,6 +3902,7 @@ int main()
                                     PostList.children[1].innerHTML = "";
                                     if (Posts.length == 0) {
                                         PostList.children[1].innerHTML = `<tr><td colspan="7">暂无数据</td></tr>`;
+                                        location.href = "https://www.xmoj.tech/discuss3/discuss.php";
                                     }
                                     for (let i = 0; i < Posts.length; i++) {
                                         let Row = document.createElement("tr");
@@ -3920,6 +3940,11 @@ int main()
                                         let LastReplyTimeCell = document.createElement("td");
                                         Row.appendChild(LastReplyTimeCell);
                                         LastReplyTimeCell.innerHTML = GetRelativeTime(Posts[i].LastReplyTime);
+                                        if (Posts[i].PostID == 1) {
+                                            DiscussPagination.children[DiscussPagination.children.length - 1].classList.add("disabled");
+                                            DiscussPagination.children[DiscussPagination.children.length - 2].remove();
+                                            break;
+                                        }
                                     }
                                 } else {
                                     ErrorElement.innerText = ResponseData.Message;

package/package.json

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

package/.idea/XMOJ-Script.iml

@@ -1,12 +0,0 @@
-<?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

@@ -1,8 +0,0 @@
-<?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/.idea/vcs.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/backend" vcs="Git" />
-  </component>
-</project>

package/.vscode/settings.json

@@ -1,148 +0,0 @@
-{
-    "github-actions.workflows.pinned.workflows": [],
-    "cSpell.words": [
-        "AAAAAAAI",
-        "aliyuncs",
-        "apos",
-        "Arround",
-        "chenlangning",
-        "chensiru",
-        "chentianle",
-        "chenxuanhe",
-        "chenzecong",
-        "chenzerui",
-        "colspan",
-        "comparesource",
-        "Consolas",
-        "contestrank",
-        "conteststatistics",
-        "danwenxiao",
-        "darcula",
-        "dongminghui",
-        "emsp",
-        "freopen",
-        "gaochenming",
-        "gaolaoshi",
-        "Geany",
-        "guoqingtong",
-        "guoruiqun",
-        "guyuchen",
-        "hanjialin",
-        "hanshujian",
-        "heshuhan",
-        "hexinyi",
-        "huangkai",
-        "huangmingxuan",
-        "huangruina",
-        "huangwei",
-        "huyiyang",
-        "ignorews",
-        "jiangxingyu",
-        "jingtaiyu",
-        "jinweizhe",
-        "jresult",
-        "laquo",
-        "leijiahan",
-        "leiwenda",
-        "lianzhongzhe",
-        "liaoyanxu",
-        "lingzixiang",
-        "linziyi",
-        "liujianhao",
-        "liujiankun",
-        "liuxianyong",
-        "liuxixian",
-        "liyihan",
-        "loginpage",
-        "lostpassword",
-        "luojinyang",
-        "lutianfeng",
-        "meitianyi",
-        "modifypage",
-        "newpost",
-        "nowdate",
-        "panyinliang",
-        "pengyixuan",
-        "PHPSESSID",
-        "problemset",
-        "problemstatus",
-        "progressbar",
-        "putong",
-        "qianqingyuan",
-        "qidekai",
-        "raquo",
-        "reinfo",
-        "remoteip",
-        "sampledata",
-        "SAXKD",
-        "shanwenxiao",
-        "shenxichen",
-        "shihongxi",
-        "shimufan",
-        "shiyichen",
-        "shiyunhao",
-        "showsource",
-        "shuxinmo",
-        "simform",
-        "submitpage",
-        "suiruochen",
-        "sunyihan",
-        "sunyimiao",
-        "syntaxhighlighter",
-        "tangchao",
-        "tangyuhan",
-        "tanhaoxuan",
-        "taoxianyu",
-        "USACO",
-        "wangkangming",
-        "wangminghao",
-        "wangmingshuo",
-        "wangpengyu",
-        "wangsiyuan",
-        "wangtianqi",
-        "wangyuancheng",
-        "wangzetong",
-        "wanxinlian",
-        "wensiyi",
-        "wujinhong",
-        "wurunze",
-        "wuyukai",
-        "xiangjicheng",
-        "xiaoguanxun",
-        "xiaojiasheng",
-        "xiaruicheng",
-        "xiaweimin",
-        "xiaxuran",
-        "xiebingxiu",
-        "xieliren",
-        "xinyihan",
-        "xmlhttp",
-        "XMOJ",
-        "xuconghan",
-        "xukan",
-        "xuweiyi",
-        "yanghaochen",
-        "yezijiong",
-        "youzhouhang",
-        "yuanruiqing",
-        "yutingjun",
-        "zhangchenming",
-        "zhangqiuze",
-        "zhangshuxuan",
-        "zhangwenda",
-        "zhangyifu",
-        "zhangyouheng",
-        "zhaochenshen",
-        "zhaochenwei",
-        "zhengyinan",
-        "zhonghongyi",
-        "zhoujunyu",
-        "zhouziyi",
-        "zhouziyou",
-        "zhuchenrui",
-        "zhuruichen",
-        "zhuxule",
-        "zhuyikun",
-        "zhuyiyang"
-    ]
-}