From 38a1e11b02b0c20d0f1365f20478f1823a5f777f Mon Sep 17 00:00:00 2001 From: Daniel Odendahl Jr Date: Fri, 29 Sep 2017 00:49:17 +0000 Subject: [PATCH] Remove extended Command class --- commands/avatar-edit/3000-years.js | 2 +- commands/avatar-edit/approved.js | 2 +- commands/avatar-edit/avatar-fusion.js | 2 +- commands/avatar-edit/beautiful.js | 2 +- commands/avatar-edit/bob-ross.js | 2 +- commands/avatar-edit/card.js | 2 +- commands/avatar-edit/challenger.js | 2 +- commands/avatar-edit/christmas-hat.js | 2 +- commands/avatar-edit/dexter.js | 2 +- commands/avatar-edit/greyscale.js | 2 +- commands/avatar-edit/he-lives-in-you.js | 2 +- commands/avatar-edit/i-have-the-power.js | 2 +- commands/avatar-edit/invert.js | 2 +- commands/avatar-edit/photograph.js | 2 +- commands/avatar-edit/pixelize.js | 2 +- commands/avatar-edit/rainbow.js | 2 +- commands/avatar-edit/rejected.js | 2 +- commands/avatar-edit/rip.js | 2 +- commands/avatar-edit/steam-card.js | 2 +- commands/avatar-edit/steam-now-playing.js | 2 +- commands/avatar-edit/thug-life.js | 2 +- commands/avatar-edit/triggered.js | 2 +- commands/avatar-edit/wanted.js | 2 +- commands/avatar-edit/yu-gi-oh-token.js | 2 +- commands/games/akinator.js | 2 +- commands/games/battle.js | 2 +- commands/games/emoji-emoji-revolution.js | 2 +- commands/games/fishy.js | 2 +- commands/games/gunfight.js | 2 +- commands/games/hangman.js | 2 +- commands/games/lottery.js | 2 +- commands/games/math-game.js | 2 +- commands/games/quiz.js | 2 +- commands/games/rock-paper-scissors.js | 2 +- commands/games/slots.js | 2 +- commands/games/tic-tac-toe.js | 2 +- commands/games/typing-game.js | 2 +- commands/games/whos-that-pokemon.js | 2 +- commands/guild-info/channel-info.js | 2 +- commands/guild-info/emoji.js | 2 +- commands/guild-info/role-info.js | 2 +- commands/guild-info/server-info.js | 2 +- commands/image-edit/achievement.js | 2 +- commands/image-edit/be-like-bill.js | 2 +- commands/image-edit/color.js | 2 +- commands/image-edit/meme.js | 2 +- commands/image-edit/pokemon-fusion.js | 2 +- commands/image-edit/robohash.js | 2 +- commands/moderation/ban.js | 2 +- commands/moderation/clear-channel.js | 2 +- commands/moderation/hackban.js | 2 +- commands/moderation/kick.js | 2 +- commands/moderation/lockdown.js | 2 +- commands/moderation/prune.js | 2 +- commands/moderation/softban.js | 2 +- commands/moderation/unban.js | 2 +- commands/num-edit/currency.js | 2 +- commands/num-edit/math.js | 2 +- commands/num-edit/temperature.js | 2 +- commands/random-img/cat.js | 2 +- commands/random-img/dog.js | 2 +- commands/random-img/fidget.js | 2 +- commands/random-img/xiao.js | 2 +- commands/random-res/8-ball.js | 2 +- commands/random-res/cat-fact.js | 2 +- commands/random-res/choose.js | 2 +- commands/random-res/chuck-norris.js | 2 +- commands/random-res/coin.js | 2 +- commands/random-res/compliment.js | 2 +- commands/random-res/dog-fact.js | 2 +- commands/random-res/fact-core.js | 2 +- commands/random-res/fortune.js | 2 +- commands/random-res/history.js | 2 +- commands/random-res/joke.js | 2 +- commands/random-res/magic-conch.js | 2 +- commands/random-res/name.js | 2 +- commands/random-res/new-york-times.js | 2 +- commands/random-res/number-fact.js | 2 +- commands/random-res/offspring.js | 2 +- commands/random-res/quantum-coin.js | 2 +- commands/random-res/quote.js | 2 +- commands/random-res/rate-waifu.js | 2 +- commands/random-res/roast.js | 2 +- commands/random-res/roll.js | 2 +- commands/random-res/roulette.js | 2 +- commands/random-res/security-key.js | 2 +- commands/random-res/ship.js | 2 +- commands/random-res/would-you-rather.js | 2 +- commands/random/can-you-not.js | 2 +- commands/random/coolness.js | 2 +- commands/random/dark-theme-light-theme.js | 2 +- commands/random/days-until.js | 2 +- commands/random/eat-pant.js | 2 +- commands/random/gender-guess.js | 2 +- commands/random/give-flower.js | 2 +- commands/random/horoscope.js | 2 +- commands/random/its-joke.js | 2 +- commands/random/lenny.js | 2 +- commands/random/lmgtfy.js | 2 +- commands/random/shorten-url.js | 2 +- commands/random/slow-clap.js | 2 +- commands/random/soundboard.js | 2 +- commands/random/spam.js | 2 +- commands/random/spoopy-link.js | 2 +- commands/random/strawpoll.js | 2 +- commands/random/tableflip.js | 2 +- commands/random/word-of-the-day.js | 2 +- commands/random/xkcd.js | 2 +- commands/roleplay/break-up.js | 2 +- commands/roleplay/cuddle.js | 2 +- commands/roleplay/eat.js | 2 +- commands/roleplay/evolve.js | 2 +- commands/roleplay/falcon-punch.js | 2 +- commands/roleplay/fist-bump.js | 2 +- commands/roleplay/high-five.js | 2 +- commands/roleplay/hit-with-shovel.js | 2 +- commands/roleplay/hug.js | 2 +- commands/roleplay/inhale.js | 2 +- commands/roleplay/kill.js | 2 +- commands/roleplay/kiss.js | 2 +- commands/roleplay/marry.js | 2 +- commands/roleplay/pat.js | 2 +- commands/roleplay/poke.js | 2 +- commands/roleplay/punch.js | 2 +- commands/roleplay/slap.js | 2 +- commands/roleplay/tackle.js | 2 +- commands/search/anime.js | 2 +- commands/search/bot-info.js | 2 +- commands/search/bulbapedia.js | 2 +- commands/search/derpibooru.js | 2 +- commands/search/dictionary.js | 2 +- commands/search/discriminator.js | 2 +- commands/search/flickr.js | 2 +- commands/search/giphy.js | 2 +- commands/search/github.js | 2 +- commands/search/ip-info.js | 2 +- commands/search/itunes.js | 2 +- commands/search/jisho.js | 2 +- commands/search/kickstarter.js | 2 +- commands/search/manga.js | 2 +- commands/search/map.js | 2 +- commands/search/mdn.js | 2 +- commands/search/movie.js | 2 +- commands/search/nasa.js | 2 +- commands/search/neopet.js | 2 +- commands/search/npm.js | 2 +- commands/search/osu.js | 2 +- commands/search/pokedex.js | 2 +- commands/search/recipe.js | 2 +- commands/search/reddit.js | 2 +- commands/search/rotten-tomatoes.js | 2 +- commands/search/safebooru.js | 2 +- commands/search/steam.js | 2 +- commands/search/stocks.js | 2 +- commands/search/studio-ghibli.js | 2 +- commands/search/thesaurus.js | 2 +- commands/search/tv-show.js | 2 +- commands/search/urban.js | 2 +- commands/search/vocaloid.js | 2 +- commands/search/wattpad.js | 2 +- commands/search/weather.js | 2 +- commands/search/wikia.js | 2 +- commands/search/wikipedia.js | 2 +- commands/search/youtube.js | 2 +- commands/search/yu-gi-oh.js | 2 +- commands/text-edit/alphabet-reverse.js | 2 +- commands/text-edit/b.js | 2 +- commands/text-edit/binary.js | 2 +- commands/text-edit/clap.js | 2 +- commands/text-edit/cow-say.js | 2 +- commands/text-edit/embed.js | 2 +- commands/text-edit/emojify.js | 2 +- commands/text-edit/mocking.js | 2 +- commands/text-edit/morse.js | 2 +- commands/text-edit/organization-xiii-name.js | 2 +- commands/text-edit/pirate.js | 2 +- commands/text-edit/repeat.js | 2 +- commands/text-edit/reverse.js | 2 +- commands/text-edit/say.js | 2 +- commands/text-edit/ship-name.js | 2 +- commands/text-edit/shuffle.js | 2 +- commands/text-edit/snake-speak.js | 2 +- commands/text-edit/temmie.js | 2 +- commands/text-edit/translate.js | 2 +- commands/text-edit/upside-down.js | 2 +- commands/text-edit/webhook.js | 7 ++++-- commands/text-edit/yoda.js | 2 +- commands/text-edit/zalgo.js | 2 +- commands/user-info/avatar.js | 2 +- commands/user-info/user-info.js | 2 +- commands/util/donate.js | 2 +- commands/util/help.js | 2 +- commands/util/info.js | 2 +- commands/util/invite.js | 2 +- commands/util/ping.js | 2 +- commands/util/shard-info.js | 2 +- commands/util/shutdown.js | 7 ++++-- commands/util/uptime.js | 2 +- commands/util/upvote.js | 2 +- package.json | 2 +- structures/Command.js | 26 -------------------- 201 files changed, 208 insertions(+), 228 deletions(-) delete mode 100644 structures/Command.js diff --git a/commands/avatar-edit/3000-years.js b/commands/avatar-edit/3000-years.js index 1737313b..6dc11ff7 100644 --- a/commands/avatar-edit/3000-years.js +++ b/commands/avatar-edit/3000-years.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { createCanvas, loadImage } = require('canvas'); const snekfetch = require('snekfetch'); const path = require('path'); diff --git a/commands/avatar-edit/approved.js b/commands/avatar-edit/approved.js index c77a47c9..fdac6ba0 100644 --- a/commands/avatar-edit/approved.js +++ b/commands/avatar-edit/approved.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { createCanvas, loadImage } = require('canvas'); const snekfetch = require('snekfetch'); const path = require('path'); diff --git a/commands/avatar-edit/avatar-fusion.js b/commands/avatar-edit/avatar-fusion.js index 36f28da9..5dabff99 100644 --- a/commands/avatar-edit/avatar-fusion.js +++ b/commands/avatar-edit/avatar-fusion.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { createCanvas, loadImage } = require('canvas'); const snekfetch = require('snekfetch'); diff --git a/commands/avatar-edit/beautiful.js b/commands/avatar-edit/beautiful.js index 5973d7e0..2a6361b2 100644 --- a/commands/avatar-edit/beautiful.js +++ b/commands/avatar-edit/beautiful.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { createCanvas, loadImage } = require('canvas'); const snekfetch = require('snekfetch'); const path = require('path'); diff --git a/commands/avatar-edit/bob-ross.js b/commands/avatar-edit/bob-ross.js index bc121340..9c402371 100644 --- a/commands/avatar-edit/bob-ross.js +++ b/commands/avatar-edit/bob-ross.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { createCanvas, loadImage } = require('canvas'); const snekfetch = require('snekfetch'); const path = require('path'); diff --git a/commands/avatar-edit/card.js b/commands/avatar-edit/card.js index ddd5da3f..6b64d269 100644 --- a/commands/avatar-edit/card.js +++ b/commands/avatar-edit/card.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { createCanvas, loadImage, registerFont } = require('canvas'); const snekfetch = require('snekfetch'); const path = require('path'); diff --git a/commands/avatar-edit/challenger.js b/commands/avatar-edit/challenger.js index 8c13c7e9..37d097fc 100644 --- a/commands/avatar-edit/challenger.js +++ b/commands/avatar-edit/challenger.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { createCanvas, loadImage } = require('canvas'); const snekfetch = require('snekfetch'); const path = require('path'); diff --git a/commands/avatar-edit/christmas-hat.js b/commands/avatar-edit/christmas-hat.js index ddbfc93d..741a24c4 100644 --- a/commands/avatar-edit/christmas-hat.js +++ b/commands/avatar-edit/christmas-hat.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { createCanvas, loadImage } = require('canvas'); const snekfetch = require('snekfetch'); const path = require('path'); diff --git a/commands/avatar-edit/dexter.js b/commands/avatar-edit/dexter.js index 2e9f83c0..a104fb50 100644 --- a/commands/avatar-edit/dexter.js +++ b/commands/avatar-edit/dexter.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { createCanvas, loadImage } = require('canvas'); const snekfetch = require('snekfetch'); const path = require('path'); diff --git a/commands/avatar-edit/greyscale.js b/commands/avatar-edit/greyscale.js index e30d3470..3a0b566e 100644 --- a/commands/avatar-edit/greyscale.js +++ b/commands/avatar-edit/greyscale.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { createCanvas, loadImage } = require('canvas'); const snekfetch = require('snekfetch'); diff --git a/commands/avatar-edit/he-lives-in-you.js b/commands/avatar-edit/he-lives-in-you.js index 38c2e8f7..75eb7ac3 100644 --- a/commands/avatar-edit/he-lives-in-you.js +++ b/commands/avatar-edit/he-lives-in-you.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { createCanvas, loadImage } = require('canvas'); const snekfetch = require('snekfetch'); const path = require('path'); diff --git a/commands/avatar-edit/i-have-the-power.js b/commands/avatar-edit/i-have-the-power.js index 18573a9e..12b676a1 100644 --- a/commands/avatar-edit/i-have-the-power.js +++ b/commands/avatar-edit/i-have-the-power.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { createCanvas, loadImage } = require('canvas'); const snekfetch = require('snekfetch'); const path = require('path'); diff --git a/commands/avatar-edit/invert.js b/commands/avatar-edit/invert.js index 2d064793..684b5407 100644 --- a/commands/avatar-edit/invert.js +++ b/commands/avatar-edit/invert.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { createCanvas, loadImage } = require('canvas'); const snekfetch = require('snekfetch'); diff --git a/commands/avatar-edit/photograph.js b/commands/avatar-edit/photograph.js index 2f75a759..66cba59e 100644 --- a/commands/avatar-edit/photograph.js +++ b/commands/avatar-edit/photograph.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { createCanvas, loadImage } = require('canvas'); const snekfetch = require('snekfetch'); const path = require('path'); diff --git a/commands/avatar-edit/pixelize.js b/commands/avatar-edit/pixelize.js index f0236782..3bb1a3e9 100644 --- a/commands/avatar-edit/pixelize.js +++ b/commands/avatar-edit/pixelize.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { createCanvas, loadImage } = require('canvas'); const snekfetch = require('snekfetch'); diff --git a/commands/avatar-edit/rainbow.js b/commands/avatar-edit/rainbow.js index cd9d61cd..5128697b 100644 --- a/commands/avatar-edit/rainbow.js +++ b/commands/avatar-edit/rainbow.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { createCanvas, loadImage } = require('canvas'); const snekfetch = require('snekfetch'); const path = require('path'); diff --git a/commands/avatar-edit/rejected.js b/commands/avatar-edit/rejected.js index 3d68f7d1..61abfe7a 100644 --- a/commands/avatar-edit/rejected.js +++ b/commands/avatar-edit/rejected.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { createCanvas, loadImage } = require('canvas'); const snekfetch = require('snekfetch'); const path = require('path'); diff --git a/commands/avatar-edit/rip.js b/commands/avatar-edit/rip.js index fc9468a9..a1617e83 100644 --- a/commands/avatar-edit/rip.js +++ b/commands/avatar-edit/rip.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { createCanvas, loadImage } = require('canvas'); const snekfetch = require('snekfetch'); const path = require('path'); diff --git a/commands/avatar-edit/steam-card.js b/commands/avatar-edit/steam-card.js index c44d7484..e1fc0791 100644 --- a/commands/avatar-edit/steam-card.js +++ b/commands/avatar-edit/steam-card.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { createCanvas, loadImage, registerFont } = require('canvas'); const snekfetch = require('snekfetch'); const path = require('path'); diff --git a/commands/avatar-edit/steam-now-playing.js b/commands/avatar-edit/steam-now-playing.js index 35d017c1..29f81f16 100644 --- a/commands/avatar-edit/steam-now-playing.js +++ b/commands/avatar-edit/steam-now-playing.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { createCanvas, loadImage, registerFont } = require('canvas'); const snekfetch = require('snekfetch'); const path = require('path'); diff --git a/commands/avatar-edit/thug-life.js b/commands/avatar-edit/thug-life.js index b1dd093c..d947f16c 100644 --- a/commands/avatar-edit/thug-life.js +++ b/commands/avatar-edit/thug-life.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { createCanvas, loadImage } = require('canvas'); const snekfetch = require('snekfetch'); const path = require('path'); diff --git a/commands/avatar-edit/triggered.js b/commands/avatar-edit/triggered.js index b4c60e04..c7c324c6 100644 --- a/commands/avatar-edit/triggered.js +++ b/commands/avatar-edit/triggered.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { createCanvas, loadImage } = require('canvas'); const snekfetch = require('snekfetch'); const path = require('path'); diff --git a/commands/avatar-edit/wanted.js b/commands/avatar-edit/wanted.js index 30defdb1..8914a209 100644 --- a/commands/avatar-edit/wanted.js +++ b/commands/avatar-edit/wanted.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { createCanvas, loadImage } = require('canvas'); const snekfetch = require('snekfetch'); const path = require('path'); diff --git a/commands/avatar-edit/yu-gi-oh-token.js b/commands/avatar-edit/yu-gi-oh-token.js index 634fe4e4..39bdf8fe 100644 --- a/commands/avatar-edit/yu-gi-oh-token.js +++ b/commands/avatar-edit/yu-gi-oh-token.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { createCanvas, loadImage } = require('canvas'); const snekfetch = require('snekfetch'); const path = require('path'); diff --git a/commands/games/akinator.js b/commands/games/akinator.js index b720598c..08eed473 100644 --- a/commands/games/akinator.js +++ b/commands/games/akinator.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { MessageEmbed } = require('discord.js'); const snekfetch = require('snekfetch'); const { stripIndents } = require('common-tags'); diff --git a/commands/games/battle.js b/commands/games/battle.js index 032a0895..fd5f9d2d 100644 --- a/commands/games/battle.js +++ b/commands/games/battle.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { stripIndents } = require('common-tags'); module.exports = class BattleCommand extends Command { diff --git a/commands/games/emoji-emoji-revolution.js b/commands/games/emoji-emoji-revolution.js index 6a043955..a77faa7b 100644 --- a/commands/games/emoji-emoji-revolution.js +++ b/commands/games/emoji-emoji-revolution.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { stripIndents } = require('common-tags'); const emojis = ['⬆', '↗', '➡', '↘', '⬇', '↙', '⬅', '↖']; diff --git a/commands/games/fishy.js b/commands/games/fishy.js index c929ea6b..eda54a72 100644 --- a/commands/games/fishy.js +++ b/commands/games/fishy.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const fishes = require('../../assets/json/fishy'); module.exports = class FishyCommand extends Command { diff --git a/commands/games/gunfight.js b/commands/games/gunfight.js index 0b683bf2..192adbcc 100644 --- a/commands/games/gunfight.js +++ b/commands/games/gunfight.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { wait } = require('../../structures/Util'); const words = ['fire', 'draw', 'shoot', 'bang', 'pull']; diff --git a/commands/games/hangman.js b/commands/games/hangman.js index a27acf0c..2688dbcf 100644 --- a/commands/games/hangman.js +++ b/commands/games/hangman.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const snekfetch = require('snekfetch'); const { stripIndents } = require('common-tags'); const { WORDNIK_KEY } = process.env; diff --git a/commands/games/lottery.js b/commands/games/lottery.js index eefd4fc4..c7a7da5b 100644 --- a/commands/games/lottery.js +++ b/commands/games/lottery.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); module.exports = class LotteryCommand extends Command { constructor(client) { diff --git a/commands/games/math-game.js b/commands/games/math-game.js index 0ff48fcf..70411849 100644 --- a/commands/games/math-game.js +++ b/commands/games/math-game.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const math = require('mathjs'); const { stripIndents } = require('common-tags'); const { list } = require('../../structures/Util'); diff --git a/commands/games/quiz.js b/commands/games/quiz.js index 37a13ecb..f02b6654 100644 --- a/commands/games/quiz.js +++ b/commands/games/quiz.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { stripIndents } = require('common-tags'); const snekfetch = require('snekfetch'); const { shuffle, list } = require('../../structures/Util'); diff --git a/commands/games/rock-paper-scissors.js b/commands/games/rock-paper-scissors.js index 673627ff..99397845 100644 --- a/commands/games/rock-paper-scissors.js +++ b/commands/games/rock-paper-scissors.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const choices = ['rock', 'paper', 'scissors']; module.exports = class RockPaperScissorsCommand extends Command { diff --git a/commands/games/slots.js b/commands/games/slots.js index 43671839..375a4e4d 100644 --- a/commands/games/slots.js +++ b/commands/games/slots.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { stripIndents } = require('common-tags'); const slots = ['🍇', '🍊', '🍐', '🍒', '🍋']; diff --git a/commands/games/tic-tac-toe.js b/commands/games/tic-tac-toe.js index d5357412..cd528728 100644 --- a/commands/games/tic-tac-toe.js +++ b/commands/games/tic-tac-toe.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { stripIndents } = require('common-tags'); module.exports = class TicTacToeCommand extends Command { diff --git a/commands/games/typing-game.js b/commands/games/typing-game.js index e5d85cc9..12a837a0 100644 --- a/commands/games/typing-game.js +++ b/commands/games/typing-game.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { stripIndents } = require('common-tags'); const { list } = require('../../structures/Util'); const sentences = require('../../assets/json/typing-game'); diff --git a/commands/games/whos-that-pokemon.js b/commands/games/whos-that-pokemon.js index 957d6da9..50ad9b83 100644 --- a/commands/games/whos-that-pokemon.js +++ b/commands/games/whos-that-pokemon.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { MessageEmbed } = require('discord.js'); const snekfetch = require('snekfetch'); const { filterPkmn } = require('../../structures/Util'); diff --git a/commands/guild-info/channel-info.js b/commands/guild-info/channel-info.js index 050643bb..7472509c 100644 --- a/commands/guild-info/channel-info.js +++ b/commands/guild-info/channel-info.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { MessageEmbed } = require('discord.js'); const types = { dm: 'DM', diff --git a/commands/guild-info/emoji.js b/commands/guild-info/emoji.js index a2df7728..44006814 100644 --- a/commands/guild-info/emoji.js +++ b/commands/guild-info/emoji.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); module.exports = class EmojiCommand extends Command { constructor(client) { diff --git a/commands/guild-info/role-info.js b/commands/guild-info/role-info.js index 16579894..f8bd8aa3 100644 --- a/commands/guild-info/role-info.js +++ b/commands/guild-info/role-info.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { MessageEmbed } = require('discord.js'); const { util } = require('discord.js-commando'); diff --git a/commands/guild-info/server-info.js b/commands/guild-info/server-info.js index 54749b54..1dca6055 100644 --- a/commands/guild-info/server-info.js +++ b/commands/guild-info/server-info.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { MessageEmbed } = require('discord.js'); const filterLevels = ['Off', 'No Role', 'Everyone']; const verificationLevels = ['None', 'Low', 'Medium', '(╯°□°）╯︵ ┻━┻', '┻━┻ ﾐヽ(ಠ益ಠ)ノ彡┻━┻']; diff --git a/commands/image-edit/achievement.js b/commands/image-edit/achievement.js index d4b2c745..a73ead1d 100644 --- a/commands/image-edit/achievement.js +++ b/commands/image-edit/achievement.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const snekfetch = require('snekfetch'); module.exports = class AchievementCommand extends Command { diff --git a/commands/image-edit/be-like-bill.js b/commands/image-edit/be-like-bill.js index ef93c5ce..187ae25a 100644 --- a/commands/image-edit/be-like-bill.js +++ b/commands/image-edit/be-like-bill.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { createCanvas, loadImage, registerFont } = require('canvas'); const { stripIndents } = require('common-tags'); const path = require('path'); diff --git a/commands/image-edit/color.js b/commands/image-edit/color.js index 248c5e7a..2707e199 100644 --- a/commands/image-edit/color.js +++ b/commands/image-edit/color.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { createCanvas } = require('canvas'); module.exports = class ColorCommand extends Command { diff --git a/commands/image-edit/meme.js b/commands/image-edit/meme.js index 25355d47..cbc2b39b 100644 --- a/commands/image-edit/meme.js +++ b/commands/image-edit/meme.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const snekfetch = require('snekfetch'); const { list } = require('../../structures/Util'); const { IMGFLIP_USER, IMGFLIP_PASS } = process.env; diff --git a/commands/image-edit/pokemon-fusion.js b/commands/image-edit/pokemon-fusion.js index 0705c2bb..b6d8513d 100644 --- a/commands/image-edit/pokemon-fusion.js +++ b/commands/image-edit/pokemon-fusion.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const pokemon = require('../../assets/json/pokemon-fusion'); module.exports = class PokemonFusionCommand extends Command { diff --git a/commands/image-edit/robohash.js b/commands/image-edit/robohash.js index 7421d588..121dfe93 100644 --- a/commands/image-edit/robohash.js +++ b/commands/image-edit/robohash.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const snekfetch = require('snekfetch'); module.exports = class RobohashCommand extends Command { diff --git a/commands/moderation/ban.js b/commands/moderation/ban.js index d67e5f14..a4eecc5c 100644 --- a/commands/moderation/ban.js +++ b/commands/moderation/ban.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { stripIndents } = require('common-tags'); module.exports = class BanCommand extends Command { diff --git a/commands/moderation/clear-channel.js b/commands/moderation/clear-channel.js index 1f9f1928..e44b81ea 100644 --- a/commands/moderation/clear-channel.js +++ b/commands/moderation/clear-channel.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); module.exports = class ClearChannelCommand extends Command { constructor(client) { diff --git a/commands/moderation/hackban.js b/commands/moderation/hackban.js index 68d7463f..7d0cca3a 100644 --- a/commands/moderation/hackban.js +++ b/commands/moderation/hackban.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); module.exports = class HackbanCommand extends Command { constructor(client) { diff --git a/commands/moderation/kick.js b/commands/moderation/kick.js index b8c4973f..4c539f95 100644 --- a/commands/moderation/kick.js +++ b/commands/moderation/kick.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { stripIndents } = require('common-tags'); module.exports = class KickCommand extends Command { diff --git a/commands/moderation/lockdown.js b/commands/moderation/lockdown.js index 48537b71..d229a6ab 100644 --- a/commands/moderation/lockdown.js +++ b/commands/moderation/lockdown.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { stripIndents } = require('common-tags'); module.exports = class LockdownCommand extends Command { diff --git a/commands/moderation/prune.js b/commands/moderation/prune.js index 4be7b46e..32759a41 100644 --- a/commands/moderation/prune.js +++ b/commands/moderation/prune.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); module.exports = class PruneCommand extends Command { constructor(client) { diff --git a/commands/moderation/softban.js b/commands/moderation/softban.js index 44bc75c9..334d0600 100644 --- a/commands/moderation/softban.js +++ b/commands/moderation/softban.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { stripIndents } = require('common-tags'); module.exports = class SoftbanCommand extends Command { diff --git a/commands/moderation/unban.js b/commands/moderation/unban.js index ee6c80a7..ff6d58b7 100644 --- a/commands/moderation/unban.js +++ b/commands/moderation/unban.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); module.exports = class UnbanCommand extends Command { constructor(client) { diff --git a/commands/num-edit/currency.js b/commands/num-edit/currency.js index f9673b47..dd524629 100644 --- a/commands/num-edit/currency.js +++ b/commands/num-edit/currency.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const snekfetch = require('snekfetch'); const { list } = require('../../structures/Util'); const codes = require('../../assets/json/currency'); diff --git a/commands/num-edit/math.js b/commands/num-edit/math.js index fde7d6f4..b7c07d9b 100644 --- a/commands/num-edit/math.js +++ b/commands/num-edit/math.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const math = require('mathjs'); module.exports = class MathCommand extends Command { diff --git a/commands/num-edit/temperature.js b/commands/num-edit/temperature.js index 8a37ade3..181f776c 100644 --- a/commands/num-edit/temperature.js +++ b/commands/num-edit/temperature.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { list } = require('../../structures/Util'); const units = ['celsius', 'fahrenheit', 'kelvin']; diff --git a/commands/random-img/cat.js b/commands/random-img/cat.js index cd7a466c..d7d288c2 100644 --- a/commands/random-img/cat.js +++ b/commands/random-img/cat.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const snekfetch = require('snekfetch'); module.exports = class CatCommand extends Command { diff --git a/commands/random-img/dog.js b/commands/random-img/dog.js index 166f798c..22d5b67f 100644 --- a/commands/random-img/dog.js +++ b/commands/random-img/dog.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const snekfetch = require('snekfetch'); module.exports = class DogCommand extends Command { diff --git a/commands/random-img/fidget.js b/commands/random-img/fidget.js index bb9ab38b..5f71854d 100644 --- a/commands/random-img/fidget.js +++ b/commands/random-img/fidget.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const nimbats = require('../../assets/json/fidget'); module.exports = class FidgetCommand extends Command { diff --git a/commands/random-img/xiao.js b/commands/random-img/xiao.js index c89d1f64..ca9bb02c 100644 --- a/commands/random-img/xiao.js +++ b/commands/random-img/xiao.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const xiaos = require('../../assets/json/xiao'); module.exports = class XiaoCommand extends Command { diff --git a/commands/random-res/8-ball.js b/commands/random-res/8-ball.js index b54dbd17..3c175126 100644 --- a/commands/random-res/8-ball.js +++ b/commands/random-res/8-ball.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { stripIndents } = require('common-tags'); const answers = require('../../assets/json/8-ball'); diff --git a/commands/random-res/cat-fact.js b/commands/random-res/cat-fact.js index 817653cd..dd059365 100644 --- a/commands/random-res/cat-fact.js +++ b/commands/random-res/cat-fact.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const facts = require('../../assets/json/cat-fact'); module.exports = class CatFactCommand extends Command { diff --git a/commands/random-res/choose.js b/commands/random-res/choose.js index 7f2c67d7..5752f8c4 100644 --- a/commands/random-res/choose.js +++ b/commands/random-res/choose.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); module.exports = class ChooseCommand extends Command { constructor(client) { diff --git a/commands/random-res/chuck-norris.js b/commands/random-res/chuck-norris.js index 52829d09..1be17592 100644 --- a/commands/random-res/chuck-norris.js +++ b/commands/random-res/chuck-norris.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const snekfetch = require('snekfetch'); module.exports = class ChuckNorrisCommand extends Command { diff --git a/commands/random-res/coin.js b/commands/random-res/coin.js index a023966c..c1dc6fcc 100644 --- a/commands/random-res/coin.js +++ b/commands/random-res/coin.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const sides = ['heads', 'tails']; module.exports = class CoinCommand extends Command { diff --git a/commands/random-res/compliment.js b/commands/random-res/compliment.js index c0f44a35..d6277d45 100644 --- a/commands/random-res/compliment.js +++ b/commands/random-res/compliment.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const compliments = require('../../assets/json/compliment'); module.exports = class ComplimentCommand extends Command { diff --git a/commands/random-res/dog-fact.js b/commands/random-res/dog-fact.js index 1ca825c5..6b1730ad 100644 --- a/commands/random-res/dog-fact.js +++ b/commands/random-res/dog-fact.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const facts = require('../../assets/json/dog-fact'); module.exports = class DogFactCommand extends Command { diff --git a/commands/random-res/fact-core.js b/commands/random-res/fact-core.js index 0a9611ac..d42154f2 100644 --- a/commands/random-res/fact-core.js +++ b/commands/random-res/fact-core.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const facts = require('../../assets/json/fact-core'); module.exports = class FactCoreCommand extends Command { diff --git a/commands/random-res/fortune.js b/commands/random-res/fortune.js index 635d5a34..08039307 100644 --- a/commands/random-res/fortune.js +++ b/commands/random-res/fortune.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const snekfetch = require('snekfetch'); const { stripIndents } = require('common-tags'); diff --git a/commands/random-res/history.js b/commands/random-res/history.js index ace26029..9564659a 100644 --- a/commands/random-res/history.js +++ b/commands/random-res/history.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { MessageEmbed } = require('discord.js'); const snekfetch = require('snekfetch'); diff --git a/commands/random-res/joke.js b/commands/random-res/joke.js index 9517a246..71fba316 100644 --- a/commands/random-res/joke.js +++ b/commands/random-res/joke.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const snekfetch = require('snekfetch'); module.exports = class JokeCommand extends Command { diff --git a/commands/random-res/magic-conch.js b/commands/random-res/magic-conch.js index 34a5561c..6287d274 100644 --- a/commands/random-res/magic-conch.js +++ b/commands/random-res/magic-conch.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { stripIndents } = require('common-tags'); const answers = ['Maybe someday', 'Nothing', 'Neither', 'I don\'t think so', 'Yes', 'Try asking again']; diff --git a/commands/random-res/name.js b/commands/random-res/name.js index 67da3fc2..0f60d1d6 100644 --- a/commands/random-res/name.js +++ b/commands/random-res/name.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const snekfetch = require('snekfetch'); const { list } = require('../../structures/Util'); const genders = ['male', 'female', 'both']; diff --git a/commands/random-res/new-york-times.js b/commands/random-res/new-york-times.js index bef9cadf..1fdb7b25 100644 --- a/commands/random-res/new-york-times.js +++ b/commands/random-res/new-york-times.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { MessageEmbed } = require('discord.js'); const snekfetch = require('snekfetch'); const { NYTIMES_KEY } = process.env; diff --git a/commands/random-res/number-fact.js b/commands/random-res/number-fact.js index b00e9eb0..72189d92 100644 --- a/commands/random-res/number-fact.js +++ b/commands/random-res/number-fact.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const snekfetch = require('snekfetch'); module.exports = class NumberFactCommand extends Command { diff --git a/commands/random-res/offspring.js b/commands/random-res/offspring.js index 408dc1fb..1803babc 100644 --- a/commands/random-res/offspring.js +++ b/commands/random-res/offspring.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const genders = ['boy', 'girl']; module.exports = class OffspringCommand extends Command { diff --git a/commands/random-res/quantum-coin.js b/commands/random-res/quantum-coin.js index 4ff9436b..85a6d4ce 100644 --- a/commands/random-res/quantum-coin.js +++ b/commands/random-res/quantum-coin.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const sides = ['on nothing', 'on NaN', 'on 0', 'in the air', 'on null']; module.exports = class QuantumCoinCommand extends Command { diff --git a/commands/random-res/quote.js b/commands/random-res/quote.js index b8de8cc1..e8e4ddaa 100644 --- a/commands/random-res/quote.js +++ b/commands/random-res/quote.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const snekfetch = require('snekfetch'); module.exports = class QuoteCommand extends Command { diff --git a/commands/random-res/rate-waifu.js b/commands/random-res/rate-waifu.js index 8c61168b..d471e304 100644 --- a/commands/random-res/rate-waifu.js +++ b/commands/random-res/rate-waifu.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); module.exports = class RateWaifuCommand extends Command { constructor(client) { diff --git a/commands/random-res/roast.js b/commands/random-res/roast.js index 658c8879..5e1d775b 100644 --- a/commands/random-res/roast.js +++ b/commands/random-res/roast.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const roasts = require('../../assets/json/roast'); module.exports = class RoastCommand extends Command { diff --git a/commands/random-res/roll.js b/commands/random-res/roll.js index 421ef7f9..85afa116 100644 --- a/commands/random-res/roll.js +++ b/commands/random-res/roll.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); module.exports = class RollCommand extends Command { constructor(client) { diff --git a/commands/random-res/roulette.js b/commands/random-res/roulette.js index ce062ead..1b0d77d9 100644 --- a/commands/random-res/roulette.js +++ b/commands/random-res/roulette.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); module.exports = class RouletteCommand extends Command { constructor(client) { diff --git a/commands/random-res/security-key.js b/commands/random-res/security-key.js index 4bbbb7ae..3b5b915c 100644 --- a/commands/random-res/security-key.js +++ b/commands/random-res/security-key.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const crypto = require('crypto'); module.exports = class SecurityKeyCommand extends Command { diff --git a/commands/random-res/ship.js b/commands/random-res/ship.js index 7f3309c4..71c18897 100644 --- a/commands/random-res/ship.js +++ b/commands/random-res/ship.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { list } = require('../../structures/Util'); module.exports = class ShipCommand extends Command { diff --git a/commands/random-res/would-you-rather.js b/commands/random-res/would-you-rather.js index 1a12bdde..263de449 100644 --- a/commands/random-res/would-you-rather.js +++ b/commands/random-res/would-you-rather.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const snekfetch = require('snekfetch'); const { stripIndents } = require('common-tags'); diff --git a/commands/random/can-you-not.js b/commands/random/can-you-not.js index 72e3e945..69ff6582 100644 --- a/commands/random/can-you-not.js +++ b/commands/random/can-you-not.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); module.exports = class CanYouNotCommand extends Command { constructor(client) { diff --git a/commands/random/coolness.js b/commands/random/coolness.js index 30e0a020..38464895 100644 --- a/commands/random/coolness.js +++ b/commands/random/coolness.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); module.exports = class CoolnessCommand extends Command { constructor(client) { diff --git a/commands/random/dark-theme-light-theme.js b/commands/random/dark-theme-light-theme.js index d3b11b3b..6e647569 100644 --- a/commands/random/dark-theme-light-theme.js +++ b/commands/random/dark-theme-light-theme.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); module.exports = class DarkThemeLightThemeCommand extends Command { constructor(client) { diff --git a/commands/random/days-until.js b/commands/random/days-until.js index f1e255bb..bc5aad7e 100644 --- a/commands/random/days-until.js +++ b/commands/random/days-until.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); module.exports = class DaysUntilCommand extends Command { constructor(client) { diff --git a/commands/random/eat-pant.js b/commands/random/eat-pant.js index 1beba727..5b85d245 100644 --- a/commands/random/eat-pant.js +++ b/commands/random/eat-pant.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); module.exports = class EatPantCommand extends Command { constructor(client) { diff --git a/commands/random/gender-guess.js b/commands/random/gender-guess.js index a2c6d013..339403b5 100644 --- a/commands/random/gender-guess.js +++ b/commands/random/gender-guess.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const snekfetch = require('snekfetch'); module.exports = class GenderGuessCommand extends Command { diff --git a/commands/random/give-flower.js b/commands/random/give-flower.js index 05e452ef..65988a88 100644 --- a/commands/random/give-flower.js +++ b/commands/random/give-flower.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); module.exports = class GiveFlowerCommand extends Command { constructor(client) { diff --git a/commands/random/horoscope.js b/commands/random/horoscope.js index ff177efe..b31a9b74 100644 --- a/commands/random/horoscope.js +++ b/commands/random/horoscope.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { MessageEmbed } = require('discord.js'); const snekfetch = require('snekfetch'); const { list } = require('../../structures/Util'); diff --git a/commands/random/its-joke.js b/commands/random/its-joke.js index 397d4d87..82e333ec 100644 --- a/commands/random/its-joke.js +++ b/commands/random/its-joke.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); module.exports = class ItsJokeCommand extends Command { constructor(client) { diff --git a/commands/random/lenny.js b/commands/random/lenny.js index 85f66fe4..18428cd4 100644 --- a/commands/random/lenny.js +++ b/commands/random/lenny.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); module.exports = class LennyCommand extends Command { constructor(client) { diff --git a/commands/random/lmgtfy.js b/commands/random/lmgtfy.js index 39ecfd52..fae62c23 100644 --- a/commands/random/lmgtfy.js +++ b/commands/random/lmgtfy.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); module.exports = class LMGTFYCommand extends Command { constructor(client) { diff --git a/commands/random/shorten-url.js b/commands/random/shorten-url.js index 02cf3d63..cc06ce24 100644 --- a/commands/random/shorten-url.js +++ b/commands/random/shorten-url.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const snekfetch = require('snekfetch'); const { GOOGLE_KEY } = process.env; diff --git a/commands/random/slow-clap.js b/commands/random/slow-clap.js index 1d261aa7..89a6c554 100644 --- a/commands/random/slow-clap.js +++ b/commands/random/slow-clap.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); module.exports = class SlowClapCommand extends Command { constructor(client) { diff --git a/commands/random/soundboard.js b/commands/random/soundboard.js index 5fcd7f70..af1dcaaa 100644 --- a/commands/random/soundboard.js +++ b/commands/random/soundboard.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { list } = require('../../structures/Util'); const path = require('path'); const sounds = ['airhorn', 'cat', 'dun-dun-dun', 'laugh track', 'pikachu', 'space']; diff --git a/commands/random/spam.js b/commands/random/spam.js index 15da046e..c94803eb 100644 --- a/commands/random/spam.js +++ b/commands/random/spam.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); module.exports = class SpamCommand extends Command { constructor(client) { diff --git a/commands/random/spoopy-link.js b/commands/random/spoopy-link.js index a0166ab6..406c8bdd 100644 --- a/commands/random/spoopy-link.js +++ b/commands/random/spoopy-link.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const snekfetch = require('snekfetch'); const { stripIndents } = require('common-tags'); diff --git a/commands/random/strawpoll.js b/commands/random/strawpoll.js index 1ebbe5b7..b9717b94 100644 --- a/commands/random/strawpoll.js +++ b/commands/random/strawpoll.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { stripIndents } = require('common-tags'); const snekfetch = require('snekfetch'); diff --git a/commands/random/tableflip.js b/commands/random/tableflip.js index e3610b9e..a0532226 100644 --- a/commands/random/tableflip.js +++ b/commands/random/tableflip.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { wait } = require('../../structures/Util'); const frames = [ '(-°□°)- ┬─┬', diff --git a/commands/random/word-of-the-day.js b/commands/random/word-of-the-day.js index f67672e4..999121d3 100644 --- a/commands/random/word-of-the-day.js +++ b/commands/random/word-of-the-day.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const snekfetch = require('snekfetch'); const { stripIndents } = require('common-tags'); const { WORDNIK_KEY } = process.env; diff --git a/commands/random/xkcd.js b/commands/random/xkcd.js index 01150336..1d4af699 100644 --- a/commands/random/xkcd.js +++ b/commands/random/xkcd.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { MessageEmbed } = require('discord.js'); const snekfetch = require('snekfetch'); diff --git a/commands/roleplay/break-up.js b/commands/roleplay/break-up.js index 323a28f4..eaecafed 100644 --- a/commands/roleplay/break-up.js +++ b/commands/roleplay/break-up.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { stripIndents } = require('common-tags'); const gifs = [ 'https://i.imgur.com/1e6QRWk.gif', diff --git a/commands/roleplay/cuddle.js b/commands/roleplay/cuddle.js index 2a9f66f7..457cd6d4 100644 --- a/commands/roleplay/cuddle.js +++ b/commands/roleplay/cuddle.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { stripIndents } = require('common-tags'); const gifs = [ 'https://i.imgur.com/JbkXFWy.gif', diff --git a/commands/roleplay/eat.js b/commands/roleplay/eat.js index 707fa178..60e61fec 100644 --- a/commands/roleplay/eat.js +++ b/commands/roleplay/eat.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { stripIndents } = require('common-tags'); const gifs = [ 'https://i.imgur.com/lQVyPgp.gif', diff --git a/commands/roleplay/evolve.js b/commands/roleplay/evolve.js index 6c0af7ef..bff89964 100644 --- a/commands/roleplay/evolve.js +++ b/commands/roleplay/evolve.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { stripIndents } = require('common-tags'); const gifs = [ 'https://i.imgur.com/bWJR9Ob.gif', diff --git a/commands/roleplay/falcon-punch.js b/commands/roleplay/falcon-punch.js index 1235a91e..769914c6 100644 --- a/commands/roleplay/falcon-punch.js +++ b/commands/roleplay/falcon-punch.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { stripIndents } = require('common-tags'); const gifs = [ 'https://i.imgur.com/womEZVC.gif', diff --git a/commands/roleplay/fist-bump.js b/commands/roleplay/fist-bump.js index 780a53be..8381c99b 100644 --- a/commands/roleplay/fist-bump.js +++ b/commands/roleplay/fist-bump.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { stripIndents } = require('common-tags'); const gifs = [ 'https://i.imgur.com/VmawTx2.gif', diff --git a/commands/roleplay/high-five.js b/commands/roleplay/high-five.js index 83d80f1b..2dd17eaa 100644 --- a/commands/roleplay/high-five.js +++ b/commands/roleplay/high-five.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { stripIndents } = require('common-tags'); const gifs = [ 'https://i.imgur.com/YvbhAML.gif', diff --git a/commands/roleplay/hit-with-shovel.js b/commands/roleplay/hit-with-shovel.js index f378cd70..4057ceaa 100644 --- a/commands/roleplay/hit-with-shovel.js +++ b/commands/roleplay/hit-with-shovel.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { stripIndents } = require('common-tags'); module.exports = class HitWithShovelCommand extends Command { diff --git a/commands/roleplay/hug.js b/commands/roleplay/hug.js index b4bf5233..4bfef5a1 100644 --- a/commands/roleplay/hug.js +++ b/commands/roleplay/hug.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { stripIndents } = require('common-tags'); const gifs = [ 'https://i.imgur.com/yb29pZP.gif', diff --git a/commands/roleplay/inhale.js b/commands/roleplay/inhale.js index ff04b8a3..708258cf 100644 --- a/commands/roleplay/inhale.js +++ b/commands/roleplay/inhale.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { stripIndents } = require('common-tags'); const gifs = [ 'https://i.imgur.com/uUUk2kS.gif', diff --git a/commands/roleplay/kill.js b/commands/roleplay/kill.js index b231ac69..1bd4f55f 100644 --- a/commands/roleplay/kill.js +++ b/commands/roleplay/kill.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { stripIndents } = require('common-tags'); module.exports = class KillCommand extends Command { diff --git a/commands/roleplay/kiss.js b/commands/roleplay/kiss.js index 0f186f3f..5afc382c 100644 --- a/commands/roleplay/kiss.js +++ b/commands/roleplay/kiss.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { stripIndents } = require('common-tags'); const gifs = [ 'https://i.imgur.com/Omge3Sb.gif', diff --git a/commands/roleplay/marry.js b/commands/roleplay/marry.js index accccb10..9521a36b 100644 --- a/commands/roleplay/marry.js +++ b/commands/roleplay/marry.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { stripIndents } = require('common-tags'); const gifs = [ 'https://i.imgur.com/uz4k1qI.gif', diff --git a/commands/roleplay/pat.js b/commands/roleplay/pat.js index a9c35a9c..addab15a 100644 --- a/commands/roleplay/pat.js +++ b/commands/roleplay/pat.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { stripIndents } = require('common-tags'); const gifs = [ 'https://i.imgur.com/vNEN1CC.gif', diff --git a/commands/roleplay/poke.js b/commands/roleplay/poke.js index dce1c82d..7b14e0ae 100644 --- a/commands/roleplay/poke.js +++ b/commands/roleplay/poke.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { stripIndents } = require('common-tags'); const gifs = [ 'https://i.imgur.com/argcQ0p.gif', diff --git a/commands/roleplay/punch.js b/commands/roleplay/punch.js index 3e7093e0..f9b714d7 100644 --- a/commands/roleplay/punch.js +++ b/commands/roleplay/punch.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { stripIndents } = require('common-tags'); const gifs = [ 'https://i.imgur.com/ihGcwnE.gif', diff --git a/commands/roleplay/slap.js b/commands/roleplay/slap.js index ff7af452..687aa39b 100644 --- a/commands/roleplay/slap.js +++ b/commands/roleplay/slap.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { stripIndents } = require('common-tags'); const gifs = [ 'https://i.imgur.com/bNw8icN.gif', diff --git a/commands/roleplay/tackle.js b/commands/roleplay/tackle.js index edd6a426..503932cb 100644 --- a/commands/roleplay/tackle.js +++ b/commands/roleplay/tackle.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { stripIndents } = require('common-tags'); const gifs = [ 'https://i.imgur.com/988Y889.gif', diff --git a/commands/search/anime.js b/commands/search/anime.js index 1f7a0b31..32a0e7f3 100644 --- a/commands/search/anime.js +++ b/commands/search/anime.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { MessageEmbed } = require('discord.js'); const snekfetch = require('snekfetch'); const { shorten } = require('../../structures/Util'); diff --git a/commands/search/bot-info.js b/commands/search/bot-info.js index 2e21b3df..4ca0fbe1 100644 --- a/commands/search/bot-info.js +++ b/commands/search/bot-info.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { MessageEmbed } = require('discord.js'); const snekfetch = require('snekfetch'); const { DBOTS_KEY } = process.env; diff --git a/commands/search/bulbapedia.js b/commands/search/bulbapedia.js index c3f719fe..b69b5ae6 100644 --- a/commands/search/bulbapedia.js +++ b/commands/search/bulbapedia.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { MessageEmbed } = require('discord.js'); const snekfetch = require('snekfetch'); const { shorten } = require('../../structures/Util'); diff --git a/commands/search/derpibooru.js b/commands/search/derpibooru.js index eb351e55..4ea15259 100644 --- a/commands/search/derpibooru.js +++ b/commands/search/derpibooru.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const snekfetch = require('snekfetch'); const { stripIndents } = require('common-tags'); diff --git a/commands/search/dictionary.js b/commands/search/dictionary.js index 4463e31f..d39bb57b 100644 --- a/commands/search/dictionary.js +++ b/commands/search/dictionary.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const snekfetch = require('snekfetch'); const { stripIndents } = require('common-tags'); const { WORDNIK_KEY } = process.env; diff --git a/commands/search/discriminator.js b/commands/search/discriminator.js index 65e8a98b..574d6657 100644 --- a/commands/search/discriminator.js +++ b/commands/search/discriminator.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { stripIndents } = require('common-tags'); module.exports = class DiscriminatorCommand extends Command { diff --git a/commands/search/flickr.js b/commands/search/flickr.js index 4eef725d..6d1e341d 100644 --- a/commands/search/flickr.js +++ b/commands/search/flickr.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const snekfetch = require('snekfetch'); const { FLICKR_KEY } = process.env; diff --git a/commands/search/giphy.js b/commands/search/giphy.js index 503e7ac1..991da5de 100644 --- a/commands/search/giphy.js +++ b/commands/search/giphy.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const snekfetch = require('snekfetch'); const { GIPHY_KEY } = process.env; diff --git a/commands/search/github.js b/commands/search/github.js index 2abc2b7e..3adf0ef6 100644 --- a/commands/search/github.js +++ b/commands/search/github.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { MessageEmbed } = require('discord.js'); const snekfetch = require('snekfetch'); const { GITHUB_LOGIN } = process.env; diff --git a/commands/search/ip-info.js b/commands/search/ip-info.js index 789eee26..e4209c3e 100644 --- a/commands/search/ip-info.js +++ b/commands/search/ip-info.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { MessageEmbed } = require('discord.js'); const snekfetch = require('snekfetch'); diff --git a/commands/search/itunes.js b/commands/search/itunes.js index 760001d0..09dfc587 100644 --- a/commands/search/itunes.js +++ b/commands/search/itunes.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { MessageEmbed } = require('discord.js'); const snekfetch = require('snekfetch'); const { list } = require('../../structures/Util'); diff --git a/commands/search/jisho.js b/commands/search/jisho.js index db81c672..0dac0f04 100644 --- a/commands/search/jisho.js +++ b/commands/search/jisho.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const snekfetch = require('snekfetch'); const { stripIndents } = require('common-tags'); diff --git a/commands/search/kickstarter.js b/commands/search/kickstarter.js index 8336bbda..0143974a 100644 --- a/commands/search/kickstarter.js +++ b/commands/search/kickstarter.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { MessageEmbed } = require('discord.js'); const snekfetch = require('snekfetch'); diff --git a/commands/search/manga.js b/commands/search/manga.js index 24fdafcd..eb5497c8 100644 --- a/commands/search/manga.js +++ b/commands/search/manga.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { MessageEmbed } = require('discord.js'); const snekfetch = require('snekfetch'); const { shorten } = require('../../structures/Util'); diff --git a/commands/search/map.js b/commands/search/map.js index fad89f5b..d460926f 100644 --- a/commands/search/map.js +++ b/commands/search/map.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const snekfetch = require('snekfetch'); const { GOOGLE_KEY } = process.env; diff --git a/commands/search/mdn.js b/commands/search/mdn.js index a0dd5e85..e9c9f22b 100644 --- a/commands/search/mdn.js +++ b/commands/search/mdn.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { MessageEmbed } = require('discord.js'); const snekfetch = require('snekfetch'); diff --git a/commands/search/movie.js b/commands/search/movie.js index 84757fe7..815e31c8 100644 --- a/commands/search/movie.js +++ b/commands/search/movie.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { MessageEmbed } = require('discord.js'); const snekfetch = require('snekfetch'); const { shorten } = require('../../structures/Util'); diff --git a/commands/search/nasa.js b/commands/search/nasa.js index 26d73612..a4154599 100644 --- a/commands/search/nasa.js +++ b/commands/search/nasa.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const snekfetch = require('snekfetch'); const { shorten } = require('../../structures/Util'); diff --git a/commands/search/neopet.js b/commands/search/neopet.js index 60e89303..a291cb47 100644 --- a/commands/search/neopet.js +++ b/commands/search/neopet.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const snekfetch = require('snekfetch'); module.exports = class NeopetCommand extends Command { diff --git a/commands/search/npm.js b/commands/search/npm.js index 7bc75461..573dcc47 100644 --- a/commands/search/npm.js +++ b/commands/search/npm.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { MessageEmbed } = require('discord.js'); const snekfetch = require('snekfetch'); const { shorten } = require('../../structures/Util'); diff --git a/commands/search/osu.js b/commands/search/osu.js index e9383025..6871f0fd 100644 --- a/commands/search/osu.js +++ b/commands/search/osu.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { MessageEmbed } = require('discord.js'); const snekfetch = require('snekfetch'); const { OSU_KEY } = process.env; diff --git a/commands/search/pokedex.js b/commands/search/pokedex.js index db3bb8a6..8c60900e 100644 --- a/commands/search/pokedex.js +++ b/commands/search/pokedex.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { MessageEmbed } = require('discord.js'); const snekfetch = require('snekfetch'); const { stripIndents } = require('common-tags'); diff --git a/commands/search/recipe.js b/commands/search/recipe.js index 1ce00651..06e9a1e9 100644 --- a/commands/search/recipe.js +++ b/commands/search/recipe.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { MessageEmbed } = require('discord.js'); const snekfetch = require('snekfetch'); diff --git a/commands/search/reddit.js b/commands/search/reddit.js index 8f25f636..988afe9a 100644 --- a/commands/search/reddit.js +++ b/commands/search/reddit.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { MessageEmbed } = require('discord.js'); const snekfetch = require('snekfetch'); diff --git a/commands/search/rotten-tomatoes.js b/commands/search/rotten-tomatoes.js index 7281308c..e0de04b3 100644 --- a/commands/search/rotten-tomatoes.js +++ b/commands/search/rotten-tomatoes.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { MessageEmbed } = require('discord.js'); const snekfetch = require('snekfetch'); const { shorten } = require('../../structures/Util'); diff --git a/commands/search/safebooru.js b/commands/search/safebooru.js index 0e85b6e8..399c8e6b 100644 --- a/commands/search/safebooru.js +++ b/commands/search/safebooru.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const snekfetch = require('snekfetch'); const { xml2js } = require('xml-js'); const { stripIndents } = require('common-tags'); diff --git a/commands/search/steam.js b/commands/search/steam.js index a9d8ec9c..bd430469 100644 --- a/commands/search/steam.js +++ b/commands/search/steam.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { MessageEmbed } = require('discord.js'); const snekfetch = require('snekfetch'); diff --git a/commands/search/stocks.js b/commands/search/stocks.js index d66d5dc5..f86e1337 100644 --- a/commands/search/stocks.js +++ b/commands/search/stocks.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { MessageEmbed } = require('discord.js'); const snekfetch = require('snekfetch'); const { ALPHA_VANTAGE_KEY } = process.env; diff --git a/commands/search/studio-ghibli.js b/commands/search/studio-ghibli.js index ae5a3325..a4be723e 100644 --- a/commands/search/studio-ghibli.js +++ b/commands/search/studio-ghibli.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { MessageEmbed } = require('discord.js'); const snekfetch = require('snekfetch'); const { shorten } = require('../../structures/Util'); diff --git a/commands/search/thesaurus.js b/commands/search/thesaurus.js index 216b1dd4..fb2d26e8 100644 --- a/commands/search/thesaurus.js +++ b/commands/search/thesaurus.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const snekfetch = require('snekfetch'); const { stripIndents } = require('common-tags'); const { WORDNIK_KEY } = process.env; diff --git a/commands/search/tv-show.js b/commands/search/tv-show.js index b601634d..0b471f16 100644 --- a/commands/search/tv-show.js +++ b/commands/search/tv-show.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { MessageEmbed } = require('discord.js'); const snekfetch = require('snekfetch'); const { shorten } = require('../../structures/Util'); diff --git a/commands/search/urban.js b/commands/search/urban.js index 898880d9..2646fa72 100644 --- a/commands/search/urban.js +++ b/commands/search/urban.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { MessageEmbed } = require('discord.js'); const snekfetch = require('snekfetch'); const { shorten } = require('../../structures/Util'); diff --git a/commands/search/vocaloid.js b/commands/search/vocaloid.js index adf810f0..c84cfbed 100644 --- a/commands/search/vocaloid.js +++ b/commands/search/vocaloid.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { MessageEmbed } = require('discord.js'); const snekfetch = require('snekfetch'); const { shorten, duration } = require('../../structures/Util'); diff --git a/commands/search/wattpad.js b/commands/search/wattpad.js index 12816548..7183d236 100644 --- a/commands/search/wattpad.js +++ b/commands/search/wattpad.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { MessageEmbed } = require('discord.js'); const snekfetch = require('snekfetch'); const { shorten } = require('../../structures/Util'); diff --git a/commands/search/weather.js b/commands/search/weather.js index 1b574a46..c4243439 100644 --- a/commands/search/weather.js +++ b/commands/search/weather.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { MessageEmbed } = require('discord.js'); const snekfetch = require('snekfetch'); const { list } = require('../../structures/Util'); diff --git a/commands/search/wikia.js b/commands/search/wikia.js index acf09289..99cc981b 100644 --- a/commands/search/wikia.js +++ b/commands/search/wikia.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { MessageEmbed } = require('discord.js'); const snekfetch = require('snekfetch'); const { shorten } = require('../../structures/Util'); diff --git a/commands/search/wikipedia.js b/commands/search/wikipedia.js index 3764f108..98a5d0fb 100644 --- a/commands/search/wikipedia.js +++ b/commands/search/wikipedia.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { MessageEmbed } = require('discord.js'); const snekfetch = require('snekfetch'); const { shorten } = require('../../structures/Util'); diff --git a/commands/search/youtube.js b/commands/search/youtube.js index 679304f9..ca7678a3 100644 --- a/commands/search/youtube.js +++ b/commands/search/youtube.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { MessageEmbed } = require('discord.js'); const snekfetch = require('snekfetch'); const { GOOGLE_KEY } = process.env; diff --git a/commands/search/yu-gi-oh.js b/commands/search/yu-gi-oh.js index 9e99a698..1d69c96a 100644 --- a/commands/search/yu-gi-oh.js +++ b/commands/search/yu-gi-oh.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { MessageEmbed } = require('discord.js'); const snekfetch = require('snekfetch'); diff --git a/commands/text-edit/alphabet-reverse.js b/commands/text-edit/alphabet-reverse.js index a6c5c871..75f70746 100644 --- a/commands/text-edit/alphabet-reverse.js +++ b/commands/text-edit/alphabet-reverse.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { letterTrans } = require('custom-translate'); const dictionary = require('../../assets/json/alphabet-reverse'); diff --git a/commands/text-edit/b.js b/commands/text-edit/b.js index 228e6c3f..1481d2b3 100644 --- a/commands/text-edit/b.js +++ b/commands/text-edit/b.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); module.exports = class BCommand extends Command { constructor(client) { diff --git a/commands/text-edit/binary.js b/commands/text-edit/binary.js index 8b7ce65e..02dd045f 100644 --- a/commands/text-edit/binary.js +++ b/commands/text-edit/binary.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); module.exports = class BinaryCommand extends Command { constructor(client) { diff --git a/commands/text-edit/clap.js b/commands/text-edit/clap.js index e98d9e96..8379c0a8 100644 --- a/commands/text-edit/clap.js +++ b/commands/text-edit/clap.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); module.exports = class ClapCommand extends Command { constructor(client) { diff --git a/commands/text-edit/cow-say.js b/commands/text-edit/cow-say.js index d7cd7d61..c3018669 100644 --- a/commands/text-edit/cow-say.js +++ b/commands/text-edit/cow-say.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { stripIndent } = require('common-tags'); module.exports = class CowSayCommand extends Command { diff --git a/commands/text-edit/embed.js b/commands/text-edit/embed.js index 429baeae..fc0e5fcb 100644 --- a/commands/text-edit/embed.js +++ b/commands/text-edit/embed.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { MessageEmbed } = require('discord.js'); module.exports = class EmbedCommand extends Command { diff --git a/commands/text-edit/emojify.js b/commands/text-edit/emojify.js index 3008828a..26d5e56b 100644 --- a/commands/text-edit/emojify.js +++ b/commands/text-edit/emojify.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { letterTrans } = require('custom-translate'); const dictionary = require('../../assets/json/emojify'); diff --git a/commands/text-edit/mocking.js b/commands/text-edit/mocking.js index a9ca6fed..a0b49ec9 100644 --- a/commands/text-edit/mocking.js +++ b/commands/text-edit/mocking.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); module.exports = class MockingCommand extends Command { constructor(client) { diff --git a/commands/text-edit/morse.js b/commands/text-edit/morse.js index ef471e4f..63459d9b 100644 --- a/commands/text-edit/morse.js +++ b/commands/text-edit/morse.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { letterTrans } = require('custom-translate'); const dictionary = require('../../assets/json/morse'); diff --git a/commands/text-edit/organization-xiii-name.js b/commands/text-edit/organization-xiii-name.js index 3b4337b1..35452bb5 100644 --- a/commands/text-edit/organization-xiii-name.js +++ b/commands/text-edit/organization-xiii-name.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { shuffle } = require('../../structures/Util'); module.exports = class OrganizationXIIINameCommand extends Command { diff --git a/commands/text-edit/pirate.js b/commands/text-edit/pirate.js index 50a1e4a2..d530f7e4 100644 --- a/commands/text-edit/pirate.js +++ b/commands/text-edit/pirate.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { wordTrans } = require('custom-translate'); const dictionary = require('../../assets/json/pirate'); diff --git a/commands/text-edit/repeat.js b/commands/text-edit/repeat.js index d922860e..e69e5f7f 100644 --- a/commands/text-edit/repeat.js +++ b/commands/text-edit/repeat.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); module.exports = class RepeatCommand extends Command { constructor(client) { diff --git a/commands/text-edit/reverse.js b/commands/text-edit/reverse.js index 8d1c723e..62e85bc3 100644 --- a/commands/text-edit/reverse.js +++ b/commands/text-edit/reverse.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); module.exports = class ReverseCommand extends Command { constructor(client) { diff --git a/commands/text-edit/say.js b/commands/text-edit/say.js index 31aca2c0..79935e5b 100644 --- a/commands/text-edit/say.js +++ b/commands/text-edit/say.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); module.exports = class SayCommand extends Command { constructor(client) { diff --git a/commands/text-edit/ship-name.js b/commands/text-edit/ship-name.js index 9b5f7d68..a59faa44 100644 --- a/commands/text-edit/ship-name.js +++ b/commands/text-edit/ship-name.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); module.exports = class ShipNameCommand extends Command { constructor(client) { diff --git a/commands/text-edit/shuffle.js b/commands/text-edit/shuffle.js index bca2f9c0..817c727d 100644 --- a/commands/text-edit/shuffle.js +++ b/commands/text-edit/shuffle.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { shuffle } = require('../../structures/Util'); module.exports = class ShuffleCommand extends Command { diff --git a/commands/text-edit/snake-speak.js b/commands/text-edit/snake-speak.js index dd63a4af..7ea5f078 100644 --- a/commands/text-edit/snake-speak.js +++ b/commands/text-edit/snake-speak.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); module.exports = class SnakeSpeakCommand extends Command { constructor(client) { diff --git a/commands/text-edit/temmie.js b/commands/text-edit/temmie.js index bb1871b8..7b059ee7 100644 --- a/commands/text-edit/temmie.js +++ b/commands/text-edit/temmie.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { wordTrans } = require('custom-translate'); const dictionary = require('../../assets/json/temmie'); diff --git a/commands/text-edit/translate.js b/commands/text-edit/translate.js index 2dd47400..0089f2b6 100644 --- a/commands/text-edit/translate.js +++ b/commands/text-edit/translate.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { MessageEmbed } = require('discord.js'); const snekfetch = require('snekfetch'); const { list } = require('../../structures/Util'); diff --git a/commands/text-edit/upside-down.js b/commands/text-edit/upside-down.js index 3e22028f..e5bea535 100644 --- a/commands/text-edit/upside-down.js +++ b/commands/text-edit/upside-down.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { letterTrans } = require('custom-translate'); const dictionary = require('../../assets/json/upside-down'); diff --git a/commands/text-edit/webhook.js b/commands/text-edit/webhook.js index 95063720..e907e6cb 100644 --- a/commands/text-edit/webhook.js +++ b/commands/text-edit/webhook.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const snekfetch = require('snekfetch'); const { WEBHOOK_URL } = process.env; @@ -10,7 +10,6 @@ module.exports = class WebhookCommand extends Command { group: 'text-edit', memberName: 'webhook', description: 'Posts a message to the webhook defined in your `process.env`.', - ownerOnly: true, args: [ { key: 'content', @@ -21,6 +20,10 @@ module.exports = class WebhookCommand extends Command { }); } + hasPermission(msg) { + return this.client.isOwner(msg.author) || `The \`${this.name}\` command can only be used by the bot owner.`; + } + async run(msg, { content }) { if (msg.channel.type === 'text' && msg.channel.permissionsFor(this.client.user).has('MANAGE_MESSAGES')) { await msg.delete(); diff --git a/commands/text-edit/yoda.js b/commands/text-edit/yoda.js index cceaaa2c..7208c002 100644 --- a/commands/text-edit/yoda.js +++ b/commands/text-edit/yoda.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const snekfetch = require('snekfetch'); const { MASHAPE_KEY } = process.env; diff --git a/commands/text-edit/zalgo.js b/commands/text-edit/zalgo.js index f8e5e469..a9df4c34 100644 --- a/commands/text-edit/zalgo.js +++ b/commands/text-edit/zalgo.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const zalgo = require('zalgolize'); module.exports = class ZalgoCommand extends Command { diff --git a/commands/user-info/avatar.js b/commands/user-info/avatar.js index c07633a7..e02350d1 100644 --- a/commands/user-info/avatar.js +++ b/commands/user-info/avatar.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); module.exports = class AvatarCommand extends Command { constructor(client) { diff --git a/commands/user-info/user-info.js b/commands/user-info/user-info.js index 437a6d07..f69487b1 100644 --- a/commands/user-info/user-info.js +++ b/commands/user-info/user-info.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { MessageEmbed } = require('discord.js'); module.exports = class UserInfoCommand extends Command { diff --git a/commands/util/donate.js b/commands/util/donate.js index 76549cb1..634ab835 100644 --- a/commands/util/donate.js +++ b/commands/util/donate.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { stripIndents } = require('common-tags'); module.exports = class DonateCommand extends Command { diff --git a/commands/util/help.js b/commands/util/help.js index 0d389360..10f7bcaf 100644 --- a/commands/util/help.js +++ b/commands/util/help.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { MessageEmbed } = require('discord.js'); const { stripIndents } = require('common-tags'); diff --git a/commands/util/info.js b/commands/util/info.js index 60200d18..cec177f9 100644 --- a/commands/util/info.js +++ b/commands/util/info.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { MessageEmbed } = require('discord.js'); const { version } = require('../../package'); const { duration } = require('../../structures/Util'); diff --git a/commands/util/invite.js b/commands/util/invite.js index 1011f3a5..65381789 100644 --- a/commands/util/invite.js +++ b/commands/util/invite.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { stripIndents } = require('common-tags'); module.exports = class InviteCommand extends Command { diff --git a/commands/util/ping.js b/commands/util/ping.js index 19ecc0cf..c7d14ead 100644 --- a/commands/util/ping.js +++ b/commands/util/ping.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { stripIndents } = require('common-tags'); module.exports = class PingCommand extends Command { diff --git a/commands/util/shard-info.js b/commands/util/shard-info.js index 540e0460..6a6be0ad 100644 --- a/commands/util/shard-info.js +++ b/commands/util/shard-info.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { MessageEmbed } = require('discord.js'); const { duration } = require('../../structures/Util'); diff --git a/commands/util/shutdown.js b/commands/util/shutdown.js index 563c9610..35f0ff0e 100644 --- a/commands/util/shutdown.js +++ b/commands/util/shutdown.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); module.exports = class ShutdownCommand extends Command { constructor(client) { @@ -9,7 +9,6 @@ module.exports = class ShutdownCommand extends Command { memberName: 'shutdown', description: 'Shuts down the current shard, or all shards.', guarded: true, - ownerOnly: true, args: [ { key: 'all', @@ -21,6 +20,10 @@ module.exports = class ShutdownCommand extends Command { }); } + hasPermission(msg) { + return this.client.isOwner(msg.author) || `The \`${this.name}\` command can only be used by the bot owner.`; + } + async run(msg, { all }) { await msg.say(`Shutting down ${all ? 'all shards' : 'this shard'}...`); if (all) await this.client.shard.broadcastEval('process.exit(0)'); diff --git a/commands/util/uptime.js b/commands/util/uptime.js index dd998e20..d7a6e63c 100644 --- a/commands/util/uptime.js +++ b/commands/util/uptime.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const { duration } = require('../../structures/Util'); module.exports = class UptimeCommand extends Command { diff --git a/commands/util/upvote.js b/commands/util/upvote.js index b7f7bc80..f6a53a2f 100644 --- a/commands/util/upvote.js +++ b/commands/util/upvote.js @@ -1,4 +1,4 @@ -const Command = require('../../structures/Command'); +const { Command } = require('discord.js-commando'); const snekfetch = require('snekfetch'); const { stripIndents } = require('common-tags'); const { DBOTSORG_KEY } = process.env; diff --git a/package.json b/package.json index d5dc5861..c7c3dbbf 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "xiaobot", - "version": "42.15.2", + "version": "42.15.3", "description": "Your personal server companion.", "main": "Shard.js", "scripts": { diff --git a/structures/Command.js b/structures/Command.js deleted file mode 100644 index 04de0a6b..00000000 --- a/structures/Command.js +++ /dev/null @@ -1,26 +0,0 @@ -const { Command } = require('discord.js-commando'); - -class XiaoCommand extends Command { - constructor(client, info) { - super(client, info); - - this.ownerOnly = !!info.ownerOnly; - this.nsfw = !!info.nsfw; - this.throttling = info.throttling || { - usages: 1, - duration: 2 - }; - } - - hasPermission(msg) { - const baseCheck = super.hasPermission(msg); - if (!baseCheck || typeof baseCheck === 'string') return baseCheck; - if (this.ownerOnly && !this.client.isOwner(msg.author)) { - return `The \`${this.name}\` command can only be used by the bot owner.`; - } - if (this.nsfw && !msg.channel.nsfw) return `The \`${this.name}\` command can only be used in NSFW channels.`; - return true; - } -} - -module.exports = XiaoCommand;