Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fetch upstream #7

Merged
merged 69 commits into from
Apr 4, 2022
Merged

fetch upstream #7

merged 69 commits into from
Apr 4, 2022

Conversation

RikkaBlue
Copy link
Owner

该 PR 相关 Issue / Involved issue

Close #

完整路由地址 / Example for the proposed route(s)

新 RSS 检查列表 / New RSS Script Checklist

  • 新的路由 New Route
  • 文档说明 Documentation
    • 中文文档 CN
    • 英文文档 EN
  • 全文获取 fulltext
    • 使用缓存 Use Cache
  • 反爬/频率限制 anti-bot or rate limit?
    • 如果有, 是否有对应的措施? If yes, do your code reflect this sign?
  • 日期和时间 date and time
    • 可以解析 Parsed
    • 时区调整 Correct TimeZone
  • 添加了新的包 New package added
  • Puppeteer

说明 / Note

huangliangshusheng and others added 30 commits March 25, 2022 20:23
feat(route): add kakuyomu (#9371)
d1cda2a 
* feat(route): add kakuyomu

* feat(route): add kakuyomu

* add pubDate

* fix radar rule
@Pulset
feat(route):add 政采云前端小报和博客 (#9379)
c91a4cd 
* feat(route):add 政采云前端小报和博客

* fix：因为使用了空值合并操作符??，所有node的版本必须大于等于14

* feat(route):add 政采云前端小报和博客

* fix：因为使用了空值合并操作符??，所有node的版本必须大于等于14

* docs:新增英文说明

* docs：调整位置

* feat: Modify Backquotes

* fix:remove duplicate rssbud and add zooTeam

* fix: add a close tag

* docs: fix docs tags and attrs

* fix：add timezone
feat(route): add 澎湃明查 (#9380)
8ecad32 
* feat(route): add 澎湃明查

* fix: 839studio routes

* docs: update example url

* fix: parseDate
@Rein-Ou
feat(route): add Weather forcast (#9382)
2a728f1 
* weather_forcast

* format

* cache

* Update lib/v2/weather/index.js

Co-authored-by: Tony <TonyRL@users.noreply.github.com>

* Update lib/v2/weather/util/location.js

Co-authored-by: Tony <TonyRL@users.noreply.github.com>

* Update docs/forecast.md

Co-authored-by: Tony <TonyRL@users.noreply.github.com>

* modify

* Update forecast.md

* readme.md

* docs: reorder `HEFENG_KEY`
@github-actions
style: auto format
fd439a1
@dependabot
chore(deps-dev): bump prettier from 2.6.0 to 2.6.1 (#9384)
616a181 
Bumps [prettier](https://github.com/prettier/prettier) from 2.6.0 to 2.6.1.
- [Release notes](https://github.com/prettier/prettier/releases)
- [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md)
- [Commits](prettier/prettier@2.6.0...2.6.1)

---
updated-dependencies:
- dependency-name: prettier
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
chore(deps): bump googleapis from 98.0.0 to 99.0.0 (#9385)
cf04733 
Bumps [googleapis](https://github.com/googleapis/google-api-nodejs-client) from 98.0.0 to 99.0.0.
- [Release notes](https://github.com/googleapis/google-api-nodejs-client/releases)
- [Changelog](https://github.com/googleapis/google-api-nodejs-client/blob/main/CHANGELOG.md)
- [Commits](googleapis/google-api-nodejs-client@googleapis-v98.0.0...googleapis-v99.0.0)

---
updated-dependencies:
- dependency-name: googleapis
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
fix(utils): parse relative dates with multiple time units (#9365)
d5648b3 
* fix(utils): parse relative dates with multiple time units

* docs: remove warning

* fix: add more characters to match

* fix: rename to parse-date
@Rein-Ou
fix(route): Weather forcast (#9390)
b55e9a3 
* weather_forcast

* format

* cache

* Update lib/v2/weather/index.js

* Update lib/v2/weather/util/location.js

* Update docs/forecast.md

* modify

* Update forecast.md

* readme.md

* docs: reorder `HEFENG_KEY`

* fixed cache problem

* dependent fix

* add link

* Update index.js

* fix dependent

* index

* fix md doc
@github-actions
style: auto format
329a04d
feat(route): add 安徽省科技厅 (#9387)
be5dd42 
* feat(route): add 安徽省科技厅

* update lib/v2/gov/radar.js

* refactor: sort radar in alphabetical order
fix(utils): typo in parse-date (#9391)
e42bdf3 
* fix(utils): typo in parse-date

* fix: add `后日`
@OrangeEd1t @TonyRL
fix(route): geo daily photo (#7555)
e61a90d 
* 完成issues#7485,在每日一图-国家地理中增加每日精选节点

* 修改文档和router位置

* 对日期pubDate规范进行了调整

* 优化调整获取内容逻辑，修改pubDate字段的获取方式

* 调整pubDate参数

* 删除代码中多余的console

* 调整parse-date引用

* 调整时区

* issues-#7471，解决国家地理每日一图获取失败问题，因为网站更改，并且网站对图片进行了处理，所以调整获取方式。

* 删除无用代码

* 调整代码，错删了代码

* refactor: migrate to v2

* fix: nat geo photo of the day

* fix: natgeo parseDate

* style: lint

* feat: radar for natgeomedia.com

Co-authored-by: TonyRL <TonyRL@users.noreply.github.com>
@Rongronggg9
feat(route)(weibo): display comments (#9394)
8c20399 
Signed-off-by: Rongrong <15956627+Rongronggg9@users.noreply.github.com>
@TonyRL
docs: fix blank page (#9396)
e5b2676
fix(utils): wrong last weekday for relative date (#9397)
a339602
@TonyRL
fix(route): qweather namespace (#9398)
668286a
fix(route): PubMed Trending articles (#9402)
5927f28
@genghis-yang
fix(route): mpaypass news (#9367)
33eb860 
* fix(route): mpaypass news

* refactor: migrate to v2

* fix: parseDate
@TonyRL
fix(utils): parseDate custom format not working
cd151f4
@Rongronggg9
refactor(core): unified memory cache (#9395)
501dff5 
Signed-off-by: Rongrong <15956627+Rongronggg9@users.noreply.github.com>
feat(route): 华硕 固件 (#9403)
21dbeba 
* feat(route): 华硕 固件

* fix(route): change radar url and modify the date format
@dependabot
chore(deps): bump ioredis from 4.28.5 to 5.0.1
8cacd98 
Bumps [ioredis](https://github.com/luin/ioredis) from 4.28.5 to 5.0.1.
- [Release notes](https://github.com/luin/ioredis/releases)
- [Changelog](https://github.com/luin/ioredis/blob/main/CHANGELOG.md)
- [Commits](redis/ioredis@v4.28.5...v5.0.1)

---
updated-dependencies:
- dependency-name: ioredis
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
@dependabot
chore(deps-dev): bump eslint from 8.11.0 to 8.12.0 (#9412)
a48af28 
Bumps [eslint](https://github.com/eslint/eslint) from 8.11.0 to 8.12.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](eslint/eslint@v8.11.0...v8.12.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
chore(deps): bump parse-torrent from 9.1.4 to 9.1.5 (#9410)
bc13cde 
Bumps [parse-torrent](https://github.com/webtorrent/parse-torrent) from 9.1.4 to 9.1.5.
- [Release notes](https://github.com/webtorrent/parse-torrent/releases)
- [Changelog](https://github.com/webtorrent/parse-torrent/blob/master/CHANGELOG.md)
- [Commits](webtorrent/parse-torrent@v9.1.4...v9.1.5)

---
updated-dependencies:
- dependency-name: parse-torrent
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@TonyRL
Merge pull request #9409 from DIYgod/dependabot/npm_and_yarn/ioredis-…
8e5971e 
…5.0.1

chore(deps): bump ioredis from 4.28.5 to 5.0.1
@Rongronggg9
fix(route)(douban/wish): username in feed title (#9408)
1fc9c4a 
fix(route)(douban/wish): username in feed title
@CaoMeiYouRen
feat(route): 新增 米游社 路由 (#9404)
b70e690 
* feat: 优化B站动态转发内容中的图片和视频

* style: 修复格式错误

* fix: 修复 B站动态转发多图的图片缺失

* style: 整理代码格式

* style: 整理代码格式

* fix: 修复B站动态转发视频缺失标题

* fix: 移除了部分不必要的代码

* fix: 修复b站动态中转发直播间动态出现undefined;整理部分代码

* style: 整理代码格式

* fix: 补充b站动态中转发活动的信息

* fix: 修正代码格式

* fix: b站动态转发专题页缺少标题;整理部分代码

* fix: 修复图片错误

* fix: 修复专栏封面缺失的bug;增加B站动态格式总结

* style:修复格式问题

* fix: 修复/robots.txt路由

* fix

* chore: 合并冲突

* fix

* fix

* feat: 优化B站动态url

* fix: 改 \n 为<br>

* chore: 更新 npm registry

* feat: 完成 米游社路由和文档的编写

* fix: 修复 @vuepress/shared-utils 在 yarn.lock 的缺失

* chore: exact match

* fix: parseDate
@Rongronggg9
feat(route): try to avoid being anti-crawled (#9406)
cd91931 
* feat(route)(weibo): try to avoid being anti-crawled

Signed-off-by: Rongrong <15956627+Rongronggg9@users.noreply.github.com>

* refactor(route)(telegram/channel): migrate to `cache.tryGet`

Signed-off-by: Rongrong <15956627+Rongronggg9@users.noreply.github.com>

* feat(route)(douban): try to avoid being anti-crawled

Signed-off-by: Rongrong <15956627+Rongronggg9@users.noreply.github.com>

* feat(route)(picuki): try to avoid being anti-crawled

Signed-off-by: Rongrong <15956627+Rongronggg9@users.noreply.github.com>

* ref: got.get() to got()
@Rongronggg9
fix(core): torrent searching error (#9407)
95db3b4 
Signed-off-by: Rongrong <15956627+Rongronggg9@users.noreply.github.com>
Ethan Shen and others added 21 commits April 1, 2022 18:02
@TonyRL
feat(route): add 湖南日报 (#9417)
457e8f8 
* feat(route): add 湖南日报

* docs: update category

* update docs/traditional-media.md

Co-authored-by: Tony <TonyRL@users.noreply.github.com>

Co-authored-by: Tony <TonyRL@users.noreply.github.com>
feat(route): npm (#9437)
bb3924c
@Rongronggg9
docs(route)(weibo): minor update (#9438)
dc90ea9 
add a warning about different responses in different regions
add my username to the author fields of `user` and `timeline`

Signed-off-by: Rongrong <15956627+Rongronggg9@users.noreply.github.com>
@Rongronggg9
feat(route)(weibo): recognize and display Live Photo (#9440)
96e3b76 
Signed-off-by: Rongrong <15956627+Rongronggg9@users.noreply.github.com>
@dependabot
chore(deps): bump googleapis from 99.0.0 to 100.0.0 (#9444)
1d4d969 
Bumps [googleapis](https://github.com/googleapis/google-api-nodejs-client) from 99.0.0 to 100.0.0.
- [Release notes](https://github.com/googleapis/google-api-nodejs-client/releases)
- [Changelog](https://github.com/googleapis/google-api-nodejs-client/blob/main/CHANGELOG.md)
- [Commits](googleapis/google-api-nodejs-client@googleapis-v99.0.0...googleapis-v100.0.0)

---
updated-dependencies:
- dependency-name: googleapis
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
chore(deps): bump actions/setup-node from 3.0.0 to 3.1.0 (#9445)
9f791ab 
Bumps [actions/setup-node](https://github.com/actions/setup-node) from 3.0.0 to 3.1.0.
- [Release notes](https://github.com/actions/setup-node/releases)
- [Commits](actions/setup-node@v3.0.0...v3.1.0)

---
updated-dependencies:
- dependency-name: actions/setup-node
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@Rein-Ou
fix(route): qweather/now measure fixed (#9448)
9299722 
* time display fix

* measure fix
@Rongronggg9
fix(route)(weibo/user): outdated API method (#9446)
63b3b04 
Signed-off-by: Rongrong <15956627+Rongronggg9@users.noreply.github.com>
@Rongronggg9
fix(core): offending RFC4287 (#9441)
5b35471 
* fix(core): offending RFC4287

should not leave `<updated>` blank when `<published>` is not blank
these two fields MUST conform to the "date-time" production in RFC3339

Signed-off-by: Rongrong <15956627+Rongronggg9@users.noreply.github.com>

* test(common-utils): complete tests

Signed-off-by: Rongrong <15956627+Rongronggg9@users.noreply.github.com>

* test(template): restrict expected value of `pubDate`

Signed-off-by: Rongrong <15956627+Rongronggg9@users.noreply.github.com>
@TsSmartTT
feat(route): add 时光网 (#9443)
577541f 
* Create 1.txt

* Add files via upload

* Delete lib/v2/mtime directory

* Add files via upload

* Update multimedia.md

* Update multimedia.md

* Update and rename lib/v2/mtime/news.js to 自由/版本 2/mtime/news.js

* Delete news.js

* Add files via upload

* Update multimedia.md

* Update news.js

* Update news.js

* Update news.js

* Update news.js

* Update radar.js

* Update radar.js

* Update radar.js

* Update news.js

* Update news.js

* Update news.js
@github-actions
style: auto format
5b7b2f4
@zytomorrow @actions-user
fix(route): sichuan/deyang 政府公开信息 (#9453)
476b393 
* fead: add 雪球股票评论

* style: auto format

* fix: 修复雪球评论转发时未带原文

* refactor: 微博个人时间线接入util，支持可读性优化，同时打开emoji表情展示

* route: 雪球评论标题长度自定义

* style: auto format

* fix: 风之动漫域名更换

* fix: 风之漫画新域名适配

* refactor: 微博个人时间线接入util，支持可读性优化，同时打开emoji表情展示

* fix: 雪球股票评论格式调整

* fix: 风之动漫域名更换

* fix: 风之动漫link修复

* fix: 雪球股票评论正文使用art模板，日期解析调整

* feat(route): add 德阳考试中心

* feat(route): add 德阳考试中心

* fix: 风之动漫获取数量去掉限制

* fix: 风之动漫获取数量去掉限制

* fix: 风之动漫获取数量使用通用参数控制

* fix: 风之动漫获取数量使用通用参数控制

* style: auto format

* fix: dykszx

* fix: 德阳考试中心 ssl证书过期

* Merge branch 'master' of https://github.com/DIYgod/RSSHub into dykszx

* Merge branch 'master' of https://github.com/DIYgod/RSSHub into dykszx

* tmp1

* tmp2:

* tmp3

* feat(route):  add 政府公开信息

* feat(route):  add 政府公开信息

* feat(route):  add 政府公开信息

* feat(route):  add 政府公开信息

* feat(route):  add 政府公开信息

* Revert "feat(route):  add 政府公开信息"

This reverts commit c9d59af9e09b14f7357014382037b7f378d65ea7.

* feat(route):  add 政府公开信息

* fix: 修复德阳政府公开信息

* fix: 修复德阳政府公开信息

* Merge branch 'master' of https://github.com/DIYgod/RSSHub into fix_router

* Merge branch 'master' of https://github.com/DIYgod/RSSHub into fix_router

* Merge branch 'master' of https://github.com/DIYgod/RSSHub into fix_router

* fix: 修复德阳政府公开信息

Co-authored-by: GitHub Action <action@github.com>
@TonyRL
chore: auto update docker hub description (#9454)
300af73
@chazeon @TonyRL
docs: 格式化文档 (#9450)
5012e71 
* Format doc

* Update api.md

* Add <code> tag for <route> and fix English documentation

* Update docs/parameter.md

Co-authored-by: Tony <TonyRL@users.noreply.github.com>

* Update docs/parameter.md

Co-authored-by: Tony <TonyRL@users.noreply.github.com>

Co-authored-by: Tony <TonyRL@users.noreply.github.com>
@myuanz
docs: 修正冗余表述 (#9456)
cf8cb29 
API 的 `I` 就是 Interface/接口的意思, 不必再说`API 接口了`
@Rongronggg9
docs: invalid <p> for route params (#9455)
19608ab 
Signed-off-by: Rongrong <15956627+Rongronggg9@users.noreply.github.com>
@chazeon @TonyRL
feat(route): 增加了六个美国博物馆的展讯 (#9451)
b17eaf9 
* Add New York Museums with working code

* Add Guggenheim and fix Jewish Museum

* Add pubDate for Gugg and Met Exhibitions

* Update docs

* Add New Museum and MCA Chicago, update document

* Fix en route

* Add and update radar.js

* Add Brooklyn Museum

* Reformat code

* Update route and travel information

* Fix `http` -> `https` for `radar.js`

* Change some link quotations mark

* Using `parseDate` provided by the project

* Removing "insecureHTTPParser"

* Fix JewishMuseum issue

* Use regex instead of node's vm

* Update lib/v2/jewishmuseum/exhibitions.js

Co-authored-by: Tony <TonyRL@users.noreply.github.com>

* Update lib/v2/guggenheim/exhibitions.js

Co-authored-by: Tony <TonyRL@users.noreply.github.com>

* Update docs/en/travel.md

Co-authored-by: Tony <TonyRL@users.noreply.github.com>

* Update docs/travel.md

Co-authored-by: Tony <TonyRL@users.noreply.github.com>

Co-authored-by: Tony <TonyRL@users.noreply.github.com>
@github-actions
style: auto format
62c3329
@Rongronggg9
fix(route)(weibo): misc icons break some readers (#9458)
7399d17 
Signed-off-by: Rongrong <15956627+Rongronggg9@users.noreply.github.com>
@Rongronggg9
feat(route)(kyodonews): icon, main pic, updated date (#9459)
32fe3ae 
Signed-off-by: Rongrong <15956627+Rongronggg9@users.noreply.github.com>
@rpsh
fix(route)(fortunechina): 修正财富中文网日期时间匹配规则、移除一些不必要评论元素 (#9464)
6835353
@github-actions
Copy link

github-actions bot commented Apr 4, 2022

自动检测失败, 请确认PR正文部分符合格式规范并重新开启, 详情请检查日志
Auto Route test failed, please check your PR body format and reopen pull request. Check logs for more details

@github-actions github-actions bot closed this Apr 4, 2022
@RikkaBlue RikkaBlue reopened this Apr 4, 2022
@RikkaBlue RikkaBlue merged commit 14de1fd into RikkaBlue:master Apr 4, 2022
@github-actions
Copy link

github-actions bot commented Apr 4, 2022

自动检测失败, 请确认PR正文部分符合格式规范并重新开启, 详情请检查日志
Auto Route test failed, please check your PR body format and reopen pull request. Check logs for more details

RikkaBlue added a commit that referenced this pull request Apr 4, 2022
@RikkaBlue
Revert "fetch upstream (#7)"
a1d87e7 
This reverts commit 14de1fd.
@RikkaBlue RikkaBlue mentioned this pull request Apr 4, 2022
Merged
RikkaBlue added a commit that referenced this pull request Apr 4, 2022
@RikkaBlue
Revert "fetch upstream (#7)"
3ca7863 
This reverts commit 14de1fd.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
Auto: Route No Found
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.