.dev.env

@@ -7,18 +7,15 @@
 # any secret values.
 
 BOT_TOKEN=
-BOT_VER=0.4.0
+BOT_VER=0.3.1
 BOT_AUTHOR=Vylpes
 BOT_OWNERID=147392775707426816
 BOT_CLIENTID=682942374040961060
 BOT_ENV=4
-BOT_ADMINS=147392775707426816,887272961504071690
 
 ABOUT_FUNDING=
 ABOUT_REPO=
 
-DATA_DIR=
-
 DB_HOST=127.0.0.1
 DB_PORT=3301
 DB_NAME=carddrop
@@ -31,4 +28,5 @@ DB_CARD_FILE=:memory:
 
 EXPRESS_PORT=3303
 
+GDRIVESYNC_WHITELIST=147392775707426816,887272961504071690
 GDRIVESYNC_AUTO=true

.drone.yml

@@ -4,36 +4,16 @@ kind: pipeline
 name: deployment
 
 steps:
-- name: build
-  image: node
-  commands:
-  - npm ci
-  - npm run build
-- name: test
-  image: node
-  commands:
-  - npm test
-- name: deploy to prod
-  image: drillster/drone-rsync
-  secrets: [ ssh_key, bot_token_prod ]
+- name: deploy
+  image: appleboy/drone-ssh
   settings:
-    hosts:
-      - 192.168.68.120
-    user: vylpes
-    key:
-      from_secret: ssh_key
-    source: .
-    target: ~/apps/card-drop/card-drop_prod
-    recursive: true
+    host: 192.168.68.120
+    username: vylpes
+    password:
+      from_secret: ssh_password
+    port: 22
     script:
-      - export PATH="$HOME/.yarn/bin:$PATH"
-      - export PATH="$HOME/.nodeuse/bin:$PATH"
-      - export BOT_TOKEN="$BOT_TOKEN_PROD"
-      - cd ~/apps/card-drop/card-drop_prod
-      - docker compose --file docker-compose.prod.yml up -d
-      - sleep 10
-      - cp .prod.env .env
-      - pm2 restart card-drop_prod || pm2 start --name card-drop_prod dist/bot.js
+      - sh /home/vylpes/scripts/card-drop/deploy_prod.sh
 
 trigger:
   event:
@@ -45,36 +25,16 @@ kind: pipeline
 name: staging
 
 steps:
-- name: build
-  image: node
-  commands:
-  - npm ci
-  - npm run build
-- name: test
-  image: node
-  commands:
-  - npm test
-- name: deploy to stage
-  image: drillster/drone-rsync
-  secrets: [ ssh_key, bot_token_stage ]
+- name: stage
+  image: appleboy/drone-ssh
   settings:
-    hosts:
-      - 192.168.68.120
-    user: vylpes
-    key:
-      from_secret: ssh_key
-    source: .
-    target: ~/apps/card-drop/card-drop_stage
-    recursive: true
+    host: 192.168.68.120
+    username: vylpes
+    password:
+      from_secret: ssh_password
+    port: 22
     script:
-      - export PATH="$HOME/.yarn/bin:$PATH"
-      - export PATH="$HOME/.nodeuse/bin:$PATH"
-      - export BOT_TOKEN="$BOT_TOKEN_STAGE"
-      - cd ~/apps/card-drop/card-drop_stage
-      - docker compose --file docker-compose.stage.yml up -d
-      - sleep 10
-      - cp .stage.env .env
-      - pm2 restart card-drop_stage || pm2 start --name card-drop_stage dist/bot.js
+      - sh /home/vylpes/scripts/card-drop/deploy_stage.sh
 
 trigger:
   branch:
@@ -94,18 +54,16 @@ steps:
   - npm ci
   - npm run build
 
-- name: lint
-  image: node
-  commands:
-  - npm run lint
-
 - name: test
   image: node
   commands:
+  - npm ci
   - npm test
 
 trigger:
   branch:
+  - main
+  - develop
   - hotfix/*
   - feature/*
   - renovate/*

.eslintrc.json

@@ -1,45 +0,0 @@
-{
-    "env": {
-        "browser": true,
-        "es2021": true
-    },
-    "extends": [
-        "eslint:recommended",
-        "plugin:@typescript-eslint/recommended"
-    ],
-    "parser": "@typescript-eslint/parser",
-    "parserOptions": {
-        "ecmaVersion": "latest",
-        "sourceType": "module"
-    },
-    "plugins": [
-        "@typescript-eslint"
-    ],
-    "rules": {
-        "indent": [
-            "error",
-            4
-        ],
-        "linebreak-style": [
-            "error",
-            "unix"
-        ],
-        "quotes": [
-            "error",
-            "double"
-        ],
-        "semi": [
-            "error",
-            "always"
-        ]
-    },
-    "globals": {
-        "jest": true,
-        "require": true,
-        "exports": true,
-        "process": true
-    },
-    "ignorePatterns": [
-        "dist/**/*"
-    ]
-}

.gitignore

@@ -107,5 +107,5 @@ config.json
 .DS_Store
 ormconfig.json
 gdrive-credentials.json
-data/
+cards/
 *.db

.prod.env

@@ -7,18 +7,15 @@
 # any secret values.
 
 BOT_TOKEN=
-BOT_VER=0.4.0
+BOT_VER=0.3.1
 BOT_AUTHOR=Vylpes
 BOT_OWNERID=147392775707426816
 BOT_CLIENTID=1093810443589529631
 BOT_ENV=1
-BOT_ADMINS=147392775707426816,887272961504071690
 
 ABOUT_FUNDING=
 ABOUT_REPO=
 
-DATA_DIR=/home/vylpes/appdata/card-drop/card-drop_prod
-
 DB_HOST=127.0.0.1
 DB_PORT=3321
 DB_NAME=carddrop
@@ -31,4 +28,5 @@ DB_CARD_FILE=:memory:
 
 EXPRESS_PORT=3323
 
+GDRIVESYNC_WHITELIST=147392775707426816,887272961504071690
 GDRIVESYNC_AUTO=false

.stage.env

@@ -7,18 +7,15 @@
 # any secret values.
 
 BOT_TOKEN=
-BOT_VER=0.4.0
+BOT_VER=0.3.1
 BOT_AUTHOR=Vylpes
 BOT_OWNERID=147392775707426816
 BOT_CLIENTID=1147976642942214235
 BOT_ENV=2
-BOT_ADMINS=147392775707426816,887272961504071690
 
 ABOUT_FUNDING=
 ABOUT_REPO=
 
-DATA_DIR=/home/vylpes/appdata/card-drop/card-drop_stage
-
 DB_HOST=127.0.0.1
 DB_PORT=3311
 DB_NAME=carddrop
@@ -31,4 +28,5 @@ DB_CARD_FILE=:memory:
 
 EXPRESS_PORT=3313
 
+GDRIVESYNC_WHITELIST=147392775707426816,887272961504071690
 GDRIVESYNC_AUTO=false

package.json

@@ -1,6 +1,6 @@
 {
   "name": "card-drop",
-  "version": "0.4.0",
+  "version": "0.3.1",
   "main": "./dist/bot.js",
   "typings": "./dist",
   "scripts": {
@@ -8,8 +8,6 @@
     "build": "tsc",
     "start": "node ./dist/bot.js",
     "test": "jest --passWithNoTests",
-    "lint": "eslint .",
-    "lint:fix": "eslint . --fix",
     "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/app/new",
@@ -39,15 +37,14 @@
     "minimatch": "9.0.3",
     "mysql": "^2.18.1",
     "ts-jest": "^29.0.0",
-    "typeorm": "0.3.19"
+    "typeorm": "0.3.17"
+  },
+  "resolutions": {
+    "**/undici": "^5.26.2"
   },
-  "resolutions": {},
   "devDependencies": {
     "@types/node": "^20.0.0",
-    "@typescript-eslint/eslint-plugin": "^6.16.0",
-    "@typescript-eslint/parser": "^6.16.0",
-    "eslint": "^8.56.0",
-    "np": "^9.0.0",
+    "np": "^8.0.4",
     "typescript": "^5.0.0"
   }
 }

renovate.json

@@ -1,5 +1,4 @@
 {
     "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-    "baseBranches": ["develop"],
-    "labels": ["type/dependencies"]
+    "baseBranches": ["develop"]
   }

src/Functions/CardMetadataFunction.ts

@@ -2,12 +2,12 @@ import { readFileSync } from "fs";
 import path from "path";
 import Config from "../database/entities/app/Config";
 import { glob } from "glob";
-import { SeriesMetadata } from "../contracts/SeriesMetadata";
+import SeriesMetadata from "../contracts/SeriesMetadata";
 import { CoreClient } from "../client/client";
 
 export default class CardMetadataFunction {
     public static async Execute(overrideSafeMode: boolean = false): Promise<boolean> {
-        if (!overrideSafeMode && await Config.GetValue("safemode") == "true") return false;
+        if (!overrideSafeMode && await Config.GetValue('safemode') == "true") return false;
 
         try {
             CoreClient.Cards = await this.FindMetadataJSONs();
@@ -16,7 +16,7 @@ export default class CardMetadataFunction {
         } catch (e) {
             console.error(e);
 
-            await Config.SetValue("safemode", "true");
+            await Config.SetValue('safemode', 'true');
             return false;
         }
 
@@ -26,9 +26,9 @@ export default class CardMetadataFunction {
     private static async FindMetadataJSONs(): Promise<SeriesMetadata[]> {
         const res: SeriesMetadata[] = [];
 
-        const seriesJSONs = await glob(path.join(process.env.DATA_DIR!, "cards", "/**/*.json"));
+        const seriesJSONs = await glob(path.join(process.cwd(), 'cards', '/**/*.json'));
 
-        for (const jsonPath of seriesJSONs) {
+        for (let jsonPath of seriesJSONs) {
             console.log(`Reading file ${jsonPath}`);
             const jsonFile = readFileSync(jsonPath);
             const parsedJson: SeriesMetadata[] = JSON.parse(jsonFile.toString());

src/bot.ts

@@ -14,8 +14,6 @@ const requiredConfigs: string[] = [
     "BOT_OWNERID",
     "BOT_CLIENTID",
     "BOT_ENV",
-    "BOT_ADMINS",
-    "DATA_DIR",
     "DB_HOST",
     "DB_PORT",
     "DB_AUTH_USER",
@@ -23,7 +21,8 @@ const requiredConfigs: string[] = [
     "DB_SYNC",
     "DB_LOGGING",
     "EXPRESS_PORT",
-];
+    "GDRIVESYNC_WHITELIST",
+]
 
 requiredConfigs.forEach(config => {
     if (!process.env[config]) {
@@ -40,7 +39,7 @@ Registry.RegisterCommands();
 Registry.RegisterEvents();
 Registry.RegisterButtonEvents();
 
-if (!existsSync(`${process.env.DATA_DIR}/cards`) && process.env.GDRIVESYNC_AUTO && process.env.GDRIVESYNC_AUTO == "true") {
+if (!existsSync(`${process.cwd()}/cards`) && process.env.GDRIVESYNC_AUTO && process.env.GDRIVESYNC_AUTO == 'true') {
     console.log("Card directory not found, syncing...");
 
     CoreClient.AllowDrops = false;
@@ -50,7 +49,7 @@ if (!existsSync(`${process.env.DATA_DIR}/cards`) && process.env.GDRIVESYNC_AUTO
             console.error(error.code);
             throw `Error while running sync command. Code: ${error.code}`;
         } else {
-            console.log("Synced successfully.");
+            console.log('Synced successfully.');
             CoreClient.AllowDrops = true;
         }
     });

src/buttonEvents/Claim.ts

@@ -8,20 +8,20 @@ export default class Claim extends ButtonEvent {
     public override async execute(interaction: ButtonInteraction) {
         if (!interaction.guild || !interaction.guildId) return;
 
-        const cardNumber = interaction.customId.split(" ")[1];
-        const claimId = interaction.customId.split(" ")[2];
-        const droppedBy = interaction.customId.split(" ")[3];
+        const cardNumber = interaction.customId.split(' ')[1];
+        const claimId = interaction.customId.split(' ')[2];
+        const droppedBy = interaction.customId.split(' ')[3];
         const userId = interaction.user.id;
 
         const claimed = await eClaim.FetchOneByClaimId(claimId);
 
         if (claimed) {
-            await interaction.reply("This card has already been claimed");
+            await interaction.reply('This card has already been claimed');
             return;
         }
 
         if (claimId == CoreClient.ClaimId && userId != droppedBy) {
-            await interaction.reply("The latest dropped card can only be claimed by the user who dropped it");
+            await interaction.reply('The latest dropped card can only be claimed by the user who dropped it');
             return;
         }
 

src/buttonEvents/Inventory.ts

@@ -1,21 +0,0 @@
-import { ButtonInteraction } from "discord.js";
-import { ButtonEvent } from "../type/buttonEvent";
-import InventoryHelper from "../helpers/InventoryHelper";
-
-export default class Inventory extends ButtonEvent {
-    public override async execute(interaction: ButtonInteraction) {
-        const userid = interaction.customId.split(" ")[1];
-        const page = interaction.customId.split(" ")[2];
-
-        try {
-            const embed = await InventoryHelper.GenerateInventoryPage(interaction.user.username, userid, Number(page));
-
-            await interaction.update({
-                embeds: [ embed.embed ],
-                components: [ embed.row ],
-            });
-        } catch {
-            await interaction.reply("No page for user found.");
-        }
-    }
-}

src/buttonEvents/Reroll.ts

@@ -1,4 +1,4 @@
-import { AttachmentBuilder, ButtonInteraction } from "discord.js";
+import { AttachmentBuilder, ButtonInteraction, DiscordAPIError } from "discord.js";
 import { ButtonEvent } from "../type/buttonEvent";
 import { readFileSync } from "fs";
 import { v4 } from "uuid";
@@ -11,26 +11,28 @@ import path from "path";
 export default class Reroll extends ButtonEvent {
     public override async execute(interaction: ButtonInteraction) {
         if (!CoreClient.AllowDrops) {
-            await interaction.reply("Bot is currently syncing, please wait until its done.");
+            await interaction.reply('Bot is currently syncing, please wait until its done.');
             return;
         }
 
-        if (await Config.GetValue("safemode") == "true") {
-            await interaction.reply("Safe Mode has been activated, please resync to continue.");
+        if (await Config.GetValue('safemode') == "true") {
+            await interaction.reply('Safe Mode has been activated, please resync to continue.');
             return;
         }
 
         const randomCard = CardDropHelperMetadata.GetRandomCard();
 
         if (!randomCard) {
-            await interaction.reply("Unable to fetch card, please try again.");
+            await interaction.reply('Unable to fetch card, please try again.');
             return;
         }
 
         try {
-            const image = readFileSync(path.join(process.env.DATA_DIR!, "cards", randomCard.card.path));
+            let image: Buffer;
             const imageFileName = randomCard.card.path.split("/").pop()!;
 
+            image = readFileSync(path.join(process.cwd(), 'cards', randomCard.card.path));
+
             await interaction.deferReply();
 
             const attachment = new AttachmentBuilder(image, { name: imageFileName });

src/client/client.ts

@@ -1,22 +1,23 @@
-import { Client, DMChannel, Guild, GuildBan, GuildMember, Message, NonThreadGuildBasedChannel, PartialGuildMember, PartialMessage } from "discord.js";
+import { Client } from "discord.js";
 import * as dotenv from "dotenv";
+import { EventType } from "../constants/EventType";
 import ICommandItem from "../contracts/ICommandItem";
-import EventExecutors from "../contracts/EventExecutors";
+import IEventItem from "../contracts/IEventItem";
 import { Command } from "../type/command";
 
 import { Events } from "./events";
 import { Util } from "./util";
-import IButtonEventItem from "../contracts/ButtonEventItem";
+import IButtonEventItem from "../contracts/IButtonEventItem";
 import { ButtonEvent } from "../type/buttonEvent";
 import AppDataSource from "../database/dataSources/appDataSource";
 import { Environment } from "../constants/Environment";
 import Webhooks from "../webhooks";
 import CardMetadataFunction from "../Functions/CardMetadataFunction";
-import { SeriesMetadata } from "../contracts/SeriesMetadata";
+import SeriesMetadata from "../contracts/SeriesMetadata";
 
 export class CoreClient extends Client {
     private static _commandItems: ICommandItem[];
-    private static _eventExecutors: EventExecutors;
+    private static _eventItems: IEventItem[];
     private static _buttonEvents: IButtonEventItem[];
 
     private _events: Events;
@@ -32,8 +33,8 @@ export class CoreClient extends Client {
         return this._commandItems;
     }
 
-    public static get eventExecutors(): EventExecutors {
-        return this._eventExecutors;
+    public static get eventItems(): IEventItem[] {
+        return this._eventItems;
     }
 
     public static get buttonEvents(): IButtonEventItem[] {
@@ -45,6 +46,7 @@ export class CoreClient extends Client {
         dotenv.config();
 
         CoreClient._commandItems = [];
+        CoreClient._eventItems = [];
         CoreClient._buttonEvents = [];
 
         this._events = new Events();
@@ -72,11 +74,15 @@ export class CoreClient extends Client {
 
         await CardMetadataFunction.Execute(true);
 
-        this._util.loadEvents(this, CoreClient._eventExecutors);
+        this._util.loadEvents(this, CoreClient._eventItems);
         this._util.loadSlashCommands(this);
 
         this._webhooks.start();
 
+        console.log(`Registered Commands: ${CoreClient._commandItems.flatMap(x => x.Name).join(", ")}`);
+        console.log(`Registered Events: ${CoreClient._eventItems.flatMap(x => x.EventType).join(", ")}`);
+        console.log(`Registered Buttons: ${CoreClient._buttonEvents.flatMap(x => x.ButtonId).join(", ")}`);
+
         await super.login(process.env.BOT_TOKEN);
     }
 
@@ -88,260 +94,20 @@ export class CoreClient extends Client {
             ServerId: serverId,
         };
 
-        if ((environment & CoreClient.Environment) == CoreClient.Environment) {
+        if (environment &= CoreClient.Environment) {
             CoreClient._commandItems.push(item);
         }
     }
 
-    public static RegisterChannelCreateEvent(fn: (channel: NonThreadGuildBasedChannel) => void) {
-        if (this._eventExecutors) {
-            this._eventExecutors.ChannelCreate.push(fn);
-        } else {
-            this._eventExecutors = {
-                ChannelCreate: [ fn ],
-                ChannelDelete: [],
-                ChannelUpdate: [],
-                GuildBanAdd: [],
-                GuildBanRemove: [],
-                GuildCreate: [],
-                GuildMemberAdd: [],
-                GuildMemberRemove: [],
-                GuildMemebrUpdate: [],
-                MessageCreate: [],
-                MessageDelete: [],
-                MessageUpdate: [],
+    public static RegisterEvent(eventType: EventType, func: Function, environment: Environment = Environment.All) {
+        const item: IEventItem = {
+            EventType: eventType,
+            ExecutionFunction: func,
+            Environment: environment,
         };
-        }
-    }
 
-    public static RegisterChannelDeleteEvent(fn: (channel: DMChannel | NonThreadGuildBasedChannel) => void) {
-        if (this._eventExecutors) {
-            this._eventExecutors.ChannelDelete.push(fn);
-        } else {
-            this._eventExecutors = {
-                ChannelCreate: [],
-                ChannelDelete: [ fn ],
-                ChannelUpdate: [],
-                GuildBanAdd: [],
-                GuildBanRemove: [],
-                GuildCreate: [],
-                GuildMemberAdd: [],
-                GuildMemberRemove: [],
-                GuildMemebrUpdate: [],
-                MessageCreate: [],
-                MessageDelete: [],
-                MessageUpdate: [],
-            };
-        }
-    }
-
-    public static RegisterChannelUpdateEvent(fn: (channel: DMChannel | NonThreadGuildBasedChannel) => void) {
-        if (this._eventExecutors) {
-            this._eventExecutors.ChannelCreate.push(fn);
-        } else {
-            this._eventExecutors = {
-                ChannelCreate: [],
-                ChannelDelete: [],
-                ChannelUpdate: [ fn ],
-                GuildBanAdd: [],
-                GuildBanRemove: [],
-                GuildCreate: [],
-                GuildMemberAdd: [],
-                GuildMemberRemove: [],
-                GuildMemebrUpdate: [],
-                MessageCreate: [],
-                MessageDelete: [],
-                MessageUpdate: [],
-            };
-        }
-    }
-
-    public static RegisterGuildBanAddEvent(fn: (ban: GuildBan) => void) {
-        if (this._eventExecutors) {
-            this._eventExecutors.GuildBanAdd.push(fn);
-        } else {
-            this._eventExecutors = {
-                ChannelCreate: [],
-                ChannelDelete: [],
-                ChannelUpdate: [],
-                GuildBanAdd: [ fn ],
-                GuildBanRemove: [],
-                GuildCreate: [],
-                GuildMemberAdd: [],
-                GuildMemberRemove: [],
-                GuildMemebrUpdate: [],
-                MessageCreate: [],
-                MessageDelete: [],
-                MessageUpdate: [],
-            };
-        }
-    }
-
-    public static RegisterGuildBanRemoveEvent(fn: (channel: GuildBan) => void) {
-        if (this._eventExecutors) {
-            this._eventExecutors.GuildBanRemove.push(fn);
-        } else {
-            this._eventExecutors = {
-                ChannelCreate: [],
-                ChannelDelete: [],
-                ChannelUpdate: [],
-                GuildBanAdd: [],
-                GuildBanRemove: [ fn ],
-                GuildCreate: [],
-                GuildMemberAdd: [],
-                GuildMemberRemove: [],
-                GuildMemebrUpdate: [],
-                MessageCreate: [],
-                MessageDelete: [],
-                MessageUpdate: [],
-            };
-        }
-    }
-
-    public static RegisterGuildCreateEvent(fn: (guild: Guild) => void) {
-        if (this._eventExecutors) {
-            this._eventExecutors.GuildCreate.push(fn);
-        } else {
-            this._eventExecutors = {
-                ChannelCreate: [],
-                ChannelDelete: [],
-                ChannelUpdate: [],
-                GuildBanAdd: [],
-                GuildBanRemove: [],
-                GuildCreate: [ fn ],
-                GuildMemberAdd: [],
-                GuildMemberRemove: [],
-                GuildMemebrUpdate: [],
-                MessageCreate: [],
-                MessageDelete: [],
-                MessageUpdate: [],
-            };
-        }
-    }
-
-    public static RegisterGuildMemberAddEvent(fn: (member: GuildMember) => void) {
-        if (this._eventExecutors) {
-            this._eventExecutors.GuildMemberAdd.push(fn);
-        } else {
-            this._eventExecutors = {
-                ChannelCreate: [],
-                ChannelDelete: [],
-                ChannelUpdate: [],
-                GuildBanAdd: [],
-                GuildBanRemove: [],
-                GuildCreate: [],
-                GuildMemberAdd: [ fn ],
-                GuildMemberRemove: [],
-                GuildMemebrUpdate: [],
-                MessageCreate: [],
-                MessageDelete: [],
-                MessageUpdate: [],
-            };
-        }
-    }
-
-    public static RegisterGuildMemberRemoveEvent(fn: (member: GuildMember | PartialGuildMember) => void) {
-        if (this._eventExecutors) {
-            this._eventExecutors.GuildMemberRemove.push(fn);
-        } else {
-            this._eventExecutors = {
-                ChannelCreate: [],
-                ChannelDelete: [],
-                ChannelUpdate: [],
-                GuildBanAdd: [],
-                GuildBanRemove: [],
-                GuildCreate: [],
-                GuildMemberAdd: [],
-                GuildMemberRemove: [ fn ],
-                GuildMemebrUpdate: [],
-                MessageCreate: [],
-                MessageDelete: [],
-                MessageUpdate: [],
-            };
-        }
-    }
-
-    public static GuildMemebrUpdate(fn: (oldMember: GuildMember | PartialGuildMember, newMember: GuildMember) => void) {
-        if (this._eventExecutors) {
-            this._eventExecutors.GuildMemebrUpdate.push(fn);
-        } else {
-            this._eventExecutors = {
-                ChannelCreate: [],
-                ChannelDelete: [],
-                ChannelUpdate: [],
-                GuildBanAdd: [],
-                GuildBanRemove: [],
-                GuildCreate: [],
-                GuildMemberAdd: [],
-                GuildMemberRemove: [],
-                GuildMemebrUpdate: [ fn ],
-                MessageCreate: [],
-                MessageDelete: [],
-                MessageUpdate: [],
-            };
-        }
-    }
-
-    public static RegisterMessageCreateEvent(fn: (message: Message<boolean>) => void) {
-        if (this._eventExecutors) {
-            this._eventExecutors.MessageCreate.push(fn);
-        } else {
-            this._eventExecutors = {
-                ChannelCreate: [],
-                ChannelDelete: [],
-                ChannelUpdate: [],
-                GuildBanAdd: [],
-                GuildBanRemove: [],
-                GuildCreate: [],
-                GuildMemberAdd: [],
-                GuildMemberRemove: [],
-                GuildMemebrUpdate: [],
-                MessageCreate: [ fn ],
-                MessageDelete: [],
-                MessageUpdate: [],
-            };
-        }
-    }
-
-    public static RegisterMessageDeleteEvent(fn: (message: Message<boolean> | PartialMessage) => void) {
-        if (this._eventExecutors) {
-            this._eventExecutors.MessageDelete.push(fn);
-        } else {
-            this._eventExecutors = {
-                ChannelCreate: [],
-                ChannelDelete: [],
-                ChannelUpdate: [],
-                GuildBanAdd: [],
-                GuildBanRemove: [],
-                GuildCreate: [],
-                GuildMemberAdd: [],
-                GuildMemberRemove: [],
-                GuildMemebrUpdate: [],
-                MessageCreate: [],
-                MessageDelete: [ fn ],
-                MessageUpdate: [],
-            };
-        }
-    }
-
-    public static RegisterMessageUpdateEvent(fn: (oldMessage: Message<boolean> | PartialMessage, newMessage: Message<boolean> | PartialMessage) => void) {
-        if (this._eventExecutors) {
-            this._eventExecutors.MessageUpdate.push(fn);
-        } else {
-            this._eventExecutors = {
-                ChannelCreate: [],
-                ChannelDelete: [],
-                ChannelUpdate: [],
-                GuildBanAdd: [],
-                GuildBanRemove: [],
-                GuildCreate: [],
-                GuildMemberAdd: [],
-                GuildMemberRemove: [],
-                GuildMemebrUpdate: [],
-                MessageCreate: [],
-                MessageDelete: [],
-                MessageUpdate: [ fn ],
-            };
+        if (environment &= CoreClient.Environment) {
+            CoreClient._eventItems.push(item);
         }
     }
 
@@ -352,7 +118,7 @@ export class CoreClient extends Client {
             Environment: environment,
         };
 
-        if ((environment & CoreClient.Environment) == CoreClient.Environment) {
+        if (environment &= CoreClient.Environment) {
             CoreClient._buttonEvents.push(item);
         }
     }

src/client/interactionCreate/Button.ts

@@ -1,14 +1,14 @@
-import { ButtonInteraction } from "discord.js";
+import { ButtonInteraction, Interaction } 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]);
+        const item = CoreClient.buttonEvents.find(x => x.ButtonId == interaction.customId.split(' ')[0]);
 
         if (!item) {
-            await interaction.reply("Event not found");
+            await interaction.reply('Event not found');
             return;
         }
 

src/client/interactionCreate/ChatInputCommand.ts

@@ -13,7 +13,7 @@ export default class ChatInputCommand {
 
         if (!itemForServer) {
             if (!item) {
-                await interaction.reply("Command not found");
+                await interaction.reply('Command not found');
                 return;
             }
 

src/client/util.ts

@@ -1,5 +1,6 @@
 import { Client, REST, Routes, SlashCommandBuilder } from "discord.js";
-import EventExecutors from "../contracts/EventExecutors";
+import { EventType } from "../constants/EventType";
+import IEventItem from "../contracts/IEventItem";
 import { CoreClient } from "./client";
 
 export class Util {
@@ -9,25 +10,25 @@ export class Util {
         const globalCommands = registeredCommands.filter(x => !x.ServerId);
         const guildCommands = registeredCommands.filter(x => x.ServerId);
 
-        const globalCommandData: Omit<SlashCommandBuilder, "addSubcommand" | "addSubcommandGroup">[] = [];
+        const globalCommandData: SlashCommandBuilder[] = [];
 
-        for (const command of globalCommands) {
+        for (let command of globalCommands) {
             if (!command.Command.CommandBuilder) continue;
 
-            if ((command.Environment & CoreClient.Environment) == CoreClient.Environment) {
+            if (command.Environment &= CoreClient.Environment) {
                 globalCommandData.push(command.Command.CommandBuilder);
             }
         }
 
         const guildIds: string[] = [];
 
-        for (const command of guildCommands) {
+        for (let command of guildCommands) {
             if (!guildIds.find(x => x == command.ServerId)) {
                 guildIds.push(command.ServerId!);
             }
         }
 
-        const rest = new REST({ version: "10" }).setToken(process.env.BOT_TOKEN!);
+        const rest = new REST({ version: '10' }).setToken(process.env.BOT_TOKEN!);
 
         rest.put(
             Routes.applicationCommands(process.env.BOT_CLIENTID!),
@@ -36,13 +37,13 @@ export class Util {
             }
         );
 
-        for (const guild of guildIds) {
-            const guildCommandData: Omit<SlashCommandBuilder, "addSubcommand" | "addSubcommandGroup">[] = [];
+        for (let guild of guildIds) {
+            const guildCommandData: SlashCommandBuilder[] = [];
 
-            for (const command of guildCommands.filter(x => x.ServerId == guild)) {
+            for (let command of guildCommands.filter(x => x.ServerId == guild)) {
                 if (!command.Command.CommandBuilder) continue;
 
-                if ((command.Environment & CoreClient.Environment) == CoreClient.Environment) {
+                if (command.Environment &= CoreClient.Environment) {
                     guildCommandData.push(command.Command.CommandBuilder);
                 }
             }
@@ -54,23 +55,53 @@ export class Util {
                 {
                     body: guildCommandData
                 }
-            );
+            )
         }
     }
 
     // Load the events
-    loadEvents(client: Client, events: EventExecutors) {
-        client.on("channelCreate", (channel) => events.ChannelCreate.forEach((fn) => fn(channel)));
-        client.on("channelDelete", (channel) => events.ChannelDelete.forEach((fn) => fn(channel)));
-        client.on("channelUpdate", (channel) => events.ChannelUpdate.forEach((fn) => fn(channel)));
-        client.on("guildBanAdd", (ban) => events.GuildBanAdd.forEach((fn) => fn(ban)));
-        client.on("guildBanRemove", (ban) => events.GuildBanRemove.forEach((fn) => fn(ban)));
-        client.on("guildCreate", (guild) => events.GuildCreate.forEach((fn) => fn(guild)));
-        client.on("guildMemberAdd", (member) => events.GuildMemberAdd.forEach((fn) => fn(member)));
-        client.on("guildMemberRemove", (member) => events.GuildMemberRemove.forEach((fn) => fn(member)));
-        client.on("guildMemberUpdate", (oldMember, newMember) => events.GuildMemebrUpdate.forEach((fn) => fn(oldMember, newMember)));
-        client.on("messageCreate", (message) => events.MessageCreate.forEach((fn) => fn(message)));
-        client.on("messageDelete", (message) => events.MessageDelete.forEach((fn) => fn(message)));
-        client.on("messageUpdate", (oldMessage, newMessage) => events.MessageUpdate.forEach((fn) => fn(oldMessage, newMessage)));
+    loadEvents(client: Client, events: IEventItem[]) {
+        events.forEach((e) => {
+            switch(e.EventType) {
+                case EventType.ChannelCreate:
+                    client.on('channelCreate', (channel) => e.ExecutionFunction(channel));
+                    break;
+                case EventType.ChannelDelete:
+                    client.on('channelDelete', (channel) => e.ExecutionFunction(channel));
+                    break;
+                case EventType.ChannelUpdate:
+                    client.on('channelUpdate', (channel) => e.ExecutionFunction(channel));
+                    break;
+                case EventType.GuildBanAdd:
+                    client.on('guildBanAdd', (ban) => e.ExecutionFunction(ban));
+                    break;
+                case EventType.GuildBanRemove:
+                    client.on('guildBanRemove', (ban) => e.ExecutionFunction(ban));
+                    break;
+                case EventType.GuildCreate:
+                    client.on('guildCreate', (guild) => e.ExecutionFunction(guild));
+                    break;
+                case EventType.GuildMemberAdd:
+                    client.on('guildMemberAdd', (member) => e.ExecutionFunction(member));
+                    break;
+                case EventType.GuildMemberRemove:
+                    client.on('guildMemberRemove', (member) => e.ExecutionFunction(member));
+                    break;
+                case EventType.GuildMemberUpdate:
+                    client.on('guildMemberUpdate', (oldMember, newMember) => e.ExecutionFunction(oldMember, newMember));
+                    break;
+                case EventType.MessageCreate:
+                    client.on('messageCreate', (message) => e.ExecutionFunction(message));
+                    break;
+                case EventType.MessageDelete:
+                    client.on('messageDelete', (message) => e.ExecutionFunction(message));
+                    break;
+                case EventType.MessageUpdate:
+                    client.on('messageUpdate', (oldMessage, newMessage) => e.ExecutionFunction(oldMessage, newMessage));
+                    break;
+                default:
+                    console.error('Event not implemented.');
+            }
+        });
     }
 }

src/commands/about.ts

@@ -6,9 +6,9 @@ export default class About extends Command {
     constructor() {
         super();
 
-        this.CommandBuilder = new SlashCommandBuilder()
-            .setName("about")
-            .setDescription("About Bot");
+        super.CommandBuilder = new SlashCommandBuilder()
+            .setName('about')
+            .setDescription('About Bot');
     }
 
     public override async execute(interaction: CommandInteraction) {

src/commands/drop.ts

@@ -1,4 +1,4 @@
-import { AttachmentBuilder, CommandInteraction, SlashCommandBuilder } from "discord.js";
+import { AttachmentBuilder, CommandInteraction, DiscordAPIError, SlashCommandBuilder } from "discord.js";
 import { Command } from "../type/command";
 import { readFileSync } from "fs";
 import { CoreClient } from "../client/client";
@@ -12,33 +12,35 @@ export default class Drop extends Command {
     constructor() {
         super();
 
-        this.CommandBuilder = new SlashCommandBuilder()
-            .setName("drop")
-            .setDescription("Summon a new card drop");
+        super.CommandBuilder = new SlashCommandBuilder()
+            .setName('drop')
+            .setDescription('Summon a new card drop');
     }
 
     public override async execute(interaction: CommandInteraction) {
         if (!CoreClient.AllowDrops) {
-            await interaction.reply("Bot is currently syncing, please wait until its done.");
+            await interaction.reply('Bot is currently syncing, please wait until its done.');
             return;
         }
 
-        if (await Config.GetValue("safemode") == "true") {
-            await interaction.reply("Safe Mode has been activated, please resync to continue.");
+        if (await Config.GetValue('safemode') == "true") {
+            await interaction.reply('Safe Mode has been activated, please resync to continue.');
             return;
         }
 
         const randomCard = CardDropHelperMetadata.GetRandomCard();
 
         if (!randomCard) {
-            await interaction.reply("Unable to fetch card, please try again.");
+            await interaction.reply('Unable to fetch card, please try again.');
             return;
         }
 
         try {
-            const image = readFileSync(path.join(process.env.DATA_DIR!, "cards", randomCard.card.path));
+            let image: Buffer;
             const imageFileName = randomCard.card.path.split("/").pop()!;
 
+            image = readFileSync(path.join(process.cwd(), 'cards', randomCard.card.path));
+
             await interaction.deferReply();
 
             const attachment = new AttachmentBuilder(image, { name: imageFileName });

src/commands/gdrivesync.ts

@@ -9,37 +9,37 @@ export default class Gdrivesync extends Command {
     constructor() {
         super();
 
-        this.CommandBuilder = new SlashCommandBuilder()
-            .setName("gdrivesync")
-            .setDescription("Sync google drive to the bot")
+        super.CommandBuilder = new SlashCommandBuilder()
+            .setName('gdrivesync')
+            .setDescription('Sync google drive to the bot')
             .setDefaultMemberPermissions(PermissionsBitField.Flags.Administrator);
     }
 
     public override async execute(interaction: CommandInteraction<CacheType>) {
         if (!interaction.isChatInputCommand()) return;
 
-        const whitelistedUsers = process.env.BOT_ADMINS!.split(",");
+        const whitelistedUsers = process.env.GDRIVESYNC_WHITELIST!.split(',');
 
         if (!whitelistedUsers.find(x => x == interaction.user.id)) {
             await interaction.reply("Only whitelisted users can use this command.");
             return;
         }
 
-        await interaction.reply("Syncing, this might take a while...");
+        await interaction.reply('Syncing, this might take a while...');
 
         CoreClient.AllowDrops = false;
 
-        exec(`rclone sync card-drop-gdrive: ${process.env.DATA_DIR}/cards`, async (error: ExecException | null) => {
+        exec(`rclone sync card-drop-gdrive: ${process.cwd()}/cards`, async (error: ExecException | null) => {
             if (error) {
                 await interaction.editReply(`Error while running sync command. Safe Mode has been activated. Code: ${error.code}`);
-                await Config.SetValue("safemode", "true");
+                await Config.SetValue('safemode', 'true');
             } else {
                 await CardMetadataFunction.Execute();
 
-                await interaction.editReply("Synced successfully.");
+                await interaction.editReply('Synced successfully.');
 
                 CoreClient.AllowDrops = true;
-                await Config.SetValue("safemode", "false");
+                await Config.SetValue('safemode', 'false');
             }
         });
     }

src/commands/give.ts

@@ -1,68 +0,0 @@
-import { CacheType, CommandInteraction, PermissionsBitField, SlashCommandBuilder } from "discord.js";
-import { Command } from "../type/command";
-import { CoreClient } from "../client/client";
-import Config from "../database/entities/app/Config";
-import CardDropHelperMetadata from "../helpers/CardDropHelperMetadata";
-import Inventory from "../database/entities/app/Inventory";
-
-export default class Give extends Command {
-    constructor() {
-        super();
-
-        this.CommandBuilder = new SlashCommandBuilder()
-            .setName("give")
-            .setDescription("Give a user a card manually, in case bot breaks")
-            .setDefaultMemberPermissions(PermissionsBitField.Flags.Administrator)
-            .addStringOption(x =>
-                x
-                    .setName("cardnumber")
-                    .setDescription("G")
-                    .setRequired(true))
-            .addUserOption(x =>
-                x
-                    .setName("user")
-                    .setDescription("The user to give the card to")
-                    .setRequired(true));
-    }
-
-    public override async execute(interaction: CommandInteraction<CacheType>) {
-        if (!CoreClient.AllowDrops) {
-            await interaction.reply("Bot is currently syncing, please wait until its done.");
-            return;
-        }
-
-        if (await Config.GetValue("safemode") == "true") {
-            await interaction.reply("Safe Mode has been activated, please resync to continue.");
-            return;
-        }
-
-        const whitelistedUsers = process.env.BOT_ADMINS!.split(",");
-
-        if (!whitelistedUsers.find(x => x == interaction.user.id)) {
-            await interaction.reply("Only whitelisted users can use this command.");
-            return;
-        }
-
-        const cardNumber = interaction.options.get("cardnumber", true);
-        const user = interaction.options.getUser("user", true);
-
-        const card = CardDropHelperMetadata.GetCardByCardNumber(cardNumber.value!.toString());
-
-        if (!card) {
-            await interaction.reply("Unable to fetch card, please try again.");
-            return;
-        }
-
-        let inventory = await Inventory.FetchOneByCardNumberAndUserId(user.id, card.id);
-
-        if (!inventory) {
-            inventory = new Inventory(user.id, card.id, 1);
-        } else {
-            inventory.SetQuantity(inventory.Quantity + 1);
-        }
-
-        await inventory.Save(Inventory, inventory);
-
-        await interaction.reply(`${card.name} given to ${interaction.user}, they now have ${inventory.Quantity}`);
-    }
-}

src/commands/inventory.ts

@@ -1,38 +0,0 @@
-import { CommandInteraction, SlashCommandBuilder } from "discord.js";
-import { Command } from "../type/command";
-import InventoryHelper from "../helpers/InventoryHelper";
-
-export default class Inventory extends Command {
-    constructor() {
-        super();
-
-        this.CommandBuilder = new SlashCommandBuilder()
-            .setName("inventory")
-            .setDescription("View your inventory")
-            .addNumberOption(x =>
-                x
-                    .setName("page")
-                    .setDescription("The page to start with"));
-    }
-
-    public override async execute(interaction: CommandInteraction) {
-        const page = interaction.options.get("page");
-
-        try {
-            let pageNumber = 0;
-
-            if (page && page.value) {
-                pageNumber = Number(page.value) - 1;
-            }
-
-            const embed = await InventoryHelper.GenerateInventoryPage(interaction.user.username, interaction.user.id, pageNumber);
-
-            await interaction.reply({
-                embeds: [ embed.embed ],
-                components: [ embed.row ],
-            });
-        } catch {
-            await interaction.reply("No page for user found.");
-        }
-    }
-}

src/commands/resync.ts

@@ -7,27 +7,27 @@ export default class Resync extends Command {
     constructor() {
         super();
 
-        this.CommandBuilder = new SlashCommandBuilder()
-            .setName("resync")
-            .setDescription("Resync the card database")
+        super.CommandBuilder = new SlashCommandBuilder()
+            .setName('resync')
+            .setDescription('Resync the card database')
             .setDefaultMemberPermissions(PermissionsBitField.Flags.Administrator);
     }
 
     public override async execute(interaction: CommandInteraction<CacheType>) {
         if (!interaction.isChatInputCommand()) return;
 
-        const whitelistedUsers = process.env.BOT_ADMINS!.split(",");
+        const whitelistedUsers = process.env.GDRIVESYNC_WHITELIST!.split(',');
 
         if (!whitelistedUsers.find(x => x == interaction.user.id)) {
             await interaction.reply("Only whitelisted users can use this command.");
             return;
         }
 
-        const result = await CardMetadataFunction.Execute(true);
+        let result = await CardMetadataFunction.Execute(true);
 
         if (result) {
-            if (await Config.GetValue("safemode") == "true") {
-                await Config.SetValue("safemode", "false");
+            if (await Config.GetValue('safemode') == "true") {
+                await Config.SetValue('safemode', 'false');
                 await interaction.reply("Resynced database and disabled safe mode.");
 
                 return;

src/commands/stage/dropnumber.ts

@@ -11,23 +11,23 @@ export default class Dropnumber extends Command {
     constructor() {
         super();
 
-        this.CommandBuilder = new SlashCommandBuilder()
-            .setName("dropnumber")
-            .setDescription("(TEST) Summon a specific card")
+        super.CommandBuilder = new SlashCommandBuilder()
+            .setName('dropnumber')
+            .setDescription('(TEST) Summon a specific card')
             .addStringOption(x =>
                 x
-                    .setName("cardnumber")
-                    .setDescription("The card number to summon")
+                    .setName('cardnumber')
+                    .setDescription('The card number to summon')
                     .setRequired(true));
     }
 
     public override async execute(interaction: CommandInteraction<CacheType>) {
         if (!interaction.isChatInputCommand()) return;
 
-        const cardNumber = interaction.options.get("cardnumber");
+        const cardNumber = interaction.options.get('cardnumber');
 
         if (!cardNumber || !cardNumber.value) {
-            await interaction.reply("Card Number is required");
+            await interaction.reply('Card Number is required');
             return;
         }
 
@@ -36,7 +36,7 @@ export default class Dropnumber extends Command {
             .find(x => x.id == cardNumber.value);
 
         if (!card) {
-            await interaction.reply("Card not found");
+            await interaction.reply('Card not found');
             return;
         }
 
@@ -47,7 +47,7 @@ export default class Dropnumber extends Command {
         const imageFileName = card.path.split("/").pop()!;
 
         try {
-            image = readFileSync(path.join(process.env.DATA_DIR!, "cards", card.path));
+            image = readFileSync(path.join(process.cwd(), 'cards', card.path));
         } catch {
             await interaction.reply(`Unable to fetch image for card ${card.id}`);
             return;
@@ -78,7 +78,7 @@ export default class Dropnumber extends Command {
             if (e instanceof DiscordAPIError) {
                 await interaction.editReply(`Unable to send next drop. Please try again, and report this if it keeps happening. Code: ${e.code}`);
             } else {
-                await interaction.editReply("Unable to send next drop. Please try again, and report this if it keeps happening. Code: UNKNOWN");
+                await interaction.editReply(`Unable to send next drop. Please try again, and report this if it keeps happening. Code: UNKNOWN`);
             }
         }
 

src/commands/stage/droprarity.ts

@@ -12,37 +12,37 @@ export default class Droprarity extends Command {
     constructor() {
         super();
 
-        this.CommandBuilder = new SlashCommandBuilder()
-            .setName("droprarity")
-            .setDescription("(TEST) Summon a random card of a specific rarity")
+        super.CommandBuilder = new SlashCommandBuilder()
+            .setName('droprarity')
+            .setDescription('(TEST) Summon a random card of a specific rarity')
             .addStringOption(x =>
                 x
-                    .setName("rarity")
-                    .setDescription("The rarity you want to summon")
+                    .setName('rarity')
+                    .setDescription('The rarity you want to summon')
                     .setRequired(true));
     }
 
     public override async execute(interaction: CommandInteraction<CacheType>) {
         if (!interaction.isChatInputCommand()) return;
 
-        const rarity = interaction.options.get("rarity");
+        const rarity = interaction.options.get('rarity');
 
         if (!rarity || !rarity.value) {
-            await interaction.reply("Rarity is required");
+            await interaction.reply('Rarity is required');
             return;
         }
 
         const rarityType = CardRarityParse(rarity.value.toString());
 
         if (rarityType == CardRarity.Unknown) {
-            await interaction.reply("Invalid rarity");
+            await interaction.reply('Invalid rarity');
             return;
         }
 
         const card = await CardDropHelperMetadata.GetRandomCardByRarity(rarityType);
 
         if (!card) {
-            await interaction.reply("Card not found");
+            await interaction.reply('Card not found');
             return;
         }
 
@@ -50,7 +50,7 @@ export default class Droprarity extends Command {
         const imageFileName = card.card.path.split("/").pop()!;
 
         try {
-            image = readFileSync(path.join(process.env.DATA_DIR!, "cards", card.card.path));
+            image = readFileSync(path.join(process.cwd(), 'cards', card.card.path));
         } catch {
             await interaction.reply(`Unable to fetch image for card ${card.card.id}`);
             return;
@@ -81,7 +81,7 @@ export default class Droprarity extends Command {
             if (e instanceof DiscordAPIError) {
                 await interaction.editReply(`Unable to send next drop. Please try again, and report this if it keeps happening. Code: ${e.code}`);
             } else {
-                await interaction.editReply("Unable to send next drop. Please try again, and report this if it keeps happening. Code: UNKNOWN");
+                await interaction.editReply(`Unable to send next drop. Please try again, and report this if it keeps happening. Code: UNKNOWN`);
             }
         }
 

src/contracts/EventExecutors.ts

@@ -1,19 +0,0 @@
-
-import { DMChannel, Guild, GuildBan, GuildMember, Message, NonThreadGuildBasedChannel, PartialGuildMember, PartialMessage } from "discord.js";
-
-interface EventExecutors {
-    ChannelCreate: ((channel: NonThreadGuildBasedChannel) => void)[],
-    ChannelDelete: ((channel: DMChannel | NonThreadGuildBasedChannel) => void)[],
-    ChannelUpdate: ((channel: DMChannel | NonThreadGuildBasedChannel) => void)[],
-    GuildBanAdd: ((ban: GuildBan) => void)[],
-    GuildBanRemove: ((ban: GuildBan) => void)[],
-    GuildCreate: ((guild: Guild) => void)[],
-    GuildMemberAdd: ((member: GuildMember) => void)[],
-    GuildMemberRemove: ((member: GuildMember | PartialGuildMember) => void)[],
-    GuildMemebrUpdate: ((oldMember: GuildMember | PartialGuildMember, newMember: GuildMember) => void)[],
-    MessageCreate: ((message: Message<boolean>) => void)[],
-    MessageDelete: ((message: Message<boolean> | PartialMessage) => void)[],
-    MessageUpdate: ((oldMessage: Message<boolean> | PartialMessage, newMessage: Message<boolean> | PartialMessage) => void)[],
-}
-
-export default EventExecutors;

src/contracts/IButtonEventItem.ts

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

src/contracts/ICommandItem.ts

@@ -1,11 +1,9 @@
 import { Environment } from "../constants/Environment";
 import { Command } from "../type/command";
 
-interface ICommandItem {
+export default interface ICommandItem {
     Name: string,
     Command: Command,
     Environment: Environment,
     ServerId?: string,
 }
-
-export default ICommandItem;

src/contracts/IEventItem.ts

@@ -0,0 +1,9 @@
+
+import { Environment } from "../constants/Environment";
+import { EventType } from "../constants/EventType";
+
+export default interface IEventItem {
+    EventType: EventType,
+    ExecutionFunction: Function,
+    Environment: Environment,
+}

src/contracts/IGDriveFolderListing.ts

@@ -1,4 +1,4 @@
-export interface IGDriveFolderListing {
+export default interface IGDriveFolderListing {
     id: string,
     name: string,
-}
+};

src/contracts/SeriesMetadata.ts

@@ -1,6 +1,6 @@
 import { CardRarity } from "../constants/CardRarity";
 
-export interface SeriesMetadata {
+export default interface SeriesMetadata {
     id: number,
     name: string,
     cards: CardMetadata[],

src/database/entities/app/Inventory.ts

@@ -40,12 +40,4 @@ export default class Inventory extends AppBaseEntity {
 
         return single;
     }
-
-    public static async FetchAllByUserId(userId: string): Promise<Inventory[]> {
-        const repository = AppDataSource.getRepository(Inventory);
-
-        const all = await repository.find({ where: { UserId: userId }});
-
-        return all;
-    }
 }

src/database/migrations/app/0.1.5/1694609771821-CreateClaim.ts

@@ -1,17 +1,17 @@
-import { MigrationInterface, QueryRunner } from "typeorm";
-import MigrationHelper from "../../../../helpers/MigrationHelper";
+import { MigrationInterface, QueryRunner } from "typeorm"
+import MigrationHelper from "../../../../helpers/MigrationHelper"
 
 export class CreateClaim1694609771821 implements MigrationInterface {
 
     public async up(queryRunner: QueryRunner): Promise<void> {
-        MigrationHelper.Up("1694609771821-CreateClaim", "0.1.5", [
-            "01-CreateClaim",
-            "02-MoveToClaim",
-            "03-AlterInventory",
+        MigrationHelper.Up('1694609771821-CreateClaim', '0.1.5', [
+            '01-CreateClaim',
+            '02-MoveToClaim',
+            '03-AlterInventory',
         ], queryRunner);
     }
 
-    public async down(): Promise<void> {
+    public async down(queryRunner: QueryRunner): Promise<void> {
     }
 
 }

src/database/migrations/app/0.1/1693769942868-CreateBase.ts

@@ -1,15 +1,15 @@
-import { MigrationInterface, QueryRunner } from "typeorm";
-import MigrationHelper from "../../../../helpers/MigrationHelper";
+import { MigrationInterface, QueryRunner } from "typeorm"
+import MigrationHelper from "../../../../helpers/MigrationHelper"
 
 export class CreateBase1693769942868 implements MigrationInterface {
 
     public async up(queryRunner: QueryRunner): Promise<void> {
-        MigrationHelper.Up("1693769942868-CreateBase", "0.1", [
+        MigrationHelper.Up('1693769942868-CreateBase', '0.1', [
             "01-table/Inventory",
         ], queryRunner);
     }
 
-    public async down(): Promise<void> {
+    public async down(queryRunner: QueryRunner): Promise<void> {
     }
 
 }

src/database/migrations/app/0.2/1699814500650-createConfig.ts

@@ -1,15 +1,15 @@
-import { MigrationInterface, QueryRunner } from "typeorm";
-import MigrationHelper from "../../../../helpers/MigrationHelper";
+import { MigrationInterface, QueryRunner } from "typeorm"
+import MigrationHelper from "../../../../helpers/MigrationHelper"
 
 export class CreateConfig1699814500650 implements MigrationInterface {
 
     public async up(queryRunner: QueryRunner): Promise<void> {
-        MigrationHelper.Up("1699814500650-createConfig", "0.2", [
+        MigrationHelper.Up('1699814500650-createConfig', '0.2', [
             "01-table/Config",
         ], queryRunner);
     }
 
-    public async down(): Promise<void> {
+    public async down(queryRunner: QueryRunner): Promise<void> {
     }
 
 }

src/helpers/CardDropHelperMetadata.ts

@@ -1,7 +1,7 @@
 import { ActionRowBuilder, ButtonBuilder, ButtonStyle, EmbedBuilder } from "discord.js";
 import { CardRarity, CardRarityToColour, CardRarityToString } from "../constants/CardRarity";
 import CardRarityChances from "../constants/CardRarityChances";
-import { CardMetadata, DropResult } from "../contracts/SeriesMetadata";
+import { DropResult } from "../contracts/SeriesMetadata";
 import { CoreClient } from "../client/client";
 
 export default class CardDropHelperMetadata {
@@ -47,15 +47,7 @@ export default class CardDropHelperMetadata {
         };
     }
 
-    public static GetCardByCardNumber(cardNumber: string): CardMetadata | undefined {
-        const card = CoreClient.Cards
-            .flatMap(x => x.cards)
-            .find(x => x.id == cardNumber);
-
-        return card;
-    }
-
-    public static GenerateDropEmbed(drop: DropResult, quantityClaimed: number, imageFileName: string): EmbedBuilder {
+    public static GenerateDropEmbed(drop: DropResult, quantityClaimed: Number, imageFileName: string): EmbedBuilder {
         let description = "";
         description += `Series: ${drop.series.name}\n`;
         description += `Claimed: ${quantityClaimed}\n`;
@@ -76,7 +68,7 @@ export default class CardDropHelperMetadata {
                     .setLabel("Claim")
                     .setStyle(ButtonStyle.Primary),
                 new ButtonBuilder()
-                    .setCustomId("reroll")
+                    .setCustomId(`reroll`)
                     .setLabel("Reroll")
                     .setStyle(ButtonStyle.Secondary));
     }

src/helpers/InventoryHelper.ts

@@ -1,98 +0,0 @@
-import { ActionRowBuilder, ButtonBuilder, ButtonStyle, EmbedBuilder } from "discord.js";
-import Inventory from "../database/entities/app/Inventory";
-import { CoreClient } from "../client/client";
-import EmbedColours from "../constants/EmbedColours";
-import { CardRarity, CardRarityToString } from "../constants/CardRarity";
-
-interface InventoryPage {
-    id: number,
-    name: string,
-    cards: InventoryPageCards[],
-    seriesSubpage: number,
-}
-
-interface InventoryPageCards {
-    id: string,
-    name: string,
-    type: CardRarity,
-    quantity: number,
-}
-
-export default class InventoryHelper {
-    public static async GenerateInventoryPage(username: string, userid: string, page: number): Promise<{ embed: EmbedBuilder, row: ActionRowBuilder<ButtonBuilder> }> {
-        const cardsPerPage = 15;
-
-        const inventory = await Inventory.FetchAllByUserId(userid);
-
-        const allSeriesClaimed = CoreClient.Cards
-            .sort((a, b) => a.id - b.id)
-            .filter(x => {
-                x.cards = x.cards
-                    .sort((a, b) => b.type - a.type)
-                    .filter(y => inventory.find(z => z.CardNumber == y.id));
-
-                return x;
-            });
-
-        const pages: InventoryPage[] = [];
-
-        for (const series of allSeriesClaimed) {
-            const seriesCards = series.cards;
-
-            for (let i = 0; i < seriesCards.length; i+= cardsPerPage) {
-                const cards = series.cards.slice(i, i + cardsPerPage);
-                const pageCards: InventoryPageCards[] = [];
-
-                for (const card of cards) {
-                    const item = inventory.find(x => x.CardNumber == card.id);
-
-                    if (!item) {
-                        continue;
-                    }
-
-                    pageCards.push({
-                        id: card.id,
-                        name: card.name,
-                        type: card.type,
-                        quantity: item.Quantity,
-                    });
-                }
-
-                pages.push({
-                    id: series.id,
-                    name: series.name,
-                    cards: pageCards,
-                    seriesSubpage: i / cardsPerPage,
-                });
-            }
-        }
-
-        const currentPage = pages[page];
-
-        if (!currentPage) {
-            console.error("Unable to find page");
-            return Promise.reject("Unable to find page");
-        }
-
-        const embed = new EmbedBuilder()
-            .setTitle(username)
-            .setDescription(`**${currentPage.name} (${currentPage.seriesSubpage + 1})**\n${currentPage.cards.map(x => `[${x.id}] ${x.name} (${CardRarityToString(x.type)}) x${x.quantity}`).join("\n")}`)
-            .setFooter({ text: `Page ${page + 1} of ${pages.length}` })
-            .setColor(EmbedColours.Ok);
-
-        const row = new ActionRowBuilder<ButtonBuilder>()
-            .addComponents(
-                new ButtonBuilder()
-                    .setCustomId(`inventory ${userid} ${page - 1}`)
-                    .setLabel("Previous")
-                    .setStyle(ButtonStyle.Primary)
-                    .setDisabled(page == 0),
-                new ButtonBuilder()
-                    .setCustomId(`inventory ${userid} ${page + 1}`)
-                    .setLabel("Next")
-                    .setStyle(ButtonStyle.Primary)
-                    .setDisabled(page + 1 == pages.length));
-
-        return { embed, row };
-    }
-}

src/helpers/MigrationHelper.ts

@@ -3,7 +3,7 @@ import { QueryRunner } from "typeorm";
 
 export default class MigrationHelper {
     public static Up(migrationName: string, version: string, queryFiles: string[], queryRunner: QueryRunner) {
-        for (const path of queryFiles) {
+        for (let path of queryFiles) {
             const query = readFileSync(`${process.cwd()}/database/${version}/${migrationName}/Up/${path}.sql`).toString();
 
             queryRunner.query(query);
@@ -11,7 +11,7 @@ export default class MigrationHelper {
     }
 
     public static Down(migrationName: string, version: string, queryFiles: string[], queryRunner: QueryRunner) {
-        for (const path of queryFiles) {
+        for (let path of queryFiles) {
             const query = readFileSync(`${process.cwd()}/database/${version}/${migrationName}/Down/${path}.sql`).toString();
 
             queryRunner.query(query);

src/helpers/StringTools.ts

@@ -1,7 +1,7 @@
 export default class StringTools {
     public static Capitalise(str: string): string {
         const words = str.split(" ");
-        const result: string[] = [];
+        let result: string[] = [];
 
         words.forEach(word => {
             const firstLetter = word.substring(0, 1).toUpperCase();
@@ -26,10 +26,10 @@ export default class StringTools {
     public static RandomString(length: number) {
         let result = "";
 
-        const characters = "abcdefghkmnpqrstuvwxyz23456789";
+        const characters = 'abcdefghkmnpqrstuvwxyz23456789';
         const charactersLength = characters.length;
 
-        for ( let i = 0; i < length; i++ ) {
+        for ( var i = 0; i < length; i++ ) {
           result += characters.charAt(Math.floor(Math.random() * charactersLength));
         }
 
@@ -37,6 +37,6 @@ export default class StringTools {
     }
 
     public static ReplaceAll(str: string, find: string, replace: string) {
-        return str.replace(new RegExp(find, "g"), replace);
+        return str.replace(new RegExp(find, 'g'), replace);
     }
 }

src/helpers/TimeLengthInput.ts

@@ -4,23 +4,23 @@ export default class TimeLengthInput {
     public readonly value: string;
 
     constructor(input: string) {
-        this.value = StringTools.ReplaceAll(input, ",", "");
+        this.value = StringTools.ReplaceAll(input, ',', '');
     }
 
     public GetDays(): number {
-        return this.GetValue("d");
+        return this.GetValue('d');
     }
 
     public GetHours(): number {
-        return this.GetValue("h");
+        return this.GetValue('h');
     }
 
     public GetMinutes(): number {
-        return this.GetValue("m");
+        return this.GetValue('m');
     }
 
     public GetSeconds(): number {
-        return this.GetValue("s");
+        return this.GetValue('s');
     }
 
     public GetMilliseconds(): number {
@@ -106,7 +106,7 @@ export default class TimeLengthInput {
     }
 
     private GetValue(designation: string): number {
-        const valueSplit = this.value.split(" ");
+        const valueSplit = this.value.split(' ');
 
         const desString = valueSplit.find(x => x.charAt(x.length - 1) == designation);
 

src/hooks/ReloadDB.ts

@@ -2,7 +2,7 @@ import { Request, Response } from "express";
 import CardMetadataFunction from "../Functions/CardMetadataFunction";
 
 export default async function ReloadDB(req: Request, res: Response) {
-    console.log("Reloading Card DB...");
+    console.log('Reloading Card DB...');
 
     await CardMetadataFunction.Execute();
 

src/registry.ts

@@ -1,12 +1,9 @@
 import { CoreClient } from "./client/client";
-import { Environment } from "./constants/Environment";
 
 // Global Command Imports
 import About from "./commands/about";
 import Drop from "./commands/drop";
 import Gdrivesync from "./commands/gdrivesync";
-import Give from "./commands/give";
-import Inventory from "./commands/inventory";
 import Resync from "./commands/resync";
 
 // Test Command Imports
@@ -15,22 +12,20 @@ import Droprarity from "./commands/stage/droprarity";
 
 // Button Event Imports
 import Claim from "./buttonEvents/Claim";
-import InventoryButtonEvent from "./buttonEvents/Inventory";
 import Reroll from "./buttonEvents/Reroll";
+import { Environment } from "./constants/Environment";
 
 export default class Registry {
     public static RegisterCommands() {
         // Global Commands
-        CoreClient.RegisterCommand("about", new About());
-        CoreClient.RegisterCommand("drop", new Drop());
-        CoreClient.RegisterCommand("gdrivesync", new Gdrivesync());
-        CoreClient.RegisterCommand("give", new Give());
-        CoreClient.RegisterCommand("inventory", new Inventory());
-        CoreClient.RegisterCommand("resync", new Resync());
+        CoreClient.RegisterCommand('about', new About());
+        CoreClient.RegisterCommand('drop', new Drop());
+        CoreClient.RegisterCommand('gdrivesync', new Gdrivesync());
+        CoreClient.RegisterCommand('resync', new Resync());
 
         // Test Commands
-        CoreClient.RegisterCommand("dropnumber", new Dropnumber(), Environment.Test);
-        CoreClient.RegisterCommand("droprarity", new Droprarity(), Environment.Test);
+        CoreClient.RegisterCommand('dropnumber', new Dropnumber(), Environment.Test);
+        CoreClient.RegisterCommand('droprarity', new Droprarity(), Environment.Test);
     }
 
     public static RegisterEvents() {
@@ -38,8 +33,7 @@ export default class Registry {
     }
 
     public static RegisterButtonEvents() {
-        CoreClient.RegisterButtonEvent("claim", new Claim());
-        CoreClient.RegisterButtonEvent("inventory", new InventoryButtonEvent);
-        CoreClient.RegisterButtonEvent("reroll", new Reroll());
+        CoreClient.RegisterButtonEvent('claim', new Claim());
+        CoreClient.RegisterButtonEvent('reroll', new Reroll());
     }
 }

src/type/buttonEvent.ts

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

src/type/command.ts

@@ -1,7 +1,9 @@
-import { CommandInteraction, SlashCommandBuilder } from "discord.js";
+import { CommandInteraction } from "discord.js";
 
-export abstract class Command {
-    public CommandBuilder: Omit<SlashCommandBuilder, "addSubcommand" | "addSubcommandGroup">;
+export class Command {
+    public CommandBuilder: any;
     
-    abstract execute(interaction: CommandInteraction): Promise<void>;
+    public execute(interaction: CommandInteraction) {
+
+    }
 }

src/webhooks.ts

@@ -19,7 +19,7 @@ export default class Webhooks {
     }
 
     private setupRoutes() {
-        this.app.post("/api/reload-db", ReloadDB);
+        this.app.post('/api/reload-db', ReloadDB);
     }
 
     private setupListen() {