62 changed files with 2565 additions and 2535 deletions
--- a/.env.example
+++ b/.env.example
@ -7,7 +7,7 @@
 # any secret values.

 BOT_TOKEN=
-BOT_VER=3.2.3
+BOT_VER=3.1.1
 BOT_AUTHOR=Vylpes
 BOT_OWNERID=147392775707426816
 BOT_CLIENTID=682942374040961060
@ -15,8 +15,6 @@ 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
--- a/.drone.yml
+++ b/.drone.yml
@ -7,7 +7,7 @@ steps:
 - name: deploy
  image: appleboy/drone-ssh
  settings:
-    host: 192.168.1.115
+    host: 192.168.68.121
    username: vylpes
    password:
      from_secret: ssh_password
@ -28,7 +28,7 @@ steps:
 - name: stage
  image: appleboy/drone-ssh
  settings:
-    host: 192.168.1.115
+    host: 192.168.68.121
    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:
--- a/.forgejo/workflows/production.yml
+++ b/.forgejo/workflows/production.yml
@ -1,67 +0,0 @@
-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: yarn install --frozen-lockfile
-    - run: yarn build
-    - run: yarn 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 \
-          && yarn db:up \
-          && pm2 start --name vylbot_prod dist/vylbot.js
--- a/.forgejo/workflows/stage.yml
+++ b/.forgejo/workflows/stage.yml
@ -1,67 +0,0 @@
-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: yarn install --frozen-lockfile
-    - run: yarn build
-    - run: yarn 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 \
-          && yarn db:up \
-          && pm2 start --name vylbot_stage dist/vylbot.js
--- a/.forgejo/workflows/test.yml
+++ b/.forgejo/workflows/test.yml
@ -1,24 +0,0 @@
-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: yarn install --frozen-lockfile
-    - run: yarn build
-    - run: yarn test
--- a/.gitea/PULL_REQUEST_TEMPLATE.md
+++ b/.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 provide my fix is effective or that my feature works
+- [ ] I have added tests that provde 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
--- a/.gitignore
+++ b/.gitignore
@ -105,5 +105,4 @@ dist

 config.json
 .DS_Store
-ormconfig.json
-.temp/
+ormconfig.json
--- a/.prod.env
+++ b/.prod.env
@ -0,0 +1,24 @@
+# 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
--- a/.stage.env
+++ b/.stage.env
@ -0,0 +1,24 @@
+# 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
--- a/data/usage/config.txt
+++ b/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 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.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.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.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.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")
+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")
--- a/database/3.2.1/1709316734401-AddServerCacheDate/Up/01-Server.sql
+++ b/database/3.2.1/1709316734401-AddServerCacheDate/Up/01-Server.sql
@ -1,2 +0,0 @@
-ALTER TABLE server
-ADD LastCached datetime NOT NULL DEFAULT '2024-03-01 18:10:04';
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@ -0,0 +1,31 @@
+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
--- a/docker-compose.stage.yml
+++ b/docker-compose.stage.yml
@ -0,0 +1,31 @@
+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
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -1,17 +1,31 @@
 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=$DB_NAME
-      - MYSQL_USER=$DB_AUTH_USER
-      - MYSQL_PASSWORD=$DB_AUTH_PASS
-      - MYSQL_ROOT_PASSWORD=$DB_AUTH_PASS
-      - MYSQL_ROOT_HOST=$DB_ROOT_HOST
+      - MYSQL_DATABASE=vylbot
+      - MYSQL_USER=dev
+      - MYSQL_PASSWORD=dev
+      - MYSQL_ROOT_PASSWORD=root
+      - MYSQL_ROOT_HOST=0.0.0.0
    ports:
-      - "$DB_PORT:3306"
+      - "3101:3306"
    volumes:
-      - $DB_DATA_LOCATION:/var/lib/mysql
+      - dev_database_data:/var/lib/mysql
+
+  phpmyadmin:
+    image: phpmyadmin
+    restart: always
+    ports:
+      - "3102:80"
+    environment:
+      - PMA_ARBITRARY=1
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "vylbot-app",
-  "version": "3.2.3",
+  "version": "3.1.1",
  "description": "A discord bot made for Vylpes' Den",
  "main": "./dist/vylbot",
  "typings": "./dist",
