[pull] master from diygod:master

.github/dependabot.yml

@@ -35,6 +35,7 @@ updates:
                   - '@oxlint/*'
                   - 'oxfmt'
                   - 'oxlint'
+                  - 'oxlint-plugin-eslint'
                   - 'oxlint-tsgolint'
           proxy-agent:
               patterns:
@@ -45,6 +46,15 @@ updates:
               patterns:
                   - '@typescript-eslint/*'
 
+    - package-ecosystem: 'nix'
+      directory: '/'
+      schedule:
+          interval: daily
+          time: '08:00'
+      open-pull-requests-limit: 100
+      labels:
+          - dependencies
+
     - package-ecosystem: 'github-actions'
       directory: '/'
       schedule:

.github/workflows/docker-release.yml

@@ -74,13 +74,13 @@ jobs:
               uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0
 
             - name: Log in to Docker Hub
-              uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0
+              uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0
               with:
                   username: ${{ vars.DOCKER_USERNAME }}
                   password: ${{ secrets.DOCKER_PASSWORD }}
 
             - name: Log in to the Container registry
-              uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0
+              uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0
               with:
                   registry: ghcr.io
                   username: ${{ github.actor }}
@@ -207,13 +207,13 @@ jobs:
               uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0
 
             - name: Log in to Docker Hub
-              uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0
+              uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0
               with:
                   username: ${{ vars.DOCKER_USERNAME }}
                   password: ${{ secrets.DOCKER_PASSWORD }}
 
             - name: Log in to the Container registry
-              uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0
+              uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0
               with:
                   registry: ghcr.io
                   username: ${{ github.actor }}

.github/workflows/docker-test-cont.yml

@@ -74,7 +74,7 @@ jobs:
 
             - name: Fetch Docker image
               if: (env.TEST_CONTINUE)
-              uses: dawidd6/action-download-artifact@8a338493df3d275e4a7a63bcff3b8fe97e51a927 # v19
+              uses: dawidd6/action-download-artifact@8305c0f1062bb0d184d09ef4493ecb9288447732 # v20
               with:
                   workflow: ${{ github.event.workflow_run.workflow_id }}
                   run_id: ${{ github.event.workflow_run.id }}

.github/workflows/test.yml

@@ -145,7 +145,7 @@ jobs:
             pull-requests: write
             contents: write
         steps:
-            - uses: fastify/github-action-merge-dependabot@1b2ed42db8f9d81a46bac83adedfc03eb5149dff # v3.11.2
+            - uses: fastify/github-action-merge-dependabot@30c3f8f14a4f7b315ba38dbc1b793d27128fef82 # v3.12.0
               with:
                   github-token: ${{ secrets.GITHUB_TOKEN }}
                   target: patch

.oxlintrc.json

@@ -12,11 +12,12 @@
     },
     "plugins": ["eslint", "typescript", "node", "unicorn", "import"],
     "jsPlugins": [
-        "@stylistic/eslint-plugin",
         { "name": "import-x-js", "specifier": "eslint-plugin-import-x" },
         { "name": "n", "specifier": "eslint-plugin-n" },
         { "name": "unicorn-js", "specifier": "eslint-plugin-unicorn" },
+        "@stylistic/eslint-plugin",
         "eslint-plugin-simple-import-sort",
+        "oxlint-plugin-eslint",
         "./eslint-plugins/no-then.js",
         "./eslint-plugins/nsfw-flag.js"
     ],
@@ -325,27 +326,60 @@
             }
         ],
 
-        // "no-implicit-globals": "error", // not yet implemented
+        "eslint-js/no-implicit-globals": "error", // use jsPlugins
         "no-labels": "error",
         "no-lonely-if": "error",
         "no-multi-str": "error",
         "no-new-func": "error",
+
+        "eslint-js/no-restricted-syntax": [
+            "error", // use jsPlugins
+            {
+                "selector": "CallExpression[callee.property.name='get'][arguments.length=0]",
+                "message": "Please use .toArray() instead."
+            },
+            {
+                "selector": "CallExpression[callee.property.name='toArray'] MemberExpression[object.callee.property.name='map']",
+                "message": "Please use .toArray() before .map()."
+            },
+            {
+                "selector": "CallExpression[callee.property.name=\"catch\"] > ArrowFunctionExpression[params.length=0][body.value=null]",
+                "message": "Usage of .catch(() => null) is not allowed. Please handle the error appropriately."
+            },
+            {
+                "selector": "CallExpression[callee.property.name=\"catch\"] > ArrowFunctionExpression[params.length=0][body.type=\"Identifier\"][body.name=\"undefined\"]",
+                "message": "Usage of .catch(() => undefined) is not allowed. Please handle the error appropriately."
+            },
+            {
+                "selector": "CallExpression[callee.property.name=\"catch\"] > ArrowFunctionExpression[params.length=0] > ArrayExpression[elements.length=0]",
+                "message": "Usage of .catch(() => []) is not allowed. Please handle the error appropriately."
+            },
+            {
+                "selector": "CallExpression[callee.property.name=\"catch\"] > ArrowFunctionExpression[params.length=0] > BlockStatement[body.length=0]",
+                "message": "Usage of .catch(() => {}) is not allowed. Please handle the error appropriately."
+            },
+            {
+                "selector": "CallExpression[callee.name=\"load\"] AwaitExpression > CallExpression",
+                "message": "Do not use await in call expressions. Extract the result into a variable first."
+            }
+        ],
+
         "no-unneeded-ternary": "error",
         "no-useless-computed-key": "error",
         "no-useless-concat": "warn",
         "no-useless-rename": "error",
         "no-var": "error",
