Merge branch 'dev' into 'main'

Dev

See merge request illegitimate/illegitimate-bot!178

.devcontainer/Dockerfile

@@ -0,0 +1,6 @@
+FROM node:20.9.0-alpine3.18
+
+RUN apk add git fish openssh gnupg
+RUN yarn global add typescript ts-node nodemon
+
+RUN mkdir -p /root/.ssh

.devcontainer/devcontainer.json

@@ -0,0 +1,46 @@
+{
+	// "remoteUser": "vscode",
+	"name": "Illegitimate dev",
+	"build": {
+		"context": "..",
+		"dockerfile": "./Dockerfile"
+	},
+
+	"mounts": [
+		"source=${localEnv:HOME}/.ssh/gitlab,target=/root/.ssh/gitlab,type=bind",
+		"source=${localEnv:HOME}/.ssh/config,target=/root/.ssh/config,type=bind",
+		"source=${localEnv:HOME}/.wakatime.cfg,target=/root/.wakatime.cfg,type=bind"
+	],
+
+	"postCreateCommand": "chmod 600 -R /root/.ssh",
+	"customizations": {
+		"vscode": {
+			"extensions": [
+				"dbaeumer.vscode-eslint",
+				"eamodio.gitlens",
+				"tal7aouy.icons",
+				"oderwat.indent-rainbow",
+				"ms-vscode.vscode-typescript-next",
+				"mongodb.mongodb-vscode",
+				"quicktype.quicktype",
+				"esbenp.prettier-vscode",
+				"YoavBls.pretty-ts-errors",
+				"rangav.vscode-thunder-client",
+				"WakaTime.vscode-wakatime",
+				"gamunu.vscode-yarn"
+			]
+		}
+	}
+
+	// Features to add to the dev container. More info: https://containers.dev/features.
+	// "features": { }
+
+	// Use 'forwardPorts' to make a list of ports inside the container available locally.
+	// "forwardPorts": [],
+
+	// Uncomment the next line to run commands after the container is created.
+
+	// Configure tool-specific properties.
+	// "customizations": {},
+
+}

.dockerignore

@@ -1,15 +1,19 @@
+.devcontainer
 .git
+.vscode
+dist/
 node_modules
 scripts
-.clang-format
 .dockerignore
 .env
 .env.example
+.eslintignore
 .eslintrc.js
 .gitignore
 .gitlab-ci.yml
+.prettierrc.js
 docker-compose.yml
 Dockerfile
 Dockerfile.cache
-nodemon-ts.json
+nodemon-js.json
 nodemon.json

Dockerfile

@@ -1,15 +1,11 @@
 FROM node-cache as cache
-
 FROM node:20.9.0-alpine3.18
 
 COPY --from=cache /cache/node_modules /app/node_modules
 COPY . /app
 
 WORKDIR /app
-
 ENV NODE_PATH=dist/
-
-RUN yarn global add typescript
 RUN yarn build
 
 CMD [ "yarn", "start" ]

nodemon.json

@@ -9,7 +9,9 @@
   "env": {
     "NODE_PATH": "src/",
     "NODE_ENV": "dev",
-    "TYPESCRIPT": "true"
+    "TYPESCRIPT": "true",
+    "TS_NODE_FILES": "true",
+    "TS_NODE_TRANSPILE_ONLY": "true"
   },
   "ext": "ts, json"
 }

src/commands/dev-info.ts

@@ -5,7 +5,7 @@ import {
 } from "discord.js"
 import { Command } from "interfaces"
 
-const command: Command = {
+export = {
     name: "dev-info",
     description: "Test command for the bot.",
     type: "slash",
@@ -33,6 +33,4 @@ const command: Command = {
 
         await interaction.reply({ content: "Test command.", ephemeral: true })
     },
-}
-
-export = command
+} as Command

src/commands/timeout.ts

@@ -10,7 +10,7 @@ import { Command } from "interfaces"
 import ms from "ms"
 import logToChannel from "utils/functions/logtochannel"
 
-const command: Command = {
+export = {
     name: "timeout",
     description: "Times out a memeber",
     type: "slash",
@@ -177,6 +177,4 @@ const command: Command = {
             ],
         })
     },
-}
-
-export = command
+} as Command

src/events/server/ready/status.ts

@@ -1,4 +1,4 @@
-import statuses = require("config/statuses.json")
+import statuses from "config/statuses.json"
 import { Event } from "interfaces"
 import { ExtendedClient as Client } from "utils/Client"