diff --git a/renovate.json b/renovate.json index 4f39080..57d1542 100644 --- a/renovate.json +++ b/renovate.json @@ -1,3 +1,4 @@ { - "extends": ["config:base"] + "extends": ["config:base"], + "baseBranches": ["dev"] } diff --git a/src/helpers/cooldown/index.ts b/src/helpers/cooldown/index.ts index 45d2729..f574f57 100644 --- a/src/helpers/cooldown/index.ts +++ b/src/helpers/cooldown/index.ts @@ -3,7 +3,6 @@ import { CommandInteraction, ButtonInteraction, Message } from "discord.js"; import logger from "../../logger"; -import getEmbedConfig from "../../helpers/getEmbedConfig"; import timeoutSchema from "../../models/timeout"; import addSeconds from "../../helpers/addSeconds"; diff --git a/src/plugins/buttons/primary/index.ts b/src/plugins/buttons/primary/index.ts index c1441db..83162a6 100644 --- a/src/plugins/buttons/primary/index.ts +++ b/src/plugins/buttons/primary/index.ts @@ -1,8 +1,8 @@ -import { CommandInteraction } from "discord.js"; +import { ButtonInteraction } from "discord.js"; import logger from "../../../logger"; export const metadata = { guildOnly: false, ephemeral: false }; -export const execute = async (interaction: CommandInteraction) => { - logger.debug("primary button clicked!"); +export const execute = async (interaction: ButtonInteraction) => { + logger.debug(interaction.customId, "primary button clicked!"); }; diff --git a/src/plugins/commands/counters/index.ts b/src/plugins/commands/counters/index.ts index eca16dc..9626b99 100644 --- a/src/plugins/commands/counters/index.ts +++ b/src/plugins/commands/counters/index.ts @@ -1,6 +1,5 @@ import { CommandInteraction } from "discord.js"; import { SlashCommandBuilder } from "@discordjs/builders"; -import logger from "../../../logger"; import modules from "../../commands/counters/modules"; diff --git a/src/plugins/commands/manage/index.ts b/src/plugins/commands/manage/index.ts index 1f914bb..1b61f39 100644 --- a/src/plugins/commands/manage/index.ts +++ b/src/plugins/commands/manage/index.ts @@ -4,7 +4,6 @@ import { CommandInteraction } from "discord.js"; // Groups import modules from "../../commands/manage/modules"; -import logger from "../../../logger"; export const moduleData = modules; diff --git a/src/plugins/commands/manage/modules/credits/index.ts b/src/plugins/commands/manage/modules/credits/index.ts index b4673ff..92efd12 100644 --- a/src/plugins/commands/manage/modules/credits/index.ts +++ b/src/plugins/commands/manage/modules/credits/index.ts @@ -1,6 +1,5 @@ import { CommandInteraction } from "discord.js"; import { SlashCommandSubcommandGroupBuilder } from "@discordjs/builders"; -import logger from "../../../../../logger"; import modules from "./modules"; diff --git a/src/plugins/commands/reputation/index.ts b/src/plugins/commands/reputation/index.ts index ae1876e..d667343 100644 --- a/src/plugins/commands/reputation/index.ts +++ b/src/plugins/commands/reputation/index.ts @@ -6,7 +6,6 @@ import { CommandInteraction } from "discord.js"; import modules from "./modules"; // Handlers -import logger from "../../../logger"; export const moduleData = modules; diff --git a/src/plugins/commands/reputation/modules/give/index.ts b/src/plugins/commands/reputation/modules/give/index.ts index eb58abe..f9970df 100644 --- a/src/plugins/commands/reputation/modules/give/index.ts +++ b/src/plugins/commands/reputation/modules/give/index.ts @@ -37,8 +37,9 @@ export default { execute: async (interaction: CommandInteraction) => { const { options, user, guild } = interaction; - const { errorColor, successColor, footerText, footerIcon } = - await getEmbedConfig(guild); // Destructure + const { successColor, footerText, footerIcon } = await getEmbedConfig( + guild + ); // Destructure const optionTarget = options?.getUser("target"); const optionType = options?.getString("type"); diff --git a/src/plugins/commands/shop/modules/cpgg/index.ts b/src/plugins/commands/shop/modules/cpgg/index.ts index 90dbe70..365753f 100644 --- a/src/plugins/commands/shop/modules/cpgg/index.ts +++ b/src/plugins/commands/shop/modules/cpgg/index.ts @@ -16,7 +16,6 @@ import pluralize from "../../../../../helpers/pluralize"; import apiSchema from "../../../../../models/api"; import fetchUser from "../../../../../helpers/fetchUser"; import { SlashCommandSubcommandBuilder } from "@discordjs/builders"; -import { message } from "../../../../../helpers/cooldown/index"; export default { metadata: { guildOnly: true, ephemeral: true }, diff --git a/src/plugins/commands/utility/modules/ping/index.ts b/src/plugins/commands/utility/modules/ping/index.ts index 666529b..420329e 100644 --- a/src/plugins/commands/utility/modules/ping/index.ts +++ b/src/plugins/commands/utility/modules/ping/index.ts @@ -1,14 +1,9 @@ // Dependencies -import { - CommandInteraction, - MessageActionRow, - MessageButton, -} from "discord.js"; +import { CommandInteraction } from "discord.js"; // Configurations import getEmbedConfig from "../../../../../helpers/getEmbedConfig"; -import { hosterName, hosterUrl } from "../../../../../config/other"; import { SlashCommandSubcommandBuilder } from "@discordjs/builders"; // Function diff --git a/src/plugins/events/guildMemberAdd/audits.ts b/src/plugins/events/guildMemberAdd/audits.ts index 89c0384..9f94282 100644 --- a/src/plugins/events/guildMemberAdd/audits.ts +++ b/src/plugins/events/guildMemberAdd/audits.ts @@ -1,5 +1,5 @@ import logger from "../../../logger"; -import { GuildMember, MessageEmbed, TextChannel } from "discord.js"; +import { GuildMember, MessageEmbed } from "discord.js"; import guildSchema from "../../../models/guild"; diff --git a/src/plugins/events/guildMemberRemove/audits.ts b/src/plugins/events/guildMemberRemove/audits.ts index a940ca3..5ce4849 100644 --- a/src/plugins/events/guildMemberRemove/audits.ts +++ b/src/plugins/events/guildMemberRemove/audits.ts @@ -1,5 +1,5 @@ import logger from "../../../logger"; -import { GuildMember, MessageEmbed, TextChannel } from "discord.js"; +import { GuildMember, MessageEmbed } from "discord.js"; import guildSchema from "../../../models/guild"; diff --git a/src/plugins/events/interactionCreate/handlers/index.ts b/src/plugins/events/interactionCreate/handlers/index.ts index c29bfc3..85f1e7a 100644 --- a/src/plugins/events/interactionCreate/handlers/index.ts +++ b/src/plugins/events/interactionCreate/handlers/index.ts @@ -3,8 +3,6 @@ import { Interaction } from "discord.js"; import button from "./button"; import command from "./command"; -import logger from "../../../../logger"; - export const execute = async (interaction: Interaction) => { await button(interaction); await command(interaction); diff --git a/src/plugins/events/messageCreate/modules/points/index.ts b/src/plugins/events/messageCreate/modules/points/index.ts index 4a4496b..ed18003 100644 --- a/src/plugins/events/messageCreate/modules/points/index.ts +++ b/src/plugins/events/messageCreate/modules/points/index.ts @@ -14,9 +14,6 @@ export default { if (author.bot) return; if (channel?.type !== "GUILD_TEXT") return; - const { id: guildId } = guild; - const { id: userId } = author; - const guildData = await fetchGuild(guild); const userData = await fetchUser(author, guild); diff --git a/src/plugins/events/messageUpdate/modules/counter.ts b/src/plugins/events/messageUpdate/modules/counter.ts index 03c60b9..4a01749 100644 --- a/src/plugins/events/messageUpdate/modules/counter.ts +++ b/src/plugins/events/messageUpdate/modules/counter.ts @@ -29,7 +29,7 @@ export default async (message: Message) => { await channel?.send(`${author} said **${word}**.`); logger?.silly(`${author} said ${word} in ${channel}`); }) - ?.catch(async (error: any) => { + ?.catch(async (error) => { logger?.error(error); }); }; diff --git a/src/plugins/events/rateLimit/index.ts b/src/plugins/events/rateLimit/index.ts index 8886c1a..ca9aab5 100644 --- a/src/plugins/events/rateLimit/index.ts +++ b/src/plugins/events/rateLimit/index.ts @@ -10,5 +10,5 @@ export const options: IEventOptions = { }; export const execute = async (client: Client) => { - logger.warn("Discord's API client is rate-limited!"); + logger.warn(`Discord's API client (${client?.user?.tag}) is rate-limited!`); };