@ -8,10 +8,9 @@
    "clean": "rm -rf node_modules/ dist/",
    "build": "tsc",
    "start": "node ./dist/vylbot",
-    "test": "echo true",
+    "test": "jest",
    "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": {
@ -27,7 +26,7 @@
  "homepage": "https://github.com/Vylpes/vylbot-app",
  "funding": "https://ko-fi.com/vylpes",
  "dependencies": {
-    "@discordjs/rest": "^2.0.0",
+    "@discordjs/rest": "^1.1.0",
    "@types/jest": "^29.0.0",
    "@types/uuid": "^9.0.0",
    "discord.js": "^14.3.0",
@ -35,19 +34,18 @@
    "emoji-regex": "^10.0.0",
    "jest": "^29.0.0",
    "jest-mock-extended": "^3.0.0",
-    "minimatch": "9.0.3",
+    "minimatch": "9.0.2",
    "mysql": "^2.18.1",
-    "random-bunny": "^2.1.6",
+    "random-bunny": "^2.0.5",
    "ts-jest": "^29.0.0",
-    "typeorm": "0.3.20"
+    "typeorm": "0.3.17"
  },
  "resolutions": {
-    "**/semver": "^7.5.2",
-    "**/undici": "^6.0.0"
+    "**/semver": "^7.5.2"
  },
  "devDependencies": {
    "@types/node": "^20.0.0",
-    "np": "^10.0.0",
+    "np": "^8.0.4",
    "typescript": "^5.0.0"
  }
 }
--- a/src/buttonEvents/verify.ts
+++ b/src/buttonEvents/verify.ts
@ -1,42 +0,0 @@
-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,
-        });
-    }
-}
--- a/src/client/client.ts
+++ b/src/client/client.ts
@ -1,4 +1,4 @@
-import { Client, Partials } from "discord.js";
+import { Client } from "discord.js";
 import * as dotenv from "dotenv";
 import { createConnection } from "typeorm";
 import { EventType } from "../constants/EventType";
@ -9,14 +9,10 @@ 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;
@ -29,17 +25,12 @@ export class CoreClient extends Client {
        return this._eventItems;
    }

-    public static get buttonEvents(): ButtonEventItem[] {
-        return this._buttonEvents;
-    }
-
-    constructor(intents: number[], partials: Partials[]) {
-        super({ intents: intents, partials: partials });
+    constructor(intents: number[]) {
+        super({ intents: intents });
        dotenv.config();

        CoreClient._commandItems = [];
        CoreClient._eventItems = [];
-        CoreClient._buttonEvents = [];

        this._events = new Events();
        this._util = new Util();
@ -60,10 +51,6 @@ 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);
    }
@ -86,13 +73,4 @@ 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);
-    }
 }
--- a/src/client/events.ts
+++ b/src/client/events.ts
@ -1,18 +1,40 @@
 import { Interaction } from "discord.js";
