diff --git a/XiaoBot.js b/XiaoBot.js index 6bc2fa00..afc990c2 100644 --- a/XiaoBot.js +++ b/XiaoBot.js @@ -11,7 +11,7 @@ const client = new CommandoClient({ messageCacheLifetime: 600, messageSweepInterval: 120 }); -const { postStats } = require('./structures/Util'); +const { postStats } = require('./util/Util'); const { version } = require('./package'); const whitelist = require('./assets/json/whitelist'); diff --git a/commands/avatar-edit/greyscale.js b/commands/avatar-edit/greyscale.js index 7eda7f1b..ad2390df 100644 --- a/commands/avatar-edit/greyscale.js +++ b/commands/avatar-edit/greyscale.js @@ -1,7 +1,7 @@ const { Command } = require('discord.js-commando'); const { createCanvas, loadImage } = require('canvas'); const snekfetch = require('snekfetch'); -const { greyscale } = require('../../structures/Util'); +const { greyscale } = require('../../util/Util'); module.exports = class GreyscaleCommand extends Command { constructor(client) { diff --git a/commands/avatar-edit/invert.js b/commands/avatar-edit/invert.js index ac365b23..f9bc2cfc 100644 --- a/commands/avatar-edit/invert.js +++ b/commands/avatar-edit/invert.js @@ -1,7 +1,7 @@ const { Command } = require('discord.js-commando'); const { createCanvas, loadImage } = require('canvas'); const snekfetch = require('snekfetch'); -const { invert } = require('../../structures/Util'); +const { invert } = require('../../util/Util'); module.exports = class InvertCommand extends Command { constructor(client) { diff --git a/commands/avatar-edit/rip.js b/commands/avatar-edit/rip.js index a6c308f0..43b622cb 100644 --- a/commands/avatar-edit/rip.js +++ b/commands/avatar-edit/rip.js @@ -2,7 +2,7 @@ const { Command } = require('discord.js-commando'); const { createCanvas, loadImage } = require('canvas'); const snekfetch = require('snekfetch'); const path = require('path'); -const { greyscale } = require('../../structures/Util'); +const { greyscale } = require('../../util/Util'); module.exports = class RIPCommand extends Command { constructor(client) { diff --git a/commands/avatar-edit/thug-life.js b/commands/avatar-edit/thug-life.js index e3448b10..a98e69a2 100644 --- a/commands/avatar-edit/thug-life.js +++ b/commands/avatar-edit/thug-life.js @@ -2,7 +2,7 @@ const { Command } = require('discord.js-commando'); const { createCanvas, loadImage } = require('canvas'); const snekfetch = require('snekfetch'); const path = require('path'); -const { greyscale } = require('../../structures/Util'); +const { greyscale } = require('../../util/Util'); module.exports = class ThugLifeCommand extends Command { constructor(client) { diff --git a/commands/games/gunfight.js b/commands/games/gunfight.js index ef8ca693..5f8d6161 100644 --- a/commands/games/gunfight.js +++ b/commands/games/gunfight.js @@ -1,5 +1,5 @@ const { Command } = require('discord.js-commando'); -const { wait } = require('../../structures/Util'); +const { wait } = require('../../util/Util'); const words = ['fire', 'draw', 'shoot', 'bang', 'pull']; module.exports = class GunfightCommand extends Command { diff --git a/commands/games/math-game.js b/commands/games/math-game.js index 49f38c1b..5ea1bb00 100644 --- a/commands/games/math-game.js +++ b/commands/games/math-game.js @@ -1,6 +1,6 @@ const { Command } = require('discord.js-commando'); const { stripIndents } = require('common-tags'); -const { list } = require('../../structures/Util'); +const { list } = require('../../util/Util'); const difficulties = ['easy', 'medium', 'hard', 'extreme', 'impossible']; const operations = ['+', '-', '*']; const maxValues = { diff --git a/commands/games/quiz.js b/commands/games/quiz.js index 52da7554..4a0522d6 100644 --- a/commands/games/quiz.js +++ b/commands/games/quiz.js @@ -1,7 +1,7 @@ const { Command } = require('discord.js-commando'); const { stripIndents } = require('common-tags'); const snekfetch = require('snekfetch'); -const { shuffle, list } = require('../../structures/Util'); +const { shuffle, list } = require('../../util/Util'); const types = ['multiple', 'boolean']; const difficulties = ['easy', 'medium', 'hard']; diff --git a/commands/games/quizlet.js b/commands/games/quizlet.js index 60d99601..adce0da3 100644 --- a/commands/games/quizlet.js +++ b/commands/games/quizlet.js @@ -1,7 +1,7 @@ const { Command } = require('discord.js-commando'); const { stripIndents } = require('common-tags'); const snekfetch = require('snekfetch'); -const { shuffle } = require('../../structures/Util'); +const { shuffle } = require('../../util/Util'); const { QUIZLET_KEY } = process.env; module.exports = class QuizletGameCommand extends Command { diff --git a/commands/games/typing-game.js b/commands/games/typing-game.js index fc611653..6feaa3a4 100644 --- a/commands/games/typing-game.js +++ b/commands/games/typing-game.js @@ -1,6 +1,6 @@ const { Command } = require('discord.js-commando'); const { stripIndents } = require('common-tags'); -const { list } = require('../../structures/Util'); +const { list } = require('../../util/Util'); const sentences = require('../../assets/json/typing-game'); const difficulties = ['easy', 'medium', 'hard', 'extreme', 'impossible']; const times = { diff --git a/commands/games/whos-that-pokemon.js b/commands/games/whos-that-pokemon.js index d7865f7c..d59f5894 100644 --- a/commands/games/whos-that-pokemon.js +++ b/commands/games/whos-that-pokemon.js @@ -1,6 +1,6 @@ const { Command } = require('discord.js-commando'); const snekfetch = require('snekfetch'); -const { filterPkmn, pad } = require('../../structures/Util'); +const { filterPkmn, pad } = require('../../util/Util'); module.exports = class WhosThatPokemonCommand extends Command { constructor(client) { diff --git a/commands/num-edit/currency.js b/commands/num-edit/currency.js index d2816f2e..9cb23552 100644 --- a/commands/num-edit/currency.js +++ b/commands/num-edit/currency.js @@ -1,6 +1,6 @@ const { Command } = require('discord.js-commando'); const snekfetch = require('snekfetch'); -const { list } = require('../../structures/Util'); +const { list } = require('../../util/Util'); const codes = require('../../assets/json/currency'); module.exports = class CurrencyCommand extends Command { diff --git a/commands/num-edit/temperature.js b/commands/num-edit/temperature.js index 181f776c..b9c0b498 100644 --- a/commands/num-edit/temperature.js +++ b/commands/num-edit/temperature.js @@ -1,5 +1,5 @@ const { Command } = require('discord.js-commando'); -const { list } = require('../../structures/Util'); +const { list } = require('../../util/Util'); const units = ['celsius', 'fahrenheit', 'kelvin']; module.exports = class TemperatureCommand extends Command { diff --git a/commands/other/astronomy-picture-of-the-day.js b/commands/other/astronomy-picture-of-the-day.js index 24be9972..284dfc8e 100644 --- a/commands/other/astronomy-picture-of-the-day.js +++ b/commands/other/astronomy-picture-of-the-day.js @@ -1,6 +1,6 @@ const { Command } = require('discord.js-commando'); const snekfetch = require('snekfetch'); -const { shorten } = require('../../structures/Util'); +const { shorten } = require('../../util/Util'); const { GOV_KEY } = process.env; module.exports = class AstronomyPictureOfTheDayCommand extends Command { diff --git a/commands/other/horoscope.js b/commands/other/horoscope.js index a586a9c9..4213fb9f 100644 --- a/commands/other/horoscope.js +++ b/commands/other/horoscope.js @@ -1,7 +1,7 @@ const { Command } = require('discord.js-commando'); const { MessageEmbed } = require('discord.js'); const snekfetch = require('snekfetch'); -const { list } = require('../../structures/Util'); +const { list } = require('../../util/Util'); const signs = require('../../assets/json/horoscope'); module.exports = class HoroscopeCommand extends Command { diff --git a/commands/other/soundboard.js b/commands/other/soundboard.js index f8c659c9..fd1db091 100644 --- a/commands/other/soundboard.js +++ b/commands/other/soundboard.js @@ -1,5 +1,5 @@ const { Command } = require('discord.js-commando'); -const { list } = require('../../structures/Util'); +const { list } = require('../../util/Util'); const path = require('path'); const sounds = ['airhorn', 'cat', 'dun-dun-dun', 'laugh track', 'pikachu', 'space']; diff --git a/commands/other/tableflip.js b/commands/other/tableflip.js index 18103c19..70a7869c 100644 --- a/commands/other/tableflip.js +++ b/commands/other/tableflip.js @@ -1,5 +1,5 @@ const { Command } = require('discord.js-commando'); -const { wait } = require('../../structures/Util'); +const { wait } = require('../../util/Util'); const frames = [ '(-°□°)- ┬─┬', '(╯°□°)╯ ]', diff --git a/commands/random-res/kiss-marry-kill.js b/commands/random-res/kiss-marry-kill.js index f3edcae6..52a89b85 100644 --- a/commands/random-res/kiss-marry-kill.js +++ b/commands/random-res/kiss-marry-kill.js @@ -1,5 +1,5 @@ const { Command } = require('discord.js-commando'); -const { shuffle } = require('../../structures/Util'); +const { shuffle } = require('../../util/Util'); module.exports = class KissMarryKillCommand extends Command { constructor(client) { diff --git a/commands/random-res/name.js b/commands/random-res/name.js index 70100f8a..66811117 100644 --- a/commands/random-res/name.js +++ b/commands/random-res/name.js @@ -1,6 +1,6 @@ const { Command } = require('discord.js-commando'); const snekfetch = require('snekfetch'); -const { list } = require('../../structures/Util'); +const { list } = require('../../util/Util'); const genders = ['male', 'female', 'both']; module.exports = class NameCommand extends Command { diff --git a/commands/random-res/ship.js b/commands/random-res/ship.js index 71c18897..f9432cf7 100644 --- a/commands/random-res/ship.js +++ b/commands/random-res/ship.js @@ -1,5 +1,5 @@ const { Command } = require('discord.js-commando'); -const { list } = require('../../structures/Util'); +const { list } = require('../../util/Util'); module.exports = class ShipCommand extends Command { constructor(client) { diff --git a/commands/search/anime.js b/commands/search/anime.js index a7d5647f..8cc0f8c1 100644 --- a/commands/search/anime.js +++ b/commands/search/anime.js @@ -1,7 +1,7 @@ const { Command } = require('discord.js-commando'); const { MessageEmbed } = require('discord.js'); const snekfetch = require('snekfetch'); -const { shorten } = require('../../structures/Util'); +const { shorten } = require('../../util/Util'); module.exports = class AnimeCommand extends Command { constructor(client) { diff --git a/commands/search/bulbapedia.js b/commands/search/bulbapedia.js index b69b5ae6..5755d9dd 100644 --- a/commands/search/bulbapedia.js +++ b/commands/search/bulbapedia.js @@ -1,7 +1,7 @@ const { Command } = require('discord.js-commando'); const { MessageEmbed } = require('discord.js'); const snekfetch = require('snekfetch'); -const { shorten } = require('../../structures/Util'); +const { shorten } = require('../../util/Util'); module.exports = class BulbapediaCommand extends Command { constructor(client) { diff --git a/commands/search/itunes.js b/commands/search/itunes.js index 72581008..3625be10 100644 --- a/commands/search/itunes.js +++ b/commands/search/itunes.js @@ -1,7 +1,7 @@ const { Command } = require('discord.js-commando'); const { MessageEmbed } = require('discord.js'); const snekfetch = require('snekfetch'); -const { list } = require('../../structures/Util'); +const { list } = require('../../util/Util'); const countries = ['us', 'jp']; module.exports = class ITunesCommand extends Command { diff --git a/commands/search/manga.js b/commands/search/manga.js index 3ca2bdd4..7669fd04 100644 --- a/commands/search/manga.js +++ b/commands/search/manga.js @@ -1,7 +1,7 @@ const { Command } = require('discord.js-commando'); const { MessageEmbed } = require('discord.js'); const snekfetch = require('snekfetch'); -const { shorten } = require('../../structures/Util'); +const { shorten } = require('../../util/Util'); module.exports = class MangaCommand extends Command { constructor(client) { diff --git a/commands/search/movie.js b/commands/search/movie.js index 815e31c8..fc77c26d 100644 --- a/commands/search/movie.js +++ b/commands/search/movie.js @@ -1,7 +1,7 @@ const { Command } = require('discord.js-commando'); const { MessageEmbed } = require('discord.js'); const snekfetch = require('snekfetch'); -const { shorten } = require('../../structures/Util'); +const { shorten } = require('../../util/Util'); const { TMDB_KEY } = process.env; module.exports = class MovieCommand extends Command { diff --git a/commands/search/nasa.js b/commands/search/nasa.js index a4154599..1b6a90fd 100644 --- a/commands/search/nasa.js +++ b/commands/search/nasa.js @@ -1,6 +1,6 @@ const { Command } = require('discord.js-commando'); const snekfetch = require('snekfetch'); -const { shorten } = require('../../structures/Util'); +const { shorten } = require('../../util/Util'); module.exports = class NASACommand extends Command { constructor(client) { diff --git a/commands/search/npm.js b/commands/search/npm.js index 5e2e7759..dbd2af67 100644 --- a/commands/search/npm.js +++ b/commands/search/npm.js @@ -1,7 +1,7 @@ const { Command } = require('discord.js-commando'); const { MessageEmbed } = require('discord.js'); const snekfetch = require('snekfetch'); -const { shorten } = require('../../structures/Util'); +const { shorten } = require('../../util/Util'); module.exports = class NPMCommand extends Command { constructor(client) { diff --git a/commands/search/pokedex.js b/commands/search/pokedex.js index a6d28143..b66df53b 100644 --- a/commands/search/pokedex.js +++ b/commands/search/pokedex.js @@ -2,7 +2,7 @@ const { Command } = require('discord.js-commando'); const { MessageEmbed } = require('discord.js'); const snekfetch = require('snekfetch'); const { stripIndents } = require('common-tags'); -const { filterPkmn, pad } = require('../../structures/Util'); +const { filterPkmn, pad } = require('../../util/Util'); module.exports = class PokedexCommand extends Command { constructor(client) { diff --git a/commands/search/rotten-tomatoes.js b/commands/search/rotten-tomatoes.js index 512cefd8..2d6c85e0 100644 --- a/commands/search/rotten-tomatoes.js +++ b/commands/search/rotten-tomatoes.js @@ -1,7 +1,7 @@ const { Command } = require('discord.js-commando'); const { MessageEmbed } = require('discord.js'); const snekfetch = require('snekfetch'); -const { shorten } = require('../../structures/Util'); +const { shorten } = require('../../util/Util'); module.exports = class RottenTomatoesCommand extends Command { constructor(client) { diff --git a/commands/search/studio-ghibli.js b/commands/search/studio-ghibli.js index a4be723e..7a419954 100644 --- a/commands/search/studio-ghibli.js +++ b/commands/search/studio-ghibli.js @@ -1,7 +1,7 @@ const { Command } = require('discord.js-commando'); const { MessageEmbed } = require('discord.js'); const snekfetch = require('snekfetch'); -const { shorten } = require('../../structures/Util'); +const { shorten } = require('../../util/Util'); module.exports = class StudioGhibliCommand extends Command { constructor(client) { diff --git a/commands/search/tv-show.js b/commands/search/tv-show.js index 0b471f16..684c94f0 100644 --- a/commands/search/tv-show.js +++ b/commands/search/tv-show.js @@ -1,7 +1,7 @@ const { Command } = require('discord.js-commando'); const { MessageEmbed } = require('discord.js'); const snekfetch = require('snekfetch'); -const { shorten } = require('../../structures/Util'); +const { shorten } = require('../../util/Util'); const { TMDB_KEY } = process.env; module.exports = class TVShowCommand extends Command { diff --git a/commands/search/urban.js b/commands/search/urban.js index 2646fa72..09ff7dc0 100644 --- a/commands/search/urban.js +++ b/commands/search/urban.js @@ -1,7 +1,7 @@ const { Command } = require('discord.js-commando'); const { MessageEmbed } = require('discord.js'); const snekfetch = require('snekfetch'); -const { shorten } = require('../../structures/Util'); +const { shorten } = require('../../util/Util'); module.exports = class UrbanCommand extends Command { constructor(client) { diff --git a/commands/search/vocaloid.js b/commands/search/vocaloid.js index c0ff02a9..d7e2d300 100644 --- a/commands/search/vocaloid.js +++ b/commands/search/vocaloid.js @@ -1,7 +1,7 @@ const { Command } = require('discord.js-commando'); const { MessageEmbed } = require('discord.js'); const snekfetch = require('snekfetch'); -const { shorten, duration } = require('../../structures/Util'); +const { shorten, duration } = require('../../util/Util'); module.exports = class VocaloidCommand extends Command { constructor(client) { diff --git a/commands/search/wattpad.js b/commands/search/wattpad.js index 8f7db890..1f4fae4d 100644 --- a/commands/search/wattpad.js +++ b/commands/search/wattpad.js @@ -1,7 +1,7 @@ const { Command } = require('discord.js-commando'); const { MessageEmbed } = require('discord.js'); const snekfetch = require('snekfetch'); -const { shorten } = require('../../structures/Util'); +const { shorten } = require('../../util/Util'); const { WATTPAD_KEY } = process.env; module.exports = class WattpadCommand extends Command { diff --git a/commands/search/wikia.js b/commands/search/wikia.js index 99cc981b..15a0505a 100644 --- a/commands/search/wikia.js +++ b/commands/search/wikia.js @@ -1,7 +1,7 @@ const { Command } = require('discord.js-commando'); const { MessageEmbed } = require('discord.js'); const snekfetch = require('snekfetch'); -const { shorten } = require('../../structures/Util'); +const { shorten } = require('../../util/Util'); module.exports = class WikiaCommand extends Command { constructor(client) { diff --git a/commands/search/wikipedia.js b/commands/search/wikipedia.js index 98a5d0fb..8e02e36c 100644 --- a/commands/search/wikipedia.js +++ b/commands/search/wikipedia.js @@ -1,7 +1,7 @@ const { Command } = require('discord.js-commando'); const { MessageEmbed } = require('discord.js'); const snekfetch = require('snekfetch'); -const { shorten } = require('../../structures/Util'); +const { shorten } = require('../../util/Util'); module.exports = class WikipediaCommand extends Command { constructor(client) { diff --git a/commands/text-edit/binary.js b/commands/text-edit/binary.js index 759bfc8b..c45bf1e4 100644 --- a/commands/text-edit/binary.js +++ b/commands/text-edit/binary.js @@ -1,5 +1,5 @@ const { Command } = require('discord.js-commando'); -const { pad } = require('../../structures/Util'); +const { pad } = require('../../util/Util'); module.exports = class BinaryCommand extends Command { constructor(client) { diff --git a/commands/text-edit/organization-xiii-name.js b/commands/text-edit/organization-xiii-name.js index 35452bb5..4e274ddc 100644 --- a/commands/text-edit/organization-xiii-name.js +++ b/commands/text-edit/organization-xiii-name.js @@ -1,5 +1,5 @@ const { Command } = require('discord.js-commando'); -const { shuffle } = require('../../structures/Util'); +const { shuffle } = require('../../util/Util'); module.exports = class OrganizationXIIINameCommand extends Command { constructor(client) { diff --git a/commands/text-edit/shuffle.js b/commands/text-edit/shuffle.js index 817c727d..7bd52982 100644 --- a/commands/text-edit/shuffle.js +++ b/commands/text-edit/shuffle.js @@ -1,5 +1,5 @@ const { Command } = require('discord.js-commando'); -const { shuffle } = require('../../structures/Util'); +const { shuffle } = require('../../util/Util'); module.exports = class ShuffleCommand extends Command { constructor(client) { diff --git a/commands/text-edit/translate.js b/commands/text-edit/translate.js index b94f5796..99566ce0 100644 --- a/commands/text-edit/translate.js +++ b/commands/text-edit/translate.js @@ -1,7 +1,7 @@ const { Command } = require('discord.js-commando'); const { MessageEmbed } = require('discord.js'); const snekfetch = require('snekfetch'); -const { list } = require('../../structures/Util'); +const { list } = require('../../util/Util'); const codes = require('../../assets/json/translate'); const { YANDEX_KEY } = process.env; diff --git a/commands/util/info.js b/commands/util/info.js index 22ad8781..67bc46bf 100644 --- a/commands/util/info.js +++ b/commands/util/info.js @@ -1,7 +1,7 @@ const { Command } = require('discord.js-commando'); const { MessageEmbed } = require('discord.js'); const { version } = require('../../package'); -const { duration } = require('../../structures/Util'); +const { duration } = require('../../util/Util'); module.exports = class InfoCommand extends Command { constructor(client) { diff --git a/commands/util/uptime.js b/commands/util/uptime.js index d7a6e63c..a20e40fa 100644 --- a/commands/util/uptime.js +++ b/commands/util/uptime.js @@ -1,5 +1,5 @@ const { Command } = require('discord.js-commando'); -const { duration } = require('../../structures/Util'); +const { duration } = require('../../util/Util'); module.exports = class UptimeCommand extends Command { constructor(client) { diff --git a/structures/Util.js b/util/Util.js similarity index 100% rename from structures/Util.js rename to util/Util.js