diff --git a/.husky/.gitignore b/.husky/.gitignore deleted file mode 100644 index 31354ec..0000000 --- a/.husky/.gitignore +++ /dev/null @@ -1 +0,0 @@ -_ diff --git a/.husky/pre-commit b/.husky/pre-commit deleted file mode 100644 index c37466e..0000000 --- a/.husky/pre-commit +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -. "$(dirname "$0")/_/husky.sh" - -npx lint-staged \ No newline at end of file diff --git a/src/helpers/listDir/index.ts b/src/helpers/checkDirectory/index.ts similarity index 100% rename from src/helpers/listDir/index.ts rename to src/helpers/checkDirectory/index.ts diff --git a/src/helpers/deferReply/index.ts b/src/helpers/deferReply/index.ts index 790df34..ae9e16b 100644 --- a/src/helpers/deferReply/index.ts +++ b/src/helpers/deferReply/index.ts @@ -1,5 +1,5 @@ import { BaseInteraction, EmbedBuilder } from "discord.js"; -import getEmbedConfig from "../../helpers/getEmbedConfig"; +import getEmbedConfig from "../getEmbedData"; export default async (interaction: BaseInteraction, ephemeral: boolean) => { if (!interaction.isRepliable()) diff --git a/src/helpers/dropGuild/index.ts b/src/helpers/deleteGuildData/index.ts similarity index 100% rename from src/helpers/dropGuild/index.ts rename to src/helpers/deleteGuildData/index.ts diff --git a/src/helpers/dropUser/index.ts b/src/helpers/deleteUserData/index.ts similarity index 100% rename from src/helpers/dropUser/index.ts rename to src/helpers/deleteUserData/index.ts diff --git a/src/handlers/deployCommands/index.ts b/src/helpers/deployCommands/index.ts similarity index 100% rename from src/handlers/deployCommands/index.ts rename to src/helpers/deployCommands/index.ts diff --git a/src/handlers/devMode/index.ts b/src/helpers/devMode/index.ts similarity index 100% rename from src/handlers/devMode/index.ts rename to src/helpers/devMode/index.ts diff --git a/src/handlers/encryption/index.ts b/src/helpers/encryption/index.ts similarity index 100% rename from src/handlers/encryption/index.ts rename to src/helpers/encryption/index.ts diff --git a/src/helpers/getEmbedConfig/index.ts b/src/helpers/getEmbedData/index.ts similarity index 100% rename from src/helpers/getEmbedConfig/index.ts rename to src/helpers/getEmbedData/index.ts diff --git a/src/helpers/getPluginCommands/index.ts b/src/helpers/getPluginCommands/index.ts index 96e4d0b..33547c0 100644 --- a/src/helpers/getPluginCommands/index.ts +++ b/src/helpers/getPluginCommands/index.ts @@ -1,8 +1,8 @@ /* eslint-disable no-loops/no-loops */ import logger from "../../middlewares/logger"; +import listDir from "../checkDirectory"; import getPluginCommandBuilder from "../getPluginCommandBuilder"; import getPluginCommandOptions from "../getPluginCommandOptions"; -import listDir from "../listDir"; export default async (plugin: string) => { logger.debug(`Processing commands for plugin: ${plugin}`); diff --git a/src/helpers/getPlugins/index.ts b/src/helpers/getPlugins/index.ts index fbf9daa..4146a4f 100644 --- a/src/helpers/getPlugins/index.ts +++ b/src/helpers/getPlugins/index.ts @@ -1,5 +1,5 @@ import logger from "../../middlewares/logger"; -import listDir from "../listDir"; +import listDir from "../checkDirectory"; export default async (dir: string) => { logger.debug("Processing list of plugins..."); diff --git a/src/helpers/fetchGuild/index.ts b/src/helpers/guildData/index.ts similarity index 100% rename from src/helpers/fetchGuild/index.ts rename to src/helpers/guildData/index.ts diff --git a/src/helpers/fetchUser/index.ts b/src/helpers/userData/index.ts similarity index 100% rename from src/helpers/fetchUser/index.ts rename to src/helpers/userData/index.ts diff --git a/src/managers/command/index.ts b/src/managers/command/index.ts index 40ab1d9..5f43be4 100644 --- a/src/managers/command/index.ts +++ b/src/managers/command/index.ts @@ -1,8 +1,7 @@ import { Client } from "discord.js"; -import listDir from "../../helpers/listDir"; -import logger from "../../middlewares/logger"; - +import listDir from "../../helpers/checkDirectory"; import { ICommand } from "../../interfaces/Command"; +import logger from "../../middlewares/logger"; export const register = async (client: Client) => { // Get name of directories containing commands diff --git a/src/managers/event/index.ts b/src/managers/event/index.ts index 9a58e18..c0734ba 100644 --- a/src/managers/event/index.ts +++ b/src/managers/event/index.ts @@ -1,6 +1,6 @@ /* eslint-disable no-loops/no-loops */ import { Client } from "discord.js"; -import listDir from "../../helpers/listDir"; +import listDir from "../../helpers/checkDirectory"; import { IEvent } from "../../interfaces/Event"; import logger from "../../middlewares/logger"; diff --git a/src/managers/schedule/index.ts b/src/managers/schedule/index.ts index 7e4cfdc..ab8e51f 100644 --- a/src/managers/schedule/index.ts +++ b/src/managers/schedule/index.ts @@ -1,11 +1,8 @@ import { Client } from "discord.js"; -import logger from "../../middlewares/logger"; - -import { IJob } from "../../interfaces/Job"; - -import listDir from "../../helpers/listDir"; - import schedule from "node-schedule"; +import listDir from "../../helpers/checkDirectory"; +import { IJob } from "../../interfaces/Job"; +import logger from "../../middlewares/logger"; export const start = async (client: Client) => { logger.info("⏰ Started job management"); diff --git a/src/plugins/commands/config/modules/audits/index.ts b/src/plugins/commands/config/modules/audits/index.ts index 5ef3fac..c8de0ad 100644 --- a/src/plugins/commands/config/modules/audits/index.ts +++ b/src/plugins/commands/config/modules/audits/index.ts @@ -1,15 +1,12 @@ +import { SlashCommandSubcommandBuilder } from "@discordjs/builders"; +import { ChannelType } from "discord-api-types/v10"; import { ChatInputCommandInteraction, EmbedBuilder, PermissionsBitField, } from "discord.js"; - -import getEmbedConfig from "../../../../../helpers/getEmbedConfig"; - +import getEmbedConfig from "../../../../../helpers/getEmbedData"; import logger from "../../../../../middlewares/logger"; - -import { SlashCommandSubcommandBuilder } from "@discordjs/builders"; -import { ChannelType } from "discord-api-types/v10"; import guildSchema from "../../../../../models/guild"; export default { diff --git a/src/plugins/commands/config/modules/cpgg/index.ts b/src/plugins/commands/config/modules/cpgg/index.ts index 80caa14..a4297ad 100644 --- a/src/plugins/commands/config/modules/cpgg/index.ts +++ b/src/plugins/commands/config/modules/cpgg/index.ts @@ -1,15 +1,12 @@ +import { SlashCommandSubcommandBuilder } from "@discordjs/builders"; import { ChatInputCommandInteraction, EmbedBuilder, PermissionsBitField, } from "discord.js"; - -import getEmbedConfig from "../../../../../helpers/getEmbedConfig"; - +import encryption from "../../../../../helpers/encryption"; +import getEmbedConfig from "../../../../../helpers/getEmbedData"; import logger from "../../../../../middlewares/logger"; - -import { SlashCommandSubcommandBuilder } from "@discordjs/builders"; -import encryption from "../../../../../handlers/encryption"; import apiSchema from "../../../../../models/api"; export default { diff --git a/src/plugins/commands/config/modules/credits/index.ts b/src/plugins/commands/config/modules/credits/index.ts index 245cc6f..436d26f 100644 --- a/src/plugins/commands/config/modules/credits/index.ts +++ b/src/plugins/commands/config/modules/credits/index.ts @@ -1,14 +1,11 @@ +import { SlashCommandSubcommandBuilder } from "@discordjs/builders"; import { ChatInputCommandInteraction, EmbedBuilder, PermissionsBitField, } from "discord.js"; - -import getEmbedConfig from "../../../../../helpers/getEmbedConfig"; - +import getEmbedConfig from "../../../../../helpers/getEmbedData"; import logger from "../../../../../middlewares/logger"; - -import { SlashCommandSubcommandBuilder } from "@discordjs/builders"; import guildSchema from "../../../../../models/guild"; export default { 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 bc49e1f..068b82c 100644 --- a/src/plugins/commands/config/modules/embeds/components/getValues/index.ts +++ b/src/plugins/commands/config/modules/embeds/components/getValues/index.ts @@ -1,5 +1,5 @@ import { ChatInputCommandInteraction, ColorResolvable } from "discord.js"; -import getEmbedConfig from "../../../../../../../helpers/getEmbedConfig"; +import getEmbedConfig from "../../../../../../../helpers/getEmbedData"; import guildSchema from "../../../../../../../models/guild"; export default async (interaction: ChatInputCommandInteraction) => { diff --git a/src/plugins/commands/config/modules/points/index.ts b/src/plugins/commands/config/modules/points/index.ts index 9b73eb1..7e1c6dc 100644 --- a/src/plugins/commands/config/modules/points/index.ts +++ b/src/plugins/commands/config/modules/points/index.ts @@ -1,14 +1,11 @@ +import { SlashCommandSubcommandBuilder } from "@discordjs/builders"; import { ChatInputCommandInteraction, EmbedBuilder, PermissionsBitField, } from "discord.js"; - -import getEmbedConfig from "../../../../../helpers/getEmbedConfig"; - +import getEmbedConfig from "../../../../../helpers/getEmbedData"; import logger from "../../../../../middlewares/logger"; - -import { SlashCommandSubcommandBuilder } from "@discordjs/builders"; import guildSchema from "../../../../../models/guild"; export default { diff --git a/src/plugins/commands/config/modules/shop/index.ts b/src/plugins/commands/config/modules/shop/index.ts index 0e10d9f..8a6ceb7 100644 --- a/src/plugins/commands/config/modules/shop/index.ts +++ b/src/plugins/commands/config/modules/shop/index.ts @@ -1,14 +1,11 @@ +import { SlashCommandSubcommandBuilder } from "@discordjs/builders"; import { ChatInputCommandInteraction, EmbedBuilder, PermissionsBitField, } from "discord.js"; - -import getEmbedConfig from "../../../../../helpers/getEmbedConfig"; - +import getEmbedConfig from "../../../../../helpers/getEmbedData"; import logger from "../../../../../middlewares/logger"; - -import { SlashCommandSubcommandBuilder } from "@discordjs/builders"; import guildSchema from "../../../../../models/guild"; export default { diff --git a/src/plugins/commands/config/modules/welcome/index.ts b/src/plugins/commands/config/modules/welcome/index.ts index 919711e..61a9436 100644 --- a/src/plugins/commands/config/modules/welcome/index.ts +++ b/src/plugins/commands/config/modules/welcome/index.ts @@ -1,15 +1,12 @@ +import { SlashCommandSubcommandBuilder } from "@discordjs/builders"; +import { ChannelType } from "discord-api-types/v10"; import { ChatInputCommandInteraction, EmbedBuilder, PermissionsBitField, } from "discord.js"; - -import getEmbedConfig from "../../../../../helpers/getEmbedConfig"; - +import getEmbedConfig from "../../../../../helpers/getEmbedData"; import logger from "../../../../../middlewares/logger"; - -import { SlashCommandSubcommandBuilder } from "@discordjs/builders"; -import { ChannelType } from "discord-api-types/v10"; import guildSchema from "../../../../../models/guild"; export default { diff --git a/src/plugins/commands/counters/modules/view/index.ts b/src/plugins/commands/counters/modules/view/index.ts index 81e1147..679b68e 100644 --- a/src/plugins/commands/counters/modules/view/index.ts +++ b/src/plugins/commands/counters/modules/view/index.ts @@ -1,9 +1,7 @@ -import getEmbedConfig from "../../../../../helpers/getEmbedConfig"; - import { SlashCommandSubcommandBuilder } from "@discordjs/builders"; import { ChannelType } from "discord-api-types/v10"; import { ChatInputCommandInteraction, EmbedBuilder } from "discord.js"; - +import getEmbedConfig from "../../../../../helpers/getEmbedData"; import counterSchema from "../../../../../models/counter"; export default { diff --git a/src/plugins/commands/credits/modules/balance/index.ts b/src/plugins/commands/credits/modules/balance/index.ts index 57afd75..3cddb4b 100644 --- a/src/plugins/commands/credits/modules/balance/index.ts +++ b/src/plugins/commands/credits/modules/balance/index.ts @@ -1,11 +1,9 @@ -import getEmbedConfig from "../../../../../helpers/getEmbedConfig"; - import { SlashCommandSubcommandBuilder } from "@discordjs/builders"; import { CommandInteraction, EmbedBuilder } from "discord.js"; +import getEmbedConfig from "../../../../../helpers/getEmbedData"; +import fetchUser from "../../../../../helpers/userData"; import logger from "../../../../../middlewares/logger"; -import fetchUser from "../../../../../helpers/fetchUser"; - export default { metadata: { guildOnly: true, ephemeral: true }, builder: (command: SlashCommandSubcommandBuilder) => { diff --git a/src/plugins/commands/credits/modules/gift/index.ts b/src/plugins/commands/credits/modules/gift/index.ts index fba20f1..b2dfabe 100644 --- a/src/plugins/commands/credits/modules/gift/index.ts +++ b/src/plugins/commands/credits/modules/gift/index.ts @@ -1,17 +1,18 @@ // Dependencies import { ChatInputCommandInteraction, EmbedBuilder } from "discord.js"; - +import mongoose from "mongoose"; // Configurations -import getEmbedConfig from "../../../../../helpers/getEmbedConfig"; - +import getEmbedConfig from "../../../../../helpers/getEmbedData"; +import fetchUser from "../../../../../helpers/userData"; // Handlers import logger from "../../../../../middlewares/logger"; - -import mongoose from "mongoose"; - // Models -import { SlashCommandSubcommandBuilder } from "@discordjs/builders"; -import fetchUser from "../../../../../helpers/fetchUser"; +import { SlashCommandSu } from /../../../../ helpers / userDatajs / builders; + + + + +"; // Function export default { diff --git a/src/plugins/commands/credits/modules/top/index.ts b/src/plugins/commands/credits/modules/top/index.ts index 6c3bec7..0ad0bb1 100644 --- a/src/plugins/commands/credits/modules/top/index.ts +++ b/src/plugins/commands/credits/modules/top/index.ts @@ -1,9 +1,7 @@ -import getEmbedConfig from "../../../../../helpers/getEmbedConfig"; - import { SlashCommandSubcommandBuilder } from "@discordjs/builders"; import { CommandInteraction, EmbedBuilder } from "discord.js"; +import getEmbedConfig from "../../../../../helpers/getEmbedData"; import logger from "../../../../../middlewares/logger"; - import userSchema, { IUser } from "../../../../../models/user"; export default { diff --git a/src/plugins/commands/credits/modules/work/index.ts b/src/plugins/commands/credits/modules/work/index.ts index 5354752..9291d45 100644 --- a/src/plugins/commands/credits/modules/work/index.ts +++ b/src/plugins/commands/credits/modules/work/index.ts @@ -2,19 +2,20 @@ import { SlashCommandSubcommandBuilder } from "@discordjs/builders"; import Chance from "chance"; import { CommandInteraction, EmbedBuilder } from "discord.js"; - -// Configurations -import getEmbedConfig from "../../../../../helpers/getEmbedConfig"; - -// Handlers -import logger from "../../../../../middlewares/logger"; - // Models import * as cooldown from "../../../../../helpers/cooldown"; - +// Configurations +import getEmbedConfig from "../../../../../helpers/getEmbedData"; +import fetchUser from "../../../../../helpers/userData"; +// Handlers +import logger from "../../../../../middlewares/logger"; // Helpers -import fetchGuild from "../../../../../helpers/fetchGuild"; -import fetchUser from "../../../../../helpers/fetchUser"; +import fetchGuild from../../../../../ helpers / userDatald; + + + + +"; export default { metadata: { guildOnly: true, ephemeral: true }, diff --git a/src/plugins/commands/dns/modules/lookup/index.ts b/src/plugins/commands/dns/modules/lookup/index.ts index 54635e1..47f0785 100644 --- a/src/plugins/commands/dns/modules/lookup/index.ts +++ b/src/plugins/commands/dns/modules/lookup/index.ts @@ -1,9 +1,7 @@ +import { SlashCommandSubcommandBuilder } from "@discordjs/builders"; import axios from "axios"; import { ChatInputCommandInteraction, EmbedBuilder } from "discord.js"; - -import getEmbedConfig from "../../../../../helpers/getEmbedConfig"; - -import { SlashCommandSubcommandBuilder } from "@discordjs/builders"; +import getEmbedConfig from "../../../../../helpers/getEmbedData"; export default { metadata: { guildOnly: false, ephemeral: false }, diff --git a/src/plugins/commands/fun/modules/meme/index.ts b/src/plugins/commands/fun/modules/meme/index.ts index 9ad5a48..9709014 100644 --- a/src/plugins/commands/fun/modules/meme/index.ts +++ b/src/plugins/commands/fun/modules/meme/index.ts @@ -1,7 +1,7 @@ import { SlashCommandSubcommandBuilder } from "@discordjs/builders"; import axios from "axios"; import { CommandInteraction, EmbedBuilder } from "discord.js"; -import getEmbedConfig from "../../../../../helpers/getEmbedConfig"; +import getEmbedConfig from "../../../../../helpers/getEmbedData"; export default { metadata: { guildOnly: false, ephemeral: false, cooldown: 15 }, 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 2b95f9a..f73d6e5 100644 --- a/src/plugins/commands/manage/modules/counters/modules/add/index.ts +++ b/src/plugins/commands/manage/modules/counters/modules/add/index.ts @@ -6,12 +6,9 @@ import { EmbedBuilder, PermissionsBitField, } from "discord.js"; - // Configurations -import getEmbedConfig from "../../../../../../../helpers/getEmbedConfig"; - +import getEmbedConfig from "../../../../../../../helpers/getEmbedData"; import logger from "../../../../../../../middlewares/logger"; - // Models import counterSchema from "../../../../../../../models/counter"; 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 096fda7..8b21059 100644 --- a/src/plugins/commands/manage/modules/counters/modules/remove/index.ts +++ b/src/plugins/commands/manage/modules/counters/modules/remove/index.ts @@ -1,19 +1,16 @@ // Dependencies +// Models +import { SlashCommandSubcommandBuilder } from "@discordjs/builders"; +import { ChannelType } from "discord-api-types/v10"; import { ChatInputCommandInteraction, EmbedBuilder, PermissionsBitField, } from "discord.js"; - // Configurations -import getEmbedConfig from "../../../../../../../helpers/getEmbedConfig"; - +import getEmbedConfig from "../../../../../../../helpers/getEmbedData"; // Handlers import logger from "../../../../../../../middlewares/logger"; - -// Models -import { SlashCommandSubcommandBuilder } from "@discordjs/builders"; -import { ChannelType } from "discord-api-types/v10"; import counterSchema from "../../../../../../../models/counter"; // Function 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 e797afd..c59bb5a 100644 --- a/src/plugins/commands/manage/modules/credits/modules/give/index.ts +++ b/src/plugins/commands/manage/modules/credits/modules/give/index.ts @@ -5,19 +5,15 @@ import { EmbedBuilder, PermissionsBitField, } from "discord.js"; - // Configurations -import getEmbedConfig from "../../../../../../../helpers/getEmbedConfig"; - +import getEmbedConfig from "../../../../../../../helpers/getEmbedData"; +// Helpers../../../../../../../helpers/userData +import pluralize from "../../../../../../../helpers/pluralize"; +// Models +import fetchUser from "../../../../../../../helpers/userData"; // Handlers import logger from "../../../../../../../middlewares/logger"; -// Helpers -import pluralize from "../../../../../../../helpers/pluralize"; - -// Models -import fetchUser from "../../../../../../../helpers/fetchUser"; - // Function export default { metadata: { diff --git a/src/plugins/commands/manage/modules/credits/modules/giveaway/index.ts b/src/plugins/commands/manage/modules/credits/modules/giveaway/index.ts index 246b00a..93ac561 100644 --- a/src/plugins/commands/manage/modules/credits/modules/giveaway/index.ts +++ b/src/plugins/commands/manage/modules/credits/modules/giveaway/index.ts @@ -1,6 +1,7 @@ // Dependencies import { SlashCommandSubcommandBuilder } from "@discordjs/builders"; import axios from "axios"; +import { ButtonStyle, ChannelType } from "discord-api-types/v10"; import { ActionRowBuilder, ButtonBuilder, @@ -9,13 +10,10 @@ import { PermissionsBitField, } from "discord.js"; import { v4 as uuidv4 } from "uuid"; -import encryption from "../../../../../../../handlers/encryption"; -import apiSchema from "../../../../../../../models/api"; - +import encryption from "../../../../../../../helpers/encryption"; // Configurations -import getEmbedConfig from "../../../../../../../helpers/getEmbedConfig"; - -import { ButtonStyle, ChannelType } from "discord-api-types/v10"; +import getEmbedConfig from "../../../../../../../helpers/getEmbedData"; +import apiSchema from "../../../../../../../models/api"; // Function export default { 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 9e2a63c..294f30a 100644 --- a/src/plugins/commands/manage/modules/credits/modules/set/index.ts +++ b/src/plugins/commands/manage/modules/credits/modules/set/index.ts @@ -1,21 +1,20 @@ // Dependencies +// Helpers +// Models +import { SlashCommandSubcommandBuilder } from "@discordjs/builders"; import { ChatInputCommandInteraction, EmbedBuilder, - PermissionsBitField, + PermissionsBitField } from "discord.js"; - // Configurations -import getEmbedConfig from "../../../../../../../helpers/getEmbedConfig"; - +import getEmbedConfig from "../../../../../../../helpers/getEmbedData"; +import fetchUser from "../../../../../../../helpers/userData"; // Handlers import logger from "../../../../../../../middlewares/logger"; -// Helpers -// Models -import { SlashCommandSubcommandBuilder } from "@discordjs/builders"; -import fetchUser from "../../../../../../../helpers/fetchUser"; +../../../../../../../helpers/userData // 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 707a149..20b5445 100644 --- a/src/plugins/commands/manage/modules/credits/modules/take/index.ts +++ b/src/plugins/commands/manage/modules/credits/modules/take/index.ts @@ -1,23 +1,19 @@ // Dependencies +// Models +import { SlashCommandSubcommandBuilder } from "@discordjs/builders"; import { ChatInputCommandInteraction, EmbedBuilder, PermissionsBitField, } from "discord.js"; - // Configurations -import getEmbedConfig from "../../../../../../../helpers/getEmbedConfig"; - +import getEmbedConfig from "../../../../../../../helpers/getEmbedData"; +// Helpers../../../../../../../helpers/userData +import pluralize from "../../../../../../../helpers/pluralize"; +import fetchUser from "../../../../../../../helpers/userData"; // Handlers import logger from "../../../../../../../middlewares/logger"; -// Helpers -import pluralize from "../../../../../../../helpers/pluralize"; - -// Models -import { SlashCommandSubcommandBuilder } from "@discordjs/builders"; -import fetchUser from "../../../../../../../helpers/fetchUser"; - // Function export default { metadata: { diff --git a/src/plugins/commands/manage/modules/credits/modules/transfer/index.ts b/src/plugins/commands/manage/modules/credits/modules/transfer/index.ts index e8a1c00..2d790b8 100644 --- a/src/plugins/commands/manage/modules/credits/modules/transfer/index.ts +++ b/src/plugins/commands/manage/modules/credits/modules/transfer/index.ts @@ -1,22 +1,18 @@ // Dependencies +// Models +import { SlashCommandSubcommandBuilder } from "@discordjs/builders"; import { ChatInputCommandInteraction, EmbedBuilder, PermissionsBitField, } from "discord.js"; - import mongoose from "mongoose"; - // Configurations -import getEmbedConfig from "../../../../../../../helpers/getEmbedConfig"; - -// Handlers +import getEmbedConfig from "../../../../../../../helpers/getEmbedData"; +import fetchUser from "../../../../../../../helpers/userData"; +// Handlers../../../../../../../helpers/userData import logger from "../../../../../../../middlewares/logger"; -// Models -import { SlashCommandSubcommandBuilder } from "@discordjs/builders"; -import fetchUser from "../../../../../../../helpers/fetchUser"; - // Function export default { metadata: { diff --git a/src/plugins/commands/moderation/modules/prune/index.ts b/src/plugins/commands/moderation/modules/prune/index.ts index e10cf48..b5e909e 100644 --- a/src/plugins/commands/moderation/modules/prune/index.ts +++ b/src/plugins/commands/moderation/modules/prune/index.ts @@ -1,15 +1,13 @@ // Dependencies +import { SlashCommandSubcommandBuilder } from "@discordjs/builders"; import { ChannelType, ChatInputCommandInteraction, EmbedBuilder, PermissionsBitField, } from "discord.js"; - // Configurations -import getEmbedConfig from "../../../../../helpers/getEmbedConfig"; - -import { SlashCommandSubcommandBuilder } from "@discordjs/builders"; +import getEmbedConfig from "../../../../../helpers/getEmbedData"; // Function export default { diff --git a/src/plugins/commands/profile/modules/view/index.ts b/src/plugins/commands/profile/modules/view/index.ts index fe4474b..a17ac18 100644 --- a/src/plugins/commands/profile/modules/view/index.ts +++ b/src/plugins/commands/profile/modules/view/index.ts @@ -1,13 +1,10 @@ // Dependencies -import { CommandInteraction, EmbedBuilder } from "discord.js"; - -// Configurations -import getEmbedConfig from "../../../../../helpers/getEmbedConfig"; - -// Models -import fetchUser from "../../../../../helpers/fetchUser"; - import { SlashCommandSubcommandBuilder } from "@discordjs/builders"; +import { CommandInteraction, EmbedBuilder } from "discord.js"; +// Configurations +import getEmbedConfig from "../../../../../helpers/getEmbedData"; +// Models +import fetchUser from "../../../../../helpers/userData"; import logger from "../../../../../middlewares/logger"; // Function diff --git a/src/plugins/commands/reputation/modules/give/index.ts b/src/plugins/commands/reputation/modules/give/index.ts index 7faa784..44f0155 100644 --- a/src/plugins/commands/reputation/modules/give/index.ts +++ b/src/plugins/commands/reputation/modules/give/index.ts @@ -1,8 +1,8 @@ import { SlashCommandSubcommandBuilder } from "@discordjs/builders"; import { ChatInputCommandInteraction, EmbedBuilder } from "discord.js"; import * as cooldown from "../../../../../helpers/cooldown"; -import fetchUser from "../../../../../helpers/fetchUser"; -import getEmbedConfig from "../../../../../helpers/getEmbedConfig"; +import getEmbedConfig from "../../../../../helpers/getEmbedData"; +import fetchUser from "../../../../../helpers/userData"; import logger from "../../../../../middlewares/logger"; import noSelfReputation from "./components/noSelfReputation"; diff --git a/src/plugins/commands/shop/modules/cpgg/index.ts b/src/plugins/commands/shop/modules/cpgg/index.ts index c868e83..124d12b 100644 --- a/src/plugins/commands/shop/modules/cpgg/index.ts +++ b/src/plugins/commands/shop/modules/cpgg/index.ts @@ -1,3 +1,4 @@ +import { SlashCommandSubcommandBuilder } from "@discordjs/builders"; import axios from "axios"; import { ActionRowBuilder, @@ -8,14 +9,11 @@ import { Message, } from "discord.js"; import { v4 as uuidv4 } from "uuid"; - -import encryption from "../../../../../handlers/encryption"; -import getEmbedConfig from "../../../../../helpers/getEmbedConfig"; -import logger from "../../../../../middlewares/logger"; - -import { SlashCommandSubcommandBuilder } from "@discordjs/builders"; -import fetchUser from "../../../../../helpers/fetchUser"; +import encryption from "../../../../../helpers/encryption"; +import getEmbedConfig from "../../../../../helpers/getEmbedData"; import pluralize from "../../../../../helpers/pluralize"; +import fetchUser from "../../../../../helpers/userData"; +import logger from "../../../../../middlewares/logger"; import apiSchema from "../../../../../models/api"; export default { diff --git a/src/plugins/commands/shop/modules/roles/modules/buy/index.ts b/src/plugins/commands/shop/modules/roles/modules/buy/index.ts index 2ed7cdf..194ccb7 100644 --- a/src/plugins/commands/shop/modules/roles/modules/buy/index.ts +++ b/src/plugins/commands/shop/modules/roles/modules/buy/index.ts @@ -1,25 +1,21 @@ // Dependencies +// Helpers +import { SlashCommandSubcommandBuilder } from "@discordjs/builders"; import { ChatInputCommandInteraction, ColorResolvable, EmbedBuilder, GuildMemberRoleManager, } from "discord.js"; - // Configurations -import getEmbedConfig from "../../../../../../../helpers/getEmbedConfig"; - +import getEmbedConfig from "../../../../../../../helpers/getEmbedData"; +import pluralize from "../../../../../../../helpers/pluralize"; +import fetchUser from "../../../../../../../helpers/userData"; +import logger from "../../../../../../../middlewares/logger"; // Models import guildSchema from "../../../../../../../models/guild"; import shopRolesSchema from "../../../../../../../models/shopRole"; -import logger from "../../../../../../../middlewares/logger"; - -// Helpers -import { SlashCommandSubcommandBuilder } from "@discordjs/builders"; -import fetchUser from "../../../../../../../helpers/fetchUser"; -import pluralize from "../../../../../../../helpers/pluralize"; - // Function export default { metadata: { guildOnly: true, ephemeral: true }, diff --git a/src/plugins/commands/shop/modules/roles/modules/cancel/index.ts b/src/plugins/commands/shop/modules/roles/modules/cancel/index.ts index 225b42a..a2d92d2 100644 --- a/src/plugins/commands/shop/modules/roles/modules/cancel/index.ts +++ b/src/plugins/commands/shop/modules/roles/modules/cancel/index.ts @@ -1,23 +1,19 @@ // Dependencies +// Helpers +import { SlashCommandSubcommandBuilder } from "@discordjs/builders"; import { ChatInputCommandInteraction, EmbedBuilder, GuildMemberRoleManager, } from "discord.js"; - // Configurations -import getEmbedConfig from "../../../../../../../helpers/getEmbedConfig"; - +import getEmbedConfig from "../../../../../../../helpers/getEmbedData"; +import pluralize from "../../../../../../../helpers/pluralize"; +import fetchUser from "../../../../../../../helpers/userData"; +import logger from "../../../../../../../middlewares/logger"; // Models import shopRolesSchema from "../../../../../../../models/shopRole"; -import logger from "../../../../../../../middlewares/logger"; - -// Helpers -import { SlashCommandSubcommandBuilder } from "@discordjs/builders"; -import fetchUser from "../../../../../../../helpers/fetchUser"; -import pluralize from "../../../../../../../helpers/pluralize"; - // Function export default { metadata: { guildOnly: true, ephemeral: true }, diff --git a/src/plugins/commands/utility/modules/about/index.ts b/src/plugins/commands/utility/modules/about/index.ts index 6fee2f3..5dfc051 100644 --- a/src/plugins/commands/utility/modules/about/index.ts +++ b/src/plugins/commands/utility/modules/about/index.ts @@ -1,4 +1,5 @@ // Dependencies +import { SlashCommandSubcommandBuilder } from "@discordjs/builders"; import { ActionRowBuilder, ButtonBuilder, @@ -6,11 +7,8 @@ import { CommandInteraction, EmbedBuilder, } from "discord.js"; - // Configurations -import getEmbedConfig from "../../../../../helpers/getEmbedConfig"; - -import { SlashCommandSubcommandBuilder } from "@discordjs/builders"; +import getEmbedConfig from "../../../../../helpers/getEmbedData"; // Function export default { diff --git a/src/plugins/commands/utility/modules/avatar/index.ts b/src/plugins/commands/utility/modules/avatar/index.ts index 20f8edd..5a935a0 100644 --- a/src/plugins/commands/utility/modules/avatar/index.ts +++ b/src/plugins/commands/utility/modules/avatar/index.ts @@ -1,7 +1,6 @@ -import getEmbedConfig from "../../../../../helpers/getEmbedConfig"; - import { SlashCommandSubcommandBuilder } from "@discordjs/builders"; import { CommandInteraction, EmbedBuilder } from "discord.js"; +import getEmbedConfig from "../../../../../helpers/getEmbedData"; export default { metadata: { guildOnly: false, ephemeral: false }, diff --git a/src/plugins/commands/utility/modules/ping/index.ts b/src/plugins/commands/utility/modules/ping/index.ts index 96aee27..60b5d3f 100644 --- a/src/plugins/commands/utility/modules/ping/index.ts +++ b/src/plugins/commands/utility/modules/ping/index.ts @@ -1,10 +1,8 @@ // Dependencies -import { CommandInteraction, EmbedBuilder } from "discord.js"; - -// Configurations -import getEmbedConfig from "../../../../../helpers/getEmbedConfig"; - import { SlashCommandSubcommandBuilder } from "@discordjs/builders"; +import { CommandInteraction, EmbedBuilder } from "discord.js"; +// Configurations +import getEmbedConfig from "../../../../../helpers/getEmbedData"; // Function export default { diff --git a/src/plugins/commands/utility/modules/stats/index.ts b/src/plugins/commands/utility/modules/stats/index.ts index a90c289..d552c86 100644 --- a/src/plugins/commands/utility/modules/stats/index.ts +++ b/src/plugins/commands/utility/modules/stats/index.ts @@ -1,7 +1,7 @@ -import getEmbedConfig from "../../../../../helpers/getEmbedConfig"; - import { SlashCommandSubcommandBuilder } from "@discordjs/builders"; import { CommandInteraction, EmbedBuilder } from "discord.js"; +import getEmbedConfig from "../../../../../helpers/getEmbedData"; + export default { metadata: { guildOnly: false, ephemeral: false }, diff --git a/src/plugins/events/guildDelete/index.ts b/src/plugins/events/guildDelete/index.ts index 5d7bde0..c3355d5 100644 --- a/src/plugins/events/guildDelete/index.ts +++ b/src/plugins/events/guildDelete/index.ts @@ -1,8 +1,7 @@ // 3rd party dependencies import { Guild } from "discord.js"; - // Dependencies -import dropGuild from "../../../helpers/dropGuild"; +import dropGuild from "../../../helpers/deleteGuildData"; import updatePresence from "../../../helpers/updatePresence"; import { IEventOptions } from "../../../interfaces/EventOptions"; import logger from "../../../middlewares/logger"; diff --git a/src/plugins/events/guildMemberAdd/audits.ts b/src/plugins/events/guildMemberAdd/audits.ts index e5b1e67..7710fac 100644 --- a/src/plugins/events/guildMemberAdd/audits.ts +++ b/src/plugins/events/guildMemberAdd/audits.ts @@ -1,10 +1,8 @@ import { ChannelType, EmbedBuilder, GuildMember } from "discord.js"; +import getEmbedConfig from "../../../helpers/getEmbedData"; import logger from "../../../middlewares/logger"; - import guildSchema from "../../../models/guild"; -import getEmbedConfig from "../../../helpers/getEmbedConfig"; - export default { execute: async (member: GuildMember) => { const { client, guild } = member; diff --git a/src/plugins/events/guildMemberAdd/index.ts b/src/plugins/events/guildMemberAdd/index.ts index a5efdb9..d65f42a 100644 --- a/src/plugins/events/guildMemberAdd/index.ts +++ b/src/plugins/events/guildMemberAdd/index.ts @@ -1,16 +1,13 @@ // 3rd party dependencies import { GuildMember } from "discord.js"; - -// Dependencies -import fetchUser from "../../../helpers/fetchUser"; import updatePresence from "../../../helpers/updatePresence"; +// Dependencies +import fetchUser from "../../../helpers/userData"; +import { IEventOptions } from "../../../interfaces/EventOptions"; import logger from "../../../middlewares/logger"; - import audits from "./audits"; import joinMessage from "./joinMessage"; -import { IEventOptions } from "../../../interfaces/EventOptions"; - export const options: IEventOptions = { type: "on", }; diff --git a/src/plugins/events/guildMemberAdd/joinMessage.ts b/src/plugins/events/guildMemberAdd/joinMessage.ts index 7bf5889..a50dca6 100644 --- a/src/plugins/events/guildMemberAdd/joinMessage.ts +++ b/src/plugins/events/guildMemberAdd/joinMessage.ts @@ -1,9 +1,7 @@ import { EmbedBuilder, GuildMember, TextChannel } from "discord.js"; - +import getEmbedConfig from "../../../helpers/getEmbedData"; import guildSchema from "../../../models/guild"; -import getEmbedConfig from "../../../helpers/getEmbedConfig"; - export default { execute: async (member: GuildMember) => { const { footerText, footerIcon, successColor } = await getEmbedConfig( diff --git a/src/plugins/events/guildMemberRemove/audits.ts b/src/plugins/events/guildMemberRemove/audits.ts index 522e132..72391fa 100644 --- a/src/plugins/events/guildMemberRemove/audits.ts +++ b/src/plugins/events/guildMemberRemove/audits.ts @@ -1,10 +1,8 @@ import { ChannelType, EmbedBuilder, GuildMember } from "discord.js"; +import getEmbedConfig from "../../../helpers/getEmbedData"; import logger from "../../../middlewares/logger"; - import guildSchema from "../../../models/guild"; -import getEmbedConfig from "../../../helpers/getEmbedConfig"; - export default { execute: async (member: GuildMember) => { const { client, guild } = member; diff --git a/src/plugins/events/guildMemberRemove/index.ts b/src/plugins/events/guildMemberRemove/index.ts index 5ee1bec..9c1bcbf 100644 --- a/src/plugins/events/guildMemberRemove/index.ts +++ b/src/plugins/events/guildMemberRemove/index.ts @@ -1,8 +1,7 @@ // 3rd party dependencies import { GuildMember } from "discord.js"; - // Dependencies -import dropUser from "../../../helpers/dropUser"; +import dropUser from "../../../helpers/deleteUserData"; import updatePresence from "../../../helpers/updatePresence"; import { IEventOptions } from "../../../interfaces/EventOptions"; import logger from "../../../middlewares/logger"; diff --git a/src/plugins/events/guildMemberRemove/leaveMessage.ts b/src/plugins/events/guildMemberRemove/leaveMessage.ts index 8792af5..7e0cc09 100644 --- a/src/plugins/events/guildMemberRemove/leaveMessage.ts +++ b/src/plugins/events/guildMemberRemove/leaveMessage.ts @@ -1,9 +1,7 @@ import { EmbedBuilder, GuildMember, TextChannel } from "discord.js"; - +import getEmbedConfig from "../../../helpers/getEmbedData"; import guildSchema from "../../../models/guild"; -import getEmbedConfig from "../../../helpers/getEmbedConfig"; - export default { execute: async (member: GuildMember) => { const { footerText, footerIcon, errorColor } = await getEmbedConfig( diff --git a/src/plugins/events/interactionCreate/audits.ts b/src/plugins/events/interactionCreate/audits.ts index e8de61c..e4ebd19 100644 --- a/src/plugins/events/interactionCreate/audits.ts +++ b/src/plugins/events/interactionCreate/audits.ts @@ -1,10 +1,8 @@ import { BaseInteraction, EmbedBuilder, TextChannel } from "discord.js"; +import getEmbedConfig from "../../../helpers/getEmbedData"; import logger from "../../../middlewares/logger"; - import guildSchema from "../../../models/guild"; -import getEmbedConfig from "../../../helpers/getEmbedConfig"; - export default { execute: async (interaction: BaseInteraction) => { if (interaction === null) return; diff --git a/src/plugins/events/interactionCreate/handlers/index.ts b/src/plugins/events/interactionCreate/handlers/index.ts index d6fad1b..d596913 100644 --- a/src/plugins/events/interactionCreate/handlers/index.ts +++ b/src/plugins/events/interactionCreate/handlers/index.ts @@ -5,8 +5,7 @@ import { EmbedBuilder, } from "discord.js"; import capitalizeFirstLetter from "../../../../helpers/capitalizeFirstLetter"; -import getEmbedConfig from "../../../../helpers/getEmbedConfig"; - +import getEmbedConfig from "../../../../helpers/getEmbedData"; import button from "./button"; import command from "./command"; diff --git a/src/plugins/events/messageCreate/modules/credits/index.ts b/src/plugins/events/messageCreate/modules/credits/index.ts index 3e12e6c..439c605 100644 --- a/src/plugins/events/messageCreate/modules/credits/index.ts +++ b/src/plugins/events/messageCreate/modules/credits/index.ts @@ -1,10 +1,8 @@ import { ChannelType, Message } from "discord.js"; -import logger from "../../../../../middlewares/logger"; - -import fetchGuild from "../../../../../helpers/fetchGuild"; -import fetchUser from "../../../../../helpers/fetchUser"; - import * as cooldown from "../../../../../helpers/cooldown"; +import fetchGuild from "../../../../../helpers/fetchGuild"; +import fetchUser from "../../../../../helpers/userData"; +import logger from "../../../../../middlewares/logger"; 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 0d4bf6b..5224a7a 100644 --- a/src/plugins/events/messageCreate/modules/points/index.ts +++ b/src/plugins/events/messageCreate/modules/points/index.ts @@ -1,11 +1,9 @@ +import { ChannelType, Message } from "discord.js"; +import * as cooldown from "../../../../../helpers/cooldown"; +import fetchGuild from "../../../../../helpers/fetchGuild"; +import fetchUser from "../../../../../helpers/userData"; import logger from "../../../../../middlewares/logger"; -import * as cooldown from "../../../../../helpers/cooldown"; - -import fetchGuild from "../../../../../helpers/fetchGuild"; -import fetchUser from "../../../../../helpers/fetchUser"; - -import { ChannelType, Message } from "discord.js"; export default { execute: async (message: Message) => { const { guild, author, content, channel } = message; diff --git a/src/plugins/events/messageDelete/audits.ts b/src/plugins/events/messageDelete/audits.ts index 781897b..8c9fba8 100644 --- a/src/plugins/events/messageDelete/audits.ts +++ b/src/plugins/events/messageDelete/audits.ts @@ -1,10 +1,8 @@ import { EmbedBuilder, Message, TextChannel } from "discord.js"; +import getEmbedConfig from "../../../helpers/getEmbedData"; import logger from "../../../middlewares/logger"; - import guildSchema from "../../../models/guild"; -import getEmbedConfig from "../../../helpers/getEmbedConfig"; - export default { execute: async (message: Message) => { if (message === null) return; diff --git a/src/plugins/events/messageUpdate/audits.ts b/src/plugins/events/messageUpdate/audits.ts index 4bd79a2..81ab688 100644 --- a/src/plugins/events/messageUpdate/audits.ts +++ b/src/plugins/events/messageUpdate/audits.ts @@ -1,11 +1,9 @@ /* eslint-disable no-loops/no-loops */ import { EmbedBuilder, Message, TextChannel } from "discord.js"; +import getEmbedConfig from "../../../helpers/getEmbedData"; import logger from "../../../middlewares/logger"; - import guildSchema from "../../../models/guild"; -import getEmbedConfig from "../../../helpers/getEmbedConfig"; - export default { execute: async (oldMessage: Message, newMessage: Message) => { if (oldMessage === null) return; diff --git a/src/plugins/events/ready/index.ts b/src/plugins/events/ready/index.ts index 2831375..e45fd39 100644 --- a/src/plugins/events/ready/index.ts +++ b/src/plugins/events/ready/index.ts @@ -1,12 +1,11 @@ // Dependencies import { Client } from "discord.js"; -import logger from "../../../middlewares/logger"; - // Helpers -import deployCommands from "../../../handlers/deployCommands"; -import devMode from "../../../handlers/devMode"; +import deployCommands from "../../../helpers/deployCommands"; +import devMode from "../../../helpers/devMode"; import updatePresence from "../../../helpers/updatePresence"; import { IEventOptions } from "../../../interfaces/EventOptions"; +import logger from "../../../middlewares/logger"; export const options: IEventOptions = { type: "once",