Skip to content

Commit ee862dd

Browse files
authored
Merge pull request #1028 from DIYgod/master
[pull] master from diygod:master
2 parents e12b8db + 6b03e49 commit ee862dd

File tree

135 files changed

+8915
-16123
lines changed

Some content is hidden

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

135 files changed

+8915
-16123
lines changed

.github/ISSUE_TEMPLATE/rss_request_en.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ body:
1010
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.
1111
Otherwise the issue will be closed immediately.
1212
13-
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!
13+
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!
1414
1515
- type: dropdown
1616
id: category

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 23 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,49 @@
11
<!--
2-
如有疑问,请参考 https://docs.rsshub.app/joinus/new-rss/submit-route
3-
Reference: https://docs.rsshub.app/en/joinus/new-rss/submit-route
2+
Reference: https://docs.rsshub.app/joinus/new-rss/submit-route
3+
如有疑问,请参考 https://docs.rsshub.app/zh/joinus/new-rss/submit-route
44
-->
55

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

88
Close #
99

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

1212
<!--
13+
Please include route starts with /, with all required and optional parameters.
14+
Fail to comply will result in your pull request being closed automatically.
1315
请在 `routes` 区域填写以 / 开头的完整路由地址,否则你的 PR 将会被无条件关闭。
1416
如果路由包含在文档中列出可以完全穷举的参数(例如分类),请依次全部列出。
1517
16-
Please include route starts with /, with all required and optional parameters. Fail to comply will result in your pull request being closed automatically.
1718
```route
1819
/some/route
1920
/some/other/route
2021
/dont/use/this/or/modify/it
2122
/use/the/fenced/code/block/below
2223
```
23-
如果你的 PR 与路由无关, 请在 `routes` 区域 填写 `NOROUTE`,而不是直接删除 `routes` 区域。否则你的 PR 将会被无条件关闭。
24+
2425
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.
26+
如果你的 PR 与路由无关, 请在 `routes` 区域 填写 `NOROUTE`,而不是直接删除 `routes` 区域。否则你的 PR 将会被无条件关闭。
2527
-->
2628

2729
```routes
2830
```
2931

30-
## RSS 路由检查表 / New RSS Route Checklist
32+
## New RSS Route Checklist / 新 RSS 路由检查表
3133