-import ChatInputCommand from "./interactionCreate/chatInputCommand";
-import Button from "./interactionCreate/button";
+import ICommandItem from "../contracts/ICommandItem";
+import SettingsHelper from "../helpers/SettingsHelper";
+import { CoreClient } from "./client";

 export class Events {
    public async onInteractionCreate(interaction: Interaction) {
+        if (!interaction.isChatInputCommand()) return;
        if (!interaction.guildId) return;

-        if (interaction.isChatInputCommand()) {
-            ChatInputCommand.onChatInput(interaction);
+        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.isButton()) {
-            Button.onButtonClicked(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;
        }
+
+        itemToUse.Command.execute(interaction);
    }

    // Emit when bot is logged in and ready to use
--- a/src/client/interactionCreate/button.ts
+++ b/src/client/interactionCreate/button.ts
@ -1,17 +0,0 @@
-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);
-    }
-}
--- a/src/client/interactionCreate/chatInputCommand.ts
+++ b/src/client/interactionCreate/chatInputCommand.ts
@ -1,27 +0,0 @@
-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);
-    }
-}
--- a/src/client/util.ts
+++ b/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),
                {
--- a/src/commands/501231711271780357/Lobby/add.ts
+++ b/src/commands/501231711271780357/Lobby/add.ts
@ -6,7 +6,7 @@ export default class AddRole extends Command {
    constructor() {
        super();

-        this.CommandBuilder = new SlashCommandBuilder()
+        super.CommandBuilder = new SlashCommandBuilder()
            .setName('addlobby')
            .setDescription('Add lobby channel')
            .setDefaultMemberPermissions(PermissionsBitField.Flags.ModerateMembers)
--- a/src/commands/501231711271780357/Lobby/list.ts
+++ b/src/commands/501231711271780357/Lobby/list.ts
@ -7,7 +7,7 @@ export default class ListLobby extends Command {
    constructor() {
        super();

-        this.CommandBuilder = new SlashCommandBuilder()
+        super.CommandBuilder = new SlashCommandBuilder()
            .setName('listlobby')
            .setDescription('Lists all channels set up as lobbies')
            .setDefaultMemberPermissions(PermissionsBitField.Flags.ModerateMembers);
--- a/src/commands/501231711271780357/Lobby/lobby.ts
+++ b/src/commands/501231711271780357/Lobby/lobby.ts
@ -6,7 +6,7 @@ export default class Lobby extends Command {
    constructor() {
        super();

-        this.CommandBuilder = new SlashCommandBuilder()
+        super.CommandBuilder = new SlashCommandBuilder()
            .setName('lobby')
            .setDescription('Attempt to organise a lobby');
    }
--- a/src/commands/501231711271780357/Lobby/remove.ts
+++ b/src/commands/501231711271780357/Lobby/remove.ts
@ -7,7 +7,7 @@ export default class RemoveLobby extends Command {
    constructor() {
        super();

-        this.CommandBuilder = new SlashCommandBuilder()
+        super.CommandBuilder = new SlashCommandBuilder()
            .setName('removelobby')
            .setDescription('Remove a lobby channel')
            .setDefaultMemberPermissions(PermissionsBitField.Flags.ModerateMembers)
--- a/src/commands/501231711271780357/entry.ts
+++ b/src/commands/501231711271780357/entry.ts
@ -1,4 +1,4 @@
-import { CommandInteraction, EmbedBuilder, PermissionsBitField, SlashCommandBuilder, TextChannel } from "discord.js";
+import { CommandInteraction, EmbedBuilder, PermissionsBitField, SlashCommandBuilder } from "discord.js";
 import EmbedColours from "../../constants/EmbedColours";
 import SettingsHelper from "../../helpers/SettingsHelper";
 import { Command } from "../../type/command";
@ -7,7 +7,7 @@ export default class Entry extends Command {
    constructor() {
        super();

-        this.CommandBuilder = new SlashCommandBuilder()
+        super.CommandBuilder = new SlashCommandBuilder()
            .setName('entry')
            .setDescription('Sends the entry embed')
            .setDefaultMemberPermissions(PermissionsBitField.Flags.ModerateMembers);
@ -24,8 +24,6 @@ export default class Entry extends Command {
            .setTitle("Welcome")
            .setDescription(`Welcome to the server! Please make sure to read the rules in the <#${rulesChannelId}> channel and type the code found there in here to proceed to the main part of the server.`);

-        const channel = interaction.channel as TextChannel;
-
-        await channel.send({ embeds: [ embed ]});
+        await interaction.channel.send({ embeds: [ embed ]});
    }
 }
--- a/src/commands/Role/config.ts
+++ b/src/commands/Role/config.ts
@ -7,7 +7,7 @@ export default class ConfigRole extends Command {
    constructor() {
        super();

-        this.CommandBuilder = new SlashCommandBuilder()
+        super.CommandBuilder = new SlashCommandBuilder()
            .setName('configrole')
            .setDescription('Toggle your roles')
            .setDefaultMemberPermissions(PermissionsBitField.Flags.ManageRoles)
--- a/src/commands/Role/role.ts
+++ b/src/commands/Role/role.ts
@ -7,7 +7,7 @@ export default class Role extends Command {
    constructor() {
        super();

-        this.CommandBuilder = new SlashCommandBuilder()
+        super.CommandBuilder = new SlashCommandBuilder()
            .setName('role')
            .setDescription('Toggle your roles')
            .addSubcommand(subcommand =>
--- a/src/commands/about.ts
+++ b/src/commands/about.ts
@ -6,7 +6,7 @@ export default class About extends Command {
    constructor() {
        super();

-        this.CommandBuilder = new SlashCommandBuilder()
+        super.CommandBuilder = new SlashCommandBuilder()
            .setName('about')
            .setDescription('About VylBot');
    }
--- a/src/commands/audits.ts
+++ b/src/commands/audits.ts
@ -9,7 +9,7 @@ export default class Audits extends Command {
    constructor() {
        super();

-        this.CommandBuilder = new SlashCommandBuilder()
+        super.CommandBuilder = new SlashCommandBuilder()
            .setName("audits")
            .setDescription("View audits of a particular user in the server")
            .setDefaultMemberPermissions(PermissionsBitField.Flags.ModerateMembers)
@ -93,7 +93,7 @@ export default class Audits extends Command {
    private async SendAuditForUser(interaction: CommandInteraction) {
        if (!interaction.guildId) return;

-        const user = interaction.options.get('target')?.user;
+        const user = interaction.options.getUser('target');

        if (!user) {
            await interaction.reply("User not found.");
@ -191,7 +191,7 @@ export default class Audits extends Command {
    private async AddAudit(interaction: CommandInteraction) {
        if (!interaction.guildId) return;

-        const user = interaction.options.get('target')?.user;
+        const user = interaction.options.getUser('target');
        const auditType = interaction.options.get('type');
        const reasonInput = interaction.options.get('reason');

--- a/src/commands/ban.ts
+++ b/src/commands/ban.ts
@ -9,7 +9,7 @@ export default class Ban extends Command {
    constructor() {
        super();

-        this.CommandBuilder = new SlashCommandBuilder()
+        super.CommandBuilder = new SlashCommandBuilder()
            .setName("ban")
            .setDescription("Ban a member from the server with an optional reason")
            .setDefaultMemberPermissions(PermissionsBitField.Flags.BanMembers)
@ -44,7 +44,6 @@ 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",
--- a/src/commands/bunny.ts
+++ b/src/commands/bunny.ts
@ -7,7 +7,7 @@ export default class Bunny extends Command {
    constructor() {
        super();

-        this.CommandBuilder = new SlashCommandBuilder()
+        super.CommandBuilder = new SlashCommandBuilder()
            .setName("bunny")
            .setDescription("Get a random picture of a rabbit.");
    }
@ -15,8 +15,6 @@ export default class Bunny extends Command {
    public override async execute(interaction: CommandInteraction) {
        if (!interaction.isChatInputCommand()) return;

-        await interaction.deferReply();
-
        const subreddits = [
            'rabbits',
            'bunnieswithhats',
@ -39,9 +37,9 @@ export default class Bunny extends Command {
                .setURL(`https://reddit.com${result.Result!.Permalink}`)
                .setFooter({ text: `r/${selectedSubreddit} · ${result.Result!.Ups} upvotes`});

-            await interaction.editReply({ embeds: [ embed ]});
+            await interaction.reply({ embeds: [ embed ]});
        } else {
-            await interaction.editReply("There was an error running this command.");
+            await interaction.reply("There was an error running this command.");
        }
    }
 }
--- a/src/commands/clear.ts
+++ b/src/commands/clear.ts
@ -5,7 +5,7 @@ export default class Clear extends Command {
    constructor() {
        super();

-        this.CommandBuilder = new SlashCommandBuilder()
+        super.CommandBuilder = new SlashCommandBuilder()
            .setName("clear")
            .setDescription("Clears the channel of messages")
            .setDefaultMemberPermissions(PermissionsBitField.Flags.ManageMessages)
--- a/src/commands/code.ts
+++ b/src/commands/code.ts
@ -1,4 +1,4 @@
-import { CommandInteraction, EmbedBuilder, PermissionsBitField, SlashCommandBuilder, TextChannel } from "discord.js";
+import { CommandInteraction, EmbedBuilder, PermissionsBitField, SlashCommandBuilder } from "discord.js";
 import SettingsHelper from "../helpers/SettingsHelper";
 import StringTools from "../helpers/StringTools";
 import { Command } from "../type/command";
@ -7,7 +7,7 @@ export default class Code extends Command {
    constructor() {
        super();

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

-        const channel = interaction.channel as TextChannel;
-
-        await channel.send({ embeds: [ embed ]});
+        await interaction.channel.send({ embeds: [ embed ]});
    }
 }
--- a/src/commands/config.ts
+++ b/src/commands/config.ts
@ -10,7 +10,7 @@ export default class Config extends Command {
    constructor() {
        super();

-        this.CommandBuilder = new SlashCommandBuilder()
+        super.CommandBuilder = new SlashCommandBuilder()
            .setName('config')
            .setDescription('Configure the current server')
            .setDefaultMemberPermissions(PermissionsBitField.Flags.Administrator)
@ -116,15 +116,9 @@ export default class Config extends Command {
        const setting = server.Settings.filter(x => x.Key == key.value)[0];

        if (setting) {
-            await interaction.reply(`\`${key.value}\`: \`${setting.Value}\``);
+            await interaction.reply(`\`${key}\`: \`${setting.Value}\``);
        } else {
-            var defaultValue = DefaultValues.GetValue(key.value.toString());
-
-            if (defaultValue) {
-                await interaction.reply(`\`${key.value}\`: \`${defaultValue}\` <DEFAULT>`);
-            } else {
-                await interaction.reply(`\`${key.value}\`: <NONE>`);
-            }
+            await interaction.reply(`\`${key}\`: \`${DefaultValues.GetValue(key.value.toString())}\` <DEFAULT>`);
        }
    }

@ -197,4 +191,4 @@ export default class Config extends Command {

        await interaction.reply('Setting has been set.');
    }
-}
+}
--- a/src/commands/disable.ts
+++ b/src/commands/disable.ts
@ -6,7 +6,7 @@ export default class Disable extends Command {
    constructor() {
        super();

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

-        this.CommandBuilder = new SlashCommandBuilder()
+        super.CommandBuilder = new SlashCommandBuilder()
            .setName('ignore')
            .setDescription('Ignore events in this channel')
            .setDefaultMemberPermissions(PermissionsBitField.Flags.Administrator);
--- a/src/commands/kick.ts
+++ b/src/commands/kick.ts
@ -9,7 +9,7 @@ export default class Kick extends Command {
    constructor() {
        super();

-        this.CommandBuilder = new SlashCommandBuilder()
+        super.CommandBuilder = new SlashCommandBuilder()
            .setName("kick")
            .setDescription("Kick a member from the server with an optional reason")
            .setDefaultMemberPermissions(PermissionsBitField.Flags.KickMembers)
@ -44,7 +44,6 @@ 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",
--- a/src/commands/linkonly.ts
+++ b/src/commands/linkonly.ts
@ -1,30 +0,0 @@
-import { CommandInteraction, PermissionFlagsBits, SlashCommandBuilder } from "discord.js";
-import { Command } from "../type/command";
-import SettingsHelper from "../helpers/SettingsHelper";
-
-export default class Linkonly extends Command {
-    constructor() {
-        super();
-
-        this.CommandBuilder = new SlashCommandBuilder()
-            .setName("linkonly")
-            .setDescription("Set the link only channel, leave blank to disable")
-            .setDefaultMemberPermissions(PermissionFlagsBits.ManageMessages)
-            .addChannelOption(x => x
-                .setName("channel")
-                .setDescription("The channel"));
-    }
-
-    public override async execute(interaction: CommandInteraction) {
-        if (!interaction.guild) return;
-
-        const channel = interaction.options.get("channel")?.channel;
-
-        const channelid = channel?.id ?? "";
-        const channelName = channel?.name ?? "<NONE>";
-
-        await SettingsHelper.SetSetting("channel.linkonly", interaction.guild.id, channelid);
-
-        await interaction.reply(`Set the link only channel to \`${channelName}\``);
-    }
-}
--- a/src/commands/mute.ts
+++ b/src/commands/mute.ts
@ -9,7 +9,7 @@ export default class Mute extends Command {
    constructor() {
        super();

-        this.CommandBuilder = new SlashCommandBuilder()
+        super.CommandBuilder = new SlashCommandBuilder()
            .setName("mute")
            .setDescription("(DEPRECATED) Mute a member in the server with an optional reason")
            .setDefaultMemberPermissions(PermissionsBitField.Flags.ModerateMembers)
@ -42,7 +42,6 @@ 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",
@ -54,14 +53,7 @@ export default class Mute extends Command {
                },
            ]);

-        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);
+        const mutedRole = interaction.guild.roles.cache.find(role => role.name == process.env.ROLES_MUTED);

        if (!mutedRole) {
            await interaction.reply('Muted role not found.');
--- a/src/commands/poll.ts
+++ b/src/commands/poll.ts
@ -7,7 +7,7 @@ export default class Poll extends Command {
    constructor() {
        super();

-        this.CommandBuilder = new SlashCommandBuilder()
+        super.CommandBuilder = new SlashCommandBuilder()
            .setName('poll')
            .setDescription('Run a poll, automatically adding reaction emojis as options')
            .addStringOption(option =>
--- a/src/commands/rules.ts
+++ b/src/commands/rules.ts
@ -1,8 +1,7 @@
-import { ActionRowBuilder, ButtonBuilder, ButtonStyle, CommandInteraction, EmbedBuilder, PermissionsBitField, SlashCommandBuilder, TextChannel } from "discord.js";
+import { 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;
@ -15,36 +14,13 @@ export default class Rules extends Command {
    constructor() {
        super();

-        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'));
+        super.CommandBuilder = new SlashCommandBuilder()
+            .setName("rules")
+            .setDescription("Send the rules embeds for this server")
+            .setDefaultMemberPermissions(PermissionsBitField.Flags.Administrator);
    }

    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`)) {
@ -79,7 +55,7 @@ export default class Rules extends Command {
            embeds.push(embed);
        });

-        const channel = interaction.channel as TextChannel;
+        const channel = interaction.channel;

        if (!channel) {
            await interaction.reply({ content: "Channel not found.", ephemeral: true });
@ -95,29 +71,4 @@ 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")
-            ]);
-
-        const channel = interaction.channel as TextChannel;
-
-        await channel.send({
-            components: [ row ]
-        });
-
-        await interaction.reply({
-            content: "Success",
-            ephemeral: true,
-        });
-    }
 }
--- a/src/commands/setup.ts
+++ b/src/commands/setup.ts
@ -6,7 +6,7 @@ export default class Setup extends Command {
    constructor() {
        super();

-        this.CommandBuilder = new SlashCommandBuilder()
+        super.CommandBuilder = new SlashCommandBuilder()
            .setName('setup')
            .setDescription('Makes the server ready to be configured')
            .setDefaultMemberPermissions(PermissionsBitField.Flags.Administrator);
--- a/src/commands/timeout.ts
+++ b/src/commands/timeout.ts
@ -10,7 +10,7 @@ export default class Timeout extends Command {
    constructor() {
        super();

-        this.CommandBuilder = new SlashCommandBuilder()
+        super.CommandBuilder = new SlashCommandBuilder()
            .setName("timeout")
            .setDescription("Timeouts a user out, sending them a DM with the reason if possible")
            .setDefaultMemberPermissions(PermissionsBitField.Flags.ModerateMembers)
@ -64,7 +64,6 @@ 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",
--- a/src/commands/unmute.ts
+++ b/src/commands/unmute.ts
@ -7,7 +7,7 @@ export default class Unmute extends Command {
    constructor() {
        super();

-        this.CommandBuilder = new SlashCommandBuilder()
+        super.CommandBuilder = new SlashCommandBuilder()
            .setName("unmute")
            .setDescription("(DEPRECATED) Unmute a member in the server with an optional reason")
            .setDefaultMemberPermissions(PermissionsBitField.Flags.ModerateMembers)
@ -40,7 +40,6 @@ 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",
@ -52,14 +51,7 @@ export default class Unmute extends Command {
                },
            ]);

-        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);
+        const mutedRole = interaction.guild.roles.cache.find(role => role.name == process.env.ROLES_MUTED);

        if (!mutedRole) {
            await interaction.reply('Muted role not found.');
--- a/src/commands/warn.ts
+++ b/src/commands/warn.ts
@ -9,7 +9,7 @@ export default class Warn extends Command {
    constructor() {
        super();

-        this.CommandBuilder = new SlashCommandBuilder()
+        super.CommandBuilder = new SlashCommandBuilder()
            .setName("warn")
            .setDescription("Warns a member in the server with an optional reason")
            .setDefaultMemberPermissions(PermissionsBitField.Flags.ModerateMembers)
@ -41,7 +41,6 @@ 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",
--- a/src/constants/DefaultValues.ts
+++ b/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,7 +31,6 @@ 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" });
@ -44,24 +43,21 @@ export default class DefaultValues {
            this.values.push({ Key: "verification.role", Value: "Entry" });
            this.values.push({ Key: "verification.code", Value: "" });

-            // Gif Only Mode
-            this.values.push({ Key: "channel.linkonly", Value: "" })
-
            // 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.update.channel", Value: "member-logs" });
+            this.values.push({ Key: "event.member.remove.channel", Value: "member-logs" });

        }
    }
--- a/src/contracts/ButtonEventItem.ts
+++ b/src/contracts/ButtonEventItem.ts
@ -1,8 +0,0 @@
-import { ButtonEvent } from "../type/buttonEvent";
-
-interface ButtonEventItem {
-    ButtonId: string,
-    Event: ButtonEvent,
-}
-
-export default ButtonEventItem;
--- a/src/database/entities/Server.ts
+++ b/src/database/entities/Server.ts
@ -1,4 +1,4 @@
-import { Column, Entity, OneToMany } from "typeorm";
+import { Entity, OneToMany } from "typeorm";
 import BaseEntity from "../../contracts/BaseEntity";
 import Role from "./Role";
 import Setting from "./Setting";
@ -9,22 +9,14 @@ 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);
    }
--- a/src/database/migrations/3.2.1/1709316734401-AddServerCacheDate.ts
+++ b/src/database/migrations/3.2.1/1709316734401-AddServerCacheDate.ts
@ -1,15 +0,0 @@
-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> {
-    }
-
-}
--- a/src/events/MemberEvents/GuildMemberAdd.ts
+++ b/src/events/MemberEvents/GuildMemberAdd.ts
@ -1,13 +1,10 @@
 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;

--- a/src/events/MemberEvents/GuildMemberRemove.ts
+++ b/src/events/MemberEvents/GuildMemberRemove.ts
@ -1,13 +1,10 @@
 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;

--- a/src/events/MemberEvents/GuildMemberUpdate.ts
+++ b/src/events/MemberEvents/GuildMemberUpdate.ts
@ -1,13 +1,8 @@
 import { GuildMember } from "discord.js";
 import NicknameChanged from "./GuildMemberUpdate/NicknameChanged";
-import CacheHelper from "../../helpers/CacheHelper";

 export default async function GuildMemberUpdate(oldMember: GuildMember, newMember: GuildMember) {
-    const updatedFromCache = await CacheHelper.UpdateServerCache(newMember.guild);
-
-    if (updatedFromCache) return;
-
-    if (oldMember.nickname !== newMember.nickname) { // Nickname change
+    if (oldMember.nickname != newMember.nickname) { // Nickname change
        await NicknameChanged(oldMember, newMember);
    }
 }
--- a/src/events/MessageEvents/MessageCreate.ts
+++ b/src/events/MessageEvents/MessageCreate.ts
@ -1,17 +1,11 @@
 import { Message } from "discord.js";
 import SettingsHelper from "../../helpers/SettingsHelper";
 import VerificationCheck from "./MessageCreate/VerificationCheck";
-import CacheHelper from "../../helpers/CacheHelper";
-import LinkOnlyMode from "./MessageCreate/LinkOnlyMode";

 export default async function MessageCreate(message: Message) {
    if (!message.guild) return;
    if (message.author.bot) return;

-    await CacheHelper.UpdateServerCache(message.guild);
-
-    await LinkOnlyMode(message);
-
    const isVerificationEnabled = await SettingsHelper.GetSetting("verification.enabled", message.guild.id);

    if (isVerificationEnabled && isVerificationEnabled.toLocaleLowerCase() == "true") {
--- a/src/events/MessageEvents/MessageCreate/LinkOnlyMode.ts
+++ b/src/events/MessageEvents/MessageCreate/LinkOnlyMode.ts
@ -1,20 +0,0 @@
-import { Message } from "discord.js";
-import SettingsHelper from "../../../helpers/SettingsHelper";
-
-export default async function LinkOnlyMode(message: Message) {
-    if (!message.guild) return;
-
-    const gifOnlyMode = await SettingsHelper.GetSetting("channel.linkonly", message.guild.id);
-
-    if (!gifOnlyMode) return;
-
-    const channel = message.guild.channels.cache.find(x => x.id == gifOnlyMode) || message.guild.channels.fetch(gifOnlyMode);
-
-    if (!channel) return;
-
-    if (message.content.startsWith("https://") || message.content.startsWith("http://")) return;
-
-    if (!message.deletable) return;
-
-    await message.delete();
-}
--- a/src/events/MessageEvents/MessageDelete.ts
+++ b/src/events/MessageEvents/MessageDelete.ts
@ -2,14 +2,11 @@ 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;

@ -36,8 +33,8 @@ export default async function MessageDelete(message: Message) {
    if (message.attachments.size > 0) {
        embed.addFields([
            {
-                name: `Attachments (${message.attachments.size})`,
-                value: `\`\`\`${message.attachments.map(x => x.name).join("\n")}\`\`\``
+                name: "Attachments",
+                value: `\`\`\`${message.attachments.map(x => x.url).join("\n")}\`\`\``
            }
        ]);
    }
--- a/src/events/MessageEvents/MessageUpdate.ts
+++ b/src/events/MessageEvents/MessageUpdate.ts
@ -2,14 +2,10 @@ 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);
--- a/src/helpers/CacheHelper.ts
+++ b/src/helpers/CacheHelper.ts
@ -1,33 +0,0 @@
-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();
-    }
-}
--- a/src/registry.ts
+++ b/src/registry.ts
@ -12,7 +12,6 @@ import Config from "./commands/config";
 import Disable from "./commands/disable";
 import Ignore from "./commands/ignore";
 import Kick from "./commands/kick";
-import Linkonly from "./commands/linkonly";
 import Mute from "./commands/mute";
 import Poll from "./commands/poll";
 import Role from "./commands/Role/role";
@ -38,9 +37,6 @@ 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());
@ -53,7 +49,6 @@ export default class Registry {
        CoreClient.RegisterCommand("disable", new Disable());
        CoreClient.RegisterCommand("ignore", new Ignore());
        CoreClient.RegisterCommand("kick", new Kick());
-        CoreClient.RegisterCommand("linkonly", new Linkonly());
        CoreClient.RegisterCommand("mute", new Mute());
        CoreClient.RegisterCommand("poll", new Poll());
        CoreClient.RegisterCommand("rules", new Rules());
@ -89,8 +84,4 @@ export default class Registry {
        CoreClient.RegisterEvent(EventType.MessageUpdate, MessageUpdate);
        CoreClient.RegisterEvent(EventType.MessageCreate, MessageCreate);
    }
-
-    public static RegisterButtonEvents() {
-        CoreClient.RegisterButtonEvent("verify", new Verify());
-    }
 }
--- a/src/type/buttonEvent.ts
+++ b/src/type/buttonEvent.ts
@ -1,5 +0,0 @@
-import { ButtonInteraction } from "discord.js";
-
-export abstract class ButtonEvent {
-    abstract execute(interaction: ButtonInteraction): Promise<void>;
-}
--- a/src/vylbot.ts
+++ b/src/vylbot.ts
@ -1,7 +1,7 @@
 import { CoreClient } from "./client/client";
 import * as dotenv from "dotenv";
 import registry from "./registry";
-import { IntentsBitField, Partials } from "discord.js";
+import { IntentsBitField } from "discord.js";

 dotenv.config();

@ -30,13 +30,9 @@ 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();
--- a/yarn.lock
+++ b/yarn.lock