Skip to content

Commit fee1307

Browse files
pull[bot]pull[bot]
authored
Merge pull request #898 from DIYgod/master
[pull] master from diygod:master
2 parents affd6d7 + c5d6b6b commit fee1307

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+4317
-1523
lines changed

‎.devcontainer/devcontainer.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
"esbenp.prettier-vscode",
1818
"deepscan.vscode-deepscan",
1919
"rangav.vscode-thunder-client",
20+
"SonarSource.sonarlint-vscode",
2021
"ZihanLi.at-helper"
2122
]
2223
}

‎.github/FUNDING.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# These are supported funding model platforms
22
github: DIYgod
3+
open_collective: RSSHub
34
patreon: DIYgod
45
custom: ['https://afdian.net/@diygod', 'https://diygod.me/images/zfb.jpg', 'https://diygod.me/images/wx.jpg']

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<!--
2-
如有疑问，请参考 https://github.com/DIYgod/RSSHub/discussions/8002
3-
Reference: https://github.com/DIYgod/RSSHub/discussions/8002
2+
如有疑问，请参考 https://docs.rsshub.app/joinus/new-rss/submit-route.html
3+
Reference: https://docs.rsshub.app/en/joinus/new-rss/submit-route.html
44
-->
55

6-
## 该 PR 相关 Issue / Involved issue
6+
## 该 PR 相关 Issue / Involved Issue
77

88
Close #
99

10-
## 路由地址示例 / Example for the proposed route(s)
10+
## 路由地址示例 / Example for the Proposed Route(s)
1111

