diff --git a/src/commands-contextmenu/updateuser.ts b/src/commands-contextmenu/updateuser.ts index 387aa1e..6f9f9fc 100644 --- a/src/commands-contextmenu/updateuser.ts +++ b/src/commands-contextmenu/updateuser.ts @@ -1,5 +1,5 @@ import { ApplicationCommandType, ContextMenuCommandBuilder, PermissionFlagsBits, userMention } from "discord.js" -import { color, devMessage, hypixelGuildID } from "config/options" +import { embedColor, devMessage, hypixelGuildID } from "config/options" import { ContextMenu } from "interfaces" import verifySchema from "schemas/verifySchema" import { getGuild, getHeadURL, getIGN } from "utils/Hypixel" @@ -23,7 +23,6 @@ export = { const user = await interaction.guild!.members.fetch(targetId) const usermentioned = userMention(user.user.id) const verifyData = await verifySchema.findOne({ userID: user.user.id }) - const embedColor = Number(color.replace("#", "0x")) if (!verifyData) { await interaction.editReply({ diff --git a/src/commands/ban.ts b/src/commands/ban.ts index 60cad65..360b0cf 100644 --- a/src/commands/ban.ts +++ b/src/commands/ban.ts @@ -1,6 +1,6 @@ import { SlashCommandBuilder, PermissionFlagsBits, userMention, GuildMember, } from "discord.js" import { admin, helper } from "config/roles" -import { color, devMessage } from "config/options" +import { embedColor, devMessage } from "config/options" import { Command } from "interfaces" import logToChannel from "utils/functions/logtochannel" @@ -47,7 +47,6 @@ export = { const member = interaction.options.getMember("user") as GuildMember | null const reason = interaction.options.getString("reason") ?? "No reason provided." const messageDeletionDays = interaction.options.getNumber("messagedeletiondays") ?? 0 - const embedColor = Number(color.replace("#", "0x")) if (!member) { await interaction.editReply("You must specify a user.") diff --git a/src/commands/botinfo.ts b/src/commands/botinfo.ts index f525b91..49f563e 100644 --- a/src/commands/botinfo.ts +++ b/src/commands/botinfo.ts @@ -1,6 +1,6 @@ import { SlashCommandBuilder } from "discord.js" import { Command } from "interfaces" -import { color, devMessage } from "config/options" +import { embedColor, devMessage } from "config/options" import os from "os" import { execSync } from "child_process" const { dependencies, devDependencies } = require("../../package.json") @@ -17,7 +17,6 @@ export = { .setDMPermission(false), async execute(interaction, client) { - const embedColor = Number(color.replace("#", "0x")) const castedDeps = dependencies as { [key: string]: string } const castedDevDeps = devDependencies as { [key: string]: string } let osInfo: string diff --git a/src/commands/check.ts b/src/commands/check.ts index 665fb10..78f5264 100644 --- a/src/commands/check.ts +++ b/src/commands/check.ts @@ -1,6 +1,6 @@ import { SlashCommandBuilder } from "discord.js" import { bwfkdr, bwstars, bwwins, swstars, swkdr, duelswins, duelswlr } from "config/reqs" -import { color, devMessage } from "config/options" +import { embedColor, devMessage } from "config/options" import { hypixelLevel, bedwarsLevel, skywarsLevel, getUUID, getPlayer, getGuild, getHeadURL } from "utils/Hypixel" import { Command } from "interfaces" @@ -27,7 +27,6 @@ export = { await interaction.deferReply({}) const ign = interaction.options.getString("ign")! - const embedColor = Number(color.replace("#", "0x")) await interaction.editReply({ embeds: [{ diff --git a/src/commands/clear.ts b/src/commands/clear.ts index cc8acb7..83bd861 100644 --- a/src/commands/clear.ts +++ b/src/commands/clear.ts @@ -1,5 +1,5 @@ import { SlashCommandBuilder, PermissionFlagsBits, TextChannel, channelMention, userMention } from "discord.js" -import { color } from "config/options" +import { embedColor } from "config/options" import { Command } from "interfaces" import logToChannel from "utils/functions/logtochannel" @@ -26,7 +26,6 @@ export = { const amount = interaction.options.getInteger("amount")! const channel = interaction.channel as TextChannel - const embedColor = Number(color.replace("#", "0x")) if (amount < 1 || amount > 100) { await interaction.editReply({ diff --git a/src/commands/config.ts b/src/commands/config.ts index 2f5ed7a..7922af7 100644 --- a/src/commands/config.ts +++ b/src/commands/config.ts @@ -1,5 +1,5 @@ import { SlashCommandBuilder, PermissionFlagsBits } from "discord.js" -import { color } from "config/options" +import { embedColor } from "config/options" import settings from "schemas/settingsSchema" import mongoose from "mongoose" import { Command } from "interfaces" @@ -37,7 +37,6 @@ export = { const setting = interaction.options.getString("setting") const value = interaction.options.getString("value") - const embedColor = Number(color.replace("#", "0x")) const settingsData = await settings.findOne({ name: setting }) if (!settingsData) { diff --git a/src/commands/counting.ts b/src/commands/counting.ts index fa3e013..9fd6bd9 100644 --- a/src/commands/counting.ts +++ b/src/commands/counting.ts @@ -1,5 +1,5 @@ import { ChannelType, PermissionFlagsBits, SlashCommandBuilder } from "discord.js" -import { color, devMessage } from "config/options" +import { embedColor, devMessage } from "config/options" import { Command } from "interfaces" import setup from "./counting/setup" import ban from "./counting/ban" @@ -54,7 +54,6 @@ export = { async execute(interaction) { const subcommand = interaction.options.getSubcommand() - const embedColor = Number(color.replace("#", "0x")) if (subcommand === "setup") { setup(interaction) diff --git a/src/commands/counting/ban.ts b/src/commands/counting/ban.ts index 848f7b2..f560420 100644 --- a/src/commands/counting/ban.ts +++ b/src/commands/counting/ban.ts @@ -1,10 +1,9 @@ import { ChatInputCommandInteraction, GuildMember, userMention } from "discord.js" import { countingBanned } from "config/roles" -import { color, devMessage } from "config/options" +import { embedColor, devMessage } from "config/options" export default async function ban(interaction: ChatInputCommandInteraction): Promise { const member = interaction.options.getMember("user")! as GuildMember - const embedColor = Number(color.replace("#", "0x")) if (member.roles.cache.has(countingBanned)) { await interaction.reply({ diff --git a/src/commands/counting/setup.ts b/src/commands/counting/setup.ts index de7c4da..6376a2c 100644 --- a/src/commands/counting/setup.ts +++ b/src/commands/counting/setup.ts @@ -1,13 +1,12 @@ import { ChatInputCommandInteraction, TextChannel, channelMention } from "discord.js" import settingsSchema from "schemas/settingsSchema" -import { color, devMessage } from "config/options" +import { embedColor, devMessage } from "config/options" import mongoose from "mongoose" export default async function setup(interaction: ChatInputCommandInteraction): Promise { await interaction.deferReply() const channel = interaction.options.getChannel("channel") as TextChannel - const embedColor = Number(color.replace("#", "0x")) if (await settingsSchema.findOne({ name: "counting" })) { await settingsSchema.findOneAndUpdate( diff --git a/src/commands/counting/unban.ts b/src/commands/counting/unban.ts index 3e7bf36..bba13fd 100644 --- a/src/commands/counting/unban.ts +++ b/src/commands/counting/unban.ts @@ -1,10 +1,9 @@ import { ChatInputCommandInteraction, GuildMember, userMention } from "discord.js" import { countingBanned } from "config/roles" -import { color, devMessage } from "config/options" +import { embedColor, devMessage } from "config/options" export default async function ban(interaction: ChatInputCommandInteraction): Promise { const member = interaction.options.getMember("user")! as GuildMember - const embedColor = Number(color.replace("#", "0x")) if (!member.roles.cache.has(countingBanned)) { await interaction.reply({ diff --git a/src/commands/forceunverify.ts b/src/commands/forceunverify.ts index dc0fad2..c50127a 100644 --- a/src/commands/forceunverify.ts +++ b/src/commands/forceunverify.ts @@ -1,5 +1,5 @@ import { SlashCommandBuilder, PermissionFlagsBits, userMention, GuildMember } from "discord.js" -import { color, devMessage } from "config/options" +import { embedColor, devMessage } from "config/options" import verify from "schemas/verifySchema" import { Command } from "interfaces" import roleManage from "utils/functions/rolesmanage" @@ -26,7 +26,6 @@ export = { async execute(interaction) { const member = interaction.options.getMember("user") as GuildMember - const embedColor = Number(color.replace("#", "0x")) const verifiedUser = await verify.findOne({ userID: member.user.id }) const mod = interaction.user diff --git a/src/commands/forceupdate.ts b/src/commands/forceupdate.ts index 317b166..461c57e 100644 --- a/src/commands/forceupdate.ts +++ b/src/commands/forceupdate.ts @@ -1,6 +1,6 @@ import { SlashCommandBuilder, PermissionFlagsBits, userMention, GuildMember } from "discord.js" import { getGuild, getHeadURL, getIGN } from "utils/Hypixel" -import { hypixelGuildID, color, devMessage } from "config/options" +import { hypixelGuildID, embedColor, devMessage } from "config/options" import verify from "schemas/verifySchema" import { Command } from "interfaces" import roleManage from "utils/functions/rolesmanage" @@ -29,7 +29,6 @@ export = { const user = interaction.options.getMember("user") as GuildMember const usermentioned = userMention(user.user.id) const verifyData = await verify.findOne({ userID: user.user.id }) - const embedColor = Number(color.replace("#", "0x")) if (!verifyData) { await interaction.editReply({ diff --git a/src/commands/forceverify.ts b/src/commands/forceverify.ts index cad5c31..d623733 100644 --- a/src/commands/forceverify.ts +++ b/src/commands/forceverify.ts @@ -1,6 +1,6 @@ import { SlashCommandBuilder, PermissionFlagsBits, GuildMember, userMention } from "discord.js" import { getUUID, getPlayer, getGuild, getHeadURL } from "utils/Hypixel" -import { color, hypixelGuildID, devMessage } from "config/options" +import { embedColor, hypixelGuildID, devMessage } from "config/options" import verify from "schemas/verifySchema" import mongoose from "mongoose" import roleManage from "utils/functions/rolesmanage" @@ -35,7 +35,6 @@ export = { const user = interaction.options.getMember("user") as GuildMember const ign = interaction.options.getString("ign") const mod = interaction.user - const embedColor = Number(color.replace("#", "0x")) const verifyData = await verify.findOne({ userID: user.user.id }) if (verifyData) { diff --git a/src/commands/guild.ts b/src/commands/guild.ts index 006f6cf..eb843f9 100644 --- a/src/commands/guild.ts +++ b/src/commands/guild.ts @@ -1,5 +1,5 @@ import { SlashCommandBuilder } from "discord.js" -import { color, devMessage } from "config/options" +import { embedColor, devMessage } from "config/options" import { Command } from "interfaces" import guildMember from "./guild/member" import guildInfo from "./guild/info" @@ -79,7 +79,6 @@ export = { async execute(interaction) { const subcommand = interaction.options.getSubcommand() - const embedColor = Number(color.replace("#", "0x")) if (subcommand === "member") { await guildMember(interaction) diff --git a/src/commands/guild/info.ts b/src/commands/guild/info.ts index 373b71c..b7eba2f 100644 --- a/src/commands/guild/info.ts +++ b/src/commands/guild/info.ts @@ -1,5 +1,5 @@ import { getUUID, getIGN, getPlayer, getGuild, guildLevel } from "utils/Hypixel" -import { color, devMessage } from "config/options" +import { embedColor, devMessage } from "config/options" import { ChatInputCommandInteraction } from "discord.js" import { GuildData } from "interfaces" @@ -8,7 +8,6 @@ export default async function guildInfo(interaction: ChatInputCommandInteraction const query = interaction.options.getString("query")! const type = interaction.options.getString("type") || "ign" - const embedColor = Number(color.replace("#", "0x")) let guild: GuildData | null if (type === "ign") { diff --git a/src/commands/guild/member.ts b/src/commands/guild/member.ts index 2ff3fc1..13bffe9 100644 --- a/src/commands/guild/member.ts +++ b/src/commands/guild/member.ts @@ -1,12 +1,11 @@ import { getUUID, getPlayer, getGuild, getHeadURL } from "utils/Hypixel" -import { color, devMessage } from "config/options" +import { embedColor, devMessage } from "config/options" import { ChatInputCommandInteraction } from "discord.js" export default async function guildMember(interaction: ChatInputCommandInteraction): Promise { await interaction.deferReply() const ign = interaction.options.getString("ign")! - const embedColor = Number(color.replace("#", "0x")) await interaction.editReply({ embeds: [{ diff --git a/src/commands/guild/top.ts b/src/commands/guild/top.ts index 64a8e98..3851f9c 100644 --- a/src/commands/guild/top.ts +++ b/src/commands/guild/top.ts @@ -1,5 +1,5 @@ import { getUUID, getPlayer, getGuild, getIGN } from "utils/Hypixel" -import { color, devMessage } from "config/options" +import { embedColor, devMessage } from "config/options" import { ChannelType, ChatInputCommandInteraction } from "discord.js" import { GuildData } from "interfaces" import { redis } from "utils/Illegitimate" @@ -10,7 +10,6 @@ export default async function guildTop(interaction: ChatInputCommandInteraction) const query = interaction.options.getString("query")! const type = interaction.options.getString("type") || "ign" let amount = interaction.options.getNumber("amount") || 10 - const embedColor = Number(color.replace("#", "0x")) let guild: GuildData | null if (interaction.channel!.type === ChannelType.DM) { diff --git a/src/commands/help.ts b/src/commands/help.ts index 30bedcd..6154aa1 100644 --- a/src/commands/help.ts +++ b/src/commands/help.ts @@ -1,5 +1,5 @@ import { SlashCommandBuilder } from "discord.js" -import { color, devMessage } from "config/options" +import { embedColor, devMessage } from "config/options" import { Command } from "interfaces" export = { @@ -55,8 +55,6 @@ export = { } } - const embedColor = Number(color.replace("#", "0x")) - await interaction.editReply({ embeds: [{ title: "Commands", diff --git a/src/commands/instructions.ts b/src/commands/instructions.ts index d82c8bf..1cc9e11 100644 --- a/src/commands/instructions.ts +++ b/src/commands/instructions.ts @@ -1,5 +1,5 @@ import { SlashCommandBuilder, PermissionFlagsBits } from "discord.js" -import { color, devMessage, instructionsgif } from "config/options" +import { embedColor, devMessage, instructionsgif } from "config/options" import { Command } from "interfaces" export = { @@ -15,8 +15,6 @@ export = { .setDMPermission(false), async execute(interaction) { - const embedColor = Number(color.replace("#", "0x")) - await interaction.reply({ embeds: [{ title: "Verification", diff --git a/src/commands/kick.ts b/src/commands/kick.ts index e76d281..399dfb3 100644 --- a/src/commands/kick.ts +++ b/src/commands/kick.ts @@ -1,6 +1,6 @@ import { SlashCommandBuilder, PermissionFlagsBits, userMention, GuildMember } from "discord.js" import { admin, helper } from "config/roles" -import { color, devMessage } from "config/options" +import { embedColor, devMessage } from "config/options" import { Command } from "interfaces" import logToChannel from "utils/functions/logtochannel" @@ -32,8 +32,6 @@ export = { const member = interaction.options.getMember("member") as GuildMember const reason = interaction.options.getString("reason") ?? "No reason provided." - const embedColor = Number(color.replace("#", "0x")) - const mod = await interaction.guild!.members.fetch(interaction.user.id) const memberRoles = member.roles.cache.map(role => role.id) const modRoles = mod.roles.cache.map(role => role.id) diff --git a/src/commands/ping.ts b/src/commands/ping.ts index 984c80e..a203493 100644 --- a/src/commands/ping.ts +++ b/src/commands/ping.ts @@ -1,5 +1,5 @@ import { SlashCommandBuilder } from "discord.js" -import { color, devMessage } from "config/options" +import { embedColor, devMessage } from "config/options" import { Command } from "interfaces" export = { @@ -15,9 +15,6 @@ export = { async execute(interaction, client) { await interaction.deferReply() - - const embedColor = Number(color.replace("#", "0x")) - await interaction.editReply({ embeds: [{ description: "Ping of the bot is " + client.ws.ping + "ms.", diff --git a/src/commands/pp.ts b/src/commands/pp.ts index cb3fe29..05bc3d7 100644 --- a/src/commands/pp.ts +++ b/src/commands/pp.ts @@ -1,5 +1,5 @@ import { SlashCommandBuilder, User } from "discord.js" -import { color } from "config/options" +import { embedColor } from "config/options" import { Command } from "interfaces" import env from "utils/Env" @@ -22,7 +22,6 @@ export = { async execute(interaction) { const user = (interaction.options.getUser("user") || interaction.user) as User - const embedColor = Number(color.replace("#", "0x")) let size: number if (user.id === env.prod.dev) { diff --git a/src/commands/remove.ts b/src/commands/remove.ts index b7b76dc..4bd910a 100644 --- a/src/commands/remove.ts +++ b/src/commands/remove.ts @@ -1,5 +1,5 @@ import { SlashCommandBuilder, PermissionFlagsBits, userMention } from "discord.js" -import { color, devMessage } from "config/options" +import { embedColor, devMessage } from "config/options" import waitinglistSchema from "schemas/waitinglistSchema" import { Command } from "interfaces" import logToChannel from "utils/functions/logtochannel" @@ -34,8 +34,6 @@ export = { const user = interaction.options.getUser("user")! const reason = interaction.options.getString("reason") ?? "No reason provided." const mod = interaction.user! - const embedColor = Number(color.replace("#", "0x")) - const waitinglist = await waitinglistSchema.findOne({ userID: user.id }) if (!waitinglist) { diff --git a/src/commands/reqs.ts b/src/commands/reqs.ts index b72a0f3..0c9a25b 100644 --- a/src/commands/reqs.ts +++ b/src/commands/reqs.ts @@ -1,5 +1,5 @@ import { SlashCommandBuilder } from "discord.js" -import { color, devMessage } from "config/options" +import { embedColor, devMessage } from "config/options" import { bwfkdr, bwstars, bwwins, swstars, swkdr, duelswins, duelswlr } from "config/reqs" import { Command } from "interfaces" @@ -15,8 +15,6 @@ export = { .setDMPermission(false), async execute(interaction) { - const embedColor = Number(color.replace("#", "0x")) - await interaction.reply({ embeds: [{ title: "Requirements", diff --git a/src/commands/send.ts b/src/commands/send.ts index 0abcff8..d096ad2 100644 --- a/src/commands/send.ts +++ b/src/commands/send.ts @@ -1,5 +1,5 @@ import { SlashCommandBuilder, PermissionFlagsBits, ChannelType, TextChannel } from "discord.js" -import { color, devMessage } from "config/options" +import { embedColor, devMessage } from "config/options" import { Command } from "interfaces" export = { @@ -31,7 +31,6 @@ export = { const message = interaction.options.getString("message")! const channel = (interaction.options.getChannel("channel") || interaction.channel) as TextChannel - const embedColor = Number(color.replace("#", "0x")) channel.send({ embeds: [{ diff --git a/src/commands/setnick.ts b/src/commands/setnick.ts index 3d56aa1..33ef2db 100644 --- a/src/commands/setnick.ts +++ b/src/commands/setnick.ts @@ -1,5 +1,5 @@ import { SlashCommandBuilder, PermissionFlagsBits, userMention, GuildMember } from "discord.js" -import { color, devMessage } from "config/options" +import { embedColor, devMessage } from "config/options" import { Command } from "interfaces" import logToChannel from "utils/functions/logtochannel" @@ -30,7 +30,6 @@ export = { async execute(interaction) { const member = interaction.options.getMember("user") as GuildMember const nickname = interaction.options.getString("nickname") - const embedColor = Number(color.replace("#", "0x")) if (!member.manageable) { interaction.reply({ diff --git a/src/commands/setup.ts b/src/commands/setup.ts index 813e4f0..97e6d3e 100644 --- a/src/commands/setup.ts +++ b/src/commands/setup.ts @@ -1,5 +1,5 @@ import { SlashCommandBuilder, PermissionFlagsBits, ButtonBuilder, ActionRowBuilder, ButtonStyle, ChannelType, TextChannel } from "discord.js" -import { color, devMessage } from "config/options" +import { embedColor, devMessage } from "config/options" import { Command } from "interfaces" export = { @@ -78,7 +78,6 @@ export = { async execute(interaction) { const subcommand = interaction.options.getSubcommand() const channel = interaction.options.getChannel("channel") as TextChannel - const embedColor = Number(color.replace("#", "0x")) let title = "" let description = "" let customId = "" diff --git a/src/commands/slowmode.ts b/src/commands/slowmode.ts index bc73e3a..1401370 100644 --- a/src/commands/slowmode.ts +++ b/src/commands/slowmode.ts @@ -1,5 +1,5 @@ import { SlashCommandBuilder, PermissionFlagsBits, ChannelType, TextChannel, channelMention, userMention } from "discord.js" -import { color, devMessage } from "config/options" +import { embedColor, devMessage } from "config/options" import { Command } from "interfaces" import logToChannel from "utils/functions/logtochannel" @@ -31,7 +31,6 @@ export = { const seconds = interaction.options.getInteger("seconds") ?? 5 const channel = (interaction.options.getChannel("channel") || interaction.channel) as TextChannel - const embedColor = Number(color.replace("#", "0x")) if (seconds > 21600) { await channel.setRateLimitPerUser(21600) diff --git a/src/commands/snipe.ts b/src/commands/snipe.ts index df4d5f4..40b94e7 100644 --- a/src/commands/snipe.ts +++ b/src/commands/snipe.ts @@ -1,7 +1,7 @@ import { GuildMember, SlashCommandBuilder } from "discord.js" import snipeCacheSchema from "schemas/snipeCacheSchema" import { Command } from "interfaces" -import { color } from "config/options" +import { embedColor } from "config/options" import { SnipeCache } from "typings" export = { @@ -28,7 +28,6 @@ export = { userid: member.user.id, channelid: interaction.channel!.id }) - const embedColor = Number(color.replace("#", "0x")) const messages: string[] = [] if (!snipeCache.length) { diff --git a/src/commands/staff.ts b/src/commands/staff.ts index c7993fd..40f3277 100644 --- a/src/commands/staff.ts +++ b/src/commands/staff.ts @@ -1,5 +1,5 @@ import { SlashCommandBuilder, PermissionFlagsBits } from "discord.js" -import { color, devMessage } from "config/options" +import { embedColor, devMessage } from "config/options" import { Command } from "interfaces" import help from "./staff/help" import beast from "./staff/beast" @@ -47,7 +47,6 @@ export = { async execute(interaction, client) { const subcommand = interaction.options.getSubcommand() - const embedColor = Number(color.replace("#", "0x")) if (subcommand === "help") { help(interaction, client) diff --git a/src/commands/staff/beast.ts b/src/commands/staff/beast.ts index 1d4efe5..4ad361e 100644 --- a/src/commands/staff/beast.ts +++ b/src/commands/staff/beast.ts @@ -1,5 +1,5 @@ import { bwwins, beastbwfkdr, beastbwstars, beastswkdr, beastswstars, beastduelswins, duelswlr } from "config/reqs" -import { color, devMessage } from "config/options" +import { embedColor, devMessage } from "config/options" import { hypixelLevel, bedwarsLevel, skywarsLevel, getUUID, getPlayer, getGuild, getHeadURL } from "utils/Hypixel" import { ChatInputCommandInteraction } from "discord.js" @@ -7,7 +7,6 @@ export default async function beast(interaction: ChatInputCommandInteraction): P await interaction.deferReply() const ign = interaction.options.getString("ign")! - const embedColor = Number(color.replace("#", "0x")) if (!ign) { await interaction.editReply("Please provide a player's IGN.") diff --git a/src/commands/staff/help.ts b/src/commands/staff/help.ts index ddcfd5e..91141e1 100644 --- a/src/commands/staff/help.ts +++ b/src/commands/staff/help.ts @@ -1,5 +1,5 @@ import { ChatInputCommandInteraction } from "discord.js" -import { color, devMessage } from "config/options" +import { embedColor, devMessage } from "config/options" import { ExtendedClient as Client } from "utils/Client" export default async function help(interaction: ChatInputCommandInteraction, client: Client): Promise { @@ -42,8 +42,6 @@ export default async function help(interaction: ChatInputCommandInteraction, cli } } - const embedColor = Number(color.replace("#", "0x")) - await interaction.editReply({ embeds: [{ title: "Commands", diff --git a/src/commands/staff/prune.ts b/src/commands/staff/prune.ts index b8d1dc5..bfde038 100644 --- a/src/commands/staff/prune.ts +++ b/src/commands/staff/prune.ts @@ -1,5 +1,5 @@ import { ActionRowBuilder, ButtonBuilder, ButtonStyle, ChatInputCommandInteraction } from "discord.js" -import { color, devMessage } from "config/options" +import { embedColor, devMessage } from "config/options" import env from "utils/Env" export default async function prune(interaction: ChatInputCommandInteraction): Promise { @@ -10,7 +10,6 @@ export default async function prune(interaction: ChatInputCommandInteraction): P return } - const embedColor = Number(color.replace("#", "0x")) const members = await interaction.guild!.members.fetch() await interaction.editReply({ diff --git a/src/commands/staff/updatediscordroles.ts b/src/commands/staff/updatediscordroles.ts index c3dd708..9f3e79a 100644 --- a/src/commands/staff/updatediscordroles.ts +++ b/src/commands/staff/updatediscordroles.ts @@ -1,5 +1,5 @@ import verify from "schemas/verifySchema" -import { color, hypixelGuildID } from "config/options" +import { embedColor, hypixelGuildID } from "config/options" import colorLog from "utils/functions/colors" import { verifyTick } from "config/roles" import roleManage from "utils/functions/rolesmanage" @@ -9,10 +9,10 @@ import { getGuild } from "utils/Hypixel" import { GuildData } from "interfaces" export default async function updateDiscordRoles(interaction: ChatInputCommandInteraction): Promise { - const discordMember = interaction.member as GuildMember - const embedColor = Number(color.replace("#", "0x")) await interaction.deferReply() + const discordMember = interaction.member as GuildMember + if (discordMember.user.id !== env.prod.dev) { await interaction.editReply({ embeds: [{ diff --git a/src/commands/timeout.ts b/src/commands/timeout.ts index bac193b..829d810 100644 --- a/src/commands/timeout.ts +++ b/src/commands/timeout.ts @@ -1,5 +1,5 @@ import { SlashCommandBuilder, PermissionFlagsBits, userMention, ChatInputCommandInteraction, GuildMember } from "discord.js" -import { color, devMessage } from "config/options" +import { embedColor, devMessage } from "config/options" import { Command } from "interfaces" import ms from "ms" import logToChannel from "utils/functions/logtochannel" @@ -40,7 +40,6 @@ export = { const timeString = interaction.options.getString("time")! const reason = interaction.options.getString("reason") || "No reason provided" const mod = interaction.member! as GuildMember - const embedColor = Number(color.replace("#", "0x")) const time = ms(timeString) const { default: prettyMs } = await import("pretty-ms") const prettyTime = prettyMs(time, { verbose: true }) diff --git a/src/commands/unban.ts b/src/commands/unban.ts index ebb6477..87420af 100644 --- a/src/commands/unban.ts +++ b/src/commands/unban.ts @@ -1,5 +1,5 @@ import { SlashCommandBuilder, PermissionFlagsBits, userMention, User } from "discord.js" -import { color, devMessage } from "config/options" +import { embedColor, devMessage } from "config/options" import { Command } from "interfaces" import logToChannel from "utils/functions/logtochannel" @@ -34,7 +34,6 @@ export = { const userid = interaction.options.getString("user")! const reason = interaction.options.getString("reason") || "No reason provided" const mod = interaction.user - const embedColor = Number(color.replace("#", "0x")) let user: User if (userid === "none") { diff --git a/src/commands/update.ts b/src/commands/update.ts index 62e6f0e..ad39ab6 100644 --- a/src/commands/update.ts +++ b/src/commands/update.ts @@ -1,7 +1,7 @@ import { GuildMember, SlashCommandBuilder } from "discord.js" import { getGuild, getIGN, getHeadURL } from "utils/Hypixel" import verify from "schemas/verifySchema" -import { color, hypixelGuildID, devMessage } from "config/options" +import { embedColor, hypixelGuildID, devMessage } from "config/options" import roleManage from "utils/functions/rolesmanage" import { Command } from "interfaces" @@ -21,7 +21,6 @@ export = { const user = interaction.member as GuildMember const verifyData = await verify.findOne({ userID: user.user.id }) - const embedColor = Number(color.replace("#", "0x")) if (!verifyData) { await interaction.editReply({ diff --git a/src/commands/uuid.ts b/src/commands/uuid.ts index ca6239f..2109422 100644 --- a/src/commands/uuid.ts +++ b/src/commands/uuid.ts @@ -1,5 +1,5 @@ import { SlashCommandBuilder } from "discord.js" -import { color, devMessage } from "config/options" +import { embedColor, devMessage } from "config/options" import { getUUID, getIGN, getHeadURL, formatUuid } from "utils/Hypixel" import { Command } from "interfaces" @@ -30,7 +30,6 @@ export = { const formattedUuid = formatUuid(uuid) const newIgn = (await getIGN(uuid)) as string const head = await getHeadURL(ign) - const embedColor = Number(color.replace("#", "0x")) if (!uuid) { interaction.editReply({ diff --git a/src/commands/verify.ts b/src/commands/verify.ts index a013b9d..2f493f2 100644 --- a/src/commands/verify.ts +++ b/src/commands/verify.ts @@ -1,6 +1,6 @@ import { GuildMember, SlashCommandBuilder } from "discord.js" import { getUUID, getPlayer, getGuild, getHeadURL } from "utils/Hypixel" -import { color, hypixelGuildID, devMessage } from "config/options" +import { embedColor, hypixelGuildID, devMessage } from "config/options" import mongoose from "mongoose" import roleManage from "utils/functions/rolesmanage" import { Command } from "interfaces" @@ -32,7 +32,6 @@ export = { const user = interaction.member! as GuildMember const ign = interaction.options.getString("ign")! - const embedColor = Number(color.replace("#", "0x")) const verifyData = await verify.findOne({ userID: user.id }) if (verifyData) { diff --git a/src/commands/whoami.ts b/src/commands/whoami.ts index 7466042..9e49e55 100644 --- a/src/commands/whoami.ts +++ b/src/commands/whoami.ts @@ -1,6 +1,6 @@ import { SlashCommandBuilder, userMention } from "discord.js" import { Command } from "interfaces" -import { color, devMessage } from "config/options" +import { embedColor, devMessage } from "config/options" import verify from "schemas/verifySchema" import { getIGN, getHeadURL } from "utils/Hypixel" @@ -20,7 +20,6 @@ export = { const user = interaction.user const verifyData = await verify.findOne({ userID: user.id }) - const embedColor = Number(color.replace("#", "0x")) if (!verifyData) { await interaction.editReply({ diff --git a/src/commands/whois.ts b/src/commands/whois.ts index fcd36ff..dde2c10 100644 --- a/src/commands/whois.ts +++ b/src/commands/whois.ts @@ -1,6 +1,6 @@ import { SlashCommandBuilder, PermissionFlagsBits, userMention } from "discord.js" import { getIGN, getHeadURL } from "utils/Hypixel" -import { color, devMessage } from "config/options" +import { embedColor, devMessage } from "config/options" import verify from "schemas/verifySchema" import { Command } from "interfaces" @@ -26,8 +26,6 @@ export = { await interaction.deferReply() const user = interaction.options.getUser("user")! - const embedColor = Number(color.replace("#", "0x")) - const verifiedUser = await verify.findOne({ userID: user.id }) if (!verifiedUser) { interaction.editReply("You are not verified!") diff --git a/src/components/buttons/checkstats.ts b/src/components/buttons/checkstats.ts index 8266f2e..64a2961 100644 --- a/src/components/buttons/checkstats.ts +++ b/src/components/buttons/checkstats.ts @@ -1,4 +1,4 @@ -import { color, devMessage } from "config/options" +import { embedColor, devMessage } from "config/options" import guildapp from "schemas/guildAppSchema" import { bwfkdr, bwstars, bwwins, swstars, swkdr, duelswins, duelswlr } from "config/reqs" import { hypixelLevel, bedwarsLevel, skywarsLevel, getPlayer, getGuild, getHeadURL } from "utils/Hypixel" @@ -16,7 +16,6 @@ export = { const applicantId = embed.footer!.text.split(" ")[1] const guildappdata = await guildapp.findOne({ userID: applicantId }) const uuid = guildappdata!.uuid - const embedColor = Number(color.replace("#", "0x")) const player = await getPlayer(uuid) if (!player) { diff --git a/src/components/buttons/guildapplicationaccept.ts b/src/components/buttons/guildapplicationaccept.ts index b9d4aa4..9749f23 100644 --- a/src/components/buttons/guildapplicationaccept.ts +++ b/src/components/buttons/guildapplicationaccept.ts @@ -1,5 +1,5 @@ import { ActionRowBuilder, ButtonStyle, ButtonBuilder, TextChannel } from "discord.js" -import { color, waitingListChannel, waitingListMessage, hypixelGuildID } from "config/options" +import { embedColor, waitingListChannel, waitingListMessage, hypixelGuildID } from "config/options" import colorLog from "utils/functions/colors" import mongoose from "mongoose" import guildapp from "schemas/guildAppSchema" @@ -17,8 +17,6 @@ export = { const user = interaction.user const guild = interaction.guild! - const embedColor = Number(color.replace("#", "0x")) - const message = interaction.message const embed = message.embeds[0] const applicantId = embed.footer!.text.split(" ")[1] diff --git a/src/components/buttons/guildapply.ts b/src/components/buttons/guildapply.ts index 1856cea..ec3e7b3 100644 --- a/src/components/buttons/guildapply.ts +++ b/src/components/buttons/guildapply.ts @@ -1,7 +1,6 @@ import { ButtonBuilder, ButtonStyle, ActionRowBuilder, EmbedBuilder, GuildMember, TextChannel } from "discord.js" -import { color } from "config/options" +import { embedColor, applicationsChannel } from "config/options" import { largeM, smallM, ignM } from "config/limitmessages" -import { applicationsChannel } from "config/options" import questions from "config/questions" import { guildRole } from "config/roles" import { getUUID } from "utils/Hypixel" @@ -17,7 +16,6 @@ export = { await interaction.deferReply({ ephemeral: true }) const user = interaction.member as GuildMember const guild = interaction.guild! - const embedColor = Number(color.replace("#", "0x")) const userRoles = user.roles.cache.map(role => role.id) const guildQuestions = questions.guild diff --git a/src/components/buttons/guildinactivitylog.ts b/src/components/buttons/guildinactivitylog.ts index 5f2ee2f..12c8a96 100644 --- a/src/components/buttons/guildinactivitylog.ts +++ b/src/components/buttons/guildinactivitylog.ts @@ -2,7 +2,7 @@ import { ButtonBuilder, ActionRowBuilder, ButtonStyle, EmbedBuilder, GuildMember import { gm, manager, moderator, beast, member, guildStaff, guildRole } from "config/roles" import { ignM, smallM, largeM } from "config/limitmessages" import { inactivity } from "config/questions" -import { color, inactivityLogChannel } from "config/options" +import { embedColor, inactivityLogChannel } from "config/options" import { Button } from "interfaces" import { getIGN } from "utils/Hypixel" const guildRoles = [gm, manager, moderator, beast, member, guildStaff, guildRole] @@ -14,7 +14,6 @@ export = { async execute(interaction) { const guild = interaction.guild! const user = interaction.member as GuildMember - const embedColor = Number(color.replace("#", "0x")) const userRoles = user.roles.cache if (!userRoles.some(role => guildRoles.includes(role.id))) { diff --git a/src/components/buttons/staffapplicationaccept.ts b/src/components/buttons/staffapplicationaccept.ts index eb1ad8b..b0cb654 100644 --- a/src/components/buttons/staffapplicationaccept.ts +++ b/src/components/buttons/staffapplicationaccept.ts @@ -1,5 +1,5 @@ import { ActionRowBuilder, ButtonBuilder, ButtonStyle } from "discord.js" -import { color } from "config/options" +import { embedColor } from "config/options" import staffapp from "schemas/staffAppSchema" import { Button } from "interfaces" @@ -12,8 +12,6 @@ export = { const user = interaction.user const guild = interaction.guild! - const embedColor = Number(color.replace("#", "0x")) - const message = interaction.message const embed = message.embeds[0] const applicantId = embed.footer!.text.split(" ")[1] diff --git a/src/components/buttons/staffapply.ts b/src/components/buttons/staffapply.ts index 9c5044a..f950294 100644 --- a/src/components/buttons/staffapply.ts +++ b/src/components/buttons/staffapply.ts @@ -1,5 +1,5 @@ import { ButtonBuilder, ButtonStyle, ActionRowBuilder, EmbedBuilder, GuildMember, TextChannel } from "discord.js" -import { color, staffApplicationsChannel } from "config/options" +import { embedColor, staffApplicationsChannel } from "config/options" import { largeM, ignM } from "config/limitmessages" import questions from "config/questions" import { guildRole, guildStaff } from "config/roles" @@ -17,7 +17,6 @@ export = { async execute(interaction) { const user = interaction.member as GuildMember const guild = interaction.guild! - const embedColor = Number(color.replace("#", "0x")) const userRoles = user.roles.cache const setting = await settings.findOne({ name: "staffAppStatus" }) const status = setting!.value || "0" diff --git a/src/components/modals/denyreasonbox.ts b/src/components/modals/denyreasonbox.ts index 5e26747..676cdef 100644 --- a/src/components/modals/denyreasonbox.ts +++ b/src/components/modals/denyreasonbox.ts @@ -1,5 +1,5 @@ import { EmbedBuilder, ActionRowBuilder, ButtonBuilder, ButtonStyle, Message, GuildMember } from "discord.js" -import { color } from "config/options" +import { embedColor } from "config/options" import guildapp from "schemas/guildAppSchema" import { Modal } from "interfaces" @@ -14,9 +14,7 @@ export = { const message = interaction.message as Message const embed = message.embeds[0] const applicantId = embed.footer!.text.split(" ")[1] - const reason = interaction.fields.fields.get("denyreason")!.value || "No reason provided" - const embedColor = Number(color.replace("#", "0x")) await message.edit({ components: [ diff --git a/src/components/modals/staffdenyreasonbox.ts b/src/components/modals/staffdenyreasonbox.ts index 21a4b53..f4c9a7f 100644 --- a/src/components/modals/staffdenyreasonbox.ts +++ b/src/components/modals/staffdenyreasonbox.ts @@ -1,5 +1,5 @@ import { EmbedBuilder, ActionRowBuilder, ButtonBuilder, ButtonStyle } from "discord.js" -import { color } from "config/options" +import { embedColor } from "config/options" import staffapp from "schemas/staffAppSchema" import { Modal } from "interfaces" @@ -12,8 +12,6 @@ export = { const guild = interaction.guild const reason = interaction.fields.fields.get("staffdenyreason")!.value || "No reason provided" - const embedColor = Number(color.replace("#", "0x")) - const message = interaction.message! const embed = message.embeds[0] const applicantId = embed.footer!.text.split(" ")[1] diff --git a/src/components/modals/verifyModal.ts b/src/components/modals/verifyModal.ts index 71f1481..c57a912 100644 --- a/src/components/modals/verifyModal.ts +++ b/src/components/modals/verifyModal.ts @@ -1,5 +1,5 @@ import { getUUID, getPlayer, getGuild, getHeadURL } from "utils/Hypixel" -import { color, hypixelGuildID, devMessage } from "config/options" +import { embedColor, hypixelGuildID, devMessage } from "config/options" import verify from "schemas/verifySchema" import mongoose from "mongoose" import { gm, manager, moderator, beast, elite, member, guildRole, guildStaff, defaultMember } from "config/roles" @@ -15,8 +15,6 @@ export = { const user = interaction.member as GuildMember const ign = interaction.fields.fields.get("verifyign")!.value - const embedColor = Number(color.replace("#", "0x")) - const verifyData = await verify.findOne({ userID: user.user.id }) if (verifyData) { interaction.editReply("You are already verified.\n" + "Try running /update to update your roles.") diff --git a/src/config/options.ts b/src/config/options.ts index 58f53ab..d08d57f 100644 --- a/src/config/options.ts +++ b/src/config/options.ts @@ -1,5 +1,4 @@ const options = { - color: "#eeaadb", embedColor: 0xeeaadb, guildid: "481741000365178881", devMessage: "Developed by taken.lua", diff --git a/src/events/cron/weeklyGexp.ts b/src/events/cron/weeklyGexp.ts index 677f3ae..88fb6f4 100644 --- a/src/events/cron/weeklyGexp.ts +++ b/src/events/cron/weeklyGexp.ts @@ -1,4 +1,4 @@ -import { hypixelGuildID, guildLogChannel, color, devMessage } from "config/options" +import { hypixelGuildID, guildLogChannel, embedColor, devMessage } from "config/options" import colorLog from "utils/functions/colors" import { getGuild, getIGN } from "utils/Hypixel" import { Cron, GuildData } from "interfaces" @@ -13,8 +13,6 @@ async function guildWeekly() { return } - const embedColor = Number(color.replace("#", "0x")) - const message = await channel.send({ embeds: [{ description: "Starting to fetch guild data...", diff --git a/src/events/server/guildMemberAdd/logNewJoins.ts b/src/events/server/guildMemberAdd/logNewJoins.ts index 9c064cb..efc989e 100644 --- a/src/events/server/guildMemberAdd/logNewJoins.ts +++ b/src/events/server/guildMemberAdd/logNewJoins.ts @@ -1,5 +1,5 @@ import { GuildMember, userMention } from "discord.js" -import { color } from "config/options" +import { embedColor } from "config/options" import { Event } from "interfaces" import logToChannel from "utils/functions/logtochannel" @@ -10,8 +10,6 @@ export = { execute(member: GuildMember) { if (process.env.NODE_ENV === "dev") return - const embedColor = Number(color.replace("#", "0x")) - logToChannel("bot", { embeds: [{ title: "New Member", diff --git a/src/events/server/ready/sendOnlineMessage.ts b/src/events/server/ready/sendOnlineMessage.ts index cfa6b57..dc2bc16 100644 --- a/src/events/server/ready/sendOnlineMessage.ts +++ b/src/events/server/ready/sendOnlineMessage.ts @@ -1,6 +1,6 @@ import logToChannel from "utils/functions/logtochannel" import { Event } from "interfaces" -import { color } from "config/options" +import { embedColor } from "config/options" export = { name: "sendonlinemessage", @@ -10,8 +10,6 @@ export = { execute() { if (process.env.NODE_ENV === "dev") return - const embedColor = Number(color.replace("#", "0x")) - logToChannel("online", { embeds: [{ description: "Bot is online!", diff --git a/src/events/server/voiceStateUpdate/vcJoinLeave.ts b/src/events/server/voiceStateUpdate/vcJoinLeave.ts index a4b0faf..52e5f9e 100644 --- a/src/events/server/voiceStateUpdate/vcJoinLeave.ts +++ b/src/events/server/voiceStateUpdate/vcJoinLeave.ts @@ -1,5 +1,5 @@ import { userMention, channelMention, VoiceState } from "discord.js" -import { color } from "config/options" +import { embedColor } from "config/options" import { Event } from "interfaces" import logToChannel from "utils/functions/logtochannel" @@ -11,7 +11,6 @@ export = { execute(oldState: VoiceState, newState: VoiceState) { if (process.env.NODE_ENV === "dev") return - const embedColor = Number(color.replace("#", "0x")) const oldChannel = oldState.channel const newChannel = newState.channel diff --git a/src/utils/Events/autocomplete.ts b/src/utils/Events/autocomplete.ts index 941e63e..adf4ff8 100644 --- a/src/utils/Events/autocomplete.ts +++ b/src/utils/Events/autocomplete.ts @@ -1,5 +1,5 @@ import { ExtendedClient as Client } from "utils/Client" -import { color } from "config/options" +import { embedColor } from "config/options" import { Autocomplete } from "interfaces" import { Events } from "discord.js" import colorLog from "utils/functions/colors" @@ -7,7 +7,6 @@ import path from "path" import fs from "fs" import logToChannel from "utils/functions/logtochannel" type FileType = "js" | "ts" -const embedColor = Number(color.replace("#", "0x")) export default function loadAutocompleteEvents(client: Client, ft: FileType) { const autocompletePath = path.join(__dirname, "..", "..", "components", "autocomplete") diff --git a/src/utils/Events/button.ts b/src/utils/Events/button.ts index 003d032..e14917c 100644 --- a/src/utils/Events/button.ts +++ b/src/utils/Events/button.ts @@ -1,13 +1,12 @@ import { ExtendedClient as Client } from "utils/Client" import colorLog from "utils/functions/colors" -import { color } from "config/options" +import { embedColor } from "config/options" import { Button } from "interfaces" import { Events } from "discord.js" import path from "path" import fs from "fs" import logToChannel from "utils/functions/logtochannel" type FileType = "js" | "ts" -const embedColor = Number(color.replace("#", "0x")) export default function loadButtonEvents(client: Client, ft: FileType) { const btnPath = path.join(__dirname, "..", "..", "components", "buttons") diff --git a/src/utils/Events/command.ts b/src/utils/Events/command.ts index 3ad03cc..9e07c10 100644 --- a/src/utils/Events/command.ts +++ b/src/utils/Events/command.ts @@ -1,13 +1,12 @@ import { ExtendedClient as Client } from "utils/Client" import colorLog from "utils/functions/colors" -import { color } from "config/options" +import { embedColor } from "config/options" import { Command } from "interfaces" import { Events } from "discord.js" import path from "path" import fs from "fs" import logToChannel from "utils/functions/logtochannel" type FileType = "js" | "ts" -const embedColor = Number(color.replace("#", "0x")) export default function loadSlashCommandsEvents(client: Client, ft: FileType) { const cmdPath = path.join(__dirname, "..", "..", "commands") diff --git a/src/utils/Events/contextmenu.ts b/src/utils/Events/contextmenu.ts index 5e338f0..19f6716 100644 --- a/src/utils/Events/contextmenu.ts +++ b/src/utils/Events/contextmenu.ts @@ -1,13 +1,12 @@ import { ExtendedClient as Client } from "utils/Client" import colorLog from "utils/functions/colors" import { ContextMenu } from "interfaces" -import { color } from "config/options" +import { embedColor } from "config/options" import { Events } from "discord.js" import path from "path" import fs from "fs" import logToChannel from "utils/functions/logtochannel" type FileType = "js" | "ts" -const embedColor = Number(color.replace("#", "0x")) export default function loadContextMenuEvents(client: Client, ft: FileType) { const contextMenuPath = path.join(__dirname, "..", "..", "commands-contextmenu") diff --git a/src/utils/Events/modal.ts b/src/utils/Events/modal.ts index 318cf07..345a0be 100644 --- a/src/utils/Events/modal.ts +++ b/src/utils/Events/modal.ts @@ -1,13 +1,12 @@ import { ExtendedClient as Client } from "utils/Client" import colorLog from "utils/functions/colors" -import { color } from "config/options" +import { embedColor } from "config/options" import { Modal } from "interfaces" import { Events } from "discord.js" import path from "path" import fs from "fs" import logToChannel from "utils/functions/logtochannel" type FileType = "js" | "ts" -const embedColor = Number(color.replace("#", "0x")) export default function loadModalEvents(client: Client, ft: FileType) { const modalPath = path.join(__dirname, "..", "..", "components", "modals")