Merge branch 'master' into fix/slash-unban-reason-validation

Author: p6y6

.cursorignore

@@ -0,0 +1,93 @@
+# Created by .ignore support plugin (hsz.mobi)
+### Node template
+# Logs
+/logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+.clinic
+.clinic-bot
+.clinic-api
+
+# 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
+
+# nyc test coverage
+.nyc_output
+
+# 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 (https://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
+
+# dotenv environment variables file
+*.env
+.env
+
+# windows folder options
+desktop.ini
+
+# PHPStorm
+.idea/
+
+# Misc
+/convert.js
+/startscript.js
+.cache
+npm-ls.txt
+npm-audit.txt
+.vscode/launch.json
+
+# Debug files
+*.debug.ts
+*.debug.js
+
+.vscode/
+
+config-errors.txt
+/config-schema.json
+
+*.tsbuildinfo
+
+# Legacy data folders
+/docker/development/data
+/docker/production/data

.dockerignore

@@ -8,6 +8,8 @@
 
 **/node_modules
 **/dist
+**/.pnpm-store
+**/.docker
 
 **/*.log
 **/npm-debug.log*
@@ -35,6 +37,7 @@
 # Debug files
 **/*.debug.ts
 **/*.debug.js
+/debug
 
 **/.vscode
 

.env.example

@@ -50,6 +50,9 @@ DEVELOPMENT_SSH_PASSWORD=password
 # If your user has a different UID than 1000, you might have to fill that in here to avoid permission issues
 #DEVELOPMENT_UID=1000
 
+# If using the cftunnel docker compose profile, set your Cloudflare Tunnel token here
+#CF_TUNNEL_TOKEN=
+
 
 # ==========================
 # PRODUCTION - STANDALONE

.gitattributes

@@ -1 +1,2 @@
 package-lock.json binary
+pnpm-lock.yaml binary

.github/workflows/codequality.yml

@@ -6,18 +6,18 @@ jobs:
   build:
     runs-on: ubuntu-latest
 
-    strategy:
-      matrix:
-        node-version: [22]
-
     steps:
-    - uses: actions/checkout@v1
-    - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v1
+    - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
+
+    - uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903
       with:
-        node-version: ${{ matrix.node-version }}
-    - name: npm install, lint, code style check
-      run: |
-        npm ci
-        npm run lint
-        npm run codestyle-check
+        node-version: 24
+
+    - uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061
+      with:
+        version: 10.19.0
+        run_install: true
+
+    - run: |
+        pnpm run lint
+        pnpm run codestyle-check

.gitignore

@@ -40,6 +40,7 @@ build/Release
 # Dependency directories
 node_modules/
 jspm_packages/
+.pnpm-store
 
 # Typescript v1 declaration files
 typings/

.nvmrc

@@ -1 +1 @@
-22
+24

AGENTS.md

@@ -0,0 +1,21 @@
+The project is called Zeppelin. It's a Discord bot that uses Discord.js. The bot is built on the Vety framework (formerly called Knub).
+
+This repository is a monorepository that contains these projects:
+1. **Backend**: The shared codebase of the bot and API. Located in `backend`.
+2. **Dashboard**: The web dashboard that contains the bot's management interface and documentation. Located in `dashboard`.
+3. **Config checker**: A tool to check the configuration of the bot. Located in `config-checker`.
+
+There is also a `shared` folder that contains shared code used by all projects, such as types and utilities.
+
+# Backend
+The backend codebase is located in the `backend` directory. It contains the main bot code, API code, and shared code used by both the bot and API.
+Zeppelin's functionality is split into plugins, which are located in the `src/plugins` directory.
+Each plugin has its own directory, with a `types.ts` for config types, `docs.ts` for a `ZeppelinPluginDocs` structure, and the plugin's main file.
+Each plugin has an internal name, such as "common". In this example, the folder would be `src/plugins/Common` (note the capitalization). The plugin's main file would be `src/plugins/CommonPlugin.ts`.
+There are two types of plugins: "guild plugins" and "global plugins". Guild plugins are loaded on a per-guild basis, while global plugins are loaded once for the entire bot.
+Plugins can specify dependencies on other plugins and call their public methods. Likewise, plugins can specify public methods in the main file.
+Available plugins are specified in `src/plugins/availablePlugins.ts`.
+
+Zeppelin's data layer uses TypeORM. Entities are located in `src/data/entities`, while repositories are in `src/data`. If the repository name is prefixed with "Guild", it's a guild-specific repository. If it's prefixed with "User", it's a user-specific repository. If it has no prefix, it's a global repository.
+
+Environment variables are parsed in `src/env.ts`.

