From 9536478730f071168bb65fdff3ecfde56305da13 Mon Sep 17 00:00:00 2001 From: Vermium Sifell Date: Wed, 19 Oct 2022 21:21:19 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=A8=20reorganized=20files?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/{managers => handlers}/command/index.ts | 0 src/{helpers => handlers}/cooldown/index.ts | 2 +- src/{helpers => handlers}/deferReply/index.ts | 2 +- .../deployCommands/index.ts | 0 src/{helpers => handlers}/devMode/index.ts | 0 src/{managers => handlers}/event/index.ts | 0 src/{managers => handlers}/schedule/index.ts | 6 +-- .../updatePresence/index.ts | 0 src/helpers/embedBuilder/index.ts | 8 ---- src/helpers/getDiscordCommandJSON/index.ts | 43 ------------------- src/helpers/getEmbedData/index.ts | 2 +- src/helpers/getPluginCommandBuilder/index.ts | 11 ----- src/helpers/getPluginCommandOptions/index.ts | 10 ----- src/helpers/getPluginCommands/index.ts | 24 ----------- src/helpers/getPluginMetadata/index.ts | 8 ---- src/helpers/getPluginStructure/index.ts | 34 --------------- src/helpers/getPlugins/index.ts | 10 ----- src/helpers/registerDiscordCommands/index.ts | 22 ---------- .../index.ts} | 2 +- src/index.ts | 9 ++-- src/managers/database/index.ts | 22 ---------- src/managers/index.ts | 12 ------ .../embeds/components/getValues/index.ts | 2 +- .../commands/counters/modules/view/index.ts | 2 +- .../commands/credits/modules/balance/index.ts | 2 +- .../commands/credits/modules/top/index.ts | 2 +- .../commands/credits/modules/work/index.ts | 4 +- .../modules/counters/modules/add/index.ts | 2 +- .../modules/counters/modules/remove/index.ts | 2 +- .../modules/credits/modules/give/index.ts | 2 +- .../modules/credits/modules/set/index.ts | 2 +- .../modules/credits/modules/take/index.ts | 2 +- .../commands/reputation/modules/give/index.ts | 4 +- src/plugins/events/guildCreate/index.ts | 4 +- src/plugins/events/guildDelete/index.ts | 4 +- src/plugins/events/guildMemberAdd/index.ts | 4 +- src/plugins/events/guildMemberRemove/index.ts | 4 +- .../handlers/button/index.ts | 4 +- .../handlers/command/index.ts | 4 +- .../messageCreate/modules/counters/index.ts | 2 +- .../messageCreate/modules/credits/index.ts | 4 +- .../messageCreate/modules/points/index.ts | 4 +- .../events/messageDelete/modules/counter.ts | 2 +- .../events/messageUpdate/modules/counter.ts | 2 +- src/plugins/events/ready/index.ts | 6 +-- src/prisma.ts | 3 -- src/{jobs => schedules}/shop/index.ts | 0 .../modules/roles/components/dueForPayment.ts | 0 .../roles/components/overDueForPayment.ts | 0 .../shop/modules/roles/index.ts | 0 src/{jobs => schedules}/timeouts/index.ts | 0 51 files changed, 48 insertions(+), 252 deletions(-) rename src/{managers => handlers}/command/index.ts (100%) rename src/{helpers => handlers}/cooldown/index.ts (99%) rename src/{helpers => handlers}/deferReply/index.ts (92%) rename src/{helpers => handlers}/deployCommands/index.ts (100%) rename src/{helpers => handlers}/devMode/index.ts (100%) rename src/{managers => handlers}/event/index.ts (100%) rename src/{managers => handlers}/schedule/index.ts (75%) rename src/{helpers => handlers}/updatePresence/index.ts (100%) delete mode 100644 src/helpers/embedBuilder/index.ts delete mode 100644 src/helpers/getDiscordCommandJSON/index.ts delete mode 100644 src/helpers/getPluginCommandBuilder/index.ts delete mode 100644 src/helpers/getPluginCommandOptions/index.ts delete mode 100644 src/helpers/getPluginCommands/index.ts delete mode 100644 src/helpers/getPluginMetadata/index.ts delete mode 100644 src/helpers/getPluginStructure/index.ts delete mode 100644 src/helpers/getPlugins/index.ts delete mode 100644 src/helpers/registerDiscordCommands/index.ts rename src/helpers/{transferCredits.ts => transferCredits/index.ts} (98%) delete mode 100644 src/managers/database/index.ts delete mode 100644 src/managers/index.ts delete mode 100644 src/prisma.ts rename src/{jobs => schedules}/shop/index.ts (100%) rename src/{jobs => schedules}/shop/modules/roles/components/dueForPayment.ts (100%) rename src/{jobs => schedules}/shop/modules/roles/components/overDueForPayment.ts (100%) rename src/{jobs => schedules}/shop/modules/roles/index.ts (100%) rename src/{jobs => schedules}/timeouts/index.ts (100%) diff --git a/src/managers/command/index.ts b/src/handlers/command/index.ts similarity index 100% rename from src/managers/command/index.ts rename to src/handlers/command/index.ts diff --git a/src/helpers/cooldown/index.ts b/src/handlers/cooldown/index.ts similarity index 99% rename from src/helpers/cooldown/index.ts rename to src/handlers/cooldown/index.ts index 3847060..c2753b1 100644 --- a/src/helpers/cooldown/index.ts +++ b/src/handlers/cooldown/index.ts @@ -2,7 +2,7 @@ import { ButtonInteraction, CommandInteraction, Message } from "discord.js"; import addSeconds from "../../helpers/addSeconds"; import logger from "../../middlewares/logger"; -import prisma from "../../prisma"; +import prisma from "../database"; export const command = async (i: CommandInteraction, cooldown: number) => { const { guild, user, commandId } = i; diff --git a/src/helpers/deferReply/index.ts b/src/handlers/deferReply/index.ts similarity index 92% rename from src/helpers/deferReply/index.ts rename to src/handlers/deferReply/index.ts index ae9e16b..e795799 100644 --- a/src/helpers/deferReply/index.ts +++ b/src/handlers/deferReply/index.ts @@ -1,5 +1,5 @@ import { BaseInteraction, EmbedBuilder } from "discord.js"; -import getEmbedConfig from "../getEmbedData"; +import getEmbedConfig from "../../helpers/getEmbedData"; export default async (interaction: BaseInteraction, ephemeral: boolean) => { if (!interaction.isRepliable()) diff --git a/src/helpers/deployCommands/index.ts b/src/handlers/deployCommands/index.ts similarity index 100% rename from src/helpers/deployCommands/index.ts rename to src/handlers/deployCommands/index.ts diff --git a/src/helpers/devMode/index.ts b/src/handlers/devMode/index.ts similarity index 100% rename from src/helpers/devMode/index.ts rename to src/handlers/devMode/index.ts diff --git a/src/managers/event/index.ts b/src/handlers/event/index.ts similarity index 100% rename from src/managers/event/index.ts rename to src/handlers/event/index.ts diff --git a/src/managers/schedule/index.ts b/src/handlers/schedule/index.ts similarity index 75% rename from src/managers/schedule/index.ts rename to src/handlers/schedule/index.ts index ab8e51f..b3b3e2f 100644 --- a/src/managers/schedule/index.ts +++ b/src/handlers/schedule/index.ts @@ -1,18 +1,18 @@ import { Client } from "discord.js"; import schedule from "node-schedule"; -import listDir from "../../helpers/checkDirectory"; +import checkDirectory from "../../helpers/checkDirectory"; import { IJob } from "../../interfaces/Job"; import logger from "../../middlewares/logger"; export const start = async (client: Client) => { logger.info("⏰ Started job management"); - const jobNames = await listDir("jobs"); + const jobNames = await checkDirectory("schedules"); if (!jobNames) return logger.warn("No available jobs found"); await Promise.all( jobNames.map(async (jobName) => { - const job: IJob = await import(`../../jobs/${jobName}`); + const job: IJob = await import(`../../schedules/${jobName}`); schedule.scheduleJob(job.options.schedule, async () => { logger.verbose(`⏰ Performed the job "${jobName}"`); diff --git a/src/helpers/updatePresence/index.ts b/src/handlers/updatePresence/index.ts similarity index 100% rename from src/helpers/updatePresence/index.ts rename to src/handlers/updatePresence/index.ts diff --git a/src/helpers/embedBuilder/index.ts b/src/helpers/embedBuilder/index.ts deleted file mode 100644 index ef36024..0000000 --- a/src/helpers/embedBuilder/index.ts +++ /dev/null @@ -1,8 +0,0 @@ -import { EmbedBuilder } from "discord.js"; - -export default new EmbedBuilder() - .setFooter({ - text: process.env.EMBED_FOOTER_TEXT, - iconURL: process.env.EMBED_FOOTER_ICON, - }) - .setTimestamp(new Date()); diff --git a/src/helpers/getDiscordCommandJSON/index.ts b/src/helpers/getDiscordCommandJSON/index.ts deleted file mode 100644 index f69deab..0000000 --- a/src/helpers/getDiscordCommandJSON/index.ts +++ /dev/null @@ -1,43 +0,0 @@ -/* eslint-disable no-loops/no-loops */ - -import { SlashCommandBuilder } from "discord.js"; -import logger from "../../middlewares/logger"; -import getPluginCommands from "../getPluginCommands"; -import getPlugins from "../getPlugins"; - -export default async () => { - logger.debug("Processing complete builder for plugins"); - const plugins = await getPlugins("plugins"); - const pluginBuilders = []; - - for await (const plugin of plugins) { - logger.debug(`Processing builder for plugin: ${plugin}`); - - const commands = await getPluginCommands(plugin); - - const builderStructure = new SlashCommandBuilder() - .setName(plugin) - .setDescription("Get info about a user or a server!"); - - for await (const command of commands) { - logger.debug(`Processing builder of command: ${command.name}`); - if (command?.options?.group) { - logger.debug(`Processing subcommand group: ${command.builder.name}`); - builderStructure.addSubcommandGroup(command.builder); - logger.verbose(`Processed subcommand group: ${command.builder.name}!`); - } else { - logger.debug(`Processing subcommand: ${command.builder.name}`); - builderStructure.addSubcommand(command.builder); - logger.verbose(`Processed subcommand: ${command.builder.name}!`); - } - logger.verbose(`Processed builder of command: ${command.name}!`); - } - - pluginBuilders.push(builderStructure); - - logger.verbose(`Processed builder for plugin: ${plugin}!`); - } - - logger.verbose("Processed complete builder for plugins!"); - return pluginBuilders; -}; diff --git a/src/helpers/getEmbedData/index.ts b/src/helpers/getEmbedData/index.ts index 7f244e3..069ce9b 100644 --- a/src/helpers/getEmbedData/index.ts +++ b/src/helpers/getEmbedData/index.ts @@ -1,6 +1,6 @@ import { ColorResolvable, Guild } from "discord.js"; +import prisma from "../../handlers/database"; import logger from "../../middlewares/logger"; -import prisma from "../../prisma"; export default async (guild?: Guild | null) => { const { diff --git a/src/helpers/getPluginCommandBuilder/index.ts b/src/helpers/getPluginCommandBuilder/index.ts deleted file mode 100644 index c7036a4..0000000 --- a/src/helpers/getPluginCommandBuilder/index.ts +++ /dev/null @@ -1,11 +0,0 @@ -import logger from "../../middlewares/logger"; - -export default async (plugin: string, command: string) => { - logger.debug(`Processing builder for command: ${command}`); - const { builder } = await import( - `../../plugins/${plugin}/commands/${command}` - ); - logger.verbose(`Processed builder for command: ${command}!`); - - return builder; -}; diff --git a/src/helpers/getPluginCommandOptions/index.ts b/src/helpers/getPluginCommandOptions/index.ts deleted file mode 100644 index e9e6a1d..0000000 --- a/src/helpers/getPluginCommandOptions/index.ts +++ /dev/null @@ -1,10 +0,0 @@ -import logger from "../../middlewares/logger"; - -export default async (plugin: string, command: string) => { - logger.debug(`Processing options for command: ${command}`); - const { options } = - (await import(`../../plugins/${plugin}/commands/${command}`)) || []; - logger.verbose(`Processed options for command: ${command}!`); - - return options; -}; diff --git a/src/helpers/getPluginCommands/index.ts b/src/helpers/getPluginCommands/index.ts deleted file mode 100644 index 33547c0..0000000 --- a/src/helpers/getPluginCommands/index.ts +++ /dev/null @@ -1,24 +0,0 @@ -/* eslint-disable no-loops/no-loops */ -import logger from "../../middlewares/logger"; -import listDir from "../checkDirectory"; -import getPluginCommandBuilder from "../getPluginCommandBuilder"; -import getPluginCommandOptions from "../getPluginCommandOptions"; - -export default async (plugin: string) => { - logger.debug(`Processing commands for plugin: ${plugin}`); - const commands = (await listDir(`plugins/${plugin}/commands`)) || []; - const commandStructure = []; - - for await (const command of commands) { - logger.debug(`Processing command: ${command}`); - - const builder = await getPluginCommandBuilder(plugin, command); - const options = await getPluginCommandOptions(plugin, command); - - commandStructure.push({ name: command, builder, options }); - logger.verbose(`Processed command: ${command}!`); - } - - logger.verbose(`Processed commands for plugin: ${plugin}!`); - return commandStructure; -}; diff --git a/src/helpers/getPluginMetadata/index.ts b/src/helpers/getPluginMetadata/index.ts deleted file mode 100644 index 36a1eaf..0000000 --- a/src/helpers/getPluginMetadata/index.ts +++ /dev/null @@ -1,8 +0,0 @@ -import logger from "../../middlewares/logger"; - -export default async (plugin: string) => { - logger.debug(`Processing metadata for plugin: ${plugin}`); - const metadata = await import(`../../plugins/${plugin}/metadata`); - logger.verbose(`Processed metadata for plugin: ${plugin}!`); - return metadata.default; -}; diff --git a/src/helpers/getPluginStructure/index.ts b/src/helpers/getPluginStructure/index.ts deleted file mode 100644 index 6642bb8..0000000 --- a/src/helpers/getPluginStructure/index.ts +++ /dev/null @@ -1,34 +0,0 @@ -/* eslint-disable no-loops/no-loops */ - -import { Client } from "discord.js"; -import logger from "../../middlewares/logger"; -import getPluginCommands from "../getPluginCommands"; -import getPluginMetadata from "../getPluginMetadata"; -import getPlugins from "../getPlugins"; - -export default async (client: Client, dir: string) => { - const plugins = await getPlugins(dir); - const pluginStructure = []; - - logger.debug("Processing structure of plugins..."); - - for await (const plugin of plugins) { - logger.debug(`Processing structure of plugin: ${plugin}`); - const commands = await getPluginCommands(plugin); - const metadata = await getPluginMetadata(plugin); - - pluginStructure.push({ - plugin, - commands, - metadata, - }); - - client.commands.set(plugin, commands); - - logger.verbose(`Processed structure of plugin: ${plugin}!`); - } - - logger.verbose("Processed structure of plugins!"); - - return pluginStructure; -}; diff --git a/src/helpers/getPlugins/index.ts b/src/helpers/getPlugins/index.ts deleted file mode 100644 index 4146a4f..0000000 --- a/src/helpers/getPlugins/index.ts +++ /dev/null @@ -1,10 +0,0 @@ -import logger from "../../middlewares/logger"; -import listDir from "../checkDirectory"; - -export default async (dir: string) => { - logger.debug("Processing list of plugins..."); - const plugins = await listDir(dir); - logger.verbose("Processed list of plugins!"); - - return plugins || []; -}; diff --git a/src/helpers/registerDiscordCommands/index.ts b/src/helpers/registerDiscordCommands/index.ts deleted file mode 100644 index d258687..0000000 --- a/src/helpers/registerDiscordCommands/index.ts +++ /dev/null @@ -1,22 +0,0 @@ -import { REST } from "@discordjs/rest"; -import { Routes, SlashCommandBuilder } from "discord.js"; -import logger from "../../middlewares/logger"; - -export default async (builder: SlashCommandBuilder) => { - const rest = new REST({ version: "10" }).setToken(process.env.DISCORD_TOKEN); - - await rest.put( - Routes.applicationGuildCommands( - process.env.DISCORD_CLIENT_ID, - process.env.DISCORD_GUILD_ID - ), - { body: builder } - ); - - await rest - .put(Routes.applicationCommands(process.env.DISCORD_CLIENT_ID as string), { - body: builder, - }) - .then(() => logger.info("Successfully deployed to Discord")) - .catch(() => logger.error("Failed to deployed to Discord")); -}; diff --git a/src/helpers/transferCredits.ts b/src/helpers/transferCredits/index.ts similarity index 98% rename from src/helpers/transferCredits.ts rename to src/helpers/transferCredits/index.ts index 58d96b0..f349b4b 100644 --- a/src/helpers/transferCredits.ts +++ b/src/helpers/transferCredits/index.ts @@ -1,5 +1,5 @@ import { Guild, User } from "discord.js"; -import prisma from "../prisma"; +import prisma from "../../handlers/database"; export default async (guild: Guild, from: User, to: User, amount: number) => { return await prisma.$transaction(async (tx) => { diff --git a/src/index.ts b/src/index.ts index 6e58d4d..b65b076 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,7 +1,8 @@ import { Client, Collection, GatewayIntentBits } from "discord.js"; // discord.js import "dotenv/config"; -import * as managers from "./managers"; - +import * as command from "./handlers/command"; +import * as event from "./handlers/event"; +import * as schedule from "./handlers/schedule"; // Main process that starts all other sub processes const main = async () => { @@ -18,7 +19,9 @@ const main = async () => { // Create command collection client.commands = new Collection(); - await managers.start(client); + await schedule.start(client); + await event.register(client); + await command.register(client); // Authorize with Discord's API await client.login(process.env.DISCORD_TOKEN); diff --git a/src/managers/database/index.ts b/src/managers/database/index.ts deleted file mode 100644 index 930f449..0000000 --- a/src/managers/database/index.ts +++ /dev/null @@ -1,22 +0,0 @@ -import mongoose from "mongoose"; -import logger from "../../middlewares/logger"; - -// Function to connect to MongoDB server -export const connect = async () => { - await mongoose - .connect(process.env.MONGO_URL) - .then((connection) => { - logger.info(`💾 Connected to database: ${connection.connection.name}`); - }) - .catch(() => { - throw new Error("Error connecting to database."); - }); - - mongoose.connection.on("error", () => { - throw new Error("Failed to connect to database."); - }); - - mongoose.connection.on("warn", (warning) => { - logger.warn(`💾 ${warning}`); - }); -}; diff --git a/src/managers/index.ts b/src/managers/index.ts deleted file mode 100644 index 330fde7..0000000 --- a/src/managers/index.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { Client } from "discord.js"; - -import * as command from "./command"; -import * as event from "./event"; -import * as schedule from "./schedule"; - -export const start = async (client: Client) => { - // await database.connect(); - await schedule.start(client); - await command.register(client); - await event.register(client); -}; diff --git a/src/plugins/commands/config/modules/embeds/components/getValues/index.ts b/src/plugins/commands/config/modules/embeds/components/getValues/index.ts index 4ae15c0..f772cbc 100644 --- a/src/plugins/commands/config/modules/embeds/components/getValues/index.ts +++ b/src/plugins/commands/config/modules/embeds/components/getValues/index.ts @@ -1,7 +1,7 @@ import { ChatInputCommandInteraction, ColorResolvable } from "discord.js"; +import prisma from "../../../../../../../handlers/database"; import getEmbedConfig from "../../../../../../../helpers/getEmbedData"; import logger from "../../../../../../../middlewares/logger"; -import prisma from "../../../../../../../prisma"; export default async (interaction: ChatInputCommandInteraction) => { const { options, guild } = interaction; diff --git a/src/plugins/commands/counters/modules/view/index.ts b/src/plugins/commands/counters/modules/view/index.ts index cc72c32..858658e 100644 --- a/src/plugins/commands/counters/modules/view/index.ts +++ b/src/plugins/commands/counters/modules/view/index.ts @@ -1,8 +1,8 @@ import { SlashCommandSubcommandBuilder } from "@discordjs/builders"; import { ChannelType } from "discord-api-types/v10"; import { ChatInputCommandInteraction, EmbedBuilder } from "discord.js"; +import prisma from "../../../../../handlers/database"; import getEmbedConfig from "../../../../../helpers/getEmbedData"; -import prisma from "../../../../../prisma"; export default { metadata: { guildOnly: true, ephemeral: false }, diff --git a/src/plugins/commands/credits/modules/balance/index.ts b/src/plugins/commands/credits/modules/balance/index.ts index 153e73b..da8f1d3 100644 --- a/src/plugins/commands/credits/modules/balance/index.ts +++ b/src/plugins/commands/credits/modules/balance/index.ts @@ -1,8 +1,8 @@ import { SlashCommandSubcommandBuilder } from "@discordjs/builders"; import { CommandInteraction, EmbedBuilder } from "discord.js"; +import prisma from "../../../../../handlers/database"; import getEmbedConfig from "../../../../../helpers/getEmbedData"; import logger from "../../../../../middlewares/logger"; -import prisma from "../../../../../prisma"; export default { metadata: { guildOnly: true, ephemeral: true }, diff --git a/src/plugins/commands/credits/modules/top/index.ts b/src/plugins/commands/credits/modules/top/index.ts index 98dc814..c045d95 100644 --- a/src/plugins/commands/credits/modules/top/index.ts +++ b/src/plugins/commands/credits/modules/top/index.ts @@ -1,9 +1,9 @@ import { SlashCommandSubcommandBuilder } from "@discordjs/builders"; import { GuildMember } from "@prisma/client"; import { CommandInteraction, EmbedBuilder } from "discord.js"; +import prisma from "../../../../../handlers/database"; import getEmbedConfig from "../../../../../helpers/getEmbedData"; import logger from "../../../../../middlewares/logger"; -import prisma from "../../../../../prisma"; export default { metadata: { guildOnly: true, ephemeral: false }, diff --git a/src/plugins/commands/credits/modules/work/index.ts b/src/plugins/commands/credits/modules/work/index.ts index 716eb47..8b88d81 100644 --- a/src/plugins/commands/credits/modules/work/index.ts +++ b/src/plugins/commands/credits/modules/work/index.ts @@ -3,13 +3,13 @@ import { SlashCommandSubcommandBuilder } from "@discordjs/builders"; import Chance from "chance"; import { CommandInteraction, EmbedBuilder } from "discord.js"; // Models -import * as cooldown from "../../../../../helpers/cooldown"; +import * as cooldown from "../../../../../handlers/cooldown"; // Configurations import getEmbedConfig from "../../../../../helpers/getEmbedData"; // Helpers // Handlers +import prisma from "../../../../../handlers/database"; import logger from "../../../../../middlewares/logger"; -import prisma from "../../../../../prisma"; export default { metadata: { guildOnly: true, ephemeral: true }, diff --git a/src/plugins/commands/manage/modules/counters/modules/add/index.ts b/src/plugins/commands/manage/modules/counters/modules/add/index.ts index 7ddbc3d..38f6f51 100644 --- a/src/plugins/commands/manage/modules/counters/modules/add/index.ts +++ b/src/plugins/commands/manage/modules/counters/modules/add/index.ts @@ -7,9 +7,9 @@ import { PermissionsBitField, } from "discord.js"; // Configurations +import prisma from "../../../../../../../handlers/database"; import getEmbedConfig from "../../../../../../../helpers/getEmbedData"; import logger from "../../../../../../../middlewares/logger"; -import prisma from "../../../../../../../prisma"; // Function export default { diff --git a/src/plugins/commands/manage/modules/counters/modules/remove/index.ts b/src/plugins/commands/manage/modules/counters/modules/remove/index.ts index 693541c..7b35ec4 100644 --- a/src/plugins/commands/manage/modules/counters/modules/remove/index.ts +++ b/src/plugins/commands/manage/modules/counters/modules/remove/index.ts @@ -8,8 +8,8 @@ import { PermissionsBitField, } from "discord.js"; // Configurations +import prisma from "../../../../../../../handlers/database"; import getEmbedConfig from "../../../../../../../helpers/getEmbedData"; -import prisma from "../../../../../../../prisma"; // Function export default { diff --git a/src/plugins/commands/manage/modules/credits/modules/give/index.ts b/src/plugins/commands/manage/modules/credits/modules/give/index.ts index 4ed822c..aaf018a 100644 --- a/src/plugins/commands/manage/modules/credits/modules/give/index.ts +++ b/src/plugins/commands/manage/modules/credits/modules/give/index.ts @@ -12,7 +12,7 @@ import getEmbedConfig from "../../../../../../../helpers/getEmbedData"; import pluralize from "../../../../../../../helpers/pluralize"; // Models // Handlers -import prisma from "../../../../../../../prisma"; +import prisma from "../../../../../../../handlers/database"; // Function export default { metadata: { diff --git a/src/plugins/commands/manage/modules/credits/modules/set/index.ts b/src/plugins/commands/manage/modules/credits/modules/set/index.ts index 562ca32..794d7ca 100644 --- a/src/plugins/commands/manage/modules/credits/modules/set/index.ts +++ b/src/plugins/commands/manage/modules/credits/modules/set/index.ts @@ -10,8 +10,8 @@ import { // Configurations import getEmbedConfig from "../../../../../../../helpers/getEmbedData"; // Handlers +import prisma from "../../../../../../../handlers/database"; import logger from "../../../../../../../middlewares/logger"; -import prisma from "../../../../../../../prisma"; // Function export default { diff --git a/src/plugins/commands/manage/modules/credits/modules/take/index.ts b/src/plugins/commands/manage/modules/credits/modules/take/index.ts index 1c5f256..42516af 100644 --- a/src/plugins/commands/manage/modules/credits/modules/take/index.ts +++ b/src/plugins/commands/manage/modules/credits/modules/take/index.ts @@ -11,8 +11,8 @@ import getEmbedConfig from "../../../../../../../helpers/getEmbedData"; // Helpers../../../../../../../helpers/userData import pluralize from "../../../../../../../helpers/pluralize"; // Handlers +import prisma from "../../../../../../../handlers/database"; import logger from "../../../../../../../middlewares/logger"; -import prisma from "../../../../../../../prisma"; // Function export default { diff --git a/src/plugins/commands/reputation/modules/give/index.ts b/src/plugins/commands/reputation/modules/give/index.ts index e134612..33c550a 100644 --- a/src/plugins/commands/reputation/modules/give/index.ts +++ b/src/plugins/commands/reputation/modules/give/index.ts @@ -1,11 +1,11 @@ import { SlashCommandSubcommandBuilder } from "@discordjs/builders"; import { ChatInputCommandInteraction, EmbedBuilder } from "discord.js"; -import { command as CooldownCommand } from "../../../../../helpers/cooldown"; +import { command as CooldownCommand } from "../../../../../handlers/cooldown"; import getEmbedConfig from "../../../../../helpers/getEmbedData"; import logger from "../../../../../middlewares/logger"; import noSelfReputation from "./components/noSelfReputation"; -import prisma from "../../../../../prisma"; +import prisma from "../../../../../handlers/database"; export default { metadata: { guildOnly: true, ephemeral: true }, diff --git a/src/plugins/events/guildCreate/index.ts b/src/plugins/events/guildCreate/index.ts index 37ec652..72eb3c7 100644 --- a/src/plugins/events/guildCreate/index.ts +++ b/src/plugins/events/guildCreate/index.ts @@ -1,8 +1,8 @@ import { Guild } from "discord.js"; -import updatePresence from "../../../helpers/updatePresence"; +import prisma from "../../../handlers/database"; +import updatePresence from "../../../handlers/updatePresence"; import { IEventOptions } from "../../../interfaces/EventOptions"; import logger from "../../../middlewares/logger"; -import prisma from "../../../prisma"; export const options: IEventOptions = { type: "on", diff --git a/src/plugins/events/guildDelete/index.ts b/src/plugins/events/guildDelete/index.ts index fc3817a..99dff25 100644 --- a/src/plugins/events/guildDelete/index.ts +++ b/src/plugins/events/guildDelete/index.ts @@ -1,9 +1,9 @@ // 3rd party dependencies import { Guild } from "discord.js"; -import updatePresence from "../../../helpers/updatePresence"; +import prisma from "../../../handlers/database"; +import updatePresence from "../../../handlers/updatePresence"; import { IEventOptions } from "../../../interfaces/EventOptions"; import logger from "../../../middlewares/logger"; -import prisma from "../../../prisma"; export const options: IEventOptions = { type: "on", diff --git a/src/plugins/events/guildMemberAdd/index.ts b/src/plugins/events/guildMemberAdd/index.ts index d1f554e..27a6192 100644 --- a/src/plugins/events/guildMemberAdd/index.ts +++ b/src/plugins/events/guildMemberAdd/index.ts @@ -1,9 +1,9 @@ // 3rd party dependencies import { GuildMember } from "discord.js"; -import updatePresence from "../../../helpers/updatePresence"; +import prisma from "../../../handlers/database"; +import updatePresence from "../../../handlers/updatePresence"; import { IEventOptions } from "../../../interfaces/EventOptions"; import logger from "../../../middlewares/logger"; -import prisma from "../../../prisma"; import audits from "./audits"; import joinMessage from "./joinMessage"; diff --git a/src/plugins/events/guildMemberRemove/index.ts b/src/plugins/events/guildMemberRemove/index.ts index 7248324..d1a662f 100644 --- a/src/plugins/events/guildMemberRemove/index.ts +++ b/src/plugins/events/guildMemberRemove/index.ts @@ -1,9 +1,9 @@ // 3rd party dependencies import { GuildMember } from "discord.js"; -import updatePresence from "../../../helpers/updatePresence"; +import prisma from "../../../handlers/database"; +import updatePresence from "../../../handlers/updatePresence"; import { IEventOptions } from "../../../interfaces/EventOptions"; import logger from "../../../middlewares/logger"; -import prisma from "../../../prisma"; import audits from "./audits"; import leaveMessage from "./leaveMessage"; diff --git a/src/plugins/events/interactionCreate/handlers/button/index.ts b/src/plugins/events/interactionCreate/handlers/button/index.ts index 8fac9dd..9f5b5b1 100644 --- a/src/plugins/events/interactionCreate/handlers/button/index.ts +++ b/src/plugins/events/interactionCreate/handlers/button/index.ts @@ -1,7 +1,7 @@ // Dependencies import { BaseInteraction } from "discord.js"; -import { button as CooldownButton } from "../../../../../helpers/cooldown"; -import deferReply from "../../../../../helpers/deferReply"; +import { button as CooldownButton } from "../../../../../handlers/cooldown"; +import deferReply from "../../../../../handlers/deferReply"; export default async (interaction: BaseInteraction) => { if (!interaction.isButton()) return; diff --git a/src/plugins/events/interactionCreate/handlers/command/index.ts b/src/plugins/events/interactionCreate/handlers/command/index.ts index 4e9cc59..9f5169c 100644 --- a/src/plugins/events/interactionCreate/handlers/command/index.ts +++ b/src/plugins/events/interactionCreate/handlers/command/index.ts @@ -1,7 +1,7 @@ // Dependencies import { ChatInputCommandInteraction } from "discord.js"; -import { command as CooldownCommand } from "../../../../../helpers/cooldown"; -import deferReply from "../../../../../helpers/deferReply"; +import { command as CooldownCommand } from "../../../../../handlers/cooldown"; +import deferReply from "../../../../../handlers/deferReply"; import getCommandMetadata from "../../../../../helpers/getCommandMetadata"; export default async (interaction: ChatInputCommandInteraction) => { diff --git a/src/plugins/events/messageCreate/modules/counters/index.ts b/src/plugins/events/messageCreate/modules/counters/index.ts index 16c648e..98decfe 100644 --- a/src/plugins/events/messageCreate/modules/counters/index.ts +++ b/src/plugins/events/messageCreate/modules/counters/index.ts @@ -1,6 +1,6 @@ import { ChannelType, Message } from "discord.js"; +import prisma from "../../../../../handlers/database"; import logger from "../../../../../middlewares/logger"; -import prisma from "../../../../../prisma"; export default { execute: async (message: Message) => { diff --git a/src/plugins/events/messageCreate/modules/credits/index.ts b/src/plugins/events/messageCreate/modules/credits/index.ts index f342237..7037438 100644 --- a/src/plugins/events/messageCreate/modules/credits/index.ts +++ b/src/plugins/events/messageCreate/modules/credits/index.ts @@ -1,7 +1,7 @@ import { ChannelType, Message } from "discord.js"; -import { message as CooldownMessage } from "../../../../../helpers/cooldown"; +import { message as CooldownMessage } from "../../../../../handlers/cooldown"; +import prisma from "../../../../../handlers/database"; import logger from "../../../../../middlewares/logger"; -import prisma from "../../../../../prisma"; export default { execute: async (message: Message) => { diff --git a/src/plugins/events/messageCreate/modules/points/index.ts b/src/plugins/events/messageCreate/modules/points/index.ts index 6fca49d..dde559e 100644 --- a/src/plugins/events/messageCreate/modules/points/index.ts +++ b/src/plugins/events/messageCreate/modules/points/index.ts @@ -1,7 +1,7 @@ import { ChannelType, Message } from "discord.js"; -import { message as CooldownMessage } from "../../../../../helpers/cooldown"; +import { message as CooldownMessage } from "../../../../../handlers/cooldown"; +import prisma from "../../../../../handlers/database"; import logger from "../../../../../middlewares/logger"; -import prisma from "../../../../../prisma"; export default { execute: async (message: Message) => { diff --git a/src/plugins/events/messageDelete/modules/counter.ts b/src/plugins/events/messageDelete/modules/counter.ts index 9689be6..ac12127 100644 --- a/src/plugins/events/messageDelete/modules/counter.ts +++ b/src/plugins/events/messageDelete/modules/counter.ts @@ -1,8 +1,8 @@ // Dependencies import { Message } from "discord.js"; // Models +import prisma from "../../../../handlers/database"; import logger from "../../../../middlewares/logger"; -import prisma from "../../../../prisma"; export default async (message: Message) => { const { guild, channel, author, content } = message; diff --git a/src/plugins/events/messageUpdate/modules/counter.ts b/src/plugins/events/messageUpdate/modules/counter.ts index 0e34dde..f630024 100644 --- a/src/plugins/events/messageUpdate/modules/counter.ts +++ b/src/plugins/events/messageUpdate/modules/counter.ts @@ -1,8 +1,8 @@ // Dependencies import { Message } from "discord.js"; // Models +import prisma from "../../../../handlers/database"; import logger from "../../../../middlewares/logger"; -import prisma from "../../../../prisma"; export default async (message: Message) => { const { guild, channel, author, content } = message; diff --git a/src/plugins/events/ready/index.ts b/src/plugins/events/ready/index.ts index e45fd39..cf043c1 100644 --- a/src/plugins/events/ready/index.ts +++ b/src/plugins/events/ready/index.ts @@ -1,9 +1,9 @@ // Dependencies import { Client } from "discord.js"; // Helpers -import deployCommands from "../../../helpers/deployCommands"; -import devMode from "../../../helpers/devMode"; -import updatePresence from "../../../helpers/updatePresence"; +import deployCommands from "../../../handlers/deployCommands"; +import devMode from "../../../handlers/devMode"; +import updatePresence from "../../../handlers/updatePresence"; import { IEventOptions } from "../../../interfaces/EventOptions"; import logger from "../../../middlewares/logger"; diff --git a/src/prisma.ts b/src/prisma.ts deleted file mode 100644 index 2c3e98f..0000000 --- a/src/prisma.ts +++ /dev/null @@ -1,3 +0,0 @@ -import { PrismaClient } from "@prisma/client"; - -export default new PrismaClient(); diff --git a/src/jobs/shop/index.ts b/src/schedules/shop/index.ts similarity index 100% rename from src/jobs/shop/index.ts rename to src/schedules/shop/index.ts diff --git a/src/jobs/shop/modules/roles/components/dueForPayment.ts b/src/schedules/shop/modules/roles/components/dueForPayment.ts similarity index 100% rename from src/jobs/shop/modules/roles/components/dueForPayment.ts rename to src/schedules/shop/modules/roles/components/dueForPayment.ts diff --git a/src/jobs/shop/modules/roles/components/overDueForPayment.ts b/src/schedules/shop/modules/roles/components/overDueForPayment.ts similarity index 100% rename from src/jobs/shop/modules/roles/components/overDueForPayment.ts rename to src/schedules/shop/modules/roles/components/overDueForPayment.ts diff --git a/src/jobs/shop/modules/roles/index.ts b/src/schedules/shop/modules/roles/index.ts similarity index 100% rename from src/jobs/shop/modules/roles/index.ts rename to src/schedules/shop/modules/roles/index.ts diff --git a/src/jobs/timeouts/index.ts b/src/schedules/timeouts/index.ts similarity index 100% rename from src/jobs/timeouts/index.ts rename to src/schedules/timeouts/index.ts