[pull] master from diygod:master

.devcontainer/devcontainer.json

@@ -0,0 +1,62 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
+// https://github.com/devcontainers/images/blob/v0.3.24/src/javascript-node/.devcontainer/devcontainer.json
+{
+    "name": "Node.js",
+    "image": "mcr.microsoft.com/devcontainers/javascript-node:22-bookworm",
+
+    // Configure tool-specific properties.
+    "customizations": {
+        // Configure properties specific to VS Code.
+        "vscode": {
+            // Add the IDs of extensions you want installed when the container is created.
+            "extensions": [
+                "cweijan.vscode-database-client2",
+                "dbaeumer.vscode-eslint",
+                "eamodio.gitlens",
+                "EditorConfig.EditorConfig",
+                "esbenp.prettier-vscode",
+                "SonarSource.sonarlint-vscode",
+                "VASubasRaj.flashpost", // Thunder Client is paywalled in WSL/Codespaces/SSH > 2.30.0
+                "ZihanLi.at-helper"
+            ]
+        }
+    },
+
+    // Use 'forwardPorts' to make a list of ports inside the container available locally.
+    "forwardPorts": [1200, 3000],
+
+    "portsAttributes": {
+        "1200": {
+            "label": "app port",
+            "onAutoForward": "notify"
+        },
+        "3000": {
+            "label": "docs port",
+            "onAutoForward": "notify"
+        }
+    },
+
+    "onCreateCommand": "sudo apt-get update && export DEBIAN_FRONTEND=noninteractive && sudo apt-get -y install --no-install-recommends ca-certificates fonts-liberation libasound2 libatk-bridge2.0-0 libatk1.0-0 libatspi2.0-0 libcairo2 libcups2 libdbus-1-3 libexpat1 libgbm1 libglib2.0-0 libnspr4 libnss3 libpango-1.0-0 libx11-6 libxcb1 libxcomposite1 libxdamage1 libxext6 libxfixes3 libxkbcommon0 libxrandr2 wget xdg-utils redis-server default-jre-headless && sudo apt-get autoremove -y && sudo apt-get clean -y && sudo rm -rf /var/lib/apt/lists/*",
+
+    "updateContentCommand": "export JAVA_HOME=/usr/lib/jvm/default-java && pnpm config set store-dir ~/.local/share/pnpm/store && pnpm i && pnpm rb && pnpx rebrowser-puppeteer browsers install chrome",
+
+    // Use 'postCreateCommand' to run commands after the container is created.
+    "postCreateCommand": "pnpm i && pnpm rb && pnpx rebrowser-puppeteer browsers install chrome",
+
+    // Disable auto start dev env since codespaces sometimes fails to attach to the terminal
+    // "postAttachCommand": {
+    //     "app": "pnpm i",
+    //     // "docs": "pnpm -C website start"
+    // },
+
+    // Comment out to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
+    "remoteUser": "node",
+    "features": {
+        "ghcr.io/devcontainers/features/docker-in-docker": {
+            "version": "latest"
+        },
+        "ghcr.io/devcontainers/features/github-cli": {
+            "version": "latest"
+        }
+    }
+}

.dockerignore

@@ -1,35 +1,46 @@
+# folders
+.devcontainer
 .github
+.husky
 .idea
+.idx
 .vscode
-Dockerfile*
-LICENSE
-Procfile
 app-minimal
-assets
 coverage
-docs
+eslint-plugins
 node_modules
 test
+
+# files
 .codecov.yml
 .dockerignore
 .editorconfig
 .env
 .eslint*
 .gitignore
+.gitpod.yml
+.markdownlint.jsonc
 .prettier*
 .(yarn|npm|nvm)rc
 *.md
+Dockerfile*
+LICENSE
 app.json
+eslint.config.mjs
 docker-compose*
+fly.toml
 jsconfig.json
 npm-debug.log
 process.json
 package-lock.json
+vitest.config.ts
 vercel.json
 
-#git but keep the git commit hash
+# git but keep the git commit hash
 .git/logs
-.git/objects
 .git/index
 .git/info
 .git/hooks
+
+# rsshub auxiliary files
+lib/routes/**/radar.js

.github/ISSUE_TEMPLATE/bug_report_en.yml

@@ -6,15 +6,15 @@ body:
   - type: markdown
     attributes:
       value: |