Dockerfile

@@ -1,12 +1,15 @@
-FROM node:22 AS build
+FROM node:24 AS build
 
 RUN mkdir /zeppelin
 RUN chown node:node /zeppelin
 
+# Install pnpm
+RUN npm install -g [email protected]
+
 USER node
 
 # Install dependencies before copying over any other files
-COPY --chown=node:node package.json package-lock.json /zeppelin
+COPY --chown=node:node package.json pnpm-workspace.yaml pnpm-lock.yaml /zeppelin
 RUN mkdir /zeppelin/backend
 COPY --chown=node:node backend/package.json /zeppelin/backend
 RUN mkdir /zeppelin/shared
@@ -15,23 +18,30 @@ RUN mkdir /zeppelin/dashboard
 COPY --chown=node:node dashboard/package.json /zeppelin/dashboard
 
 WORKDIR /zeppelin
-RUN npm ci
+RUN CI=true pnpm install
 
 COPY --chown=node:node . /zeppelin
 
 # Build backend
 WORKDIR /zeppelin/backend
-RUN npm run build
+RUN pnpm run build
 
 # Build dashboard
 WORKDIR /zeppelin/dashboard
-RUN npm run build
+RUN pnpm run build
 
-# Prune dev dependencies
+# Only keep prod dependencies
 WORKDIR /zeppelin
-RUN npm prune --omit=dev
+RUN CI=true pnpm install --prod
+
+
+# --- Main image ---
 
-FROM node:22-alpine AS main
+FROM node:24-alpine AS main
+
+RUN npm install -g [email protected]
 
 USER node
 COPY --from=build --chown=node:node /zeppelin /zeppelin
+
+WORKDIR /zeppelin

backend/package.json

@@ -11,78 +11,74 @@
     "watch": "tsc-watch --build --onSuccess \"node start-dev.js\"",
     "watch-yaml-parse-test": "tsc-watch --build --onSuccess \"node dist/yamlParseTest.js\"",
     "build": "tsc --build",
-    "start-bot-dev": "node --enable-source-maps --stack-trace-limit=30 --inspect=0.0.0.0:9229 dist/index.js",
-    "start-bot-dev-debug": "DEBUG=true clinic heapprofiler --collect-only --dest .clinic-bot -- node --enable-source-maps --stack-trace-limit=30 --inspect=0.0.0.0:9229 dist/index.js",
-    "start-bot-prod": "node --enable-source-maps --stack-trace-limit=30 dist/index.js",
-    "start-bot-prod-debug": "DEBUG=true clinic heapprofiler --collect-only --dest .clinic-bot -- node --enable-source-maps --stack-trace-limit=30 dist/index.js",
-    "watch-bot": "tsc-watch --build --onSuccess \"npm run start-bot-dev\"",
+    "typecheck": "tsc --noEmit",
+    "start-bot-dev": "node --enable-source-maps --stack-trace-limit=30 --trace-warnings --inspect=0.0.0.0:9229 dist/index.js",
+    "start-bot-prod": "node --enable-source-maps --stack-trace-limit=30 --trace-warnings dist/index.js",
+    "watch-bot": "tsc-watch --build --onSuccess \"pnpm run start-bot-dev\"",
     "start-api-dev": "node --enable-source-maps --stack-trace-limit=30 --inspect=0.0.0.0:9239 dist/api/index.js",
-    "start-api-dev-debug": "DEBUG=true clinic heapprofiler --collect-only --dest .clinic-api -- node --enable-source-maps --stack-trace-limit=30 --inspect=0.0.0.0:9239 dist/api/index.js",
     "start-api-prod": "node --enable-source-maps --stack-trace-limit=30 dist/api/index.js",
