feat: rename models + remove helpers

wdhdev · Jul 9, 2023 · 162f151 · 162f151
1 parent f0e57e6
commit 162f151
Show file tree

Hide file tree

Showing 65 changed files with 344 additions and 361 deletions.
diff --git a/src/buttons/appeals/approve.js b/src/buttons/appeals/approve.js
@@ -1,7 +1,7 @@
 const emoji = require("../../config.json").emojis;
 
-const appealSchema = require("../../models/appealSchema");
-const bannedUserSchema = require("../../models/bannedUserSchema");
+const Appeal = require("../../models/Appeal");
+const BannedUser = require("../../models/BannedUser");
 
 module.exports = {
     name: "appeal-approve",
@@ -12,7 +12,7 @@ module.exports = {
             const id = interaction.customId.replace("appeal-approve-", "");
             const modLogsChannel = client.channels.cache.get(client.config_channels.modLogs);
 
-            const data = await appealSchema.findOne({ _id: id });
+            const data = await Appeal.findOne({ _id: id });
 
             if(!data) {
                 const error = new Discord.EmbedBuilder()
@@ -66,8 +66,8 @@ module.exports = {
                 if(i.customId === `modal-${interaction.id}`) {
                     const reason = i.fields.getTextInputValue(`modal-reason-${interaction.id}`);
 
-                    await bannedUserSchema.findOneAndDelete({ _id: data.id });
-                    await appealSchema.findOneAndUpdate({ _id: id }, { status: "APPROVED", mod: interaction.user.id, reason: reason });
+                    await BannedUser.findOneAndDelete({ _id: data.id });
+                    await Appeal.findOneAndUpdate({ _id: id }, { status: "APPROVED", mod: interaction.user.id, reason: reason });
 
                     const userDM = new Discord.EmbedBuilder()
                         .setColor(client.config_embeds.green)

diff --git a/src/buttons/appeals/check.js b/src/buttons/appeals/check.js
@@ -1,6 +1,6 @@
 const emoji = require("../../config.json").emojis;
 
-const appealSchema = require("../../models/appealSchema");
+const Appeal = require("../../models/Appeal");
 
 module.exports = {
     name: "check-appeal",
@@ -33,7 +33,7 @@ module.exports = {
                 if(i.customId === `modal-${interaction.id}`) {
                     const id = i.fields.getTextInputValue(`modal-appealid-${interaction.id}`);
 
-                    if(!await appealSchema.exists({ _id: id })) {
+                    if(!await Appeal.exists({ _id: id })) {
                         const error = new Discord.EmbedBuilder()
                             .setColor(client.config_embeds.error)
                             .setDescription(`${emoji.cross} That appeal does not exist!`)
@@ -42,7 +42,7 @@ module.exports = {
                         return;
                     }
 
-                    const data = await appealSchema.findOne({ _id: id });
+                    const data = await Appeal.findOne({ _id: id });
 
                     if(data.id !== interaction.user.id) {
                         const error = new Discord.EmbedBuilder()

diff --git a/src/buttons/appeals/deny.js b/src/buttons/appeals/deny.js
@@ -1,6 +1,6 @@
 const emoji = require("../../config.json").emojis;
 
-const appealSchema = require("../../models/appealSchema");
+const Appeal = require("../../models/Appeal");
 
 module.exports = {
     name: "appeal-deny",
@@ -11,7 +11,7 @@ module.exports = {
             const id = interaction.customId.replace("appeal-deny-", "");
             const modLogsChannel = client.channels.cache.get(client.config_channels.modLogs);
 
-            const data = await appealSchema.findOne({ _id: id });
+            const data = await Appeal.findOne({ _id: id });
 
             if(!data) {
                 const error = new Discord.EmbedBuilder()
@@ -65,7 +65,7 @@ module.exports = {
                 if(i.customId === `modal-${interaction.id}`) {
                     const reason = i.fields.getTextInputValue(`modal-reason-${interaction.id}`);
 
-                    await appealSchema.findOneAndUpdate({ _id: id }, { status: "DENIED", mod: interaction.user.id, reason: reason });
+                    await Appeal.findOneAndUpdate({ _id: id }, { status: "DENIED", mod: interaction.user.id, reason: reason });
 
                     const userDM = new Discord.EmbedBuilder()
                         .setColor(client.config_embeds.red)

diff --git a/src/buttons/appeals/submit.js b/src/buttons/appeals/submit.js
@@ -1,15 +1,15 @@
 const emoji = require("../../config.json").emojis;
 
-const appealSchema = require("../../models/appealSchema");
-const bannedUserSchema = require("../../models/bannedUserSchema");
+const Appeal = require("../../models/Appeal");
+const BannedUser = require("../../models/BannedUser");
 
 module.exports = {
     name: "submit-appeal",
     startsWith: false,
     requiredRoles: [],
     async execute(interaction, client, Discord) {
         try {
-            if(!await bannedUserSchema.exists({ _id: interaction.user.id })) {
+            if(!await BannedUser.exists({ _id: interaction.user.id })) {
                 const error = new Discord.EmbedBuilder()
                     .setColor(client.config_embeds.error)
                     .setDescription(`${emoji.cross} You are not banned!`)
@@ -18,7 +18,7 @@ module.exports = {
                 return;
             }
 
-            if(await bannedUserSchema.exists({ _id: interaction.user.id, allowAppeal: false }) || await appealSchema.exists({ id: interaction.user.id, status: "DENIED" })) {
+            if(await BannedUser.exists({ _id: interaction.user.id, allowAppeal: false }) || await Appeal.exists({ id: interaction.user.id, status: "DENIED" })) {
                 const error = new Discord.EmbedBuilder()
                     .setColor(client.config_embeds.error)
                     .setDescription(`${emoji.cross} You are allowed to submit an appeal!`)
@@ -27,7 +27,7 @@ module.exports = {
                 return;
             }
 
-            if(await appealSchema.exists({ id: interaction.user.id, status: "NOT_REVIEWED" })) {
+            if(await Appeal.exists({ id: interaction.user.id, status: "NOT_REVIEWED" })) {
                 const error = new Discord.EmbedBuilder()
                     .setColor(client.config_embeds.error)
                     .setDescription(`${emoji.cross} You already have created an appeal!`)
@@ -74,7 +74,7 @@ module.exports = {
                     const banReason = i.fields.getTextInputValue(`modal-banreason-${id}`);
                     const unbanReason = i.fields.getTextInputValue(`modal-unbanreason-${id}`);
 
-                    const banData = await bannedUserSchema.findOne({ _id: interaction.user.id });
+                    const banData = await BannedUser.findOne({ _id: interaction.user.id });
 
                     const embed = new Discord.EmbedBuilder()
                         .setColor(client.config_embeds.default)
@@ -86,7 +86,7 @@ module.exports = {
                             { name: "🔓 Unban Reason (*user provided*)", value: `${unbanReason}` }
                         )
 
-                    new appealSchema({
+                    new Appeal({
                         _id: id,
                         id: interaction.user.id,
                         ban_reason: banReason,

diff --git a/src/buttons/logs/blocked-message-ban.js b/src/buttons/logs/blocked-message-ban.js
@@ -1,7 +1,7 @@
 const emoji = require("../../config.json").emojis;
 
-const bannedUserSchema = require("../../models/bannedUserSchema");
-const userSchema = require("../../models/userSchema");
+const BannedUser = require("../../models/BannedUser");
+const User = require("../../models/User");
 
 module.exports = {
     name: "blocked-message-ban",
@@ -20,7 +20,7 @@ module.exports = {
                 return;
             }
 
-            if(await userSchema.exists({ _id: id, immune: true })) {
+            if(await User.exists({ _id: id, immune: true })) {
                 const error = new Discord.EmbedBuilder()
                     .setColor(client.config_embeds.error)
                     .setDescription(`${emoji.cross} You cannot ban that user!`)
@@ -33,7 +33,7 @@ module.exports = {
                 return;
             }
 
-            if(await bannedUserSchema.exists({ _id: id })) {
+            if(await BannedUser.exists({ _id: id })) {
                 const error = new Discord.EmbedBuilder()
                     .setColor(client.config_embeds.error)
                     .setDescription(`${emoji.cross} That user is already banned!`)
@@ -99,7 +99,7 @@ module.exports = {
 
                             const user = await client.users.fetch(id);
 
-                            new bannedUserSchema({
+                            new BannedUser({
                                 _id: id,
                                 timestamp: Date.now(),
                                 allowAppeal: appealable === "false" ? false : true,

diff --git a/src/buttons/logs/blocked-message-info.js b/src/buttons/logs/blocked-message-info.js
@@ -1,6 +1,6 @@
 const emoji = require("../../config.json").emojis;
 
-const blockedSchema = require("../../models/blockedSchema");
+const BlockedMessage = require("../../models/BlockedMessage");
 
 module.exports = {
     name: "blocked-message-info",
@@ -10,7 +10,7 @@ module.exports = {
         try {
             const id = interaction.customId.replace("blocked-message-info-", "");
 
-            if(!await blockedSchema.exists({ _id: id })) {
+            if(!await BlockedMessage.exists({ _id: id })) {
                 const error = new Discord.EmbedBuilder()
                     .setColor(client.config_embeds.error)
                     .setDescription(`${emoji.cross} No message was found with that ID!`)
@@ -19,7 +19,7 @@ module.exports = {
                 return;
             }
 
-            const data = await blockedSchema.findOne({ _id: id });
+            const data = await BlockedMessage.findOne({ _id: id });
 
             const info = new Discord.EmbedBuilder()
                 .setColor(client.config_embeds.default)

diff --git a/src/buttons/logs/delete-message.js b/src/buttons/logs/delete-message.js
@@ -1,6 +1,6 @@
 const emoji = require("../../config.json").emojis;
 
-const messageSchema = require("../../models/messageSchema");
+const Message = require("../../models/Message");
 
 module.exports = {
     name: "delete-message",
@@ -11,7 +11,7 @@ module.exports = {
             const id = interaction.customId.replace("delete-message-", "");
             const modLogsChannel = client.channels.cache.get(client.config_channels.modLogs);
 
-            if(!await messageSchema.exists({ _id: id })) {
+            if(!await Message.exists({ _id: id })) {
                 const error = new Discord.EmbedBuilder()
                     .setColor(client.config_embeds.error)
                     .setDescription(`${emoji.cross} No message was found with that ID!`)
@@ -20,7 +20,7 @@ module.exports = {
                 return;
             }
 
-            const data = await messageSchema.findOne({ _id: id });
+            const data = await Message.findOne({ _id: id });
 
             const total = data.messages.length;
             let deleted = 0;

diff --git a/src/buttons/logs/message-ban.js b/src/buttons/logs/message-ban.js
@@ -1,7 +1,7 @@
 const emoji = require("../../config.json").emojis;
 
-const bannedUserSchema = require("../../models/bannedUserSchema");
-const userSchema = require("../../models/userSchema");
+const BannedUser = require("../../models/BannedUser");
+const User = require("../../models/User");
 
 module.exports = {
     name: "message-ban",
@@ -20,7 +20,7 @@ module.exports = {
                 return;
             }
 
-            if(await userSchema.exists({ _id: id, immune: true })) {
+            if(await User.exists({ _id: id, immune: true })) {
                 const error = new Discord.EmbedBuilder()
                     .setColor(client.config_embeds.error)
                     .setDescription(`${emoji.cross} You cannot ban that user!`)
@@ -33,7 +33,7 @@ module.exports = {
                 return;
             }
 
-            if(await bannedUserSchema.exists({ _id: id })) {
+            if(await BannedUser.exists({ _id: id })) {
                 const error = new Discord.EmbedBuilder()
                     .setColor(client.config_embeds.error)
                     .setDescription(`${emoji.cross} That user is already banned!`)
@@ -99,7 +99,7 @@ module.exports = {
 
                             const user = await client.users.fetch(id);
 
-                            new bannedUserSchema({
+                            new BannedUser({
                                 _id: id,
                                 timestamp: Date.now(),
                                 allowAppeal: appealable === "false" ? false : true,

diff --git a/src/buttons/logs/message-info.js b/src/buttons/logs/message-info.js
@@ -1,6 +1,6 @@
 const emoji = require("../../config.json").emojis;
 
-const messageSchema = require("../../models/messageSchema");
+const Message = require("../../models/Message");
 
 module.exports = {
     name: "message-info",
@@ -10,7 +10,7 @@ module.exports = {
         try {
             const id = interaction.customId.replace("message-info-", "");
 
-            if(!await messageSchema.exists({ _id: id })) {
+            if(!await Message.exists({ _id: id })) {
                 const error = new Discord.EmbedBuilder()
                     .setColor(client.config_embeds.error)
                     .setDescription(`${emoji.cross} No message was found with that ID!`)
@@ -19,7 +19,7 @@ module.exports = {
                 return;
             }
 
-            const data = await messageSchema.findOne({ _id: id });
+            const data = await Message.findOne({ _id: id });
 
             const info = new Discord.EmbedBuilder()
                 .setColor(client.config_embeds.default)

diff --git a/src/buttons/logs/report-ban.js b/src/buttons/logs/report-ban.js
@@ -1,7 +1,7 @@
 const emoji = require("../../config.json").emojis;
 
-const bannedUserSchema = require("../../models/bannedUserSchema");
-const userSchema = require("../../models/userSchema");
+const BannedUser = require("../../models/BannedUser");
+const User = require("../../models/User");
 
 module.exports = {
     name: "report-ban",
@@ -20,7 +20,7 @@ module.exports = {
                 return;
             }
 
-            if(await userSchema.exists({ _id: id, immune: true })) {
+            if(await User.exists({ _id: id, immune: true })) {
                 const error = new Discord.EmbedBuilder()
                     .setColor(client.config_embeds.error)
                     .setDescription(`${emoji.cross} You cannot ban that user!`)
@@ -33,7 +33,7 @@ module.exports = {
                 return;
             }
 
-            if(await bannedUserSchema.exists({ _id: id })) {
+            if(await BannedUser.exists({ _id: id })) {
                 const error = new Discord.EmbedBuilder()
                     .setColor(client.config_embeds.error)
                     .setDescription(`${emoji.cross} That user is already banned!`)
@@ -99,7 +99,7 @@ module.exports = {
 
                             const user = await client.users.fetch(id);
 
-                            new bannedUserSchema({
+                            new BannedUser({
                                 _id: id,
                                 timestamp: Date.now(),
                                 allowAppeal: appealable === "false" ? false : true,

diff --git a/src/buttons/sentry/capture-info.js b/src/buttons/sentry/capture-info.js
@@ -1,6 +1,6 @@
 const emoji = require("../../config.json").emojis;
 
-const sentrySchema = require("../../models/sentrySchema");
+const SentryCapture = require("../../models/SentryCapture");
 
 module.exports = {
     name: "sentry-capture-info",
@@ -32,7 +32,7 @@ module.exports = {
             if(i.customId === `modal-${interaction.id}`) {
                 const token = i.fields.getTextInputValue(`modal-token-${interaction.id}`);
 
-                if(!await sentrySchema.exists({ _id: token })) {
+                if(!await SentryCapture.exists({ _id: token })) {
                     const error = new Discord.EmbedBuilder()
                         .setColor(client.config_embeds.error)
                         .setDescription(`${emoji.cross} That token does not exist!`)
@@ -41,7 +41,7 @@ module.exports = {
                     return;
                 }
 
-                const data = await sentrySchema.findOne({ _id: token });
+                const data = await SentryCapture.findOne({ _id: token });
 
                 const tokenInfo = new Discord.EmbedBuilder()
                     .setColor(client.config_embeds.default)

diff --git a/src/buttons/to-do-list/add.js b/src/buttons/to-do-list/add.js
@@ -1,13 +1,13 @@
 const emoji = require("../../config.json").emojis;
 
-const todoSchema = require("../../models/todoSchema");
+const Task = require("../../models/Task");
 
 module.exports = {
     name: "add-task",
     startsWith: false,
     requiredRoles: ["dev"],
     async execute(interaction, client, Discord) {
-        const todoData = await todoSchema.find();
+        const todoData = await Task.find();
 
         if(todoData.length >= 25) {
             const error = new Discord.EmbedBuilder()
@@ -96,7 +96,7 @@ module.exports = {
                         const message = interaction.message;
                         const taskId = require("crypto").randomUUID();
 
-                        data = new todoSchema({
+                        data = new Task({
                             _id: taskId,
                             timestamp: Date.now(),
                             added_by: interaction.user.id,
@@ -111,7 +111,7 @@ module.exports = {
 
                         await i.editReply({ embeds: [added], components: [], ephemeral: true });
 
-                        const newData = await todoSchema.find();
+                        const newData = await Task.find();
 
                         const todoList = [];