-        Please ensure you have read [documentation](https://docs.rsshub.app/en), and provide all the information required by this template, otherwise the issue will be closed immediately.
-        Due to the anti-crawling policy implemented by certain websites, some RSS routes provided by the demo will return status code 403. This is not an issue caused by RSSHub and please do not report it.
+        Please ensure you have read [documentation](https://docs.rsshub.app/), and provide all the information required by this template, otherwise the issue will be closed immediately.
+        Due to the anti-crawling policy implemented by certain websites, some RSS routes provided by the demo will return status code 403 or fetch failed. This is not an issue caused by RSSHub and please do not report it.
 
   - type: textarea
     id: routes
     attributes:
       label: Routes
       description: The involved route, without any parameters, copied directly from the docs "route" field, one link per line. Use `NOROUTE` if it is not route related.
-      placeholder: /rsshub/someroute/:type?
+      placeholder: /someroute/:type?
       render: routes
     validations:
       required: true
@@ -24,7 +24,7 @@ body:
     attributes:
       label: Full routes
       description: The involved route, with all required and optional parameters, and could be duplicate if necessary (different parameters)
-      placeholder: /rsshub/routes/1234?some_extension=mode
+      placeholder: /routes/1234?some_extension=mode
       render: fullroutes
     validations:
       required: true
@@ -58,16 +58,16 @@ body:
       label: Deployment information
       multiple: false
       options:
-        - RSSHub demo (https://rsshub.app)
         - Self-hosted
+        - RSSHub demo (https://rsshub.app)
     validations:
       required: true
 
   - type: input
     id: deploy-info
     attributes:
       label: Deployment information (for self-hosted)
-      description: Please provide your OS, node version and docker version(if applicable)
+      description: Please provide your OS, node version, docker version and environment variables (if applicable)
       placeholder: 'OS: Linux, Node: v10.15.3, Docker: v19.03.13'
 
   - type: textarea

.github/ISSUE_TEMPLATE/bug_report_zh.yml

@@ -7,14 +7,14 @@ body:
     attributes:
       value: |
         请确保已阅读 [文档](https://docs.rsshub.app) 内相关部分，并按照模版提供信息，否则 issue 将被立即关闭。
-        由于部分源网站反爬缘故，演示地址一些 RSS 会返回 status code 403，该问题不是 RSSHub 所致，请勿提交 issue。
+        由于部分源网站反爬缘故，演示地址一些 RSS 会返回 status code 403 或 fetch failed，该问题不是 RSSHub 所致，请勿提交 issue。
 
   - type: textarea
     id: routes
     attributes:
       label: 路由地址
-      description: 不包含参数，复制文档路由参数，一行一个，不要重复。如果和路由没有关系，请写`NOROUTE`
-      placeholder: /rsshub/someroute/:type?
+      description: 不包含参数，复制文档路由参数，一行一个，不要重复。如果和路由没有关系，请写 `NOROUTE`
+      placeholder: /someroute/:type?
       render: routes
     validations:
       required: true
@@ -24,7 +24,7 @@ body:
     attributes:
       label: 完整路由地址
       description: 包含所有必选与可选参数，一行一个，可以有重复路由不同参数（如果需要）
-      placeholder: /rsshub/routes/1234?some_extension=mode
+      placeholder: /routes/1234?some_extension=mode
       render: fullroutes
     validations:
       required: true
@@ -58,8 +58,8 @@ body:
       label: 部署
       multiple: false
       options:
-        - RSSHub 演示 (https://rsshub.app)
         - 自建
+        - RSSHub 演示 (https://rsshub.app)
     validations:
       required: true
 
@@ -68,8 +68,8 @@ body:
     attributes:
       label: 部署相关信息
       description: |
-        请提供您的操作系统、node 版本和（如果适用） docker 版本。
-        请确保您部署的是[主线 master 分支](https://github.com/DIYgod/RSSHub/tree/master)最新版 RSSHub。
+        请提供您的操作系统、node 版本、（如果适用） docker 版本和环境变量。
+        请确保您部署的是 [主线 master 分支](https://github.com/DIYgod/RSSHub/tree/master) 最新版 RSSHub。
       placeholder: 'OS: Linux, Node: v10.15.3, Docker: v19.03.13'
 
   - type: textarea
@@ -86,5 +86,5 @@ body:
     attributes:
       label: 这不是重复的 issue
       options:
-        - label: 我已经搜索了[现有 issue](https://github.com/DIYgod/RSSHub/issues)，以确保该错误尚未被报告。
+        - label: 我已经搜索了 [现有 issue](https://github.com/DIYgod/RSSHub/issues)，以确保该错误尚未被报告。
           required: true

.github/ISSUE_TEMPLATE/feature_request_en.yml

@@ -7,7 +7,7 @@ body:
   - type: markdown
     attributes:
       value: |
-        Please ensure the feature requested is not listed in [documentation](https://docs.rsshub.app/en) or [issue](https://github.com/DIYgod/RSSHub/issues), and is not a [new RSS proposal](https://github.com/DIYgod/RSSHub/issues/new?assignees=&labels=RSS+proposal&template=rss_request_en.yml), and provide all the information required by this template.
+        Please ensure the feature requested is not listed in [documentation](https://docs.rsshub.app/) or [issue](https://github.com/DIYgod/RSSHub/issues), and is not a [new RSS proposal](https://github.com/DIYgod/RSSHub/issues/new?assignees=&labels=RSS+proposal&template=rss_request_en.yml), and provide all the information required by this template.
         Otherwise the issue will be closed immediately.
 
   - type: textarea
@@ -35,7 +35,7 @@ body:
   - type: checkboxes
     id: terms
     attributes:
-      label: This is not a duplicated feature request
+      label: This is not a duplicated feature request or new RSS proposal
       options:
-        - label: I have searched [existing issues](https://github.com/DIYgod/RSSHub/issues) to ensure this feature has not already been requested
+        - label: I have searched [existing issues](https://github.com/DIYgod/RSSHub/issues) to ensure this feature has not already been requested and this is not a [new RSS proposal](https://github.com/DIYgod/RSSHub/issues/new?assignees=&labels=RSS+proposal&template=rss_request_en.yml).
           required: true

.github/ISSUE_TEMPLATE/feature_request_zh.yml

@@ -7,7 +7,7 @@ body:
   - type: markdown
     attributes:
       value: |
-        请确保 [文档](https://docs.rsshub.app) 和 [Issue](https://github.com/DIYgod/RSSHub/issues) 中没有相关内容及不是[新的 RSS 提案](https://github.com/DIYgod/RSSHub/issues/new?assignees=&labels=RSS+proposal&template=rss_request_zh.yml)，并按照模版提供信息，
+        请确保 [文档](https://docs.rsshub.app) 和 [Issue](https://github.com/DIYgod/RSSHub/issues) 中没有相关内容及不是 [新的 RSS 提案](https://github.com/DIYgod/RSSHub/issues/new?assignees=&labels=RSS+proposal&template=rss_request_zh.yml)，并按照模版提供信息，
         否则 issue 将被立即关闭。
 
   - type: textarea
@@ -35,7 +35,7 @@ body:
   - type: checkboxes
     id: terms
     attributes:
-      label: 这不是重复的功能请求
+      label: 这不是重复的功能请求和 RSS 提案
       options:
-        - label: 我已经搜索了[现有 issue](https://github.com/DIYgod/RSSHub/issues)，以确保这项功能尚未被请求。
+        - label: 我已经搜索了 [现有 issue](https://github.com/DIYgod/RSSHub/issues)，以确保这项功能尚未被请求及不是 [新的 RSS 提案](https://github.com/DIYgod/RSSHub/issues/new?assignees=&labels=RSS+proposal&template=rss_request_zh.yml)。
           required: true

.github/ISSUE_TEMPLATE/rss_request_en.yml

@@ -1,4 +1,4 @@
-name: 🍰 RSS Proposal
+name: 🧡 RSS Proposal
 description: Submit a new RSS proposal
 labels: ['RSS proposal']
 
@@ -7,10 +7,10 @@ body:
   - type: markdown
     attributes:
       value: |
-        Please ensure the RSS proposal is not listed in [documentation](https://docs.rsshub.app/en) or [issue](https://github.com/DIYgod/RSSHub/issues), website doesn't provide this kind of RSS feed, and provide all the information required by this template.
+        Please ensure the RSS proposal is not listed in [documentation](https://docs.rsshub.app/) or [issue](https://github.com/DIYgod/RSSHub/issues), website doesn't provide this kind of RSS feed, and provide all the information required by this template.
         Otherwise the issue will be closed immediately.
 
-        We are flooded with feature requests and short-handed, please try to make it yourself, the [guide](https://docs.rsshub.app/en/joinus) is a good place to start. Submit a pull request when done!
+        We are flooded with feature requests and short-handed, please try to make it yourself, the [guide](https://docs.rsshub.app/joinus) is a good place to start. Submit a pull request when done!
 
   - type: dropdown
     id: category
@@ -27,7 +27,7 @@ body:
         - Design
         - Live
         - Multimedia
-        - Pciture
+        - Picture
         - ACG
         - Application Updates
         - University