Revert "fetch upstream (#7)"

This reverts commit 14de1fd.
RikkaBlue · Apr 4, 2022 · a1d87e7 · a1d87e7
1 parent 14de1fd
commit a1d87e7
Show file tree

Hide file tree

Showing 199 changed files with 1,147 additions and 3,896 deletions.
diff --git a/.github/workflows/build-assets.yml b/.github/workflows/build-assets.yml
@@ -15,7 +15,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
       - name: Use Node.js v14
-        uses: actions/setup-node@v3.1.0
+        uses: actions/setup-node@v3.0.0
         with:
           node-version: '14'
           cache: 'yarn'

diff --git a/.github/workflows/docker-release.yml b/.github/workflows/docker-release.yml
@@ -63,16 +63,3 @@ jobs:
           platforms: linux/amd64,linux/arm/v7,linux/arm64
           cache-from: type=gha,scope=docker-release
           cache-to: type=gha,mode=max,scope=docker-release
-  description:
-    runs-on: ubuntu-latest
-    needs: check-env
-    if: needs.check-env.outputs.check-docker == 'true'
-    steps:
-    - uses: actions/checkout@v3
-
-    - name: Docker Hub Description
-      uses: peter-evans/dockerhub-description@v3
-      with:
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-        repository: ${{ secrets.DOCKER_USERNAME }}/rsshub
diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml
@@ -12,7 +12,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3.1.0
+      - uses: actions/setup-node@v3.0.0
         with:
           node-version: '14'
           cache: 'yarn'

diff --git a/.github/workflows/npm-publish.yml b/.github/workflows/npm-publish.yml
@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3.1.0
+      - uses: actions/setup-node@v3.0.0
         with:
           node-version: '14'
           cache: 'yarn'

diff --git a/.github/workflows/pr-lint.yml b/.github/workflows/pr-lint.yml
@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3.1.0
+      - uses: actions/setup-node@v3.0.0
         with:
           node-version: '14'
           cache: 'yarn'

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -17,7 +17,7 @@ jobs:
     name: Jest on Node ${{ matrix.node-version }}
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3.1.0
+      - uses: actions/setup-node@v3.0.0
         with:
           node-version: ${{ matrix.node-version }}
           cache: 'yarn'
@@ -38,7 +38,7 @@ jobs:
     name: Build docs on Node ${{ matrix.node-version }}
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3.1.0
+      - uses: actions/setup-node@v3.0.0
         with:
           node-version: ${{ matrix.node-version }}
           cache: 'yarn'
@@ -54,7 +54,7 @@ jobs:
     name: Build radar and maintainer on Node ${{ matrix.node-version }}
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3.1.0
+      - uses: actions/setup-node@v3.0.0
         with:
           node-version: ${{ matrix.node-version }}
           cache: 'yarn'

diff --git a/README.md b/README.md
@@ -5,10 +5,9 @@
 
 > 🍰 Everything is RSSible
 
