Merge branch 'master' into comfy

Author: neverbiasu

.c8rc.json

@@ -19,7 +19,6 @@
     "core/base-service/loader-test-fixtures",
     "scripts",
     "coverage",
-    "build",
     ".github",
     "**/public/",
     "cypress",

.dockerignore

@@ -1,5 +1,4 @@
 node_modules/
-shields.env
 .git/
 .gitignore
 .github

.github/actions/docusaurus-swizzled-warning/package.json

@@ -1,16 +1,16 @@
 {
-    "name": "docusaurus-swizzled-warning",
-    "version": "0.0.0",
-    "description": "",
-    "main": "index.js",
-    "private": true,
-    "scripts": {
-        "test": "echo \"Error: no test specified\" && exit 1"
-    },
-    "author": "jNullj",
-    "license": "CC0",
-    "dependencies": {
-        "@actions/core": "^1.11.1",
-        "@actions/github": "^6.0.1"
-    }
+  "name": "docusaurus-swizzled-warning",
+  "version": "0.0.0",
+  "description": "",
+  "main": "index.js",
+  "private": true,
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "jNullj",
+  "license": "CC0",
+  "dependencies": {
+    "@actions/core": "^1.11.1",
+    "@actions/github": "^6.0.1"
+  }
 }

.gitignore

@@ -1,22 +1,7 @@
-# Project-specific files
-/Verdana.ttf
-/analytics.json
-/coverage.html
-/redis
-/ServerScript
-/private
-/index.html
-/shields.env
-badge-maker/package-lock.json
-
 # Folder view configuration files
 .DS_Store
 Desktop.ini
 
-# Thumbnail cache files
-._*
-Thumbs.db
-
 # Visual Studio Code User Settings
 .vscode/settings.json
 *.code-workspace
@@ -32,64 +17,20 @@ Thumbs.db
 # Jetbrains
 /.idea
 
-# Created by https://www.gitignore.io/api/node
-
-### Node ###
-# Logs
-logs
-*.log
-
-# Runtime data
-pids
-*.pid
-*.seed
-*.pid.lock
-
-# Directory for instrumented libs generated by jscoverage/JSCover
-lib-cov
-
 # Coverage directory used by tools like istanbul
 coverage
 
-# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
-.grunt
-
-# Bower dependency directory (https://bower.io/)
-bower_components
-
-# node-waf configuration
-.lock-wscript
-
-# Compiled binary addons (http://nodejs.org/api/addons.html)
-build/Release
-
 # Dependency directories
 node_modules/
-jspm_packages/
-
-# Typescript v1 declaration files
-typings/
-
-# Optional npm cache directory
-.npm
-
-# Optional eslint cache
-.eslintcache
 
-# Optional REPL history
-.node_repl_history
-
-# Output of 'npm pack'
-*.tgz
-
-# Yarn Integrity file
-.yarn-integrity
+# Node logs produced by profiling
+logs
+*.log
 
-# dotenv environment variables file
-.env
+# Lock file for badge-maker
+badge-maker/package-lock.json
 
 # Temporary build artifacts.
-/build
 frontend/categories/*.yaml
 
 # Local runtime configuration.

.prettierignore

@@ -1,14 +1,7 @@
-package.json
 package-lock.json
 /__snapshots__
-/.next
-.cache
 /api-docs
-/build
 public
 /coverage
-private/*.json
-/.nyc_output
-analytics.json
 frontend/.docusaurus
 frontend/categories

config/custom-environment-variables.yml

@@ -101,7 +101,6 @@ private:
   npm_token: 'NPM_TOKEN'
   obs_user: 'OBS_USER'
   obs_pass: 'OBS_PASS'
-  redis_url: 'REDIS_URL'
   opencollective_token: 'OPENCOLLECTIVE_TOKEN'
   pepy_key: 'PEPY_KEY'
   postgres_url: 'POSTGRES_URL'

core/server/server.js

@@ -193,7 +193,6 @@ const privateConfigSchema = Joi.object({
   npm_token: Joi.string(),
   obs_user: Joi.string(),
   obs_pass: Joi.string(),
-  redis_url: Joi.string().uri({ scheme: ['redis', 'rediss'] }),
   opencollective_token: Joi.string(),
   pepy_key: Joi.string(),
   postgres_url: Joi.string().uri({ scheme: 'postgresql' }),

jsdoc.json

@@ -1,14 +1,6 @@
 {
   "source": {
-    "exclude": [
-      "__snapshots__",
-      "build",
-      "coverage",
-      "logo",
-      "node_modules",
-      "private",
-      "public"
-    ],
+    "exclude": ["__snapshots__", "coverage", "node_modules", "public"],
     "excludePattern": ".+\\.(service|spec|tester)\\.js$"
   },
   "plugins": ["plugins/markdown"],

server.js

@@ -1,6 +1,3 @@
-import fs from 'fs'
-import path from 'path'
-import { fileURLToPath } from 'url'
 import configModule from 'config'
 import * as Sentry from '@sentry/node'
 import Server from './core/server/server.js'
@@ -16,7 +13,7 @@ Sentry.init({
     )
     if (filtered.length !== integrations.length - disabledIntegrations.length) {
       throw Error(
-        `An error occurred while filtering integrations. The following inetgrations were found: ${integrations.map(
+        `An error occurred while filtering integrations. The following integrations were found: ${integrations.map(
           ({ name }) => name,
         )}`,
       )
@@ -35,31 +32,6 @@ if (process.argv[3]) {
 console.log('Configuration:')
 console.dir(config.public, { depth: null })
 
-if (fs.existsSync('.env')) {
-  console.error(
-    'Legacy .env file found. It should be deleted and replaced with environment variables or config/local.yml',
-  )
-  process.exit(1)
-}
-
-if (config.private.redis_url != null) {
-  console.error(
-    'RedisTokenPersistence has been removed. Migrate to SqlTokenPersistence',
-  )
-  process.exit(1)
-}
-
-const legacySecretsPath = path.join(
-  path.dirname(fileURLToPath(import.meta.url)),
-  'private',
-  'secret.json',
-)
-if (fs.existsSync(legacySecretsPath)) {
-  console.error(
-    `Legacy secrets file found at ${legacySecretsPath}. It should be deleted and secrets replaced with environment variables or config/local.yml`,
-  )
-  process.exit(1)
-}
 export const server = new Server(config)
 
 process.on('SIGTERM', async () => {

services/greasyfork/greasyfork-downloads.service.js

@@ -19,7 +19,7 @@ export default class GreasyForkInstalls extends BaseGreasyForkService {
           },
           {
             name: 'scriptId',
-            example: '407466',
+            example: '545651',
           },
         ),
       },