Merge pull request #55 from DIYgod/master

[pull] master from diygod:master
ciwei-ya · Sep 13, 2023 · 08175d7 · 08175d7
2 parents 65bc719 + ea999d9
commit 08175d7
Show file tree

Hide file tree

Showing 20 changed files with 910 additions and 370 deletions.
diff --git a/.github/workflows/docker-release.yml b/.github/workflows/docker-release.yml
@@ -49,27 +49,27 @@ jobs:
         uses: sigstore/cosign-installer@v3
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - name: Log in to Docker Hub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
       - name: Log in to the Container registry
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Extract Docker metadata (ordinary version)
         id: meta-ordinary
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         with:
           images: |
             ${{ secrets.DOCKER_USERNAME }}/rsshub
@@ -81,7 +81,7 @@ jobs:
 
       - name: Build and push Docker image (ordinary version)
         id: build-and-push
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         with:
           context: .
           push: true
@@ -99,7 +99,7 @@ jobs:
 
       - name: Extract Docker metadata (Chromium-bundled version)
         id: meta-chromium-bundled
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         with:
           images: |
             ${{ secrets.DOCKER_USERNAME }}/rsshub
@@ -111,7 +111,7 @@ jobs:
 
       - name: Build and push Docker image (Chromium-bundled version)
         id: build-and-push-chromium
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         with:
           context: .
           build-args: PUPPETEER_SKIP_DOWNLOAD=0

diff --git a/.github/workflows/docker-test.yml b/.github/workflows/docker-test.yml
@@ -36,17 +36,17 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Set up Docker Buildx  # needed by `cache-from`
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - name: Extract Docker metadata
         id: meta
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         with:
           images: rsshub
           flavor: latest=true
 
       - name: Build Docker image
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         with:
           context: .
           build-args: PUPPETEER_SKIP_DOWNLOAD=0  # also test bundling Chromium

diff --git a/lib/radar.js b/lib/radar.js
@@ -4,7 +4,7 @@ const toSource = require('tosource');
 const { join } = require('path');
 
 // Namespaces that do not require radar.js
-const allowNamespace = ['discourse', 'discuz', 'ehentai', 'test'];
+const allowNamespace = ['discourse', 'discuz', 'ehentai', 'mail', 'test'];
 // Check if a radar.js file is exist under each folder of dirname
 for (const dir of fs.readdirSync(dirname)) {
     const dirPath = join(dirname, dir);

diff --git a/lib/router.js b/lib/router.js
@@ -351,8 +351,8 @@ router.get('/kmust/job/careers/:type?', lazyloadRouteHandler('./routes/universit
 router.get('/kmust/job/jobfairs', lazyloadRouteHandler('./routes/universities/kmust/job/jobfairs'));
 
 // 武汉大学
-router.get('/whu/cs/:type', lazyloadRouteHandler('./routes/universities/whu/cs'));
-router.get('/whu/news/:type?', lazyloadRouteHandler('./routes/universities/whu/news'));
+// router.get('/whu/cs/:type', lazyloadRouteHandler('./routes/universities/whu/cs'));
+// router.get('/whu/news/:type?', lazyloadRouteHandler('./routes/universities/whu/news'));
 
 // 井冈山大学
 router.get('/jgsu/jwc', lazyloadRouteHandler('./routes/universities/jgsu/jwc'));
@@ -1199,7 +1199,7 @@ router.get('/latexstudio/home', lazyloadRouteHandler('./routes/latexstudio/home'
 router.get('/jskou/:type?', lazyloadRouteHandler('./routes/jskou/index'));
 
 // 邮箱
-router.get('/mail/imap/:email', lazyloadRouteHandler('./routes/mail/imap'));
+// router.get('/mail/imap/:email/:folder*', lazyloadRouteHandler('./routes/mail/imap'));
 
 // 好队友
 router.get('/network360/jobs', lazyloadRouteHandler('./routes/network360/jobs'));

diff --git a/lib/routes/mail/imap.js b/lib/routes/mail/imap.js
diff --git a/lib/routes/universities/whu/cs.js b/lib/routes/universities/whu/cs.js
diff --git a/lib/routes/universities/whu/news.js b/lib/routes/universities/whu/news.js