diff --git a/commands/avataredit/3000years.js b/commands/avataredit/3000years.js index 19dc9e1a..088eec36 100644 --- a/commands/avataredit/3000years.js +++ b/commands/avataredit/3000years.js @@ -36,7 +36,7 @@ module.exports = class YearsCommand extends commando.Command { avatar.resize(200, 200); years.blit(avatar, 461, 127); years.getBuffer(Jimp.MIME_PNG, (err, buff) => { - if (err) return message.channel.send(':x: Error! Something went wrong!'); + if (err) return message.say(':x: Error! Something went wrong!'); return message.channel.sendFile(buff); }); } diff --git a/commands/avataredit/beautiful.js b/commands/avataredit/beautiful.js index 29b6ec11..d2857eea 100644 --- a/commands/avataredit/beautiful.js +++ b/commands/avataredit/beautiful.js @@ -38,7 +38,7 @@ module.exports = class BeautifulCommand extends commando.Command { avatar.resize(190, 190); beautiful.blit(avatar, 451, 434); beautiful.getBuffer(Jimp.MIME_PNG, (err, buff) => { - if (err) return message.channel.send(':x: Error! Something went wrong!'); + if (err) return message.say(':x: Error! Something went wrong!'); return message.channel.sendFile(buff); }); } diff --git a/commands/avataredit/bobross.js b/commands/avataredit/bobross.js index b69acacd..86405ac9 100644 --- a/commands/avataredit/bobross.js +++ b/commands/avataredit/bobross.js @@ -40,7 +40,7 @@ module.exports = class BobRossCommand extends commando.Command { nothing.composite(avatar, 44, 85); nothing.composite(bob, 0, 0); nothing.getBuffer(Jimp.MIME_PNG, (err, buff) => { - if (err) return message.channel.send(':x: Error! Something went wrong!'); + if (err) return message.say(':x: Error! Something went wrong!'); return message.channel.sendFile(buff); }); } diff --git a/commands/avataredit/rip.js b/commands/avataredit/rip.js index b30d339e..7a7d4aba 100644 --- a/commands/avataredit/rip.js +++ b/commands/avataredit/rip.js @@ -37,7 +37,7 @@ module.exports = class RIPCommand extends commando.Command { avatar.resize(200, 200); gravestone.blit(avatar, 60, 65); gravestone.getBuffer(Jimp.MIME_PNG, (err, buff) => { - if (err) return message.channel.send(':x: Error! Something went wrong!'); + if (err) return message.say(':x: Error! Something went wrong!'); return message.channel.sendFile(buff); }); } diff --git a/commands/avataredit/steamcard.js b/commands/avataredit/steamcard.js index 002cdde7..fcd98036 100644 --- a/commands/avataredit/steamcard.js +++ b/commands/avataredit/steamcard.js @@ -42,7 +42,7 @@ module.exports = class SteamCardCommand extends commando.Command { nothing.composite(steamcard, 0, 0); nothing.print(font, 38, 20, userDisplayName); nothing.getBuffer(Jimp.MIME_PNG, (err, buff) => { - if (err) return message.channel.send(':x: Error! Something went wrong!'); + if (err) return message.say(':x: Error! Something went wrong!'); return message.channel.sendFile(buff); }); } diff --git a/commands/botinfo/contact.js b/commands/botinfo/contact.js index fc53a56d..99895de9 100644 --- a/commands/botinfo/contact.js +++ b/commands/botinfo/contact.js @@ -33,7 +33,7 @@ module.exports = class ContactCommand extends commando.Command { console.log(`[Command] ${message.content}`); let messageToReport = args.report; let reportedMsg = await this.client.users.get(config.owner).send(`**${message.author.username}#${message.author.discriminator} (${message.author.id}):**\n${messageToReport}`); - let successMsg = await message.channel.send('Message Sent! Thanks for your support!'); + let successMsg = await message.say('Message Sent! Thanks for your support!'); return [reportedMsg, successMsg]; } }; diff --git a/commands/botinfo/info.js b/commands/botinfo/info.js index 8e675ff5..dfecebb7 100644 --- a/commands/botinfo/info.js +++ b/commands/botinfo/info.js @@ -68,6 +68,6 @@ module.exports = class InfoCommand extends commando.Command { "[Click Here to Join!](https://discord.gg/fqQF8mc)") .addField('Invite Link:', "[Click Here to Add Me to Your Server!](https://discordapp.com/oauth2/authorize?client_id=278305350804045834&scope=bot&permissions=1345846343)"); - return message.channel.sendEmbed(embed); + return message.embed(embed); } }; diff --git a/commands/botinfo/invite.js b/commands/botinfo/invite.js index 93fc067a..c6788379 100644 --- a/commands/botinfo/invite.js +++ b/commands/botinfo/invite.js @@ -16,6 +16,6 @@ module.exports = class InviteCommand extends commando.Command { if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES'])) return; } console.log(`[Command] ${message.content}`); - return message.channel.send("Add me to your server with this link:\nhttps://discordapp.com/oauth2/authorize?client_id=278305350804045834&scope=bot&permissions=1345846343\nOr, come to my server with this link:\nhttps://discord.gg/fqQF8mc"); + return message.say("Add me to your server with this link:\nhttps://discordapp.com/oauth2/authorize?client_id=278305350804045834&scope=bot&permissions=1345846343\nOr, come to my server with this link:\nhttps://discord.gg/fqQF8mc"); } }; diff --git a/commands/botinfo/uptime.js b/commands/botinfo/uptime.js index c3adedad..f670ce84 100644 --- a/commands/botinfo/uptime.js +++ b/commands/botinfo/uptime.js @@ -18,6 +18,6 @@ module.exports = class UptimeCommand extends commando.Command { if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES'])) return; } console.log(`[Command] ${message.content}`); - return message.channel.send(`I've been active on this shard for: **${moment.duration(this.client.uptime).format('d[ days], h[ hours], m[ minutes, and ]s[ seconds]')}** in **${this.client.guilds.size} Servers.**`); + return message.say(`I've been active on this shard for: **${moment.duration(this.client.uptime).format('d[ days], h[ hours], m[ minutes, and ]s[ seconds]')}** in **${this.client.guilds.size} Servers.**`); } }; diff --git a/commands/games/lottery.js b/commands/games/lottery.js index e806355d..5dc81ed8 100644 --- a/commands/games/lottery.js +++ b/commands/games/lottery.js @@ -17,7 +17,7 @@ module.exports = class LotteryCommand extends commando.Command { } console.log(`[Command] ${message.content}`); let lotteryNumber = ['Winner'][Math.floor(Math.random() * 100)]; - if (lotteryNumber !== "Winner") return message.channel.send(`Nope, sorry ${message.author.username}, you lost.`); - return message.channel.send(`Wow ${message.author.username}! You actually won! Great job!`); + if (lotteryNumber !== "Winner") return message.say(`Nope, sorry ${message.author.username}, you lost.`); + return message.say(`Wow ${message.author.username}! You actually won! Great job!`); } }; diff --git a/commands/games/mathgame.js b/commands/games/mathgame.js index 7298ce72..01b8edfe 100644 --- a/commands/games/mathgame.js +++ b/commands/games/mathgame.js @@ -54,18 +54,18 @@ module.exports = class MathGameCommand extends commando.Command { const embed = new Discord.RichEmbed() .setTitle('You have **ten** seconds to answer:') .setDescription(randomExpression); - let embedMsg = await message.channel.sendEmbed(embed); + let embedMsg = await message.embed(embed); try { let collected = await message.channel.awaitMessages(response => response.content === solved.toString() && response.author.id === message.author.id, { max: 1, time: 10000, errors: ['time'], }); - let victoryMsg = await message.channel.send(`Good Job! You won! ${solved} is the correct answer!`); + let victoryMsg = await message.say(`Good Job! You won! ${solved} is the correct answer!`); return [embedMsg, collected, victoryMsg]; } catch (err) { - let loseMsg = await message.channel.send(`Aw... Too bad, try again next time!\nThe correct answer is: ${solved}`); + let loseMsg = await message.say(`Aw... Too bad, try again next time!\nThe correct answer is: ${solved}`); return [embedMsg, loseMsg]; } } diff --git a/commands/games/quiz.js b/commands/games/quiz.js index e3dc9579..d8a98de9 100644 --- a/commands/games/quiz.js +++ b/commands/games/quiz.js @@ -31,23 +31,23 @@ module.exports = class QuizCommand extends commando.Command { const embed = new Discord.RichEmbed() .setTitle('You have **fifteen** seconds to answer this question:') .setDescription(`**Category: ${response.body[0].category.title}**\n${response.body[0].question}`); - let embedMsg = await message.channel.sendEmbed(embed); + let embedMsg = await message.embed(embed); try { let collected = await message.channel.awaitMessages(res => res.content.toLowerCase() === answer && res.author.id === message.author.id, { max: 1, time: 15000, errors: ['time'] }); - let victoryMsg = await message.channel.send(`Good Job! You won! ${answer} is the correct answer!`); + let victoryMsg = await message.say(`Good Job! You won! ${answer} is the correct answer!`); return [embedMsg, collected, victoryMsg]; } catch (err) { - let loseMsg = await message.channel.send(`Aw... Too bad, try again next time!\nThe Correct Answer was: ${answer}`); + let loseMsg = await message.say(`Aw... Too bad, try again next time!\nThe Correct Answer was: ${answer}`); return [embedMsg, loseMsg]; } } catch (err) { - return message.channel.send(":x: Error! Something went wrong!"); + return message.say(":x: Error! Something went wrong!"); } } }; diff --git a/commands/games/rockpaperscissors.js b/commands/games/rockpaperscissors.js index efd1bccb..f936a334 100644 --- a/commands/games/rockpaperscissors.js +++ b/commands/games/rockpaperscissors.js @@ -35,35 +35,35 @@ module.exports = class RockPaperScissors extends commando.Command { response = response[Math.floor(Math.random() * response.length)]; if (rps === "rock") { if (response === "Rock") { - return message.channel.send("Rock! Aw, it's a tie!"); + return message.say("Rock! Aw, it's a tie!"); } if (response === "Paper") { - return message.channel.send("Paper! Yes! I win!"); + return message.say("Paper! Yes! I win!"); } if (response === "Scissors") { - return message.channel.send("Scissors! Aw... I lose..."); + return message.say("Scissors! Aw... I lose..."); } } else if (rps === "paper") { if (response === "Rock") { - return message.channel.send("Rock! Aw... I lose..."); + return message.say("Rock! Aw... I lose..."); } if (response === "Paper") { - return message.channel.send("Paper! Aw, it's a tie!"); + return message.say("Paper! Aw, it's a tie!"); } if (response === "Scissors") { - return message.channel.send("Scissors! Yes! I win!"); + return message.say("Scissors! Yes! I win!"); } } else if (rps === "scissors") { if (response === "Rock") { - return message.channel.send("Rock! Yes! I win!"); + return message.say("Rock! Yes! I win!"); } if (response === "Paper") { - return message.channel.send("Paper! Aw... I lose..."); + return message.say("Paper! Aw... I lose..."); } if (response === "Scissors") { - return message.channel.send("Scissors! Aw, it's a tie!"); + return message.say("Scissors! Aw, it's a tie!"); } } } diff --git a/commands/games/slots.js b/commands/games/slots.js index 0b1ffa42..131932c9 100644 --- a/commands/games/slots.js +++ b/commands/games/slots.js @@ -22,10 +22,10 @@ module.exports = class SlotsCommand extends commando.Command { let slotThree = slotThing[Math.floor(Math.random() * slotThing.length)]; let slotFour = slotThing[Math.floor(Math.random() * slotThing.length)]; if (slotOne === slotTwo && slotOne === slotThree && slotOne === slotFour) { - return message.channel.send(`${slotOne}|${slotTwo}|${slotThree}|${slotFour}\nWow! You won! Great job... er... luck!`); + return message.say(`${slotOne}|${slotTwo}|${slotThree}|${slotFour}\nWow! You won! Great job... er... luck!`); } else { - return message.channel.send(`${slotOne}|${slotTwo}|${slotThree}|${slotFour}\nAww... You lost... Guess it's just bad luck, huh?`); + return message.say(`${slotOne}|${slotTwo}|${slotThree}|${slotFour}\nAww... You lost... Guess it's just bad luck, huh?`); } } }; diff --git a/commands/games/typinggame.js b/commands/games/typinggame.js index c111e45c..0b22cafb 100644 --- a/commands/games/typinggame.js +++ b/commands/games/typinggame.js @@ -29,7 +29,7 @@ module.exports = class TypingGameCommand extends commando.Command { } console.log(`[Command] ${message.content}`); let level = args.difficulty.toLowerCase(); - if (level !== 'easy' || level !== 'medium' || level !== 'hard' || level !== 'extreme') return message.channel.send(':x: Error! Please set the difficulty to either easy, medium, hard, or extreme!'); + if (level !== 'easy' || level !== 'medium' || level !== 'hard' || level !== 'extreme') return message.say(':x: Error! Please set the difficulty to either easy, medium, hard, or extreme!'); let randomSentence = ['The quick brown fox jumps over the lazy dog.', 'Buffalo buffalo Buffalo buffalo buffalo buffalo Buffalo buffalo.', 'How razorback-jumping frogs can level six piqued gymnasts!', 'Amazingly few discotheques provide jukeboxes.']; randomSentence = randomSentence[Math.floor(Math.random() * randomSentence.length)]; let time; @@ -65,18 +65,18 @@ module.exports = class TypingGameCommand extends commando.Command { const embed = new Discord.RichEmbed() .setTitle(`You have **${levelWord}** seconds to type:`) .setDescription(randomSentence); - let embedMsg = await message.channel.sendEmbed(embed); + let embedMsg = await message.embed(embed); try { let collected = await message.channel.awaitMessages(response => response.content === randomSentence && response.author.id === message.author.id, { max: 1, time: time, errors: ['time'] }); - let victoryMsg = await message.channel.send(`Good Job! You won!`); + let victoryMsg = await message.say(`Good Job! You won!`); return [embedMsg, collected, victoryMsg]; } catch (err) { - let loseMsg = await message.channel.send('Aw... Too bad, try again next time!'); + let loseMsg = await message.say('Aw... Too bad, try again next time!'); return [embedMsg, loseMsg]; } } diff --git a/commands/guildinfo/emoji.js b/commands/guildinfo/emoji.js index 23461bb0..a716a731 100644 --- a/commands/guildinfo/emoji.js +++ b/commands/guildinfo/emoji.js @@ -22,6 +22,6 @@ module.exports = class EmojiCommand extends commando.Command { if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES'])) return; } console.log(`[Command] ${message.content}`); - return message.channel.send(message.guild.emojis.map(e => e).join(" ")); + return message.say(message.guild.emojis.map(e => e).join(" ")); } }; diff --git a/commands/guildinfo/guildinfo.js b/commands/guildinfo/guildinfo.js index 7fa446d0..fc071e52 100644 --- a/commands/guildinfo/guildinfo.js +++ b/commands/guildinfo/guildinfo.js @@ -42,6 +42,6 @@ module.exports = class GuildInfoCommand extends commando.Command { `${message.guild.owner.user.username}#${message.guild.owner.user.discriminator}`, true) .addField("**Users:**", message.guild.memberCount, true); - return message.channel.sendEmbed(embed); + return message.embed(embed); } }; diff --git a/commands/imageedit/meme.js b/commands/imageedit/meme.js index 4c03914e..d3c7318a 100644 --- a/commands/imageedit/meme.js +++ b/commands/imageedit/meme.js @@ -145,8 +145,8 @@ module.exports = class MemeCommand extends commando.Command { let toprow = memeQuery[0].split("?").join("~q"); let bottomrow = memeQuery[1].split("?").join("~q"); let link = `https://memegen.link/${type}/${toprow}/${bottomrow}.jpg`; - if (bottomrow.length > 100) return message.channel.send(":x: Error! Bottom text is over 100 characters!"); - if (toprow.length > 100) return message.channel.send(":x: Error! Top text is over 100 characters!"); - return message.channel.sendFile(link).catch(err => message.channel.send(':x: Error! Something went wrong!')); + if (bottomrow.length > 100) return message.say(":x: Error! Bottom text is over 100 characters!"); + if (toprow.length > 100) return message.say(":x: Error! Top text is over 100 characters!"); + return message.channel.sendFile(link).catch(err => message.say(':x: Error! Something went wrong!')); } }; diff --git a/commands/moderation/ban.js b/commands/moderation/ban.js index 24a7f60c..bf572b66 100644 --- a/commands/moderation/ban.js +++ b/commands/moderation/ban.js @@ -33,12 +33,12 @@ module.exports = class BanCommand extends commando.Command { if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES', 'EMBED_LINKS', 'BAN_MEMBERS'])) return; } console.log(`[Command] ${message.content}`); - if (!message.guild.channels.exists("name", "mod_logs")) return message.channel.send(":x: Error! Could not find the mod_logs channel! Please create it!"); + if (!message.guild.channels.exists("name", "mod_logs")) return message.say(":x: Error! Could not find the mod_logs channel! Please create it!"); let member = args.member; let reason = args.reason; - if (!message.guild.member(member).bannable) return message.channel.send(":x: Error! This member cannot be banned! Perhaps they have a higher role than me?"); + if (!message.guild.member(member).bannable) return message.say(":x: Error! This member cannot be banned! Perhaps they have a higher role than me?"); let banUser = await message.guild.member(member).ban(); - let okHandMsg = await message.channel.send(":ok_hand:"); + let okHandMsg = await message.say(":ok_hand:"); const embed = new Discord.RichEmbed() .setAuthor(`${message.author.username}#${message.author.discriminator}`, message.author.avatarURL) .setColor(0xFF0000) diff --git a/commands/moderation/kick.js b/commands/moderation/kick.js index 4518625e..cb5dde42 100644 --- a/commands/moderation/kick.js +++ b/commands/moderation/kick.js @@ -30,12 +30,12 @@ module.exports = class KickCommand extends commando.Command { if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES', 'EMBED_LINKS', 'KICK_MEMBERS'])) return; } console.log(`[Command] ${message.content}`); - if (!message.guild.channels.exists("name", "mod_logs")) return message.channel.send(":x: Error! Could not find the mod_logs channel! Please create it!"); + if (!message.guild.channels.exists("name", "mod_logs")) return message.say(":x: Error! Could not find the mod_logs channel! Please create it!"); let member = args.member; let reason = args.reason; - if (!message.guild.member(member).bannable) return message.channel.send(":x: Error! This member cannot be kicked! Perhaps they have a higher role than me?"); + if (!message.guild.member(member).bannable) return message.say(":x: Error! This member cannot be kicked! Perhaps they have a higher role than me?"); let kickUser = await message.guild.member(member).kick(); - let okHandMsg = await message.channel.send(":ok_hand:"); + let okHandMsg = await message.say(":ok_hand:"); const embed = new Discord.RichEmbed() .setAuthor(`${message.author.username}#${message.author.discriminator}`, message.author.avatarURL) .setColor(0xFFA500) diff --git a/commands/moderation/warn.js b/commands/moderation/warn.js index dd4df5cf..81336f1c 100644 --- a/commands/moderation/warn.js +++ b/commands/moderation/warn.js @@ -32,8 +32,8 @@ module.exports = class WarnCommand extends commando.Command { console.log(`[Command] ${message.content}`); let userToWarn = args.member; let reason = args.reason; - if (!message.guild.channels.exists("name", "mod_logs")) return message.channel.send(":x: Error! Could not find the mod_logs channel! Please create it!"); - let okHandMsg = await message.channel.send(":ok_hand:"); + if (!message.guild.channels.exists("name", "mod_logs")) return message.say(":x: Error! Could not find the mod_logs channel! Please create it!"); + let okHandMsg = await message.say(":ok_hand:"); const embed = new Discord.RichEmbed() .setAuthor(`${message.author.username}#${message.author.discriminator}`, message.author.avatarURL) .setColor(0xFFFF00) diff --git a/commands/numedit/math.js b/commands/numedit/math.js index 859007f9..161035cf 100644 --- a/commands/numedit/math.js +++ b/commands/numedit/math.js @@ -31,10 +31,10 @@ module.exports = class MathCommand extends commando.Command { let expression = args.expression; try { let solved = math.eval(expression); - return message.channel.send(solved).catch(err => message.channel.send(":x: Error! Invalid statement!")); + return message.say(solved).catch(err => message.say(":x: Error! Invalid statement!")); } catch (err) { - return message.channel.send(":x: Error! Invalid statement!"); + return message.say(":x: Error! Invalid statement!"); } } }; diff --git a/commands/numedit/roman.js b/commands/numedit/roman.js index c3da6e42..affe5d1f 100644 --- a/commands/numedit/roman.js +++ b/commands/numedit/roman.js @@ -30,6 +30,6 @@ module.exports = class RomanCommand extends commando.Command { console.log(`[Command] ${message.content}`); let numberToRoman = args.number; let romanInterger = numberToRoman; - return message.channel.send(romanNumeralConverter.getRomanFromInteger(romanInterger)); + return message.say(romanNumeralConverter.getRomanFromInteger(romanInterger)); } }; diff --git a/commands/random/canyounot.js b/commands/random/canyounot.js index d801677d..258b3995 100644 --- a/commands/random/canyounot.js +++ b/commands/random/canyounot.js @@ -16,6 +16,6 @@ module.exports = class CanYouNot extends commando.Command { if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES'])) return; } console.log(`[Command] ${message.content}`); - return message.channel.send('Can YOU not?'); + return message.say('Can YOU not?'); } }; diff --git a/commands/random/giveflower.js b/commands/random/giveflower.js index 511b46d6..da369196 100644 --- a/commands/random/giveflower.js +++ b/commands/random/giveflower.js @@ -20,6 +20,6 @@ module.exports = class GiveFlowerCommand extends commando.Command { if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES'])) return; } console.log(`[Command] ${message.content}`); - return message.channel.send('Ooh, what a pretty flower. What, I may have it? Thanks! I like flowers, yes? ♪'); + return message.say('Ooh, what a pretty flower. What, I may have it? Thanks! I like flowers, yes? ♪'); } }; diff --git a/commands/random/lenny.js b/commands/random/lenny.js index 2d572025..d568cbc5 100644 --- a/commands/random/lenny.js +++ b/commands/random/lenny.js @@ -16,6 +16,6 @@ module.exports = class LennyCommand extends commando.Command { if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES'])) return; } console.log(`[Command] ${message.content}`); - return message.channel.send('( ͡° ͜ʖ ͡°)'); + return message.say('( ͡° ͜ʖ ͡°)'); } }; diff --git a/commands/random/nitro.js b/commands/random/nitro.js index d533e6a3..d3deff7c 100644 --- a/commands/random/nitro.js +++ b/commands/random/nitro.js @@ -23,6 +23,6 @@ module.exports = class NitroCommand extends commando.Command { .setColor(0x748BD9) .setURL("https://discordapp.com/nitro") .setDescription("This Message can only be viewed by members with Discord Nitro.\n\n\n[More Information](https://discordapp.com/nitro)"); - return message.channel.sendEmbed(embed); + return message.embed(embed); } }; diff --git a/commands/random/remind.js b/commands/random/remind.js index 54447897..c0ec8296 100644 --- a/commands/random/remind.js +++ b/commands/random/remind.js @@ -30,14 +30,14 @@ module.exports = class RemindCommand extends commando.Command { try { let remindTime = sherlock.parse(remindMe); let time = remindTime.startDate.getTime() - Date.now(); - let preRemind = await message.channel.send(`I will remind you '${remindTime.eventTitle}' ${moment().add(time, 'ms').fromNow()}.`); + let preRemind = await message.say(`I will remind you '${remindTime.eventTitle}' ${moment().add(time, 'ms').fromNow()}.`); const remindMessage = await new Promise(resolve => { - setTimeout(() => resolve(message.channel.send(`${message.author} you wanted me to remind you of: '${remindTime.eventTitle}'`)), time); + setTimeout(() => resolve(message.say(`${message.author} you wanted me to remind you of: '${remindTime.eventTitle}'`)), time); }); return [preRemind, remindMessage]; } catch (err) { - return message.channel.send(":x: Error! Something went wrong! Perhaps you didn't enter a valid time with your data?"); + return message.say(":x: Error! Something went wrong! Perhaps you didn't enter a valid time with your data?"); } } }; diff --git a/commands/random/slowclap.js b/commands/random/slowclap.js index 54a9a158..5792e831 100644 --- a/commands/random/slowclap.js +++ b/commands/random/slowclap.js @@ -16,6 +16,6 @@ module.exports = class SlowClapCommand extends commando.Command { if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES'])) return; } console.log(`[Command] ${message.content}`); - return message.channel.send('*slow clap*'); + return message.say('*slow clap*'); } }; diff --git a/commands/random/soundboard.js b/commands/random/soundboard.js index a3abcdcb..d27e78a7 100644 --- a/commands/random/soundboard.js +++ b/commands/random/soundboard.js @@ -35,12 +35,12 @@ module.exports = class SoundBoardCommand extends commando.Command { } console.log(`[Command] ${message.content}`); let voiceChannel = message.member.voiceChannel; - if (!voiceChannel) return message.channel.send(`:x: Error! Please be in a voice channel first!`); + if (!voiceChannel) return message.say(`:x: Error! Please be in a voice channel first!`); let soundToPlay = args.sound.toLowerCase(); let alreadyConnected = await this.client.voiceConnections.get(voiceChannel.guild.id); if (alreadyConnected) { - if (alreadyConnected.channel.id === voiceChannel.id) return message.channel.send(':x: Error! I am already playing a sound!'); - return message.channel.send(':x: Error! I am already playing a sound!'); + if (alreadyConnected.channel.id === voiceChannel.id) return message.say(':x: Error! I am already playing a sound!'); + return message.say(':x: Error! I am already playing a sound!'); } let connection = await voiceChannel.join(); let stream = sounds.paths[soundToPlay]; diff --git a/commands/random/today.js b/commands/random/today.js index 7cc55ae3..284533cf 100644 --- a/commands/random/today.js +++ b/commands/random/today.js @@ -37,10 +37,10 @@ module.exports = class TodayCommand extends commando.Command { .setTitle(`On this day (${responseData.date})...`) .setTimestamp() .setDescription(`${responseData.data.Events[randomNumber].text} (${responseData.data.Events[randomNumber].year})`); - return message.channel.sendEmbed(embed); + return message.embed(embed); } catch (err) { - return message.channel.send(":x: Error! Something went wrong!"); + return message.say(":x: Error! Something went wrong!"); } } }; diff --git a/commands/response/8ball.js b/commands/response/8ball.js index 1c39125e..f7c37ef2 100644 --- a/commands/response/8ball.js +++ b/commands/response/8ball.js @@ -24,6 +24,6 @@ module.exports = class MagicBall extends commando.Command { let question = args.question; let answers = ['It seems the answer is yes, yes?', 'It seems the answer is no.', 'It is a little doubtful, yes?', 'It seems it is very likely to be true.']; answers = answers[Math.floor(Math.random() * answers.length)]; - return message.channel.send(`Question: ${question}\n:8ball: ${answers} :8ball:`); + return message.say(`Question: ${question}\n:8ball: ${answers} :8ball:`); } }; diff --git a/commands/response/choose.js b/commands/response/choose.js index a772e7c0..3fe904e0 100644 --- a/commands/response/choose.js +++ b/commands/response/choose.js @@ -31,9 +31,9 @@ module.exports = class ChooseCommand extends commando.Command { } console.log(`[Command] ${message.content}`); let choices = args.choices; - if (!choices.includes(' | ')) return message.channel.send(':x: Error! Split your messages with a " | "!'); + if (!choices.includes(' | ')) return message.say(':x: Error! Split your messages with a " | "!'); choices = choices.split(" | "); choices = choices[Math.floor(Math.random() * choices.length)]; - return message.channel.send(`I choose ${choices}!`); + return message.say(`I choose ${choices}!`); } }; diff --git a/commands/response/coin.js b/commands/response/coin.js index cb716131..9cad4749 100644 --- a/commands/response/coin.js +++ b/commands/response/coin.js @@ -22,6 +22,6 @@ module.exports = class CoinFlipCommand extends commando.Command { console.log(`[Command] ${message.content}`); let coin = ['heads', 'tails']; coin = coin[Math.floor(Math.random() * coin.length)]; - return message.channel.send(`It landed on ${coin}!`); + return message.say(`It landed on ${coin}!`); } }; diff --git a/commands/response/compliment.js b/commands/response/compliment.js index 211b9d6a..229e9b3a 100644 --- a/commands/response/compliment.js +++ b/commands/response/compliment.js @@ -25,6 +25,6 @@ module.exports = class ComplimentCommand extends commando.Command { let thingToCompliment = args.thing || message.author; let compliments = ["Your smile is contagious.", "You look great today.", "You're a smart cookie.", "I bet you make babies smile.", "You have impeccable manners.", "I like your style.", "You have the best laugh.", "I appreciate you.", "You are the most perfect you there is.", "You are enough.", "You're strong.", "Your perspective is refreshing.", "You're an awesome friend.", "You light up the room.", "You shine brighter than a shooting star.", "You deserve a hug right now.", "You should be proud of yourself.", "You're more helpful than you realize.", "You have a great sense of humor.", "You've got all the right moves!", "Is that your picture next to 'charming' in the dictionary?", "Your kindness is a balm to all who encounter it.", "You're all that and a super-size bag of chips.", "On a scale from 1 to 10, you're an 11.", "You are brave.", "You're even more beautiful on the inside than you are on the outside.", "You have the courage of your convictions.", "Your eyes are breathtaking.", "If cartoon bluebirds were real, a bunch of them would be sitting on your shoulders singing right now.", "You are making a difference.", "You're like sunshine on a rainy day.", "You bring out the best in other people.", "Your ability to recall random factoids at just the right time is impressive.", "You're a great listener.", "How is it that you always look great, even in sweatpants?", "Everything would be better if more people were like you!", "I bet you sweat glitter.", "You were cool way before hipsters were cool.", "That color is perfect on you.", "Hanging out with you is always a blast.", "You always know -- and say -- exactly what I need to hear when I need to hear it.", "You smell really good.", "You may dance like no one's watching, but everyone's watching because you're an amazing dancer!", "Being around you makes everything better!", "When you say, 'I meant to do that,' I totally believe you.", "When you're not afraid to be yourself is when you're most incredible.", "Colors seem brighter when you're around.", "You're more fun than a ball pit filled with candy. (And seriously, what could be more fun than that?)", "That thing you don't like about yourself is what makes you so interesting.", "You're wonderful.", "You have cute elbows. For reals!", "Jokes are funnier when you tell them.", "You're better than a triple-scoop ice cream cone. With sprinkles.", "Your bellybutton is kind of adorable.", "Your hair looks stunning.", "You're one of a kind!", "You're inspiring.", "If you were a box of crayons, you'd be the giant name-brand one with the built-in sharpener.", "You should be thanked more often. So thank you!!", "Our community is better because you're in it.", "Someone is getting through something hard right now because you've got their back.", "You have the best ideas.", "You always know how to find that silver lining.", "Everyone gets knocked down sometimes, but you always get back up and keep going.", "You're a candle in the darkness.", "You're a great example to others.", "Being around you is like being on a happy little vacation.", "You always know just what to say.", "You're always learning new things and trying to better yourself, which is awesome.", "If someone based an Internet meme on you, it would have impeccable grammar.", "You could survive a Zombie apocalypse.", "You're more fun than bubble wrap.", "When you make a mistake, you fix it.", "Who raised you? They deserve a medal for a job well done.", "You're great at figuring stuff out.", "Your voice is magnificent.", "The people you love are lucky to have you in their lives.", "You're like a breath of fresh air.", "You're gorgeous -- and that's the least interesting thing about you, too.", "You're so thoughtful.", "Your creative potential seems limitless.", "Your name suits you to a T.", "You're irresistible when you blush.", "Actions speak louder than words, and yours tell an incredible story.", "Somehow you make time stop and fly at the same time.", "When you make up your mind about something, nothing stands in your way.", "You seem to really know who you are.", "Any team would be lucky to have you on it.", "In high school I bet you were voted 'most likely to keep being awesome.'", "I bet you do the crossword puzzle in ink.", "Babies and small animals probably love you.", "If you were a scented candle they'd call it Perfectly Imperfect (and it would smell like summer).", "There's ordinary, and then there's you.", "You're someone's reason to smile.", "You're even better than a unicorn, because you're real.", "How do you keep being so funny and making everyone laugh?", "You have a good head on your shoulders.", "Has anyone ever told you that you have great posture?", "The way you treasure your loved ones is incredible.", "You're really something special.", "You're a gift to those around you.", "You don't deserve it."]; compliments = compliments[Math.floor(Math.random() * compliments.length)]; - return message.channel.send(`${thingToCompliment}, ${compliments}`); + return message.say(`${thingToCompliment}, ${compliments}`); } }; diff --git a/commands/response/factcore.js b/commands/response/factcore.js index 4e24c5e4..5f93108c 100644 --- a/commands/response/factcore.js +++ b/commands/response/factcore.js @@ -18,6 +18,6 @@ module.exports = class FactCore extends commando.Command { console.log(`[Command] ${message.content}`); let facts = ["The billionth digit of Pi is 9.", "Humans can survive underwater. But not for very long.", "A nanosecond lasts one billionth of a second.", "Honey does not spoil.", "The atomic weight of Germanium is seven two point four six.", "An ostrich's eye is bigger than its brain.", "Rats cannot throw up.", "Iguanas can stay underwater for twenty-eight point seven minutes.", "The moon orbits the Earth every 27.32 days.", "A gallon of water weighs 8.34 pounds.", "According to Norse legend, thunder god Thor's chariot was pulled across the sky by two goats.", "Tungsten has the highest melting point of any metal, at 3,410 degrees Celsius.", "Gently cleaning the tongue twice a day is the most effective way to fight bad breath.", "The Tariff Act of 1789, established to protect domestic manufacture, was the second salute ever enacted by the United States government.", "The value of Pi is the ratio of any circle's circumference to its diameter in Euclidean space.", "The Mexican-American War ended in 1848 with the signing of the Treaty of Guadalupe Hidalgo.", "In 1879, Sandford Fleming first proposed the adoption of worldwide standardized time zones at the Royal Canadian Institute.", "Marie Curie invented the theory of radioactivity, the treatment of radioactivity, and the dying of radioactivity.", "At the end of The Seagull by Anton Chekhov, Konstantin kills himself.", "Hot water freezes quicker than cold water.", "The situation you are in is very dangerous.", "Polymerase I polypeptide A is a human gene.", "The sun is 333,330 times larger than Earth.", "Dental floss has superb tensile strength.", "Raseph, the Semitic god of war and plague, had a gazelle growing out of his forehead.", "Human tapeworms can grow up to twenty-two point nine meters.", "If you have trouble with simple counting, use the following mnemonic device: one comes before two comes before 60 comes after 12 comes before six trillion comes after 504. This should make your earlier counting difficulties seem like no big deal.", "The first person to prove that cow's milk is drinkable was very, very thirsty.", "Roman toothpaste was made with human urine. Urine as an ingredient in toothpaste continued to be used up until the 18th century.", "Volcano-ologists are experts in the study of volcanoes.", "In Victorian England, a commoner was not allowed to look directly at the Queen, due to a belief at the time that the poor had the ability to steal thoughts. Science now believes that less than 4 percent of poor people are able to do this.", "Cellular phones will not give you cancer. Only hepatitis.", "In Greek myth, Prometheus stole fire from the Gods and gave it to humankind. The jewelry he kept for himself.", "The Schrodinger's cat paradox outlines a situation in which a cat in a box must be considered, for all intents and purposes, simultaneously alive and dead. Schrodinger created this paradox as a justification for killing cats.", "In 1862, Abraham Lincoln signed the Emancipation Proclamation, freeing the slaves. Like everything he did, Lincoln freed the slaves while sleepwalking, and later had no memory of the event.", "The plural of surgeon general is surgeons general. The past tense of surgeons general is surgeonsed general.", "Contrary to popular belief, the Eskimo does not have one hundred different words for snow. They do, however, have two hundred and thirty-four words for fudge.", "Halley's Comet can be viewed orbiting Earth every seventy-six years. For the other seventy-five, it retreats to the heart of the sun, where it hibernates undisturbed.", "The first commercial airline flight took to the air in 1914. Everyone involved screamed the entire way.", "Edmund Hillary, the first person to climb Mount Everest, did so accidentally while chasing a bird.", "We will both die because of your negligence.", "This is a bad plan. You will fail.", "He will most likely kill you, violently.", "He will most likely kill you.", "You will be dead soon.", "You are going to die in this room.", "The Fact Sphere is a good person, whose insights are relevant.", "The Fact Sphere is a good sphere, with many friends.", "Dreams are the subconscious mind's way of reminding people to go to school naked and have their teeth fall out.", "The square root of rope is string.", "89 percent of magic tricks are not actually magic. Technically, they are sorcery.", "At some point in their lives 1 in 6 children will be abducted by the Dutch.", "According to most advanced algorithms, the world's best name is Craig.", "To make a photocopier, simply photocopy a mirror.", "Whales are twice as intelligent, and three times as delicious, as humans.", "Pants were invented by sailors in the sixteenth century to avoid Poseiden's wrath. It was believed that the sight of naked sailors angered the sea god.", "In Greek myth, the craftsman Daedalus invented human flight so a group of Minotaurs would stop teasing him about it.", "The average life expectancy of a rhinoceros in captivity is 15 years.", "China produces the world's second largest crop of soybeans.", "In 1948, at the request of a dying boy, baseball legend Babe Ruth ate seventy-five hot dogs, then died of hot dog poisoning.", "William Shakespeare did not exist. His plays were masterminded in 1589 by Francis Bacon, who used a Ouija board to enslave play-writing ghosts.", "It is incorrectly noted that Thomas Edison invented push-ups in 1878. Nikolai Tesla had in fact patented the activity three years earlier, under the name Tesla-cize.", "The automobile brake was not invented until 1895. Before this, someone had to remain in the car at all times, driving in circles until passengers returned from their errands.", "The most poisonous fish in the world is the orange ruffy. Everything but its eyes are made of deadly poison. The ruffy's eyes are composed of a less harmful, deadly poison.", "The occupation of court jester was invented accidentally, when a vassal's epilepsy was mistaken for capering.", "Before the Wright Brothers invented the airplane, anyone wanting to fly anywhere was required to eat 200 pounds of helium.", "Before the invention of scrambled eggs in 1912, the typical breakfast was either whole eggs still in the shell or scrambled rocks.", "During the Great Depression, the Tennessee Valley Authority outlawed pet rabbits, forcing many to hot glue-gun long ears onto their pet mice.", "The situation is hopeless.", "Diamonds are made when coal is put under intense pressure. Diamonds put under intense pressure become foam pellets, commonly used today as packing material.", "Corruption is at 25 percent.", "Corruption is at 50 percent.", "Fact: Space does not exist.", "The Fact Sphere is not defective. Its facts are wholly accurate and very interesting.", "The Fact Sphere is always right.", "You will never go into space.", "The Space Sphere will never go to space.", "While the submarine is vastly superior to the boat in every way, over 97 percent of people still use boats for aquatic transportation.", "The likelihood of you dying within the next five minutes is eighty-seven point six one percent.", "The likelihood of you dying violently within the next five minutes is eighty-seven point six one percent.", "You are about to get me killed.", "The Fact Sphere is the most intelligent sphere.", "The Fact Sphere is the most handsome sphere.", "The Fact Sphere is incredibly handsome.", "Sphere that insist of going into space are inferior to spheres who don't.", "Whoever wins this battle is clearly superior, and will earn the allegiance of the Fact Sphere.", "You could stand to lose a few pounds.", "Avocados have the highest fiber and calories of any fruit.", "Avocados have the highest fiber and calories of any fruit. They are found in Australians.", "Every square inch of the human body has 32 million bacteria on it.", "The average adult body contains half a pound of salt.", "The Adventure Sphere is a blowhard and a coward.", "Twelve. Twelve. Twelve. Twelve. Twelve. Twelve. Twelve. Twelve. Twelve. Twelve.", "Pens. Pens. Pens. Pens. Pens. Pens. Pens.", "Apples. Oranges. Pears. Plums. Kumquats. Tangerines. Lemons. Limes. Avocado. Tomoato. Banana. Papaya. Guava.", "Error. Error. Error. File not found.", "Error. Error. Error. Fact not found.", "Fact not found.", "Warning, sphere corruption at twenty-- rats cannot throw up."]; facts = facts[Math.floor(Math.random() * facts.length)]; - return message.channel.send(facts); + return message.say(facts); } }; diff --git a/commands/response/fishy.js b/commands/response/fishy.js index 3df90c50..7e35e446 100644 --- a/commands/response/fishy.js +++ b/commands/response/fishy.js @@ -22,6 +22,6 @@ module.exports = class FishyCommand extends commando.Command { console.log(`[Command] ${message.content}`); let fish = [':fish:', ':tropical_fish:', ':blowfish:']; fish = fish[Math.floor(Math.random() * fish.length)]; - return message.channel.send(`You caught a: ${fish}`); + return message.say(`You caught a: ${fish}`); } }; diff --git a/commands/response/fortune.js b/commands/response/fortune.js index 627342af..5c131422 100644 --- a/commands/response/fortune.js +++ b/commands/response/fortune.js @@ -21,6 +21,6 @@ module.exports = class FortuneCookieCommand extends commando.Command { console.log(`[Command] ${message.content}`); let fortunes = ["Do not seek so much to find the answer as much as to understand the question better.", "You will soon be honored by someone you respect.", "Happiness comes from a good life.", "You are contemplating some action which will bring credit upon you.", "Be prepared for extra energy.", "You are admired for your adventurous ways.", "The love of your life is sitting across from you.", "Beauty is simply beauty. Originality is magical.", "Never quit!", "Today is an ideal time to water your personal garden.", "Questions provide the key to unlocking our unlimited potential.", "Expect great things and great things will come.", "The Greatest War Sometimes Isn't On The Battlefield But Against Oneself.", "Become who you are.", "In case of fire, keep calm, pay bill and run.", "Anyone who dares to be, can never be weak.", "You broke my cookie!", "Dream lofty dreams, and as you dream, so shall you become.", "You've got what it takes, but it will take everything you've got!", "Trust your intuition.", "The wise are aware of their treasure, while fools follow their vanity.", "You will always have good luck in your personal affairs.", "You don't need talent to gain experience.", "All the preparation you've done will finally be paying off!", "Determination is the wake-up call to the human will.", "The most useless energy is trying to change what and who God so carefully created.", "You cannot become rich except by enriching others.", "Your happiness is intertwined with your outlook on life.", "Sing and rejoice, fortune is smiling on you.", "Well-arranged time is the surest sign of a well-arranged mind."]; fortunes = fortunes[Math.floor(Math.random() * fortunes.length)]; - return message.channel.send(fortunes); + return message.say(fortunes); } }; diff --git a/commands/response/motivate.js b/commands/response/motivate.js index 16c33266..e7843086 100644 --- a/commands/response/motivate.js +++ b/commands/response/motivate.js @@ -27,6 +27,6 @@ module.exports = class MotivateCommand extends commando.Command { } console.log(`[Command] ${message.content}`); let userToMotivate = args.thing || message.author; - return message.channel.send(`${userToMotivate}, https://www.youtube.com/watch?v=ZXsQAXx_ao0`); + return message.say(`${userToMotivate}, https://www.youtube.com/watch?v=ZXsQAXx_ao0`); } }; diff --git a/commands/response/name.js b/commands/response/name.js index e986a0d3..a4da9c9c 100644 --- a/commands/response/name.js +++ b/commands/response/name.js @@ -39,10 +39,10 @@ module.exports = class RandomNameGen extends commando.Command { randomLast = randomLast[Math.floor(Math.random() * randomLast.length)]; let gender = args.gender.toLowerCase(); if (gender === "male") { - return message.channel.send(`${randomFirstMale} ${randomLast}`); + return message.say(`${randomFirstMale} ${randomLast}`); } else if (gender === "female") { - return message.channel.send(`${randomFirstFemale} ${randomLast}`); + return message.say(`${randomFirstFemale} ${randomLast}`); } } }; diff --git a/commands/response/offspring.js b/commands/response/offspring.js index 8e466d7d..37ea9baf 100644 --- a/commands/response/offspring.js +++ b/commands/response/offspring.js @@ -22,6 +22,6 @@ module.exports = class OffspringCommand extends commando.Command { console.log(`[Command] ${message.content}`); let gender = ['boy', 'girl']; gender = gender[Math.floor(Math.random() * gender.length)]; - return message.channel.send(`It's a ${gender}!`); + return message.say(`It's a ${gender}!`); } }; diff --git a/commands/response/quantumcoin.js b/commands/response/quantumcoin.js index 7a7c996d..caee8dda 100644 --- a/commands/response/quantumcoin.js +++ b/commands/response/quantumcoin.js @@ -23,6 +23,6 @@ module.exports = class QuantumCoin extends commando.Command { console.log(`[Command] ${message.content}`); let qcoin = ['on nothing', 'on NaN', 'on 0', 'in the air', 'on null']; qcoin = qcoin[Math.floor(Math.random() * qcoin.length)]; - return message.channel.send(`It landed ${qcoin}.`); + return message.say(`It landed ${qcoin}.`); } }; diff --git a/commands/response/ratewaifu.js b/commands/response/ratewaifu.js index 7116de80..21a2391d 100644 --- a/commands/response/ratewaifu.js +++ b/commands/response/ratewaifu.js @@ -26,6 +26,6 @@ module.exports = class RateWaifuCommand extends commando.Command { console.log(`[Command] ${message.content}`); let waifuToRate = args.waifu; let rating = Math.floor(Math.random() * 10) + 1; - return message.channel.send(`I'd give ${waifuToRate} a ${rating}/10!`); + return message.say(`I'd give ${waifuToRate} a ${rating}/10!`); } }; diff --git a/commands/response/roast.js b/commands/response/roast.js index ce7f0307..77da42c9 100644 --- a/commands/response/roast.js +++ b/commands/response/roast.js @@ -32,7 +32,7 @@ module.exports = class RoastMeCommand extends commando.Command { return message.reply(roasts); } else { - return message.channel.send(`${userToRoast}, ${roasts}`); + return message.say(`${userToRoast}, ${roasts}`); } } }; diff --git a/commands/response/roll.js b/commands/response/roll.js index a9b89eb4..575f3529 100644 --- a/commands/response/roll.js +++ b/commands/response/roll.js @@ -28,6 +28,6 @@ module.exports = class RollChooseCommand extends commando.Command { console.log(`[Command] ${message.content}`); let value = args.number; let roll = Math.floor(Math.random() * value) + 1; - return message.channel.send(`You rolled a ${roll}.`); + return message.say(`You rolled a ${roll}.`); } }; diff --git a/commands/response/roulette.js b/commands/response/roulette.js index df631dc9..ada51d65 100644 --- a/commands/response/roulette.js +++ b/commands/response/roulette.js @@ -23,6 +23,6 @@ module.exports = class RouletteCommand extends commando.Command { if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES'])) return; } console.log(`[Command] ${message.content}`); - return message.channel.send(`I choose ${message.guild.members.random().displayName}!`); + return message.say(`I choose ${message.guild.members.random().displayName}!`); } }; diff --git a/commands/response/ship.js b/commands/response/ship.js index 5dead621..d75e4b1d 100644 --- a/commands/response/ship.js +++ b/commands/response/ship.js @@ -26,6 +26,6 @@ module.exports = class ShipCommand extends commando.Command { console.log(`[Command] ${message.content}`); let thingToShip = args.things; let percentage = Math.floor(Math.random() * 100) + 1; - return message.channel.send(`I'd give ${thingToShip} a ${percentage}%!`); + return message.say(`I'd give ${thingToShip} a ${percentage}%!`); } }; diff --git a/commands/response/vocaloid.js b/commands/response/vocaloid.js index 3c3744f3..316cd1aa 100644 --- a/commands/response/vocaloid.js +++ b/commands/response/vocaloid.js @@ -21,6 +21,6 @@ module.exports = class VocaloidSongRndm extends commando.Command { console.log(`[Command] ${message.content}`); let songs = ["https://www.youtube.com/watch?v=ebAKoRcYFTA", "https://www.youtube.com/watch?v=Mqps4anhz0Q", "https://www.youtube.com/watch?v=AUEiHQOCQ2M", "https://www.youtube.com/watch?v=oyteTOBxRm8", "https://www.youtube.com/watch?v=uwwU55zBYlQ", "https://www.youtube.com/watch?v=sSYoz0JmnZo", "https://www.youtube.com/watch?v=NpU4dsXW6EI", "https://www.youtube.com/watch?v=MzyXD8bNbvk", "https://www.youtube.com/watch?v=hyV4qGAPKac", "https://www.youtube.com/watch?v=pywNi6gD1FA", "https://www.youtube.com/watch?v=17FEtaiWdVg", "https://www.youtube.com/watch?v=fmrA-gxJxgQ", "https://www.youtube.com/watch?v=yOBWgSPrYVA", "https://www.youtube.com/watch?v=nCaqf9WhqOY", "https://www.youtube.com/watch?v=cQKGUgOfD8U", "https://www.youtube.com/watch?v=sK92X82T3Sk", "https://www.youtube.com/watch?v=AH5_sKwDw1E", "https://www.youtube.com/watch?v=dw-KJNqcK-Q", "https://www.youtube.com/watch?v=X47JmmqbMvc", "https://www.youtube.com/watch?v=ojQPpYVQt7U", "https://www.amazon.com/Gogatsu-Yamai-feat-Kagamine-Len/dp/B00P1BG27S", "https://www.youtube.com/watch?v=N1-Z8uslIsI", "https://www.youtube.com/watch?v=EAgk-t2zzqw", "https://www.youtube.com/watch?v=uLBC2kWYFo8", "https://www.youtube.com/watch?v=OXHYIlkZLUU", "https://www.youtube.com/watch?v=ObIa9wXbyMQ", "https://www.youtube.com/watch?v=dGNoCICGmo0", "https://www.youtube.com/watch?v=LcoyEZkTKfY", "https://www.youtube.com/watch?v=mKHaW0qd5Mw", "https://www.youtube.com/watch?v=GG627DYk_E4", "https://www.youtube.com/watch?v=jTm6Q5Pj_Jo", "https://www.youtube.com/watch?v=TVeIDmk3rBo", "https://www.youtube.com/watch?v=1K3in6w9tt4", "https://www.youtube.com/watch?v=07r67gGbtLQ", "https://www.youtube.com/watch?v=243vPl8HdVk", "https://www.youtube.com/watch?v=zweVJrnE1uY", "https://www.youtube.com/watch?v=RKtoreimcQ8", "https://www.youtube.com/watch?v=Je6dCVfHvkU", "https://www.youtube.com/watch?v=UxFv12y_evM", "https://www.youtube.com/watch?v=2HegQtmJeto", "https://www.youtube.com/watch?v=8-Epnpruww0"]; songs = songs[Math.floor(Math.random() * songs.length)]; - return message.channel.send(songs); + return message.say(songs); } }; diff --git a/commands/roleplay/cuddle.js b/commands/roleplay/cuddle.js index 8890ad05..f433161c 100644 --- a/commands/roleplay/cuddle.js +++ b/commands/roleplay/cuddle.js @@ -22,6 +22,6 @@ module.exports = class CuddleCommand extends commando.Command { } console.log(`[Command] ${message.content}`); let thingToRoleplay = args.thing; - return message.channel.send(`${message.author} *cuddles* ${thingToRoleplay}`); + return message.say(`${message.author} *cuddles* ${thingToRoleplay}`); } }; diff --git a/commands/roleplay/divorce.js b/commands/roleplay/divorce.js index 13b98151..bed06cb0 100644 --- a/commands/roleplay/divorce.js +++ b/commands/roleplay/divorce.js @@ -22,6 +22,6 @@ module.exports = class DivorceCommand extends commando.Command { } console.log(`[Command] ${message.content}`); let thingToRoleplay = args.thing; - return message.channel.send(`${message.author} *divorces* ${thingToRoleplay}`); + return message.say(`${message.author} *divorces* ${thingToRoleplay}`); } }; diff --git a/commands/roleplay/eat.js b/commands/roleplay/eat.js index 31045c20..b877b663 100644 --- a/commands/roleplay/eat.js +++ b/commands/roleplay/eat.js @@ -22,6 +22,6 @@ module.exports = class EatCommand extends commando.Command { } console.log(`[Command] ${message.content}`); let thingToRoleplay = args.thing; - return message.channel.send(`${message.author} *eats* ${thingToRoleplay}`); + return message.say(`${message.author} *eats* ${thingToRoleplay}`); } }; diff --git a/commands/roleplay/falconpunch.js b/commands/roleplay/falconpunch.js index c3e38928..dfc04c59 100644 --- a/commands/roleplay/falconpunch.js +++ b/commands/roleplay/falconpunch.js @@ -22,6 +22,6 @@ module.exports = class FalconPunchCommand extends commando.Command { } console.log(`[Command] ${message.content}`); let thingToRoleplay = args.thing; - return message.channel.send(`${message.author} *falcon punches* ${thingToRoleplay}`); + return message.say(`${message.author} *falcon punches* ${thingToRoleplay}`); } }; diff --git a/commands/roleplay/fistbump.js b/commands/roleplay/fistbump.js index d3acc5b2..446e3c36 100644 --- a/commands/roleplay/fistbump.js +++ b/commands/roleplay/fistbump.js @@ -22,6 +22,6 @@ module.exports = class FistBumpCommand extends commando.Command { } console.log(`[Command] ${message.content}`); let thingToRoleplay = args.thing; - return message.channel.send(`${message.author} *fist-bumps* ${thingToRoleplay} *badalalala*`); + return message.say(`${message.author} *fist-bumps* ${thingToRoleplay} *badalalala*`); } }; diff --git a/commands/roleplay/highfive.js b/commands/roleplay/highfive.js index 7097f812..49d22adb 100644 --- a/commands/roleplay/highfive.js +++ b/commands/roleplay/highfive.js @@ -22,6 +22,6 @@ module.exports = class HighFivesCommand extends commando.Command { } console.log(`[Command] ${message.content}`); let thingToRoleplay = args.thing; - return message.channel.send(`${message.author} *high-fives* ${thingToRoleplay}`); + return message.say(`${message.author} *high-fives* ${thingToRoleplay}`); } }; diff --git a/commands/roleplay/hitwithshovel.js b/commands/roleplay/hitwithshovel.js index e6128323..40515beb 100644 --- a/commands/roleplay/hitwithshovel.js +++ b/commands/roleplay/hitwithshovel.js @@ -22,6 +22,6 @@ module.exports = class HitwithShovelCommand extends commando.Command { } console.log(`[Command] ${message.content}`); let thingToRoleplay = args.thing; - return message.channel.send(`${message.author} *hits* ${thingToRoleplay} *with a shovel*`); + return message.say(`${message.author} *hits* ${thingToRoleplay} *with a shovel*`); } }; diff --git a/commands/roleplay/hug.js b/commands/roleplay/hug.js index 93433031..13a403d3 100644 --- a/commands/roleplay/hug.js +++ b/commands/roleplay/hug.js @@ -22,6 +22,6 @@ module.exports = class HugCommand extends commando.Command { } console.log(`[Command] ${message.content}`); let thingToRoleplay = args.thing; - return message.channel.send(`${message.author} *hugs* ${thingToRoleplay}`); + return message.say(`${message.author} *hugs* ${thingToRoleplay}`); } }; diff --git a/commands/roleplay/inhales.js b/commands/roleplay/inhales.js index 054d8d58..2bb5a585 100644 --- a/commands/roleplay/inhales.js +++ b/commands/roleplay/inhales.js @@ -22,6 +22,6 @@ module.exports = class InhaleCommand extends commando.Command { } console.log(`[Command] ${message.content}`); let thingToRoleplay = args.thing; - return message.channel.send(`${message.author} *inhales* ${thingToRoleplay} *but gained no ability...*`); + return message.say(`${message.author} *inhales* ${thingToRoleplay} *but gained no ability...*`); } }; diff --git a/commands/roleplay/kill.js b/commands/roleplay/kill.js index 58cd0f28..e6d82558 100644 --- a/commands/roleplay/kill.js +++ b/commands/roleplay/kill.js @@ -22,6 +22,6 @@ module.exports = class KillCommand extends commando.Command { } console.log(`[Command] ${message.content}`); let thingToRoleplay = args.thing; - return message.channel.send(`${message.author} *kills* ${thingToRoleplay}`); + return message.say(`${message.author} *kills* ${thingToRoleplay}`); } }; diff --git a/commands/roleplay/kiss.js b/commands/roleplay/kiss.js index 99147e10..3c2620d4 100644 --- a/commands/roleplay/kiss.js +++ b/commands/roleplay/kiss.js @@ -22,6 +22,6 @@ module.exports = class KissCommand extends commando.Command { } console.log(`[Command] ${message.content}`); let thingToRoleplay = args.thing; - return message.channel.send(`${message.author} *kisses* ${thingToRoleplay}`); + return message.say(`${message.author} *kisses* ${thingToRoleplay}`); } }; diff --git a/commands/roleplay/marries.js b/commands/roleplay/marries.js index 5fff0f9a..113380c4 100644 --- a/commands/roleplay/marries.js +++ b/commands/roleplay/marries.js @@ -22,6 +22,6 @@ module.exports = class MarryCommand extends commando.Command { } console.log(`[Command] ${message.content}`); let thingToRoleplay = args.thing; - return message.channel.send(`${message.author} *marries* ${thingToRoleplay}`); + return message.say(`${message.author} *marries* ${thingToRoleplay}`); } }; diff --git a/commands/roleplay/pat.js b/commands/roleplay/pat.js index 18860c35..54a24d02 100644 --- a/commands/roleplay/pat.js +++ b/commands/roleplay/pat.js @@ -22,6 +22,6 @@ module.exports = class PatCommand extends commando.Command { } console.log(`[Command] ${message.content}`); let thingToRoleplay = args.thing; - return message.channel.send(`${message.author} *pats* ${thingToRoleplay}`); + return message.say(`${message.author} *pats* ${thingToRoleplay}`); } }; diff --git a/commands/roleplay/poke.js b/commands/roleplay/poke.js index b5829168..94aec50a 100644 --- a/commands/roleplay/poke.js +++ b/commands/roleplay/poke.js @@ -22,6 +22,6 @@ module.exports = class PokeCommand extends commando.Command { } console.log(`[Command] ${message.content}`); let thingToRoleplay = args.thing; - return message.channel.send(`${message.author} *pokes* ${thingToRoleplay}`); + return message.say(`${message.author} *pokes* ${thingToRoleplay}`); } }; diff --git a/commands/roleplay/punch.js b/commands/roleplay/punch.js index 7d53a658..4a2f4dee 100644 --- a/commands/roleplay/punch.js +++ b/commands/roleplay/punch.js @@ -22,6 +22,6 @@ module.exports = class PunchCommand extends commando.Command { } console.log(`[Command] ${message.content}`); let thingToRoleplay = args.thing; - return message.channel.send(`${message.author} *punches* ${thingToRoleplay}`); + return message.say(`${message.author} *punches* ${thingToRoleplay}`); } }; diff --git a/commands/roleplay/slap.js b/commands/roleplay/slap.js index 678f8aa2..7ff1f34a 100644 --- a/commands/roleplay/slap.js +++ b/commands/roleplay/slap.js @@ -22,6 +22,6 @@ module.exports = class SlapCommand extends commando.Command { } console.log(`[Command] ${message.content}`); let thingToRoleplay = args.thing; - return message.channel.send(`${message.author} *slaps* ${thingToRoleplay}`); + return message.say(`${message.author} *slaps* ${thingToRoleplay}`); } }; diff --git a/commands/search/botinfo.js b/commands/search/botinfo.js index ecf6a781..b3bff08e 100644 --- a/commands/search/botinfo.js +++ b/commands/search/botinfo.js @@ -47,10 +47,10 @@ module.exports = class BotSearchCommand extends commando.Command { response.body.prefix, true) .addField('**Invite:**', `[Here](${response.body.invite_url})`, true); - return message.channel.sendEmbed(embed); + return message.embed(embed); } catch (err) { - return message.channel.send(":x: Error! Bot not Found!"); + return message.say(":x: Error! Bot not Found!"); } } }; diff --git a/commands/search/define.js b/commands/search/define.js index 3f3ca82d..208c75f6 100644 --- a/commands/search/define.js +++ b/commands/search/define.js @@ -45,10 +45,10 @@ module.exports = class DefineCommand extends commando.Command { .setColor(0x9797FF) .setTitle(response.body[0].word) .setDescription(response.body[0].text); - return message.channel.sendEmbed(embed); + return message.embed(embed); } catch (err) { - return message.channel.send(":x: Error! Word not Found!"); + return message.say(":x: Error! Word not Found!"); } } }; diff --git a/commands/search/discrim.js b/commands/search/discrim.js index e3e4b48a..3e535706 100644 --- a/commands/search/discrim.js +++ b/commands/search/discrim.js @@ -37,6 +37,6 @@ module.exports = class DiscrimCommand extends commando.Command { const embed = new Discord.RichEmbed() .setTitle(`${users.length} Users with the discriminator: ${userToSearch}`) .setDescription(users.join(', ')); - return message.channel.sendEmbed(embed); + return message.embed(embed); } }; diff --git a/commands/search/forecast.js b/commands/search/forecast.js index 7773c268..9776b6be 100644 --- a/commands/search/forecast.js +++ b/commands/search/forecast.js @@ -48,10 +48,10 @@ module.exports = class ForecastCommand extends commando.Command { `**High:** ${info.item.forecast[5].high}°F, **Low:** ${info.item.forecast[5].low}°F, **Condition:** ${info.item.forecast[5].text}`) .addField(`**${info.item.forecast[6].day} - ${info.item.forecast[6].date}:**`, `**High:** ${info.item.forecast[6].high}°F, **Low:** ${info.item.forecast[6].low}°F, **Condition:** ${info.item.forecast[6].text}`); - return message.channel.sendEmbed(embed); + return message.embed(embed); } catch (err) { - return message.channel.send(":x: Error! Make sure you typed the location correctly!"); + return message.say(":x: Error! Make sure you typed the location correctly!"); } } }; diff --git a/commands/search/google.js b/commands/search/google.js index 9f524a8e..844e8e48 100644 --- a/commands/search/google.js +++ b/commands/search/google.js @@ -28,7 +28,7 @@ module.exports = class DefineCommand extends commando.Command { } console.log(`[Command] ${message.content}`); let thingToSearch = encodeURI(args.query); - let searchMsg = await message.channel.send('Searching...'); + let searchMsg = await message.say('Searching...'); try { let response = await request .get(`https://www.google.com/search?q=${thingToSearch}`); diff --git a/commands/search/image.js b/commands/search/image.js index 9f8d1531..593999c0 100644 --- a/commands/search/image.js +++ b/commands/search/image.js @@ -28,7 +28,7 @@ module.exports = class DefineCommand extends commando.Command { } console.log(`[Command] ${message.content}`); let thingToSearch = encodeURI(args.query); - let searchMsg = await message.channel.send('Searching...'); + let searchMsg = await message.say('Searching...'); try { let response = await request .get(`https://www.google.com/search?tbm=isch&gs_l=img&q=${encodeURI(thingToSearch)}`); diff --git a/commands/search/imdb.js b/commands/search/imdb.js index 9efa0c69..a177aa85 100644 --- a/commands/search/imdb.js +++ b/commands/search/imdb.js @@ -34,7 +34,7 @@ module.exports = class IMDBCommand extends commando.Command { name: queryMovie }, (err, response) => { movie = response; - if (!movie) return message.channel.send(":x: Error! Movie not found!"); + if (!movie) return message.say(":x: Error! Movie not found!"); const embed = new Discord.RichEmbed() .setColor(0xDBA628) .setAuthor('IMDB', 'http://static.wixstatic.com/media/c65cbf_31901b544fe24f1890134553bf40c8be.png') @@ -55,7 +55,7 @@ module.exports = class IMDBCommand extends commando.Command { movie.writer) .addField('**Actors:**', movie.actors); - return message.channel.sendEmbed(embed); + return message.embed(embed); }); } }; diff --git a/commands/search/neopet.js b/commands/search/neopet.js index 25e0fcff..a1beb848 100644 --- a/commands/search/neopet.js +++ b/commands/search/neopet.js @@ -23,17 +23,17 @@ module.exports = class NeopetCommand extends commando.Command { console.log(`[Command] ${message.content}`); let petID = encodeURI(args.pet); if (petID === "getID") { - let petIDMsg = await message.channel.send("To get your pet's ID, simply go to http://www.sunnyneo.com/petimagefinder.php and enter your pet's name. It's image should show up. Then, find the link below the pet's image, and copy it to your message! It's recommended you keep this ID with you so you can easily share your pet's picture without having to repeat these steps."); + let petIDMsg = await message.say("To get your pet's ID, simply go to http://www.sunnyneo.com/petimagefinder.php and enter your pet's name. It's image should show up. Then, find the link below the pet's image, and copy it to your message! It's recommended you keep this ID with you so you can easily share your pet's picture without having to repeat these steps."); let petImg = await message.channel.sendFile('./images/PetID.png'); return [petIDMsg, petImg]; } try { - let petMsg = await message.channel.send(`Result for: ${petID}`); + let petMsg = await message.say(`Result for: ${petID}`); let petImg = await message.channel.sendFile(`http://pets.neopets.com/cp/${petID}/1/5.png`); return [petMsg, petImg]; } catch (err) { - return message.channel.send(":x: Error! Pet ID Not Found! Use `;neopet getID` for help on getting your pet ID."); + return message.say(":x: Error! Pet ID Not Found! Use `;neopet getID` for help on getting your pet ID."); } } }; diff --git a/commands/search/osu.js b/commands/search/osu.js index a7395df5..3afcc031 100644 --- a/commands/search/osu.js +++ b/commands/search/osu.js @@ -66,10 +66,10 @@ module.exports = class OsuCommand extends commando.Command { response.body[0].count_rank_s, true) .addField('**A:**', response.body[0].count_rank_a, true); - return message.channel.sendEmbed(embed); + return message.embed(embed); } catch (err) { - return message.channel.send(":x: Error! User not Found!"); + return message.say(":x: Error! User not Found!"); } } }; diff --git a/commands/search/pokedex.js b/commands/search/pokedex.js index 3c206530..be51b641 100644 --- a/commands/search/pokedex.js +++ b/commands/search/pokedex.js @@ -44,6 +44,6 @@ module.exports = class PokedexCommand extends commando.Command { pokedex.entry[pokemon]) .addField('Type', pokedex.type[pokemon]); - return message.channel.sendEmbed(embed); + return message.embed(embed); } }; diff --git a/commands/search/urban.js b/commands/search/urban.js index 91f7525e..8f3d3266 100644 --- a/commands/search/urban.js +++ b/commands/search/urban.js @@ -30,8 +30,8 @@ module.exports = class UrbanDictionary extends commando.Command { console.log(`[Command] ${message.content}`); let wordToDefine = args.word; urban(wordToDefine).first(function(response) { - if (!response) return message.channel.send(":x: Error! Word not found!"); - if (!response.definition) return message.channel.send(":x: Error! Word has no definition!"); + if (!response) return message.say(":x: Error! Word not found!"); + if (!response.definition) return message.say(":x: Error! Word has no definition!"); if (!response.example) { const embed = new Discord.RichEmbed() .setColor(0x32a8f0) @@ -39,7 +39,7 @@ module.exports = class UrbanDictionary extends commando.Command { .setURL(response.permalink) .setTitle(response.word) .setDescription(`${response.definition.substr(0, 1900)} [Read the Rest Here!](${response.permalink})`); - return message.channel.sendEmbed(embed); + return message.embed(embed); } const embed = new Discord.RichEmbed() .setColor(0x32a8f0) @@ -49,7 +49,7 @@ module.exports = class UrbanDictionary extends commando.Command { .setDescription(`${response.definition.substr(0, 1900)} [Read the Rest Here!](${response.permalink})`) .addField('**Example:**', response.example.substr(0, 1900)); - return message.channel.sendEmbed(embed); + return message.embed(embed); }); } }; diff --git a/commands/search/wattpad.js b/commands/search/wattpad.js index b94f7c40..63a184da 100644 --- a/commands/search/wattpad.js +++ b/commands/search/wattpad.js @@ -53,10 +53,10 @@ module.exports = class WattpadCommand extends commando.Command { response.body.stories[0].readCount, true) .addField('**Comments:**', response.body.stories[0].commentCount, true); - return message.channel.sendEmbed(embed); + return message.embed(embed); } catch (err) { - return message.channel.send(":x: Error! Book not Found!"); + return message.say(":x: Error! Book not Found!"); } } }; diff --git a/commands/search/weather.js b/commands/search/weather.js index 0a8febd3..d8865baf 100644 --- a/commands/search/weather.js +++ b/commands/search/weather.js @@ -55,10 +55,10 @@ module.exports = class WeatherCommand extends commando.Command { info.wind.direction, true) .addField('**Wind Speed:**', info.wind.speed, true); - return message.channel.sendEmbed(embed); + return message.embed(embed); } catch (err) { - return message.channel.send(":x: Error! Make sure you typed the location correctly!"); + return message.say(":x: Error! Make sure you typed the location correctly!"); } } }; diff --git a/commands/search/wikipedia.js b/commands/search/wikipedia.js index ecad20bb..e977adbd 100644 --- a/commands/search/wikipedia.js +++ b/commands/search/wikipedia.js @@ -30,7 +30,7 @@ module.exports = class WikipediaCommand extends commando.Command { .get(`https://en.wikipedia.org/w/api.php?action=query&prop=extracts&format=json&titles=${thingToSearch}&exintro=&explaintext=&redirects=&formatversion=2`); let description = response.body.query.pages[0].extract; let name = response.body.query.pages[0].title; - if (!description) return message.channel.send(":x: Error! Entry Not Found!"); + if (!description) return message.say(":x: Error! Entry Not Found!"); description = description.substr(0, 1900); description = description.split('\n').join("\n\n"); const embed = new Discord.RichEmbed() @@ -39,10 +39,10 @@ module.exports = class WikipediaCommand extends commando.Command { .setURL(`https://en.wikipedia.org/wiki/${thingToSearch}`) .setAuthor("Wikipedia", "https://upload.wikimedia.org/wikipedia/en/thumb/8/80/Wikipedia-logo-v2.svg/1122px-Wikipedia-logo-v2.svg.png") .setDescription(`${description} [Read the Rest Here](https://en.wikipedia.org/wiki/${thingToSearch})`); - return message.channel.sendEmbed(embed); + return message.embed(embed); } catch (err) { - return message.channel.send(":x: Error! Entry Not Found!"); + return message.say(":x: Error! Entry Not Found!"); } } }; diff --git a/commands/search/youtube.js b/commands/search/youtube.js index b44ab03f..21b61a5d 100644 --- a/commands/search/youtube.js +++ b/commands/search/youtube.js @@ -38,7 +38,7 @@ module.exports = class YouTubeCommand extends commando.Command { q: videoToSearch, key: config.youtubekey }); - if (!response.body.items[0].snippet) return message.channel.send(':x: Error! No Video Found!'); + if (!response.body.items[0].snippet) return message.say(':x: Error! No Video Found!'); const embed = new Discord.RichEmbed() .setColor(0xDD2825) .setTitle(response.body.items[0].snippet.title) @@ -46,10 +46,10 @@ module.exports = class YouTubeCommand extends commando.Command { .setAuthor(`YouTube - ${response.body.items[0].snippet.channelTitle}`, 'https://cdn3.iconfinder.com/data/icons/social-icons-5/607/YouTube_Play.png') .setURL(`https://www.youtube.com/watch?v=${response.body.items[0].id.videoId}`) .setThumbnail(response.body.items[0].snippet.thumbnails.default.url); - return message.channel.sendEmbed(embed); + return message.embed(embed); } catch (err) { - return message.channel.send(":x: Error! An error has occurred! Try again later! (If this continues to occur, the daily quota may have been reached)."); + return message.say(":x: Error! An error has occurred! Try again later! (If this continues to occur, the daily quota may have been reached)."); } } }; diff --git a/commands/search/yugioh.js b/commands/search/yugioh.js index f1a9e952..24dc323d 100644 --- a/commands/search/yugioh.js +++ b/commands/search/yugioh.js @@ -45,7 +45,7 @@ module.exports = class YuGiOhCommand extends commando.Command { response.body.data.def, true) .addField('**Level:**', response.body.data.level, true); - return message.channel.sendEmbed(embed); + return message.embed(embed); } const embed = new Discord.RichEmbed() .setColor(0xBE5F1F) @@ -54,10 +54,10 @@ module.exports = class YuGiOhCommand extends commando.Command { .setAuthor('Yu-Gi-Oh!', 'http://vignette3.wikia.nocookie.net/yugioh/images/1/10/Back-TF-EN-VG.png/revision/latest?cb=20120824043558') .addField('**Card Type:**', response.body.data.card_type, true); - return message.channel.sendEmbed(embed); + return message.embed(embed); } catch (err) { - return message.channel.send(":x: Error! Card not Found!\n:notepad_spiral: Note: This command is **extremely** sensitive to casing and dashes and whatnot. Type the *exact* card name to get data!"); + return message.say(":x: Error! Card not Found!\n:notepad_spiral: Note: This command is **extremely** sensitive to casing and dashes and whatnot. Type the *exact* card name to get data!"); } } }; diff --git a/commands/textedit/binary.js b/commands/textedit/binary.js index 5b10cf06..5284be26 100644 --- a/commands/textedit/binary.js +++ b/commands/textedit/binary.js @@ -30,6 +30,6 @@ module.exports = class BinaryCommand extends commando.Command { console.log(`[Command] ${message.content}`); let turnToBinary = args.text; let binaryText = stringToBinary(turnToBinary); - return message.channel.send(binaryText); + return message.say(binaryText); } }; diff --git a/commands/textedit/cowsay.js b/commands/textedit/cowsay.js index 00433c03..37d0bfc3 100644 --- a/commands/textedit/cowsay.js +++ b/commands/textedit/cowsay.js @@ -23,10 +23,10 @@ module.exports = class CowsayCommand extends commando.Command { } console.log(`[Command] ${message.content}`); let turnToCowsay = args.text; - return message.channel.sendCode(null, cowsay.say({ + return message.code(null, cowsay.say({ text: turnToCowsay, e: "oO", T: "U " - })).catch(error => message.channel.send(':x: Error! Perhaps the content is too long?')); + })).catch(error => message.say(':x: Error! Perhaps the content is too long?')); } }; diff --git a/commands/textedit/embed.js b/commands/textedit/embed.js index b4f9e79b..1c30e5ad 100644 --- a/commands/textedit/embed.js +++ b/commands/textedit/embed.js @@ -30,7 +30,7 @@ module.exports = class EmbedCommand extends commando.Command { .setTimestamp() .setDescription(embedMessage); let deleteMsg = await message.delete(); - let embedSend = await message.channel.sendEmbed(embed); + let embedSend = await message.embed(embed); return [deleteMsg, embedSend]; } }; diff --git a/commands/textedit/morse.js b/commands/textedit/morse.js index ed55b0f3..cade6bf0 100644 --- a/commands/textedit/morse.js +++ b/commands/textedit/morse.js @@ -38,10 +38,10 @@ module.exports = class MorseCommand extends commando.Command { let methodToUse = args.method.toLowerCase(); let toMorse = args.text; if (methodToUse === 'encode') { - return message.channel.send(morse.encode(toMorse)).catch(error => message.channel.send(':x: Error! Something went wrong! Perhaps you entered incorrect text?')); + return message.say(morse.encode(toMorse)).catch(error => message.say(':x: Error! Something went wrong! Perhaps you entered incorrect text?')); } else if (methodToUse === 'decode') { - return message.channel.send(morse.decode(toMorse)).catch(error => message.channel.send(':x: Error! Something went wrong! Perhaps you entered incorrect text?')); + return message.say(morse.decode(toMorse)).catch(error => message.say(':x: Error! Something went wrong! Perhaps you entered incorrect text?')); } } }; diff --git a/commands/textedit/pirate.js b/commands/textedit/pirate.js index 6b91b1cf..f8708d91 100644 --- a/commands/textedit/pirate.js +++ b/commands/textedit/pirate.js @@ -34,7 +34,7 @@ module.exports = class PirateCommand extends commando.Command { console.log(`[Command] ${message.content}`); let turnToPirate = args.text; let pirate = pirateSpeak.translate(turnToPirate); - if (pirate.length > 1950) return message.channel.send(":x: Error! Your message is too long!"); - return message.channel.send(pirate); + if (pirate.length > 1950) return message.say(":x: Error! Your message is too long!"); + return message.say(pirate); } }; diff --git a/commands/textedit/reverse.js b/commands/textedit/reverse.js index 4ed71ce4..193383aa 100644 --- a/commands/textedit/reverse.js +++ b/commands/textedit/reverse.js @@ -23,6 +23,6 @@ module.exports = class ReverseCommand extends commando.Command { console.log(`[Command] ${message.content}`); let stringToReverse = args.text; let reversed = stringToReverse.split("").reverse().join(""); - return message.channel.send(reversed); + return message.say(reversed); } }; diff --git a/commands/textedit/rin.js b/commands/textedit/rin.js index 8df7f0a7..6f044bf5 100644 --- a/commands/textedit/rin.js +++ b/commands/textedit/rin.js @@ -41,7 +41,7 @@ module.exports = class RinSayCommand extends commando.Command { return [post, deleteMsg]; } catch (err) { - return message.channel.send(':x: Error! Message failed to send!'); + return message.say(':x: Error! Message failed to send!'); } } }; diff --git a/commands/textedit/romaji.js b/commands/textedit/romaji.js index cdddf05e..893c35ae 100644 --- a/commands/textedit/romaji.js +++ b/commands/textedit/romaji.js @@ -36,6 +36,6 @@ module.exports = class RomajiCommand extends commando.Command { console.log(`[Command] ${message.content}`); let romajify = args.kana; let romajified = hepburn.fromKana(romajify); - return message.channel.send(romajified); + return message.say(romajified); } }; diff --git a/commands/textedit/say.js b/commands/textedit/say.js index 00c3d7d8..b3fb6c05 100644 --- a/commands/textedit/say.js +++ b/commands/textedit/say.js @@ -30,7 +30,7 @@ module.exports = class SayCommand extends commando.Command { console.log(`[Command] ${message.content}`); let copycat = args.text; let deleteMsg = await message.delete(); - let copyMsg = await message.channel.send(copycat); + let copyMsg = await message.say(copycat); return [deleteMsg, copyMsg]; } }; diff --git a/commands/textedit/shuffle.js b/commands/textedit/shuffle.js index 0805b853..39f4209d 100644 --- a/commands/textedit/shuffle.js +++ b/commands/textedit/shuffle.js @@ -34,6 +34,6 @@ module.exports = class ShuffleCommand extends commando.Command { } console.log(`[Command] ${message.content}`); let thingToShuffle = args.text; - return message.channel.send(thingToShuffle.shuffle()); + return message.say(thingToShuffle.shuffle()); } }; diff --git a/commands/textedit/temmie.js b/commands/textedit/temmie.js index c748169f..30c41eca 100644 --- a/commands/textedit/temmie.js +++ b/commands/textedit/temmie.js @@ -315,6 +315,6 @@ module.exports = class TemmieCommand extends commando.Command { console.log(`[Command] ${message.content}`); let thingToTranslate = args.text; let temmized = temmize(thingToTranslate); - return message.channel.send(temmized); + return message.say(temmized); } }; diff --git a/commands/textedit/translate.js b/commands/textedit/translate.js index da43f831..69e76436 100644 --- a/commands/textedit/translate.js +++ b/commands/textedit/translate.js @@ -160,10 +160,10 @@ module.exports = class TranslateCommand extends commando.Command { thingToTranslate) .addField(`Translation (To: ${languages[languageto]}):`, res.text); - return message.channel.sendEmbed(embed); + return message.embed(embed); } catch (err) { - return message.channel.send(":x: Error! Something went wrong!"); + return message.say(":x: Error! Something went wrong!"); } } }; diff --git a/commands/textedit/yoda.js b/commands/textedit/yoda.js index 16804288..511c246e 100644 --- a/commands/textedit/yoda.js +++ b/commands/textedit/yoda.js @@ -34,11 +34,11 @@ module.exports = class YodaCommand extends commando.Command { .query({ sentence: turnToYoda }); - if (!response.text) return message.channel.send(':x: Error! Something went wrong! Keep it simple to avoid this error.'); - return message.channel.send(response.text); + if (!response.text) return message.say(':x: Error! Something went wrong! Keep it simple to avoid this error.'); + return message.say(response.text); } catch (err) { - return message.channel.send(":x: Error! Something went wrong!"); + return message.say(":x: Error! Something went wrong!"); } } }; diff --git a/commands/textedit/zalgo.js b/commands/textedit/zalgo.js index 7e594817..fb46b2e3 100644 --- a/commands/textedit/zalgo.js +++ b/commands/textedit/zalgo.js @@ -29,6 +29,6 @@ module.exports = class ZalgoCommand extends commando.Command { } console.log(`[Command] ${message.content}`); let zalgoified = zalgo(args.text); - return message.channel.send(zalgoified); + return message.say(zalgoified); } }; diff --git a/commands/userinfo/avatar.js b/commands/userinfo/avatar.js index 39b2d7d3..4a3a144f 100644 --- a/commands/userinfo/avatar.js +++ b/commands/userinfo/avatar.js @@ -22,6 +22,6 @@ module.exports = class AvatarCommand extends commando.Command { } console.log(`[Command] ${message.content}`); let user = args.user; - return message.channel.send(user.displayAvatarURL); + return message.say(user.displayAvatarURL); } }; diff --git a/commands/userinfo/userinfo.js b/commands/userinfo/userinfo.js index 39c62bc9..2cdee54f 100644 --- a/commands/userinfo/userinfo.js +++ b/commands/userinfo/userinfo.js @@ -83,6 +83,6 @@ module.exports = class UserInfoCommand extends commando.Command { stat, true) .addField('**Playing:**', userGame, true); - return message.channel.sendEmbed(embed); + return message.embed(embed); } }; diff --git a/commands/util/servers.js b/commands/util/servers.js index da6c892a..22514177 100644 --- a/commands/util/servers.js +++ b/commands/util/servers.js @@ -25,6 +25,6 @@ module.exports = class ServersCommand extends commando.Command { let guildCount = this.client.guilds.size; let guildNames = this.client.guilds.map(g => `${g.name} (${g.id})`).join(", "); console.log(`${guildCount} Servers: ${guildNames}`); - return message.channel.send("Sent the information to the console!"); + return message.say("Sent the information to the console!"); } };