32-
- [ ] 新的路由 New Route
33-
- [ ] 跟随 [v2 路由规范](https://docs.rsshub.app/joinus/advanced/script-standard) Follows [v2 Script Standard](https://docs.rsshub.app/en/joinus/advanced/script-standard)
34-
- [ ] 文档说明 Documentation
35-
- [ ] 中文文档 CN
36-
- [ ] 英文文档 EN
37-
- [ ] 全文获取 full article
38-
- [ ] 使用缓存 Use cache
39-
- [ ] 反爬/频率限制 anti-bot or rate limit?
40-
- [ ] 如果有, 是否有对应的措施? If yes, do your code reflect this sign?
41-
- [ ] [日期和时间](https://docs.rsshub.app/joinus/advanced/pub-date) [date and time](https://docs.rsshub.app/en/joinus/advanced/pub-date)
42-
- [ ] 可以解析 Parsed
43-
- [ ] 时区正确 Correct time zone
44-
- [ ] 添加了新的包 New package added
34+
- [ ] New Route / 新的路由
35+
- [ ] Follows [v2 Script Standard](https://docs.rsshub.app/joinus/advanced/script-standard) / 跟随 [v2 路由规范](https://docs.rsshub.app/zh/joinus/advanced/script-standard)
36+
- [ ] Documentation / 文档说明
37+
- [ ] EN / 英文文档
38+
- [ ] CN / 中文文档
39+
- [ ] Full text / 全文获取
40+
- [ ] Use cache / 使用缓存
41+
- [ ] Anti-bot or rate limit / 反爬/频率限制
42+
- [ ] If yes, do your code reflect this sign? / 如果有, 是否有对应的措施?
43+
- [ ] [Date and time](https://docs.rsshub.app/joinus/advanced/pub-date) / [日期和时间](https://docs.rsshub.app/zh/joinus/advanced/pub-date)
44+
- [ ] Parsed / 可以解析
45+
- [ ] Correct time zone / 时区正确
46+
- [ ] New package added / 添加了新的包
4547
- [ ] `Puppeteer`
4648

47-
## 说明 / Note
49+
## Note / 说明

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ jobs:
118118

119119
docs:
120120
runs-on: ubuntu-latest
121-
timeout-minutes: 5
121+
timeout-minutes: 10
122122
strategy:
123123
fail-fast: false
124124
matrix:

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
## 请参见[参与我们](https://docs.rsshub.app/joinus/quick-start)
1+
## 请参见[参与我们](https://docs.rsshub.app/zh/joinus/quick-start)
22

3-
## Please refer to [Join Us](https://docs.rsshub.app/en/joinus/quick-start)
3+
## Please refer to [Join Us](https://docs.rsshub.app/joinus/quick-start)

README.md

Lines changed: 8 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,6 @@ RSSHub can be used with browser extension [RSSHub Radar](https://github.com/DIYg
2323

2424
[English docs](https://docs.rsshub.app/en) | [Telegram Group](https://t.me/rsshub) | [Telegram Channel](https://t.me/awesomeRSSHub)
2525

26-
---
27-
28-
RSSHub 是一个开源、简单易用、易于扩展的 RSS 生成器,可以给任何奇奇怪怪的内容生成 RSS 订阅源。RSSHub 借助于开源社区的力量快速发展中,目前已适配数百家网站的上千项内容
29-
30-
可以配合浏览器扩展 [RSSHub Radar](https://github.com/DIYgod/RSSHub-Radar) 和 移动端辅助 App [RSSBud](https://github.com/Cay-Zhang/RSSBud) (iOS) 与 [RSSAid](https://github.com/LeetaoGoooo/RSSAid) (Android) 食用
31-
3226
[中文文档](https://docs.rsshub.app) | [Telegram 群](https://t.me/rsshub) | [Telegram 频道](https://t.me/awesomeRSSHub)
3327

3428
## Special Thanks
@@ -39,7 +33,7 @@ RSSHub 是一个开源、简单易用、易于扩展的 RSS 生成器,可以
3933
<a href="https://xlog.app/" target="_blank"><img height="100px" src="https://i.imgur.com/JuhHTKD.png"></a>
4034
</p>
4135

42-
[![](https://opencollective.com/static/images/become_sponsor.svg)](https://docs.rsshub.app/en/support/)
36+
[![](https://opencollective.com/static/images/become_sponsor.svg)](https://docs.rsshub.app/support/)
4337

4438
### Contributors
4539

@@ -53,30 +47,24 @@ Logo designer [sheldonrrr](https://dribbble.com/sheldonrrr)
5347

5448
## Related Projects
5549

56-
- [RSSHub Radar](https://github.com/DIYgod/RSSHub-Radar) | 一个可以帮助你快速发现和订阅当前网站 RSS RSSHub 的浏览器扩展
57-
- [RSSBud](https://github.com/Cay-Zhang/RSSBud) ([TestFlight 公测](https://testflight.apple.com/join/rjCVzzHP)) | iOS 平台的 RSSHub Radar,专为移动生态优化
58-
- [RSSAid](https://github.com/LeetaoGoooo/RSSAid) | 基于 Flutter 构建的 Android 平台的 RSSHub Radar
50+
- [RSSHub Radar](https://github.com/DIYgod/RSSHub-Radar) | A browser extension that can help you quickly discover and subscribe to the RSS and RSSHub of current websites.
51+
- [RSSBud](https://github.com/Cay-Zhang/RSSBud) ([TestFlight](https://testflight.apple.com/join/rjCVzzHP)) | RSSHub Radar for iOS platform, designed specifically for mobile ecosystem optimization.
52+
- [RSSAid](https://github.com/LeetaoGoooo/RSSAid) | RSSHub Radar for Android platform built with Flutter.
5953
- [DocSearch](https://github.com/Fatpandac/DocSearch) | Link RSSHub DocSearch into Raycast
6054

6155
## Join Us
6256

6357
We welcome all pull requests. Suggestions and feedback are also welcomed [here](https://github.com/DIYgod/RSSHub/issues).
6458

65-
Refer to [Join Us](https://docs.rsshub.app/en/joinus/quick-start)
66-
67-
[参与我们](https://docs.rsshub.app/joinus/quick-start)
59+
Refer to [Join Us](https://docs.rsshub.app/joinus/quick-start)
6860

6961
## Deployment
7062

71-
Refer to [Deployment](https://docs.rsshub.app/en/install/)
72-
73-
[部署](https://docs.rsshub.app/install/)
63+
Refer to [Deployment](https://docs.rsshub.app/install/)
7464

7565
## Support RSSHub
7666

77-
Refer to [Support RSSHub](https://docs.rsshub.app/en/support/)
78-
79-
[支持 RSSHub](https://docs.rsshub.app/support/)
67+
Refer to [Support RSSHub](https://docs.rsshub.app/support/)
8068

8169
RSSHub is open source and completely free under the MIT license. However, just like any other open source project, as the project grows, the hosting, development and maintenance requires funding support.
8270

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

8977
- Become a Sponser on [GitHub](https://github.com/sponsors/DIYgod)
90-
- Become a Sponser on [Open Collective](https://opencollective.com/RSSHub)
9178
- Become a Sponser on [Patreon](https://www.patreon.com/DIYgod)
79+
- Become a Sponser on [Open Collective](https://opencollective.com/RSSHub)
9280
- Become a Sponser on [爱发电](https://afdian.net/@diygod)
9381
- Contact us directly: i@diygod.me
9482

assets/radar-rules.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@
100100
},
101101
'alter-shanghai.cn': { _name: 'Alter', '.': [{ title: '新闻', docs: 'https://docs.rsshub.app/routes/shopping#alter-zhong-guo', source: '/cn/news', target: '/alter-cn/news' }] },
102102
'itslide.com': { _name: 'ITSlide', www: [{ title: '最新', docs: 'https://docs.rsshub.app/routes/programming#itslide', source: '/*', target: '/itslide/new' }] },
103-
'leboncoin.fr': { _name: 'leboncoin', www: [{ title: 'ads', docs: 'https://docs.rsshub.app/routes/en/shopping#leboncoin', source: '/recherche', target: (params, url) => '/leboncoin/ad/' + url.split('?')[1] }] },
103+
'leboncoin.fr': { _name: 'leboncoin', www: [{ title: 'ads', docs: 'https://docs.rsshub.app/routes/shopping#leboncoin', source: '/recherche', target: (params, url) => '/leboncoin/ad/' + url.split('?')[1] }] },
104104
'yuancheng.work': {
105105
_name: '远程.work',
106106
'.': [
@@ -312,13 +312,13 @@
312312
'umass.edu': {
313313
_name: 'UMASS Amherst',
314314
ece: [
315-
{ title: 'ECE News', docs: 'http://docs.rsshub.app/en/routes/university#umass-amherst', source: '/news', target: '/umass/amherst/ecenews' },
316-
{ title: 'ECE Seminar', docs: 'http://docs.rsshub.app/en/routes/university#umass-amherst', source: '/seminars', target: '/umass/amherst/eceseminar' },
315+
{ title: 'ECE News', docs: 'http://docs.rsshub.app/routes/university#umass-amherst', source: '/news', target: '/umass/amherst/ecenews' },
316+
{ title: 'ECE Seminar', docs: 'http://docs.rsshub.app/routes/university#umass-amherst', source: '/seminars', target: '/umass/amherst/eceseminar' },
317317
],
318-
'www.cics': [{ title: 'CICS News', docs: 'http://docs.rsshub.app/en/routes/university#umass-amherst', source: '/news', target: '/umass/amherst/csnews' }],
318+
'www.cics': [{ title: 'CICS News', docs: 'http://docs.rsshub.app/routes/university#umass-amherst', source: '/news', target: '/umass/amherst/csnews' }],
319319
www: [
320-
{ title: 'IPO Events', docs: 'http://docs.rsshub.app/en/routes/university#umass-amherst', source: '/ipo/iss/events', target: '/umass/amherst/ipoevents' },
321-
{ title: 'IPO Featured Stories', docs: 'http://docs.rsshub.app/en/routes/university#umass-amherst', source: '/ipo/iss/featured-stories', target: '/umass/amherst/ipostories' },
320+
{ title: 'IPO Events', docs: 'http://docs.rsshub.app/routes/university#umass-amherst', source: '/ipo/iss/events', target: '/umass/amherst/ipoevents' },
321+
{ title: 'IPO Featured Stories', docs: 'http://docs.rsshub.app/routes/university#umass-amherst', source: '/ipo/iss/featured-stories', target: '/umass/amherst/ipostories' },
322322
],
323323
},
324324
'bjeea.com': {

lib/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ if (config.enableCluster && cluster.isMaster && process.env.NODE_ENV !== 'test'
2929
}
3030

3131
logger.info('🎉 RSSHub start! Cheers!');
32-
logger.info('💖 Can you help keep this open source project alive? Please sponsor 👉 https://docs.rsshub.app/en/support');
32+
logger.info('💖 Can you help keep this open source project alive? Please sponsor 👉 https://docs.rsshub.app/support');
3333

3434
module.exports = server;
3535
}

lib/radar-rules.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ module.exports = {
264264
www: [
265265
{
266266
title: 'ads',
267-
docs: 'https://docs.rsshub.app/routes/en/shopping#leboncoin',
267+
docs: 'https://docs.rsshub.app/routes/shopping#leboncoin',
268268
source: '/recherche',
269269
target: (params, url) => '/leboncoin/ad/' + url.split('?')[1],
270270
},
@@ -817,35 +817,35 @@ module.exports = {
817817
ece: [
818818
{
819819
title: 'ECE News',
820-
docs: 'http://docs.rsshub.app/en/routes/university#umass-amherst',
820+
docs: 'http://docs.rsshub.app/routes/university#umass-amherst',
821821
source: '/news',
822822
target: '/umass/amherst/ecenews',
823823
},
824824
{
825825
title: 'ECE Seminar',
826-
docs: 'http://docs.rsshub.app/en/routes/university#umass-amherst',
826+
docs: 'http://docs.rsshub.app/routes/university#umass-amherst',
827827
source: '/seminars',
828828
target: '/umass/amherst/eceseminar',
829829
},
830830
],
831831
'www.cics': [
832832
{
833833
title: 'CICS News',
834-
docs: 'http://docs.rsshub.app/en/routes/university#umass-amherst',
834+
docs: 'http://docs.rsshub.app/routes/university#umass-amherst',
835835
source: '/news',
836836
target: '/umass/amherst/csnews',
837837
},
838838
],
839839
www: [
840840
{
841841
title: 'IPO Events',
842-
docs: 'http://docs.rsshub.app/en/routes/university#umass-amherst',
842+
docs: 'http://docs.rsshub.app/routes/university#umass-amherst',
843843
source: '/ipo/iss/events',
844844
target: '/umass/amherst/ipoevents',
845845
},
846846
{
847847
title: 'IPO Featured Stories',
848-
docs: 'http://docs.rsshub.app/en/routes/university#umass-amherst',
848+
docs: 'http://docs.rsshub.app/routes/university#umass-amherst',
849849
source: '/ipo/iss/featured-stories',
850850
target: '/umass/amherst/ipostories',
851851
},

lib/routes/miniflux/get_feeds.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,11 @@ module.exports = async (ctx) => {
4646
const feedsList = response.data;
4747

4848
const parameters = ctx.params.parameters
49-
.split('&')
49+
?.split('&')
5050
.map((parameter) => set(parameter))
5151
.join('');
5252

53-
if (parameters !== '') {
53+
if (parameters) {
5454
for (const item of feedsList) {
5555
if (categories.length && feeds.length) {
5656
const categoryTitle = item.category.title.toLowerCase();

lib/v2/bloomberg/utils.js

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ const got = require('@/utils/got');
77
const { art } = require('@/utils/render');
88

99
const rootUrl = 'https://www.bloomberg.com/feeds';
10-
const idSel = 'script[id^="article-info"][type="application/json"], script[class^="article-info"][type="application/json"]';
10+
const idSel = 'script[id^="article-info"][type="application/json"], script[class^="article-info"][type="application/json"], script#dvz-config';
1111
const idUrl = 'https://www.bloomberg.com/article/api/story/id/';
1212

1313
const headers = {
@@ -45,7 +45,7 @@ const apiEndpoints = {
4545
// https://www.bloomberg.com/features/2023-stradivarius-murders/
4646
url: 'https://www.bloomberg.com/features/',
4747
sel: idSel,
48-
props: 'id',
48+
prop: 'id',
4949
},
5050
};
5151

@@ -508,8 +508,10 @@ const nodeRenderers = {
508508
if (t === 'video') {
509509
const h = node.data;
510510
const id = h.attachment?.id;
511-
const desc = await processVideo(id, h.attachment?.title);
512-
return art(path.join(__dirname, 'templates/video_media.art'), desc);
511+
if (id) {
512+
const desc = await processVideo(id, h.attachment?.title);
513+
return art(path.join(__dirname, 'templates/video_media.art'), desc);
514+
}
513515
}
514516
if (t === 'audio' && node.data.attachment) {
515517
const B = node.data.attachment;

0 commit comments

Comments
 (0)