-[![telegram](https://img.shields.io/badge/chat-telegram-brightgreen.svg?logo=telegram&style=flat-square)](https://t.me/rsshub)
-[![npm publish](https://img.shields.io/github/workflow/status/DIYgod/RSSHub/publish/master?label=npm%20publish&logo=npm&style=flat-square)](https://www.npmjs.com/package/rsshub)
-[![docker publish](https://img.shields.io/github/workflow/status/DIYgod/RSSHub/%5Bdocker%5D%20CI%20for%20releases/master?label=docker%20publish&logo=docker&style=flat-square)](https://hub.docker.com/r/diygod/rsshub)
-[![test](https://img.shields.io/github/workflow/status/DIYgod/RSSHub/test/master?label=test&logo=github&style=flat-square)](https://github.com/DIYgod/RSSHub/actions/workflows/test.yml?query=event%3Apush+branch%3Amaster)
+[![telegram](https://img.shields.io/badge/chat-telegram-brightgreen.svg?style=flat-square)](https://t.me/rsshub)
+[![build status](https://img.shields.io/travis/DIYgod/RSSHub/master.svg?style=flat-square)](https://travis-ci.org/DIYgod/RSSHub)
+[![Test coverage](https://img.shields.io/codecov/c/github/DIYgod/RSSHub.svg?style=flat-square)](https://codecov.io/github/DIYgod/RSSHub?branch=master)
 
 ## Introduction
 

diff --git a/docs/.vuepress/components/Route.vue b/docs/.vuepress/components/Route.vue
@@ -15,8 +15,7 @@
   <div v-if="path.match(/:.*?(\/|$)/g)">
   <p>
     参数:
-  </p>
-  <ul><li class="params" v-for="(item, index) in path.match(/:.*?(\/|$)/g)"><code>{{item.replace(':','').replace('/','').replace('?','')}}</code>, {{(item.includes('?'))?'可选':'必选'}} - <span v-html="renderMarkdown(paramsDesc[index])"></span></li></ul>
+  <ul><li class="params" v-for="(item, index) in path.match(/:.*?(\/|$)/g)">{{item.replace(':','').replace('/','').replace('?','')}}, {{(item.includes('?'))?'可选':'必选'}} - <span v-html="renderMarkdown(paramsDesc[index])"></span></li></ul> </p>
   </div>
   <div v-else><p>参数: 无</p></div>
   <slot></slot>
@@ -71,11 +70,11 @@ export default {
     },
   },
   methods: {
-    renderMarkdown(item, inline = true) {
+    renderMarkdown(item) {
     const md = require('markdown-it')({
             html: true,
     });
-        return inline ? md.renderInline(item) : md.render(item);
+        return md.render(item);
     },
   },
   computed: {

diff --git a/docs/.vuepress/components/RouteEn.vue b/docs/.vuepress/components/RouteEn.vue
@@ -15,8 +15,7 @@
   <div v-if="path.match(/(?<=:).*?(?=\/|$)/g)">
   <p>
     Parameters:
-  </p>
-  <ul><li class="params" v-for="(item, index) in path.match(/(?<=:).*?(?=\/|$)/g)"><code>{{item.replace('?','')}}</code>, {{(item.includes('?'))?'optional':'required'}} - <span v-html="renderMarkdown(paramsDesc[index])"></span></li></ul>
+  <ul><li class="params" v-for="(item, index) in path.match(/(?<=:).*?(?=\/|$)/g)">{{item.replace('?','')}}, {{(item.includes('?'))?'optional':'required'}} - <span v-html="renderMarkdown(paramsDesc[index])"></span></li></ul> </p>
   </div>
   <div v-else><p>Parameters: N/A</p></div>
   <slot></slot>
@@ -67,11 +66,11 @@ export default {
     },
   },
   methods: {
-    renderMarkdown(item, inline = true) {
+    renderMarkdown(item) {
     const md = require('markdown-it')({
             html: true,
     });
-        return inline ? md.renderInline(item) : md.render(item);
+        return md.render(item);
     },
   },
   computed: {

diff --git a/docs/README.md b/docs/README.md
@@ -11,10 +11,9 @@ sidebarDepth: 0
 
 > 🍰 万物皆可 RSS
 
-[![telegram](https://img.shields.io/badge/chat-telegram-brightgreen.svg?logo=telegram\&style=flat-square)](https://t.me/rsshub)
-[![npm publish](https://img.shields.io/github/workflow/status/DIYgod/RSSHub/publish/master?label=npm%20publish\&logo=npm\&style=flat-square)](https://www.npmjs.com/package/rsshub)
-[![docker publish](https://img.shields.io/github/workflow/status/DIYgod/RSSHub/%5Bdocker%5D%20CI%20for%20releases/master?label=docker%20publish\&logo=docker\&style=flat-square)](https://hub.docker.com/r/diygod/rsshub)
-[![test](https://img.shields.io/github/workflow/status/DIYgod/RSSHub/test/master?label=test\&logo=github\&style=flat-square)](https://github.com/DIYgod/RSSHub/actions/workflows/test.yml?query=event%3Apush+branch%3Amaster)
+[![telegram](https://img.shields.io/badge/chat-telegram-brightgreen.svg?style=flat-square)](https://t.me/rsshub)
+[![build status](https://img.shields.io/travis/DIYgod/RSSHub/master.svg?style=flat-square)](https://travis-ci.org/DIYgod/RSSHub)
+[![Test coverage](https://img.shields.io/codecov/c/github/DIYgod/RSSHub.svg?style=flat-square)](https://codecov.io/github/DIYgod/RSSHub?branch=master)
 
 RSSHub 是一个开源、简单易用、易于扩展的 RSS 生成器，可以给任何奇奇怪怪的内容生成 RSS 订阅源。RSSHub 借助于开源社区的力量快速发展中，目前已适配数百家网站的上千项内容
 

diff --git a/docs/api.md b/docs/api.md
@@ -1,10 +1,10 @@
-# API
+# API 接口
 
 ::: warning 注意
 API 仍处于开发状态中， 并可能会有改动。欢迎提供建议！
 :::
 
-RSSHub 提供下列 API:
+RSSHub 提供下列 API 接口:
 
 ### 可用公共路由列表
 
@@ -18,7 +18,7 @@ RSSHub 提供下列 API:
 
 参数:
 
--   `name`, 路由一级名称，对应 <https://github.com/DIYgod/RSSHub/tree/master/lib/routes> 中的文件夹名称。可选，**缺省则返回所有可用路由**.
+-   name, 路由一级名称，对应 <https://github.com/DIYgod/RSSHub/tree/master/lib/routes> 中的文件夹名称。可选，**缺省则返回所有可用路由**.
 
 成功请求将会返回 HTTP 状态码 `200 OK` 与 JSON 结果，格式如下:
 

diff --git a/docs/bbs.md b/docs/bbs.md
@@ -218,6 +218,16 @@ pageClass: routes
 
 <Route author="xyqfer" example="/nga/post/18449558" path="/nga/post/:tid"  :paramsDesc="['帖子 id, 可在帖子 URL 找到']" radar="1" rssbud="1"/>
 
+## Quicker
+
+### 讨论区
+
+<Route author="Cesaryuan" example="/quicker/qa" path="/quicker/qa"/>
+
+### 用户动作更新
+
+<Route author="Cesaryuan" example="/quicker/user/action/18359/Cesaryuan" path="/quicker/user/action/:uid/:person" :paramsDesc="['用户ID，可在用户主页链接里找到', '用户昵称，可在用户主页链接里找到']" />
+
 ## RF 技术社区
 
 ### 文章
@@ -346,43 +356,47 @@ pageClass: routes
 
 ## 虎扑
 
-### 首页
-
-<Route author="nczitzk" example="/hupu/nba" path="/hupu/:category?" :paramsDesc="['分类，见下表']">
-
-| NBA | CBA | 足球     |
-| --- | --- | ------ |
-| nba | cba | soccer |
-
-::: tip 提示
+### 虎扑 BBS 论坛
 
-电竞分类参见 [游戏热帖](https://bbs.hupu.com/all-gg) 的对应路由 [`/hupu/all/all-gg`](https://rsshub.app/hupu/all/all-gg)。
+<Route author="LogicJake" example="/hupu/bbs/bxj/2" path="/hupu/bbs/:id/:order?" :paramsDesc="['板块 id，可在板块 URL 找到', '排序方式，1最新回帖（默认），2最新发帖，3精华帖']">
 
-:::
+此路由与旧的 `/hupu/bxj/:id/:order?` 等价，但推荐使用 `/hupu/bbs/:id/:order?`，旧路由可能会在未来被删除。
 
 </Route>
 
-### 社区
-
-<Route author="LogicJake nczitzk" example="/hupu/bbs/34" path="/hupu/bbs/:id?/:order?" :paramsDesc="['编号，可在对应社区 URL 中找到，默认为步行街', '排序方式，可选 `0` 即 最新回复 或 `1` 即 最新发布']">
+### 分类
 
-::: tip 提示
+<Route author="nczitzk" example="/hupu/all/gambia" path="/hupu/all/:caty" :paramsDesc="['分类名，见下表']">
 
-更多社区参见 [社区](https://m.hupu.com/bbs)
+| 分类     | 名称       |
+| ------ | -------- |
+| NBA 论坛 | nba      |
+| CBA 论坛 | cba      |
+| 运动和装备  | gear     |
+| 国际足球论坛 | soccer   |
+| 中国足球论坛 | csl      |
+| 综合体育   | sports   |
+| 步行街    | gambia   |
+| 彩票中心   | lottery  |
+| 自建版块   | boards   |
+| 虎扑社团   | group    |
+| 站务管理   | feedback |
 
-:::
+更多参见 [虎扑社区版块目录](https://bbs.hupu.com/boards.php) 左侧导航栏各板块分类页
 
 </Route>
 
-### 热帖
-
-<Route author="nczitzk" example="/hupu/all/topic-daily" path="/hupu/all/:id?" :paramsDesc="['编号，可在对应热帖版面 URL 中找到，默认为步行街每日话题']">
+### 子站
 
-::: tip 提示
+<Route author="nczitzk" example="/hupu/dept/nba" path="/hupu/dept/:dept" :paramsDesc="['名称，见下表']">
 
-更多热帖版面参见 [论坛](https://bbs.hupu.com)
-
-:::
+| 子站   | 名称           |
+| ---- | ------------ |
+| NBA  | nba          |
+| 国际足球 | soccer       |
+| 中国足球 | soccer-china |
+| CBA  | cba          |
+| 电竞   | gg           |
 
 </Route>
 

diff --git a/docs/en/README.md b/docs/en/README.md
@@ -11,10 +11,9 @@ sidebarDepth: 0
 
 > 🍰 Everything is RSSible
 
-[![telegram](https://img.shields.io/badge/chat-telegram-brightgreen.svg?logo=telegram&style=flat-square)](https://t.me/rsshub)
-[![npm publish](https://img.shields.io/github/workflow/status/DIYgod/RSSHub/publish/master?label=npm%20publish&logo=npm&style=flat-square)](https://www.npmjs.com/package/rsshub)
-[![docker publish](https://img.shields.io/github/workflow/status/DIYgod/RSSHub/%5Bdocker%5D%20CI%20for%20releases/master?label=docker%20publish&logo=docker&style=flat-square)](https://hub.docker.com/r/diygod/rsshub)
-[![test](https://img.shields.io/github/workflow/status/DIYgod/RSSHub/test/master?label=test&logo=github&style=flat-square)](https://github.com/DIYgod/RSSHub/actions/workflows/test.yml?query=event%3Apush+branch%3Amaster)
+[![telegram](https://img.shields.io/badge/chat-telegram-brightgreen.svg?style=flat-square)](https://t.me/rsshub)
+[![build status](https://img.shields.io/travis/DIYgod/RSSHub/master.svg?style=flat-square)](https://travis-ci.org/DIYgod/RSSHub)
+[![Test coverage](https://img.shields.io/codecov/c/github/DIYgod/RSSHub.svg?style=flat-square)](https://codecov.io/github/DIYgod/RSSHub?branch=master)
 
 RSSHub is an open source, easy to use, and extensible RSS feed aggregator, it's capable of generating RSS feeds from pretty much everything.
 

diff --git a/docs/en/api.md b/docs/en/api.md
@@ -18,7 +18,7 @@ Route: `/api/routes/:name?`
 
 Parameters:
 
--   `name`, route's top level name as in [https://github.com/DIYgod/RSSHub/tree/master/lib/routes](https://github.com/DIYgod/RSSHub/tree/master/lib/routes). Optional, **returns all public routes if not specified**.
+-   name, route's top level name as in [https://github.com/DIYgod/RSSHub/tree/master/lib/routes](https://github.com/DIYgod/RSSHub/tree/master/lib/routes). Optional, **returns all public routes if not specified**.
 
 A successful request returns a HTTP status code `200 OK` with the result in JSON:
 

diff --git a/docs/en/joinus/pub-date.md b/docs/en/joinus/pub-date.md
@@ -33,11 +33,15 @@ const pubDate = parseDate('2020/12/30', 'YYYY/MM/DD');
 
 If you need to parse a relative date, use `parseRelativeDate`.
 
+::: warning Warning
+Only works for relative date in Chinese for now
+:::
+
 ```javascript
 const { parseRelativeDate } = require('@/utils/parse-date');
 
-const pubDate = parseRelativeDate('2 days ago');
-const pubDate = parseRelativeDate('day before yesterday 15:36');
+const pubDate = parseRelativeDate('2天前');
+const pubDate = parseRelativeDate('前天 15:36');
 ```
 
 ### Timezone

diff --git a/docs/en/journal.md b/docs/en/journal.md
@@ -262,19 +262,9 @@ Subscribe to the cover images of the Nature journals, and get the latest publica
 
 ## PubMed
 
-### Trending articles
+### Trending
 
-<RouteEn author="yech1990 nczitzk" example="/pubmed/trending" path="/pubmed/trending/:filter?" :paramsDesc="['Filters, can be found in URL']" supportScihub="1">
-
-::: tip Tip
-
-For the parameter **filter**, the `filter` parameter in the URL should be split into a string by `,`, here is an example.
-
-In <https://pubmed.ncbi.nlm.nih.gov/trending/?filter=simsearch1.fha&filter=pubt.clinicaltrial&filter=pubt.randomizedcontrolledtrial>, the filter parameters are `simsearch1.fha`, `pubt.clinicaltrial`, and `pubt.randomizedcontrolledtrial`. Therefore, the filter corresponding to the route should be filled with `simsearch1.fha,pubt.clinicaltrial,pubt.randomizedcontrolledtrial`, and the route is [`/pubmed/trending/simsearch1.fha,pubt .clinicaltrial,pubt.randomizedcontrolledtrial`](https://rsshub.app/pubmed/trending/simsearch1.fha,pubt.clinicaltrial,pubt.randomizedcontrolledtrial)
-
-:::
-
-</RouteEn>
+<RouteEn author="yech1990" example="/pubmed/trending" path="/pubmed/trending" supportScihub="1"/>
 
 ## Science Journal