Merge pull request #880 from DIYgod/master

[pull] master from diygod:master

Author: pull[bot]

.devcontainer/devcontainer.json

@@ -2,7 +2,7 @@
 // https://github.com/devcontainers/images/blob/v0.2.24/src/javascript-node/.devcontainer/devcontainer.json
 {
     "name": "Node.js",
-    "image": "mcr.microsoft.com/devcontainers/javascript-node:16-bullseye",
+    "image": "mcr.microsoft.com/devcontainers/javascript-node:18-bullseye",
 
     // Configure tool-specific properties.
     "customizations": {

.github/dependabot.yml

@@ -16,8 +16,6 @@ updates:
         versions: ['>=12.0.0']
       - dependency-name: ip-regex
         versions: ['>=5.0.0']
-      - dependency-name: parse-torrent
-        versions: ['>=10.0.0']
       - dependency-name: query-string
         versions: ['>=8.0.0']
       - dependency-name: rand-user-agent

.github/workflows/docker-release.yml

@@ -34,6 +34,9 @@ jobs:
     needs: check-env
     if: needs.check-env.outputs.check-docker == 'true'
     timeout-minutes: 120
+    permissions:
+      packages: write
+      contents: read
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -44,17 +47,26 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
 
-      - name: Login to DockerHub
+      - name: Log in to Docker Hub
         uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
+      - name: Log in to the Container registry
+        uses: docker/login-action@v2
+        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
         with:
-          images: ${{ secrets.DOCKER_USERNAME }}/rsshub
+          images: |
+            ${{ secrets.DOCKER_USERNAME }}/rsshub
+            ghcr.io/${{ github.repository }}
           tags: |
             type=raw,value=latest,enable=true
             type=raw,value={{date 'YYYY-MM-DD'}},enable=true
@@ -77,7 +89,9 @@ jobs:
         id: meta-chromium-bundled
         uses: docker/metadata-action@v4
         with:
-          images: ${{ secrets.DOCKER_USERNAME }}/rsshub
+          images: |
+            ${{ secrets.DOCKER_USERNAME }}/rsshub
+            ghcr.io/${{ github.repository }}
           tags: |
             type=raw,value=chromium-bundled,enable=true
             type=raw,value=chromium-bundled-{{date 'YYYY-MM-DD'}},enable=true

.github/workflows/npm-publish.yml

@@ -20,7 +20,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 18
           cache: 'yarn'
           registry-url: 'https://registry.npmjs.org'
       - name: Release

.github/workflows/pr-lint.yml

@@ -45,7 +45,7 @@ jobs:
           wait-for-processing: true
 
   titleLint:
-    if: ${{ github.event_name == 'pull_request_target' }}
+    if: ${{ github.event_name == 'pull_request_target' && github.repository == 'DIYgod/RSSHub' }}
     name: Validate PR title
     runs-on: ubuntu-latest
     timeout-minutes: 5

.github/workflows/test.yml

@@ -31,7 +31,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node-version: [ 14, 16, 18 ]
+        node-version: [ 16, 18 ]
     name: Jest on Node ${{ matrix.node-version }}
     steps:
       - name: Collect Workflow Telemetry
@@ -73,7 +73,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node-version: [ 14, 16, 18 ]
+        node-version: [ 16, 18 ]
         chromium:
           - name: bundled Chromium
             dependency: ''
@@ -117,7 +117,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node-version: [ 14, 16, 18 ]
+        node-version: [ 16, 18 ]
     name: Build docs on Node ${{ matrix.node-version }}
     steps:
       - uses: actions/checkout@v3
@@ -141,7 +141,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node-version: [ 14, 16, 18 ]
+        node-version: [ 16, 18 ]
     name: Build radar and maintainer on Node ${{ matrix.node-version }}
     steps:
       - uses: actions/checkout@v3

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:16-bullseye as dep-builder
+FROM node:18-bullseye as dep-builder
 # Here we use the non-slim image to provide build-time deps (compilers and python), thus no need to install later.
 # This effectively speeds up qemu-based cross-build.
 
@@ -30,7 +30,7 @@ FROM debian:bullseye-slim as dep-version-parser
 # This stage is necessary to limit the cache miss scope.
 # With this stage, any modification to package.json won't break the build cache of the next two stages as long as the
 # version unchanged.
-# node:16-bullseye-slim is based on debian:bullseye-slim so this stage would not cause any additional download.
+# node:18-bullseye-slim is based on debian:bullseye-slim so this stage would not cause any additional download.
 
 WORKDIR /ver
 COPY ./package.json /app/
@@ -42,7 +42,7 @@ RUN \
 
 # ---------------------------------------------------------------------------------------------------------------------
 
-FROM node:16-bullseye-slim as docker-minifier
+FROM node:18-bullseye-slim as docker-minifier
 # The stage is used to further reduce the image size by removing unused files.
 
 WORKDIR /minifier
@@ -74,7 +74,7 @@ RUN \
 
 # ---------------------------------------------------------------------------------------------------------------------
 
-FROM node:16-bullseye-slim as chromium-downloader
+FROM node:18-bullseye-slim as chromium-downloader
 # This stage is necessary to improve build concurrency and minimize the image size.
 # Yeah, downloading Chromium never needs those dependencies below.
 
@@ -104,7 +104,7 @@ RUN \
 
 # ---------------------------------------------------------------------------------------------------------------------
 
-FROM node:16-bullseye-slim as app
+FROM node:18-bullseye-slim as app
 
 LABEL org.opencontainers.image.authors="https://github.com/DIYgod/RSSHub"
 

README.md

@@ -10,7 +10,8 @@
 [![docker publish](https://img.shields.io/github/actions/workflow/status/DIYgod/RSSHub/docker-release.yml?branch=master&label=docker%20publish&logo=docker&style=flat-square)](https://hub.docker.com/r/diygod/rsshub)
 [![test](https://img.shields.io/github/actions/workflow/status/DIYgod/RSSHub/test.yml?branch=master&label=test&logo=github&style=flat-square)](https://github.com/DIYgod/RSSHub/actions/workflows/test.yml?query=event%3Apush+branch%3Amaster)
 [![Test coverage](https://img.shields.io/codecov/c/github/DIYgod/RSSHub.svg?style=flat-square&logo=codecov)](https://app.codecov.io/gh/DIYgod/RSSHub/branch/master)
-[![Foresight Docs](https://api-public.service.runforesight.com/api/v1/badge/success?repoId=5da20e56-cecf-4b05-9bcd-cab097fb2dca)](https://docs.runforesight.com/)
+[![CodeFactor](https://www.codefactor.io/repository/github/diygod/rsshub/badge)](https://www.codefactor.io/repository/github/diygod/rsshub)
+[![DeepScan grade](https://deepscan.io/api/teams/6244/projects/8135/branches/92448/badge/grade.svg)](https://deepscan.io/dashboard#view=project&tid=6244&pid=8135&bid=92448)
 
 ## Introduction
 
@@ -35,21 +36,9 @@ RSSHub 是一个开源、简单易用、易于扩展的 RSS 生成器，可以
 ### Special Sponsors
 
 <p>
-<a href="https://rss3.io/" target="_blank"><img height="60px" src="https://i.imgur.com/vHtI4bz.png"></a>
+<a href="https://rss3.io/" target="_blank"><img height="50px" src="https://i.imgur.com/vHtI4bz.png"></a>
 </p>
 
-<table width="100%">
-<tr>
-<td><img width="1000" height="0"><a href="https://www.runforesight.com/?utm_source=RSSHub&utm_medium=sponsorship"><img src="https://www.thundra.io/hubfs/RunForesight/GitHub%20Sponsorship%20banners/github-actions-observability.png"
-alt="Foresight" width="260" align="right"></a><h3>Foresight: Increase CI/CD Health & Test Performance</h3><p>
-Foresight provides full visibility and deep insights into the health and performance of your tests and CI pipelines. Assess the risk of code changes, deal with flaky tests, see workflow and test trends over time, and improve the contributing experience with Foresight.</p>
-
-[Sign up now!](https://runforesight.com/?utm_source=RSSHub&utm_medium=sponsorship)
-
-</td>
-</tr>
-</table>
-
 [![](https://opencollective.com/static/images/become_sponsor.svg)](https://docs.rsshub.app/en/support/)
 
 ### Contributors

app.json

@@ -14,28 +14,8 @@
             "value": "80",
             "required": false
         },
-        "PIXIV_REFRESHTOKEN": {
-            "required": false
-        },
-        "DISQUS_API_KEY": {
-            "required": false
-        },
-        "SPOTIFY_CLIENT_ID": {
-            "required": false
-        },
-        "SPOTIFY_CLIENT_SECRET": {
-            "required": false
-        },
-        "SPOTIFY_REFRESHTOKEN": {
-            "required": false
-        },
-        "TWITTER_CONSUMER_KEY": {
-            "required": false
-        },
-        "TWITTER_CONSUMER_SECRET": {
-            "required": false
-        },
-        "YOUTUBE_KEY": {
+        "PUPPETEER_SKIP_CHROMIUM_DOWNLOAD": {
+            "value": "1",
             "required": false
         }
     }

docs/.format/chineseFormat.js

@@ -22,9 +22,7 @@ module.exports = {
             })
             .use(prettier)
             .use(gfm, {
-                options: {
-                    stringLength: width,
-                },
+                stringLength: width,
             })
             .process(doc);
         return typeof result === 'string' ? result : typeof result.contents === 'string' ? result.contents : result.result;