-    "start-api-prod-debug": "clinic heapprofiler --collect-only --dest .clinic-api -- node --enable-source-maps --stack-trace-limit=30 dist/api/index.js",
-    "watch-api": "tsc-watch --build --onSuccess \"npm run start-api-dev\"",
-    "typeorm": "node ../node_modules/typeorm/cli.js",
-    "migrate": "npm run typeorm -- migration:run -d dist/data/dataSource.js",
-    "migrate-prod": "npm run migrate",
-    "migrate-dev": "npm run build && npm run migrate",
-    "migrate-rollback": "npm run typeorm -- migration:revert -d dist/data/dataSource.js",
-    "migrate-rollback-prod": "npm run migrate-rollback",
-    "migrate-rollback-dev": "npm run build && npm run migrate-rollback",
+    "watch-api": "tsc-watch --build --onSuccess \"pnpm run start-api-dev\"",
+    "migrate": "pnpm exec typeorm migration:run -d dist/data/dataSource.js",
+    "migrate-prod": "pnpm run migrate",
+    "migrate-dev": "pnpm run build && pnpm run migrate",
+    "migrate-rollback": "pnpm exec typeorm migration:revert -d dist/data/dataSource.js",
+    "migrate-rollback-prod": "pnpm run migrate-rollback",
+    "migrate-rollback-dev": "pnpm run build && pnpm run migrate-rollback",
     "validate-active-configs": "node --enable-source-maps dist/validateActiveConfigs.js > ../config-errors.txt",
     "export-config-json-schema": "node --enable-source-maps dist/exportSchemas.js ../config-checker/public/config-schema.json",
-    "test": "npm run build && npm run run-tests",
+    "test": "pnpm run build && pnpm run run-tests",
     "run-tests": "ava",
-    "test-watch": "tsc-watch --build --onSuccess \"npx ava\""
+    "test-watch": "tsc-watch --build --onSuccess \"pnpm exec ava\""
   },
   "dependencies": {
     "@silvia-odwyer/photon-node": "^0.3.1",
+    "@zeppelinbot/shared": "workspace:*",
     "bufferutil": "^4.0.3",
-    "clinic": "^13.0.0",
     "cors": "^2.8.5",
     "cross-env": "^7.0.3",
     "deep-diff": "^1.0.2",
-    "discord.js": "^14.19.3",
+    "discord.js": "*",
     "emoji-regex": "^8.0.0",
     "escape-string-regexp": "^1.0.5",
     "express": "^4.20.0",
     "fp-ts": "^2.0.1",
     "humanize-duration": "^3.15.0",
     "js-yaml": "^4.1.0",
-    "knub": "^32.0.0-next.25",
     "knub-command-manager": "^9.1.0",
     "last-commit-log": "^2.1.0",
     "lodash-es": "^4.17.21",
     "moment-timezone": "^0.5.21",
-    "multer": "^1.4.5-lts.1",
+    "multer": "^2.0.2",
     "mysql2": "^3.9.8",
     "parse-color": "^1.0.0",
     "passport": "^0.6.0",
     "passport-custom": "^1.0.5",
     "passport-oauth2": "^1.6.1",
     "pkg-up": "^3.1.0",
+    "redis": "^5.9.0",
     "reflect-metadata": "^0.1.12",
     "regexp-worker": "^1.1.0",
     "safe-regex": "^2.0.2",
     "seedrandom": "^3.0.1",
     "strip-combining-marks": "^1.0.0",
     "threads": "^1.7.0",
     "tlds": "^1.221.1",
-    "tmp": "0.0.33",
+    "tmp": "0.2.5",
     "tsconfig-paths": "^3.9.0",
     "twemoji": "^12.1.4",
-    "typeorm": "^0.3.17",
+    "typeorm": "^0.3.27",
     "utf-8-validate": "^5.0.5",
     "uuid": "^9.0.0",
+    "vety": "1.0.0-rc2",
     "yawn-yaml": "github:dragory/yawn-yaml#string-number-fix-build",
-    "zod": "^3.25.17"
+    "zod": "^4.1.12"
   },
   "devDependencies": {
     "@types/cors": "^2.8.5",
     "@types/express": "^4.16.1",
     "@types/jest": "^24.0.15",
     "@types/js-yaml": "^3.12.1",
     "@types/lodash-es": "^4.17.12",
-    "@types/moment-timezone": "^0.5.6",
     "@types/multer": "^1.4.7",
     "@types/passport": "^1.0.0",
     "@types/passport-oauth2": "^1.4.8",
@@ -92,9 +88,7 @@
     "@types/twemoji": "^12.1.0",
     "@types/uuid": "^9.0.2",
     "ava": "^5.3.1",
-    "rimraf": "^2.6.2",
-    "source-map-support": "^0.5.16",
-    "zod-to-json-schema": "^3.22.3"
+    "source-map-support": "^0.5.16"
   },
   "ava": {
     "files": [