1212
<!--
1313
请在 `routes` 区域填写以 / 开头的完整路由地址，否则你的 PR 将会被无条件关闭。
@@ -21,13 +21,13 @@ Please include route starts with /, with all required and optional parameters. F
2121
/use/the/fenced/code/block/below
2222
```
2323
如果你的 PR 与路由无关, 请在 `routes` 区域 填写 `NOROUTE`，而不是直接删除 `routes` 区域。否则你的 PR 将会被无条件关闭。
24-
If your changes are not related to route, please fill in `routes` with `NOROUTE`. Fail to comply will result in your PR being closed.
24+
If your changes are not related to route, please fill in `routes` section with `NOROUTE`. Fail to comply will result in your PR being closed.
2525
-->
2626

2727
```routes
2828
```
2929

30-
## 新 RSS 检查列表 / New RSS Script Checklist
30+
## 新 RSS 路由检查表 / New RSS Route Checklist
3131

3232
- [ ] 新的路由 New Route
3333
- [ ] 跟随 [v2 路由规范](https://docs.rsshub.app/joinus/script-standard.html) Follows [v2 Script Standard](https://docs.rsshub.app/en/joinus/script-standard.html)

‎.gitpod.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ vscode:
3131
- esbenp.prettier-vscode
3232
- deepscan.vscode-deepscan
3333
- rangav.vscode-thunder-client
34-
- TabNine.tabnine-vscode
34+
- sonarsource.sonarlint-vscode
3535
# - ZihanLi.at-helper not available on Open VSX
3636

3737
github:

‎.markdownlint.jsonc‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"MD007": { "indent": 4 }, // ul-indent - Unordered list indentation
3+
"MD013": false, // line-length - Line length
4+
"MD014": false, // commands-show-output - Dollar signs used before commands without showing output
5+
"MD024": { "siblings_only": true }, // no-duplicate-heading/no-duplicate-header - Multiple headings with the same content
6+
"MD030": { "ul_single": 3, "ol_single": 2, "ul_multi": 3, "ol_multi": 2 }, // list-marker-space - Spaces after list markers
7+
"MD033": false, // no-inline-html - Inline HTML
8+
"MD036": false, // no-emphasis-as-heading/no-emphasis-as-header - Emphasis used instead of a heading
9+
"MD040": false, // fenced-code-language - Fenced code blocks should have a language specified
10+
"MD051": false // link-fragments - Link fragments should be valid
11+
}

‎README.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<p align="center">
2-
<img src="https://i.loli.net/2019/04/23/5cbeb7e41414c.png" alt="RSSHub" width="100">
2+
<img src="https://docs.rsshub.app/logo.png" alt="RSSHub" width="100">
33
</p>
44
<h1 align="center">RSSHub</h1>
55

@@ -87,6 +87,7 @@ You can support RSSHub via donations.
8787
Recurring donors will be rewarded via express issue response, or even have your name displayed on our GitHub page and website.
8888

8989
- Become a Sponser on [GitHub](https://github.com/sponsors/DIYgod)
90+
- Become a Sponser on [Open Collective](https://opencollective.com/RSSHub)
9091
- Become a Sponser on [Patreon](https://www.patreon.com/DIYgod)
9192
- Become a Sponser on [爱发电](https://afdian.net/@diygod)
9293
- Contact us directly: i@diygod.me

‎docs/.vuepress/config.js‎

Lines changed: 130 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ module.exports = {
4646
anchor: {
4747
level: 999, // Disable original Plugin
4848
},
49+
lineNumbers: true,
4950
extendMarkdown: (md) => {
5051
md.use(require('../.format/md/hierarchySlug'), {
5152
slugify(s) {
@@ -83,6 +84,7 @@ module.exports = {
8384
editLinks: true,
8485
docsDir: 'docs',
8586
smoothScroll: true,
87+
logo: '/logo.png',
8688
locales: {
8789
'/': {
8890
lang: 'zh-CN',
@@ -92,6 +94,70 @@ module.exports = {
9294
lastUpdated: '上次更新',
9395
nav: require('./nav/zh'),
9496
sidebar: {
97+
'/joinus/': [
98+
{
99+
title: '👥 参与我们',
100+
path: '/joinus/quick-start.html',
101+
},
102+
{
103+
title: '📰 提交新的 RSSHub 规则',
104+
path: '/joinus/new-rss/prerequisites.html',
105+
collapsable: false,
106+
children: [
107+
{
108+
title: '🔑 准备工作',
109+
path: 'new-rss/prerequisites',
110+
},
111+
{
112+
title: '💡 开始之前',
113+
path: 'new-rss/before-start',
114+
},
115+
{
116+
title: '🚀 制作自己的 RSSHub 路由',
117+
path: 'new-rss/start-code',
118+
},
119+
{
120+
title: '📖 添加文档',
121+
path: 'new-rss/add-docs',
122+
},
123+
{
124+
title: '📤 提交路由',
125+
path: 'new-rss/submit-route',
126+
},
127+
],
128+
},
129+
{
130+
title: '📡 提交新的 RSSHub Radar 规则',
131+
path: '/joinus/new-radar.html',
132+
},
133+
{
134+
title: '💪 高级用法',
135+
path: '/joinus/advanced-feed.html',
136+
collapsable: false,
137+
children: [
138+
{
139+
title: '🎧 制作多媒体 RSS 订阅源',
140+
path: 'advanced-feed',
141+
},
142+
{
143+
title: '📜 路由规范',
144+
path: 'script-standard',
145+
},
146+
{
147+
title: '💾 使用缓存',
148+
path: 'use-cache',
149+
},
150+
{
151+
title: '🗓️ 日期处理',
152+
path: 'pub-date',
153+
},
154+
{
155+
title: '🐛 调试',
156+
path: 'debug',
157+
},
158+
],
159+
},
160+
],
95161
'/': [
96162
{
97163
title: '指南',
@@ -139,6 +205,70 @@ module.exports = {
139205
lastUpdated: 'Last Updated',
140206
nav: require('./nav/en'),
141207
sidebar: {
208+
'/en/joinus/': [
209+
{
210+
title: '👥 Join Us',
211+
path: '/en/joinus/quick-start.html',
212+
},
213+
{
214+
title: '📰 New RSSHub rules',
215+
path: '/en/joinus/new-rss/prerequisites.html',
216+
collapsable: false,
217+
children: [
218+
{
219+
title: '🔑 Prerequisites',
220+
path: 'new-rss/prerequisites',
221+
},
222+
{
223+
title: '💡 Just before you start',
224+
path: 'new-rss/before-start',
225+
},
226+
{
227+
title: '🚀 Create your own RSSHub route',
228+
path: 'new-rss/start-code',
229+
},
230+
{
231+
title: '📖 Add documentation',
232+
path: 'new-rss/add-docs',
233+
},
234+
{
235+
title: '📤 Submit your route',
236+
path: 'new-rss/submit-route',
237+
},
238+
],
239+
},
240+
{
241+
title: '📡 New Radar Rules',
242+
path: '/en/joinus/new-radar.html',
243+
},
244+
{
245+
title: '💪 Advanced',
246+
path: '/en/joinus/advanced-feed.html',
247+
collapsable: false,
248+
children: [
249+
{
250+
title: '🎧 Create a Rich Media RSS Feed',
251+
path: 'advanced-feed',
252+
},
253+
{
254+
title: '📜 Script Standard',
255+
path: 'script-standard',
256+
},
257+
{
258+
title: '💾 Caching',
259+
path: 'use-cache',
260+
},
261+
{
262+
title: '🗓️ Date Handling',
263+
path: 'pub-date',
264+
},
265+
{
266+
title: '🐛 Debugging',
267+
path: 'debug',
268+
},
269+
],
270+
},
271+
],
142272
'/en/': [
143273
{
144274
title: 'Guide',

‎docs/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ RSSHub 是一个开源、简单易用、易于扩展的 RSS 生成器，可以
3030
### Special Sponsors
3131

3232
<div style="margin: 30px 50px 20px 0;">
33-
<a href="https://rss3.io/" target="_blank"><img alt="RSS3" height="50px" src="https://i.imgur.com/vHtI4bz.png"></a>
33+
<a href="https://rss3.io" target="_blank"><img alt="RSS3" height="50px" src="https://i.imgur.com/vHtI4bz.png"></a>
3434
</div>
3535

3636
[![](https://opencollective.com/static/images/become_sponsor.svg)](/support/)

‎docs/en/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ RSSHub can be used with browser extension [RSSHub Radar](https://github.com/DIYg
3030
### Special Sponsors
3131

3232
<div style="margin: 30px 50px 20px 0;">
33-
<a href="https://rss3.io/" target="_blank"><img alt="RSS3" height="50px" src="https://i.imgur.com/vHtI4bz.png"></a>
33+
<a href="https://rss3.io" target="_blank"><img alt="RSS3" height="50px" src="https://i.imgur.com/vHtI4bz.png"></a>
3434
</div>
3535

3636
[![](https://opencollective.com/static/images/become_sponsor.svg)](/en/support/)

‎docs/en/api.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Parameters:
2020

2121
- `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**.
2222

23-
A successful request returns a HTTP status code `200 OK` with the result in JSON:
23+
A successful request returns an HTTP status code `200 OK` with the result in JSON:
2424

2525
```js
2626
{
@@ -39,4 +39,4 @@ A successful request returns a HTTP status code `200 OK` with the result in JSON
3939
}
4040
```
4141

42-
If no matching results were found, the server returns only a HTTP status code `204 No Content`.
42+
If no matching results were found, the server returns only an HTTP status code `204 No Content`.

0 commit comments

Comments
 (0)