diff --git a/drizzle.config.ts b/drizzle.config.ts index f8d7a4a..bcff231 100644 --- a/drizzle.config.ts +++ b/drizzle.config.ts @@ -1,8 +1,8 @@ import { defineConfig } from "drizzle-kit" export default defineConfig({ - schema: "./src/db/schema.ts", - out: "./src/db/migrations", + schema: "./src/drizzle/schema.ts", + out: "./src/drizzle/migrations", dialect: "postgresql", strict: true, verbose: true, diff --git a/src/commands-contextmenu/updateuser.ts b/src/commands-contextmenu/updateuser.ts index 2783baf..b025fff 100644 --- a/src/commands-contextmenu/updateuser.ts +++ b/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" diff --git a/src/commands/config.ts b/src/commands/config.ts index d624fde..199bbc8 100644 --- a/src/commands/config.ts +++ b/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 { settings } from "src/db/schema.js" +import db from "src/drizzle/db.js" +import { settings } from "src/drizzle/schema.js" export default { name: "config", diff --git a/src/commands/find.ts b/src/commands/find.ts index 432ae7b..74bbd3d 100644 --- a/src/commands/find.ts +++ b/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 { diff --git a/src/commands/forceunverify.ts b/src/commands/forceunverify.ts index 5d5ee48..2fed862 100644 --- a/src/commands/forceunverify.ts +++ b/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 { verifies } from "src/db/schema.js" +import db from "src/drizzle/db.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" diff --git a/src/commands/forceupdate.ts b/src/commands/forceupdate.ts index cbff14f..a2379a5 100644 --- a/src/commands/forceupdate.ts +++ b/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" diff --git a/src/commands/forceverify.ts b/src/commands/forceverify.ts index 5bd323f..012c6a8 100644 --- a/src/commands/forceverify.ts +++ b/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 { verifies } from "src/db/schema.js" +import db from "src/drizzle/db.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" diff --git a/src/commands/remove.ts b/src/commands/remove.ts index 1317c1f..41a3a49 100644 --- a/src/commands/remove.ts +++ b/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 { waitingLists } from "src/db/schema.js" +import db from "src/drizzle/db.js" +import { waitingLists } from "src/drizzle/schema.js" import logToChannel from "utils/functions/logtochannel.js" export default { diff --git a/src/commands/staff/removeguildroles.ts b/src/commands/staff/removeguildroles.ts index ecb3795..f23a3e1 100644 --- a/src/commands/staff/removeguildroles.ts +++ b/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" diff --git a/src/commands/staff/updateall.ts b/src/commands/staff/updateall.ts index ccfdd20..0a054ae 100644 --- a/src/commands/staff/updateall.ts +++ b/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" diff --git a/src/commands/update.ts b/src/commands/update.ts index 0dc3e71..676213d 100644 --- a/src/commands/update.ts +++ b/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" diff --git a/src/commands/verify.ts b/src/commands/verify.ts index a786ed1..d3d1fc8 100644 --- a/src/commands/verify.ts +++ b/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 { verifies } from "src/db/schema.js" +import db from "src/drizzle/db.js" +import { verifies } from "src/drizzle/schema.js" import roleManage from "utils/functions/rolesmanage.js" import { getGuild, getHeadURL, getPlayer, getUUID } from "utils/Hypixel.js" diff --git a/src/commands/whoami.ts b/src/commands/whoami.ts index 1b1dbc9..4f565d6 100644 --- a/src/commands/whoami.ts +++ b/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 { diff --git a/src/commands/whois.ts b/src/commands/whois.ts index 7723bae..8094473 100644 --- a/src/commands/whois.ts +++ b/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 { diff --git a/src/components/buttons/checkstats.ts b/src/components/buttons/checkstats.ts index 0ad0b3f..410feee 100644 --- a/src/components/buttons/checkstats.ts +++ b/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 { diff --git a/src/components/buttons/guildapplicationaccept.ts b/src/components/buttons/guildapplicationaccept.ts index ff2b34d..e37ce3d 100644 --- a/src/components/buttons/guildapplicationaccept.ts +++ b/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 { guildApps, waitingLists } from "src/db/schema.js" +import db from "src/drizzle/db.js" +import { guildApps, waitingLists } from "src/drizzle/schema.js" import { color } from "utils/functions/colors.js" import { getGuild, getIGN } from "utils/Hypixel.js" diff --git a/src/components/buttons/guildapply.ts b/src/components/buttons/guildapply.ts index 2fb529c..dad5ef4 100644 --- a/src/components/buttons/guildapply.ts +++ b/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 { guildApps } from "src/db/schema.js" +import db from "src/drizzle/db.js" +import { guildApps } from "src/drizzle/schema.js" import applicationQuestions from "utils/functions/applicationquestions.js" export default { diff --git a/src/components/buttons/staffapplicationaccept.ts b/src/components/buttons/staffapplicationaccept.ts index efe0919..2f6e694 100644 --- a/src/components/buttons/staffapplicationaccept.ts +++ b/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 { staffApps } from "src/db/schema.js" +import db from "src/drizzle/db.js" +import { staffApps } from "src/drizzle/schema.js" export default { name: "staffapplicationaccept", diff --git a/src/components/buttons/staffapply.ts b/src/components/buttons/staffapply.ts index e627ce9..8d87e67 100644 --- a/src/components/buttons/staffapply.ts +++ b/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 { staffApps } from "src/db/schema.js" +import db from "src/drizzle/db.js" +import { staffApps } from "src/drizzle/schema.js" import env from "utils/Env.js" import applicationQuestions from "utils/functions/applicationquestions.js" diff --git a/src/components/buttons/waitingListUpdate.ts b/src/components/buttons/waitingListUpdate.ts index 67ae2fe..05a6fb3 100644 --- a/src/components/buttons/waitingListUpdate.ts +++ b/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 { waitingLists } from "src/db/schema.js" +import db from "src/drizzle/db.js" +import { waitingLists } from "src/drizzle/schema.js" import { getGuild, getIGN } from "utils/Hypixel.js" export default { diff --git a/src/components/modals/denyreasonbox.ts b/src/components/modals/denyreasonbox.ts index fb361b4..3686e95 100644 --- a/src/components/modals/denyreasonbox.ts +++ b/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 { guildApps } from "src/db/schema.js" +import db from "src/drizzle/db.js" +import { guildApps } from "src/drizzle/schema.js" export default { name: "denyreasonbox", diff --git a/src/components/modals/staffdenyreasonbox.ts b/src/components/modals/staffdenyreasonbox.ts index dea399c..20d92be 100644 --- a/src/components/modals/staffdenyreasonbox.ts +++ b/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 { staffApps } from "src/db/schema.js" +import db from "src/drizzle/db.js" +import { staffApps } from "src/drizzle/schema.js" export default { name: "staffdenyreasonbox", diff --git a/src/components/modals/verifyModal.ts b/src/components/modals/verifyModal.ts index b758487..c4d80a0 100644 --- a/src/components/modals/verifyModal.ts +++ b/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 { verifies } from "src/db/schema.js" +import db from "src/drizzle/db.js" +import { verifies } from "src/drizzle/schema.js" import roleManage from "utils/functions/rolesmanage.js" import { getGuild, getHeadURL, getPlayer, getUUID } from "utils/Hypixel.js" diff --git a/src/db/db.ts b/src/drizzle/db.ts similarity index 100% rename from src/db/db.ts rename to src/drizzle/db.ts diff --git a/src/db/migrations/0000_bouncy_thor_girl.sql b/src/drizzle/migrations/0000_bouncy_thor_girl.sql similarity index 100% rename from src/db/migrations/0000_bouncy_thor_girl.sql rename to src/drizzle/migrations/0000_bouncy_thor_girl.sql diff --git a/src/db/migrations/meta/0000_snapshot.json b/src/drizzle/migrations/meta/0000_snapshot.json similarity index 100% rename from src/db/migrations/meta/0000_snapshot.json rename to src/drizzle/migrations/meta/0000_snapshot.json diff --git a/src/db/migrations/meta/_journal.json b/src/drizzle/migrations/meta/_journal.json similarity index 100% rename from src/db/migrations/meta/_journal.json rename to src/drizzle/migrations/meta/_journal.json diff --git a/src/db/schema.ts b/src/drizzle/schema.ts similarity index 100% rename from src/db/schema.ts rename to src/drizzle/schema.ts