Merge pull request #2515 from DIYgod/master

[pull] master from diygod:master
HenryQW · May 2, 2024 · 738eea2 · 738eea2
2 parents 12f67b3 + e030be0
commit 738eea2
Show file tree

Hide file tree

Showing 39 changed files with 1,212 additions and 802 deletions.
diff --git a/.github/workflows/docker-test-cont.yml b/.github/workflows/docker-test-cont.yml
@@ -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 \

diff --git a/.github/workflows/docker-test.yml b/.github/workflows/docker-test.yml
@@ -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
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -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
@@ -60,7 +60,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node-version: [ 20, 21 ]
+        node-version: [ 20, 22 ]
         chromium:
           - name: bundled Chromium
             dependency: ''
@@ -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

diff --git a/lib/router.js b/lib/router.js
@@ -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'));
 

diff --git a/lib/routes-deprecated/fanbox/conv.js b/lib/routes-deprecated/fanbox/conv.js
diff --git a/lib/routes-deprecated/fanbox/header.js b/lib/routes-deprecated/fanbox/header.js
diff --git a/lib/routes-deprecated/fanbox/main.js b/lib/routes-deprecated/fanbox/main.js
diff --git a/lib/routes/copernicium/index.ts b/lib/routes/copernicium/index.ts
@@ -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.');