Merge pull request #364 from VermiumSifell/dev

Minor fixes

renovate.json

@@ -1,3 +1,4 @@
 {
-  "extends": ["config:base"]
+  "extends": ["config:base"],
+  "baseBranches": ["dev"]
 }

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";
 

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) => {
+export const execute = async (interaction: ButtonInteraction) => {
-  logger.debug("primary button clicked!");
+  logger.debug(interaction.customId, "primary button clicked!");
 };

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";
 

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;
 

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";
 

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;
 

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 } =
+    const { successColor, footerText, footerIcon } = await getEmbedConfig(
-      await getEmbedConfig(guild); // Destructure
+      guild
+    ); // Destructure
 
     const optionTarget = options?.getUser("target");
     const optionType = options?.getString("type");

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 },

src/plugins/commands/utility/modules/ping/index.ts

@@ -1,14 +1,9 @@
 // Dependencies
-import {
+import { CommandInteraction } from "discord.js";
-  CommandInteraction,
-  MessageActionRow,
-  MessageButton,
-} from "discord.js";
 
 // Configurations
 import getEmbedConfig from "../../../../../helpers/getEmbedConfig";
 
-import { hosterName, hosterUrl } from "../../../../../config/other";
 import { SlashCommandSubcommandBuilder } from "@discordjs/builders";
 
 // Function

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";
 

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";
 

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);

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);
 

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);
     });
 };

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!`);
 };