From 601c2639ba8b653743b8af5686e3b5969b462107 Mon Sep 17 00:00:00 2001
From: Dominik Koch <dominik@koch-bautechnik.de>
Date: Sat, 20 Jul 2024 16:04:29 +0200
Subject: [PATCH] Remake the question queue system (#577)

* start queue remake

* fix: minor fixes and additions

* fix; make sure questions are cleared and added

* fix: saving point for files

* this sucks

* add: non-repetitive questions

* fix: ts ignore welcomer

* fix: add enabled flag

* fix: remove nodemon

* fix: no custom questions issue

---------

Co-authored-by: ForGetFulSkyBro <forgetfulskybro9@gmail.com>
---
 README.md                                     |  13 +-
 package.json                                  |   1 -
 src/buttons/gamesActivities/dare.ts           |  10 +-
 src/buttons/gamesActivities/higher.ts         |   4 +-
 src/buttons/gamesActivities/lower.ts          |   4 +-
 src/buttons/gamesActivities/neverhaveiever.ts |  10 +-
 src/buttons/gamesActivities/random.ts         |   9 +-
 src/buttons/gamesActivities/truth.ts          |   9 +-
 src/buttons/gamesActivities/wouldyourather.ts |   9 +-
 src/buttons/gamesActivities/wwyd.ts           |   9 +-
 src/commands/game/dare.ts                     |   6 +-
 src/commands/game/neverhaveiever.ts           |   6 +-
 src/commands/game/random.ts                   |   6 +-
 src/commands/game/truth.ts                    |   6 +-
 src/commands/game/whatwouldyoudo.ts           |   6 +-
 src/commands/game/wouldyourather.ts           |   8 +-
 src/events/guildMemberAdd.ts                  |  95 +++---
 src/util/Functions/jsonImport.ts              | 272 +++++++++++++-----
 src/util/Functions/queueHandler.ts            | 130 ---------
 src/util/Models/usedModel.ts                  |  25 ++
 20 files changed, 341 insertions(+), 297 deletions(-)
 delete mode 100644 src/util/Functions/queueHandler.ts

diff --git a/README.md b/README.md
index ea2a86e7..6a3ea353 100644
--- a/README.md
+++ b/README.md
@@ -37,17 +37,18 @@ Follow the Angular commit message format. See [here](https://github.com/angular/
 
 You can run the below scripts with `pnpm <script>`.
 
-| Script         | Description                                                          |
-| -------------- | -------------------------------------------------------------------- |
-| `start`        | Runs the code in production mode                                     |
-| `dev`          | Runs the code using nodemon in dev mode                              |
-| `format`       | Formats the code.                                                    |
-
+| Script   | Description                      |
+| -------- | -------------------------------- |
+| `start`  | Runs the code in production mode |
+| `dev`    | Runs the code in dev mode        |
+| `format` | Formats the code.                |
 
 ### Discord logs
 
 Logs are also sent to Discord to allow for easier and more accessible debugging, as not everyone will have access to the host system, especially in production. The channels for the different log levels are defined in the `.env` file.
+
 # Docker deployment
+
 For a guide regarding the deployment on our production server go to [this link](https://github.com/Would-You-Bot/config)
 
 # Project Details
diff --git a/package.json b/package.json
index 030d2f53..4401c4d2 100644
--- a/package.json
+++ b/package.json
@@ -61,7 +61,6 @@
     "@types/express": "^4.17.21",
     "@types/uuid": "^10.0.0",
     "copyfiles": "^2.4.1",
-    "nodemon": "3.0.1",
     "prettier": "^3.2.5",
     "typescript": "^5.4.5"
   }
diff --git a/src/buttons/gamesActivities/dare.ts b/src/buttons/gamesActivities/dare.ts
index e3e5ff7d..d08d413e 100644
--- a/src/buttons/gamesActivities/dare.ts
+++ b/src/buttons/gamesActivities/dare.ts
@@ -46,6 +46,9 @@ const button: Button = {
         }
       }
     }
+
+    const premium = await client.premium.check(interaction?.guildId);
+
     const userDb = await UserModel.findOne({
       userID: interaction.user?.id,
     });
