Update test script to use node

This PR contains the following updates:

| Package | Type | Update | Change |
|---|---|---|---|
| [np](https://github.com/sindresorhus/np) | devDependencies | major | [`^9.0.0` -> `^10.0.0`](https://renovatebot.com/diffs/npm/np/9.2.0/10.0.2) |

---

### Release Notes

<details>
<summary>sindresorhus/np (np)</summary>

### [`v10.0.2`](https://github.com/sindresorhus/np/releases/tag/v10.0.2)

[Compare Source](https://github.com/sindresorhus/np/compare/v10.0.1...v10.0.2)

-   Use npm for tagging versions when pnpm is the chosen package manager ([#&#8203;739](https://github.com/sindresorhus/np/issues/739))  [`770418f`](https://github.com/sindresorhus/np/commit/770418f)

### [`v10.0.1`](https://github.com/sindresorhus/np/releases/tag/v10.0.1)

[Compare Source](https://github.com/sindresorhus/np/compare/v10.0.0...v10.0.1)

-   Fix compatibility with npm 10 ([#&#8203;737](https://github.com/sindresorhus/np/issues/737))  [`9fdebd5`](https://github.com/sindresorhus/np/commit/9fdebd5)

### [`v10.0.0`](https://github.com/sindresorhus/np/releases/tag/v10.0.0)

[Compare Source](https://github.com/sindresorhus/np/compare/v9.2.0...v10.0.0)

##### Breaking

-   Remove the `--yarn` flag ([#&#8203;730](https://github.com/sindresorhus/np/issues/730))  [`4b3b599`](https://github.com/sindresorhus/np/commit/4b3b599)
    -   The functionality is replaced by `--package-manager`. See below.

##### Improvements

-   Add `--package-manager` flag ([#&#8203;730](https://github.com/sindresorhus/np/issues/730))  [`4b3b599`](https://github.com/sindresorhus/np/commit/4b3b599)
    -   This acts like the [`packageManager` field](https://nodejs.org/api/packages.html#packagemanager) in package.json. `np` will default to reading package.json, and look for lockfiles to determine the best package manager as a last resort.
-   Add pnpm support ([#&#8203;730](https://github.com/sindresorhus/np/issues/730))  [`4b3b599`](https://github.com/sindresorhus/np/commit/4b3b599)

</details>

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box

---

This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4wLjAiLCJ1cGRhdGVkSW5WZXIiOiIzNy4wLjAiLCJ0YXJnZXRCcmFuY2giOiJkZXZlbG9wIn0=-->

Reviewed-on: https://gitea.vylpes.xyz/RabbitLabs/vylbot-app/pulls/415
Co-authored-by: Renovate Bot <renovate@vylpes.com>
Co-committed-by: Renovate Bot <renovate@vylpes.com>

.drone.yml

@@ -7,7 +7,7 @@ steps:
 - name: deploy
   image: appleboy/drone-ssh
   settings:
-    host: 192.168.68.121
+    host: 192.168.1.115
     username: vylpes
     password:
       from_secret: ssh_password
@@ -28,7 +28,7 @@ steps:
 - name: stage
   image: appleboy/drone-ssh
   settings:
-    host: 192.168.68.121
+    host: 192.168.1.115
     username: vylpes
     password:
       from_secret: ssh_password
@@ -54,11 +54,11 @@ steps:
   - yarn install --frozen-lockfile
   - yarn build
 
-- name: test
-  image: node
-  commands:
-  - yarn install --frozen-lockfile
-  - yarn test
+# - name: test
+#   image: node
+#   commands:
+#   - yarn install --frozen-lockfile
+#   - yarn test
 
 trigger:
   branch:

.env.example

@@ -7,7 +7,7 @@
 # any secret values.
 
 BOT_TOKEN=
-BOT_VER=3.1.1
+BOT_VER=3.2.1
 BOT_AUTHOR=Vylpes
 BOT_OWNERID=147392775707426816
 BOT_CLIENTID=682942374040961060
@@ -15,6 +15,8 @@ BOT_CLIENTID=682942374040961060
 ABOUT_FUNDING=https://ko-fi.com/vylpes
 ABOUT_REPO=https://gitea.vylpes.xyz/RabbitLabs/vylbot-app
 
+CACHE_INTERVAL=1800000 # 30 minutes
+
 DB_HOST=127.0.0.1
 DB_PORT=3101
 DB_NAME=vylbot

.forgejo/workflows/production.yml

@@ -0,0 +1,67 @@
+name: Deploy To Production
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  build:
+    environment: prod
+
+    runs-on: node
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Use Node.js
+      uses: actions/setup-node@v1
+      with:
+        node-version: 18.x
+    - run: npm ci
+    - run: npm run build
+    - run: npm test
+
+    - name: "Copy files over to location"
+      run: cp -r . ${{ secrets.PROD_REPO_PATH }}
+
+  deploy:
+    environment: prod
+    needs: build
+    runs-on: node
+    steps:
+    - uses: https://github.com/appleboy/ssh-action@v1.0.0
+      env:
+        DB_NAME: ${{ secrets.PROD_DB_NAME }}
+        DB_AUTH_USER: ${{ secrets.PROD_DB_AUTH_USER }}
+        DB_AUTH_PASS: ${{ secrets.PROD_DB_AUTH_PASS }}
+        DB_HOST: ${{ secrets.PROD_DB_HOST }}
+        DB_PORT: ${{ secrets.PROD_DB_PORT }}
+        DB_ROOT_HOST: ${{ secrets.PROD_DB_ROOT_HOST }}
+        DB_SYNC: ${{ secrets.PROD_DB_SYNC }}
+        DB_LOGGING: ${{ secrets.PROD_DB_LOGGING }}
+        DB_DATA_LOCATION: ${{ secrets.PROD_DB_DATA_LOCATION }}
+        SERVER_PATH: ${{ secrets.PROD_SSH_SERVER_PATH }}
+        BOT_TOKEN: ${{ secrets.PROD_BOT_TOKEN }}
+        BOT_VER: ${{ vars.PROD_BOT_VER }}
+        BOT_AUTHOR: ${{ vars.PROD_BOT_AUTHOR }}
+        BOT_OWNERID: ${{ vars.PROD_BOT_OWNERID }}
+        BOT_CLIENTID: ${{ vars.PROD_BOT_CLIENTID }}
+        ABOUT_FUNDING: ${{ vars.PROD_ABOUT_FUNDING }}
+        ABOUT_REPO: ${{ vars.PROD_ABOUT_REPO }}
+        CACHE_INTERVAL: ${{ vars.PROD_CACHE_INTERVAL }}
+      with:
+        host: ${{ secrets.PROD_SSH_HOST }}
+        username: ${{ secrets.PROD_SSH_USER }}
+        key: ${{ secrets.PROD_SSH_KEY }}
+        port: ${{ secrets.PROD_SSH_PORT }}
+        envs: DB_NAME,DB_AUTH_USER,DB_AUTH_PASS,DB_HOST,DB_PORT,DB_ROOT_HOST,DB_SYNC,DB_LOGGING,DB_DATA_LOCATION,BOT_TOKEN,BOT_VER,BOT_AUTHOR,BOT_OWNERID,BOT_CLIENTID,ABOUT_FUNDING,ABOUT_REPO,CACHE_INTERVAL
+        script: |
+          source .sshrc \
+          && cd /home/vylpes/apps/vylbot/vylbot_prod \
+          && docker compose down \
+          && (pm2 stop vylbot_prod || true) \
+          && (pm2 delete vylbot_prod || true) \
+          && docker compose up -d \
+          && sleep 10 \
+          && npm run db:up \
+          && pm2 start --name vylbot_prod dist/vylbot.js

.forgejo/workflows/stage.yml

@@ -0,0 +1,67 @@
+name: Deploy To Stage
+
+on:
+  push:
+    branches:
+      - develop
+
+jobs:
+  build:
+    environment: prod
+
+    runs-on: node
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Use Node.js
+      uses: actions/setup-node@v1
+      with:
+        node-version: 18.x
+    - run: npm ci
+    - run: npm run build
+    - run: npm test
+
+    - name: "Copy files over to location"
+      run: cp -r . ${{ secrets.STAGE_REPO_PATH }}
+
+  deploy:
+    environment: prod
+    needs: build
+    runs-on: node
+    steps:
+    - uses: https://github.com/appleboy/ssh-action@v1.0.0
+      env:
+        DB_NAME: ${{ secrets.STAGE_DB_NAME }}
+        DB_AUTH_USER: ${{ secrets.STAGE_DB_AUTH_USER }}
+        DB_AUTH_PASS: ${{ secrets.STAGE_DB_AUTH_PASS }}
+        DB_HOST: ${{ secrets.STAGE_DB_HOST }}
+        DB_PORT: ${{ secrets.STAGE_DB_PORT }}
+        DB_ROOT_HOST: ${{ secrets.STAGE_DB_ROOT_HOST }}
+        DB_SYNC: ${{ secrets.STAGE_DB_SYNC }}
+        DB_LOGGING: ${{ secrets.STAGE_DB_LOGGING }}
+        DB_DATA_LOCATION: ${{ secrets.STAGE_DB_DATA_LOCATION }}
+        SERVER_PATH: ${{ secrets.STAGE_SSH_SERVER_PATH }}
+        BOT_TOKEN: ${{ secrets.STAGE_BOT_TOKEN }}
+        BOT_VER: ${{ vars.STAGE_BOT_VER }}
+        BOT_AUTHOR: ${{ vars.STAGE_BOT_AUTHOR }}
+        BOT_OWNERID: ${{ vars.STAGE_BOT_OWNERID }}
+        BOT_CLIENTID: ${{ vars.STAGE_BOT_CLIENTID }}
+        ABOUT_FUNDING: ${{ vars.STAGE_ABOUT_FUNDING }}
+        ABOUT_REPO: ${{ vars.STAGE_ABOUT_REPO }}
+        CACHE_INTERVAL: ${{ vars.STAGE_CACHE_INTERVAL }}
+      with:
+        host: ${{ secrets.STAGE_SSH_HOST }}
+        username: ${{ secrets.STAGE_SSH_USER }}
+        key: ${{ secrets.STAGE_SSH_KEY }}
+        port: ${{ secrets.STAGE_SSH_PORT }}
+        envs: DB_NAME,DB_AUTH_USER,DB_AUTH_PASS,DB_HOST,DB_PORT,DB_ROOT_HOST,DB_SYNC,DB_LOGGING,DB_DATA_LOCATION,BOT_TOKEN,BOT_VER,BOT_AUTHOR,BOT_OWNERID,BOT_CLIENTID,ABOUT_FUNDING,ABOUT_REPO,CACHE_INTERVAL
+        script: |
+          source .sshrc \
+          && cd /home/vylpes/apps/vylbot/vylbot_stage \
+          && docker compose down \
+          && (pm2 stop vylbot_stage || true) \
+          && (pm2 delete vylbot_stage || true) \
+          && docker compose up -d \
+          && sleep 10 \
+          && npm run db:up \
+          && pm2 start --name vylbot_stage dist/vylbot.js

.forgejo/workflows/test.yml

@@ -0,0 +1,24 @@
+name: Test
+
+on:
+  push:
+    branches:
+      - feature/*
+      - hotfix/*
+      - renovate/*
+
+jobs:
+  build:
+    environment: stage
+
+    runs-on: node
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Use Node.js
+      uses: actions/setup-node@v1
+      with:
+        node-version: 18.x
+    - run: npm ci
+    - run: npm run build
+    - run: npm test

.gitea/PULL_REQUEST_TEMPLATE.md

@@ -24,6 +24,6 @@ Please describe the tests that you ran to verify the changes. Provide instructio
 - [ ] I have commented my code, particularly in hard-to-understand areas
 - [ ] I have made corresponding changes to the documentation
 - [ ] My changes generate no new warnings
-- [ ] I have added tests that provde my fix is effective or that my feature works
+- [ ] I have added tests that provide my fix is effective or that my feature works
 - [ ] New and existing unit tests pass locally with my changes
 - [ ] Any dependent changes have been merged and published in downstream modules

.prod.env

@@ -1,24 +0,0 @@
-# Security Warning! Do not commit this file to any VCS!
-# This is a local file to speed up development process,
-# so you don't have to change your environment variables.
-#
-# This is not applied to `.env.template`!
-# Template files must be committed to the VCS, but must not contain
-# any secret values.
-
-BOT_TOKEN=
-BOT_VER=3.1.1
-BOT_AUTHOR=Vylpes
-BOT_OWNERID=147392775707426816
-BOT_CLIENTID=680083120896081954
-
-ABOUT_FUNDING=https://ko-fi.com/vylpes
-ABOUT_REPO=https://gitea.vylpes.xyz/RabbitLabs/vylbot-app
-
-DB_HOST=127.0.0.1
-DB_PORT=3121
-DB_NAME=vylbot
-DB_AUTH_USER=prod
-DB_AUTH_PASS=prod
-DB_SYNC=false
-DB_LOGGING=false

.stage.env

@@ -1,24 +0,0 @@
-# Security Warning! Do not commit this file to any VCS!
-# This is a local file to speed up development process,
-# so you don't have to change your environment variables.
-#
-# This is not applied to `.env.template`!
-# Template files must be committed to the VCS, but must not contain
-# any secret values.
-
-BOT_TOKEN=
-BOT_VER=3.1.1
-BOT_AUTHOR=Vylpes
-BOT_OWNERID=147392775707426816
-BOT_CLIENTID=1016767908740857949
-
-ABOUT_FUNDING=https://ko-fi.com/vylpes
-ABOUT_REPO=https://gitea.vylpes.xyz/RabbitLabs/vylbot-app
-
-DB_HOST=127.0.0.1
-DB_PORT=3111
-DB_NAME=vylbot
-DB_AUTH_USER=stage
-DB_AUTH_PASS=stage
-DB_SYNC=false
-DB_LOGGING=false

data/usage/config.txt

@@ -26,11 +26,11 @@ event.message.delete.channel: Sets the channel the bot will log message delete e
 event.message.update.enabled: Enables/Disables the message delete log event (Default: "false")
 event.message.update.channel: Sets the channel the bot will log message delete events to (Default: "message-logs")
 
-event.member.add.enabled: Enables/Disables the message delete log event (Default: "false")
-event.member.add.channel: Sets the channel the bot will log message delete events to (Default: "member-logs")
+event.member.add.enabled: Enables/Disables the member join log event (Default: "false")
+event.member.add.channel: Sets the channel the bot will log member join events to (Default: "member-logs")
 
-event.member.remove.enabled: Enables/Disables the message delete log event (Default: "false")
-event.member.remove.channel: Sets the channel the bot will log message delete events to (Default: "member-logs")
+event.member.remove.enabled: Enables/Disables the member leave log event (Default: "false")
+event.member.remove.channel: Sets the channel the bot will log member leave events to (Default: "member-logs")
 
-event.member.update.enabled: Enables/Disables the message delete log event (Default: "false")
-event.member.update.channel: Sets the channel the bot will log message delete events to (Default: "member-logs")
+event.member.update.enabled: Enables/Disables the member update log event (Default: "false")
+event.member.update.channel: Sets the channel the bot will log member update events to (Default: "member-logs")

database/3.2.1/1709316734401-AddServerCacheDate/Up/01-Server.sql

@@ -0,0 +1,2 @@
+ALTER TABLE server
+ADD LastCached datetime NOT NULL DEFAULT '2024-03-01 18:10:04';

docker-compose.prod.yml

@@ -1,31 +0,0 @@
-version: "3.9"
-
-volumes:
-  prod_database_data:
-
-services:
-  # discord:
-  #   build: .
-
-  database:
-    image: mysql/mysql-server
-    command: --default-authentication-plugin=mysql_native_password
-    restart: always
-    environment:
-      - MYSQL_DATABASE=vylbot
-      - MYSQL_USER=prod
-      - MYSQL_PASSWORD=prod
-      - MYSQL_ROOT_PASSWORD=root
-      - MYSQL_ROOT_HOST=0.0.0.0
-    ports:
-      - "3121:3306"
-    volumes:
-      - prod_database_data:/var/lib/mysql
-
-  phpmyadmin:
-    image: phpmyadmin
-    restart: always
-    ports:
-      - "3122:80"
-    environment:
-      - PMA_ARBITRARY=1

docker-compose.stage.yml

@@ -1,31 +0,0 @@
-version: "3.9"
-
-volumes:
-  stage_database_data:
-
-services:
-  # discord:
-  #   build: .
-
-  database:
-    image: mysql/mysql-server
-    command: --default-authentication-plugin=mysql_native_password
-    restart: always
-    environment:
-      - MYSQL_DATABASE=vylbot
-      - MYSQL_USER=stage
-      - MYSQL_PASSWORD=stage
-      - MYSQL_ROOT_PASSWORD=root
-      - MYSQL_ROOT_HOST=0.0.0.0
-    ports:
-      - "3111:3306"
-    volumes:
-      - stage_database_data:/var/lib/mysql
-
-  phpmyadmin:
-    image: phpmyadmin
-    restart: always
-    ports:
-      - "3112:80"
-    environment:
-      - PMA_ARBITRARY=1

docker-compose.yml

@@ -1,31 +1,17 @@
 version: "3.9"
 
-volumes:
-  dev_database_data:
-
 services:
-  # discord:
-  #   build: .
-
   database:
     image: mysql/mysql-server
     command: --default-authentication-plugin=mysql_native_password
     restart: always
     environment:
-      - MYSQL_DATABASE=vylbot
-      - MYSQL_USER=dev
-      - MYSQL_PASSWORD=dev
-      - MYSQL_ROOT_PASSWORD=root
-      - MYSQL_ROOT_HOST=0.0.0.0
+      - MYSQL_DATABASE=$DB_NAME
+      - MYSQL_USER=$DB_AUTH_USER
+      - MYSQL_PASSWORD=$DB_AUTH_PASS
+      - MYSQL_ROOT_PASSWORD=$DB_AUTH_PASS
+      - MYSQL_ROOT_HOST=$DB_ROOT_HOST
     ports:
-      - "3101:3306"
+      - "$DB_PORT:3306"
     volumes:
-      - dev_database_data:/var/lib/mysql
-
-  phpmyadmin:
-    image: phpmyadmin
-    restart: always
-    ports:
-      - "3102:80"
-    environment:
-      - PMA_ARBITRARY=1
+      - $DB_DATA_LOCATION:/var/lib/mysql

package.json

@@ -1,6 +1,6 @@
 {
   "name": "vylbot-app",
-  "version": "3.1.2",
+  "version": "3.2.2",
   "description": "A discord bot made for Vylpes' Den",
   "main": "./dist/vylbot",
   "typings": "./dist",
@@ -11,6 +11,7 @@
     "test": "echo true",
     "db:up": "typeorm migration:run -d dist/database/dataSources/appDataSource.js",
     "db:down": "typeorm migration:revert -d dist/database/dataSources/appDataSource.js",
+    "db:create": "typeorm migration:create ./src/database/migrations",
     "release": "np --no-publish"
   },
   "repository": {
@@ -26,7 +27,7 @@
   "homepage": "https://github.com/Vylpes/vylbot-app",
   "funding": "https://ko-fi.com/vylpes",
   "dependencies": {
-    "@discordjs/rest": "^1.1.0",
+    "@discordjs/rest": "^2.0.0",
     "@types/jest": "^29.0.0",
     "@types/uuid": "^9.0.0",
     "discord.js": "^14.3.0",
@@ -34,18 +35,19 @@
     "emoji-regex": "^10.0.0",
     "jest": "^29.0.0",
     "jest-mock-extended": "^3.0.0",
-    "minimatch": "9.0.2",
+    "minimatch": "9.0.3",
     "mysql": "^2.18.1",
-    "random-bunny": "^2.0.5",
+    "random-bunny": "^2.1.6",
     "ts-jest": "^29.0.0",
-    "typeorm": "0.3.17"
+    "typeorm": "0.3.20"
   },
   "resolutions": {
-    "**/semver": "^7.5.2"
+    "**/semver": "^7.5.2",
+    "**/undici": "^6.0.0"
   },
   "devDependencies": {
     "@types/node": "^20.0.0",
-    "np": "^8.0.4",
+    "np": "^10.0.0",
     "typescript": "^5.0.0"
   }
 }

src/buttonEvents/verify.ts

@@ -0,0 +1,42 @@
+import { ButtonInteraction, CacheType } from "discord.js";
+import { ButtonEvent } from "../type/buttonEvent";
+import SettingsHelper from "../helpers/SettingsHelper";
+
+export default class Verify extends ButtonEvent {
+    public override async execute(interaction: ButtonInteraction<CacheType>) {
+        if (!interaction.guildId || !interaction.guild) return;
+
+        const roleName = await SettingsHelper.GetSetting("verification.role", interaction.guildId);
+
+        if (!roleName) return;
+
+        const role = interaction.guild.roles.cache.find(x => x.name == roleName);
+
+        if (!role) {
+            await interaction.reply({
+                content: `Unable to find the role, ${roleName}`,
+                ephemeral: true,
+            });
+
+            return;
+        }
+
+        const member = interaction.guild.members.cache.find(x => x.id == interaction.user.id);
+
+        if (!member || !member.manageable) {
+            await interaction.reply({
+                content: "Unable to give role to user",
+                ephemeral: true,
+            });
+
+            return;
+        }
+
+        await member.roles.add(role);
+
+        await interaction.reply({
+            content: "Given role",
+            ephemeral: true,
+        });
+    }
+}

src/client/client.ts

@@ -1,4 +1,4 @@
-import { Client } from "discord.js";
+import { Client, Partials } from "discord.js";
 import * as dotenv from "dotenv";
 import { createConnection } from "typeorm";
 import { EventType } from "../constants/EventType";
@@ -9,10 +9,14 @@ import { Command } from "../type/command";
 import { Events } from "./events";
 import { Util } from "./util";
 import AppDataSource from "../database/dataSources/appDataSource";
+import ButtonEventItem from "../contracts/ButtonEventItem";
+import { ButtonEvent } from "../type/buttonEvent";
+import CacheHelper from "../helpers/CacheHelper";
 
 export class CoreClient extends Client {
     private static _commandItems: ICommandItem[];
     private static _eventItems: IEventItem[];
+    private static _buttonEvents: ButtonEventItem[];
 
     private _events: Events;
     private _util: Util;
@@ -25,12 +29,17 @@ export class CoreClient extends Client {
         return this._eventItems;
     }
 
-    constructor(intents: number[]) {
-        super({ intents: intents });
+    public static get buttonEvents(): ButtonEventItem[] {
+        return this._buttonEvents;
+    }
+
+    constructor(intents: number[], partials: Partials[]) {
+        super({ intents: intents, partials: partials });
         dotenv.config();
 
         CoreClient._commandItems = [];
         CoreClient._eventItems = [];
+        CoreClient._buttonEvents = [];
 
         this._events = new Events();
         this._util = new Util();
@@ -51,6 +60,10 @@ export class CoreClient extends Client {
 
         await super.login(process.env.BOT_TOKEN);
 
+        this.guilds.cache.forEach(async (guild) => {
+            await CacheHelper.UpdateServerCache(guild);
+        });
+
         this._util.loadEvents(this, CoreClient._eventItems);
         this._util.loadSlashCommands(this);
     }
@@ -73,4 +86,13 @@ export class CoreClient extends Client {
 
         CoreClient._eventItems.push(item);
     }
+
+    public static RegisterButtonEvent(buttonId: string, event: ButtonEvent) {
+        const item: ButtonEventItem = {
+            ButtonId: buttonId,
+            Event: event,
+        };
+
+        CoreClient._buttonEvents.push(item);
+    }
 }

src/client/events.ts

@@ -1,40 +1,18 @@
 import { Interaction } from "discord.js";
-import ICommandItem from "../contracts/ICommandItem";
-import SettingsHelper from "../helpers/SettingsHelper";
-import { CoreClient } from "./client";
+import ChatInputCommand from "./interactionCreate/chatInputCommand";
+import Button from "./interactionCreate/button";
 
 export class Events {
     public async onInteractionCreate(interaction: Interaction) {
-        if (!interaction.isChatInputCommand()) return;
         if (!interaction.guildId) return;
 
-        const disabledCommandsString = await SettingsHelper.GetSetting("commands.disabled", interaction.guildId);
-        const disabledCommands = disabledCommandsString?.split(",");
-
-        const disabledCommandsMessage = await SettingsHelper.GetSetting("commands.disabled.message", interaction.guildId);
-
-        if (disabledCommands?.find(x => x == interaction.commandName)) {
-            await interaction.reply(disabledCommandsMessage || "This command is disabled.");
-            return;
+        if (interaction.isChatInputCommand()) {
+            ChatInputCommand.onChatInput(interaction);
         }
 
-        const item = CoreClient.commandItems.find(x => x.Name == interaction.commandName && !x.ServerId);
-        const itemForServer = CoreClient.commandItems.find(x => x.Name == interaction.commandName && x.ServerId == interaction.guildId);
-
-        let itemToUse: ICommandItem;
-
-        if (!itemForServer) {
-            if (!item) {
-                await interaction.reply('Command not found');
-                return;
-            }
-
-            itemToUse = item;
-        } else {
-            itemToUse = itemForServer;
+        if (interaction.isButton()) {
+            Button.onButtonClicked(interaction);
         }
-
-        itemToUse.Command.execute(interaction);
     }
 
     // Emit when bot is logged in and ready to use

src/client/interactionCreate/button.ts

@@ -0,0 +1,17 @@
+import { ButtonInteraction } from "discord.js";
+import { CoreClient } from "../client";
+
+export default class Button {
+    public static async onButtonClicked(interaction: ButtonInteraction) {
+        if (!interaction.isButton) return;
+
+        const item = CoreClient.buttonEvents.find(x => x.ButtonId == interaction.customId.split(" ")[0]);
+
+        if (!item) {
+            await interaction.reply("Event not found.");
+            return;
+        }
+
+        item.Event.execute(interaction);
+    }
+}

src/client/interactionCreate/chatInputCommand.ts

@@ -0,0 +1,27 @@
+import { Interaction } from "discord.js";
+import { CoreClient } from "../client";
+import ICommandItem from "../../contracts/ICommandItem";
+
+export default class ChatInputCommand {
+    public static async onChatInput(interaction: Interaction) {
+        if (!interaction.isChatInputCommand()) return;
+
+        const item = CoreClient.commandItems.find(x => x.Name == interaction.commandName && !x.ServerId);
+        const itemForServer = CoreClient.commandItems.find(x => x.Name == interaction.commandName && x.ServerId == interaction.guildId);
+
+        let itemToUse: ICommandItem;
+
+        if (!itemForServer) {
+            if (!item) {
+                await interaction.reply("Command not found.");
+                return;
+            }
+
+            itemToUse = item;
+        } else {
+            itemToUse = itemForServer;
+        }
+
+        itemToUse.Command.execute(interaction);
+    }
+}

src/client/util.ts

@@ -37,7 +37,7 @@ export class Util {
                 .flatMap(x => x.Command.CommandBuilder);
 
             if (!client.guilds.cache.has(guild)) continue;
-            
+
             rest.put(
                 Routes.applicationGuildCommands(process.env.BOT_CLIENTID!, guild),
                 {

src/commands/501231711271780357/Lobby/add.ts

@@ -6,7 +6,7 @@ export default class AddRole extends Command {
     constructor() {
         super();
 
-        super.CommandBuilder = new SlashCommandBuilder()
+        this.CommandBuilder = new SlashCommandBuilder()
             .setName('addlobby')
             .setDescription('Add lobby channel')
             .setDefaultMemberPermissions(PermissionsBitField.Flags.ModerateMembers)

src/commands/501231711271780357/Lobby/list.ts

@@ -7,7 +7,7 @@ export default class ListLobby extends Command {
     constructor() {
         super();
 
-        super.CommandBuilder = new SlashCommandBuilder()
+        this.CommandBuilder = new SlashCommandBuilder()
             .setName('listlobby')
             .setDescription('Lists all channels set up as lobbies')
             .setDefaultMemberPermissions(PermissionsBitField.Flags.ModerateMembers);

src/commands/501231711271780357/Lobby/lobby.ts

@@ -6,7 +6,7 @@ export default class Lobby extends Command {
     constructor() {
         super();
 
-        super.CommandBuilder = new SlashCommandBuilder()
+        this.CommandBuilder = new SlashCommandBuilder()
             .setName('lobby')
             .setDescription('Attempt to organise a lobby');
     }

src/commands/501231711271780357/Lobby/remove.ts

@@ -7,7 +7,7 @@ export default class RemoveLobby extends Command {
     constructor() {
         super();
 
-        super.CommandBuilder = new SlashCommandBuilder()
+        this.CommandBuilder = new SlashCommandBuilder()
             .setName('removelobby')
             .setDescription('Remove a lobby channel')
             .setDefaultMemberPermissions(PermissionsBitField.Flags.ModerateMembers)

src/commands/501231711271780357/entry.ts

@@ -7,7 +7,7 @@ export default class Entry extends Command {
     constructor() {
         super();
 
-        super.CommandBuilder = new SlashCommandBuilder()
+        this.CommandBuilder = new SlashCommandBuilder()
             .setName('entry')
             .setDescription('Sends the entry embed')
             .setDefaultMemberPermissions(PermissionsBitField.Flags.ModerateMembers);

src/commands/Role/config.ts

@@ -7,7 +7,7 @@ export default class ConfigRole extends Command {
     constructor() {
         super();
 
-        super.CommandBuilder = new SlashCommandBuilder()
+        this.CommandBuilder = new SlashCommandBuilder()
             .setName('configrole')
             .setDescription('Toggle your roles')
             .setDefaultMemberPermissions(PermissionsBitField.Flags.ManageRoles)

src/commands/Role/role.ts

@@ -7,7 +7,7 @@ export default class Role extends Command {
     constructor() {
         super();
 
-        super.CommandBuilder = new SlashCommandBuilder()
+        this.CommandBuilder = new SlashCommandBuilder()
             .setName('role')
             .setDescription('Toggle your roles')
             .addSubcommand(subcommand =>

src/commands/about.ts

@@ -6,7 +6,7 @@ export default class About extends Command {
     constructor() {
         super();
 
-        super.CommandBuilder = new SlashCommandBuilder()
+        this.CommandBuilder = new SlashCommandBuilder()
             .setName('about')
             .setDescription('About VylBot');
     }

src/commands/audits.ts

@@ -9,7 +9,7 @@ export default class Audits extends Command {
     constructor() {
         super();
 
-        super.CommandBuilder = new SlashCommandBuilder()
+        this.CommandBuilder = new SlashCommandBuilder()
             .setName("audits")
             .setDescription("View audits of a particular user in the server")
             .setDefaultMemberPermissions(PermissionsBitField.Flags.ModerateMembers)

src/commands/ban.ts

@@ -9,7 +9,7 @@ export default class Ban extends Command {
     constructor() {
         super();
 
-        super.CommandBuilder = new SlashCommandBuilder()
+        this.CommandBuilder = new SlashCommandBuilder()
             .setName("ban")
             .setDescription("Ban a member from the server with an optional reason")
             .setDefaultMemberPermissions(PermissionsBitField.Flags.BanMembers)
@@ -44,6 +44,7 @@ export default class Ban extends Command {
             .setColor(EmbedColours.Ok)
             .setTitle("Member Banned")
             .setDescription(`<@${targetUser.user.id}> \`${targetUser.user.tag}\``)
+            .setThumbnail(targetUser.user.avatarURL())
             .addFields([
                 {
                     name: "Moderator",

src/commands/bunny.ts

@@ -7,7 +7,7 @@ export default class Bunny extends Command {
     constructor() {
         super();
 
-        super.CommandBuilder = new SlashCommandBuilder()
+        this.CommandBuilder = new SlashCommandBuilder()
             .setName("bunny")
             .setDescription("Get a random picture of a rabbit.");
     }
@@ -15,6 +15,8 @@ export default class Bunny extends Command {
     public override async execute(interaction: CommandInteraction) {
         if (!interaction.isChatInputCommand()) return;
 
+        await interaction.deferReply();
+
         const subreddits = [
             'rabbits',
             'bunnieswithhats',
@@ -37,9 +39,9 @@ export default class Bunny extends Command {
                 .setURL(`https://reddit.com${result.Result!.Permalink}`)
                 .setFooter({ text: `r/${selectedSubreddit} · ${result.Result!.Ups} upvotes`});
 
-            await interaction.reply({ embeds: [ embed ]});
+            await interaction.editReply({ embeds: [ embed ]});
         } else {
-            await interaction.reply("There was an error running this command.");
+            await interaction.editReply("There was an error running this command.");
         }
     }
 }

src/commands/clear.ts

@@ -5,7 +5,7 @@ export default class Clear extends Command {
     constructor() {
         super();
 
-        super.CommandBuilder = new SlashCommandBuilder()
+        this.CommandBuilder = new SlashCommandBuilder()
             .setName("clear")
             .setDescription("Clears the channel of messages")
             .setDefaultMemberPermissions(PermissionsBitField.Flags.ManageMessages)

src/commands/code.ts

@@ -7,7 +7,7 @@ export default class Code extends Command {
     constructor() {
         super();
 
-        super.CommandBuilder = new SlashCommandBuilder()
+        this.CommandBuilder = new SlashCommandBuilder()
             .setName('code')
             .setDescription('Manage the verification code of the server')
             .setDefaultMemberPermissions(PermissionsBitField.Flags.ModerateMembers)

src/commands/config.ts

@@ -10,7 +10,7 @@ export default class Config extends Command {
     constructor() {
         super();
 
-        super.CommandBuilder = new SlashCommandBuilder()
+        this.CommandBuilder = new SlashCommandBuilder()
             .setName('config')
             .setDescription('Configure the current server')
             .setDefaultMemberPermissions(PermissionsBitField.Flags.Administrator)
@@ -116,9 +116,15 @@ export default class Config extends Command {
         const setting = server.Settings.filter(x => x.Key == key.value)[0];
 
         if (setting) {
-            await interaction.reply(`\`${key}\`: \`${setting.Value}\``);
+            await interaction.reply(`\`${key.value}\`: \`${setting.Value}\``);
         } else {
-            await interaction.reply(`\`${key}\`: \`${DefaultValues.GetValue(key.value.toString())}\` <DEFAULT>`);
+            var defaultValue = DefaultValues.GetValue(key.value.toString());
+
+            if (defaultValue) {
+                await interaction.reply(`\`${key.value}\`: \`${defaultValue}\` <DEFAULT>`);
+            } else {
+                await interaction.reply(`\`${key.value}\`: <NONE>`);
+            }
         }
     }
 
@@ -191,4 +197,4 @@ export default class Config extends Command {
 
         await interaction.reply('Setting has been set.');
     }
-}
+}

src/commands/disable.ts

@@ -6,7 +6,7 @@ export default class Disable extends Command {
     constructor() {
         super();
 
-        super.CommandBuilder = new SlashCommandBuilder()
+        this.CommandBuilder = new SlashCommandBuilder()
             .setName('disable')
             .setDescription('Disables a command')
             .setDefaultMemberPermissions(PermissionsBitField.Flags.Administrator)

src/commands/ignore.ts

@@ -6,7 +6,7 @@ export default class Ignore extends Command {
     constructor() {
         super();
 
-        super.CommandBuilder = new SlashCommandBuilder()
+        this.CommandBuilder = new SlashCommandBuilder()
             .setName('ignore')
             .setDescription('Ignore events in this channel')
             .setDefaultMemberPermissions(PermissionsBitField.Flags.Administrator);

src/commands/kick.ts

@@ -9,7 +9,7 @@ export default class Kick extends Command {
     constructor() {
         super();
 
-        super.CommandBuilder = new SlashCommandBuilder()
+        this.CommandBuilder = new SlashCommandBuilder()
             .setName("kick")
             .setDescription("Kick a member from the server with an optional reason")
             .setDefaultMemberPermissions(PermissionsBitField.Flags.KickMembers)
@@ -44,6 +44,7 @@ export default class Kick extends Command {
             .setColor(EmbedColours.Ok)
             .setTitle("Member Kicked")
             .setDescription(`<@${targetUser.user.id}> \`${targetUser.user.tag}\``)
+            .setThumbnail(targetUser.user.avatarURL())
             .addFields([
                 {
                     name: "Moderator",

src/commands/mute.ts

@@ -9,7 +9,7 @@ export default class Mute extends Command {
     constructor() {
         super();
 
-        super.CommandBuilder = new SlashCommandBuilder()
+        this.CommandBuilder = new SlashCommandBuilder()
             .setName("mute")
             .setDescription("(DEPRECATED) Mute a member in the server with an optional reason")
             .setDefaultMemberPermissions(PermissionsBitField.Flags.ModerateMembers)
@@ -42,6 +42,7 @@ export default class Mute extends Command {
             .setColor(EmbedColours.Ok)
             .setTitle("Member Muted")
             .setDescription(`<@${targetUser.user.id}> \`${targetUser.user.tag}\``)
+            .setThumbnail(targetUser.user.avatarURL())
             .addFields([
                 {
                     name: "Moderator",
@@ -53,7 +54,14 @@ export default class Mute extends Command {
                 },
             ]);
 
-        const mutedRole = interaction.guild.roles.cache.find(role => role.name == process.env.ROLES_MUTED);
+        const mutedRoleName = await SettingsHelper.GetSetting('role.muted', interaction.guildId);
+
+        if (!mutedRoleName) {
+            await interaction.reply('Unable to find configuration. Please contact the bot author.');
+            return;
+        }
+
+        const mutedRole = interaction.guild.roles.cache.find(role => role.name == mutedRoleName);
 
         if (!mutedRole) {
             await interaction.reply('Muted role not found.');

src/commands/poll.ts

@@ -7,7 +7,7 @@ export default class Poll extends Command {
     constructor() {
         super();
 
-        super.CommandBuilder = new SlashCommandBuilder()
+        this.CommandBuilder = new SlashCommandBuilder()
             .setName('poll')
             .setDescription('Run a poll, automatically adding reaction emojis as options')
             .addStringOption(option =>

src/commands/rules.ts

@@ -1,7 +1,8 @@
-import { CommandInteraction, EmbedBuilder, PermissionsBitField, SlashCommandBuilder } from "discord.js";
+import { ActionRowBuilder, ButtonBuilder, ButtonStyle, CommandInteraction, EmbedBuilder, PermissionsBitField, SlashCommandBuilder } from "discord.js";
 import { existsSync, readFileSync } from "fs";
 import EmbedColours from "../constants/EmbedColours";
 import { Command } from "../type/command";
+import SettingsHelper from "../helpers/SettingsHelper";
 
 interface IRules {
     title?: string;
@@ -14,13 +15,36 @@ export default class Rules extends Command {
     constructor() {
         super();
 
-        super.CommandBuilder = new SlashCommandBuilder()
-            .setName("rules")
-            .setDescription("Send the rules embeds for this server")
-            .setDefaultMemberPermissions(PermissionsBitField.Flags.Administrator);
+        this.CommandBuilder = new SlashCommandBuilder()
+            .setName('rules')
+            .setDescription("Rules-related commands")
+            .setDefaultMemberPermissions(PermissionsBitField.Flags.Administrator)
+            .addSubcommand(x =>
+                x
+                    .setName('embeds')
+                    .setDescription('Send the rules embeds for this server'))
+            .addSubcommand(x =>
+                x
+                    .setName('access')
+                    .setDescription('Send the server verification embed button'));
     }
 
     public override async execute(interaction: CommandInteraction) {
+        if (!interaction.isChatInputCommand()) return;
+
+        switch (interaction.options.getSubcommand()) {
+            case "embeds":
+                await this.SendEmbeds(interaction);
+                break;
+            case "access":
+                await this.SendAccessButton(interaction);
+                break;
+            default:
+                await interaction.reply("Subcommand doesn't exist.");
+        }
+    }
+
+    private async SendEmbeds(interaction: CommandInteraction) {
         if (!interaction.guildId) return;
 
         if (!existsSync(`${process.cwd()}/data/rules/${interaction.guildId}.json`)) {
@@ -71,4 +95,27 @@ export default class Rules extends Command {
 
         await interaction.reply({ embeds: [ successEmbed ], ephemeral: true });
     }
+
+    private async SendAccessButton(interaction: CommandInteraction) {
+        if (!interaction.guildId) return;
+
+        const buttonLabel = await SettingsHelper.GetSetting("rules.access.label", interaction.guildId);
+
+        const row = new ActionRowBuilder<ButtonBuilder>()
+            .addComponents([
+                new ButtonBuilder()
+                    .setCustomId('verify')
+                    .setStyle(ButtonStyle.Primary)
+                    .setLabel(buttonLabel || "Verify")
+            ]);
+
+        await interaction.channel?.send({
+            components: [ row ]
+        });
+
+        await interaction.reply({
+            content: "Success",
+            ephemeral: true,
+        });
+    }
 }

src/commands/setup.ts

@@ -6,7 +6,7 @@ export default class Setup extends Command {
     constructor() {
         super();
 
-        super.CommandBuilder = new SlashCommandBuilder()
+        this.CommandBuilder = new SlashCommandBuilder()
             .setName('setup')
             .setDescription('Makes the server ready to be configured')
             .setDefaultMemberPermissions(PermissionsBitField.Flags.Administrator);

src/commands/timeout.ts

@@ -10,7 +10,7 @@ export default class Timeout extends Command {
     constructor() {
         super();
 
-        super.CommandBuilder = new SlashCommandBuilder()
+        this.CommandBuilder = new SlashCommandBuilder()
             .setName("timeout")
             .setDescription("Timeouts a user out, sending them a DM with the reason if possible")
             .setDefaultMemberPermissions(PermissionsBitField.Flags.ModerateMembers)
@@ -64,6 +64,7 @@ export default class Timeout extends Command {
             .setColor(EmbedColours.Ok)
             .setTitle("Member Timed Out")
             .setDescription(`<@${targetUser.user.id}> \`${targetUser.user.tag}\``)
+            .setThumbnail(targetUser.user.avatarURL())
             .addFields([
                 {
                     name: "Moderator",

src/commands/unmute.ts

@@ -7,7 +7,7 @@ export default class Unmute extends Command {
     constructor() {
         super();
 
-        super.CommandBuilder = new SlashCommandBuilder()
+        this.CommandBuilder = new SlashCommandBuilder()
             .setName("unmute")
             .setDescription("(DEPRECATED) Unmute a member in the server with an optional reason")
             .setDefaultMemberPermissions(PermissionsBitField.Flags.ModerateMembers)
@@ -40,6 +40,7 @@ export default class Unmute extends Command {
             .setColor(EmbedColours.Ok)
             .setTitle("Member Unmuted")
             .setDescription(`<@${targetUser.user.id}> \`${targetUser.user.tag}\``)
+            .setThumbnail(targetUser.user.avatarURL())
             .addFields([
                 {
                     name: "Moderator",
@@ -51,7 +52,14 @@ export default class Unmute extends Command {
                 },
             ]);
 
-        const mutedRole = interaction.guild.roles.cache.find(role => role.name == process.env.ROLES_MUTED);
+        const mutedRoleName = await SettingsHelper.GetSetting('role.muted', interaction.guildId);
+
+        if (!mutedRoleName) {
+            await interaction.reply('Unable to find configuration. Please contact the bot author.');
+            return;
+        }
+
+        const mutedRole = interaction.guild.roles.cache.find(role => role.name == mutedRoleName);
 
         if (!mutedRole) {
             await interaction.reply('Muted role not found.');

src/commands/warn.ts

@@ -9,7 +9,7 @@ export default class Warn extends Command {
     constructor() {
         super();
 
-        super.CommandBuilder = new SlashCommandBuilder()
+        this.CommandBuilder = new SlashCommandBuilder()
             .setName("warn")
             .setDescription("Warns a member in the server with an optional reason")
             .setDefaultMemberPermissions(PermissionsBitField.Flags.ModerateMembers)
@@ -41,6 +41,7 @@ export default class Warn extends Command {
             .setColor(EmbedColours.Ok)
             .setTitle("Member Warned")
             .setDescription(`<@${targetUser.user.id}> \`${targetUser.user.tag}\``)
+            .setThumbnail(targetUser.user.avatarURL())
             .addFields([
                 {
                     name: "Moderator",

src/constants/DefaultValues.ts

@@ -6,7 +6,7 @@ export default class DefaultValues {
         this.SetValues();
 
         const res = this.values.find(x => x.Key == key);
-        
+
         if (!res) {
             return undefined;
         }
@@ -31,6 +31,7 @@ export default class DefaultValues {
 
             // Rules (Command)
             this.values.push({ Key: "rules.file", Value: "data/rules/rules" });
+            this.values.push({ Key: "rules.access.label", Value: "Verify" });
 
             // Channels
             this.values.push({ Key: "channels.logs.message", Value: "message-logs" });
@@ -46,18 +47,18 @@ export default class DefaultValues {
             // Event
             this.values.push({ Key: "event.message.delete.enabled", Value: "false" });
             this.values.push({ Key: "event.message.delete.channel", Value: "message-logs" });
-            
+
             this.values.push({ Key: "event.message.update.enabled", Value: "false" });
             this.values.push({ Key: "event.message.update.channel", Value: "message-logs" });
-            
+
             this.values.push({ Key: "event.member.add.enabled", Value: "false" });
             this.values.push({ Key: "event.member.add.channel", Value: "member-logs" });
-             
+
             this.values.push({ Key: "event.member.remove.enabled", Value: "false" });
             this.values.push({ Key: "event.member.remove.channel", Value: "member-logs" });
-            
+
             this.values.push({ Key: "event.member.update.enabled", Value: "false" });
-            this.values.push({ Key: "event.member.remove.channel", Value: "member-logs" });
+            this.values.push({ Key: "event.member.update.channel", Value: "member-logs" });
 
         }
     }

src/contracts/ButtonEventItem.ts

@@ -0,0 +1,8 @@
+import { ButtonEvent } from "../type/buttonEvent";
+
+interface ButtonEventItem {
+    ButtonId: string,
+    Event: ButtonEvent,
+}
+
+export default ButtonEventItem;

src/database/entities/Server.ts

@@ -1,4 +1,4 @@
-import { Entity, OneToMany } from "typeorm";
+import { Column, Entity, OneToMany } from "typeorm";
 import BaseEntity from "../../contracts/BaseEntity";
 import Role from "./Role";
 import Setting from "./Setting";
@@ -9,14 +9,22 @@ export default class Server extends BaseEntity {
         super();
 
         this.Id = serverId;
+        this.LastCached = new Date();
     }
 
+    @Column({ default: "2024-03-01 18:10:04" })
+    LastCached: Date;
+
     @OneToMany(() => Setting, x => x.Server)
     Settings: Setting[];
 
     @OneToMany(() => Role, x => x.Server)
     Roles: Role[];
 
+    public UpdateLastCached(lastCached: Date) {
+        this.LastCached = lastCached;
+    }
+
     public AddSettingToServer(setting: Setting) {
         this.Settings.push(setting);
     }

src/database/migrations/3.2.1/1709316734401-AddServerCacheDate.ts

@@ -0,0 +1,15 @@
+import { MigrationInterface, QueryRunner } from "typeorm"
+import MigrationHelper from "../../../helpers/MigrationHelper"
+
+export class AddServerCacheDate1709316734401 implements MigrationInterface {
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        MigrationHelper.Up('1709316734401-AddServerCacheDate', '3.2.1', [
+            "01-Server",
+        ], queryRunner);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+    }
+
+}

src/events/MemberEvents/GuildMemberAdd.ts

@@ -1,10 +1,13 @@
 import { EmbedBuilder, GuildMember, TextChannel } from "discord.js";
 import EmbedColours from "../../constants/EmbedColours";
 import SettingsHelper from "../../helpers/SettingsHelper";
+import CacheHelper from "../../helpers/CacheHelper";
 
 export default async function GuildMemberAdd(member: GuildMember) {
     if (!member.guild) return;
 
+    await CacheHelper.UpdateServerCache(member.guild);
+
     const enabled = await SettingsHelper.GetSetting("event.member.add.enabled", member.guild.id);
     if (!enabled || enabled.toLowerCase() != "true") return;
 

src/events/MemberEvents/GuildMemberRemove.ts

@@ -1,10 +1,13 @@
 import { EmbedBuilder, GuildMember, TextChannel } from "discord.js";
 import EmbedColours from "../../constants/EmbedColours";
 import SettingsHelper from "../../helpers/SettingsHelper";
+import CacheHelper from "../../helpers/CacheHelper";
 
 export default async function GuildMemberRemove(member: GuildMember) {
     if (!member.guild) return;
 
+    await CacheHelper.UpdateServerCache(member.guild);
+
     const enabled = await SettingsHelper.GetSetting("event.member.remove.enabled", member.guild.id);
     if (!enabled || enabled.toLowerCase() != "true") return;
 

src/events/MemberEvents/GuildMemberUpdate.ts

@@ -1,8 +1,13 @@
 import { GuildMember } from "discord.js";
 import NicknameChanged from "./GuildMemberUpdate/NicknameChanged";
+import CacheHelper from "../../helpers/CacheHelper";
 
 export default async function GuildMemberUpdate(oldMember: GuildMember, newMember: GuildMember) {
-    if (oldMember.nickname != newMember.nickname) { // Nickname change
+    const updatedFromCache = await CacheHelper.UpdateServerCache(newMember.guild);
+
+    if (updatedFromCache) return;
+
+    if (oldMember.nickname !== newMember.nickname) { // Nickname change
         await NicknameChanged(oldMember, newMember);
     }
 }

src/events/MessageEvents/MessageCreate.ts

@@ -1,11 +1,14 @@
 import { Message } from "discord.js";
 import SettingsHelper from "../../helpers/SettingsHelper";
 import VerificationCheck from "./MessageCreate/VerificationCheck";
+import CacheHelper from "../../helpers/CacheHelper";
 
 export default async function MessageCreate(message: Message) {
     if (!message.guild) return;
     if (message.author.bot) return;
 
+    await CacheHelper.UpdateServerCache(message.guild);
+
     const isVerificationEnabled = await SettingsHelper.GetSetting("verification.enabled", message.guild.id);
 
     if (isVerificationEnabled && isVerificationEnabled.toLocaleLowerCase() == "true") {

src/events/MessageEvents/MessageDelete.ts

@@ -2,11 +2,14 @@ import { EmbedBuilder, Message, TextChannel } from "discord.js";
 import EmbedColours from "../../constants/EmbedColours";
 import IgnoredChannel from "../../database/entities/IgnoredChannel";
 import SettingsHelper from "../../helpers/SettingsHelper";
+import CacheHelper from "../../helpers/CacheHelper";
 
 export default async function MessageDelete(message: Message) {
     if (!message.guild) return;
     if (message.author.bot) return;
 
+    await CacheHelper.UpdateServerCache(message.guild);
+
     const enabled = await SettingsHelper.GetSetting("event.message.delete.enabled", message.guild.id);
     if (!enabled || enabled.toLowerCase() != "true") return;
 
@@ -33,8 +36,8 @@ export default async function MessageDelete(message: Message) {
     if (message.attachments.size > 0) {
         embed.addFields([
             {
-                name: "Attachments",
-                value: `\`\`\`${message.attachments.map(x => x.url).join("\n")}\`\`\``
+                name: `Attachments (${message.attachments.size})`,
+                value: `\`\`\`${message.attachments.map(x => x.name).join("\n")}\`\`\``
             }
         ]);
     }

src/events/MessageEvents/MessageUpdate.ts

@@ -2,10 +2,14 @@ import { EmbedBuilder, Message, TextChannel } from "discord.js";
 import EmbedColours from "../../constants/EmbedColours";
 import IgnoredChannel from "../../database/entities/IgnoredChannel";
 import SettingsHelper from "../../helpers/SettingsHelper";
+import CacheHelper from "../../helpers/CacheHelper";
 
 export default async function MessageUpdate(oldMessage: Message, newMessage: Message) {
     if (!newMessage.guild) return;
     if (newMessage.author.bot) return;
+
+    await CacheHelper.UpdateServerCache(newMessage.guild);
+
     if (oldMessage.content == newMessage.content) return;
 
     const enabled = await SettingsHelper.GetSetting("event.message.update.enabled", newMessage.guild.id);

src/helpers/CacheHelper.ts

@@ -0,0 +1,33 @@
+import { Guild } from "discord.js";
+import Server from "../database/entities/Server";
+
+export default class CacheHelper {
+    public static async UpdateServerCache(guild: Guild): Promise<boolean> {
+        const cacheInterval = process.env.CACHE_INTERVAL;
+
+        if (!cacheInterval) return false;
+
+        let server = await Server.FetchOneById(Server, guild.id);
+
+        if (!server) {
+            server = new Server(guild.id);
+            await server.Save(Server, server);
+
+            await CacheHelper.UpdateCache(guild);
+
+            return true;
+        } else if (server.LastCached.getTime() + Number(cacheInterval) > Date.now()) {
+            await CacheHelper.UpdateCache(guild);
+
+            return true;
+        }
+
+        return false;
+    }
+
+    private static async UpdateCache(guild: Guild) {
+        console.log(`Updating cache for ${guild.name} (${guild.id})`);
+
+        await guild.members.fetch();
+    }
+}

src/registry.ts

@@ -37,6 +37,9 @@ import MessageDelete from "./events/MessageEvents/MessageDelete";
 import MessageUpdate from "./events/MessageEvents/MessageUpdate";
 import MessageCreate from "./events/MessageEvents/MessageCreate";
 
+// Button Event Imports
+import Verify from "./buttonEvents/verify";
+
 export default class Registry {
     public static RegisterCommands() {
         CoreClient.RegisterCommand("about", new About());
@@ -84,4 +87,8 @@ export default class Registry {
         CoreClient.RegisterEvent(EventType.MessageUpdate, MessageUpdate);
         CoreClient.RegisterEvent(EventType.MessageCreate, MessageCreate);
     }
+
+    public static RegisterButtonEvents() {
+        CoreClient.RegisterButtonEvent("verify", new Verify());
+    }
 }

src/type/buttonEvent.ts

@@ -0,0 +1,5 @@
+import { ButtonInteraction } from "discord.js";
+
+export abstract class ButtonEvent {
+    abstract execute(interaction: ButtonInteraction): Promise<void>;
+}

src/vylbot.ts

@@ -1,7 +1,7 @@
 import { CoreClient } from "./client/client";
 import * as dotenv from "dotenv";
 import registry from "./registry";
-import { IntentsBitField } from "discord.js";
+import { IntentsBitField, Partials } from "discord.js";
 
 dotenv.config();
 
@@ -30,9 +30,13 @@ const client = new CoreClient([
     IntentsBitField.Flags.GuildMessages,
     IntentsBitField.Flags.GuildMembers,
     IntentsBitField.Flags.MessageContent,
+], [
+    Partials.GuildMember,
+    Partials.User,
 ]);
 
 registry.RegisterCommands();
 registry.RegisterEvents();
+registry.RegisterButtonEvents();
 
 client.start();