Merge branch 'dev' into 'main'

Revert "Update .gitlab-ci.yml file"

See merge request illegitimate/illegitimate-bot!298

drizzle.config.ts

@@ -1,8 +1,8 @@
 import { defineConfig } from "drizzle-kit"
 
 export default defineConfig({
-    schema: "./src/db/schema.ts",
+    schema: "./src/drizzle/schema.ts",
-    out: "./src/db/migrations",
+    out: "./src/drizzle/migrations",
     dialect: "postgresql",
     strict: true,
     verbose: true,

package.json

@@ -73,7 +73,7 @@
         "tsx": "^4.19.1",
         "typescript": "^5.6.2"
     },
-    "packageManager": "pnpm@9.11.0+sha256.1c0e33f70e5df9eede84a357bdfa0b1f9dba6e58194628d48a1055756f553754",
+    "packageManager": "pnpm@9.12.0+sha512.4abf725084d7bcbafbd728bfc7bee61f2f791f977fd87542b3579dcb23504d170d46337945e4c66485cd12d588a0c0e570ed9c477e7ccdd8507cf05f3f92eaca",
     "pnpm": {
         "patchedDependencies": {
             "whatwg-url@5.0.0": "patches/whatwg-url@5.0.0.patch",

src/commands-contextmenu/updateuser.ts

@@ -2,7 +2,7 @@ import { devMessage, embedColor, hypixelGuildID } from "config/options.js"
 import { waitingListRole } from "config/roles.js"
 import { ApplicationCommandType, ContextMenuCommandBuilder, PermissionFlagsBits, userMention } from "discord.js"
 import { IContextMenu } from "interfaces"
-import db from "src/db/db.js"
+import db from "src/drizzle/db.js"
 import roleManage from "utils/functions/rolesmanage.js"
 import { getGuild, getHeadURL, getIGN } from "utils/Hypixel.js"
 

src/commands/config.ts

@@ -2,8 +2,8 @@ import { embedColor } from "config/options.js"
 import { InteractionContextType, PermissionFlagsBits, SlashCommandBuilder } from "discord.js"
 import { eq } from "drizzle-orm"
 import { ICommand } from "interfaces"
-import db from "src/db/db.js"
+import db from "src/drizzle/db.js"
-import { settings } from "src/db/schema.js"
+import { settings } from "src/drizzle/schema.js"
 
 export default {
     name: "config",

src/commands/find.ts

@@ -1,7 +1,7 @@
 import { devMessage, embedColor } from "config/options.js"
 import { InteractionContextType, PermissionFlagsBits, SlashCommandBuilder, userMention } from "discord.js"
 import { ICommand } from "interfaces"
-import db from "src/db/db.js"
+import db from "src/drizzle/db.js"
 import { getHeadURL, getIGN, getUUID } from "utils/Hypixel.js"
 
 export default {

src/commands/forceunverify.ts

@@ -2,8 +2,8 @@ import { devMessage, embedColor } from "config/options.js"
 import { GuildMember, InteractionContextType, PermissionFlagsBits, SlashCommandBuilder, userMention } from "discord.js"
 import { eq } from "drizzle-orm"
 import { ICommand } from "interfaces"
-import db from "src/db/db.js"
+import db from "src/drizzle/db.js"
-import { verifies } from "src/db/schema.js"
+import { verifies } from "src/drizzle/schema.js"
 import logToChannel from "utils/functions/logtochannel.js"
 import roleManage from "utils/functions/rolesmanage.js"
 import { getIGN } from "utils/Hypixel.js"

src/commands/forceupdate.ts

@@ -2,7 +2,7 @@ import { devMessage, embedColor, hypixelGuildID } from "config/options.js"
 import { waitingListRole } from "config/roles.js"
 import { GuildMember, InteractionContextType, PermissionFlagsBits, SlashCommandBuilder, userMention } from "discord.js"
 import { ICommand } from "interfaces"
-import db from "src/db/db.js"
+import db from "src/drizzle/db.js"
 import roleManage from "utils/functions/rolesmanage.js"
 import { getGuild, getHeadURL, getIGN } from "utils/Hypixel.js"
 

src/commands/forceverify.ts

@@ -1,8 +1,8 @@
 import { devMessage, embedColor, hypixelGuildID } from "config/options.js"
 import { GuildMember, InteractionContextType, PermissionFlagsBits, SlashCommandBuilder, userMention } from "discord.js"
 import { ICommand } from "interfaces"
-import db from "src/db/db.js"
+import db from "src/drizzle/db.js"
-import { verifies } from "src/db/schema.js"
+import { verifies } from "src/drizzle/schema.js"
 import logToChannel from "utils/functions/logtochannel.js"
 import roleManage from "utils/functions/rolesmanage.js"
 import { getGuild, getHeadURL, getPlayer, getUUID } from "utils/Hypixel.js"

src/commands/remove.ts

@@ -3,8 +3,8 @@ import { waitingListRole } from "config/roles.js"
 import { GuildMember, InteractionContextType, PermissionFlagsBits, SlashCommandBuilder, userMention } from "discord.js"
 import { eq } from "drizzle-orm"
 import { ICommand } from "interfaces"
-import db from "src/db/db.js"
+import db from "src/drizzle/db.js"
-import { waitingLists } from "src/db/schema.js"
+import { waitingLists } from "src/drizzle/schema.js"
 import logToChannel from "utils/functions/logtochannel.js"
 
 export default {

src/commands/staff/removeguildroles.ts

@@ -1,7 +1,7 @@
 import { embedColor, hypixelGuildID } from "config/options.js"
 import { ChatInputCommandInteraction, GuildMember } from "discord.js"
 import { IGuildData } from "interfaces"
-import db from "src/db/db.js"
+import db from "src/drizzle/db.js"
 import env from "utils/Env.js"
 import roleManage from "utils/functions/rolesmanage.js"
 import { getGuild } from "utils/Hypixel.js"

src/commands/staff/updateall.ts

@@ -1,7 +1,7 @@
 import { embedColor, hypixelGuildID } from "config/options.js"
 import { ChannelType, ChatInputCommandInteraction, GuildMember } from "discord.js"
 import { IGuildData } from "interfaces"
-import db from "src/db/db.js"
+import db from "src/drizzle/db.js"
 import env from "utils/Env.js"
 import { color } from "utils/functions/colors.js"
 import roleManage from "utils/functions/rolesmanage.js"

src/commands/update.ts

@@ -2,7 +2,7 @@ import { devMessage, embedColor, hypixelGuildID } from "config/options.js"
 import { waitingListRole } from "config/roles.js"
 import { GuildMember, InteractionContextType, SlashCommandBuilder } from "discord.js"
 import { ICommand } from "interfaces"
-import db from "src/db/db.js"
+import db from "src/drizzle/db.js"
 import roleManage from "utils/functions/rolesmanage.js"
 import { getGuild, getHeadURL, getIGN } from "utils/Hypixel.js"
 

src/commands/verify.ts

@@ -3,8 +3,8 @@ import { GuildMember, InteractionContextType, SlashCommandBuilder } from "discor
 import { ICommand } from "interfaces"
 import { IPlayerData } from "interfaces"
 import { IGuildData } from "interfaces"
-import db from "src/db/db.js"
+import db from "src/drizzle/db.js"
-import { verifies } from "src/db/schema.js"
+import { verifies } from "src/drizzle/schema.js"
 import roleManage from "utils/functions/rolesmanage.js"
 import { getGuild, getHeadURL, getPlayer, getUUID } from "utils/Hypixel.js"
 

src/commands/whoami.ts

@@ -1,7 +1,7 @@
 import { devMessage, embedColor } from "config/options.js"
 import { InteractionContextType, SlashCommandBuilder, userMention } from "discord.js"
 import { ICommand } from "interfaces"
-import db from "src/db/db.js"
+import db from "src/drizzle/db.js"
 import { getHeadURL, getIGN } from "utils/Hypixel.js"
 
 export default {

src/commands/whois.ts

@@ -1,7 +1,7 @@
 import { devMessage, embedColor } from "config/options.js"
 import { InteractionContextType, PermissionFlagsBits, SlashCommandBuilder, userMention } from "discord.js"
 import { ICommand } from "interfaces"
-import db from "src/db/db.js"
+import db from "src/drizzle/db.js"
 import { getHeadURL, getIGN } from "utils/Hypixel.js"
 
 export default {

src/components/buttons/checkstats.ts

@@ -1,7 +1,7 @@
 import { devMessage, embedColor } from "config/options.js"
 import { bwfkdr, bwstars, bwwins, duelswins, duelswlr, swkdr, swstars } from "config/reqs.js"
 import { IButton } from "interfaces"
-import db from "src/db/db.js"
+import db from "src/drizzle/db.js"
 import { bedwarsLevel, getGuild, getHeadURL, getPlayer, hypixelLevel, skywarsLevel } from "utils/Hypixel.js"
 
 export default {

src/components/buttons/guildapplicationaccept.ts

@@ -3,8 +3,8 @@ import { waitingListRole } from "config/roles.js"
 import { ActionRowBuilder, ButtonBuilder, ButtonStyle, TextChannel } from "discord.js"
 import { eq } from "drizzle-orm"
 import { IButton } from "interfaces"
-import db from "src/db/db.js"
+import db from "src/drizzle/db.js"
-import { guildApps, waitingLists } from "src/db/schema.js"
+import { guildApps, waitingLists } from "src/drizzle/schema.js"
 import { color } from "utils/functions/colors.js"
 import { getGuild, getIGN } from "utils/Hypixel.js"
 

src/components/buttons/guildapply.ts

@@ -4,8 +4,8 @@ import { guild as guildQuestions } from "config/questions.js"
 import { guildRole } from "config/roles.js"
 import { ActionRowBuilder, ButtonBuilder, ButtonStyle, GuildMember, TextChannel } from "discord.js"
 import { IButton } from "interfaces"
-import db from "src/db/db.js"
+import db from "src/drizzle/db.js"
-import { guildApps } from "src/db/schema.js"
+import { guildApps } from "src/drizzle/schema.js"
 import applicationQuestions from "utils/functions/applicationquestions.js"
 
 export default {

src/components/buttons/staffapplicationaccept.ts

@@ -2,8 +2,8 @@ import { embedColor } from "config/options.js"
 import { ActionRowBuilder, ButtonBuilder, ButtonStyle } from "discord.js"
 import { eq } from "drizzle-orm"
 import { IButton } from "interfaces"
-import db from "src/db/db.js"
+import db from "src/drizzle/db.js"
-import { staffApps } from "src/db/schema.js"
+import { staffApps } from "src/drizzle/schema.js"
 
 export default {
     name: "staffapplicationaccept",

src/components/buttons/staffapply.ts

@@ -4,8 +4,8 @@ import { staff as staffQuestions } from "config/questions.js"
 import { guildRole, guildStaff } from "config/roles.js"
 import { ActionRowBuilder, ButtonBuilder, ButtonStyle, GuildMember, TextChannel } from "discord.js"
 import { IButton } from "interfaces"
-import db from "src/db/db.js"
+import db from "src/drizzle/db.js"
-import { staffApps } from "src/db/schema.js"
+import { staffApps } from "src/drizzle/schema.js"
 import env from "utils/Env.js"
 import applicationQuestions from "utils/functions/applicationquestions.js"
 

src/components/buttons/waitingListUpdate.ts

@@ -1,8 +1,8 @@
 import { hypixelGuildID } from "config/options.js"
 import { eq } from "drizzle-orm"
 import { IButton } from "interfaces"
-import db from "src/db/db.js"
+import db from "src/drizzle/db.js"
-import { waitingLists } from "src/db/schema.js"
+import { waitingLists } from "src/drizzle/schema.js"
 import { getGuild, getIGN } from "utils/Hypixel.js"
 
 export default {

src/components/modals/denyreasonbox.ts

@@ -2,8 +2,8 @@ import { embedColor } from "config/options.js"
 import { ActionRowBuilder, ButtonBuilder, ButtonStyle, EmbedBuilder, GuildMember, Message } from "discord.js"
 import { eq } from "drizzle-orm"
 import { IModal } from "interfaces"
-import db from "src/db/db.js"
+import db from "src/drizzle/db.js"
-import { guildApps } from "src/db/schema.js"
+import { guildApps } from "src/drizzle/schema.js"
 
 export default {
     name: "denyreasonbox",

src/components/modals/staffdenyreasonbox.ts

@@ -2,8 +2,8 @@ import { embedColor } from "config/options.js"
 import { ActionRowBuilder, ButtonBuilder, ButtonStyle, EmbedBuilder } from "discord.js"
 import { eq } from "drizzle-orm"
 import { IModal } from "interfaces"
-import db from "src/db/db.js"
+import db from "src/drizzle/db.js"
-import { staffApps } from "src/db/schema.js"
+import { staffApps } from "src/drizzle/schema.js"
 
 export default {
     name: "staffdenyreasonbox",

src/components/modals/verifyModal.ts

@@ -1,8 +1,8 @@
 import { devMessage, embedColor, hypixelGuildID } from "config/options.js"
 import { GuildMember } from "discord.js"
 import { IModal } from "interfaces"
-import db from "src/db/db.js"
+import db from "src/drizzle/db.js"
-import { verifies } from "src/db/schema.js"
+import { verifies } from "src/drizzle/schema.js"
 import roleManage from "utils/functions/rolesmanage.js"
 import { getGuild, getHeadURL, getPlayer, getUUID } from "utils/Hypixel.js"