Skip to content

Commit

Permalink
[Fix] more fixes and error handling for all commands
Browse files Browse the repository at this point in the history
  • Loading branch information
naseif committed Oct 1, 2021
1 parent 604e7a9 commit 012f236
Show file tree
Hide file tree
Showing 20 changed files with 28 additions and 11 deletions.
2 changes: 1 addition & 1 deletion commands/admin/addrole.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ module.exports = {
],
});
} catch (err) {
console.error(err);
client.logger(err.message, "error");
if (err.message === "Missing Access") {
return await interaction.followUp({
embeds: [
Expand Down
1 change: 1 addition & 0 deletions commands/admin/ban.js
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ module.exports = {
await interaction.guild.members.ban(user, { reason });
await interaction.followUp({ embeds: [embed] });
} catch (error) {
client.logger(error.message, "error");
await interaction.followUp({
embeds: [
embedMessage("#9dcc37", `Couldn't ban ${user}, ${error.message}`),
Expand Down
3 changes: 2 additions & 1 deletion commands/admin/deleteMessages.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ module.exports = {
option.setName("int").setDescription("Enter an integer").setRequired(true)
),
async execute(interaction, client) {
const integer = interaction.options.getInteger("int");
await interaction.deferReply();
const integer = interaction.options.getInteger("int");

if (
!interaction.member.permissions.has([Permissions.FLAGS.MANAGE_MESSAGES])
Expand All @@ -31,6 +31,7 @@ module.exports = {
});
await interaction.channel.bulkDelete(integer);
} catch (error) {
client.logger(error.message, "error");
const errorEmbed = {
color: "#9dcc37",
description: `💥 ${error.message}`,
Expand Down
4 changes: 2 additions & 2 deletions commands/admin/kick.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ module.exports = {
option.setName("reason").setDescription("kick reason").setRequired(true)
),
async execute(interaction, client) {
await interaction.deferReply();
const user = interaction.options.getUser("user");
const reason = interaction.options.getString("reason");
await interaction.deferReply();

const embed = {
author: {
Expand Down Expand Up @@ -52,12 +52,12 @@ module.exports = {
await interaction.guild.members.kick(user, { reason });
await interaction.followUp({ embeds: [embed] });
} catch (error) {
client.logger(error.message, "error");
await interaction.followUp({
embeds: [
embedMessage("#9dcc37", `Couldn't kick ${user}, ${error.message}`),
],
});
console.log(error);
}
},
};
2 changes: 1 addition & 1 deletion commands/admin/region.js
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ module.exports = {
],
});
} catch (err) {
console.error(err);
client.logger(err.message, "error");
await interaction.followUp({
embeds: [
embedMessage(
Expand Down
2 changes: 1 addition & 1 deletion commands/admin/regionById.js
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ module.exports = {
],
});
} catch (err) {
console.error(err);
client.logger(err.message, "error");
await interaction.followUp({
embeds: [
embedMessage(
Expand Down
2 changes: 1 addition & 1 deletion commands/admin/removerole.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ module.exports = {
],
});
} catch (err) {
console.error(err);
client.logger(err.message, "error");
if (err.message === "Missing Access") {
return await interaction.followUp({
embeds: [
Expand Down
1 change: 1 addition & 0 deletions commands/admin/serverIcon.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ module.exports = {
],
});
} catch (error) {
client.logger(error.message, "error");
await interaction.followUp({
embeds: [
embedMessage(
Expand Down
1 change: 1 addition & 0 deletions commands/admin/unban.js
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ module.exports = {
await interaction.guild.members.unban(userID, { reason });
await interaction.followUp({ embeds: [embed] });
} catch (error) {
client.logger(error.message, "error");
await interaction.followUp({
embeds: [
embedMessage(
Expand Down
1 change: 1 addition & 0 deletions commands/anime/highfive.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ module.exports = {
};
await interaction.followUp({ embeds: [highFiveEmbed] });
} catch (error) {
client.logger(error.message, "error");
await interaction.followUp(`Couldn't retrieve a hug gif, Sorry!`);
}
},
Expand Down
1 change: 1 addition & 0 deletions commands/anime/hug.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ module.exports = {
};
await interaction.followUp({ embeds: [hugEmbed] });
} catch (error) {
client.logger(error.message, "error");
await interaction.followUp(`Couldn't retrieve a hug gif, Sorry!`);
}
},
Expand Down
1 change: 1 addition & 0 deletions commands/anime/waifu.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ module.exports = {
};
await interaction.followUp({ embeds: [waifuEmbed] });
} catch (error) {
client.logger(error.message, "error");
await interaction.followUp(`Couldn't retrieve a waifu pic, Sorry!`);
}
},
Expand Down
1 change: 1 addition & 0 deletions commands/anime/whatAnime.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ module.exports = {
};
await interaction.followUp({ embeds: [infoEmbed] });
} catch (error) {
client.logger(error.message, "error");
await interaction.followUp(
`${interaction.user.toString()}, There was an error processing this image!`
);
Expand Down
5 changes: 4 additions & 1 deletion commands/fun/insult.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
const { SlashCommandBuilder } = require("@discordjs/builders");
const { requestAPI } = require("../../modules/requestAPI");

module.exports = {
data: new SlashCommandBuilder()
.setName("insult")
Expand All @@ -8,8 +9,9 @@ module.exports = {
option.setName("user").setDescription("Select a user")
),
async execute(interaction, client) {
const user = interaction.options.getUser("user");
await interaction.deferReply();
const user = interaction.options.getUser("user");

try {
const insult = await requestAPI(
"https://evilinsult.com/generate_insult.php?lang=en&type=json"
Expand All @@ -19,6 +21,7 @@ module.exports = {
`${user ? user : `${interaction.member.toString()}`}, ${insult.insult}`
);
} catch (error) {
client.logger(error.message, "error");
await interaction.followUp(
`Couldn't retrieve Insult, I blame <@503264757785165851>`
);
Expand Down
1 change: 1 addition & 0 deletions commands/fun/jokes.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ module.exports = {

await interaction.followUp({ embeds: [embed] });
} catch (err) {
client.logger(err.message, "error");
await interaction.followUp(
`Could not retrieve a Joke, I blame <@503264757785165851>`
);
Expand Down
3 changes: 2 additions & 1 deletion commands/misc/avatar.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@ module.exports = {
option.setName("user").setDescription("Select a user").setRequired(true)
),
async execute(interaction, client) {
const user = interaction.options.getUser("user");
await interaction.deferReply();
const user = interaction.options.getUser("user");

const embed = {
color: "#9dcc37",
fields: [
Expand Down
1 change: 1 addition & 0 deletions commands/misc/nickname.js
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ module.exports = {
],
});
} catch (err) {
client.logger(err.message, "error");
if (err.message === "Missing Permissions") {
return await interaction.followUp({
embeds: [
Expand Down
3 changes: 2 additions & 1 deletion commands/misc/perms.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ module.exports = {
option.setName("user").setDescription("Select a user")
),
async execute(interaction, client) {
const user = interaction.options.getMember("user");
await interaction.deferReply();
const user = interaction.options.getMember("user");

let userRoles;

Expand Down Expand Up @@ -42,6 +42,7 @@ module.exports = {
embeds: [permsEmbed],
});
} catch (err) {
client.logger(err.message, "error");
await interaction.followUp({
embeds: [
embedMessage(
Expand Down
1 change: 1 addition & 0 deletions commands/misc/serverstats.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ module.exports = {
try {
await interaction.followUp({ embeds: [statssEmbed] });
} catch (err) {
client.logger(err.message, "error");
await interaction.followUp(
`I was not able to fetch the server info, do I have permission ?`
);
Expand Down
3 changes: 2 additions & 1 deletion commands/misc/summon.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ module.exports = {
});

try {
await user.voice.setChannel(interaction.member.voice.channelId);
await interaction.followUp({
embeds: [
embedMessage(
Expand All @@ -46,8 +47,8 @@ module.exports = {
),
],
});
await user.voice.setChannel(interaction.member.voice.channelId);
} catch (err) {
client.logger(err.message, "error");
return await interaction.followUp(
`Something went wrong, I could not summon this user!`
);
Expand Down

0 comments on commit 012f236

Please sign in to comment.