-        // "object-shorthand": "error", // not yet implemented
-        // "prefer-arrow-callback'": "error", // not yet implemented
+        "eslint-js/object-shorthand": "error", // use jsPlugins
+        "eslint-js/prefer-arrow-callback": "error", // use jsPlugins
         "prefer-const": "error",
         "prefer-object-has-own": "error",
+        "eslint-js/prefer-regex-literals": [
+            "error", // use jsPlugins
+            {
+                "disallowRedundantWrapping": true
+            }
+        ],
         "require-await": "error",
-        // "prefer-regex-literals": [ // not yet implemented
-        //     "error",
-        //     {
-        //         "disallowRedundantWrapping": true
-        //     }
-        // ],
         // #endregion
 
         // #region --- TypeScript ---
@@ -354,6 +388,7 @@
         "@typescript-eslint/ban-ts-comment": "off",
         "@typescript-eslint/consistent-indexed-object-style": "off", // stylistic
         "@typescript-eslint/consistent-type-definitions": "off", // stylistic
+        "@typescript-eslint/dot-notation": "error", // type-aware
         "@typescript-eslint/no-empty-function": "off", // stylistic && tests
         "@typescript-eslint/no-explicit-any": "off",
 
@@ -397,6 +432,7 @@
         "unicorn/no-null": "off",
         "unicorn/no-object-as-default-parameter": "warn",
         "unicorn/no-process-exit": "off",
+        "unicorn/no-useless-iterator-to-array": "off",
         "unicorn/no-useless-switch-case": "off",
 
         "unicorn/no-useless-undefined": ["error", { "checkArguments": false }],

eslint.config.mjs

@@ -1,41 +1,26 @@
 import js from '@eslint/js';
-import stylistic from '@stylistic/eslint-plugin';
 import typescriptEslint from '@typescript-eslint/eslint-plugin';
 import tsParser from '@typescript-eslint/parser';
 // import { importX } from 'eslint-plugin-import-x';
-import n from 'eslint-plugin-n';
 // import simpleImportSort from 'eslint-plugin-simple-import-sort';
 import eslintPluginYml from 'eslint-plugin-yml';
 import { defineConfig } from 'eslint/config';
 import globals from 'globals';
 
-// import github from './eslint-plugins/no-then.js';
-// import nsfwFlagPlugin from './eslint-plugins/nsfw-flag.js';
-
 const SOURCE_FILES_GLOB = '**/*.?([cm])[jt]s?(x)';
 
 export default defineConfig([
-    // {
-    //     plugins: {
-    //         '@rsshub/nsfw-flag': nsfwFlagPlugin,
-    //     },
-    //     rules: {
-    //         '@rsshub/nsfw-flag/add-nsfw-flag': 'error',
-    //     },
-    // },
     {
         ignores: ['**/coverage', '**/.vscode', '**/docker-compose.yml', '!.github', 'assets/build', 'lib/routes-deprecated', 'lib/router.js', 'dist', 'dist-lib', 'dist-worker'],
     },
     {
         files: [SOURCE_FILES_GLOB],
         plugins: {
-            '@stylistic': stylistic,
             '@typescript-eslint': typescriptEslint,
             // github,
             js,
-            n,
         },
-        // extends: [js.configs.recommended, typescriptEslint.configs['flat/recommended'], typescriptEslint.configs['flat/stylistic'], n.configs['flat/recommended-script']],
+        // extends: [typescriptEslint.configs['flat/recommended'], typescriptEslint.configs['flat/stylistic'], n.configs['flat/recommended-script']],
 
         languageOptions: {
             globals: {
@@ -53,101 +38,6 @@ export default defineConfig([
         },
 
         rules: {
-            // #region possible problems
-            /*
-            'array-callback-return': ['error', { allowImplicit: true }],
-
-            'no-await-in-loop': 'error',
-            'no-control-regex': 'off',
-            'no-prototype-builtins': 'off',
-            */
-            // #endregion
-
-            // #region suggestions
-            /*
-            'arrow-body-style': 'error',
-            'block-scoped-var': 'error',
-            curly: 'error',
-            'dot-notation': 'error',
-            eqeqeq: 'error',
-
-            'default-case': ['warn', { commentPattern: '^no default$' }],
-
-            'default-case-last': 'error',
-            'no-console': 'error',
-            'no-eval': 'error',
-            'no-extend-native': 'error',
-            'no-extra-label': 'error',
-
-            'no-implicit-coercion': [
-                'error',
-                {
-                    boolean: false,
-                    number: false,
-                    string: false,
-                    disallowTemplateShorthand: true,
-                },
-            ],
-
-            'no-implicit-globals': 'error',
-            'no-labels': 'error',
-            'no-lonely-if': 'error',
-            'no-multi-str': 'error',
-            'no-new-func': 'error',
-            */
-            'no-restricted-syntax': [
-                'error',
-                {
-                    selector: "CallExpression[callee.property.name='get'][arguments.length=0]",
-                    message: 'Please use .toArray() instead.',
-                },
-                {
-                    selector: "CallExpression[callee.property.name='toArray'] MemberExpression[object.callee.property.name='map']",
-                    message: 'Please use .toArray() before .map().',
-                },
-                {
-                    selector: 'CallExpression[callee.property.name="catch"] > ArrowFunctionExpression[params.length=0][body.value=null]',
-                    message: 'Usage of .catch(() => null) is not allowed. Please handle the error appropriately.',
-                },
-                {
-                    selector: 'CallExpression[callee.property.name="catch"] > ArrowFunctionExpression[params.length=0][body.type="Identifier"][body.name="undefined"]',
-                    message: 'Usage of .catch(() => undefined) is not allowed. Please handle the error appropriately.',
-                },
-                {
-                    selector: 'CallExpression[callee.property.name="catch"] > ArrowFunctionExpression[params.length=0] > ArrayExpression[elements.length=0]',
-                    message: 'Usage of .catch(() => []) is not allowed. Please handle the error appropriately.',
-                },
-                {
-                    selector: 'CallExpression[callee.property.name="catch"] > ArrowFunctionExpression[params.length=0] > BlockStatement[body.length=0]',
-                    message: 'Usage of .catch(() => {}) is not allowed. Please handle the error appropriately.',
-                },
-                {
-                    selector: 'CallExpression[callee.name="load"] AwaitExpression > CallExpression',
-                    message: 'Do not use await in call expressions. Extract the result into a variable first.',
-                },
-            ],
-            /*
-            'no-unneeded-ternary': 'error',
-            'no-useless-computed-key': 'error',
-            'no-useless-concat': 'warn',
-            'no-useless-rename': 'error',
-            'no-var': 'error',
-            'object-shorthand': 'error',
-            'prefer-arrow-callback': 'error',
-            'prefer-const': 'error',
-            'prefer-object-has-own': 'error',
-
-            'prefer-regex-literals': [
-                'error',
-                {
-                    disallowRedundantWrapping: true,
-                },
-            ],
-
-            'require-await': 'error',
-            */
-            // #endregion
-
             // #region typescript
             /*
             '@typescript-eslint/array-type': ['error', { default: 'array-simple' }],
@@ -163,55 +53,6 @@ export default defineConfig([
             '@typescript-eslint/no-unused-vars': ['error', { args: 'after-used', argsIgnorePattern: '^_' }],
             */
             // #endregion
-
-            // #region stylistic
-            /*
-            '@stylistic/arrow-parens': 'error',
-            '@stylistic/arrow-spacing': 'error',
-            '@stylistic/comma-spacing': 'error',
-            '@stylistic/comma-style': 'error',
-            '@stylistic/function-call-spacing': 'error',
-            '@stylistic/keyword-spacing': 'off',
-            '@stylistic/linebreak-style': 'error',
-
-            '@stylistic/lines-around-comment': ['error', { beforeBlockComment: false }],
-
-            '@stylistic/no-multiple-empty-lines': 'error',
-            '@stylistic/no-trailing-spaces': 'error',
-            '@stylistic/rest-spread-spacing': 'error',
-            '@stylistic/semi': 'error',
-            '@stylistic/space-before-blocks': 'error',
-            '@stylistic/space-in-parens': 'error',
-            '@stylistic/space-infix-ops': 'error',
-            '@stylistic/space-unary-ops': 'error',
-            '@stylistic/spaced-comment': 'error',
-            */
-            // #endregion
-
-            // #region node specific rules
-            /*
-            'n/no-extraneous-require': 'error',
-            'n/no-deprecated-api': 'warn',
-            'n/no-missing-import': 'off',
-            'n/no-missing-require': 'off',
-            'n/no-process-exit': 'off',
-            'n/no-unpublished-import': 'off',
-
-            'n/no-unpublished-require': ['error', { allowModules: ['tosource'] }],
-
-            'n/no-unsupported-features/node-builtins': [
-                'error',
-                {
-                    version: '^22.20.0 || ^24',
-                    allowExperimental: true,
-                    ignores: [],
-                },
-            ],
-            */
-            // #endregion
-
-            // github
-            // 'github/no-then': 'warn',
         },
     },
     {