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.

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

[pull] master from diygod:master #1371

Merged
merged 20 commits into from
May 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/docker-test-cont.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:
if: (env.TEST_CONTINUE)
run: |
set -ex
gzip -cvd docker-image/rsshub.tar.gz | docker load
zstd -d --stdout docker-image/rsshub.tar.zst | docker load
docker run -d \
--name rsshub \
-e NODE_ENV=dev \
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/docker-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,11 @@ jobs:
run: bash scripts/docker/test-docker.sh

- name: Export Docker image
run: docker save rsshub:latest | gzip -1cf > rsshub.tar.gz
run: docker save rsshub:latest | zstdmt -o rsshub.tar.zst

- name: Upload Docker image
uses: actions/upload-artifact@v4
with:
name: docker-image
path: rsshub.tar.gz
path: rsshub.tar.zst
retention-days: 1
6 changes: 3 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
strategy:
fail-fast: false
matrix:
node-version: [ 20, 21 ]
node-version: [ 20, 22 ]
name: Vitest on Node ${{ matrix.node-version }}
steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -60,7 +60,7 @@ jobs:
strategy:
fail-fast: false
matrix:
node-version: [ 20, 21 ]
node-version: [ 20, 22 ]
chromium:
- name: bundled Chromium
dependency: ''
Expand Down Expand Up @@ -117,7 +117,7 @@ jobs:
strategy:
fail-fast: false
matrix:
node-version: [ 20, 21 ]
node-version: [ 20, 22 ]
name: Build radar and maintainer on Node ${{ matrix.node-version }}
steps:
- uses: actions/checkout@v4
Expand Down
3 changes: 0 additions & 3 deletions lib/router.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,6 @@ router.get('/benedictevans', lazyloadRouteHandler('./routes/benedictevans/recent
// router.get('/jianshu/collection/:id', lazyloadRouteHandler('./routes/jianshu/collection'));
// router.get('/jianshu/user/:id', lazyloadRouteHandler('./routes/jianshu/user'));

// pixiv-fanbox
router.get('/fanbox/:user?', lazyloadRouteHandler('./routes/fanbox/main'));

// Disqus
router.get('/disqus/posts/:forum', lazyloadRouteHandler('./routes/disqus/posts'));

Expand Down
227 changes: 0 additions & 227 deletions lib/routes-deprecated/fanbox/conv.js

This file was deleted.

13 changes: 0 additions & 13 deletions lib/routes-deprecated/fanbox/header.js

This file was deleted.

45 changes: 0 additions & 45 deletions lib/routes-deprecated/fanbox/main.js

This file was deleted.

1 change: 1 addition & 0 deletions lib/routes/copernicium/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ async function handler(ctx) {
['环球视角', '4_1'],
['人文叙述', '4_3'],
['观点评论', '4_5'],
['专题报道', '4_7'],
]);
if (!CATEGORY_TO_ARG_MAP.get(ctx.req.param().category)) {
throw new Error('The requested category does not exist or is not supported.');
Expand Down
Loading
Loading