From beccd479c7d325456955d8076e5f0bfcb74dfbab Mon Sep 17 00:00:00 2001 From: CorwinDev <88144943+CorwinDev@users.noreply.github.com> Date: Sat, 10 Dec 2022 16:21:51 +0100 Subject: [PATCH] update --- src/bot.js | 18 +++++++++--------- src/commands/config/leavemessage.js | 4 ++-- src/commands/config/levelmessage.js | 4 ++-- src/commands/config/levels.js | 4 ++-- src/commands/config/setchannelname.js | 4 ++-- src/commands/config/setcolor.js | 4 ++-- src/commands/config/setverify.js | 4 ++-- src/commands/config/ticketmessage.js | 4 ++-- src/commands/config/welcomemessage.js | 4 ++-- src/commands/economy/additem.js | 4 ++-- src/commands/economy/addmoney.js | 4 ++-- src/commands/economy/clear.js | 4 ++-- src/commands/economy/deleteitem.js | 4 ++-- src/commands/economy/removemoney.js | 4 ++-- src/commands/guild/roleinfo.js | 2 +- src/commands/invites/add.js | 4 ++-- src/commands/invites/remove.js | 4 ++-- src/commands/levels/createreward.js | 4 ++-- src/commands/levels/deletereward.js | 4 ++-- src/commands/levels/setlevel.js | 4 ++-- src/commands/levels/setxp.js | 4 ++-- src/commands/messages/add.js | 4 ++-- src/commands/messages/createreward.js | 4 ++-- src/commands/messages/deletereward.js | 4 ++-- src/commands/messages/remove.js | 4 ++-- src/commands/moderation/ban.js | 6 +++--- src/commands/moderation/banlist.js | 4 ++-- src/commands/moderation/clear.js | 4 ++-- src/commands/moderation/clearuser.js | 4 ++-- src/commands/moderation/demote.js | 4 ++-- src/commands/moderation/kick.js | 2 +- src/commands/moderation/lock.js | 4 ++-- src/commands/moderation/lockdown.js | 4 ++-- src/commands/moderation/nuke.js | 4 ++-- src/commands/moderation/softban.js | 6 +++--- src/commands/moderation/tempban.js | 6 +++--- src/commands/moderation/timeout.js | 4 ++-- src/commands/moderation/unban.js | 11 ++++++----- src/commands/moderation/unlock.js | 4 ++-- src/commands/moderation/unwarn.js | 4 ++-- src/commands/moderation/warn.js | 4 ++-- src/commands/moderation/warnings.js | 4 ++-- src/commands/suggestions/accept.js | 4 ++-- src/commands/suggestions/deny.js | 4 ++-- src/commands/tickets/add.js | 4 ++-- src/commands/tickets/claim.js | 4 ++-- src/commands/tickets/delete.js | 4 ++-- src/commands/tickets/lower.js | 4 ++-- src/commands/tickets/notice.js | 4 ++-- src/commands/tickets/open.js | 4 ++-- src/commands/tickets/raise.js | 4 ++-- src/commands/tickets/remove.js | 4 ++-- src/commands/tickets/rename.js | 4 ++-- src/commands/tickets/transcript.js | 4 ++-- src/commands/tickets/unclaim.js | 4 ++-- src/commands/voice/limit.js | 4 ++-- src/commands/voice/lock.js | 4 ++-- src/commands/voice/rename.js | 4 ++-- src/commands/voice/unlock.js | 4 ++-- src/config/emojis.json | 20 ++++++++++---------- src/handlers/functions/functions.js | 3 +-- src/handlers/security/antiad.js | 8 ++++---- src/index.js | 9 +++++++++ src/interactions/Command/announcement.js | 4 ++-- src/interactions/Command/automod.js | 4 ++-- src/interactions/Command/autosetup.js | 4 ++-- src/interactions/Command/commands.js | 4 ++-- src/interactions/Command/embed.js | 4 ++-- src/interactions/Command/giveaway.js | 4 ++-- src/interactions/Command/guild.js | 1 + src/interactions/Command/music.js | 4 ++-- src/interactions/Command/radio.js | 4 ++-- src/interactions/Command/reactionroles.js | 4 ++-- src/interactions/Command/serverstats.js | 4 ++-- src/interactions/Command/setup.js | 4 ++-- src/interactions/Command/stickymessages.js | 4 ++-- src/interactions/ContextMenu/unwarn.js | 4 ++-- src/interactions/ContextMenu/warn.js | 4 ++-- src/interactions/ContextMenu/warnings.js | 4 ++-- 79 files changed, 185 insertions(+), 175 deletions(-) diff --git a/src/bot.js b/src/bot.js index 8f40838..9114718 100644 --- a/src/bot.js +++ b/src/bot.js @@ -21,12 +21,12 @@ const client = new Discord.Client({ "TYPING_START" ], partials: [ - 'USER', - 'CHANNEL', - 'GUILD_MEMBER', - 'MESSAGE', - 'REACTION', - 'GUILD_SCHEDULED_EVENT' + Discord.Partials.Channel, + Discord.Partials.GuildMember, + Discord.Partials.Message, + Discord.Partials.Reaction, + Discord.Partials.User, + Discord.Partials.GuildScheduledEvent ], intents: [ Discord.GatewayIntentBits.Guilds, @@ -44,6 +44,7 @@ const client = new Discord.Client({ Discord.GatewayIntentBits.DirectMessageReactions, Discord.GatewayIntentBits.DirectMessageTyping, Discord.GatewayIntentBits.GuildScheduledEvents, + Discord.GatewayIntentBits.MessageContent ], restTimeOffset: 0 }); @@ -162,9 +163,8 @@ fs.readdirSync('./src/handlers').forEach((dir) => { client.login(process.env.DISCORD_TOKEN); process.on('unhandledRejection', error => { - console.error('Unhandled promise rejection:', error); - if (error.length > 1000) error = error.slice(0, 950) + '... view console for details'; - if (error.stack.length > 1000) error.stack = error.stack.slice(0, 950) + '... view console for details'; + if(error) if (error.length > 950) error = error.slice(0, 950) + '... view console for details'; + if(error.stack) if (error.stack.length > 950) error.stack = error.stack.slice(0, 950) + '... view console for details'; const embed = new Discord.EmbedBuilder() .setTitle(`🚨・Unhandled promise rejection`) .addFields([ diff --git a/src/commands/config/leavemessage.js b/src/commands/config/leavemessage.js index b5f28c0..4685847 100644 --- a/src/commands/config/leavemessage.js +++ b/src/commands/config/leavemessage.js @@ -4,8 +4,8 @@ const inviteMessages = require("../../database/models/inviteMessages"); module.exports = async (client, interaction, args) => { const perms = await client.checkUserPerms({ - flags: [Discord.PermissionsBitField.Flags.MANAGE_MESSAGES], - perms: ["MANAGE_MESSAGES"] + flags: [Discord.PermissionsBitField.Flags.ManageMessages], + perms: [Discord.PermissionsBitField.Flags.ManageMessages] }, interaction) if (perms == false) return; diff --git a/src/commands/config/levelmessage.js b/src/commands/config/levelmessage.js index a963c60..8035a63 100644 --- a/src/commands/config/levelmessage.js +++ b/src/commands/config/levelmessage.js @@ -4,8 +4,8 @@ const Schema = require("../../database/models/levelMessages"); module.exports = async (client, interaction, args) => { const perms = await client.checkUserPerms({ - flags: [Discord.PermissionsBitField.Flags.MANAGE_MESSAGES], - perms: ["MANAGE_MESSAGES"] + flags: [Discord.PermissionsBitField.Flags.ManageMessages], + perms: [Discord.PermissionsBitField.Flags.ManageMessages] }, interaction) if (perms == false) return; diff --git a/src/commands/config/levels.js b/src/commands/config/levels.js index 8cd13bb..2a8cabc 100644 --- a/src/commands/config/levels.js +++ b/src/commands/config/levels.js @@ -4,8 +4,8 @@ const Schema = require("../../database/models/functions"); module.exports = async (client, interaction, args) => { const perms = await client.checkUserPerms({ - flags: [Discord.PermissionsBitField.Flags.MANAGE_MESSAGES], - perms: ["MANAGE_MESSAGES"] + flags: [Discord.PermissionsBitField.Flags.ManageMessages], + perms: [Discord.PermissionsBitField.Flags.ManageMessages] }, interaction) if (perms == false) return; diff --git a/src/commands/config/setchannelname.js b/src/commands/config/setchannelname.js index f1b9f65..446b6bd 100644 --- a/src/commands/config/setchannelname.js +++ b/src/commands/config/setchannelname.js @@ -4,8 +4,8 @@ const Schema = require("../../database/models/stats"); module.exports = async (client, interaction, args) => { const perms = await client.checkUserPerms({ - flags: [Discord.PermissionsBitField.Flags.MANAGE_CHANNELS], - perms: ["MANAGE_CHANNELS"] + flags: [Discord.PermissionsBitField.Flags.ManageChannels], + perms: [Discord.PermissionsBitField.Flags.ManageChannels] }, interaction) if (perms == false) return; diff --git a/src/commands/config/setcolor.js b/src/commands/config/setcolor.js index 3af641f..6f72605 100644 --- a/src/commands/config/setcolor.js +++ b/src/commands/config/setcolor.js @@ -4,8 +4,8 @@ const Schema = require("../../database/models/functions"); module.exports = async (client, interaction, args) => { const perms = await client.checkUserPerms({ - flags: [Discord.PermissionsBitField.Flags.ADMINISTRATOR], - perms: ["ADMINISTRATOR"] + flags: [Discord.PermissionsBitField.Flags.Administrator], + perms: [Discord.PermissionsBitField.Flags.Administrator] }, interaction) if (perms == false) return; diff --git a/src/commands/config/setverify.js b/src/commands/config/setverify.js index c130644..8db1f98 100644 --- a/src/commands/config/setverify.js +++ b/src/commands/config/setverify.js @@ -4,8 +4,8 @@ const Schema = require("../../database/models/verify"); module.exports = async (client, interaction, args) => { const perms = await client.checkUserPerms({ - flags: [Discord.PermissionsBitField.Flags.MANAGE_MESSAGES], - perms: ["MANAGE_MESSAGES"] + flags: [Discord.PermissionsBitField.Flags.ManageMessages], + perms: [Discord.PermissionsBitField.Flags.ManageMessages] }, interaction) if (perms == false) return; diff --git a/src/commands/config/ticketmessage.js b/src/commands/config/ticketmessage.js index 9b9c21e..024ca56 100644 --- a/src/commands/config/ticketmessage.js +++ b/src/commands/config/ticketmessage.js @@ -4,8 +4,8 @@ const Schema = require("../../database/models/ticketMessage"); module.exports = async (client, interaction, args) => { const perms = await client.checkUserPerms({ - flags: [Discord.PermissionsBitField.Flags.MANAGE_MESSAGES], - perms: ["MANAGE_MESSAGES"] + flags: [Discord.PermissionsBitField.Flags.ManageMessages], + perms: [Discord.PermissionsBitField.Flags.ManageMessages] }, interaction) if (perms == false) return; diff --git a/src/commands/config/welcomemessage.js b/src/commands/config/welcomemessage.js index b0a1b63..9607653 100644 --- a/src/commands/config/welcomemessage.js +++ b/src/commands/config/welcomemessage.js @@ -4,8 +4,8 @@ const inviteMessages = require("../../database/models/inviteMessages"); module.exports = async (client, interaction, args) => { const perms = await client.checkUserPerms({ - flags: [Discord.PermissionsBitField.Flags.MANAGE_MESSAGES], - perms: ["MANAGE_MESSAGES"] + flags: [Discord.PermissionsBitField.Flags.ManageMessages], + perms: [Discord.PermissionsBitField.Flags.ManageMessages] }, interaction) if (perms == false) return; diff --git a/src/commands/economy/additem.js b/src/commands/economy/additem.js index c19cca7..87a23cf 100644 --- a/src/commands/economy/additem.js +++ b/src/commands/economy/additem.js @@ -4,8 +4,8 @@ const store = require("../../database/models/economyStore"); module.exports = async (client, interaction, args) => { const perms = await client.checkUserPerms({ - flags: [Discord.PermissionsBitField.Flags.MANAGE_MESSAGES], - perms: ["MANAGE_MESSAGES"] + flags: [Discord.PermissionsBitField.Flags.ManageMessages], + perms: [Discord.PermissionsBitField.Flags.ManageMessages] }, interaction) if (perms == false) return; diff --git a/src/commands/economy/addmoney.js b/src/commands/economy/addmoney.js index d2ab358..d23b357 100644 --- a/src/commands/economy/addmoney.js +++ b/src/commands/economy/addmoney.js @@ -4,8 +4,8 @@ const Schema = require("../../database/models/economy"); module.exports = async (client, interaction, args) => { const perms = await client.checkUserPerms({ - flags: [Discord.PermissionsBitField.Flags.ADMINISTRATOR], - perms: ["ADMINISTRATOR"] + flags: [Discord.PermissionsBitField.Flags.Administrator], + perms: [Discord.PermissionsBitField.Flags.Administrator] }, interaction) if (perms == false) return; diff --git a/src/commands/economy/clear.js b/src/commands/economy/clear.js index 7446a4c..3a6dcc7 100644 --- a/src/commands/economy/clear.js +++ b/src/commands/economy/clear.js @@ -7,8 +7,8 @@ const store = require("../../database/models/economyStore"); module.exports = async (client, interaction, args) => { client.checkPerms({ - flags: [Discord.PermissionsBitField.Flags.ADMINISTRATOR], - perms: ["ADMINISTRATOR"] + flags: [Discord.PermissionsBitField.Flags.Administrator], + perms: [Discord.PermissionsBitField.Flags.Administrator] }, interaction) diff --git a/src/commands/economy/deleteitem.js b/src/commands/economy/deleteitem.js index 7757537..28371f1 100644 --- a/src/commands/economy/deleteitem.js +++ b/src/commands/economy/deleteitem.js @@ -4,8 +4,8 @@ const store = require("../../database/models/economyStore"); module.exports = async (client, interaction, args) => { const perms = await client.checkUserPerms({ - flags: [Discord.PermissionsBitField.Flags.MANAGE_MESSAGES], - perms: ["MANAGE_MESSAGES"] + flags: [Discord.PermissionsBitField.Flags.ManageMessages], + perms: [Discord.PermissionsBitField.Flags.ManageMessages] }, interaction) if (perms == false) return; diff --git a/src/commands/economy/removemoney.js b/src/commands/economy/removemoney.js index face967..e668831 100644 --- a/src/commands/economy/removemoney.js +++ b/src/commands/economy/removemoney.js @@ -4,8 +4,8 @@ const Schema = require("../../database/models/economy"); module.exports = async (client, interaction, args) => { const perms = await client.checkUserPerms({ - flags: [Discord.PermissionsBitField.Flags.ADMINISTRATOR], - perms: ["ADMINISTRATOR"] + flags: [Discord.PermissionsBitField.Flags.Administrator], + perms: [Discord.PermissionsBitField.Flags.Administrator] }, interaction) if (perms == false) return; diff --git a/src/commands/guild/roleinfo.js b/src/commands/guild/roleinfo.js index cb696f9..8afc44b 100644 --- a/src/commands/guild/roleinfo.js +++ b/src/commands/guild/roleinfo.js @@ -2,7 +2,7 @@ const Discord = require('discord.js'); module.exports = async (client, interaction, args) => { const role = interaction.options.getRole('role'); - const perms = new Discord.Permissions(role.permissions.bitfield).toArray(); + const perms = role.permissions.toArray(); client.embed({ title: `ℹ️・Role information`, diff --git a/src/commands/invites/add.js b/src/commands/invites/add.js index eee59d9..8153662 100644 --- a/src/commands/invites/add.js +++ b/src/commands/invites/add.js @@ -7,8 +7,8 @@ module.exports = async (client, interaction, args) => { let amount = interaction.options.getNumber('amount'); const perms = await client.checkUserPerms({ - flags: [Discord.PermissionsBitField.Flags.MANAGE_MESSAGES], - perms: ["MANAGE_MESSAGES"] + flags: [Discord.PermissionsBitField.Flags.ManageMessages], + perms: [Discord.PermissionsBitField.Flags.ManageMessages] }, interaction) if (perms == false) return; diff --git a/src/commands/invites/remove.js b/src/commands/invites/remove.js index b844182..0fbf173 100644 --- a/src/commands/invites/remove.js +++ b/src/commands/invites/remove.js @@ -7,8 +7,8 @@ module.exports = async (client, interaction, args) => { let amount = interaction.options.getNumber('amount'); const perms = await client.checkUserPerms({ - flags: [Discord.PermissionsBitField.Flags.MANAGE_MESSAGES], - perms: ["MANAGE_MESSAGES"] + flags: [Discord.PermissionsBitField.Flags.ManageMessages], + perms: [Discord.PermissionsBitField.Flags.ManageMessages] }, interaction) if (perms == false) return; diff --git a/src/commands/levels/createreward.js b/src/commands/levels/createreward.js index bdf50af..be6688d 100644 --- a/src/commands/levels/createreward.js +++ b/src/commands/levels/createreward.js @@ -7,8 +7,8 @@ module.exports = async (client, interaction, args) => { let role = interaction.options.getRole('role'); const perms = await client.checkUserPerms({ - flags: [Discord.PermissionsBitField.Flags.MANAGE_MESSAGES], - perms: ["MANAGE_MESSAGES"] + flags: [Discord.PermissionsBitField.Flags.ManageMessages], + perms: [Discord.PermissionsBitField.Flags.ManageMessages] }, interaction) if (perms == false) return; diff --git a/src/commands/levels/deletereward.js b/src/commands/levels/deletereward.js index fb99b79..b21c40e 100644 --- a/src/commands/levels/deletereward.js +++ b/src/commands/levels/deletereward.js @@ -6,8 +6,8 @@ module.exports = async (client, interaction, args) => { let level = interaction.options.getNumber('level'); const perms = await client.checkUserPerms({ - flags: [Discord.PermissionsBitField.Flags.MANAGE_MESSAGES], - perms: ["MANAGE_MESSAGES"] + flags: [Discord.PermissionsBitField.Flags.ManageMessages], + perms: [Discord.PermissionsBitField.Flags.ManageMessages] }, interaction) if (perms == false) return; diff --git a/src/commands/levels/setlevel.js b/src/commands/levels/setlevel.js index d10859e..c561202 100644 --- a/src/commands/levels/setlevel.js +++ b/src/commands/levels/setlevel.js @@ -8,8 +8,8 @@ module.exports = async (client, interaction, args) => { const data = await Functions.findOne({ Guild: interaction.guild.id }); const perms = await client.checkUserPerms({ - flags: [Discord.PermissionsBitField.Flags.MANAGE_MESSAGES], - perms: ["MANAGE_MESSAGES"] + flags: [Discord.PermissionsBitField.Flags.ManageMessages], + perms: [Discord.PermissionsBitField.Flags.ManageMessages] }, interaction) if (perms == false) return; diff --git a/src/commands/levels/setxp.js b/src/commands/levels/setxp.js index ea4a97e..83eecfd 100644 --- a/src/commands/levels/setxp.js +++ b/src/commands/levels/setxp.js @@ -8,8 +8,8 @@ module.exports = async (client, interaction, args) => { const data = await Functions.findOne({ Guild: interaction.guild.id }); const perms = await client.checkUserPerms({ - flags: [Discord.PermissionsBitField.Flags.MANAGE_MESSAGES], - perms: ["MANAGE_MESSAGES"] + flags: [Discord.PermissionsBitField.Flags.ManageMessages], + perms: [Discord.PermissionsBitField.Flags.ManageMessages] }, interaction) if (perms == false) return; diff --git a/src/commands/messages/add.js b/src/commands/messages/add.js index 3f039de..1913150 100644 --- a/src/commands/messages/add.js +++ b/src/commands/messages/add.js @@ -7,8 +7,8 @@ module.exports = async (client, interaction, args) => { let amount = interaction.options.getNumber('amount'); const perms = await client.checkUserPerms({ - flags: [Discord.PermissionsBitField.Flags.MANAGE_MESSAGES], - perms: ["MANAGE_MESSAGES"] + flags: [Discord.PermissionsBitField.Flags.ManageMessages], + perms: [Discord.PermissionsBitField.Flags.ManageMessages] }, interaction) if (perms == false) return; diff --git a/src/commands/messages/createreward.js b/src/commands/messages/createreward.js index 030fb4a..829167e 100644 --- a/src/commands/messages/createreward.js +++ b/src/commands/messages/createreward.js @@ -7,8 +7,8 @@ module.exports = async (client, interaction, args) => { let role = interaction.options.getRole('role'); const perms = await client.checkUserPerms({ - flags: [Discord.PermissionsBitField.Flags.MANAGE_MESSAGES], - perms: ["MANAGE_MESSAGES"] + flags: [Discord.PermissionsBitField.Flags.ManageMessages], + perms: [Discord.PermissionsBitField.Flags.ManageMessages] }, interaction) if (perms == false) return; diff --git a/src/commands/messages/deletereward.js b/src/commands/messages/deletereward.js index e16d851..5d75a10 100644 --- a/src/commands/messages/deletereward.js +++ b/src/commands/messages/deletereward.js @@ -6,8 +6,8 @@ module.exports = async (client, interaction, args) => { let messages = interaction.options.getNumber('amount'); const perms = await client.checkUserPerms({ - flags: [Discord.PermissionsBitField.Flags.MANAGE_MESSAGES], - perms: ["MANAGE_MESSAGES"] + flags: [Discord.PermissionsBitField.Flags.ManageMessages], + perms: [Discord.PermissionsBitField.Flags.ManageMessages] }, interaction) if (perms == false) return; diff --git a/src/commands/messages/remove.js b/src/commands/messages/remove.js index e699414..0b41bc7 100644 --- a/src/commands/messages/remove.js +++ b/src/commands/messages/remove.js @@ -7,8 +7,8 @@ module.exports = async (client, interaction, args) => { let amount = interaction.options.getNumber('amount'); const perms = await client.checkUserPerms({ - flags: [Discord.PermissionsBitField.Flags.MANAGE_MESSAGES], - perms: ["MANAGE_MESSAGES"] + flags: [Discord.PermissionsBitField.Flags.ManageMessages], + perms: [Discord.PermissionsBitField.Flags.ManageMessages] }, interaction) if (perms == false) return; diff --git a/src/commands/moderation/ban.js b/src/commands/moderation/ban.js index bd7c630..40da02d 100644 --- a/src/commands/moderation/ban.js +++ b/src/commands/moderation/ban.js @@ -2,8 +2,8 @@ const Discord = require('discord.js'); module.exports = async (client, interaction, args) => { const perms = await client.checkPerms({ - flags: [Discord.PermissionsBitField.Flags.BAN_MEMBERS], - perms: ["BAN_MEMBERS"] + flags: [Discord.PermissionsBitField.Flags.BanMembers], + perms: [Discord.PermissionsBitField.Flags.BanMembers] }, interaction) if (perms == false) return; @@ -11,7 +11,7 @@ module.exports = async (client, interaction, args) => { const member = await interaction.guild.members.fetch(interaction.options.getUser('user').id); const reason = interaction.options.getString('reason') || 'Not given'; - if (member.permissions.has(Discord.PermissionsBitField.Flags.BAN_MEMBERS) || member.permissions.has(Discord.PermissionsBitField.Flags.BAN_MEMBERS)) return client.errNormal({ + if (member.permissions.has(Discord.PermissionsBitField.Flags.BanMembers) || member.permissions.has(Discord.PermissionsBitField.Flags.BanMembers)) return client.errNormal({ error: "You can't ban a moderator", type: 'editreply' }, interaction); diff --git a/src/commands/moderation/banlist.js b/src/commands/moderation/banlist.js index 08de005..109b2e9 100644 --- a/src/commands/moderation/banlist.js +++ b/src/commands/moderation/banlist.js @@ -2,8 +2,8 @@ const Discord = require('discord.js'); module.exports = async (client, interaction, args) => { const perms = await client.checkPerms({ - flags: [Discord.PermissionsBitField.Flags.BAN_MEMBERS], - perms: ["BAN_MEMBERS"] + flags: [Discord.PermissionsBitField.Flags.BanMembers], + perms: [Discord.PermissionsBitField.Flags.BanMembers] }, interaction) if (perms == false) return; diff --git a/src/commands/moderation/clear.js b/src/commands/moderation/clear.js index a6cafd3..2bd713d 100644 --- a/src/commands/moderation/clear.js +++ b/src/commands/moderation/clear.js @@ -2,8 +2,8 @@ const Discord = require('discord.js'); module.exports = async (client, interaction, args) => { const perms = await client.checkPerms({ - flags: [Discord.PermissionsBitField.Flags.MANAGE_MESSAGES], - perms: ["MANAGE_MESSAGES"] + flags: [Discord.PermissionsBitField.Flags.ManageMessages], + perms: [Discord.PermissionsBitField.Flags.ManageMessages] }, interaction); if (perms == false) return; diff --git a/src/commands/moderation/clearuser.js b/src/commands/moderation/clearuser.js index 1f8080a..330ed11 100644 --- a/src/commands/moderation/clearuser.js +++ b/src/commands/moderation/clearuser.js @@ -2,8 +2,8 @@ const Discord = require('discord.js'); module.exports = async (client, interaction, args) => { const perms = await client.checkPerms({ - flags: [Discord.PermissionsBitField.Flags.MANAGE_MESSAGES], - perms: ["MANAGE_MESSAGES"] + flags: [Discord.PermissionsBitField.Flags.ManageMessages], + perms: [Discord.PermissionsBitField.Flags.ManageMessages] }, interaction); if (perms == false) return; diff --git a/src/commands/moderation/demote.js b/src/commands/moderation/demote.js index da0cb89..ae6664a 100644 --- a/src/commands/moderation/demote.js +++ b/src/commands/moderation/demote.js @@ -2,8 +2,8 @@ const Discord = require('discord.js'); module.exports = async (client, interaction, args) => { const perms = await client.checkPerms({ - flags: [Discord.PermissionsBitField.Flags.BAN_MEMBERS], - perms: ["BAN_MEMBERS"] + flags: [Discord.PermissionsBitField.Flags.BanMembers], + perms: [Discord.PermissionsBitField.Flags.BanMembers] }, interaction) if (perms == false) return; diff --git a/src/commands/moderation/kick.js b/src/commands/moderation/kick.js index 20a05f9..8aa82ea 100644 --- a/src/commands/moderation/kick.js +++ b/src/commands/moderation/kick.js @@ -3,7 +3,7 @@ const Discord = require('discord.js'); module.exports = async (client, interaction, args) => { const perms = await client.checkPerms({ flags: [Discord.PermissionsBitField.Flags.KICK_MEMBERS], - perms: ["KICK_MEMBERS"] + perms: [Discord.PermissionsBitField.Flags.KickMembers] }, interaction) if (perms == false) return; diff --git a/src/commands/moderation/lock.js b/src/commands/moderation/lock.js index 808f175..15c7063 100644 --- a/src/commands/moderation/lock.js +++ b/src/commands/moderation/lock.js @@ -2,8 +2,8 @@ const Discord = require('discord.js'); module.exports = async (client, interaction, args) => { const perms = await client.checkPerms({ - flags: [Discord.PermissionsBitField.Flags.MANAGE_CHANNELS], - perms: ["MANAGE_CHANNELS"] + flags: [Discord.PermissionsBitField.Flags.ManageChannels], + perms: [Discord.PermissionsBitField.Flags.ManageChannels] }, interaction); if (perms == false) return; diff --git a/src/commands/moderation/lockdown.js b/src/commands/moderation/lockdown.js index 3df833c..2a361db 100644 --- a/src/commands/moderation/lockdown.js +++ b/src/commands/moderation/lockdown.js @@ -2,8 +2,8 @@ const Discord = require('discord.js'); module.exports = async (client, interaction, args) => { const perms = await client.checkPerms({ - flags: [Discord.PermissionsBitField.Flags.MANAGE_CHANNELS], - perms: ["MANAGE_CHANNELS"] + flags: [Discord.PermissionsBitField.Flags.ManageChannels], + perms: [Discord.PermissionsBitField.Flags.ManageChannels] }, interaction); if (perms == false) return; diff --git a/src/commands/moderation/nuke.js b/src/commands/moderation/nuke.js index b2bbd21..5039faf 100644 --- a/src/commands/moderation/nuke.js +++ b/src/commands/moderation/nuke.js @@ -2,8 +2,8 @@ const Discord = require('discord.js'); module.exports = async (client, interaction, args) => { const perms = await client.checkPerms({ - flags: [Discord.PermissionsBitField.Flags.MANAGE_CHANNELS], - perms: ["MANAGE_CHANNELS"] + flags: [Discord.PermissionsBitField.Flags.ManageChannels], + perms: [Discord.PermissionsBitField.Flags.ManageChannels] }, interaction); if (perms == false) return; diff --git a/src/commands/moderation/softban.js b/src/commands/moderation/softban.js index a06f361..e417e4d 100644 --- a/src/commands/moderation/softban.js +++ b/src/commands/moderation/softban.js @@ -2,8 +2,8 @@ const Discord = require('discord.js'); module.exports = async (client, interaction, args) => { const perms = await client.checkPerms({ - flags: [Discord.PermissionsBitField.Flags.BAN_MEMBERS], - perms: ["BAN_MEMBERS"] + flags: [Discord.PermissionsBitField.Flags.BanMembers], + perms: [Discord.PermissionsBitField.Flags.BanMembers] }, interaction) if (perms == false) return; @@ -11,7 +11,7 @@ module.exports = async (client, interaction, args) => { const member = await interaction.guild.members.fetch(interaction.options.getUser('user').id); const reason = interaction.options.getString('reason') || 'Not given'; - if (member.permissions.has(Discord.PermissionsBitField.Flags.BAN_MEMBERS) || member.permissions.has(Discord.PermissionsBitField.Flags.BAN_MEMBERS)) return client.errNormal({ + if (member.permissions.has(Discord.PermissionsBitField.Flags.BanMembers) || member.permissions.has(Discord.PermissionsBitField.Flags.BanMembers)) return client.errNormal({ error: "You can't ban a moderator", type: 'editreply' }, interaction); diff --git a/src/commands/moderation/tempban.js b/src/commands/moderation/tempban.js index 4b5b8db..2433af0 100644 --- a/src/commands/moderation/tempban.js +++ b/src/commands/moderation/tempban.js @@ -4,8 +4,8 @@ const TempSchema = require("../../database/models/tempban"); module.exports = async (client, interaction, args) => { const perms = await client.checkPerms({ - flags: [Discord.PermissionsBitField.Flags.BAN_MEMBERS], - perms: ["BAN_MEMBERS"] + flags: [Discord.PermissionsBitField.Flags.BanMembers], + perms: [Discord.PermissionsBitField.Flags.BanMembers] }, interaction) if (perms == false) return; @@ -13,7 +13,7 @@ module.exports = async (client, interaction, args) => { const member = await interaction.guild.members.fetch(interaction.options.getUser('user').id); const reason = interaction.options.getString('reason') || 'Not given'; - if (member.permissions.has(Discord.PermissionsBitField.Flags.BAN_MEMBERS) || member.permissions.has(Discord.PermissionsBitField.Flags.BAN_MEMBERS)) return client.errNormal({ + if (member.permissions.has(Discord.PermissionsBitField.Flags.BanMembers) || member.permissions.has(Discord.PermissionsBitField.Flags.BanMembers)) return client.errNormal({ error: "You can't ban a moderator", type: 'editreply' }, interaction); diff --git a/src/commands/moderation/timeout.js b/src/commands/moderation/timeout.js index a94d008..376dc86 100644 --- a/src/commands/moderation/timeout.js +++ b/src/commands/moderation/timeout.js @@ -2,8 +2,8 @@ const Discord = require('discord.js'); module.exports = async (client, interaction, args) => { const perms = await client.checkPerms({ - flags: [Discord.PermissionsBitField.Flags.MODERATE_MEMBERS], - perms: ["MODERATE_MEMBERS"] + flags: [Discord.PermissionsBitField.Flags.ModerateMembers], + perms: [Discord.PermissionsBitField.Flags.ModerateMembers] }, interaction); if (perms == false) return; diff --git a/src/commands/moderation/unban.js b/src/commands/moderation/unban.js index 55b4c27..1974f41 100644 --- a/src/commands/moderation/unban.js +++ b/src/commands/moderation/unban.js @@ -2,25 +2,26 @@ const Discord = require('discord.js'); module.exports = async (client, interaction, args) => { const perms = await client.checkPerms({ - flags: [Discord.PermissionsBitField.Flags.BAN_MEMBERS], - perms: ["BAN_MEMBERS"] + flags: [Discord.PermissionsBitField.Flags.BanMembers], + perms: [Discord.PermissionsBitField.Flags.BanMembers] }, interaction) if (perms == false) return; - interaction.guild.members.unban(interaction.options.getString('user')).then(function () { + interaction.guild.members.unban(interaction.options.getString('user')).then(async function () { + var member = await interaction.guild.members.cache.get(interaction.options.getString('user')); client.succNormal({ text: "The specified user has been successfully unbanned!", fields: [ { name: "👤┆User", - value: member.user.tag, + value: member ? member.user.tag : interaction.options.getString('user'), inline: true } ], type: 'editreply' }, interaction); - }).catch(function () { + }).catch(function (e) { return client.errNormal({ error: `I could not find the user!`, type: 'editreply' diff --git a/src/commands/moderation/unlock.js b/src/commands/moderation/unlock.js index 6a86fe3..5482bc1 100644 --- a/src/commands/moderation/unlock.js +++ b/src/commands/moderation/unlock.js @@ -2,8 +2,8 @@ const Discord = require('discord.js'); module.exports = async (client, interaction, args) => { const perms = await client.checkPerms({ - flags: [Discord.PermissionsBitField.Flags.MANAGE_CHANNELS], - perms: ["MANAGE_CHANNELS"] + flags: [Discord.PermissionsBitField.Flags.ManageChannels], + perms: [Discord.PermissionsBitField.Flags.ManageChannels] }, interaction); if (perms == false) return; diff --git a/src/commands/moderation/unwarn.js b/src/commands/moderation/unwarn.js index a58602b..782c9b6 100644 --- a/src/commands/moderation/unwarn.js +++ b/src/commands/moderation/unwarn.js @@ -4,8 +4,8 @@ const Schema = require("../../database/models/warnings"); module.exports = async (client, interaction, args) => { const perms = await client.checkUserPerms({ - flags: [Discord.PermissionsBitField.Flags.MANAGE_MESSAGES], - perms: ["MANAGE_MESSAGES"] + flags: [Discord.PermissionsBitField.Flags.ManageMessages], + perms: [Discord.PermissionsBitField.Flags.ManageMessages] }, interaction); if (perms == false) return; diff --git a/src/commands/moderation/warn.js b/src/commands/moderation/warn.js index f0fc88d..6ee7694 100644 --- a/src/commands/moderation/warn.js +++ b/src/commands/moderation/warn.js @@ -4,8 +4,8 @@ const Schema = require("../../database/models/warnings"); module.exports = async (client, interaction, args) => { const perms = await client.checkUserPerms({ - flags: [Discord.PermissionsBitField.Flags.MANAGE_MESSAGES], - perms: ["MANAGE_MESSAGES"] + flags: [Discord.PermissionsBitField.Flags.ManageMessages], + perms: [Discord.PermissionsBitField.Flags.ManageMessages] }, interaction); if (perms == false) return; diff --git a/src/commands/moderation/warnings.js b/src/commands/moderation/warnings.js index 6e751bf..302d788 100644 --- a/src/commands/moderation/warnings.js +++ b/src/commands/moderation/warnings.js @@ -4,8 +4,8 @@ const Schema = require("../../database/models/warnings"); module.exports = async (client, interaction, args) => { const perms = await client.checkUserPerms({ - flags: [Discord.PermissionsBitField.Flags.MANAGE_MESSAGES], - perms: ["MANAGE_MESSAGES"] + flags: [Discord.PermissionsBitField.Flags.ManageMessages], + perms: [Discord.PermissionsBitField.Flags.ManageMessages] }, interaction); if (perms == false) return; diff --git a/src/commands/suggestions/accept.js b/src/commands/suggestions/accept.js index 36814b2..b3c05f8 100644 --- a/src/commands/suggestions/accept.js +++ b/src/commands/suggestions/accept.js @@ -4,8 +4,8 @@ const Schema = require("../../database/models/suggestionChannels"); module.exports = async (client, interaction, args) => { const perms = await client.checkUserPerms({ - flags: [Discord.PermissionsBitField.Flags.MANAGE_MESSAGES], - perms: ["MANAGE_MESSAGES"] + flags: [Discord.PermissionsBitField.Flags.ManageMessages], + perms: [Discord.PermissionsBitField.Flags.ManageMessages] }, interaction) if (perms == false) return; diff --git a/src/commands/suggestions/deny.js b/src/commands/suggestions/deny.js index 34f9e10..076f7d1 100644 --- a/src/commands/suggestions/deny.js +++ b/src/commands/suggestions/deny.js @@ -4,8 +4,8 @@ const Schema = require("../../database/models/suggestionChannels"); module.exports = async (client, interaction, args) => { const perms = await client.checkUserPerms({ - flags: [Discord.PermissionsBitField.Flags.MANAGE_MESSAGES], - perms: ["MANAGE_MESSAGES"] + flags: [Discord.PermissionsBitField.Flags.ManageMessages], + perms: [Discord.PermissionsBitField.Flags.ManageMessages] }, interaction) if (perms == false) return; diff --git a/src/commands/tickets/add.js b/src/commands/tickets/add.js index 396b630..77ace1e 100644 --- a/src/commands/tickets/add.js +++ b/src/commands/tickets/add.js @@ -6,8 +6,8 @@ module.exports = async (client, interaction, args) => { const data = await ticketSchema.findOne({ Guild: interaction.guild.id }); const perms = await client.checkUserPerms({ - flags: [Discord.PermissionsBitField.Flags.MANAGE_MESSAGES], - perms: ["MANAGE_MESSAGES"] + flags: [Discord.PermissionsBitField.Flags.ManageMessages], + perms: [Discord.PermissionsBitField.Flags.ManageMessages] }, interaction) if (perms == false) return; diff --git a/src/commands/tickets/claim.js b/src/commands/tickets/claim.js index 10dcd8c..e1e60e2 100644 --- a/src/commands/tickets/claim.js +++ b/src/commands/tickets/claim.js @@ -13,8 +13,8 @@ module.exports = async (client, interaction, args) => { if (ticketData) { if (interaction.user.id !== ticketData.creator) { const perms = await client.checkUserPerms({ - flags: [Discord.PermissionsBitField.Flags.MANAGE_MESSAGES], - perms: ["MANAGE_MESSAGES"] + flags: [Discord.PermissionsBitField.Flags.ManageMessages], + perms: [Discord.PermissionsBitField.Flags.ManageMessages] }, interaction) if (perms == false) return; diff --git a/src/commands/tickets/delete.js b/src/commands/tickets/delete.js index 49823a4..ba2697c 100644 --- a/src/commands/tickets/delete.js +++ b/src/commands/tickets/delete.js @@ -5,8 +5,8 @@ const ticketChannels = require("../../database/models/ticketChannels"); module.exports = async (client, interaction, args) => { const perms = await client.checkUserPerms({ - flags: [Discord.PermissionsBitField.Flags.MANAGE_MESSAGES], - perms: ["MANAGE_MESSAGES"] + flags: [Discord.PermissionsBitField.Flags.ManageMessages], + perms: [Discord.PermissionsBitField.Flags.ManageMessages] }, interaction) if (perms == false) return; diff --git a/src/commands/tickets/lower.js b/src/commands/tickets/lower.js index e136abd..24b3272 100644 --- a/src/commands/tickets/lower.js +++ b/src/commands/tickets/lower.js @@ -5,8 +5,8 @@ const ticketChannels = require("../../database/models/ticketChannels"); module.exports = async (client, interaction, args) => { const perms = await client.checkUserPerms({ - flags: [Discord.PermissionsBitField.Flags.MANAGE_MESSAGES], - perms: ["MANAGE_MESSAGES"] + flags: [Discord.PermissionsBitField.Flags.ManageMessages], + perms: [Discord.PermissionsBitField.Flags.ManageMessages] }, interaction) if (perms == false) return; diff --git a/src/commands/tickets/notice.js b/src/commands/tickets/notice.js index 1971930..3f50321 100644 --- a/src/commands/tickets/notice.js +++ b/src/commands/tickets/notice.js @@ -5,8 +5,8 @@ const ticketChannels = require("../../database/models/ticketChannels"); module.exports = async (client, interaction, args) => { const perms = await client.checkUserPerms({ - flags: [Discord.PermissionsBitField.Flags.MANAGE_MESSAGES], - perms: ["MANAGE_MESSAGES"] + flags: [Discord.PermissionsBitField.Flags.ManageMessages], + perms: [Discord.PermissionsBitField.Flags.ManageMessages] }, interaction) if (perms == false) return; diff --git a/src/commands/tickets/open.js b/src/commands/tickets/open.js index 16d9f08..d829e96 100644 --- a/src/commands/tickets/open.js +++ b/src/commands/tickets/open.js @@ -5,8 +5,8 @@ const ticketChannels = require("../../database/models/ticketChannels"); module.exports = async (client, interaction, args) => { const perms = await client.checkUserPerms({ - flags: [Discord.PermissionsBitField.Flags.MANAGE_MESSAGES], - perms: ["MANAGE_MESSAGES"] + flags: [Discord.PermissionsBitField.Flags.ManageMessages], + perms: [Discord.PermissionsBitField.Flags.ManageMessages] }, interaction) if (perms == false) return; diff --git a/src/commands/tickets/raise.js b/src/commands/tickets/raise.js index 1c54cad..2e1155d 100644 --- a/src/commands/tickets/raise.js +++ b/src/commands/tickets/raise.js @@ -5,8 +5,8 @@ const ticketChannels = require("../../database/models/ticketChannels"); module.exports = async (client, interaction, args) => { const perms = await client.checkUserPerms({ - flags: [Discord.PermissionsBitField.Flags.MANAGE_MESSAGES], - perms: ["MANAGE_MESSAGES"] + flags: [Discord.PermissionsBitField.Flags.ManageMessages], + perms: [Discord.PermissionsBitField.Flags.ManageMessages] }, interaction) if (perms == false) return; diff --git a/src/commands/tickets/remove.js b/src/commands/tickets/remove.js index c72542b..44a317a 100644 --- a/src/commands/tickets/remove.js +++ b/src/commands/tickets/remove.js @@ -8,8 +8,8 @@ module.exports = async (client, interaction, args) => { const ticketData = await ticketChannels.findOne({ Guild: interaction.guild.id, channelID: interaction.channel.id }); const perms = await client.checkUserPerms({ - flags: [Discord.PermissionsBitField.Flags.MANAGE_MESSAGES], - perms: ["MANAGE_MESSAGES"] + flags: [Discord.PermissionsBitField.Flags.ManageMessages], + perms: [Discord.PermissionsBitField.Flags.ManageMessages] }, interaction) if (perms == false) return; diff --git a/src/commands/tickets/rename.js b/src/commands/tickets/rename.js index 6aa339b..c4ebf1c 100644 --- a/src/commands/tickets/rename.js +++ b/src/commands/tickets/rename.js @@ -6,8 +6,8 @@ module.exports = async (client, interaction, args) => { const data = await ticketSchema.findOne({ Guild: interaction.guild.id }); const perms = await client.checkUserPerms({ - flags: [Discord.PermissionsBitField.Flags.MANAGE_MESSAGES], - perms: ["MANAGE_MESSAGES"] + flags: [Discord.PermissionsBitField.Flags.ManageMessages], + perms: [Discord.PermissionsBitField.Flags.ManageMessages] }, interaction) if (perms == false) return; diff --git a/src/commands/tickets/transcript.js b/src/commands/tickets/transcript.js index 8cd2d52..a13fe52 100644 --- a/src/commands/tickets/transcript.js +++ b/src/commands/tickets/transcript.js @@ -5,8 +5,8 @@ const ticketChannels = require("../../database/models/ticketChannels"); module.exports = async (client, interaction, args) => { const perms = await client.checkUserPerms({ - flags: [Discord.PermissionsBitField.Flags.MANAGE_MESSAGES], - perms: ["MANAGE_MESSAGES"] + flags: [Discord.PermissionsBitField.Flags.ManageMessages], + perms: [Discord.PermissionsBitField.Flags.ManageMessages] }, interaction) if (perms == false) return; diff --git a/src/commands/tickets/unclaim.js b/src/commands/tickets/unclaim.js index 69b4654..1d8afe3 100644 --- a/src/commands/tickets/unclaim.js +++ b/src/commands/tickets/unclaim.js @@ -10,8 +10,8 @@ module.exports = async (client, interaction, args) => { if (ticketData) { if (interaction.user.id !== ticketData.creator) { const perms = await client.checkUserPerms({ - flags: [Discord.PermissionsBitField.Flags.MANAGE_MESSAGES], - perms: ["MANAGE_MESSAGES"] + flags: [Discord.PermissionsBitField.Flags.ManageMessages], + perms: [Discord.PermissionsBitField.Flags.ManageMessages] }, interaction) if (perms == false) return; diff --git a/src/commands/voice/limit.js b/src/commands/voice/limit.js index 8e26349..6689bcc 100644 --- a/src/commands/voice/limit.js +++ b/src/commands/voice/limit.js @@ -2,8 +2,8 @@ const Discord = require('discord.js'); module.exports = async (client, interaction, args) => { const perms = await client.checkBotPerms({ - flags: [Discord.PermissionsBitField.Flags.MANAGE_CHANNELS], - perms: ["MANAGE_CHANNELS"] + flags: [Discord.PermissionsBitField.Flags.ManageChannels], + perms: [Discord.PermissionsBitField.Flags.ManageChannels] }, interaction) if (perms == false) return; diff --git a/src/commands/voice/lock.js b/src/commands/voice/lock.js index 085bab4..ca56a3c 100644 --- a/src/commands/voice/lock.js +++ b/src/commands/voice/lock.js @@ -2,8 +2,8 @@ const Discord = require('discord.js'); module.exports = async (client, interaction, args) => { const perms = await client.checkBotPerms({ - flags: [Discord.PermissionsBitField.Flags.MANAGE_CHANNELS], - perms: ["MANAGE_CHANNELS"] + flags: [Discord.PermissionsBitField.Flags.ManageChannels], + perms: [Discord.PermissionsBitField.Flags.ManageChannels] }, interaction) if (perms == false) return; diff --git a/src/commands/voice/rename.js b/src/commands/voice/rename.js index a275a7c..46f30a9 100644 --- a/src/commands/voice/rename.js +++ b/src/commands/voice/rename.js @@ -2,8 +2,8 @@ const Discord = require('discord.js'); module.exports = async (client, interaction, args) => { const perms = await client.checkBotPerms({ - flags: [Discord.PermissionsBitField.Flags.MANAGE_CHANNELS], - perms: ["MANAGE_CHANNELS"] + flags: [Discord.PermissionsBitField.Flags.ManageChannels], + perms: [Discord.PermissionsBitField.Flags.ManageChannels] }, interaction) if (perms == false) return; diff --git a/src/commands/voice/unlock.js b/src/commands/voice/unlock.js index f6d9de1..26aad1e 100644 --- a/src/commands/voice/unlock.js +++ b/src/commands/voice/unlock.js @@ -2,8 +2,8 @@ const Discord = require('discord.js'); module.exports = async (client, interaction, args) => { const perms = await client.checkBotPerms({ - flags: [Discord.PermissionsBitField.Flags.MANAGE_CHANNELS], - perms: ["MANAGE_CHANNELS"] + flags: [Discord.PermissionsBitField.Flags.ManageChannels], + perms: [Discord.PermissionsBitField.Flags.ManageChannels] }, interaction) if (perms == false) return; diff --git a/src/config/emojis.json b/src/config/emojis.json index b330ca8..56d88e0 100644 --- a/src/config/emojis.json +++ b/src/config/emojis.json @@ -1,15 +1,15 @@ { "normal": { - "error": "<:error:898486909070876672>", - "check": "<:check:898486908907315201>", - "music": "<:music:830897792665911306>", - "volume": "<:speaker:898486908819226626>", - "ball": "<:8ball:898486908798238722>", - "christmas": "<:christmas_tree:819983426832302110>", - "heart": "<:heart:898486909033148416>", - "paper": "<:paper:898486909175726151>", - "scissors": "<:scissor:898486909020536842>", - "stone": "<:rock:898486908991205377>", + "error": "<:error:1051149558706610278>", + "check": "<:check:1051149610674028574>", + "music": "🎵", + "volume": "🔉", + "ball": "🎱", + "christmas": "🎄", + "heart": "❤️", + "paper": "📰", + "scissors": "✂️", + "stone": "🪨", "pong": "<:ping_pong:898486909028945950>", "birthday": "<:birthday:898486908932456560>", "clock": "<:clock:898486909158981682>", diff --git a/src/handlers/functions/functions.js b/src/handlers/functions/functions.js index e73a4e1..b520ffb 100644 --- a/src/handlers/functions/functions.js +++ b/src/handlers/functions/functions.js @@ -22,8 +22,7 @@ module.exports = async (client) => { return false } - - if (!interaction.guild.me.permissions.has(flags[i])) { + if (!interaction.guild.members.me.permissions.has(flags[i])) { client.errNoPerms({ perms: perms[i], type: 'editreply' diff --git a/src/handlers/security/antiad.js b/src/handlers/security/antiad.js index 8c51b58..1042911 100644 --- a/src/handlers/security/antiad.js +++ b/src/handlers/security/antiad.js @@ -16,7 +16,7 @@ module.exports = (client) => { if (code) { Schema2.findOne({ Guild: message.guild.id }, async (err, data2) => { if (data2) { - if (data2.Channels.includes(message.channel.id) || message.member.permissions.has(Discord.PermissionsBitField.Flags.MANAGE_MESSAGES)) { + if (data2.Channels.includes(message.channel.id) || message.member.permissions.has(Discord.PermissionsBitField.Flags.ManageMessages)) { return; } @@ -48,7 +48,7 @@ module.exports = (client) => { if (content.includes('http://') || content.includes('https://') || content.includes('www.')) { Schema2.findOne({ Guild: message.guild.id }, async (err, data2) => { if (data2) { - if (data2.Channels.includes(message.channel.id) || message.member.permissions.has(Discord.PermissionsBitField.Flags.MANAGE_MESSAGES)) { + if (data2.Channels.includes(message.channel.id) || message.member.permissions.has(Discord.PermissionsBitField.Flags.ManageMessages)) { return; } @@ -92,7 +92,7 @@ module.exports = (client) => { if (code) { Schema2.findOne({ Guild: newMessage.guild.id }, async (err, data2) => { if (data2) { - if (data2.Channels.includes(newMessage.channel.id) || newMessage.member.permissions.has(Discord.PermissionsBitField.Flags.MANAGE_MESSAGES)) { + if (data2.Channels.includes(newMessage.channel.id) || newMessage.member.permissions.has(Discord.PermissionsBitField.Flags.ManageMessages)) { return; } @@ -126,7 +126,7 @@ module.exports = (client) => { if (content.includes('http://') || content.includes('https://') || content.includes('www.')) { Schema2.findOne({ Guild: newMessage.guild.id }, async (err, data2) => { if (data2) { - if (data2.Channels.includes(newMessage.channel.id) || newMessage.member.permissions.has(Discord.PermissionsBitField.Flags.MANAGE_MESSAGES)) { + if (data2.Channels.includes(newMessage.channel.id) || newMessage.member.permissions.has(Discord.PermissionsBitField.Flags.ManageMessages)) { return; } diff --git a/src/index.js b/src/index.js index c3cc67c..3df6a5e 100644 --- a/src/index.js +++ b/src/index.js @@ -1,6 +1,15 @@ const Discord = require('discord.js'); const chalk = require('chalk'); require('dotenv').config('./.env'); +const axios = require('axios'); +// Check if is up to date +const { version } = require('.././package.json'); +axios.get('https://api.github.com/repos/CorwinDev/Discord-Bot/releases/latest').then(res => { + if (res.data.tag_name !== version) { + console.log(chalk.red.bgYellow(`Your bot is not up to date! Please update to the latest version!`, version + ' -> ' + res.data.tag_name)); + } +}); + const webhook = require("./config/webhooks.json"); const config = require("./config/bot.js"); diff --git a/src/interactions/Command/announcement.js b/src/interactions/Command/announcement.js index 3ba0996..437466a 100644 --- a/src/interactions/Command/announcement.js +++ b/src/interactions/Command/announcement.js @@ -35,8 +35,8 @@ module.exports = { run: async (client, interaction, args) => { const perms = await client.checkUserPerms({ - flags: [Discord.PermissionsBitField.Flags.MANAGE_MESSAGES], - perms: ["MANAGE_MESSAGES"] + flags: [Discord.PermissionsBitField.Flags.ManageMessages], + perms: [Discord.PermissionsBitField.Flags.ManageMessages] }, interaction) if (perms == false) return; diff --git a/src/interactions/Command/automod.js b/src/interactions/Command/automod.js index 0636593..5892539 100644 --- a/src/interactions/Command/automod.js +++ b/src/interactions/Command/automod.js @@ -77,8 +77,8 @@ module.exports = { run: async (client, interaction, args) => { const perms = await client.checkUserPerms({ - flags: [Discord.PermissionsBitField.Flags.MANAGE_MESSAGES], - perms: ["MANAGE_MESSAGES"] + flags: [Discord.PermissionsBitField.Flags.ManageMessages], + perms: [Discord.PermissionsBitField.Flags.ManageMessages] }, interaction) if (perms == false) return; diff --git a/src/interactions/Command/autosetup.js b/src/interactions/Command/autosetup.js index 1cce61a..a57d443 100644 --- a/src/interactions/Command/autosetup.js +++ b/src/interactions/Command/autosetup.js @@ -94,8 +94,8 @@ module.exports = { run: async (client, interaction, args) => { const perms = await client.checkUserPerms({ - flags: [Discord.PermissionsBitField.Flags.ADMINISTRATOR], - perms: ["ADMINISTRATOR"] + flags: [Discord.PermissionsBitField.Flags.Administrator], + perms: [Discord.PermissionsBitField.Flags.Administrator] }, interaction) if (perms == false) return; diff --git a/src/interactions/Command/commands.js b/src/interactions/Command/commands.js index ed740f4..d368be3 100644 --- a/src/interactions/Command/commands.js +++ b/src/interactions/Command/commands.js @@ -36,8 +36,8 @@ module.exports = { run: async (client, interaction, args) => { const perms = await client.checkUserPerms({ - flags: [Discord.PermissionsBitField.Flags.MANAGE_MESSAGES], - perms: ["MANAGE_MESSAGES"] + flags: [Discord.PermissionsBitField.Flags.ManageMessages], + perms: [Discord.PermissionsBitField.Flags.ManageMessages] }, interaction) if (perms == false) return; diff --git a/src/interactions/Command/embed.js b/src/interactions/Command/embed.js index 9f438bc..c8da0a7 100644 --- a/src/interactions/Command/embed.js +++ b/src/interactions/Command/embed.js @@ -23,8 +23,8 @@ module.exports = { run: async (client, interaction, args) => { const perms = await client.checkPerms( { - flags: [Discord.PermissionsBitField.Flags.MANAGE_MESSAGES], - perms: ["MANAGE_MESSAGES"], + flags: [Discord.PermissionsBitField.Flags.ManageMessages], + perms: [Discord.PermissionsBitField.Flags.ManageMessages], }, interaction ); diff --git a/src/interactions/Command/giveaway.js b/src/interactions/Command/giveaway.js index baced8b..b8e5952 100644 --- a/src/interactions/Command/giveaway.js +++ b/src/interactions/Command/giveaway.js @@ -76,8 +76,8 @@ module.exports = { run: async (client, interaction, args) => { const perms = await client.checkUserPerms({ - flags: [Discord.PermissionsBitField.Flags.MANAGE_MESSAGES], - perms: ["MANAGE_MESSAGES"] + flags: [Discord.PermissionsBitField.Flags.ManageMessages], + perms: [Discord.PermissionsBitField.Flags.ManageMessages] }, interaction) if (perms == false) return; diff --git a/src/interactions/Command/guild.js b/src/interactions/Command/guild.js index d2a6eed..00fd547 100644 --- a/src/interactions/Command/guild.js +++ b/src/interactions/Command/guild.js @@ -43,6 +43,7 @@ module.exports = { .setName('stealemoji') .setDescription('Steal an emoji') .addStringOption(option => option.setName('emoji').setDescription('Enter an emoji to steal').setRequired(true)) + .addRoleOption(option => option.setName('role').setDescription('Select a role').setRequired(false)) ) .addSubcommand(subcommand => subcommand diff --git a/src/interactions/Command/music.js b/src/interactions/Command/music.js index d0145e2..f3fc5aa 100644 --- a/src/interactions/Command/music.js +++ b/src/interactions/Command/music.js @@ -122,8 +122,8 @@ module.exports = { run: async (client, interaction, args) => { client.checkBotPerms({ - flags: [Discord.PermissionsBitField.Flags.CONNECT, Discord.PermissionsBitField.Flags.SPEAK], - perms: ["CONNECT", "SPEAK"] + flags: [Discord.PermissionsBitField.Flags.Connect, Discord.PermissionsBitField.Flags.Speak], + perms: [Discord.PermissionsBitField.Flags.Connect, Discord.PermissionsBitField.Flags.Speak] }, interaction) client.loadSubcommands(client, interaction, args); diff --git a/src/interactions/Command/radio.js b/src/interactions/Command/radio.js index ea7d225..02b789c 100644 --- a/src/interactions/Command/radio.js +++ b/src/interactions/Command/radio.js @@ -37,8 +37,8 @@ module.exports = { run: async (client, interaction, args) => { client.checkBotPerms({ - flags: [Discord.PermissionsBitField.Flags.CONNECT, Discord.PermissionsBitField.Flags.SPEAK], - perms: ["CONNECT", "SPEAK"] + flags: [Discord.PermissionsBitField.Flags.Connect, Discord.PermissionsBitField.Flags.Speak], + perms: [Discord.PermissionsBitField.Flags.Connect, Discord.PermissionsBitField.Flags.Speak] }, interaction) if (!interaction.member.voice.channel) return client.errNormal({ diff --git a/src/interactions/Command/reactionroles.js b/src/interactions/Command/reactionroles.js index 9c3aa07..7aaff52 100644 --- a/src/interactions/Command/reactionroles.js +++ b/src/interactions/Command/reactionroles.js @@ -55,8 +55,8 @@ module.exports = { run: async (client, interaction, args) => { const perms = await client.checkPerms({ - flags: [Discord.PermissionsBitField.Flags.MANAGE_ROLES], - perms: ["MANAGE_ROLES"] + flags: [Discord.PermissionsBitField.Flags.ManageRoles], + perms: [Discord.PermissionsBitField.Flags.ManageRoles] }, interaction) if (perms == false) return; diff --git a/src/interactions/Command/serverstats.js b/src/interactions/Command/serverstats.js index 797aeb8..6e9bbb6 100644 --- a/src/interactions/Command/serverstats.js +++ b/src/interactions/Command/serverstats.js @@ -96,8 +96,8 @@ module.exports = { run: async (client, interaction, args) => { const perms = await client.checkPerms({ - flags: [Discord.PermissionsBitField.Flags.MANAGE_CHANNELS], - perms: ["MANAGE_CHANNELS"] + flags: [Discord.PermissionsBitField.Flags.ManageChannels], + perms: [Discord.PermissionsBitField.Flags.ManageChannels] }, interaction) if (perms == false) return; diff --git a/src/interactions/Command/setup.js b/src/interactions/Command/setup.js index 8898cda..32d8c3a 100644 --- a/src/interactions/Command/setup.js +++ b/src/interactions/Command/setup.js @@ -145,8 +145,8 @@ module.exports = { run: async (client, interaction, args) => { const perms = await client.checkUserPerms({ - flags: [Discord.PermissionsBitField.Flags.ADMINISTRATOR], - perms: ["ADMINISTRATOR"] + flags: [Discord.PermissionsBitField.Flags.Administrator], + perms: [Discord.PermissionsBitField.Flags.Administrator] }, interaction) if (perms == false) return; diff --git a/src/interactions/Command/stickymessages.js b/src/interactions/Command/stickymessages.js index e25dfea..1fe6c30 100644 --- a/src/interactions/Command/stickymessages.js +++ b/src/interactions/Command/stickymessages.js @@ -40,8 +40,8 @@ module.exports = { run: async (client, interaction, args) => { const perms = await client.checkUserPerms({ - flags: [Discord.PermissionsBitField.Flags.MANAGE_MESSAGES], - perms: ["MANAGE_MESSAGES"] + flags: [Discord.PermissionsBitField.Flags.ManageMessages], + perms: [Discord.PermissionsBitField.Flags.ManageMessages] }, interaction) if (perms == false) return; diff --git a/src/interactions/ContextMenu/unwarn.js b/src/interactions/ContextMenu/unwarn.js index aac6363..ad00885 100644 --- a/src/interactions/ContextMenu/unwarn.js +++ b/src/interactions/ContextMenu/unwarn.js @@ -17,8 +17,8 @@ module.exports = { run: async (client, interaction, args) => { const perms = await client.checkPerms({ - flags: [Discord.PermissionsBitField.Flags.MANAGE_MESSAGES], - perms: ["MANAGE_MESSAGES"] + flags: [Discord.PermissionsBitField.Flags.ManageMessages], + perms: [Discord.PermissionsBitField.Flags.ManageMessages] }, interaction) if (perms == false) return; diff --git a/src/interactions/ContextMenu/warn.js b/src/interactions/ContextMenu/warn.js index f244314..3e9e2b8 100644 --- a/src/interactions/ContextMenu/warn.js +++ b/src/interactions/ContextMenu/warn.js @@ -17,8 +17,8 @@ module.exports = { run: async (client, interaction, args) => { const perms = await client.checkPerms({ - flags: [Discord.PermissionsBitField.Flags.MANAGE_MESSAGES], - perms: ["MANAGE_MESSAGES"] + flags: [Discord.PermissionsBitField.Flags.ManageMessages], + perms: [Discord.PermissionsBitField.Flags.ManageMessages] }, interaction) if (perms == false) return; diff --git a/src/interactions/ContextMenu/warnings.js b/src/interactions/ContextMenu/warnings.js index 3bb9ba5..6f8e286 100644 --- a/src/interactions/ContextMenu/warnings.js +++ b/src/interactions/ContextMenu/warnings.js @@ -17,8 +17,8 @@ module.exports = { run: async (client, interaction, args) => { const perms = await client.checkPerms({ - flags: [Discord.PermissionsBitField.Flags.MANAGE_MESSAGES], - perms: ["MANAGE_MESSAGES"] + flags: [Discord.PermissionsBitField.Flags.ManageMessages], + perms: [Discord.PermissionsBitField.Flags.ManageMessages] }, interaction) if (perms == false) return;