@@ -58,6 +61,7 @@ const button: Button = {
         : userDb?.language
           ? userDb.language
           : "en_EN",
+      premium.result,
     );
 
     const dareEmbed = new DefaultGameEmbed(
@@ -71,8 +75,6 @@ const button: Button = {
     const row2 = new ActionRowBuilder<MessageActionRowComponentBuilder>();
     let components: ActionRowBuilder<MessageActionRowComponentBuilder>[];
 
-    const premium = await client.premium.check(interaction?.guildId);
-
     const randomValue = Math.round(Math.random() * 15);
 
     if (!premium.result && randomValue < 3) {
@@ -86,7 +88,7 @@ const button: Button = {
           ),
       ]);
       components = [row, row2];
-    } else if (!premium.result && randomValue >= 3 && randomValue < 7) {
+    } else if (!premium.result && randomValue >= 3 && randomValue < 5) {
       row2.addComponents([
         new ButtonBuilder()
           .setLabel("Premium")
@@ -108,7 +110,7 @@ const button: Button = {
       ? { content: DARE.question }
       : {
           content:
-            !premium.result && randomValue >= 3 && randomValue < 6
+            !premium.result && randomValue >= 3 && randomValue < 5
               ? client.translation.get(guildDb?.language, "Premium.message")
               : undefined,
           embeds: [dareEmbed],
diff --git a/src/buttons/gamesActivities/higher.ts b/src/buttons/gamesActivities/higher.ts
index c444623a..4e9e439a 100644
--- a/src/buttons/gamesActivities/higher.ts
+++ b/src/buttons/gamesActivities/higher.ts
@@ -179,7 +179,7 @@ const button: Button = {
               "https://discord.com/oauth2/authorize?client_id=981649513427111957&permissions=275415247936&scope=bot%20applications.commands",
             ),
         ]);
-      } else if (!premium.result && randomValue >= 3 && randomValue < 6) {
+      } else if (!premium.result && randomValue >= 3 && randomValue < 5) {
         mainRow.addComponents([
           new ButtonBuilder()
             .setLabel("Premium")
@@ -203,7 +203,7 @@ const button: Button = {
       gameImage.build(game?.score || 0, client).then((image) => {
         interaction.editReply({
           content:
-            !premium.result && randomValue >= 3 && randomValue < 6
+            !premium.result && randomValue >= 3 && randomValue < 5
               ? client.translation.get(guildDb?.language, "Premium.message")
               : undefined,
           embeds: [loseEmbed],
diff --git a/src/buttons/gamesActivities/lower.ts b/src/buttons/gamesActivities/lower.ts
index 1485b638..c0ee8ac3 100644
--- a/src/buttons/gamesActivities/lower.ts
+++ b/src/buttons/gamesActivities/lower.ts
@@ -179,7 +179,7 @@ const button: Button = {
               "https://discord.com/oauth2/authorize?client_id=981649513427111957&permissions=275415247936&scope=bot%20applications.commands",
             ),
         ]);
-      } else if (!premium.result && randomValue >= 3 && randomValue < 6) {
+      } else if (!premium.result && randomValue >= 3 && randomValue < 5) {
         mainRow.addComponents([
           new ButtonBuilder()
             .setLabel("Premium")
@@ -203,7 +203,7 @@ const button: Button = {
       gameImage.build(game?.score || 0, client).then((image) => {
         interaction.editReply({
           content:
-            !premium.result && randomValue >= 3 && randomValue < 6
+            !premium.result && randomValue >= 3 && randomValue < 5
               ? client.translation.get(guildDb?.language, "Premium.message")
               : undefined,
           embeds: [loseEmbed],
diff --git a/src/buttons/gamesActivities/neverhaveiever.ts b/src/buttons/gamesActivities/neverhaveiever.ts
index 3e9bea0d..c9f1c350 100644
--- a/src/buttons/gamesActivities/neverhaveiever.ts
+++ b/src/buttons/gamesActivities/neverhaveiever.ts
@@ -46,6 +46,9 @@ const button: Button = {
         }
       }
     }
+
+    const premium = await client.premium.check(interaction?.guildId);
+
     const userDb = await UserModel.findOne({
       userID: interaction.user?.id,
     });
@@ -58,6 +61,7 @@ const button: Button = {
         : userDb?.language
           ? userDb.language
           : "en_EN",
+      premium.result,
     );
 
     const nhieEmbed = new DefaultGameEmbed(
@@ -71,8 +75,6 @@ const button: Button = {
 
     const randomValue = Math.round(Math.random() * 15);
 
-    const premium = await client.premium.check(interaction?.guildId);
-
     if (!premium.result && randomValue < 3) {
       mainRow.addComponents([
         new ButtonBuilder()
@@ -83,7 +85,7 @@ const button: Button = {
             "https://discord.com/oauth2/authorize?client_id=981649513427111957&permissions=275415247936&scope=bot%20applications.commands",
           ),
       ]);
-    } else if (!premium.result && randomValue >= 3 && randomValue < 6) {
+    } else if (!premium.result && randomValue >= 3 && randomValue < 5) {
       mainRow.addComponents([
         new ButtonBuilder()
           .setLabel("Premium")
@@ -117,7 +119,7 @@ const button: Button = {
       ? { content: NHIE.question, fetchReply: true }
       : {
           content:
-            !premium.result && randomValue >= 3 && randomValue < 6
+            !premium.result && randomValue >= 3 && randomValue < 5
               ? client.translation.get(guildDb?.language, "Premium.message")
               : undefined,
           embeds: [nhieEmbed],
diff --git a/src/buttons/gamesActivities/random.ts b/src/buttons/gamesActivities/random.ts
index 0ef91fab..92ce69e4 100644
--- a/src/buttons/gamesActivities/random.ts
+++ b/src/buttons/gamesActivities/random.ts
@@ -48,6 +48,8 @@ const button: Button = {
       }
     }
 
+    const premium = await client.premium.check(interaction?.guildId);
+
     const userDb = await UserModel.findOne({
       userID: interaction.user?.id,
     });
@@ -59,6 +61,7 @@ const button: Button = {
         : userDb?.language
           ? userDb.language
           : "en_EN",
+      premium.result,
     );
 
     const randomEmbed = new DefaultGameEmbed(
@@ -72,8 +75,6 @@ const button: Button = {
     const row2 = new ActionRowBuilder<MessageActionRowComponentBuilder>();
     let components = [];
 
-    const premium = await client.premium.check(interaction?.guildId);
-
     const randomValue = Math.round(Math.random() * 15);
 
     if (!premium.result && randomValue < 3) {
@@ -87,7 +88,7 @@ const button: Button = {
           ),
       ]);
       components = [row, row2];
-    } else if (!premium.result && randomValue >= 3 && randomValue < 7) {
+    } else if (!premium.result && randomValue >= 3 && randomValue < 5) {
       row2.addComponents([
         new ButtonBuilder()
           .setLabel("Premium")
@@ -109,7 +110,7 @@ const button: Button = {
       ? { content: RANDOM.question }
       : {
           content:
-            !premium.result && randomValue >= 3 && randomValue < 6
+            !premium.result && randomValue >= 3 && randomValue < 5
               ? client.translation.get(guildDb?.language, "Premium.message")
               : undefined,
           embeds: [randomEmbed],
diff --git a/src/buttons/gamesActivities/truth.ts b/src/buttons/gamesActivities/truth.ts
index ba3da8d1..b0fd1729 100644
--- a/src/buttons/gamesActivities/truth.ts
+++ b/src/buttons/gamesActivities/truth.ts
@@ -49,6 +49,8 @@ const button: Button = {
       }
     }
 
+    const premium = await client.premium.check(interaction?.guildId);
+
     const userDb = await UserModel.findOne({
       userID: interaction.user?.id,
     });
@@ -61,6 +63,7 @@ const button: Button = {
         : userDb?.language
           ? userDb.language
           : "en_EN",
+      premium.result,
     );
 
     const truthEmbed = new DefaultGameEmbed(
@@ -74,8 +77,6 @@ const button: Button = {
     const row2 = new ActionRowBuilder<MessageActionRowComponentBuilder>();
     let components: ActionRowBuilder<MessageActionRowComponentBuilder>[];
 
-    const premium = await client.premium.check(interaction?.guildId);
-
     const randomValue = Math.round(Math.random() * 15);
 
     if (!premium.result && randomValue < 3) {
@@ -89,7 +90,7 @@ const button: Button = {
           ),
       ]);
       components = [row, row2];
-    } else if (!premium.result && randomValue >= 3 && randomValue < 7) {
+    } else if (!premium.result && randomValue >= 3 && randomValue < 5) {
       row2.addComponents([
         new ButtonBuilder()
           .setLabel("Premium")
@@ -111,7 +112,7 @@ const button: Button = {
       ? { content: TRUTH.question }
       : {
           content:
-            !premium.result && randomValue >= 3 && randomValue < 6
+            !premium.result && randomValue >= 3 && randomValue < 5
               ? client.translation.get(guildDb?.language, "Premium.message")
               : undefined,
           embeds: [truthEmbed],
diff --git a/src/buttons/gamesActivities/wouldyourather.ts b/src/buttons/gamesActivities/wouldyourather.ts
index 425af3fb..2522343a 100644
--- a/src/buttons/gamesActivities/wouldyourather.ts
+++ b/src/buttons/gamesActivities/wouldyourather.ts
@@ -49,6 +49,8 @@ const button: Button = {
       }
     }
 
+    const premium = await client.premium.check(interaction?.guildId);
+
     const userDb = await UserModel.findOne({
       userID: interaction.user?.id,
     });
@@ -61,6 +63,7 @@ const button: Button = {
         : userDb?.language
           ? userDb.language
           : "en_EN",
+      premium.result,
     );
 
     const ratherEmbed = new DefaultGameEmbed(
@@ -83,8 +86,6 @@ const button: Button = {
 
     const randomValue = Math.round(Math.random() * 15);
 
-    const premium = await client.premium.check(interaction?.guildId);
-
     if (!premium.result && randomValue < 3) {
       mainRow.addComponents([
         new ButtonBuilder()
@@ -95,7 +96,7 @@ const button: Button = {
             "https://discord.com/oauth2/authorize?client_id=981649513427111957&permissions=275415247936&scope=bot%20applications.commands",
           ),
       ]);
-    } else if (!premium.result && randomValue >= 3 && randomValue < 6) {
+    } else if (!premium.result && randomValue >= 3 && randomValue < 5) {
       mainRow.addComponents([
         new ButtonBuilder()
           .setLabel("Premium")
@@ -129,7 +130,7 @@ const button: Button = {
       ? { content: WYR.question, fetchReply: true }
       : {
           content:
-            !premium.result && randomValue >= 3 && randomValue < 6
+            !premium.result && randomValue >= 3 && randomValue < 5
               ? client.translation.get(guildDb?.language, "Premium.message")
               : undefined,
           embeds: [ratherEmbed],
diff --git a/src/buttons/gamesActivities/wwyd.ts b/src/buttons/gamesActivities/wwyd.ts
index e76191df..c1db725c 100644
--- a/src/buttons/gamesActivities/wwyd.ts
+++ b/src/buttons/gamesActivities/wwyd.ts
@@ -49,6 +49,8 @@ const button: Button = {
       }
     }
 
+    const premium = await client.premium.check(interaction?.guildId);
+
     const userDb = await UserModel.findOne({
       userID: interaction.user?.id,
     });
@@ -61,6 +63,7 @@ const button: Button = {
         : userDb?.language
           ? userDb.language
           : "en_EN",
+      premium.result,
     );
 
     const wwydEmbed = new DefaultGameEmbed(
@@ -74,8 +77,6 @@ const button: Button = {
 
     const randomValue = Math.round(Math.random() * 15);
 
-    const premium = await client.premium.check(interaction?.guildId);
-
     if (!premium.result && randomValue < 3) {
       row.addComponents([
         new ButtonBuilder()
@@ -86,7 +87,7 @@ const button: Button = {
             "https://discord.com/oauth2/authorize?client_id=981649513427111957&permissions=275415247936&scope=bot%20applications.commands",
           ),
       ]);
-    } else if (!premium.result && randomValue >= 3 && randomValue < 6) {
+    } else if (!premium.result && randomValue >= 3 && randomValue < 5) {
       row.addComponents([
         new ButtonBuilder()
           .setLabel("Premium")
@@ -108,7 +109,7 @@ const button: Button = {
       ? { content: WWYD.question, fetchReply: true }
       : {
           content:
-            !premium.result && randomValue >= 3 && randomValue < 6
+            !premium.result && randomValue >= 3 && randomValue < 5
               ? client.translation.get(guildDb?.language, "Premium.message")
               : undefined,
           embeds: [wwydEmbed],
diff --git a/src/commands/game/dare.ts b/src/commands/game/dare.ts
index 12c9b6b0..17792ccc 100644
--- a/src/commands/game/dare.ts
+++ b/src/commands/game/dare.ts
@@ -32,6 +32,7 @@ const command: ChatInputCommand = {
    * @param {guildModel} guildDb
    */
   execute: async (interaction, client, guildDb) => {
+    const premium = await client.premium.check(interaction?.guildId);
     const userDb = await UserModel.findOne({
       userID: interaction.user?.id,
     });
@@ -44,6 +45,7 @@ const command: ChatInputCommand = {
         : userDb?.language
           ? userDb.language
           : "en_EN",
+      premium.result,
     );
 
     const dareEmbed = new DefaultGameEmbed(
@@ -57,8 +59,6 @@ const command: ChatInputCommand = {
     const row2 = new ActionRowBuilder<MessageActionRowComponentBuilder>();
     let components = [];
 
-    const premium = await client.premium.check(interaction?.guildId);
-
     const randomValue = Math.round(Math.random() * 15);
 
     if (!premium.result && randomValue < 3) {
@@ -72,7 +72,7 @@ const command: ChatInputCommand = {
           ),
       ]);
       components = [row, row2];
-    } else if (!premium.result && randomValue >= 3 && randomValue < 7) {
+    } else if (!premium.result && randomValue >= 3 && randomValue < 5) {
       row2.addComponents([
         new ButtonBuilder()
           .setLabel("Premium")
diff --git a/src/commands/game/neverhaveiever.ts b/src/commands/game/neverhaveiever.ts
index 2a253e0c..b5e26f31 100644
--- a/src/commands/game/neverhaveiever.ts
+++ b/src/commands/game/neverhaveiever.ts
@@ -31,6 +31,7 @@ const command: ChatInputCommand = {
    */
 
   execute: async (interaction, client, guildDb) => {
+    const premium = await client.premium.check(interaction?.guildId);
     let userDb = await UserModel.findOne({
       userID: interaction.user?.id,
     });
@@ -43,6 +44,7 @@ const command: ChatInputCommand = {
         : userDb?.language
           ? userDb.language
           : "en_EN",
+      premium.result,
     );
 
     const nhieEmbed = new DefaultGameEmbed(
@@ -54,8 +56,6 @@ const command: ChatInputCommand = {
 
     const mainRow = new ActionRowBuilder<MessageActionRowComponentBuilder>();
 
-    const premium = await client.premium.check(interaction.guildId);
-
     const randomValue = Math.round(Math.random() * 15);
 
     if (!premium.result && randomValue < 3) {
@@ -68,7 +68,7 @@ const command: ChatInputCommand = {
             "https://discord.com/oauth2/authorize?client_id=981649513427111957&permissions=275415247936&scope=bot%20applications.commands",
           ),
       ]);
-    } else if (!premium.result && randomValue >= 3 && randomValue < 6) {
+    } else if (!premium.result && randomValue >= 3 && randomValue < 5) {
       mainRow.addComponents([
         new ButtonBuilder()
           .setLabel("Premium")
diff --git a/src/commands/game/random.ts b/src/commands/game/random.ts
index 2a48cd57..011baa54 100644
--- a/src/commands/game/random.ts
+++ b/src/commands/game/random.ts
@@ -31,6 +31,7 @@ const command: ChatInputCommand = {
    * @param {guildModel} guildDb
    */
   execute: async (interaction, client, guildDb) => {
+    const premium = await client.premium.check(interaction?.guildId);
     const userDb = await UserModel.findOne({
       userID: interaction.user?.id,
     });
@@ -42,6 +43,7 @@ const command: ChatInputCommand = {
         : userDb?.language
           ? userDb.language
           : "en_EN",
+      premium.result,
     );
 
     const randomEmbed = new DefaultGameEmbed(
@@ -55,8 +57,6 @@ const command: ChatInputCommand = {
     const row2 = new ActionRowBuilder<MessageActionRowComponentBuilder>();
     let components = [];
 
-    const premium = await client.premium.check(interaction?.guildId);
-
     const randomValue = Math.round(Math.random() * 15);
 
     if (!premium.result && randomValue < 3) {
@@ -70,7 +70,7 @@ const command: ChatInputCommand = {
           ),
       ]);
       components = [row, row2];
-    } else if (!premium.result && randomValue >= 3 && randomValue < 7) {
+    } else if (!premium.result && randomValue >= 3 && randomValue < 5) {
       row2.addComponents([
         new ButtonBuilder()
           .setLabel("Premium")
diff --git a/src/commands/game/truth.ts b/src/commands/game/truth.ts
index 06bdb789..f8fab380 100644
--- a/src/commands/game/truth.ts
+++ b/src/commands/game/truth.ts
@@ -32,6 +32,7 @@ const command: ChatInputCommand = {
    * @param {guildModel} guildDb
    */
   execute: async (interaction, client, guildDb) => {
+    const premium = await client.premium.check(interaction?.guildId);
     const userDb = await UserModel.findOne({
       userID: interaction.user?.id,
     });
@@ -44,6 +45,7 @@ const command: ChatInputCommand = {
         : userDb?.language
           ? userDb.language
           : "en_EN",
+      premium.result,
     );
 
     const truthEmbed = new DefaultGameEmbed(
@@ -57,8 +59,6 @@ const command: ChatInputCommand = {
     const row2 = new ActionRowBuilder<MessageActionRowComponentBuilder>();
     let components = [];
 
-    const premium = await client.premium.check(interaction?.guildId);
-
     const randomValue = Math.round(Math.random() * 15);
 
     if (!premium.result && randomValue < 3) {
@@ -72,7 +72,7 @@ const command: ChatInputCommand = {
           ),
       ]);
       components = [row, row2];
-    } else if (!premium.result && randomValue >= 3 && randomValue < 7) {
+    } else if (!premium.result && randomValue >= 3 && randomValue < 5) {
       row2.addComponents([
         new ButtonBuilder()
           .setLabel("Premium")
diff --git a/src/commands/game/whatwouldyoudo.ts b/src/commands/game/whatwouldyoudo.ts
index 9fdaf26d..e558ac73 100644
--- a/src/commands/game/whatwouldyoudo.ts
+++ b/src/commands/game/whatwouldyoudo.ts
@@ -30,6 +30,7 @@ const command: ChatInputCommand = {
    * @param {guildModel} guildDb
    */
   execute: async (interaction, client, guildDb) => {
+    const premium = await client.premium.check(interaction?.guildId);
     const userDb = await UserModel.findOne({
       userID: interaction.user?.id,
     });
@@ -42,6 +43,7 @@ const command: ChatInputCommand = {
         : userDb?.language
           ? userDb.language
           : "en_EN",
+      premium.result,
     );
 
     const wwydEmbed = new DefaultGameEmbed(
@@ -55,8 +57,6 @@ const command: ChatInputCommand = {
 
     const randomValue = Math.round(Math.random() * 15);
 
-    const premium = await client.premium.check(interaction?.guildId);
-
     if (!premium.result && randomValue < 3) {
       row.addComponents([
         new ButtonBuilder()
@@ -67,7 +67,7 @@ const command: ChatInputCommand = {
             "https://discord.com/oauth2/authorize?client_id=981649513427111957&permissions=275415247936&scope=bot%20applications.commands",
           ),
       ]);
-    } else if (!premium.result && randomValue >= 3 && randomValue < 6) {
+    } else if (!premium.result && randomValue >= 3 && randomValue < 5) {
       row.addComponents([
         new ButtonBuilder()
           .setLabel("Premium")
diff --git a/src/commands/game/wouldyourather.ts b/src/commands/game/wouldyourather.ts
index 4ff38222..cec94c57 100644
--- a/src/commands/game/wouldyourather.ts
+++ b/src/commands/game/wouldyourather.ts
@@ -31,6 +31,7 @@ const command: ChatInputCommand = {
    */
 
   execute: async (interaction, client, guildDb) => {
+    const premium = await client.premium.check(interaction?.guildId);
     const userDb = await UserModel.findOne({
       userID: interaction.user?.id,
     });
@@ -43,6 +44,7 @@ const command: ChatInputCommand = {
         : userDb?.language
           ? userDb.language
           : "en_EN",
+      premium.result,
     );
 
     const ratherEmbed = new DefaultGameEmbed(
@@ -56,8 +58,6 @@ const command: ChatInputCommand = {
 
     const randomValue = Math.round(Math.random() * 15);
 
-    const premium = await client.premium.check(interaction?.guildId);
-
     if (!premium.result && randomValue < 3) {
       mainRow.addComponents([
         new ButtonBuilder()
@@ -68,7 +68,7 @@ const command: ChatInputCommand = {
             "https://discord.com/oauth2/authorize?client_id=981649513427111957&permissions=275415247936&scope=bot%20applications.commands",
           ),
       ]);
-    } else if (!premium.result && randomValue >= 3 && randomValue < 6) {
+    } else if (!premium.result && randomValue >= 3 && randomValue < 5) {
       mainRow.addComponents([
         new ButtonBuilder()
           .setLabel("Premium")
@@ -103,7 +103,7 @@ const command: ChatInputCommand = {
       ? { content: WYR.question, fetchReply: true }
       : {
           content:
-            !premium.result && randomValue >= 3 && randomValue < 6
+            !premium.result && randomValue >= 3 && randomValue < 5
               ? client.translation.get(guildDb?.language, "Premium.message")
               : undefined,
           embeds: [ratherEmbed],
diff --git a/src/events/guildMemberAdd.ts b/src/events/guildMemberAdd.ts
index 3128511b..ba3278ea 100644
--- a/src/events/guildMemberAdd.ts
+++ b/src/events/guildMemberAdd.ts
@@ -12,60 +12,63 @@ import WouldYou from "../util/wouldYou";
 const event: Event = {
   event: "guildMemberAdd",
   execute: async (client: WouldYou, member: GuildMember) => {
-    // Always do simple if checks before the main code. This is a little but not so little performance boost :)
     if (member?.user?.bot) return;
 
     const guildDb = await client.database.getGuild(member.guild.id, false);
-    if (guildDb && guildDb?.welcome) {
-      const channel = (await member.guild.channels
-        .fetch(guildDb.welcomeChannel)
-        .catch((err: Error) => {
-          captureException(err);
-        })) as GuildTextBasedChannel;
+    if (!guildDb || !guildDb?.welcome) return;
+    const channel = (await member.guild.channels
+      .fetch(guildDb.welcomeChannel)
+      .catch((err: Error) => {
+        captureException(err);
+      })) as GuildTextBasedChannel;
 
-      if (!channel?.id) return;
+    if (!channel?.id) return;
 
-      if (
-        member.guild.members.me &&
-        !channel
-          ?.permissionsFor(member.guild.members.me)
-          ?.has([
-            PermissionFlagsBits.ViewChannel,
-            PermissionFlagsBits.SendMessages,
-            PermissionFlagsBits.EmbedLinks,
-          ])
-      )
-        return;
+    if (
+      member.guild.members.me &&
+      !channel
+        ?.permissionsFor(member.guild.members.me)
+        ?.has([
+          PermissionFlagsBits.ViewChannel,
+          PermissionFlagsBits.SendMessages,
+          PermissionFlagsBits.EmbedLinks,
+        ])
+    ) return;
 
-      const General = await getQuestionsByType(
-        "wouldyourather",
-        guildDb != null ? guildDb : null,
-        guildDb?.language != null ? guildDb.language : "en_EN",
-      );
-      const WhatYouDo = await getQuestionsByType(
-        "whatwouldyoudo",
-        guildDb != null ? guildDb : null,
-        guildDb?.language != null ? guildDb.language : "en_EN",
-      );
+    const premium = await client.premium.check(member?.guild.id);
 
-      const randomMessage = Math.random() > 0.5 ? General : WhatYouDo;
+    const General = await getQuestionsByType(
+      "wouldyourather",
+      guildDb,
+      guildDb?.language != null ? guildDb.language : "en_EN",
+      premium.result,
+      false,
+    );
+    const WhatYouDo = await getQuestionsByType(
+      "whatwouldyoudo",
+      guildDb,
+      guildDb?.language != null ? guildDb.language : "en_EN",
+      premium.result,
+      false,
+    );
 
-      channel
-        .send({
-          content: `${client.translation.get(
-            guildDb?.language,
-            "Welcome.embed.title",
-          )} ${
-            guildDb.welcomePing
-              ? `<@${member.user.id}>`
-              : `${member.user.username}`
-          }! ${randomMessage.question}`,
-        })
-        .catch((err: Error) => {
-          captureException(err);
-        });
-      return;
-    }
+    const randomMessage = Math.random() > 0.5 ? General : WhatYouDo;
+
+    channel
+      .send({
+        content: `${client.translation.get(
+          guildDb?.language,
+          "Welcome.embed.title",
+        )} ${
+          guildDb.welcomePing
+            ? `<@${member.user.id}>`
+            : `${member.user.username}`
+        }! ${randomMessage.question}`,
+      })
+      .catch((err: Error) => {
+        captureException(err);
+      });
+    return;
   },
 };
 
diff --git a/src/util/Functions/jsonImport.ts b/src/util/Functions/jsonImport.ts
index c112dc69..24448654 100644
--- a/src/util/Functions/jsonImport.ts
+++ b/src/util/Functions/jsonImport.ts
@@ -1,6 +1,5 @@
 import path from "path";
-import { Questions } from "../Functions/queueHandler";
-import { IGuildModel } from "../Models/guildModel";
+import { GuildModel, IGuildModel } from "../Models/guildModel";
 import {
   dareModel,
   nhieModel,
@@ -8,6 +7,7 @@ import {
   wwydModel,
   wyrModel,
 } from "../Models/questionModel";
+import { usedQuestionModel } from "../Models/usedModel";
 
 interface LanguageMapInterface {
   [key: string]: string;
@@ -20,6 +20,7 @@ const languageMap: LanguageMapInterface = {
   it_IT: "it",
 };
 
+import type { UpdateWriteOpResult } from "mongoose";
 import shuffle from "../shuffle";
 
 export interface QuestionResult {
@@ -27,81 +28,119 @@ export interface QuestionResult {
   question: string;
 }
 
-type QuestType =
-  | "wouldyourather"
-  | "neverhaveiever"
-  | "whatwouldyoudo"
-  | "truth"
-  | "dare";
 type Quest =
   | "truthQuestions"
   | "dareQuestions"
   | "wwydQuestions"
   | "nhieQuestions"
   | "wyrQuestions";
+
 const validTypes = [
   "wouldyourather",
+  "customwouldyourather",
   "neverhaveiever",
+  "customneverhaveiever",
   "truth",
+  "customtruth",
   "dare",
+  "customdare",
   "whatwouldyoudo",
+  "customwhatwouldyoudo",
 ];
-const typeCheck: { [key: string]: string } = {
+
+interface IUsedQuestions {
+  wyrQuestions: string[];
+  customWyrQuestions: string[];
+  nhieQuestions: string[];
+  customNhieQuestions: string[];
+  truthQuestions: string[];
+  customTruthQuestions: string[];
+  dareQuestions: string[];
+  customDareQuestions: string[];
+  wwydQuestions: string[];
+  customWwydQuestions: string[];
+}
+
+const typeCheck: { [key: string]: keyof IUsedQuestions } = {
   wouldyourather: "wyrQuestions",
+  customwouldyourather: "customWyrQuestions",
   neverhaveiever: "nhieQuestions",
+  customneverhaveiever: "customNhieQuestions",
   truth: "truthQuestions",
+  customtruth: "customTruthQuestions",
   dare: "dareQuestions",
+  customdare: "customDareQuestions",
   whatwouldyoudo: "wwydQuestions",
+  customwhatwouldyoudo: "customWwydQuestions",
 };
 
 function getPath(file: string) {
-  return path.join(__dirname, "..", "..", "data", file);
-}
-
-interface HigherLowerJsonModel {
-  id: string;
-  keyword: string;
-  value: number;
-  author: string;
-  link: string;
+  const fullPath = path.join(__dirname, "..", "..", "data", file);
+  return fullPath;
 }
 
-export async function getHigherLower(): Promise<HigherLowerJsonModel[]> {
-  let result = [] as HigherLowerJsonModel[];
-  await import(getPath("hl-en_EN.json")).then((value) => {
-    result = value.data;
-  });
+export async function getHigherLower(): Promise<any[]> {
+  let result = [] as any[];
+  try {
+    await import(getPath("hl-en_EN.json")).then((value) => {
+      result = value.data;
+    });
+  } catch (error) {
+    throw error;
+  }
   return result;
 }
 
 export async function getRandomTod(
   guildDb: IGuildModel,
   language: string,
+  premium: Boolean,
+  enabled: Boolean = true,
 ): Promise<QuestionResult> {
   let result;
 
-  const truth = await getQuestionsByType("truth", guildDb, language);
-  const dare = await getQuestionsByType("dare", guildDb, language);
+  try {
+    const truth = await getQuestionsByType(
+      "truth",
+      guildDb,
+      language,
+      premium,
+      enabled,
+    );
+    const dare = await getQuestionsByType(
+      "dare",
+      guildDb,
+      language,
+      premium,
+      enabled,
+    );
 
-  if (Math.random() < 0.5) {
-    result = truth;
-  } else {
-    result = dare;
+    result = Math.random() < 0.5 ? truth : dare;
+  } catch (error) {
+    throw error;
   }
+
   return result;
 }
 
 export async function getQuestionsByType(
   type: string,
-  guildDb: IGuildModel | null,
+  guildDb: IGuildModel,
   language: string,
+  premium: Boolean,
+  enabled: Boolean = true,
 ): Promise<QuestionResult> {
   if (!validTypes.includes(type)) {
-    throw new Error(`Invalid question type: ${type}`);
+    return Promise.reject("Invalid type");
   }
 
-  // TODO: Make this work with the language system
-  const normalizedLanguage = languageMap[language];
+  if (
+    guildDb.customTypes !== "regular" &&
+    guildDb.customMessages.filter((e) => e.type === type).length === 0
+  )
+    guildDb.customTypes = "regular";
+
+  const normalizedLanguage = languageMap[language] || "en";
 
   const models: { [key: string]: any } = {
     wouldyourather: wyrModel,
@@ -111,75 +150,174 @@ export async function getQuestionsByType(
     whatwouldyoudo: wwydModel,
   };
 
-  const selectedModel = models[type.toLowerCase()];
+  let selectedModel = models[type.toLowerCase()];
 
-  let result = {} as QuestionResult;
+  let result: QuestionResult = { id: "", question: "" };
 
-  if (!selectedModel) {
-    throw new Error(`Invalid question type: ${type}`);
-  }
+  if (guildDb != null) {
+    let usedQuestions = await usedQuestionModel.find({
+      guildID: guildDb.guildID,
+    });
 
-  const questions = await selectedModel.aggregate([{ $sample: { size: 1 } }]);
+    if (!usedQuestions[0] && premium && enabled) {
+      await usedQuestionModel.create({
+        guildID: guildDb.guildID,
+        customTruthQuestions: [],
+        truthQuestions: [],
+        customDareQuestions: [],
+        dareQuestions: [],
+        customNhieQuestions: [],
+        nhieQuestions: [],
+        wwydQuestions: [],
+        customWwydQuestions: [],
+        wyrQuestions: [],
+        customWyrQuestions: [],
+      });
 
-  if (questions.length === 0) {
-    throw new Error("No questions found");
-  }
+      usedQuestions = await usedQuestionModel.find({
+        guildID: guildDb.guildID,
+      });
+    }
 
-  if (guildDb != null) {
-    const dbquestions = guildDb.customMessages.filter(
-      (c) => c.type === "dare" || c.type === "truth",
+    async function getDBQuestion(nin: string[]) {
+      return await selectedModel.aggregate([
+        { $match: { id: { $nin: nin } } },
+        { $sample: { size: 1 } },
+      ]);
+    }
+
+    let questionDatabase = await getDBQuestion(
+      premium && enabled ? usedQuestions[0][typeCheck[type]] : [],
+    );
+    if (!questionDatabase[0]?.id && premium && enabled) {
+      await reset(type as Quest, guildDb.customTypes, guildDb.guildID, "db");
+      questionDatabase = await getDBQuestion([]);
+    }
+
+    async function getRandomCustom(nin: string[]) {
+      return await GuildModel.aggregate([
+        { $match: { guildID: guildDb.guildID } },
+        { $unwind: "$customMessages" },
+        {
+          $match: {
+            "customMessages.id": {
+              $nin: nin,
+            },
+            "customMessages.type": type === "whatwouldyoudo" ? "wwyd" : type,
+          },
+        },
+        { $sample: { size: 1 } },
+        {
+          $project: {
+            id: "$customMessages.id",
+            msg: "$customMessages.msg",
+            type: "$customMessages.type",
+          },
+        },
+      ]);
+    }
+
+    let newRandomCustomQuestion = await getRandomCustom(
+      premium && enabled ? usedQuestions[0][typeCheck["custom" + type]] : [],
     );
-    if (!dbquestions.length) guildDb.customTypes = "regular";
 
-    const Random = Math.floor(Math.random() * dbquestions.length);
+    if (!newRandomCustomQuestion[0]?.id && premium && enabled) {
+      await reset(
+        type as Quest,
+        guildDb.customTypes,
+        guildDb.guildID,
+        "custom",
+      );
+      newRandomCustomQuestion = await getRandomCustom([]);
+    }
 
     switch (guildDb.customTypes) {
       case "regular":
         result = {
-          id: questions[0].id,
+          id: questionDatabase[0].id,
           question:
             normalizedLanguage === "en"
-              ? questions[0].question
-              : questions[0].translations[normalizedLanguage],
+              ? questionDatabase[0].question
+              : questionDatabase[0].translations[normalizedLanguage],
         };
+
         break;
       case "mixed":
         const mixedQuestions = shuffle([
-          ...questions.concat(dbquestions[Random]),
+          ...questionDatabase.concat(newRandomCustomQuestion[0]),
         ]);
 
         result = {
           id: mixedQuestions[0].id,
           question:
             normalizedLanguage === "en"
-              ? mixedQuestions[0].msg
-                ? mixedQuestions[0].msg
-                : mixedQuestions[0].question
-              : mixedQuestions[0].msg
-                ? mixedQuestions[0].msg
-                : mixedQuestions[0].translations[normalizedLanguage],
+              ? mixedQuestions[0].msg || mixedQuestions[0].question
+              : mixedQuestions[0].msg ||
+                mixedQuestions[0].translations[normalizedLanguage],
         };
         break;
       case "custom":
         result = {
-          id: dbquestions[Random].id,
-          question: dbquestions[Random].msg,
+          id: newRandomCustomQuestion[0].id,
+          question: newRandomCustomQuestion[0].msg,
         };
         break;
     }
-    result = await Questions(result, null, guildDb, {
-      quest: typeCheck[type] as Quest,
-      questType: type as QuestType,
-    });
+
+    if (premium && enabled) {
+      if (guildDb.customTypes === "custom") {
+        selectedModel = typeCheck["custom" + type];
+      } else if (guildDb.customTypes === "mixed") {
+        if (result.id === questionDatabase[0].id)
+          selectedModel = typeCheck[type];
+        else selectedModel = typeCheck["custom" + type];
+      } else {
+        selectedModel = typeCheck[type];
+      }
+      await usedQuestionModel.updateOne(
+        { guildID: guildDb.guildID },
+        { $push: { [selectedModel]: result.id } },
+      );
+    }
   } else {
+    const questionDatabase = await selectedModel.aggregate([
+      { $sample: { size: 1 } },
+    ]);
+
     result = {
-      id: questions[0].id,
+      id: questionDatabase[0].id,
       question:
         normalizedLanguage === "en"
-          ? questions[0].question
-          : questions[0].translations[normalizedLanguage],
+          ? questionDatabase[0].question
+          : questionDatabase[0].translations[normalizedLanguage],
     };
   }
 
-  return result;
+  return result as QuestionResult;
+}
+
+export async function reset(
+  type: Quest,
+  customType: string,
+  guildID: string,
+  resetType: string,
+): Promise<UpdateWriteOpResult> {
+  let selectedModel;
+  if (customType === "custom") {
+    selectedModel = typeCheck["custom" + type];
+  } else if (customType === "mixed") {
+    if (resetType === "custom") selectedModel = typeCheck["custom" + type];
+    else selectedModel = typeCheck[type];
+  } else {
+    selectedModel = type;
+  }
+
+  return await usedQuestionModel.updateOne(
+    { guildID },
+    {
+      $set: {
+        [selectedModel]: [],
+      },
+    },
+  );
 }
diff --git a/src/util/Functions/queueHandler.ts b/src/util/Functions/queueHandler.ts
deleted file mode 100644
index f939d754..00000000
--- a/src/util/Functions/queueHandler.ts
+++ /dev/null
@@ -1,130 +0,0 @@
-import { Error as MongooseError } from "mongoose";
-import { QuestionResult } from "../Functions/jsonImport";
-import { IGuildModel } from "../Models/guildModel";
-import {
-  dareModel,
-  nhieModel,
-  truthModel,
-  wwydModel,
-  wyrModel,
-} from "../Models/questionModel";
-import { IUsedQuestions, usedQuestionModel } from "../Models/usedModel";
-import shuffle from "../shuffle";
-
-type Quest =
-  | "truthQuestions"
-  | "dareQuestions"
-  | "wwydQuestions"
-  | "nhieQuestions"
-  | "wyrQuestions";
-type QuestType =
-  | "wouldyourather"
-  | "neverhaveiever"
-  | "whatwouldyoudo"
-  | "truth"
-  | "dare";
-const typeCheck: { [key: string]: string } = {
-  wouldyourather: "wyr",
-  neverhaveiever: "nhie",
-  truth: "truth",
-  dare: "dare",
-  whatwouldyoudo: "wwyd",
-};
-const models: { [key: string]: any } = {
-  wouldyourather: wyrModel,
-  neverhaveiever: nhieModel,
-  truth: truthModel,
-  dare: dareModel,
-  whatwouldyoudo: wwydModel,
-};
-
-export async function markQuestionAsUsed(
-  guildID: string,
-  question: string,
-  type: string,
-) {
-  const validTypes = [
-    "truth",
-    "dare",
-    "whatwouldyoudo",
-    "wouldyourather",
-    "neverhaveiever",
-  ];
-
-  if (!validTypes.includes(type.toLowerCase())) {
-    throw new Error("Invalid question type");
-  }
-
-  try {
-    let questionDoc = await usedQuestionModel.findOneAndUpdate(
-      {
-        guildID,
-        [`${typeCheck[type]}Questions`]: { $ne: question }, // Check for non-existence
-      },
-      { $push: { [`${typeCheck[type]}Questions`]: question } },
-      { new: true, upsert: true },
-    );
-
-    return questionDoc;
-  } catch (error: MongooseError | any) {
-    if (error.codeName === "DuplicateKey" && error.code === 11000) {
-      console.log(
-        `Duplicate key error, resetting the questions | Guild ID: ${guildID}`,
-      );
-      await reset(guildID, {
-        quest: type as Quest,
-        questType: type as QuestType,
-      });
-    }
-    return true;
-  }
-}
-
-async function reset(
-  guildID: string,
-  type: { quest: Quest; questType: QuestType },
-) {
-  return await usedQuestionModel.findOneAndUpdate(
-    { guildID },
-    { $set: { [`${typeCheck[type.questType]}Questions`]: [] } },
-  );
-}
-
-export async function Questions(
-  chose: QuestionResult,
-  guild: IUsedQuestions | null,
-  guildDb: IGuildModel | null,
-  type: { quest: Quest; questType: QuestType },
-  num: number = 0,
-) {
-  if (!guild)
-    guild = await usedQuestionModel.findOneAndUpdate(
-      { guildID: guildDb?.guildID },
-      { $set: { guildID: guildDb?.guildID } },
-      { new: true, upsert: true },
-    );
-
-  const modal = await models[type.questType.toLowerCase()].aggregate([
-    { $sample: { size: 1 } },
-  ]);
-
-  let unusedQuestions = modal.filter(
-    (questionId: string) => !guild![type.quest].includes(questionId),
-  );
-
-  if (unusedQuestions.length === 0) {
-    await reset(guildDb?.guildID!, type);
-    unusedQuestions = modal;
-  }
-
-  const shuffledQuestion = shuffle([...unusedQuestions]);
-  const randomIndex = Math.floor(Math.random() * shuffledQuestion.length);
-  const question = shuffledQuestion[randomIndex];
-
-  if (guild![type.quest].includes(chose.id)) {
-    return await Questions(question, guild, guildDb, type, num + 1);
-  } else {
-    await markQuestionAsUsed(guildDb!.guildID!, chose.id, type.questType);
-    return chose;
-  }
-}
diff --git a/src/util/Models/usedModel.ts b/src/util/Models/usedModel.ts
index b4897ddd..741a13b9 100644
--- a/src/util/Models/usedModel.ts
+++ b/src/util/Models/usedModel.ts
@@ -2,10 +2,15 @@ import { Schema, model } from "mongoose";
 export interface IUsedQuestions {
   guildID: string;
   truthQuestions: string[];
+  customTruthQuestions: string[];
   dareQuestions: string[];
+  customDareQuestions: string[];
   wwydQuestions: string[];
+  customWwydQuestions: string[];
   wyrQuestions: string[];
+  customWyrQuestions: string[];
   nhieQuestions: string[];
+  customNhieQuestions: string[];
 }
 
 const usedQuestionSchema = new Schema({
@@ -14,22 +19,42 @@ const usedQuestionSchema = new Schema({
     require: true,
     unique: true,
   },
+  customTruthQuestions: {
+    type: Array,
+    default: [],
+  },
   truthQuestions: {
     type: Array,
     default: [],
   },
+  customDareQuestions: {
+    type: Array,
+    default: [],
+  },
   dareQuestions: {
     type: Array,
     default: [],
   },
+  customNhieQuestions: {
+    type: Array,
+    default: [],
+  },
   wwydQuestions: {
     type: Array,
     default: [],
   },
+  customWwydQuestions: {
+    type: Array,
+    default: [],
+  },
   wyrQuestions: {
     type: Array,
     default: [],
   },
+  customWyrQuestions: {
+    type: Array,
+    default: [],
+  },
   nhieQuestions: {
     type: Array,
     default: [],