Merge pull request #1079 from LEDBrain/dev

fix: Bug in Settings.ts command file

.husky/commit-msg

@@ -0,0 +1,3 @@
+[ -n "$CI" ] && exit 0
+
+npx --no -- commitlint --edit $1

.husky/pre-commit

@@ -1,3 +1,3 @@
 [ -n "$CI" ] && exit 0
 
-npm run lint
+npx lint-staged

commitlint.config.cjs

@@ -0,0 +1 @@
+module.exports = { extends: ['@commitlint/config-conventional'] };

package.json

@@ -39,25 +39,28 @@
         "joi": "^17.13.1",
         "jsdom": "^24.0.0",
         "node-libcurl": "^4.0.0",
-        "zod": "^3.23.6"
+        "zod": "^3.23.7"
     },
     "devDependencies": {
+        "@commitlint/cli": "^19.3.0",
+        "@commitlint/config-conventional": "^19.2.2",
         "@hapi/code": "^9.0.3",
         "@hapi/iron": "^7.0.0",
         "@hapi/lab": "^25.2.0",
         "@tsconfig/node16": "^16.1.3",
         "@types/hapi__catbox": "^10.2.6",
         "@types/jsdom": "^21.1.6",
         "@types/ms": "^0.7.34",
-        "@types/node": "^20.12.8",
+        "@types/node": "^20.12.10",
         "@types/node-fetch": "^2.6.11",
         "@typescript-eslint/eslint-plugin": "^7.8.0",
         "@typescript-eslint/parser": "^7.8.0",
         "c8": "^9.1.0",
         "cz-conventional-changelog": "^3.3.0",
-        "esbuild": "0.20.2",
+        "esbuild": "0.21.1",
         "eslint": "^8.56.0",
         "husky": "^9.0.11",
+        "lint-staged": "^15.2.2",
         "prettier": "^3.2.5",
         "prisma": "^5.13.0",
         "rimraf": "^5.0.5",
@@ -72,6 +75,9 @@
     "publishConfig": {
         "access": "restricted"
     },
+    "lint-staged": {
+        "*.{js,ts}": "npm run lint"
+    },
     "overrides": {
         "@sapphire/shapeshift": "3.9.2"
     },

src/commands/Settings.ts

@@ -5,9 +5,9 @@ import {
     SlashCommandBuilder,
     inlineCode,
 } from 'discord.js';
-import { client } from 'index.js';
 import type { Config } from '../base/Command.js';
 import Command from '../base/Command.js';
+import { client } from '../index.js';
 
 export default class Ping extends Command {
     constructor() {

src/env.ts

@@ -10,6 +10,8 @@ export const env = createEnv({
         DISCORD_CLIENT_SECRET: z.string().min(1),
         DISCORD_REDIRECT_URI: z.string().url().min(1),
 
+        DISCORD_ADMIN_ID: z.string().min(1),
+
         COOKIE_SECRET: z.string().min(32),
         DATABASE_URL: z.string().url().min(1),
 

src/events/MessageCreate.ts

@@ -5,6 +5,7 @@ import type { Message } from 'discord.js';
 import { ChannelType } from 'discord.js';
 import type Client from '../base/Client.js';
 import Event from '../base/Event.js';
+import { env } from 'env.js';
 
 export default class MessageCreate extends Event {
     constructor() {
@@ -13,7 +14,7 @@ export default class MessageCreate extends Event {
     public async execute(_: Client, message: Message) {
         if (
             message.content.toLowerCase() === 'deploy' &&
-            message.author.id === '199964094357307392' // Change this to the bot admin/dev id
+            message.author.id === env.DISCORD_ADMIN_ID
         ) {
             console.log(`Deploying...`);
             (await import('../deploy')).default();