meta/xyter
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases 2 Wiki Activity

Merge pull request #426 from VermiumSifell/dev

Browse source 
🧑‍💻 Fixed some more code smells
This commit is contained in:
Axel Olausson Holtenäs 2022-10-14 13:51:16 +02:00 • committed by GitHub
commit bde5d257ed
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/plugins/events/interactionCreate/handlers/button/index.ts
View file

@ -1,7 +1,6 @@
// Dependencies // Dependencies
import { BaseInteraction } from "discord.js"; import { BaseInteraction } from "discord.js";
import { button as CooldownButton } from "../../../../../helpers/cooldown";
import * as cooldown from "../../../../../helpers/cooldown";
import deferReply from "../../../../../helpers/deferReply"; import deferReply from "../../../../../helpers/deferReply";
export default async (interaction: BaseInteraction) => { export default async (interaction: BaseInteraction) => {
@ -30,7 +29,7 @@ export default async (interaction: BaseInteraction) => {
if (metadata.dmOnly && guild) if (metadata.dmOnly && guild)
throw new Error("This command is only available in DM"); throw new Error("This command is only available in DM");
if (metadata.cooldown) await cooldown.button(interaction, metadata.cooldown); if (metadata.cooldown) await CooldownButton(interaction, metadata.cooldown);
await currentButton.execute(interaction); await currentButton.execute(interaction);
}; };

5
src/plugins/events/interactionCreate/handlers/command/index.ts
View file

@ -1,7 +1,6 @@
// Dependencies // Dependencies
import { ChatInputCommandInteraction } from "discord.js"; import { ChatInputCommandInteraction } from "discord.js";
import { command as CooldownCommand } from "../../../../../helpers/cooldown";
import * as cooldown from "../../../../../helpers/cooldown";
import deferReply from "../../../../../helpers/deferReply"; import deferReply from "../../../../../helpers/deferReply";
import getCommandMetadata from "../../../../../helpers/getCommandMetadata"; import getCommandMetadata from "../../../../../helpers/getCommandMetadata";
@ -29,7 +28,7 @@ export default async (interaction: ChatInputCommandInteraction) => {
throw new Error("This command is only available in DM"); throw new Error("This command is only available in DM");
if (metadata.cooldown) { if (metadata.cooldown) {
await cooldown.command(interaction, metadata.cooldown); await CooldownCommand(interaction, metadata.cooldown);
} }
await currentCommand.execute(interaction); await currentCommand.execute(interaction);
}; };

9
src/plugins/events/interactionCreate/index.ts
View file

@ -4,18 +4,17 @@ import {
CommandInteraction, CommandInteraction,
InteractionType, InteractionType,
} from "discord.js"; } from "discord.js";
// Dependencies
import * as handlers from "./handlers";
import { IEventOptions } from "../../../interfaces/EventOptions"; import { IEventOptions } from "../../../interfaces/EventOptions";
import logger from "../../../middlewares/logger"; import logger from "../../../middlewares/logger";
import audits from "./audits"; import audits from "./audits";
// Dependencies
import { handleCommandInteraction as HandlersHandleCommandInteraction } from "./handlers";
export const options: IEventOptions = { export const options: IEventOptions = {
type: "on", type: "on",
}; };
// Execute the event
export const execute = async (interaction: BaseInteraction) => { export const execute = async (interaction: BaseInteraction) => {
const { guild, id } = interaction; const { guild, id } = interaction;
@ -27,7 +26,7 @@ export const execute = async (interaction: BaseInteraction) => {
switch (interaction.type) { switch (interaction.type) {
case InteractionType.ApplicationCommand: case InteractionType.ApplicationCommand:
await handlers.handleCommandInteraction(<CommandInteraction>interaction); await HandlersHandleCommandInteraction(<CommandInteraction>interaction);
break; break;
default: default: