diff --git a/events/message.js b/events/message.js index 67398a9..4539caa 100644 --- a/events/message.js +++ b/events/message.js @@ -1,70 +1,44 @@ -// The MESSAGE event runs anytime a message is received -// Note that due to the binding of client to every event, every event -// goes `client, other, args` when this function is run. - module.exports = async (client, message) => { - // It's good practice to ignore other bots. This also makes your bot ignore itself - // and not get into a spam loop (we call that "botception"). if (message.author.bot) return; - - // Grab the settings for this server from Enmap. - // If there is no guild, get default conf (DMs) const settings = message.settings = client.getSettings(message.guild); - - // Checks if the bot was mentioned, with no message after it, returns the prefix. + const prefixMention = new RegExp(`^<@!?${client.user.id}>( |)$`); if (message.content.match(prefixMention)) { - return message.reply(`My prefix on this guild is \`${settings.prefix}\``); + return message.reply(`my prefix for this guild is \`${settings.prefix}\``); } - - // Also good practice to ignore any message that does not start with our prefix, - // which is set in the configuration file. + if (message.content.indexOf(settings.prefix) !== 0) return; - - // Here we separate our "command" name, and our "arguments" for the command. - // e.g. if we have the message "+say Is this the real life?" , we'll get the following: - // command = say - // args = ["Is", "this", "the", "real", "life?"] + const args = message.content.slice(settings.prefix.length).trim().split(/ +/g); const command = args.shift().toLowerCase(); - - // If the member on a guild is invisible or not cached, fetch them. + if (message.guild && !message.member) await message.guild.fetchMember(message.author); - - // Get the user or member's permission level from the elevation + const level = client.permlevel(message); - - // Check whether the command, or alias, exist in the collections defined - // in app.js. + const cmd = client.commands.get(command) || client.commands.get(client.aliases.get(command)); - // using this const varName = thing OR otherthign; is a pretty efficient - // and clean way to grab one of 2 values! if (!cmd) return; - - // Some commands may not be useable in DMs. This check prevents those commands from running - // and return a friendly error message. + if (cmd && !message.guild && cmd.conf.guildOnly) return message.channel.send("This command is unavailable via private message. Please run this command in a guild."); if (level < client.levelCache[cmd.conf.permLevel]) { if (settings.systemNotice === "true") { return message.channel.send(`You do not have permission to use this command. - Your permission level is ${level} (${client.config.permLevels.find(l => l.level === level).name}) - This command requires level ${client.levelCache[cmd.conf.permLevel]} (${cmd.conf.permLevel})`); + Your permission level is **${level}** (${client.config.permLevels.find(l => l.level === level).name}) + This command requires level **${client.levelCache[cmd.conf.permLevel]}** (${cmd.conf.permLevel})`); } else { return; } } - - // To simplify message arguments, the author's level is now put on level (not member so it is supported in DMs) - // The "level" command module argument will be deprecated in the future. + message.author.permLevel = level; message.flags = []; while (args[0] && args[0][0] === "-") { message.flags.push(args.shift().slice(1)); } - // If the command exists, **AND** the user has permission, run it. + client.logger.cmd(`[CMD] ${client.config.permLevels.find(l => l.level === level).name} ${message.author.username} (${message.author.id}) ran command ${cmd.help.name}`); cmd.run(client, message, args, level); };