From ff80053d179d03bb117535ecaf25bacd3aff7261 Mon Sep 17 00:00:00 2001 From: mudkipscience Date: Sun, 29 Mar 2020 17:29:53 +1100 Subject: [PATCH 001/156] bye lol --- .gitignore | 4 - LICENSE.md | 22 -- README.md | 21 -- configTemplate.js | 75 ----- index.js | 93 ------- package.json | 45 --- resources/audio/WOOMY.mp3 | Bin 26469 -> 0 bytes resources/images/attackhelicopter.jpg | Bin 101789 -> 0 bytes resources/images/fax.png | Bin 16880 -> 0 bytes resources/other/coolpeople.json | 21 -- resources/other/identities.json | 110 -------- resources/other/lyrics.json | 122 -------- resources/other/pronouns.json | 154 ----------- resources/other/sexualities.json | 102 ------- src/commands/8ball.js | 38 --- src/commands/about.js | 58 ---- src/commands/achievement.js | 41 --- src/commands/activity.js | 45 --- src/commands/adminrole.js | 61 ---- src/commands/autorole.js | 69 ----- src/commands/avatar.js | 38 --- src/commands/ban.js | 87 ------ src/commands/blacklist.js | 124 --------- src/commands/bohemian_rhapsody.js | 45 --- src/commands/calculate.js | 42 --- src/commands/cat.js | 30 -- src/commands/catfact.js | 27 -- src/commands/changelog.js | 18 -- src/commands/chatlogs.js | 29 -- src/commands/coinflip.js | 35 --- src/commands/colour.js | 57 ---- src/commands/credits.js | 20 -- src/commands/creeper.js | 45 --- src/commands/cuddle.js | 69 ----- src/commands/dice.js | 27 -- src/commands/dog.js | 30 -- src/commands/dogfact.js | 27 -- src/commands/emoji.js | 42 --- src/commands/emojify.js | 56 ---- src/commands/eval.js | 46 ---- src/commands/fact.js | 30 -- src/commands/feed.js | 69 ----- src/commands/feedback.js | 28 -- src/commands/forceskip.js | 28 -- src/commands/foxgirl.js | 30 -- src/commands/garfield.js | 21 -- src/commands/giverole.js | 87 ------ src/commands/goodbye.js | 42 --- src/commands/hackban.js | 60 ---- src/commands/help.js | 174 ------------ src/commands/hug.js | 69 ----- src/commands/identity.js | 36 --- src/commands/inspirobot.js | 28 -- src/commands/invite.js | 20 -- src/commands/kemonomimi.js | 30 -- src/commands/kick.js | 87 ------ src/commands/kiss.js | 69 ----- src/commands/lizard.js | 30 -- src/commands/modlogs.js | 28 -- src/commands/modrole.js | 61 ---- src/commands/msearch.js | 39 --- src/commands/mute.js | 114 -------- src/commands/mutedrole.js | 61 ---- src/commands/neko.js | 30 -- src/commands/nekogif.js | 30 -- src/commands/nowplaying.js | 44 --- src/commands/owoify.js | 35 --- src/commands/pat.js | 69 ----- src/commands/pause.js | 30 -- src/commands/permlevel.js | 19 -- src/commands/ping.js | 21 -- src/commands/play.js | 33 --- src/commands/poke.js | 69 ----- src/commands/prefix.js | 30 -- src/commands/pronoun.js | 36 --- src/commands/purge.js | 60 ---- src/commands/queue.js | 183 ------------ src/commands/raidmode.js | 70 ----- src/commands/randurban.js | 41 --- src/commands/rate.js | 36 --- src/commands/reload.js | 28 -- src/commands/removesong.js | 49 ---- src/commands/reset.js | 30 -- src/commands/restart.js | 27 -- src/commands/resume.js | 28 -- src/commands/rip.js | 25 -- src/commands/rolecolour.js | 52 ---- src/commands/roleinfo.js | 75 ----- src/commands/sans.js | 36 --- src/commands/say.js | 28 -- src/commands/servericon.js | 18 -- src/commands/serverinfo.js | 99 ------- src/commands/settings.js | 101 ------- src/commands/sexuality.js | 36 --- src/commands/ship.js | 53 ---- src/commands/skip.js | 66 ----- src/commands/slap.js | 69 ----- src/commands/smug.js | 33 --- src/commands/softban.js | 99 ------- src/commands/spoilerise.js | 28 -- src/commands/stop.js | 32 --- src/commands/support.js | 18 -- src/commands/takerole.js | 86 ------ src/commands/tickle.js | 69 ----- src/commands/unmute.js | 90 ------ src/commands/urban.js | 48 ---- src/commands/userinfo.js | 129 --------- src/commands/weather.js | 64 ----- src/commands/welcome.js | 45 --- src/commands/woomy.js | 33 --- src/commands/yoda.js | 33 --- src/commands/zalgo.js | 30 -- src/events/error.js | 3 - src/events/guildCreate.js | 15 - src/events/guildDelete.js | 20 -- src/events/guildMemberAdd.js | 94 ------- src/events/guildMemberRemove.js | 36 --- src/events/message.js | 235 ---------------- src/events/messageDelete.js | 40 --- src/events/messageUpdate.js | 40 --- src/events/ready.js | 60 ---- src/modules/Logger.js | 90 ------ src/modules/functions.js | 382 -------------------------- version.json | 4 - 124 files changed, 6728 deletions(-) delete mode 100644 .gitignore delete mode 100644 LICENSE.md delete mode 100644 README.md delete mode 100644 configTemplate.js delete mode 100644 index.js delete mode 100644 package.json delete mode 100644 resources/audio/WOOMY.mp3 delete mode 100644 resources/images/attackhelicopter.jpg delete mode 100644 resources/images/fax.png delete mode 100644 resources/other/coolpeople.json delete mode 100644 resources/other/identities.json delete mode 100644 resources/other/lyrics.json delete mode 100644 resources/other/pronouns.json delete mode 100644 resources/other/sexualities.json delete mode 100644 src/commands/8ball.js delete mode 100644 src/commands/about.js delete mode 100644 src/commands/achievement.js delete mode 100644 src/commands/activity.js delete mode 100644 src/commands/adminrole.js delete mode 100644 src/commands/autorole.js delete mode 100644 src/commands/avatar.js delete mode 100644 src/commands/ban.js delete mode 100644 src/commands/blacklist.js delete mode 100644 src/commands/bohemian_rhapsody.js delete mode 100644 src/commands/calculate.js delete mode 100644 src/commands/cat.js delete mode 100644 src/commands/catfact.js delete mode 100644 src/commands/changelog.js delete mode 100644 src/commands/chatlogs.js delete mode 100644 src/commands/coinflip.js delete mode 100644 src/commands/colour.js delete mode 100644 src/commands/credits.js delete mode 100644 src/commands/creeper.js delete mode 100644 src/commands/cuddle.js delete mode 100644 src/commands/dice.js delete mode 100644 src/commands/dog.js delete mode 100644 src/commands/dogfact.js delete mode 100644 src/commands/emoji.js delete mode 100644 src/commands/emojify.js delete mode 100644 src/commands/eval.js delete mode 100644 src/commands/fact.js delete mode 100644 src/commands/feed.js delete mode 100644 src/commands/feedback.js delete mode 100644 src/commands/forceskip.js delete mode 100644 src/commands/foxgirl.js delete mode 100644 src/commands/garfield.js delete mode 100644 src/commands/giverole.js delete mode 100644 src/commands/goodbye.js delete mode 100644 src/commands/hackban.js delete mode 100644 src/commands/help.js delete mode 100644 src/commands/hug.js delete mode 100644 src/commands/identity.js delete mode 100644 src/commands/inspirobot.js delete mode 100644 src/commands/invite.js delete mode 100644 src/commands/kemonomimi.js delete mode 100644 src/commands/kick.js delete mode 100644 src/commands/kiss.js delete mode 100644 src/commands/lizard.js delete mode 100644 src/commands/modlogs.js delete mode 100644 src/commands/modrole.js delete mode 100644 src/commands/msearch.js delete mode 100644 src/commands/mute.js delete mode 100644 src/commands/mutedrole.js delete mode 100644 src/commands/neko.js delete mode 100644 src/commands/nekogif.js delete mode 100644 src/commands/nowplaying.js delete mode 100644 src/commands/owoify.js delete mode 100644 src/commands/pat.js delete mode 100644 src/commands/pause.js delete mode 100644 src/commands/permlevel.js delete mode 100644 src/commands/ping.js delete mode 100644 src/commands/play.js delete mode 100644 src/commands/poke.js delete mode 100644 src/commands/prefix.js delete mode 100644 src/commands/pronoun.js delete mode 100644 src/commands/purge.js delete mode 100644 src/commands/queue.js delete mode 100644 src/commands/raidmode.js delete mode 100644 src/commands/randurban.js delete mode 100644 src/commands/rate.js delete mode 100644 src/commands/reload.js delete mode 100644 src/commands/removesong.js delete mode 100644 src/commands/reset.js delete mode 100644 src/commands/restart.js delete mode 100644 src/commands/resume.js delete mode 100644 src/commands/rip.js delete mode 100644 src/commands/rolecolour.js delete mode 100644 src/commands/roleinfo.js delete mode 100644 src/commands/sans.js delete mode 100644 src/commands/say.js delete mode 100644 src/commands/servericon.js delete mode 100644 src/commands/serverinfo.js delete mode 100644 src/commands/settings.js delete mode 100644 src/commands/sexuality.js delete mode 100644 src/commands/ship.js delete mode 100644 src/commands/skip.js delete mode 100644 src/commands/slap.js delete mode 100644 src/commands/smug.js delete mode 100644 src/commands/softban.js delete mode 100644 src/commands/spoilerise.js delete mode 100644 src/commands/stop.js delete mode 100644 src/commands/support.js delete mode 100644 src/commands/takerole.js delete mode 100644 src/commands/tickle.js delete mode 100644 src/commands/unmute.js delete mode 100644 src/commands/urban.js delete mode 100644 src/commands/userinfo.js delete mode 100644 src/commands/weather.js delete mode 100644 src/commands/welcome.js delete mode 100644 src/commands/woomy.js delete mode 100644 src/commands/yoda.js delete mode 100644 src/commands/zalgo.js delete mode 100644 src/events/error.js delete mode 100644 src/events/guildCreate.js delete mode 100644 src/events/guildDelete.js delete mode 100644 src/events/guildMemberAdd.js delete mode 100644 src/events/guildMemberRemove.js delete mode 100644 src/events/message.js delete mode 100644 src/events/messageDelete.js delete mode 100644 src/events/messageUpdate.js delete mode 100644 src/events/ready.js delete mode 100644 src/modules/Logger.js delete mode 100644 src/modules/functions.js delete mode 100644 version.json diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 656811d..0000000 --- a/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -node_modules -data -config.js -package-lock.json \ No newline at end of file diff --git a/LICENSE.md b/LICENSE.md deleted file mode 100644 index 4e230a1..0000000 --- a/LICENSE.md +++ /dev/null @@ -1,22 +0,0 @@ -MIT License - -Copyright (c) 2018 YorkAARGH -Copyright (c) 2018-2020 mudkipscience - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/README.md b/README.md deleted file mode 100644 index d0fde98..0000000 --- a/README.md +++ /dev/null @@ -1,21 +0,0 @@ -# Woomy -Woomy is a all-purpose discord bot built off the [guidebot](https://github.com/AnIdiotsGuide/guidebot) base and coded in node.js using discord.js. - -# How to use -The easiest way to use Woomy is to invite it to your server with [this link.](https://discordapp.com/oauth2/authorize?client_id=435961704145485835&permissions=2134240503&scope=bot) It is hosted 24/7 and automatically updates itself when a new release is made available, making sure you always get the newest features. - -You can also self-host! Some modificatiomns to the code will need to be made before Woomy will run on your machine, but anyone who can read errors will figure out what needs to be changed pretty quickly :P - -# Requirements -- git -- node.js v12.0.0 or higher -- node-gyp build tools -- ffmpeg (or ffmpeg-static) - -# Installation -- Clone Woomy to your machine -- Run `npm i` in Woomy's directory -- Open config.js in your code editor and insert all the required information - -# Contributing -If you wish to contribute to Woomy, please fork the repository and open a pull request. Any contribution is appreciated <3 diff --git a/configTemplate.js b/configTemplate.js deleted file mode 100644 index b6e96c3..0000000 --- a/configTemplate.js +++ /dev/null @@ -1,75 +0,0 @@ -const config = { - // ID's - "owners": [], // Adding your ID here will give you access to dangerous commands like eval. Please be careful with who you add here! Eval can be used to modify the host machine. - - // Host options - "devmodeEnabled": false, // true or false - "loggingServer": "", // server ID, or blank to disable - "startupLogs": "", // Channel ID, or blank to disable - "consoleLogs": "", // Channel ID, or blank to disable - - // Tokens - "token": "", // Your bot's token. - "devtoken": "", // (optional) another token, meant for a bot used for development - "ytkey": "", // Youtube API key, needed for music searching to work - "dblkey": "", // top.gg key, sends bot statistics to top.gg. You do not need this. - - // Default per-server settings - "defaultSettings" : { - "prefix": "~", - "devprefix": "!", - "modRole": "None set", - "adminRole": "None set", - "mutedRole": "None set", - "autorole": "off", - "welcomeChannel": "off", - "welcomeMessage": "off", - "leaveMessage": "off", - "chatlogsChannel": "off", - "modlogsChannel": "off", - "raidMode": "off", - "raidModeStrict": "off", - "blacklisted": "ARRAY", - "botChannels": "ARRAY", - "AFK": "ARRAY", - "SAR": "ARRAY", - "customCommands": "ARRAY", - }, - - // Perm levels - permLevels: [ - { level: 0, - name: "User", - check: () => true - }, - - { level: 1, - name: "Moderator", - check: (message) => { - try { - if (message.member.roles.cache.has(message.settings.modRole)) return true; - } catch (e) { - return false; - } - } - }, - - { level: 2, - name: "Administrator", - check: (message) => { - try { - if (message.member.roles.cache.has(message.settings.adminRole) || message.member.permissions.has("ADMINISTRATOR")) return true; - } catch (e) { - return false; - } - } - }, - - { level: 3, - name: "Server Owner", - check: (message) => message.channel.type === "text" ? (message.guild.ownerID === message.author.id ? true : false) : false - }, - ] -}; - -module.exports = config; diff --git a/index.js b/index.js deleted file mode 100644 index 49d5326..0000000 --- a/index.js +++ /dev/null @@ -1,93 +0,0 @@ -if (Number(process.version.slice(1).split(".")[0]) < 12) { - throw new Error("Node 12.0.0 or higher is required. Please update Node on your system."); -}; - -const Discord = require('discord.js'); -const { promisify } = require('util'); -const readdir = promisify(require('fs').readdir); -const Enmap = require('enmap'); -const chalk = require('chalk'); -const client = new Discord.Client(); - -try { - client.config = require('./config'); -} catch (err) { - console.log('Failed to load config.js:', err); - process.exit(); -}; - -try{ - client.version = require('./version.json'); -} catch (err) { - console.log('Failed to load version.json:', err); - process.exit(); -}; - -try{ - client.logger = require('./src/modules/Logger'); -} catch (err) { - console.log('Failed to load Logger.js:', err); - process.exit(); -}; - -client.logger.setClient(client); - -try{ - require("./src/modules/functions")(client); -} catch (err) { - console.log('Failed to load functions.js:', err); - process.exit(); -}; - -if(client.config.devmodeEnabled == true && process.env['USER'] != 'container') { - client.devmode = true; -} else { - client.devmode = false; - if(client.config.dblkey.length > 0) { - const DBL = require("dblapi.js"); - const dblapi = new DBL(client.config.dblkey, client); - }; -}; - -client.commands = new Enmap(); -client.aliases = new Enmap(); -client.settings = new Enmap({name: 'settings'}); - -const init = async () => { - const cmdFiles = await readdir("./src/commands/"); - client.logger.info(`Loading ${cmdFiles.length} commands.`); - cmdFiles.forEach(file => { - if (!file.endsWith(".js")) { - return; - }; - const response = client.loadCommand(file); - if (response) { - console.log(response); - }; - }); - - const evtFiles = await readdir("./src/events/"); - client.logger.info(`Loading ${evtFiles.length} events.`); - evtFiles.forEach(file => { - if (!file.endsWith(".js")) { - return; - }; - const eventName = file.split(".")[0]; - const event = require(`./src/events/${file}`); - client.on(eventName, event.bind(null, client)); - }); - - client.levelCache = {}; - for (let i = 0; i < client.config.permLevels.length; i++) { - const thisLevel = client.config.permLevels[i]; - client.levelCache[thisLevel.name] = thisLevel.level; - }; - - if(client.devmode === true) { - client.login(client.config.devtoken); - } else { - client.login(client.config.token); - }; -}; - -init(); \ No newline at end of file diff --git a/package.json b/package.json deleted file mode 100644 index 891ab34..0000000 --- a/package.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "name": "woomy", - "version": "1.1.0", - "description": "Woomy is a all-purpose discord bot built off the guidebot base and coded in node.js using discord.js.", - "main": "index.js", - "dependencies": { - "@discordjs/opus": "^0.1.0", - "better-sqlite3": "^5.4.1", - "chalk": "^3.0.0", - "dblapi.js": "^2.3.1", - "discord.js": "^12.0.2", - "enmap": "^5.2.4", - "garfield": "^1.1.2", - "get-youtube-id": "^1.0.1", - "hastebin-gen": "^2.0.5", - "moment": "^2.24.0", - "moment-duration-format": "^2.3.2", - "nekos.life": "^2.0.5", - "node-fetch": "^2.6.0", - "openweather-apis": "^4.2.0", - "prism-media": "^1.2.1", - "randomcolor": "^0.5.4", - "relevant-urban": "^2.0.0", - "request": "^2.88.2", - "to-zalgo": "^1.0.1", - "urban": "^0.3.2", - "weather-js": "^2.0.0", - "youtube-info": "^1.3.2", - "ytdl-core-discord": "^1.1.0" - }, - "devDependencies": {}, - "scripts": { - "test": "echo \"Error: no test specified\" && exit 1" - }, - "repository": { - "type": "git", - "url": "git+https://github.com/mudkipscience/woomy.git" - }, - "author": "mudkipscience", - "license": "MIT", - "bugs": { - "url": "https://github.com/mudkipscience/woomy/issues" - }, - "homepage": "https://github.com/mudkipscience/woomy#readme" -} diff --git a/resources/audio/WOOMY.mp3 b/resources/audio/WOOMY.mp3 deleted file mode 100644 index 9b3989193dede59c1495d97229aec4e603b8f5d8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 26469 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

LP?s}>_8ENxMl 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 { - if (!args[0]) - return message.channel.send( - `<:error:466995152976871434> You did not ask me a question. Usage: \`${client.commands.get(`8ball`).help.usage}\`` - ); - - var ball = [ - "No darndested clue.", - "Stupid question. You should be ashamed of yourself for even asking.", - "Yes!", - "Not in your wildest dreams!", - "No chance.", - "Never.", - "Just Google it.", - "¯\\_(ツ)_/¯", - "Possibly.", - "There's a high chance.", - "I'd rather not say." - ]; - - let mess = ball.random(); - message.channel.send(":8ball: " + mess); -}; - -exports.conf = { - enabled: true, - guildOnly: false, - aliases: [], - permLevel: "User", - requiredPerms: [] -}; - -exports.help = { - name: "8ball", - category: "Fun", - description: "Consult the 8ball for advice.", - usage: "8ball [question]" -}; diff --git a/src/commands/about.js b/src/commands/about.js deleted file mode 100644 index 2049bfa..0000000 --- a/src/commands/about.js +++ /dev/null @@ -1,58 +0,0 @@ - -const { version } = require("discord.js"); -const moment = require("moment"); -require("moment-duration-format"); - -exports.run = (client, message) => { - const duration = moment - .duration(client.uptime) - .format(" D [days], H [hrs], m [mins], s [secs]"); - - var mud = client.users.cache.get(client.config.owners[0]).tag; - var flgx = client.users.cache.get(client.config.owners[1]).tag; - var build; - var prefix; - - if(message.guild) { - prefix = message.settings.prefix; - } else { - prefix = client.config.defaultSettings.prefix; - }; - - if(client.devmode == true) { - build = "development" - } else { - build = "production" - } - - embed = new Discord.MessageEmbed(); - embed.setColor(client.embedColour(message)); - embed.setThumbnail(client.user.avatarURL({format: "png", dynamic: true, size: 2048})) - embed.setTitle("About Woomy") - embed.addField( - "General:", `• users: \`${client.users.cache.size}\`\n• channels: \`${client.channels.cache.size}\`\n• servers: \`${client.guilds.cache.size}\`\n• commands: \`${client.commands.size}\`\n• uptime: \`${duration}\``,true - ); - embed.addField( - `Technical:`, `• RAM Usage: \`${(process.memoryUsage().heapUsed / 1024 / 1024).toFixed(2)} MB\`\n• OS: \`${require("os").type}\`\n• bot version: \`${client.version.number} (${build})\`\n• discord.js version: \`v${version}\`\n• node.js version: \`${process.version}\``,true - ); - embed.addField( - "Links:", "[Support](https://discord.gg/HCF8mdv) | [GitHub](https://github.com/mudkipscience/woomy) | [db.org](https://discordbots.org/bot/435961704145485835/vote) | [BFD](https://botsfordiscord.com/bots/435961704145485835/vote) | [top.gg](https://discordbotlist.com/bots/435961704145485835) | [discord.js](https://discord.js.org/#/) | [guidebot](https://github.com/AnIdiotsGuide/guidebot/)" - ); - - message.channel.send(embed); -}; - -exports.conf = { - enabled: true, - guildOnly: false, - aliases: ["stats", "botinfo"], - permLevel: "User", - requiredPerms: [] -}; - -exports.help = { - name: "about", - category: "Utility", - description: "Information about the bot, as well as a couple of helpful links", - usage: "about" -}; diff --git a/src/commands/achievement.js b/src/commands/achievement.js deleted file mode 100644 index 49b75f7..0000000 --- a/src/commands/achievement.js +++ /dev/null @@ -1,41 +0,0 @@ -Discord = require("discord.js"); - -const url = "https://www.minecraftskinstealer.com/achievement/a.php"; - -exports.run = (client, message, args) => { - let text = args.join(" "); - - if (!text) { - return message.channel.send( - `<:error:466995152976871434> No text provided to turn into an achievement. Usage: \`${client.commands.get(`achievement`).help.usage}\`` - ); - }; - message.channel.startTyping(); - let params = "h=Achievement+Get%21&i=1&t=" + encodeURIComponent(text); - - try { - message.channel.stopTyping(); - message.channel.send({ - files: [new Discord.MessageAttachment(url + "?" + params, "achievement.png")] - }); - - } catch(err) { - message.channel.stopTyping(); - message.channel.send(`<:error:466995152976871434> Error when generating image: \`${err}\``) - } -}; - -exports.conf = { - enabled: true, - guildOnly: false, - aliases: [], - permLevel: "User", - requiredPerms: ["ATTACH_FILES"] -}; - -exports.help = { - name: "achievement", - category: "Fun", - description: "Generates an minecraft achievement.", - usage: "achievement [text]" -}; diff --git a/src/commands/activity.js b/src/commands/activity.js deleted file mode 100644 index 59ab78a..0000000 --- a/src/commands/activity.js +++ /dev/null @@ -1,45 +0,0 @@ -exports.run = (client, message, args) => { - if(!args[0]) { - return message.channel.send(`<:error:466995152976871434> No arguments! Usage: \`${client.commands.get(`activity`).help.usage}\``) - } - if(client.lockActivity == true) { - activityLocked = "locked"; - } else { - activityLocked = "unlocked"; - } - - if(args[0] == "lock" && !args[1]) { - client.lockActivity = true; - return message.channel.send( - "<:success:466995111885144095> Activity has been locked will no longer change automatically." - ); - }; - - if(args[0] == "unlock" && !args[1]) { - client.lockActivity = false; - return message.channel.send( - "<:success:466995111885144095> Activity has been unlocked and will begin changing automatically." - ); - }; - - client.lockActivity = true; - client.user.setActivity(args.join(" ")); - message.channel.send( - `<:success:466995111885144095> Activity locked and changed to \`${args.join(" ")}\` - `); -}; - -exports.conf = { - enabled: true, - guildOnly: false, - aliases: [], - permLevel: "Developer", - requiredPerms: [] -}; - -exports.help = { - name: "activity", - category: "Owner", - description: "Changes the bot's activity and disables automatic changing of the activity", - usage: "activity [activity] **OR** activity [lock/unlock]" -}; diff --git a/src/commands/adminrole.js b/src/commands/adminrole.js deleted file mode 100644 index 6e3d231..0000000 --- a/src/commands/adminrole.js +++ /dev/null @@ -1,61 +0,0 @@ -exports.run = async (client, message, args) => { - - const settings = message.settings; - - if (!client.settings.has(message.guild.id)) { - client.settings.set(message.guild.id, {}); - } - - var adminRole = message.guild.roles.cache.get(settings.adminRole) - - if (!args[0]) { - if(!adminRole) { - return message.channel.send( - `<:error:466995152976871434> There is no admin role set for this server. Please set one using \`${message.settings.prefix}adminrole \`` - ); - } else { - message.channel.send(`The current admin role is: \`${adminRole.name}\``) - } - - } else { - const joinedValue = args.join(" "); - if (joinedValue.length < 1) { - return message.channel.send( - `<:error:466995152976871434> You didn't specify a role. Usage: \`${client.commands.get(`adminrole`).help.usage}\`` - ); - }; - - if (settings.adminRole != "None set" && joinedValue === adminRole.name) { - return message.channel.send( - "<:error:466995152976871434> The admin role is already set to that!" - ); - }; - - let role = client.findRole(joinedValue, message); - - if (!role) { - return message.channel.send(`<:error:466995152976871434> That role doesn't seem to exist. Try again!`); - }; - - client.settings.set(message.guild.id, role.id, "adminRole"); - - message.channel.send( - `<:success:466995111885144095> The admin role has been set to \`${role.name}\` - `); - }; -}; - -exports.conf = { - enabled: true, - guildOnly: true, - aliases: [], - permLevel: "Server Owner", - requiredPerms: [] -}; - -exports.help = { - name: "adminrole", - category: "Configure", - description: "Sets the admin role for this server.", - usage: "adminrole [role]" -}; diff --git a/src/commands/autorole.js b/src/commands/autorole.js deleted file mode 100644 index 2aae88d..0000000 --- a/src/commands/autorole.js +++ /dev/null @@ -1,69 +0,0 @@ -exports.run = async (client, message, args) => { - - const settings = message.settings; - - if (!client.settings.has(message.guild.id)) { - client.settings.set(message.guild.id, {}); - } - - var autorole = message.guild.roles.cache.get(settings.autorole) - - if (!args[0]) { - if(!autorole) { - return message.channel.send( - `<:error:466995152976871434> There is no autorole set for this server. Please set one using \`${message.settings.prefix}autorole \`` - ); - } else { - message.channel.send(`Users recieve this role upon joining: \`${autorole.name}\``) - } - - } else if(args.join(" ").toLowerCase() == "off") { - if(settings.autorole == "off") { - return message.channel.send("<:error:466995152976871434> Autoroling has not been enabled.") - } - - client.settings.set(message.guild.id, "off", "autorole"); - return message.channel.send("<:success:466995111885144095> Autoroling has been disabled.") - } else { - - const joinedValue = args.join(" "); - if (joinedValue.length < 1) { - return message.channel.send( - `<:error:466995152976871434> You didn't specify a role. Usage: \`${client.commands.get(`autorole`).help.usage}\`` - ); - }; - - if (settings.autorole != "off" && joinedValue === autorole.name) { - return message.channel.send( - "<:error:466995152976871434> The autorole is already set to that!" - ); - }; - - role = client.findRole(joinedValue, message); - - if (!role) { - return message.channel.send(`<:error:466995152976871434> That role doesn't seem to exist. Try again!`); - }; - - client.settings.set(message.guild.id, role.id, "autorole"); - - message.channel.send( - `<:success:466995111885144095> The autorole has been set to \`${role.name}\` - `); - }; -}; - -exports.conf = { - enabled: true, - guildOnly: true, - aliases: [], - permLevel: "Administrator", - requiredPerms: ["MANAGE_ROLES"] -}; - -exports.help = { - name: "autorole", - category: "Configure", - description: "Sets the autorole for this server.", - usage: "autorole **OR** autorole off" -}; diff --git a/src/commands/avatar.js b/src/commands/avatar.js deleted file mode 100644 index 5832be2..0000000 --- a/src/commands/avatar.js +++ /dev/null @@ -1,38 +0,0 @@ -exports.run = (client, message, args) => { - let user = message.mentions.users.first(); - let users; - if (!args[0] || !message.guild) { - user = message.author; - }; - - if (!user && message.guild) { - users = client.searchForMembers(message.guild, args[0]); - if (users.length > 1) { - return message.channel.send( - "<:error:466995152976871434> Found multiple users, please be more specific or mention the user instead." - ); - } else if (users.length == 0) { - return message.channel.send( - "<:error:466995152976871434> That user doesn't seem to exist, try again!" - ); - }; - user = users[0]; - user = user.user; - } - message.channel.send(`**${user.tag}'s** avatar is: ${user.avatarURL({format: "png", dynamic: true, size: 2048})}`); -}; - -exports.conf = { - enabled: true, - guildOnly: false, - aliases: [], - permLevel: "User", - requiredPerms: ["EMBED_LINKS"] -}; - -exports.help = { - name: "avatar", - category: "Utility", - description: "Gives you the specified users avatar.", - usage: "avatar " -}; diff --git a/src/commands/ban.js b/src/commands/ban.js deleted file mode 100644 index affa882..0000000 --- a/src/commands/ban.js +++ /dev/null @@ -1,87 +0,0 @@ -exports.run = async (client, message, args) => { - const settings = (message.settings = client.getSettings(message.guild.id)); - - if(!args[0]) { - return message.channel.send( - `<:error:466995152976871434> No username provided. Usage: \`${client.commands.get(`ban`).help.usage}\`` - ); - }; - - let user = message.mentions.members.first(); - - if (!user) { - let users; - users = client.searchForMembers(message.guild, args[0]); - if (users.length > 1) - return message.channel.send( - "<:error:466995152976871434> Found multiple users! Please be more specific or mention the user instead." - ); - else if (users.length == 0) - return message.channel.send( - "<:error:466995152976871434> That user doesn't seem to exist. Try again!" - ); - user = users[0]; - }; - - if (user.user.id === message.guild.owner.id) { - return message.channel.send("<:error:466995152976871434> You can't ban the owner!") - }; - let moderator = message.guild.member(message.author) - if (user.roles.highest.position >= moderator.roles.highest.position && moderator.user.id !== message.guild.ownerID) { - return message.channel.send( - `<:error:466995152976871434> You can't ban people higher ranked than yourself!` - ); - }; - - let bot = message.guild.member(client.user) - if (user.roles.highest.position >= bot.roles.highest.position) { - return message.channel.send( - `<:error:466995152976871434> I can't ban people who are higher ranked than me!` - ); - }; - - if (!user.bannable) - return message.channel.send( - "<:error:466995152976871434> Specified user is not bannable." - ); - - let reason = args.slice(1).join(" "); - if (!reason) reason = `Banned by ${message.author.tag}`; - await message.guild.members.ban(user, {reason: reason}).catch(console.error); - message.channel.send(`<:success:466995111885144095> Banned \`${user.user.tag}\``); - - if (settings.modlogsChannel !== "off") { - const channel = message.guild.channels.cache.find( - channel => channel.name === settings.modlogsChannel - ); - - if (channel) { - let embed = new Discord.MessageEmbed(); - embed.setColor("#BC0057"); - embed.setAuthor("User banned!", user.user.avatarURL({format: "png", dynamic: true, size: 2048})); - embed.setDescription( - `• User: ${user.user.tag} (${user.user.id})\n• Mod: ${message.author} (${message.author.id})\n• Reason: ${reason}` - ); - try { - channel.send(embed); - } catch (err) { - // probably no permissions to send messages/embeds there - }; - }; - }; -}; - -exports.conf = { - enabled: true, - guildOnly: true, - aliases: [], - permLevel: "Moderator", - requiredPerms: ["BAN_MEMBERS"] -}; - -exports.help = { - name: "ban", - category: "Moderation", - description: "Bans specified user.", - usage: "ban [user] " -}; diff --git a/src/commands/blacklist.js b/src/commands/blacklist.js deleted file mode 100644 index 20c41aa..0000000 --- a/src/commands/blacklist.js +++ /dev/null @@ -1,124 +0,0 @@ -exports.run = async (client, message, [action, ...member]) => { - const settings = message.settings; - - if(settings.blacklisted == "ARRAY") { - await client.settings.set(message.guild.id, [], "blacklisted"); - } - - if(!action) { - return message.channel.send( - `<:error:466995152976871434> You didn't tell me if I was meant to add or remove someone from the blacklist! Usage: \`${client.commands.get(`blacklist`).help.usage}\`` - ) - } - - member = member.join(" ") - - if(!member) { - return message.channel.send( - `<:error:466995152976871434> You didn't tell me who to blacklist! Usage: \`${client.commands.get(`blacklist`).help.usage}\`` - ); - }; - - let user = message.mentions.members.first(); - - if(action == "add") { - if (!user) { - let users; - users = client.searchForMembers(message.guild, member); - if (users.length > 1) - return message.channel.send( - "<:error:466995152976871434> Found multiple users! Please be more specific or mention the user instead." - ); - else if (users.length == 0) - return message.channel.send( - "<:error:466995152976871434> That user doesn't seem to exist. Try again!" - ); - user = users[0]; - }; - - if(user.id === client.user.id) { - return message.channel.send('lol no'); - }; - - if (user.id === message.guild.owner.id) { - return message.channel.send("<:error:466995152976871434> You can't blacklist the owner!") - }; - - let admin = message.guild.member(message.author) - if (user.roles.highest.position >= admin.roles.highest.position && admin.user.id !== message.guild.ownerID) { - return message.channel.send( - `<:error:466995152976871434> You can't blacklist people higher ranked than yourself!` - ); - }; - - if(user.id === message.member.id) { - return message.channel.send('<:error:466995152976871434> You can\'t blacklist yourself!'); - }; - - let blacklisted = false; - - if(settings.blacklisted.length > 0) { - settings.blacklisted.forEach(function(ID) { - if(ID == user.id) { - blacklisted = true; - } - }); - - if(blacklisted == true) { - return message.channel.send('<:error:466995152976871434> This person has already been blacklisted!'); - }; - }; - - client.settings.push(message.guild.id, user.id, "blacklisted") - - return message.channel.send(`<:success:466995111885144095> Blacklisted \`${user.user.tag}\``) - }; - - - if (action == "remove") { - if (!user) { - let users; - users = client.searchForMembers(message.guild, member); - if (users.length > 1) - return message.channel.send( - "<:error:466995152976871434> Found multiple users! Please be more specific or mention the user instead." - ); - else if (users.length == 0) - return message.channel.send( - "<:error:466995152976871434> That user doesn't seem to exist. Try again!" - ); - user = users[0]; - }; - - let blacklisted = false; - - settings.blacklisted.forEach(function(ID) { - if(ID == user.id) { - blacklisted = true; - } - }); - - if(blacklisted != true) { - return message.channel.send('<:error:466995152976871434> This user isn\'t blacklisted!'); - }; - - client.settings.remove(message.guild.id, user.id, "blacklisted") - - return message.channel.send(`<:success:466995111885144095> Removed \`${user.user.tag}\` from the blacklist.`) - }; -}; - -exports.conf = { - enabled: true, - guildOnly: true, - aliases: [], - permLevel: "Administrator", - requiredPerms: [] -}; - -exports.help = { - name: "blacklist", - category: "Moderation", - description: "Allows you to configure Woomy's blacklist. Blacklisted users cannot use commands.", - usage: "blacklist [add/remove] [member]" -}; diff --git a/src/commands/bohemian_rhapsody.js b/src/commands/bohemian_rhapsody.js deleted file mode 100644 index c9bb3ef..0000000 --- a/src/commands/bohemian_rhapsody.js +++ /dev/null @@ -1,45 +0,0 @@ -const Discord = require("discord.js"); -const lyric = require('../../resources/other/lyrics.json') -exports.run = async (client, message, args, level) => { - const lyrics = lyric.bohemian_rhapsody; - var runtop = true; - var runbottom = false; - for(var br = 0; br < lyrics.length; br++) { - { - if (runtop === true) { - var response = await client.awaitReply(message, lyrics[br]); - runbottom = false; - }; - - if (runbottom === true) { - if (response !== lyrics[br]) { - return message.channel.send("Those aren't the lyrics!"); - } - runtop = false - }; - }; - if (runtop === true) { - runtop = false - runbottom = true - } else if (runbottom === true) { - runtop = true - runbottom = false - }; - }; - message.channel.send("What a lovely duet!"); -}; - -exports.conf = { - enabled: true, - guildOnly: false, - aliases: ["br"], - permLevel: "User", - requiredPerms: [] -}; - -exports.help = { - name: "bohemian_rhapsody", - category: "Fun", - description: "Queen kareoke", - usage: "bohemian_rhapsody" -}; diff --git a/src/commands/calculate.js b/src/commands/calculate.js deleted file mode 100644 index e7737b3..0000000 --- a/src/commands/calculate.js +++ /dev/null @@ -1,42 +0,0 @@ -var allowed = ["+", "-", "*", "/", "(", ")", " "]; -exports.run = (client, message, args) => { - let exercise = args.join(" "); - - if (!exercise) { - return message.channel.send( - `<:error:466995152976871434> No equation provided. Usage :\`${client.commands.get(`calculate`).help.usage}\`` - ); - } - - for (var i = 0; i < exercise.length; i++) { - let c = exercise.charAt(i); - let found = allowed.find((element) => element === c); - - if(c == "0") found = true; - if(!(Number(c) || found)) - { - return message.channel.send( - `<:error:466995152976871434> Invalid equation. Please use \`*\` for multiplication and \`/\` for division!` - ); - } - } - - let result = (new Function( 'return ' + exercise )()); - - message.channel.send(`\`RESULT:\`\n\`\`\`${result}\`\`\``); -}; - -exports.conf = { - enabled: true, - guildOnly: false, - aliases: ["calc", "math"], - permLevel: "User", - requiredPerms: [] -}; - -exports.help = { - name: "calculate", - category: "Utility", - description: "Solves basic mathematical equations.", - usage: "calculate [equation]" -}; \ No newline at end of file diff --git a/src/commands/cat.js b/src/commands/cat.js deleted file mode 100644 index afd627f..0000000 --- a/src/commands/cat.js +++ /dev/null @@ -1,30 +0,0 @@ -const API = require('nekos.life'); -const {sfw} = new API(); -exports.run = async (client, message) => { - message.channel.startTyping(); - try { - sfw.meow().then((json) => { - message.channel.send(json.url) - message.channel.stopTyping(); - }); - } catch (err) { - client.logger.error("cat.js: " + err); - message.channel.send(`<:error:466995152976871434> An error has occurred: ${err}`) - message.channel.stopTyping(); - }; -}; - -exports.conf = { - enabled: true, - guildOnly: false, - aliases: [], - permLevel: "User", - requiredPerms: ["EMBED_LINKS"] -}; - -exports.help = { - name: "cat", - category: "Image", - description: "Sends you cat pics.", - usage: "cat" -}; diff --git a/src/commands/catfact.js b/src/commands/catfact.js deleted file mode 100644 index 366999e..0000000 --- a/src/commands/catfact.js +++ /dev/null @@ -1,27 +0,0 @@ -const fetch = require("node-fetch") -exports.run = async (bot, message, args) => { - message.channel.startTyping(); - try{ - fetch('https://catfact.ninja/facts') - .then(res => res.json()) - .then(json => message.channel.send(`__**Did you know?**__\n${json.data[0].fact}`)) - } catch(err) { - message.channel.send(`<:error:466995152976871434> An error has occurred: ${err}`); - }; - message.channel.stopTyping(); -}; - -exports.conf = { - enabled: true, - guildOnly: false, - aliases: ["kittenfact"], - permLevel: "User", - requiredPerms: [] - }; - - exports.help = { - name: "catfact", - category: "Fun", - description: "Sends a fun fact about a cat.", - usage: "catfact/kittenfact" - }; diff --git a/src/commands/changelog.js b/src/commands/changelog.js deleted file mode 100644 index a604a98..0000000 --- a/src/commands/changelog.js +++ /dev/null @@ -1,18 +0,0 @@ -exports.run = (client, message) => { - message.channel.send(client.version.changelog) -}; - -exports.conf = { - enabled: true, - guildOnly: false, - aliases: ["updates"], - permLevel: "User", - requiredPerms: [] -}; - -exports.help = { - name: "changelog", - category: "Utility", - description: "Gives you the changes/features introduced with the latest update", - usage: "changelog" -}; diff --git a/src/commands/chatlogs.js b/src/commands/chatlogs.js deleted file mode 100644 index 8faab92..0000000 --- a/src/commands/chatlogs.js +++ /dev/null @@ -1,29 +0,0 @@ -exports.run = async (client, message) => { - - const settings = message.settings; - - if (!client.settings.has(message.guild.id)) client.settings.set(message.guild.id, {}); - - if (message.channel.name !== settings.chatlogsChannel) { - client.settings.set(message.guild.id, message.channel.name, "chatlogsChannel") - message.channel.send(`<:success:466995111885144095> Chat logs will now be displayed in \`${message.channel.name}\``); - } else { - client.settings.set(message.guild.id, "off", "chatlogsChannel") - message.channel.send(`<:success:466995111885144095> Chat logs disabled.`); - } -}; - -exports.conf = { - enabled: true, - guildOnly: true, - aliases: [], - permLevel: "Administrator", - requiredPerms: [] -}; - -exports.help = { - name: "chatlogs", - category: "Configure", - description: "Enables chat logging in your server.", - usage: "chatlogs **OR** chatlogs off" -}; diff --git a/src/commands/coinflip.js b/src/commands/coinflip.js deleted file mode 100644 index 418a996..0000000 --- a/src/commands/coinflip.js +++ /dev/null @@ -1,35 +0,0 @@ -exports.run = (client, message, args) => { - if(!args[0]) { - return message.channel.send( - `<:error:466995152976871434> Invalid choice. Usage: \`${client.commands.get(`flip`).help.usage}\`` - ); - }; - - if(args[0].toLowerCase() != "heads" && args[0].toLowerCase() != "tails") { - return message.channel.send( - `<:error:466995152976871434> Invalid choice. Usage: \`${client.commands.get(`flip`).help.usage}\`` - ); - }; - var coin = [ - "Heads!", - "Tails!" - ]; - - let mess = coin.random(); - message.channel.send(mess); -}; - -exports.conf = { - enabled: true, - guildOnly: false, - aliases: ["flip"], - permLevel: "User", - requiredPerms: [] -}; - -exports.help = { - name: "coinflip", - category: "Fun", - description: "Flips a coin!", - usage: "coinflip [heads/tails]" -}; diff --git a/src/commands/colour.js b/src/commands/colour.js deleted file mode 100644 index bdcbf61..0000000 --- a/src/commands/colour.js +++ /dev/null @@ -1,57 +0,0 @@ -const randomColour = require("randomcolor"); -exports.run = async (client, message, args, level) => { - var colour; - if(!args[0]) { - colour = randomColour(); - } else if(isHex(args.join(" ")) != true) { - colour = stringToHex(args.join(" ")); - } else { - colour = args[0] - } - - embed = new Discord.MessageEmbed(); - embed.setTitle(colour) - embed.setColor(colour); - embed.setImage("https://api.alexflipnote.xyz/colour/image/" + colour.replace("#", "")); - message.channel.send(embed) -}; - -function isHex(string) { - var str = string; - if(str.charAt(0) == "#") { - str = str.slice(1) - }; - - return typeof str === 'string' - && str.length === 6 - && !isNaN(Number('0x' + str)) -} - -function stringToHex(string) { - var hash = 0; - for (var i = 0; i < string.length; i++) { - hash = string.charCodeAt(i) + ((hash << 5) - hash); - } - var colour = '#'; - for (var i = 0; i < 3; i++) { - var value = (hash >> (i * 8)) & 0xFF; - colour += ('00' + value.toString(16)).substr(-2); - } - return colour; -}; - - -exports.conf = { - enabled: true, - guildOnly: false, - aliases: ["color"], - permLevel: "User", - requiredPerms: [] -}; - -exports.help = { - name: "colour", - category: "Utility", - description: "Gives you a random colour", - usage: "colour **OR** colour " -}; \ No newline at end of file diff --git a/src/commands/credits.js b/src/commands/credits.js deleted file mode 100644 index 5eb48ce..0000000 --- a/src/commands/credits.js +++ /dev/null @@ -1,20 +0,0 @@ -exports.run = async (client, message, args) => { - message.channel.send( - `__**Credits:**__\n• \`mudkipscience#8904\`, \`FLGX#9896\` and \`TheCakeChicken#9088\` for developing the bot\n• \`An Idiots Guide\` for the Guidebot bot base\n• \`Tina the Cyclops girl#0064\` for helping me not suck at coding\n• \`AirVentTrent\` for the icon, find him on Instagram\n• \`Terryiscool160\` for contributing to Woomy.` - ); -}; - -exports.conf = { - enabled: true, - guildOnly: false, - aliases: [], - permLevel: "User", - requiredPerms: [] -}; - -exports.help = { - name: "credits", - category: "Utility", - description: "Cool people", - usage: "credits" -}; diff --git a/src/commands/creeper.js b/src/commands/creeper.js deleted file mode 100644 index 80ac90b..0000000 --- a/src/commands/creeper.js +++ /dev/null @@ -1,45 +0,0 @@ - -const lyric = require('../../resources/other/lyrics.json') -exports.run = async (client, message, args, level) => { - var lyrics = lyric.creeper; - - var runtop = true; - var runbottom = false; - for(var br = 0; br < lyrics.length; br++) { - { - if (runtop === true) { - var response = await client.awaitReply(message, lyrics[br]); - runbottom = false; - }; - - if (runbottom === true) { - if (response !== lyrics[br]) { - return message.channel.send("Those aren't the lyrics!") - } - runtop = false - }; - } if (runtop === true) { - runtop = false - runbottom = true - } else if (runbottom === true) { - runtop = true - runbottom = false - } - } - message.channel.send("What a lovely duet!") -}; - -exports.conf = { - enabled: true, - guildOnly: false, - aliases: [], - permLevel: "User", - requiredPerms: [] -}; - -exports.help = { - name: "creeper", - category: "Fun", - description: "Aww man", - usage: "creeper" -}; diff --git a/src/commands/cuddle.js b/src/commands/cuddle.js deleted file mode 100644 index 63263ae..0000000 --- a/src/commands/cuddle.js +++ /dev/null @@ -1,69 +0,0 @@ -const API = require('nekos.life'); -const {sfw} = new API(); -exports.run = async (client, message, args) => { - if(!args[0]) { - return message.channel.send(`<:error:466995152976871434> You didn't say who you wanted to cuddle! Usage: \`${client.commands.get(`cuddle`).help.usage}\``) - }; - - var people = ""; - - for (var i = 0; i < args.length; i++) { - var user = client.getUserFromMention(args[i]) - if (user) { - user = message.guild.members.cache.get(user.id).displayName; - } else { - users = client.searchForMembers(message.guild, args[i]); - if (users.length > 1) - return message.channel.send( - "<:error:466995152976871434> Found multiple users for `" + args[i] + "`, Please be more specific or mention the user instead." - ); - else if (users.length == 0) - return message.channel.send( - "<:error:466995152976871434> That user doesn't seem to exist. Try again!" - ); - user = users[0].displayName; - }; - if(i+1 == args.length && args.length > 1) { - people += `**and** ${user}!` - } else if(args.length < 2) { - people += `${user}!`; - } else if(args.length == 2 && i == 0) { - people += `${user} `; - } else { - people += `${user}, `; - }; - }; - - - - message.channel.startTyping(); - try { - sfw.cuddle().then((json) => { - embed = new Discord.MessageEmbed(); - embed.setImage(json.url) - embed.setColor(client.embedColour(message)); - embed.setDescription(`**${message.guild.members.cache.get(message.author.id).displayName}** cuddled **${people}**`) - message.channel.send(embed) - message.channel.stopTyping(); - }); - } catch (err) { - client.logger.error("cuddle.js: " + err); - message.channel.send(`<:error:466995152976871434> An error has occurred: ${err}`) - message.channel.stopTyping(); - }; -}; - -exports.conf = { - enabled: true, - guildOnly: true, - aliases: [], - permLevel: "User", - requiredPerms: ["EMBED_LINKS"] -}; - -exports.help = { - name: "cuddle", - category: "Action", - description: "cuddle someone!", - usage: "cuddle [@user/user] (you can cuddle as many people as you want!)" -}; diff --git a/src/commands/dice.js b/src/commands/dice.js deleted file mode 100644 index be9edcf..0000000 --- a/src/commands/dice.js +++ /dev/null @@ -1,27 +0,0 @@ -exports.run = async (bot, message, args) => { - if (args.length === 0) { - message.channel.send(`🎲 You rolled a ${Array.from(Array(6).keys()).random() + 1}!`); - } else { - if (args[0].match(/^\d+$/)) { - message.channel.send(`🎲 You rolled a ${Array.from(Array(parseInt(args[0])).keys()).random() + 1}!`); - } else { - message.channel.send(`🎲 You rolled a ${Array.from(Array(6).keys()).random() + 1}!`); - } - } - }; - - exports.conf = { - enabled: true, - guildOnly: false, - aliases: ["diceroll", "roll"], - permLevel: "User", - requiredPerms: [] - }; - - exports.help = { - name: "dice", - category: "Fun", - description: "Rolls a dice.", - usage: "dice " - }; - diff --git a/src/commands/dog.js b/src/commands/dog.js deleted file mode 100644 index 39ce25c..0000000 --- a/src/commands/dog.js +++ /dev/null @@ -1,30 +0,0 @@ -const API = require('nekos.life'); -const {sfw} = new API(); -exports.run = async (client, message) => { - message.channel.startTyping(); - try { - sfw.woof().then((json) => { - message.channel.send(json.url) - message.channel.stopTyping(); - }); - } catch (err) { - client.logger.error("dog.js: " + err); - message.channel.send(`<:error:466995152976871434> An error has occurred: ${err}`) - message.channel.stopTyping(); - }; -}; - -exports.conf = { - enabled: true, - guildOnly: false, - aliases: [], - permLevel: "User", - requiredPerms: ["EMBED_LINKS"] -}; - -exports.help = { - name: "dog", - category: "Image", - description: "Sends you dog pics.", - usage: "dog" -}; diff --git a/src/commands/dogfact.js b/src/commands/dogfact.js deleted file mode 100644 index fca8a62..0000000 --- a/src/commands/dogfact.js +++ /dev/null @@ -1,27 +0,0 @@ -const fetch = require("node-fetch"); -exports.run = async (bot, message, args) => { - message.channel.startTyping(); - try{ - fetch('https://dog-api.kinduff.com/api/facts') - .then(res => res.json()) - .then(json => message.channel.send(`__**Did you know?**__\n ${json.facts[0]}`)); - } catch(err) { - message.channel.send(`<:error:466995152976871434> An error has occurred: ${err}`); - }; - message.channel.stopTyping(); -}; - -exports.conf = { - enabled: true, - guildOnly: false, - aliases: ["pupfact"], - permLevel: "User", - requiredPerms: [] - }; - - exports.help = { - name: "dogfact", - category: "Fun", - description: "Sends a fun fact about a doggo.", - usage: "dogfact/pupfact" - }; diff --git a/src/commands/emoji.js b/src/commands/emoji.js deleted file mode 100644 index ab6907b..0000000 --- a/src/commands/emoji.js +++ /dev/null @@ -1,42 +0,0 @@ -exports.run = async (client, message, args) => { - if(!args[0]) { - return message.channel.send(`You need to specify a custom emoji. Usage: \`${client.commands.get(`emoji`).help.usage}\``) - }; - - var ID; - var format = ".png" - var string = args[0].replace(/\D/g,''); - - if(args[0].charAt(1) == "a" && args[0].charAt(2) == ":") { - format = ".gif" - }; - - if(string.length > 18) { - ID = string.slice(string.length - 18); - } else { - ID = string; - }; - - if(!ID) { - return message.channel.send(`<:error:466995152976871434> Invalid emoji. This command only works with custom emojis.`) - }; - - - - message.channel.send("https://cdn.discordapp.com/emojis/" + ID + format) -}; - -exports.conf = { - enabled: true, - guildOnly: false, - aliases: [], - permLevel: "User", - requiredPerms: [] -}; - -exports.help = { - name: "emoji", - category: "Utility", - description: "Enlarges and links an custom emoji", - usage: "emoji [emoji]" -}; diff --git a/src/commands/emojify.js b/src/commands/emojify.js deleted file mode 100644 index 46dfa35..0000000 --- a/src/commands/emojify.js +++ /dev/null @@ -1,56 +0,0 @@ -Discord = require("discord.js"); -exports.run = (client, message, args) => { - if (!args[0]) { - return message.channel.send( - `<:error:466995152976871434> You must include a message for me to emojify! Usage: \`${client.commands.get(`emojify`).help.usage}\`` - ); - }; - const specialChars = { - '0': ':zero:', - '1': ':one:', - '2': ':two:', - '3': ':three:', - '4': ':four:', - '5': ':five:', - '6': ':six:', - '7': ':seven:', - '8': ':eight:', - '9': ':nine:', - '#': ':hash:', - '*': ':asterisk:', - '?': ':grey_question:', - '!': ':grey_exclamation:', - ' ': ' ' - }; - - const emojified = `${args.join(' ')}`.toLowerCase().split('').map(letter => { - if (/[a-z]/g.test(letter)) { - return `:regional_indicator_${letter}: ` - } else if (specialChars[letter]) { - return `${specialChars[letter]} ` - }; - return letter - }).join(''); - - if(emojified.length > 2000) { - return message.channel.send("<:error:466995152976871434> The emojified message exceeds 2000 characters.") - }; - - message.channel.send(emojified); -}; - - -exports.conf = { - enabled: true, - guildOnly: false, - aliases: [], - permLevel: "User", - requiredPerms: [] -}; - -exports.help = { - name: "emojify", - category: "Fun", - description: "Changes text into emojis", - usage: "emojify [message]" -}; diff --git a/src/commands/eval.js b/src/commands/eval.js deleted file mode 100644 index 2fef95f..0000000 --- a/src/commands/eval.js +++ /dev/null @@ -1,46 +0,0 @@ -const hastebin = require('hastebin-gen'); -exports.run = async (client, message, args) => { - const code = args.join(" "); - try { - const evaled = eval(code); - const clean = await client.clean(client, evaled); - - if(clean.length > 2000) { - hastebin(clean, { extension: "txt" }).then(haste => { - return message.channel.send('`OUTPUT`\n' + haste); - }).catch(error => { - client.logger.err(error); - }); - - return; - } - message.channel.send(`\`OUTPUT\` \`\`\`js\n${await clean}\n\`\`\``); - } catch (err) { - const errclean = await client.clean(client, err); - if(errclean.length > 2000) { - hastebin(errclean, { extension: "txt" }).then(haste => { - return message.channel.send('`ERROR`\n' + haste); - }).catch(error => { - client.logger.err(error); - }); - - return; - } - message.channel.send(`\`ERROR\` \`\`\`xl\n${await errclean}\n\`\`\``); - } -}; - -exports.conf = { - enabled: true, - guildOnly: false, - aliases: [], - permLevel: "Developer", - requiredPerms: [] -}; - -exports.help = { - name: "eval", - category: "Owner", - description: "Evaluates arbitrary javascript.", - usage: "eval [code]" -}; diff --git a/src/commands/fact.js b/src/commands/fact.js deleted file mode 100644 index 0e351a6..0000000 --- a/src/commands/fact.js +++ /dev/null @@ -1,30 +0,0 @@ -const API = require('nekos.life'); -const {sfw} = new API(); -exports.run = async (client, message) => { - message.channel.startTyping(); - try { - sfw.fact().then((json) => { - message.channel.send("__**Did you know?**__\n" + json.fact + "."); - message.channel.stopTyping(); - }); - } catch (err) { - client.logger.error("fact.js: " + err); - message.channel.send(`<:error:466995152976871434> An error has occurred: ${err}`) - message.channel.stopTyping(); - }; -}; - -exports.conf = { - enabled: true, - guildOnly: false, - aliases: ["randomfact"], - permLevel: "User", - requiredPerms: [] -}; - -exports.help = { - name: "fact", - category: "Fun", - description: "Sends you a random fact.", - usage: "fact" -}; diff --git a/src/commands/feed.js b/src/commands/feed.js deleted file mode 100644 index 9749f45..0000000 --- a/src/commands/feed.js +++ /dev/null @@ -1,69 +0,0 @@ -const API = require('nekos.life'); -const {sfw} = new API(); -exports.run = async (client, message, args) => { - if(!args[0]) { - return message.channel.send(`<:error:466995152976871434> You didn't say who you wanted to feed! Usage: \`${client.commands.get(`feed`).help.usage}\``) - }; - - var people = ""; - - for (var i = 0; i < args.length; i++) { - var user = client.getUserFromMention(args[i]) - if (user) { - user = message.guild.members.cache.get(user.id).displayName; - } else { - users = client.searchForMembers(message.guild, args[i]); - if (users.length > 1) - return message.channel.send( - "<:error:466995152976871434> Found multiple users for `" + args[i] + "`, Please be more specific or mention the user instead." - ); - else if (users.length == 0) - return message.channel.send( - "<:error:466995152976871434> That user doesn't seem to exist. Try again!" - ); - user = users[0].displayName; - }; - if(i+1 == args.length && args.length > 1) { - people += `**and** ${user}!` - } else if(args.length < 2) { - people += `${user}!`; - } else if(args.length == 2 && i == 0) { - people += `${user} `; - } else { - people += `${user}, `; - }; - }; - - - - message.channel.startTyping(); - try { - sfw.feed().then((json) => { - embed = new Discord.MessageEmbed(); - embed.setImage(json.url) - embed.setColor(client.embedColour(message)); - embed.setDescription(`**${message.guild.members.cache.get(message.author.id).displayName}** fed **${people}**`) - message.channel.send(embed) - message.channel.stopTyping(); - }); - } catch (err) { - client.logger.error("feed.js: " + err); - message.channel.send(`<:error:466995152976871434> An error has occurred: ${err}`) - message.channel.stopTyping(); - }; -}; - -exports.conf = { - enabled: true, - guildOnly: true, - aliases: [], - permLevel: "User", - requiredPerms: ["EMBED_LINKS"] -}; - -exports.help = { - name: "feed", - category: "Action", - description: "feed someone!", - usage: "feed [@user/user] (you can feed as many people as you want!)" -}; diff --git a/src/commands/feedback.js b/src/commands/feedback.js deleted file mode 100644 index 6b4512b..0000000 --- a/src/commands/feedback.js +++ /dev/null @@ -1,28 +0,0 @@ -exports.run = (client, message, args, level) => { - if(!args[0]) return message.channel.send(`<:error:466995152976871434> You didn't give me any feedback! Usage: \`${client.commands.get(`feedback`).help.usage}\``) - const feedback = args.join(" ") - let guild = client.guilds.cache.get("410990517841690625") - let channel = guild.channels.cache.get("438825830949453824") - let embed = new Discord.MessageEmbed() - .setTitle(`Feedback:`) - .setColor(client.embedColour(message)) - .addField("User:",message.author.tag) - .addField("Feedback: ", feedback) - channel.send({embed: embed}) - message.channel.send("<:success:466995111885144095> Your feedback has been sent to my developer. Thank you!") -}; - -exports.conf = { - enabled: true, - guildOnly: false, - aliases: ["suggest"], - permLevel: "User", - requiredPerms: [] -}; - -exports.help = { - name: "feedback", - category: "Utility", - description: "Send feedback to my developer.", - usage: "feedback [message]" -}; diff --git a/src/commands/forceskip.js b/src/commands/forceskip.js deleted file mode 100644 index 7e341d6..0000000 --- a/src/commands/forceskip.js +++ /dev/null @@ -1,28 +0,0 @@ -exports.run = (client, message) => { - let guild = client.music.getGuild(message.guild.id); - - if(guild.queue.length < 1) return message.channel.send( - `<:error:466995152976871434> There is nothing for me to skip!` - ); - skip_song(guild); - message.channel.send("<:skip:467216735356059660> Skipped the song!") -}; - -exports.conf = { - enabled: true, - guildOnly: true, - aliases: [], - permLevel: "Moderator", - requiredPerms: ["SPEAK"] -}; - -exports.help = { - name: "forceskip", - category: "Music", - description: "Skips the currently playing song without requiring a vote.", - usage: "forceskip" -}; - -function skip_song(guild) { - guild.dispatcher.end(); -} diff --git a/src/commands/foxgirl.js b/src/commands/foxgirl.js deleted file mode 100644 index f3f3312..0000000 --- a/src/commands/foxgirl.js +++ /dev/null @@ -1,30 +0,0 @@ -const API = require('nekos.life'); -const {sfw} = new API(); -exports.run = async (client, message) => { - message.channel.startTyping(); - try { - sfw.foxGirl().then((json) => { - message.channel.send(json.url) - message.channel.stopTyping(); - }); - } catch (err) { - client.logger.error("foxgirl.js: " + err); - message.channel.send(`<:error:466995152976871434> An error has occurred: ${err}`) - message.channel.stopTyping(); - }; -}; - -exports.conf = { - enabled: true, - guildOnly: false, - aliases: [], - permLevel: "User", - requiredPerms: ["EMBED_LINKS"] -}; - -exports.help = { - name: "foxgirl", - category: "Image", - description: "Sends you pictures of fox girls.", - usage: "foxgirl" -}; diff --git a/src/commands/garfield.js b/src/commands/garfield.js deleted file mode 100644 index 5376ded..0000000 --- a/src/commands/garfield.js +++ /dev/null @@ -1,21 +0,0 @@ -const garfield = require("garfield"); -exports.run = async (client, message) => { - message.channel.send({ files: [garfield.random()] }).catch(() => message.channel.send( - "<:error:466995152976871434> API didn't respond, try again in a few seconds." - )); -}; - -exports.conf = { - enabled: true, - guildOnly: false, - aliases: [], - permLevel: "User", - requiredPerms: ["ATTACH_FILES"] -}; - -exports.help = { - name: "garfield", - category: "Fun", - description: "Sends you a random garfield comic", - usage: "garfield" -}; diff --git a/src/commands/giverole.js b/src/commands/giverole.js deleted file mode 100644 index f62a055..0000000 --- a/src/commands/giverole.js +++ /dev/null @@ -1,87 +0,0 @@ -exports.run = async (client, message, [member, ...role2add], query) => { - if (!member) { - return message.channel.send( - "<:error:466995152976871434> Who am I meant to give a role?" - ); - } - let user = message.mentions.members.first(); - let users; - if (!user) { - users = client.searchForMembers(message.guild, member); - if (users.length > 1) - return message.channel.send( - "<:error:466995152976871434> Found multiple users! Please be more specific or mention the user instead." - ); - else if (users.length == 0) - return message.channel.send( - "<:error:466995152976871434> That user doesn't seem to exist. Try again!" - ); - user = users[0]; - } - let joinedValue = role2add.join(" "); - - let gRole = client.findRole(joinedValue, message); - - if (!gRole) { - return message.channel.send(`<:error:466995152976871434> That role doesn't seem to exist. Try again!`); - }; - - let moderator = message.guild.member(message.author) - if (gRole.position >= moderator.roles.highest.position) { - return message.channel.send( - "<:error:466995152976871434> You cannot give roles higher than your own!" - ); - } - - var bot = message.guild.members.cache.get(client.user.id) - if (gRole.position >= bot.roles.highest.position) { - return message.channel.send( - `<:error:466995152976871434> I cannot give roles higher than my own!` - ); - } - - if (user.roles.cache.has(gRole.id)) { - return message.channel.send( - "<:error:466995152976871434> They already have that role!" - ); - } - - await user.roles.add(gRole.id); - message.channel.send( - `<:success:466995111885144095> Gave \`${user.user.tag}\` the \`${gRole.name}\` role.` - ); - - if (client.getSettings(message.guild.id).modlogsChannel !== "off") { - const channel = message.guild.channels.cache.find( - channel => channel.name === client.getSettings(message.guild.id).modlogsChannel - ); - - if (channel) { - let embed = new Discord.MessageEmbed(); - embed.setColor("#00c09a"); - embed.setAuthor("Role given:", user.user.avatarURL({format: "png", dynamic: true, size: 2048})); - embed.setDescription(`‏‏‎• User: ${user} (${user.user.id})\n‏‏‎• Mod: ${message.author} (${message.author.id})\n‏‏‎• Role: ${gRole}`) - try { - channel.send({ embed }); - } catch (err) { - // probably no permissions to send messages/embeds there - }; - }; - }; - -}; - -exports.conf = { - enabled: true, - guildOnly: true, - aliases: ["addrole"], - permLevel: "Moderator", - requiredPerms: ["MANAGE_ROLES"] -}; - -exports.help = { - name: "giverole", - category: "Moderation", - description: "Gives the user the specified role.", - usage: "giverole [user] [role]" -}; diff --git a/src/commands/goodbye.js b/src/commands/goodbye.js deleted file mode 100644 index f22d1cf..0000000 --- a/src/commands/goodbye.js +++ /dev/null @@ -1,42 +0,0 @@ -exports.run = async (client, message, args, level) => { - - const settings = message.settings; - if (!client.settings.has(message.guild.id)) client.settings.set(message.guild.id, {}); - - if (args[0]) { - const joinedValue = args.join(" "); - if (joinedValue === settings.welcomeMessage) return message.channel.send( - "<:error:466995152976871434> The leave message is already set to that!" - ); - if (!client.settings.has(message.guild.id)) client.settings.set(message.guild.id, {}); - if (joinedValue === "off") { - if (!client.settings.has(message.guild.id)) client.settings.set(message.guild.id, {}); - client.settings.set(message.guild.id, "off", "leaveMessage"); - return message.channel.send(`<:success:466995111885144095> Leave messages have been disabled.`); - } - client.settings.set(message.guild.id, joinedValue, "leaveMessage"); - client.settings.set(message.guild.id, message.channel.id, "welcomeChannel") - message.channel.send(`<:success:466995111885144095> Set the leave message to \`${joinedValue}\``); - } else { - if (settings.leaveMessage === "off") { - message.channel.send(`Leave messages are off.`) - } else { - message.channel.send(`The current leave message is: \`${settings.leaveMessage}\``) - } - } -}; - -exports.conf = { - enabled: true, - guildOnly: true, - aliases: [], - permLevel: "Administrator", - requiredPerms: [] -}; - -exports.help = { - name: "goodbye", - category: "Configure", - description: "Sets the leave message for this server. try using [[server]], [[user]] and [[members]] in your message!", - usage: "goodbye **OR** goodbye off" -}; diff --git a/src/commands/hackban.js b/src/commands/hackban.js deleted file mode 100644 index ff4d1cb..0000000 --- a/src/commands/hackban.js +++ /dev/null @@ -1,60 +0,0 @@ -exports.run = async (client, message, args) => { - const settings = (message.settings = client.getSettings(message.guild.id)); - - if(!args[0]) { - return message.channel.send( - `<:error:466995152976871434> No user ID provided. Usage: \`${client.commands.get(`hackban`).help.usage}\`` - ); - }; - - user = client.users.cache.get(args[0]) - if(!user) { - return message.channel.send("<:error:466995152976871434> Invalid ID") - } - - if(message.guild.member(args[0])) { - if(!message.guild.member(args[0]).bannable) { - return message.channel.send("<:error:466995152976871434> User is not bannable.") - } - } - - let reason = args.slice(1).join(" "); - if (!reason) reason = `Banned by ${message.author.tag}`; - await message.guild.members.ban(args[0], {reason: reason}).catch(console.error); - message.channel.send(`<:success:466995111885144095> Hackbanned \`${user.tag}\``); - - if (settings.modlogsChannel !== "off") { - const channel = message.guild.channels.cache.find( - channel => channel.name === settings.modlogsChannel - ); - - if (channel) { - let embed = new Discord.MessageEmbed(); - embed.setColor("#BC0057"); - embed.setAuthor("User banned!", user.avatarURL({format: "png", dynamic: true, size: 2048})); - embed.setDescription( - `• User: ${user.tag} (${user.id})\n• Mod: ${message.author} (${message.author.id})\n• Reason: ${reason}` - ); - try { - channel.send(embed); - } catch (err) { - // probably no permissions to send messages/embeds there - }; - } - }; -}; - -exports.conf = { - enabled: true, - guildOnly: true, - aliases: [], - permLevel: "Moderator", - requiredPerms: ["BAN_MEMBERS"] -}; - -exports.help = { - name: "hackban", - category: "Moderation", - description: "Ban users who are not in the server.", - usage: "ban [userID] " -}; diff --git a/src/commands/help.js b/src/commands/help.js deleted file mode 100644 index 5c07963..0000000 --- a/src/commands/help.js +++ /dev/null @@ -1,174 +0,0 @@ -exports.run = (client, message, args, level) => { - embed = new Discord.MessageEmbed(); - embed.setColor(client.embedColour(message)); - - var ran = false; - var output = ""; - var commands = 0; - var prefix; - var currentCategory; - - if(message.guild) { - prefix = message.settings.prefix; - } else { - prefix = client.config.defaultSettings.prefix; - }; - - if(!args[0]) { - embed.setTitle(`Command list`); - embed.setDescription(`⁣For more information on a specific command use \`${prefix}help \`\nFor the full command list use \`${prefix}help all\`\n`); - - const myCommands = message.guild ? client.commands.filter( - cmd => client.levelCache[cmd.conf.permLevel] <= level - ) : client.commands.filter( - cmd => client.levelCache[cmd.conf.permLevel] <= level && cmd.conf.guildOnly !== true - ); - - const commandNames = myCommands.keyArray(); - const longest = commandNames.reduce( - (long, str) => Math.max(long, str.length), - 0 - ); - - const sorted = myCommands.array().sort( - (p, c) => p.help.category > c.help.category ? 1 : p.help.name > c.help.name && p.help.category === c.help.category ? 1 : -1 - ); - - sorted.forEach( c => { - const cat = c.help.category; - if (currentCategory !== cat) { - if(ran == true) { - embed.addField(currentCategory + ` [${commands}]`, output) - output = ""; - commands = 0; - } - currentCategory = cat; - ran = true - } - output += `\`${c.help.name}\` `; - commands = commands + 1; - }); - - embed.addField(currentCategory + ` [${commands}]`, output); - - embed.addField( - "Invite me", - "[Click here](https://discordapp.com/oauth2/authorize?client_id=435961704145485835&permissions=8&scope=bot) to add me to your server", - true - ); - embed.addField( - "Support", - "[Click here](https://discord.gg/HCF8mdv) if bot broke", - true - ); - - message.channel.send(embed); - - return; - }; - - if(args[0].toLowerCase() == "all") { - embed.setTitle(`Command list`); - embed.setDescription(`⁣For more information on a specific command use \`${prefix}help \`\nFor the full command list use \`${prefix}help all\`\n`); - - const myCommands = client.commands - - const commandNames = myCommands.keyArray(); - const longest = commandNames.reduce( - (long, str) => Math.max(long, str.length), - 0 - ); - - const sorted = myCommands.array().sort( - (p, c) => p.help.category > c.help.category ? 1 : p.help.name > c.help.name && p.help.category === c.help.category ? 1 : -1 - ); - - sorted.forEach( c => { - const cat = c.help.category; - if (currentCategory !== cat) { - if(ran == true) { - embed.addField(currentCategory + ` [${commands}]`, output) - output = ""; - commands = 0; - } - currentCategory = cat; - ran = true - } - output += `\`${c.help.name}\` `; - commands = commands + 1; - }); - - - embed.addField(currentCategory + ` [${commands}]`, output); - - embed.addField( - "Invite me", - "[Click here](https://discordapp.com/oauth2/authorize?client_id=435961704145485835&permissions=8&scope=bot) to add me to your server", - true - ); - embed.addField( - "Support", - "[Click here](https://discord.gg/HCF8mdv) if bot broke", - true - ); - - message.channel.send(embed); - - return; - }; - - if(args[0]) { - let command = args.shift().toLowerCase(); - let cmd = client.commands.get(command) || client.commands.get(client.aliases.get(command)); - - if(!client.commands.has(command)) { - return message.channel.send("<:error:466995152976871434> That command doesn't exist!") - }; - - command = client.commands.get(command); - - var requiredPerms = ""; - - if(cmd.conf.requiredPerms.length > 0 ) { - requiredPerms = "`" + cmd.conf.requiredPerms.join("`, `") + "`"; - } else { - requiredPerms = "None"; - }; - - var aliases = ""; - - if(cmd.conf.aliases.length > 0 ) { - aliases = "`" + cmd.conf.aliases.join("`, `") + "`"; - } else { - aliases = "None"; - }; - - - - embed.setTitle(prefix + command.help.name); - embed.setDescription( - `• **Description:** ${command.help.description}\n• **Usage:** ${prefix + command.help.usage}\n• **Permission Level:** ${cmd.conf.permLevel} \n• **Guild Only:** ${cmd.conf.guildOnly}\n• **Aliases:** ${aliases}\n• **Required perms:** ${requiredPerms}` - ); - embed.setFooter("Arguments in [] are required, <> are optional."); - - message.channel.send(embed); - - return; - }; -}; - -exports.conf = { - enabled: true, - guildOnly: false, - aliases: ["h", "cmds"], - permLevel: "User", - requiredPerms: ["EMBED_LINKS"] -}; - -exports.help = { - name: "help", - category: "Utility", - description: - "Displays all the commands you are able to use.", - usage: "help **OR** help all" -}; \ No newline at end of file diff --git a/src/commands/hug.js b/src/commands/hug.js deleted file mode 100644 index 30ef214..0000000 --- a/src/commands/hug.js +++ /dev/null @@ -1,69 +0,0 @@ -const API = require('nekos.life'); -const {sfw} = new API(); -exports.run = async (client, message, args) => { - if(!args[0]) { - return message.channel.send(`<:error:466995152976871434> You didn't say who you wanted to hug! Usage: \`${client.commands.get(`hug`).help.usage}\``) - }; - - var people = ""; - - for (var i = 0; i < args.length; i++) { - var user = client.getUserFromMention(args[i]) - if (user) { - user = message.guild.members.cache.get(user.id).displayName; - } else { - users = client.searchForMembers(message.guild, args[i]); - if (users.length > 1) - return message.channel.send( - "<:error:466995152976871434> Found multiple users for `" + args[i] + "`, Please be more specific or mention the user instead." - ); - else if (users.length == 0) - return message.channel.send( - "<:error:466995152976871434> That user doesn't seem to exist. Try again!" - ); - user = users[0].displayName; - }; - if(i+1 == args.length && args.length > 1) { - people += `**and** ${user}!` - } else if(args.length < 2) { - people += `${user}!`; - } else if(args.length == 2 && i == 0) { - people += `${user} `; - } else { - people += `${user}, `; - }; - }; - - - - message.channel.startTyping(); - try { - sfw.hug().then((json) => { - embed = new Discord.MessageEmbed(); - embed.setImage(json.url) - embed.setColor(client.embedColour(message)); - embed.setDescription(`**${message.guild.members.cache.get(message.author.id).displayName}** hugged **${people}**`) - message.channel.send(embed) - message.channel.stopTyping(); - }); - } catch (err) { - client.logger.error("hug.js: " + err); - message.channel.send(`<:error:466995152976871434> An error has occurred: ${err}`) - message.channel.stopTyping(); - }; -}; - -exports.conf = { - enabled: true, - guildOnly: true, - aliases: [], - permLevel: "User", - requiredPerms: ["EMBED_LINKS"] -}; - -exports.help = { - name: "hug", - category: "Action", - description: "Hug someone!", - usage: "hug [@user/user] (you can hug as many people as you want!)" -}; diff --git a/src/commands/identity.js b/src/commands/identity.js deleted file mode 100644 index b7f3809..0000000 --- a/src/commands/identity.js +++ /dev/null @@ -1,36 +0,0 @@ -const identities = require ("../../resources/other/identities.json"); -exports.run = async (client, message, args) => { - var output = ""; - if(!args[0]) { - for (var key of Object.keys(identities)) { - output += `${key}, ` - }; - return message.channel.send(`__**Identities**__\n${output.slice(0, -2)}`); - } else { - if(args.join(" ").toLowerCase() == "attack helicopter" || args.join(" ").toLowerCase() == "apache attack helicopter" || args.join(" ").toLowerCase() == "apache") { - return message.channel.send({ - files: [new Discord.MessageAttachment("./resources/images/attackhelicopter.jpg")] - }); - } - output = identities[args.join(" ").toLowerCase()]; - if(!output) { - return message.channel.send("<:error:466995152976871434> No results for that query."); - }; - return message.channel.send(`__**${output.name.toProperCase()}**__\n${output.description}`); - }; -}; - -exports.conf = { - enabled: true, - guildOnly: false, - aliases: ["identities"], - permLevel: "User", - requiredPerms: [] -}; - -exports.help = { - name: "identity", - category: "Fun", - description: "Gives you information about the specified identity.", - usage: "identity [identity]" -}; diff --git a/src/commands/inspirobot.js b/src/commands/inspirobot.js deleted file mode 100644 index 17a028f..0000000 --- a/src/commands/inspirobot.js +++ /dev/null @@ -1,28 +0,0 @@ -const fetch = require("node-fetch") -exports.run = async (client, message) => { - message.channel.startTyping(); - try { - fetch('http://inspirobot.me/api?generate=true') - .then(res => res.text()) - .then(body => message.channel.send({files: [new Discord.MessageAttachment(body)]})); - message.channel.stopTyping(); - } catch (err) { - message.channel.send(`<:error:466995152976871434> An error has occurred: ${err}`) - message.channel.stopTyping(); - }; -}; - -exports.conf = { - enabled: true, - guildOnly: false, - aliases: ["inspire"], - permLevel: "User", - requiredPerms: [] -}; - -exports.help = { - name: "inspirobot", - category: "Fun", - description: "Returns an inspirational message generated by inspirobot.", - usage: "inspirobot" -}; diff --git a/src/commands/invite.js b/src/commands/invite.js deleted file mode 100644 index 49cdc86..0000000 --- a/src/commands/invite.js +++ /dev/null @@ -1,20 +0,0 @@ -exports.run = async (client, message) => { - message.channel.send( - `Use this link to invite me to your server:\n` - ); -}; - -exports.conf = { - enabled: true, - guildOnly: false, - aliases: [], - permLevel: "User", - requiredPerms: [] -}; - -exports.help = { - name: "invite", - category: "Utility", - description: "Sends you a link so you can add Woomy to your own servers", - usage: "invite" -}; diff --git a/src/commands/kemonomimi.js b/src/commands/kemonomimi.js deleted file mode 100644 index 3c4b70e..0000000 --- a/src/commands/kemonomimi.js +++ /dev/null @@ -1,30 +0,0 @@ -const API = require('nekos.life'); -const {sfw} = new API(); -exports.run = async (client, message) => { - message.channel.startTyping(); - try { - sfw.kemonomimi().then((json) => { - message.channel.send(json.url) - message.channel.stopTyping(); - }); - } catch (err) { - client.logger.error("kemonomimi.js: " + err); - message.channel.send(`<:error:466995152976871434> An error has occurred: ${err}`) - message.channel.stopTyping(); - }; -}; - -exports.conf = { - enabled: true, - guildOnly: false, - aliases: [], - permLevel: "User", - requiredPerms: ["EMBED_LINKS"] -}; - -exports.help = { - name: "kemonomimi", - category: "Image", - description: "Sends you pictures of people with animal characteristics.", - usage: "kemonomimi" -}; diff --git a/src/commands/kick.js b/src/commands/kick.js deleted file mode 100644 index 9070a98..0000000 --- a/src/commands/kick.js +++ /dev/null @@ -1,87 +0,0 @@ -exports.run = async (client, message, args) => { - const settings = client.getSettings(message.guild.id); - - if(!args[0]) { - return message.channel.send("<:error:466995152976871434> Who am I meant to kick?") - } - - let user = message.mentions.members.first(); - - if (!user) { - let users; - users = client.searchForMembers(message.guild, args[0]); - if (users.length > 1) - return message.channel.send( - "<:error:466995152976871434> Found multiple users! Please be more specific or mention the user instead." - ); - else if (users.length == 0) - return message.channel.send( - "<:error:466995152976871434> That user doesn't seem to exist. Try again!" - ); - user = users[0]; - } -if (user.user.id === client.user.id) { - return message.channel.send("lol no") -} -if (user.user.id === message.guild.owner.id) { - return message.channel.send("<:error:466995152976871434> You can't kick the owner!") -} -let moderator = message.guild.member(message.author) -if (user.roles.highest.position >= moderator.roles.highest.position && moderator.user.id !== message.guild.ownerID) { - return message.channel.send( - `<:error:466995152976871434> You can't kick people higher ranked than yourself!` - ); -} - -let bot = message.guild.member(client.user) -if (user.roles.highest.position >= bot.roles.highest.position) { - return message.channel.send( - `<:error:466995152976871434> I can't kick people who are higher ranked than me!` - ); -} - -if (!user.bannable) - return message.channel.send( - "<:error:466995152976871434> Specified user is not bannable." - ); - -let reason = args.slice(1).join(" "); -if (!reason) reason = `Kicked by ${message.author.tag}`; -await user.kick(reason).catch(console.error); -message.channel.send(`<:success:466995111885144095> Kicked \`${user.user.tag}\``); - -if (settings.modlogsChannel !== "off") { - const channel = message.guild.channels.cache.find( - channel => channel.name === settings.modlogsChannel - ); - - if (channel) { - let embed = new Discord.MessageEmbed(); - embed.setColor("#fd0061"); - embed.setAuthor("User kicked!", user.user.avatarURL({format: "png", dynamic: true, size: 2048})); - embed.setDescription( - `• User: ${user.user.tag} (${user.user.id})\n• Mod: ${message.author} (${message.author.id})\n• Reason: ${reason}` - ); - try { - channel.send({ embed }); - } catch (err) { - // probably no permissions to send messages/embeds there - }; - }; -}; -}; - -exports.conf = { - enabled: true, - guildOnly: true, - aliases: [], - permLevel: "Moderator", - requiredPerms: ["KICK_MEMBERS"] -}; - -exports.help = { - name: "kick", - category: "Moderation", - description: "Kicks specified user.", - usage: "kick [user] " -}; diff --git a/src/commands/kiss.js b/src/commands/kiss.js deleted file mode 100644 index 495ee62..0000000 --- a/src/commands/kiss.js +++ /dev/null @@ -1,69 +0,0 @@ -const API = require('nekos.life'); -const {sfw} = new API(); -exports.run = async (client, message, args) => { - if(!args[0]) { - return message.channel.send(`<:error:466995152976871434> You didn't say who you wanted to kiss! Usage: \`${client.commands.get(`kiss`).help.usage}\``) - }; - - var people = ""; - - for (var i = 0; i < args.length; i++) { - var user = client.getUserFromMention(args[i]) - if (user) { - user = message.guild.members.cache.get(user.id).displayName; - } else { - users = client.searchForMembers(message.guild, args[i]); - if (users.length > 1) - return message.channel.send( - "<:error:466995152976871434> Found multiple users for `" + args[i] + "`, Please be more specific or mention the user instead." - ); - else if (users.length == 0) - return message.channel.send( - "<:error:466995152976871434> That user doesn't seem to exist. Try again!" - ); - user = users[0].displayName; - }; - if(i+1 == args.length && args.length > 1) { - people += `**and** ${user}!` - } else if(args.length < 2) { - people += `${user}!`; - } else if(args.length == 2 && i == 0) { - people += `${user} `; - } else { - people += `${user}, `; - }; - }; - - - - message.channel.startTyping(); - try { - sfw.kiss().then((json) => { - embed = new Discord.MessageEmbed(); - embed.setImage(json.url) - embed.setColor(client.embedColour(message)); - embed.setDescription(`**${message.guild.members.cache.get(message.author.id).displayName}** kissed **${people}**`) - message.channel.send(embed) - message.channel.stopTyping(); - }); - } catch (err) { - client.logger.error("kiss.js: " + err); - message.channel.send(`<:error:466995152976871434> An error has occurred: ${err}`) - message.channel.stopTyping(); - }; -}; - -exports.conf = { - enabled: true, - guildOnly: true, - aliases: [], - permLevel: "User", - requiredPerms: ["EMBED_LINKS"] -}; - -exports.help = { - name: "kiss", - category: "Action", - description: "Kiss someone!", - usage: "kiss [@user/user] (you can kiss as many people as you want!)" -}; diff --git a/src/commands/lizard.js b/src/commands/lizard.js deleted file mode 100644 index f476704..0000000 --- a/src/commands/lizard.js +++ /dev/null @@ -1,30 +0,0 @@ -const API = require('nekos.life'); -const {sfw} = new API(); -exports.run = async (client, message) => { - message.channel.startTyping(); - try { - sfw.lizard().then((json) => { - message.channel.send(json.url) - message.channel.stopTyping(); - }); - } catch (err) { - client.logger.error("lizard.js: " + err); - message.channel.send(`<:error:466995152976871434> An error has occurred: ${err}`) - message.channel.stopTyping(); - }; -}; - -exports.conf = { - enabled: true, - guildOnly: true, - aliases: [], - permLevel: "User", - requiredPerms: ["EMBED_LINKS"] -}; - -exports.help = { - name: "lizard", - category: "Image", - description: "Sends pictures of lizards.", - usage: "lizard" -}; diff --git a/src/commands/modlogs.js b/src/commands/modlogs.js deleted file mode 100644 index 3c0c2c0..0000000 --- a/src/commands/modlogs.js +++ /dev/null @@ -1,28 +0,0 @@ -exports.run = async (client, message) => { - const settings = message.settings; - - if (!client.settings.has(message.guild.id)) client.settings.set(message.guild.id, {}); - - if (message.channel.name !== settings.modlogsChannel) { - client.settings.set(message.guild.id, message.channel.name, "modlogsChannel") - message.channel.send(`<:success:466995111885144095> Mod logs will now be displayed in \`${message.channel.name}\``); - } else { - client.settings.set(message.guild.id, "off", "modlogsChannel") - message.channel.send(`<:success:466995111885144095> Mod logging disabled.`); - } -}; - -exports.conf = { - enabled: true, - guildOnly: true, - aliases: [], - permLevel: "Administrator", - requiredPerms: [] -}; - -exports.help = { - name: "modlogs", - category: "Configure", - description: "Enables mod action logging in your server.", - usage: "modlogs **OR** modlogs off" -}; diff --git a/src/commands/modrole.js b/src/commands/modrole.js deleted file mode 100644 index 817d89a..0000000 --- a/src/commands/modrole.js +++ /dev/null @@ -1,61 +0,0 @@ -exports.run = async (client, message, args) => { - - const settings = message.settings; - - if (!client.settings.has(message.guild.id)) { - client.settings.set(message.guild.id, {}); - } - - var modRole = message.guild.roles.cache.get(settings.modRole) - - if (!args[0]) { - if(!modRole) { - return message.channel.send( - "<:error:466995152976871434> There is no mod role set for this server. Please set one using `" + message.settings.prefix + "modrole `" - ) - } else { - message.channel.send(`The current mod role is: \`${modRole.name}\``) - } - - } else { - const joinedValue = args.join(" "); - if (joinedValue.length < 1) { - return message.channel.send( - `<:error:466995152976871434> You didn't specify a role. Usage: \`${client.commands.get(`modrole`).help.usage}\`` - ); - }; - - if (settings.modRole != "None set" && joinedValue === modRole.name) { - return message.channel.send( - "<:error:466995152976871434> The mod role is already set to that!" - ); - }; - - let role = client.findRole(joinedValue, message); - - if (!role) { - return message.channel.send(`<:error:466995152976871434> That role doesn't seem to exist. Try again!`); - }; - - client.settings.set(message.guild.id, role.id, "modRole"); - - message.channel.send( - `<:success:466995111885144095> The mod role has been set to \`${role.name}\` - `); - }; -}; - -exports.conf = { - enabled: true, - guildOnly: true, - aliases: [], - permLevel: "Administrator", - requiredPerms: [] -}; - -exports.help = { - name: "modrole", - category: "Configure", - description: "Sets the mod role for this server.", - usage: "modrole " -}; \ No newline at end of file diff --git a/src/commands/msearch.js b/src/commands/msearch.js deleted file mode 100644 index 876da31..0000000 --- a/src/commands/msearch.js +++ /dev/null @@ -1,39 +0,0 @@ -exports.run = (client, message, args) => { - if (!args[0]) - return message.channel.send( - `<:error:466995152976871434> No username provided. Usage: \`${client.commands.get(``).help.usage}\`` - ); - var mlist = ""; - var count = 0; - client.searchForMembers(message.guild, args[0]).forEach((member) => { - if (member) { - mlist += `\`${member.user.tag}\``; - count = count + 1; - } - mlist += "**, **"; - }); - mlist = mlist.substring(0, mlist.length - 6); - - var mlist1 = `Found ${count} users:\n` + mlist; - - if (!mlist1) { - return message.channel.send("<:error:466995152976871434> No users found!"); - } - - message.channel.send(mlist1); -}; - -exports.conf = { - enabled: true, - guildOnly: true, - aliases: [], - permLevel: "User", - requiredPerms: [] -}; - -exports.help = { - name: "msearch", - category: "Utility", - description: "Search for server members.", - usage: "msearch [user]" -}; \ No newline at end of file diff --git a/src/commands/mute.js b/src/commands/mute.js deleted file mode 100644 index a52e7c5..0000000 --- a/src/commands/mute.js +++ /dev/null @@ -1,114 +0,0 @@ -exports.run = async (client, message, [args, ...reason], level) => { - const settings = message.settings; - - if(!args) { - return message.channel.send("<:error:466995152976871434> Who am I meant to mute?") - } - let user = message.mentions.members.first(); - let users; - if (!user) { - users = client.searchForMembers(message.guild, args); - if (users.length > 1) - return message.channel.send( - "<:error:466995152976871434> Found multiple users! Please be more specific or mention the user instead." - ); - else if (users.length == 0) - return message.channel.send( - "<:error:466995152976871434> That user doesn't seem to exist. Try again!" - ); - user = users[0]; - }; - - if (user.user.id === message.guild.ownerID) { - return message.channel.send("<:error:466995152976871434> You can't mute the owner!") - }; - - let moderator = message.guild.member(message.author) - if (message.settings.mutedRole.position >= moderator.roles.highest.position && level < 2) { - return message.channel.send( - "<:error:466995152976871434> The muted role is positioned above the moderator role! Please move the muted role below the moderator role." - ); - }; - if (user.roles.highest.position >= moderator.roles.highest.position && moderator.user.id !== message.guild.ownerID) { - return message.channel.send( - `<:error:466995152976871434> You can't mute people who have a higher role than you!` - ); - }; - - let bot = message.guild.member(client.user) - - if (user.roles.highest.position >= bot.roles.highest.position) { - return message.channel.send( - `<:error:466995152976871434> I can't mute people who have a higher role than me!` - ); - } - - var role = message.guild.roles.cache.get(settings.mutedRole); - - if (!role) { - return message.channel.send( - "<:error:466995152976871434> There is no muted role set for this server. Please set one using `" + message.settings.prefix + "mutedrole ` before using this command." - ); - }; - - if (bot.roles.highest.position <= role.position) { - return message.channel.send( - "<:error:466995152976871434> The muted role is above my highest role! Please move the muted role below my highest role." - ); - }; - - message.guild.channels.cache.forEach(async (channel, id) => { - await channel.updateOverwrite(role, { - SEND_MESSAGES: false, - ADD_REACTIONS: false - }); - }); - - if (user.roles.cache.has(role.id)) { - return message.channel.send("<:error:466995152976871434> They're already muted!") - } - - await user.roles.add(role.id); - message.channel.send(`<:success:466995111885144095> Muted \`${user.user.tag}\``) - - var muteReason = reason.join(" "); - - if(muteReason.length == 0) { - muteReason = "**No reason provided.**" - } - - if (settings.modlogsChannel !== "off") { - const channel = message.guild.channels.cache.find( - channel => channel.name === settings.modlogsChannel - ); - - if (channel) { - let embed = new Discord.MessageEmbed(); - embed.setColor("#a652bb"); - embed.setAuthor("User muted!", user.user.avatarURL({format: "png", dynamic: true, size: 2048})); - embed.setDescription( - `• User: ${user} (${user.user.id})\n• Mod: ${message.author} (${message.author.id})\n• Reason: ${muteReason}` - ); - try { - channel.send(embed); - } catch (err) { - // probably no permissions to send messages/embeds there - } - } - } -}; - -exports.conf = { - enabled: true, - guildOnly: true, - aliases: [], - permLevel: "Moderator", - requiredPerms: ["MANAGE_ROLES", "MANAGE_CHANNELS"] -}; - -exports.help = { - name: "mute", - category: "Moderation", - description: "Prevents the specified user from typing.", - usage: "mute [member] " -}; diff --git a/src/commands/mutedrole.js b/src/commands/mutedrole.js deleted file mode 100644 index 1757efd..0000000 --- a/src/commands/mutedrole.js +++ /dev/null @@ -1,61 +0,0 @@ -exports.run = async (client, message, args) => { - - const settings = message.settings; - - if (!client.settings.has(message.guild.id)) { - client.settings.set(message.guild.id, {}); - } - - var mutedRole = message.guild.roles.cache.get(settings.mutedRole) - - if (!args[0]) { - if(!mutedRole) { - return message.channel.send( - "<:error:466995152976871434> There is no muted role set for this server. Please set one using `" + message.settings.prefix + "mutedrole `" - ) - } else { - message.channel.send(`The current muted role is: \`${mutedRole.name}\``) - } - - } else { - const joinedValue = args.join(" "); - if (joinedValue.length < 1) { - return message.channel.send( - `<:error:466995152976871434> You didn't specify a role. Usage: \`${client.commands.get(`mutedrole`).help.usage}\`` - ); - }; - - if (settings.mutedRole != "None set" && joinedValue === mutedRole.name) { - return message.channel.send( - "<:error:466995152976871434> The muted role is already set to that!" - ); - }; - - let role = client.findRole(joinedValue, message); - - if (!role) { - return message.channel.send(`<:error:466995152976871434> That role doesn't seem to exist. Try again!`); - }; - - client.settings.set(message.guild.id, role.id, "mutedRole"); - - message.channel.send( - `<:success:466995111885144095> The muted role has been set to \`${role.name}\` - `); - }; -}; - -exports.conf = { - enabled: true, - guildOnly: true, - aliases: [], - permLevel: "Administrator", - requiredPerms: [] -}; - -exports.help = { - name: "mutedrole", - category: "Configure", - description: "Sets the muted role for this server.", - usage: "mutedrole [role]" -}; diff --git a/src/commands/neko.js b/src/commands/neko.js deleted file mode 100644 index 7ce0d6b..0000000 --- a/src/commands/neko.js +++ /dev/null @@ -1,30 +0,0 @@ -const API = require('nekos.life'); -const {sfw} = new API(); -exports.run = async (client, message) => { - message.channel.startTyping(); - try { - sfw.neko().then((json) => { - message.channel.send(json.url); - message.channel.stopTyping(); - }); - } catch (err) { - client.logger.error("neko.js: " + err); - message.channel.send(`<:error:466995152976871434> An error has occurred: ${err}`) - message.channel.stopTyping(); - }; -}; - -exports.conf = { - enabled: true, - guildOnly: false, - aliases: ["catgirl"], - permLevel: "User", - requiredPerms: ["EMBED_LINKS"] -}; - -exports.help = { - name: "neko", - category: "Image", - description: "Sends you pictures of catgirls.", - usage: "neko" -}; diff --git a/src/commands/nekogif.js b/src/commands/nekogif.js deleted file mode 100644 index 0df6917..0000000 --- a/src/commands/nekogif.js +++ /dev/null @@ -1,30 +0,0 @@ -const API = require('nekos.life'); -const {sfw} = new API(); -exports.run = async (client, message) => { - message.channel.startTyping(); - try { - sfw.nekoGif().then((json) => { - message.channel.send(json.url); - message.channel.stopTyping(); - }); - } catch (err) { - client.logger.error("nekogif.js: " + err); - message.channel.send(`<:error:466995152976871434> An error has occurred: ${err}`) - message.channel.stopTyping(); - }; -}; - -exports.conf = { - enabled: true, - guildOnly: false, - aliases: ["catgirlgif"], - permLevel: "User", - requiredPerms: ["EMBED_LINKS"] -}; - -exports.help = { - name: "nekogif", - category: "Image", - description: "Sends you gifs of catgirls.", - usage: "nekogif" -}; diff --git a/src/commands/nowplaying.js b/src/commands/nowplaying.js deleted file mode 100644 index e94f71a..0000000 --- a/src/commands/nowplaying.js +++ /dev/null @@ -1,44 +0,0 @@ -const Discord = require("discord.js"); -exports.run = async (client, message) => { - let guild = client.music.getGuild(message.guild.id); - - if(guild.queue.length < 1) { - return message.channel.send("<:error:466995152976871434> Nothing is playing."); - } - - var song = guild.queue[0]; - var elapsedTime = client.createTimestamp(guild.dispatcher.streamTime / 1000); - var timestamp; - - if(song.duration == 0) { - timestamp = "`[LIVE]`"; - } else { - timestamp = `\`[${elapsedTime + "/" + client.createTimestamp(song.duration)}]\``; - }; - - embed = new Discord.MessageEmbed(); - embed.setTitle("Now playing:") - embed.setThumbnail(song.thumbnail) - embed.setColor(client.embedColour(message)); - embed.setDescription(`**[${song.title}](https://www.youtube.com/watch?v=${song.id})**`) - embed.addField("Channel:", song.author, true) - embed.addField("Time:", timestamp, true) - embed.setFooter("Requested by " + song.requestedBy.tag, song.requestedBy.avatarURL({format: "png", dynamic: true, size: 2048})) - - message.channel.send(embed) -}; - -exports.conf = { - enabled: true, - guildOnly: true, - aliases: ["np"], - permLevel: "User", - requiredPerms: ["EMBED_LINKS"] -}; - -exports.help = { - name: "nowplaying", - category: "Music", - description: "Shows details about the currently playing song.", - usage: "nowplaying" -}; diff --git a/src/commands/owoify.js b/src/commands/owoify.js deleted file mode 100644 index 9587a6f..0000000 --- a/src/commands/owoify.js +++ /dev/null @@ -1,35 +0,0 @@ -// totally not stolen from https://github.com/GmdDjca/Hitomi-Manaka -exports.run = (client, message, args) => { - if (!args[0]) { - return message.channel.send(`<:error:466995152976871434> pwease incwude some text fow me to owoify UwU`) - } - const faces = ['(・`ω´・)', 'x3', 'owo', 'UwU', '>w<', '^w^'] - owoified = `${args.join(' ')}`.replace(/(?:r|l)/g, 'w') - owoified = owoified.replace(/(?:R|L)/g, 'W') - owoified = owoified.replace(/n([aeiou])/g, 'ny$1') - owoified = owoified.replace(/N([aeiou])/g, 'Ny$1') - owoified = owoified.replace(/N([AEIOU])/g, 'Ny$1') - owoified = owoified.replace(/ove/g, 'uv') - owoified = owoified.replace(/!+/g, ' ' + faces[~~(Math.random() * faces.length)] + ' ') - - if(owoified.length > 2000) { - owoified = owoified.slice(0, -Math.abs(owoified.length - 2000)) - }; - -message.channel.send(owoified) -}; - -exports.conf = { - enabled: true, - guildOnly: false, - aliases: [], - permLevel: "User", - requiredPerms: [] -}; - -exports.help = { - name: "owoify", - category: "Fun", - description: "Makes nyowmal tewxt owo'ed x3", - usage: "owoify [message]" -}; diff --git a/src/commands/pat.js b/src/commands/pat.js deleted file mode 100644 index fee469b..0000000 --- a/src/commands/pat.js +++ /dev/null @@ -1,69 +0,0 @@ -const API = require('nekos.life'); -const {sfw} = new API(); -exports.run = async (client, message, args) => { - if(!args[0]) { - return message.channel.send(`<:error:466995152976871434> You didn't say who you wanted to pat! Usage: \`${client.commands.get(`pat`).help.usage}\``) - }; - - var people = ""; - - for (var i = 0; i < args.length; i++) { - var user = client.getUserFromMention(args[i]) - if (user) { - user = message.guild.members.cache.get(user.id).displayName; - } else { - users = client.searchForMembers(message.guild, args[i]); - if (users.length > 1) - return message.channel.send( - "<:error:466995152976871434> Found multiple users for `" + args[i] + "`, Please be more specific or mention the user instead." - ); - else if (users.length == 0) - return message.channel.send( - "<:error:466995152976871434> That user doesn't seem to exist. Try again!" - ); - user = users[0].displayName; - }; - if(i+1 == args.length && args.length > 1) { - people += `**and** ${user}!` - } else if(args.length < 2) { - people += `${user}!`; - } else if(args.length == 2 && i == 0) { - people += `${user} `; - } else { - people += `${user}, `; - }; - }; - - - - message.channel.startTyping(); - try { - sfw.pat().then((json) => { - embed = new Discord.MessageEmbed(); - embed.setImage(json.url) - embed.setColor(client.embedColour(message)); - embed.setDescription(`**${message.guild.members.cache.get(message.author.id).displayName}** patted **${people}**`) - message.channel.send(embed) - message.channel.stopTyping(); - }); - } catch (err) { - client.logger.error("pat.js: " + err); - message.channel.send(`<:error:466995152976871434> An error has occurred: ${err}`) - message.channel.stopTyping(); - }; -}; - -exports.conf = { - enabled: true, - guildOnly: true, - aliases: ["headpat"], - permLevel: "User", - requiredPerms: ["EMBED_LINKS"] -}; - -exports.help = { - name: "pat", - category: "Action", - description: "pat someone!", - usage: "pat [@user/user] (you can pat as many people as you want!)" -}; diff --git a/src/commands/pause.js b/src/commands/pause.js deleted file mode 100644 index 2816baf..0000000 --- a/src/commands/pause.js +++ /dev/null @@ -1,30 +0,0 @@ -exports.run = (client, message, args, level) => { - let guild = client.music.getGuild(message.guild.id); - if(guild.queue.length < 1) { - return message.channel.send("<:error:466995152976871434> Nothing is playing."); - }; - - guild.playing = false; - guild.paused = true; - guild.dispatcher.pause(); - message.channel.send("<:pause:467639357961142273> Playback paused!"); - - -}; - -exports.conf = { - enabled: true, - guildOnly: true, - aliases: [], - permLevel: "Moderator", - requiredPerms: ["CONNECT", "SPEAK"] -}; - -exports.help = { - name: "pause", - category: "Music", - description: "Pauses music playback.", - usage: "pause" -}; - - diff --git a/src/commands/permlevel.js b/src/commands/permlevel.js deleted file mode 100644 index 5d41034..0000000 --- a/src/commands/permlevel.js +++ /dev/null @@ -1,19 +0,0 @@ -exports.run = async (client, message, args, level) => { - const friendly = client.config.permLevels.find(l => l.level === level).name; - message.reply(`Your permission level is: ${level} - ${friendly}`); -}; - -exports.conf = { - enabled: true, - guildOnly: false, - aliases: ["plevel"], - permLevel: "User", - requiredPerms: [] -}; - -exports.help = { - name: "permlevel", - category: "Utility", - description: "Tells you your permission level for that server.", - usage: "permlevel" -}; diff --git a/src/commands/ping.js b/src/commands/ping.js deleted file mode 100644 index 6f6d674..0000000 --- a/src/commands/ping.js +++ /dev/null @@ -1,21 +0,0 @@ -exports.run = async (client, message) => { - const msg = await message.channel.send("⏱️ Please wait..."); - msg.edit( - `:ping_pong: Pong! Latency is ${msg.createdTimestamp - message.createdTimestamp}ms, API Latency is ${Math.round(client.ws.ping)}ms` - ); -}; - -exports.conf = { - enabled: true, - guildOnly: false, - aliases: [], - permLevel: "User", - requiredPerms: [] -}; - -exports.help = { - name: "ping", - category: "Utility", - description: "Displays bot latency in miliseconds.", - usage: "ping" -}; diff --git a/src/commands/play.js b/src/commands/play.js deleted file mode 100644 index d9c8866..0000000 --- a/src/commands/play.js +++ /dev/null @@ -1,33 +0,0 @@ -const util = require("util") -const Discord = require("discord.js") - -module.exports.run = (client, message, args, level) =>{ - if(!args[0]) - { - message.channel.send(`<:error:466995152976871434> You didn't give me a song to play! Usage: \`${client.commands.get(`play`).help.usage}\``); - - return; - } - - let voiceChannel = message.member.voice.channel; - if(!voiceChannel) return message.channel.send('<:error:466995152976871434> You need to be in a voice channel to use this command!'); - - message.channel.send(`🔎 searching YouTube for \`${args.join(" ")}\``); - - client.music.play(message, args.join(" ")); -} - -exports.conf = { - enabled: true, - guildOnly: true, - aliases: ["p"], - permLevel: "User", - requiredPerms: ["CONNECT", "SPEAK"] -}; - -exports.help = { - name: "play", - category: "Music", - description: "Plays a song.", - usage: "play [youtube-url] **OR** play [song-name]" -}; diff --git a/src/commands/poke.js b/src/commands/poke.js deleted file mode 100644 index 07c48bc..0000000 --- a/src/commands/poke.js +++ /dev/null @@ -1,69 +0,0 @@ -const API = require('nekos.life'); -const {sfw} = new API(); -exports.run = async (client, message, args) => { - if(!args[0]) { - return message.channel.send(`<:error:466995152976871434> You didn't say who you wanted to poke! Usage: \`${client.commands.get(`poke`).help.usage}\``) - }; - - var people = ""; - - for (var i = 0; i < args.length; i++) { - var user = client.getUserFromMention(args[i]) - if (user) { - user = message.guild.members.cache.get(user.id).displayName; - } else { - users = client.searchForMembers(message.guild, args[i]); - if (users.length > 1) - return message.channel.send( - "<:error:466995152976871434> Found multiple users for `" + args[i] + "`, Please be more specific or mention the user instead." - ); - else if (users.length == 0) - return message.channel.send( - "<:error:466995152976871434> That user doesn't seem to exist. Try again!" - ); - user = users[0].displayName; - }; - if(i+1 == args.length && args.length > 1) { - people += `**and** ${user}!` - } else if(args.length < 2) { - people += `${user}!`; - } else if(args.length == 2 && i == 0) { - people += `${user} `; - } else { - people += `${user}, `; - }; - }; - - - - message.channel.startTyping(); - try { - sfw.poke().then((json) => { - embed = new Discord.MessageEmbed(); - embed.setImage(json.url) - embed.setColor(client.embedColour(message)); - embed.setDescription(`**${message.guild.members.cache.get(message.author.id).displayName}** poked **${people}**`) - message.channel.send(embed) - message.channel.stopTyping(); - }); - } catch (err) { - client.logger.error("poke.js: " + err); - message.channel.send(`<:error:466995152976871434> An error has occurred: ${err}`) - message.channel.stopTyping(); - }; -}; - -exports.conf = { - enabled: true, - guildOnly: true, - aliases: [], - permLevel: "User", - requiredPerms: ["EMBED_LINKS"] -}; - -exports.help = { - name: "poke", - category: "Action", - description: "poke someone!", - usage: "poke [@user/user] (you can poke as many people as you want!)" -}; diff --git a/src/commands/prefix.js b/src/commands/prefix.js deleted file mode 100644 index 1d72e74..0000000 --- a/src/commands/prefix.js +++ /dev/null @@ -1,30 +0,0 @@ -exports.run = async (client, message, args) => { - const settings = message.settings; - - if (!client.settings.has(message.guild.id)) client.settings.set(message.guild.id, {}); - - if (args[0]) { - const joinedValue = args.join(" "); - if (joinedValue === settings.prefix) return message.channel.send("<:error:466995152976871434> The prefix is already set to that!"); - if (!client.settings.has(message.guild.id)) client.settings.set(message.guild.id, {}); - client.settings.set(message.guild.id, joinedValue, "prefix"); - message.channel.send(`<:success:466995111885144095> Set the prefix to \`${joinedValue}\``); - } else { - message.channel.send(`The current prefix is: \`${settings.prefix}\``) - } -} - -exports.conf = { - enabled: true, - guildOnly: true, - aliases: [], - permLevel: "Administrator", - requiredPerms: [] -}; - -exports.help = { - name: "prefix", - category: "Configure", - description: "Sets the prefix for this server.", - usage: "prefix [prefix]" -}; diff --git a/src/commands/pronoun.js b/src/commands/pronoun.js deleted file mode 100644 index 0d4b36a..0000000 --- a/src/commands/pronoun.js +++ /dev/null @@ -1,36 +0,0 @@ -const pronouns = require ("../../resources/other/pronouns.json"); -exports.run = async (client, message, args) => { - var output = ""; - if(!args[0]) { - for (var key of Object.keys(pronouns)) { - output += `${key}, ` - }; - return message.channel.send(`__**Pronouns:**__\n${output.slice(0, -2)}`); - } else { - if(args.join(" ").toLowerCase() == "attack helicopter" || args.join(" ").toLowerCase() == "apache attack helicopter" || args.join(" ").toLowerCase() == "apache") { - return message.channel.send({ - files: [new Discord.MessageAttachment("./resources/images/attackhelicopter.jpg")] - }); - }; - output = pronouns[args.join(" ").toLowerCase()]; - if(!output) { - return message.channel.send("<:error:466995152976871434> No results for that query."); - }; - return message.channel.send(`__**Example sentences using ${output.name}:**__\n${output.examples}`); - }; -}; - -exports.conf = { - enabled: true, - guildOnly: false, - aliases: ["pronouns"], - permLevel: "User", - requiredPerms: [] -}; - -exports.help = { - name: "pronoun", - category: "Fun", - description: "Gives you information on how to use the specified pronoun.", - usage: "pronoun [pronoun]" -}; diff --git a/src/commands/purge.js b/src/commands/purge.js deleted file mode 100644 index 79cf320..0000000 --- a/src/commands/purge.js +++ /dev/null @@ -1,60 +0,0 @@ -exports.run = async (client, message, args, level) => { - const settings = message.settings; - - if(message.channel.name === settings.chatlogsChannel) { - return message.channel.send("<:error:466995152976871434> Can't purge logs.") - } - - if(message.channel.name === settings.modlogsChannel) { - return message.channel.send("<:error:466995152976871434> Can't purge logs.") - } - const amount = !!parseInt(message.content.split(' ')[1]) ? parseInt(message.content.split(' ')[1]) : parseInt(message.content.split(' ')[2]) - if(amount > 100) { - return message.channel.send("<:error:466995152976871434> Can only purge a maximum of 100 messages!") - } - - if (!amount) return message.channel.send( - '<:error:466995152976871434> You didn\'t tell me how many messages to purge. Usage: \`' + client.commands.get(`purge`).help.usage + "`" - ); - - await message.delete().catch(O_o => {}); - - message.channel.messages.fetch({ - limit: amount, - }).then((messages) => { - message.channel.bulkDelete(messages, true).catch(console.error); - message.channel.send(`<:success:466995111885144095> Purged ${amount} messages!`).then(m => m.delete({timeout: 5000})); - }); - - if (settings.modlogsChannel !== "off") { - const channel = message.guild.channels.cache.find( - channel => channel.name === settings.modlogsChannel - ); - - if (channel) { - let embed = new Discord.MessageEmbed(); - embed.setColor("#a62019"); - embed.setAuthor(`${amount} messages purged!`, message.author.avatarURL({format: "png", dynamic: true, size: 2048})); - embed.setDescription(`• Channel: ${message.channel.name} (${message.channel.id})\n• Mod: ${message.author} (${message.author.id})\n• Amount: \`${amount}\``) - try { - channel.send({ embed }); - } catch (err) { - }; - }; - }; -}; - -exports.conf = { - enabled: true, - guildOnly: true, - aliases: [], - permLevel: "Moderator", - requiredPerms: ["MANAGE_MESSAGES"] -}; - -exports.help = { - name: "purge", - category: "Moderation", - description: "Bulk deletes messages. **cannot delete messages older than 14 days.**", - usage: "purge [amount]" -}; diff --git a/src/commands/queue.js b/src/commands/queue.js deleted file mode 100644 index 0bdc87e..0000000 --- a/src/commands/queue.js +++ /dev/null @@ -1,183 +0,0 @@ -'use strict'; - -const Discord = require("discord.js"); -exports.run = (client, message, args) => { - var queue = client.music.getGuild(message.guild.id).queue; - - if(queue.length < 1) { - return message.channel.send("<:error:466995152976871434> Nothing is playing."); - } - - let lists = []; - - function generateList(start, number) { - var list = ""; - var timestamp; - var livestream; - - if(start == 1 && queue.length == 1) { - return ["There's nothing else waiting to be played!", 1]; - } - - if(number == 1 && queue.length + 1 < start) { - return false; - }; - - let q = queue.slice(start); - - let i = 0; - - for(i = 0; i < q.length; i++) { - let song = q[i]; - - if(song.duration == 0) { - timestamp = "LIVE"; - livestream = true; - } else { - timestamp = client.createTimestamp(song.duration); - }; - - let aaa = list + `\`${(i + 1) + start - 1}:\` **[${song.title}](https://www.youtube.com/watch?v=${song.id})** added by ${song.requestedBy} \`[${timestamp}]\`\n`; - - if(aaa.length > 1024) { - return [list, start + i - 1]; - } else { - list = aaa; - } - - //totalDuration = totalDuration + song.duration; - }; - - return [list, start + i + 1]; - }; - - let songsInQueue = queue.length - 1; - let songsInQueueEnglish = "song"; - let timeRemaining = 0; - - function generatePage(list, page) { - if(!list || list == "") { - return false; - } - - var embed = new Discord.MessageEmbed(); - embed.setTitle(`Queue for: ${message.guild.name}`); - embed.setColor(client.embedColour(message)); - - var elapsedTime = client.music.getGuild(message.guild.id).dispatcher.streamTime / 1000 - var totalDuration = queue[0].duration - elapsedTime; - - let timeRemaining = ""; - - for(let i = 1; i < queue.length; i++) { - let b = queue[i]; - - if(b.duration == 0) { - timeRemaining = "∞"; - - break; - } - - totalDuration += b.duration; - } - - if(timeRemaining == "") { - let queueDuration = client.createTimestamp(totalDuration); - - timeRemaining = queueDuration; - } - - let timestamp; - - if(queue[0].duration == 0) { - timestamp = "LIVE"; - livestream = true; - } else { - timestamp = client.createTimestamp(elapsedTime) + '/' + client.createTimestamp(queue[0].duration); - }; - - embed.addField(`Now playing:`, `**[${queue[0].title}](https://www.youtube.com/watch?v=${queue[0].id})** added by ${queue[0].requestedBy} \`[${timestamp}]\``) - - embed.addField(`Up next:`, list); - - if(songsInQueue > 1 || songsInQueue == 0) { - songsInQueueEnglish = "songs"; - } - - embed.setFooter(`Page ${page}/${lists.length} | ${songsInQueue + " " + songsInQueueEnglish} in queue | ${timeRemaining} time remaining`); - - return embed; - }; - - var myMessage = null; - - function displayPage(number) { - let page = generatePage(lists[number - 1], number); - - if(page) { - if(myMessage) { - myMessage.edit(page); - } else { - myMessage = message.channel.send(page); - } - - return true; - } else { - return false; - } - }; - - function aFunction(start) { - // start - index of song, which we should start with - // end - index of song, which we ended with - - let [list, end] = generateList(start, lists.length + 1); - - if(list && list != "") { - lists.push(list); - - if(queue[end + 1]) { - aFunction(end + 1); - } - } - }; - - aFunction(1); - - let page = 1; - - if(args[0]) { - let userPage = Number(args[0]); - - if(userPage) { - page = userPage; - } else { - return message.channel.send( - `<:error:466995152976871434> Invalid page. Usage: \`${client.commands.get(`queue`).help.usage}\`` - ); - } - }; - - if(displayPage(page)) { - - } else { - return message.channel.send( - `<:error:466995152976871434> Page ${page} doesn't exist!` - ); - } -}; - -exports.conf = { - enabled: true, - guildOnly: true, - aliases: [], - permLevel: "User", - requiredPerms: [] -}; - -exports.help = { - name: "queue", - category: "Music", - description: "Displays what songs are in the queue.", - usage: "queue " -}; diff --git a/src/commands/raidmode.js b/src/commands/raidmode.js deleted file mode 100644 index 68a70ec..0000000 --- a/src/commands/raidmode.js +++ /dev/null @@ -1,70 +0,0 @@ -const Discord = require("discord.js") -exports.run = async (client, message, args, level) => { - - const settings = message.settings; - const defaults = client.config.defaultSettings; - const overrides = client.settings.get(message.guild.id); - if (!client.settings.has(message.guild.id)) client.settings.set(message.guild.id, {}); - - var raidToggle; - var embColour; - var mutedRole = message.guild.roles.cache.get(settings.mutedRole) - - if(!mutedRole) { - return message.channel.send( - "<:error:466995152976871434> This command requires a muted role to be set! Please ask an admin or the owner to set this with `" + message.settings.prefix + "mutedrole `" - ) - } - if(args[0] == "strict") { - client.settings.set(message.guild.id, "on", "raidModeStrict"); - client.settings.set(message.guild.id, "on", "raidMode"); - message.channel.send(`<:success:466995111885144095> Strict raid mode enabled! New users will now be automatically kicked.`); - raidToggle = "Strict raid mode activated!" - embColour = "#777B7E" - } else { - if (settings.raidMode === "off") { - client.settings.set(message.guild.id, "on", "raidMode") - message.channel.send(`<:success:466995111885144095> Raid mode enabled! New users will now be automatically muted.`); - raidToggle = "Raid mode activated!" - embColour = "#777B7E" - } else { - client.settings.set(message.guild.id, "off", "raidMode") - client.settings.set(message.guild.id, "off", "raidModeStrict"); - message.channel.send(`<:success:466995111885144095> Raid mode disabled.`); - raidToggle = "Raid mode deactivated!" - embColour = "#48494b" - }; -}; - if (settings.modlogsChannel !== "off") { - const channel = message.guild.channels.cache.find( - channel => channel.name === settings.modlogsChannel - ); - - if (channel) { - let embed = new Discord.MessageEmbed(); - embed.setColor(embColour); - embed.setAuthor(raidToggle, message.author.avatarURL({format: "png", dynamic: true, size: 2048})); - embed.setDescription(`• Mod: ${message.author} (${message.author.id})`) - try { - channel.send({ embed }); - } catch (err) { - // probably no permissions to send messages/embeds there - } - } - } -}; - -exports.conf = { - enabled: true, - guildOnly: true, - aliases: [], - permLevel: "Administrator", - requiredPerms: ["MANAGE_ROLES", "KICK_MEMBERS"] -}; - -exports.help = { - name: "raidmode", - category: "Moderation", - description: "Enables/disables raid mode in your server, which automatically mutes new members. Strict raidmode automatically kicks new members.", - usage: "raidmode **OR** raidmode strict" -}; diff --git a/src/commands/randurban.js b/src/commands/randurban.js deleted file mode 100644 index 1a6a42b..0000000 --- a/src/commands/randurban.js +++ /dev/null @@ -1,41 +0,0 @@ -const urban = require("urban"); -exports.run = (client, message) => { - urban.random().first(json => { - if(message.channel.nsfw === false) return message.channel.send( - "<:error:466995152976871434> This command can only be executed in channels marked as NSFW!" - ); - if(json.definition.length > 2000) return message.channel.send( - `<:error:466995152976871434> Definition cannot exceed 2000 characters! Use this link instead: ${json.permalink}` - ); - if(json.example.length > 2000) return message.channel.send( - "<:error:466995152976871434> Example cannot exceed 2000 characters!" - ); - - embed = new Discord.MessageEmbed() - .setTitle(json.word) - .setURL(json.permalink) - .setColor("#EFFF00") - .setDescription(json.definition || "None") - .addField("Example", json.example || "None") - .addField("Upvotes", json.thumbs_up, true) - .addField("Downvotes", json.thumbs_down, true) - .setFooter(`Submitted by ${json.author}`) - message.channel.send(embed); - - }); -} - -exports.conf = { - enabled: true, - guildOnly: false, - aliases: ["rurban"], - permLevel: "User", - requiredPerms: [] -}; - -exports.help = { - name: "randurban", - category: "Fun", - description: "Grabs a random definition from the Urban Dictonary.", - usage: "randurban" -}; diff --git a/src/commands/rate.js b/src/commands/rate.js deleted file mode 100644 index d4f0eac..0000000 --- a/src/commands/rate.js +++ /dev/null @@ -1,36 +0,0 @@ -exports.run = async (client, message, args) => { - if (!args[0]) - return message.channel.send( - `<:error:466995152976871434> What am I meant to rate? Usage: \`${client.commands.get(`rate`).help.usage}\`` - ); -var rating = [ - "0/10", - "1/10", - "2/10", - "3/10", - "4/10", - "5/10", - "6/10", - "7/10", - "8/10", - "9/10", - "10/10" -]; - let mess = rating.random(); - message.channel.send(`<:star:618393201501536258> I give ${args.join(" ")} a **${mess}**`); -}; - -exports.conf = { - enabled: true, - guildOnly: false, - aliases: [], - permLevel: "User", - requiredPerms: [] -}; - -exports.help = { - name: "rate", - category: "Fun", - description: "Gives something a rating from 0-10", - usage: "rate [thing]" -}; \ No newline at end of file diff --git a/src/commands/reload.js b/src/commands/reload.js deleted file mode 100644 index 8cefd15..0000000 --- a/src/commands/reload.js +++ /dev/null @@ -1,28 +0,0 @@ -exports.run = async (client, message, args) => {// eslint-disable-line no-unused-vars - if (!args || args.length < 1) return message.channel.send( - `<:error:466995152976871434> You must provide a command to reload! Usage: \`${client.commands.get(`reload`).help.usage}\`` - ); - - let response = await client.unloadCommand(args[0]); - if (response) return message.channel.send(`<:error:466995152976871434> Error unloading: ${response}`); - - response = client.loadCommand(args[0]); - if (response) return message.channel.send(`<:error:466995152976871434> Error loading: ${response}`); - - message.channel.send(`<:success:466995111885144095> \`${args[0]}\` has been reloaded!`); -}; - -exports.conf = { - enabled: true, - guildOnly: false, - aliases: [], - permLevel: "Developer", - requiredPerms: [] -}; - -exports.help = { - name: "reload", - category: "Owner", - description: "Reloads the specified command.", - usage: "reload [command]" -}; diff --git a/src/commands/removesong.js b/src/commands/removesong.js deleted file mode 100644 index d576c7d..0000000 --- a/src/commands/removesong.js +++ /dev/null @@ -1,49 +0,0 @@ -const util = require("util") -const Discord = require("discord.js") - -module.exports.run = (client, message, args, level) =>{ - var queue = client.music.getGuild(message.guild.id).queue; - - if(queue.length < 2) { - return message.channel.send(`<:error:466995152976871434> Not enough songs are in the queue for this command to work!`); - } - - if(!args[0]) { - return message.channel.send(`<:error:466995152976871434> You didn't tell me what song to remove! Usage: \`${client.commands.get(`removesong`).help.usage}\``); - }; - - var input = +args[0]; - - if(isNaN(input) == true) { - return message.channel.send(`<:error:466995152976871434> That isn't a number! You need to tell me the songs position in the queue (1, 2, etc.)`); - }; - - if(input >= queue.length) { - return message.channel.send("Invalid (too large)"); - }; - - if(input < 1) { - return message.channel.send("Invalid (too small)"); - }; - - var songName = queue[input].title; - - queue.splice(input, 1); - - message.channel.send(`<:success:466995111885144095> Removed from queue: **${songName}**`); -}; - -exports.conf = { - enabled: true, - guildOnly: true, - aliases: ["rmsong"], - permLevel: "Moderator", - requiredPerms: ["SPEAK"] -}; - -exports.help = { - name: "removesong", - category: "Music", - description: "Removes the specified song from the queue.", - usage: "removesong [position]" -}; diff --git a/src/commands/reset.js b/src/commands/reset.js deleted file mode 100644 index ca8fe34..0000000 --- a/src/commands/reset.js +++ /dev/null @@ -1,30 +0,0 @@ -const Discord = require("discord.js") -exports.run = async (client, message) => { - - if (!client.settings.has(message.guild.id)) client.settings.set(message.guild.id, {}); - - const response = await client.awaitReply(message, - "<:reboot:467216876938985482> This will clear the guild config and restore me to my default settings. Are you sure you want to do this?" - ); - if (["y", "yes"].includes(response.toLowerCase())) { - client.settings.set(message.guild.id, {}); - message.channel.send("<:success:466995111885144095> All settings have been restored to their default values.") - } else { - message.channel.send("<:success:466995111885144095> Action cancelled.") - } -}; - -exports.conf = { - enabled: true, - guildOnly: true, - aliases: [], - permLevel: "Administrator", - requiredPerms: [] -}; - -exports.help = { - name: "reset", - category: "Configure", - description: "Resets all settings to their default values.", - usage: "reset" -}; \ No newline at end of file diff --git a/src/commands/restart.js b/src/commands/restart.js deleted file mode 100644 index f3cf1a7..0000000 --- a/src/commands/restart.js +++ /dev/null @@ -1,27 +0,0 @@ -exports.run = async (client, message) => {// eslint-disable-line no-unused-vars - - // This actually shuts down the bot, you'll need to use something like pm2 to get it to restart - - await message.channel.send("<:reboot:467216876938985482> Restarting..."); - - client.commands.forEach( async cmd => { - await client.unloadCommand(cmd); - }); - - process.exit(); -}; - -exports.conf = { - enabled: true, - guildOnly: false, - aliases: [], - permLevel: "Developer", - requiredPerms: [] -}; - -exports.help = { - name: "restart", - category: "Owner", - description: "Restarts the bot.", - usage: "restart" -}; diff --git a/src/commands/resume.js b/src/commands/resume.js deleted file mode 100644 index 9c63f87..0000000 --- a/src/commands/resume.js +++ /dev/null @@ -1,28 +0,0 @@ -const Discord = require("discord.js") -exports.run = (client, message, args, level) => { - let guild = client.music.getGuild(message.guild.id); - if(guild.queue.length < 1) { - return message.channel.send("<:error:466995152976871434> Nothing is playing."); - }; - guild.playing = true; - guild.paused = false; - guild.dispatcher.resume(); - message.channel.send("<:play:467216788187512832> Playback resumed!"); - - -}; - -exports.conf = { - enabled: true, - guildOnly: true, - aliases: ["unpause"], - permLevel: "Moderator", - requiredPerms: ["SPEAK"] -}; - -exports.help = { - name: "resume", - category: "Music", - description: "Unpauses music.", - usage: "resume" -}; \ No newline at end of file diff --git a/src/commands/rip.js b/src/commands/rip.js deleted file mode 100644 index d677655..0000000 --- a/src/commands/rip.js +++ /dev/null @@ -1,25 +0,0 @@ -var request = require('request'); -const Discord = require("discord.js") -exports.run = (client, message) => { - message.channel.startTyping(); - var r = request.get('http://mityurl.com/y/yKsQ/r', function (err, res, body) { - var rip = r.uri.href - message.channel.send(`>:] ${rip}`) - message.channel.stopTyping(); - }); -} - -exports.conf = { - enabled: true, - guildOnly: false, - aliases: [], - permLevel: "User", - requiredPerms: [] - }; - - exports.help = { - name: "rip", - category: "Fun", - description: "nice >:]", - usage: "`rip`" - }; \ No newline at end of file diff --git a/src/commands/rolecolour.js b/src/commands/rolecolour.js deleted file mode 100644 index 31248b6..0000000 --- a/src/commands/rolecolour.js +++ /dev/null @@ -1,52 +0,0 @@ -exports.run = async (client, message, [colour, ...givenRole], query) => { - let role = givenRole.join(" "); - - let gRole = client.findRole(role, message); - - if (!gRole) { - return message.channel.send(`<:error:466995152976871434> That role doesn't seem to exist. Try again!`); - }; - - if(!colour.startsWith('#')) { - colour = `#`+colour; - } - if(colour.length > 7) return message.channel.send( - `<:error:466995152976871434> Colour has to be a hex code. Usage: \`${client.commands.get(`rolecolour`).help.usage}\`` - ); - if(colour.length < 7) return message.channel.send( - `<:error:466995152976871434> Colour has to be a hex code. Usage: \`${client.commands.get(`rolecolour`).help.usage}\`` - ); - - let moderator = message.guild.member(message.author) - if (gRole.position >= moderator.roles.highest.position) { - return message.channel.send( - "<:error:466995152976871434> You cannot modify roles higher than your own!" - ); - } - - var bot = message.guild.members.cache.get(client.user.id) - if (gRole.position >= bot.roles.highest.position) { - return message.channel.send( - `<:error:466995152976871434> I cannot modify roles higher than my own!` - ); - } - - await gRole.edit({color: colour}) - message.channel.send( - `<:success:466995111885144095> The colour of the role \`${gRole.name}\` has been set to \`${colour}\``); -}; - -exports.conf = { - enabled: true, - guildOnly: true, - aliases: ["rolecolor"], - permLevel: "Moderator", - requiredPerms: ["MANAGE_ROLES"] -}; - -exports.help = { - name: "rolecolour", - category: "Utility", - description: "Sets the colour of a role to the specified hex.", - usage: "rolecolour [hex] [role]" -}; diff --git a/src/commands/roleinfo.js b/src/commands/roleinfo.js deleted file mode 100644 index 10d8c4d..0000000 --- a/src/commands/roleinfo.js +++ /dev/null @@ -1,75 +0,0 @@ -const Discord = require("discord.js"); -exports.run = async (client, message, args, level) => { - if (!args[0]) - return message.channel.send( - `<:error:466995152976871434> You didn't provide me with a role name or ID! Usage: \`${client.commands.get(`roleinfo`).help.usage}\`` - ); - - let role = client.findRole(args.join(" "), message); - - if (!role) { - return message.channel.send(`<:error:466995152976871434> That role doesn't seem to exist. Try again!`); - }; - - if(!role) { - return message.channel.send(`<:error:466995152976871434> Role not found.`) - } - - var permissions = "```"; - if(role.permissions.has("ADMINISTRATOR")) permissions += "ADMINISTRATOR, "; - if(role.permissions.has("CREATE_INSTANT_INVITE")) permissions += "CREATE_INSTANT_INVITE, "; - if(role.permissions.has("KICK_MEMBERS")) permissions += "KICK_MEMBERS, "; - if(role.permissions.has("BAN_MEMBERS")) permissions += "BAN_MEMBERS, "; - if(role.permissions.has("MANAGE_CHANNELS")) permissions += "MANAGE_CHANNELS, "; - if(role.permissions.has("MANAGE_GUILD")) permissions += "MANAGE_GUILD, "; - if(role.permissions.has("ADD_REACTIONS")) permissions += "ADD_REACTIONS, "; - if(role.permissions.has("VIEW_AUDIT_LOG")) permissions += "VIEW_AUDIT_LOG, "; - if(role.permissions.has("PRIORITY_SPEAKER")) permissions += "PRIORITY_SPEAKER, "; - if(role.permissions.has("STREAM")) permissions += "STREAM, "; - if(role.permissions.has("VIEW_CHANNEL")) permissions += "VIEW_CHANNEL, "; - if(role.permissions.has("SEND_MESSAGES")) permissions += "SEND_MESSAGES, "; - if(role.permissions.has("SEND_TTS_MESSAGES")) permissions += "SEND_TTS_MESSAGES, "; - if(role.permissions.has("MANAGE_MESSAGES")) permissions += "MANAGE_MESSAGES, "; - if(role.permissions.has("EMBED_LINKS")) permissions += "EMBED_LINKS, "; - if(role.permissions.has("ATTACH_FILES")) permissions += "ATTACH_FILES, "; - if(role.permissions.has("READ_MESSAGE_HISTORY")) permissions += "READ_MESSAGE_HISTORY, "; - if(role.permissions.has("MENTION_EVERYONE")) permissions += "MENTION_EVERYONE, "; - if(role.permissions.has("USE_EXTERNAL_EMOJIS")) permissions += "USE_EXTERNAL_EMOJIS, "; - if(role.permissions.has("CONNECT")) permissions += "CONNECT, "; - if(role.permissions.has("SPEAK")) permissions += "SPEAK, "; - if(role.permissions.has("MUTE_MEMBERS")) permissions += "MUTE_MEMBERS, "; - if(role.permissions.has("DEAFEN_MEMBERS")) permissions += "DEAFEN_MEMBERS, "; - if(role.permissions.has("MOVE_MEMBERS")) permissions += "MOVE_MEMBERS, "; - if(role.permissions.has("USE_VAD")) permissions += "USE_VAD, "; - if(role.permissions.has("CHANGE_NICKNAME")) permissions += "CHANGE_NICKNAME, "; - if(role.permissions.has("MANAGE_NICKNAMES")) permissions += "MANAGE_NICKNAMES, "; - if(role.permissions.has("MANAGE_ROLES")) permissions += "MANAGE_ROLES, "; - if(role.permissions.has("MANAGE_WEBHOOKS")) permissions += "MANAGE_WEBHOOKS, "; - if(role.permissions.has("MANAGE_EMOJIS")) permissions += "MANAGE_EMOJIS, "; - permissions = permissions.slice(0, -2); - permissions += "```"; - - var embed = new Discord.MessageEmbed(); - embed.setColor(role.color); - embed.setTitle(role.name); - embed.setDescription( - `• **ID:** ${role.id}\n• **Hex:** ${role.hexColor}\n• **Members:** ${role.members.size}\n• **Position:** ${role.position}\n• **Hoisted:** ${role.hoist}` - ); - embed.addField(`**Permissions:**`, permissions) - message.channel.send(embed) -}; - -exports.conf = { - enabled: true, - guildOnly: true, - aliases: ["rinfo"], - permLevel: "User", - requiredPerms: [] -}; - -exports.help = { - name: "roleinfo", - category: "Utility", - description: "Gives information about a role.", - usage: "roleinfo [role]" -}; \ No newline at end of file diff --git a/src/commands/sans.js b/src/commands/sans.js deleted file mode 100644 index ae5b3af..0000000 --- a/src/commands/sans.js +++ /dev/null @@ -1,36 +0,0 @@ -const url = "https://demirramon.com/gen/undertale_text_box.png"; -exports.run = (client, message, args) => { - let text = args.join(" "); - if (!text) { - return message.channel.send( - `<:error:466995152976871434> No message provided. Usage: \`${client.commands.get(`sans`).help.usage}\`` - ); - } - - message.channel.startTyping(); - - let params = "box=undertale&boxcolor=white&character=undertale-sans&expression=default&charcolor=white&font=determination&asterisk=true&mode=regular&text=" + encodeURIComponent(text); - - try { - message.channel.stopTyping(); - message.channel.send({files: [new Discord.MessageAttachment(url + "?" + params, "undertale.png")]}); - } catch(err) { - message.channel.stopTyping(); - message.channel.send(`<:error:466995152976871434> Error when generating image: \`${err}\``) - } -}; - -exports.conf = { - enabled: true, - guildOnly: false, - aliases: ["undertale"], - permLevel: "User", - requiredPerms: ["ATTACH_FILES"] -}; - -exports.help = { - name: "sans", - category: "Fun", - description: "Generates a sans text box", - usage: "sans [message]" -}; \ No newline at end of file diff --git a/src/commands/say.js b/src/commands/say.js deleted file mode 100644 index e196847..0000000 --- a/src/commands/say.js +++ /dev/null @@ -1,28 +0,0 @@ -exports.run = (client, message, args, level) => { - if(!args[0]) { - return message.channel.send( - `<:error:466995152976871434> No message provided. Usage: \`${client.commands.get(`echo`).help.usage}\`` - ); - }; - if (message.content.includes("@everyone")) { - return message.channel.send(`<@${message.author.id}>`); - }; - - message.delete().catch(O_o => {}); - message.channel.send(args.join(" ")); -}; - -exports.conf = { - enabled: true, - guildOnly: false, - aliases: ["echo"], - permLevel: "User", - requiredPerms: ["MANAGE_MESSAGES"] -}; - -exports.help = { - name: "say", - category: "Fun", - description: "Makes Woomy copy what the user says.", - usage: "echo <-hide> [message]" -}; diff --git a/src/commands/servericon.js b/src/commands/servericon.js deleted file mode 100644 index 2eb44c4..0000000 --- a/src/commands/servericon.js +++ /dev/null @@ -1,18 +0,0 @@ -exports.run = (client, message) => { - message.channel.send(`**${message.guild}'s** icon is:\n${message.guild.iconURL({format: "png", dynamic: true, size: 2048})}`) -}; - -exports.conf = { - enabled: true, - guildOnly: true, - aliases: ["sicon", "guildicon"], - permLevel: "User", - requiredPerms: ["EMBED_LINKS"] -}; - -exports.help = { - name: "servericon", - category: "Utility", - description: "Displays the icon for the server.", - usage: "servericon" -}; diff --git a/src/commands/serverinfo.js b/src/commands/serverinfo.js deleted file mode 100644 index 89c2230..0000000 --- a/src/commands/serverinfo.js +++ /dev/null @@ -1,99 +0,0 @@ -exports.run = (client, message) => { - - var guild = message.guild - var badges = ""; - var members = `${guild.memberCount} (${guild.memberCount-guild.members.cache.filter(member => member.user.bot).size} users | ${guild.members.cache.filter(member => member.user.bot).size} bots)`; - - var roles = 0; - guild.roles.cache.forEach((role) => { - roles = roles + 1; - }); - - var channels = 0; - var categories = 0; - var text = 0; - var voice = 0; - - guild.channels.cache.forEach((channel) => { - if(channel.type == "category") { - categories = categories + 1; - } else { - if(channel.type == "text") { - text = text + 1; - }; - - if(channel.type == "voice") { - voice = voice + 1; - }; - - channels = channels + 1; - }; - }); - - var channelString = `${channels} (${text} text | ${voice} voice | ${categories} categories)` - - if(guild.premiumTier > 0) { - badges = badges += "<:boosted:685704824175853624> " - } - - if(guild.partnered == true) { - badges = badges += "<:partnered:685704834779054107> " - } - - if(guild.verified == true) { - badges = badges += "<:verified:685704812435734569>" - } - - if(badges.length > 0) { - badges = badges += "\n" - } - - var boosts; - if(guild.premiumTier == 1) { - boosts = `${guild.premiumSubscriptionCount} (level 1)` - } else if(guild.premiumTier == 2) { - boosts = `${guild.premiumSubscriptionCount} (level 2)` - } else if(guild.premiumTier == 3) { - boosts = `${guild.premiumSubscriptionCount} (level 3)` - } else { - boosts = guild.premiumSubscriptionCount; - }; - - var emojis = 0; - var static = 0; - var animated = 0; - - guild.emojis.cache.forEach((emoji) => { - if(emoji.animated == true) { - animated = animated + 1; - } else { - static = static + 1; - }; - emojis = emojis + 1; - }); - - emojiString = `${emojis} (${static} static | ${animated} animated)` - - let embed = new Discord.MessageEmbed() - .setColor(message.guild.member(client.user).displayHexColor) - .setTitle(guild.name) - .setDescription(`${badges}• **ID:** ${guild.id}\n• **Owner:** ${guild.owner}\n• **Region:** ${guild.region.toProperCase()}\n• **Boosts:** ${boosts}\n• **Members:** ${members}\n• **Channels:** ${channelString}\n• **Roles:** ${roles}\n• **Emojis:** ${emojiString}\n• **Creation date:** ${guild.createdAt}`) - .setThumbnail(message.guild.iconURL({format: "png", dynamic: true, size: 2048})); - - message.channel.send(embed); -}; - -exports.conf = { - enabled: true, - guildOnly: true, - aliases: ["sinfo", "guildinfo", "ginfo", "server"], - permLevel: "User", - requiredPerms: ["EMBED_LINKS"] -}; - -exports.help = { - name: "serverinfo", - category: "Utility", - description: "Displays some useful information about the current server.", - usage: "serverinfo" -}; diff --git a/src/commands/settings.js b/src/commands/settings.js deleted file mode 100644 index eb1f66c..0000000 --- a/src/commands/settings.js +++ /dev/null @@ -1,101 +0,0 @@ -exports.run = async (client, message, args) => { - - const settings = message.settings; - if (!client.settings.has(message.guild.id)) client.settings.set(message.guild.id, {}); - - modChan = message.guild.channels.cache.find(channel => channel.name === settings.modlogsChannel) || "__Disabled__"; - chatChan = message.guild.channels.cache.find(channel => channel.name === settings.chatlogsChannel) || "__Disabled__" - greetChan = message.guild.channels.cache.get(settings.welcomeChannel) || "__Disabled__"; - prefix = settings.prefix; - - var raidMode; - var rmDisabled = false; - if(settings.raidMode == "off") { - raidMode = "__Disabled__" - rmDisabled = true; - } else { - raidMode = `\`${settings.raidMode}` - } - - if(settings.raidModeStrict == "on") { - raidMode += " (strict)`" - } else if(rmDisabled != true) { - raidMode += "`" - } - - var modRole = message.guild.roles.cache.get(settings.modRole); - var adminRole = message.guild.roles.cache.get(settings.adminRole); - var autorole = message.guild.roles.cache.get(settings.autorole); - var mutedRole = message.guild.roles.cache.get(settings.mutedRole); - var blacklist = ""; - - if(settings.modRole == "off" || !modRole) { - modRole = "__None set__"; - } else { - modRole = "`" + modRole.name + "`"; - } - - if(settings.adminRole == "off" || !adminRole) { - adminRole = "__None set__"; - } else { - adminRole = "`" + adminRole.name + "`"; - } - - if(settings.autorole == "off" || !autorole) { - autorole = "__None set__"; - } else { - autorole = "`" + autorole.name + "`"; - } - - if(settings.mutedRole == "off" || !mutedRole) { - mutedRole = "__None set__"; - } else { - mutedRole = "`" + mutedRole.name + "`"; - } - - if(settings.welcomeMessage == "off") { - welcomeMessage = "__Disabled__"; - } else { - welcomeMessage = "`" + settings.welcomeMessage + "`"; - } - - if(settings.leaveMessage == "off") { - leaveMessage = "__Disabled__"; - } else { - leaveMessage = "`" + settings.leaveMessage + "`"; - } - - if(settings.blacklisted == "ARRAY" || settings.blacklisted.length < 1) { - blacklist = "__Disabled__"; - } else { - if(settings.blacklisted.length > 0) { - settings.blacklisted.forEach(function(user) { - blacklist += "`" + (client.users.cache.get(user).tag || user.tag) + "`, " - }); - blacklist = blacklist.substring(0, blacklist.length - 2); - }; - }; - - embed = new Discord.MessageEmbed() - embed.setAuthor("Settings for: " + message.guild.name, message.guild.iconURL({dynamic: true})) - embed.setColor(message.guild.member(client.user).displayHexColor) - embed.setDescription("You can edit these settings using the commands in the 'configure' section of the help command.") - embed.addFields({ name: "General:", value: `Prefix: \`${prefix}\`\nChat logging: ${chatChan}\nMod logging: ${modChan}\nRaid mode: ${raidMode}\nJoin/leave channel: ${greetChan}\nWelcome message: ${welcomeMessage}\nLeave message: ${leaveMessage}`, inline: true}, {name: "Roles:", value: `Moderator: ${modRole}\nAdministrator: ${adminRole}\nMuted: ${mutedRole}\nBlacklisted: ${blacklist}\nAutorole: ${autorole}`, inline: true}) - message.channel.send(embed) - -}; - -exports.conf = { - enabled: true, - guildOnly: true, - aliases: ["config"], - permLevel: "Administrator", - requiredPerms: [] -}; - -exports.help = { - name: "settings", - category: "Configure", - description: "View your server's settings.", - usage: "settings" -}; diff --git a/src/commands/sexuality.js b/src/commands/sexuality.js deleted file mode 100644 index c41930b..0000000 --- a/src/commands/sexuality.js +++ /dev/null @@ -1,36 +0,0 @@ -const sexualities = require ("../../resources/other/sexualities.json"); -exports.run = async (client, message, args) => { - var output = ""; - if(!args[0]) { - for (var key of Object.keys(sexualities)) { - output += `${key}, ` - }; - return message.channel.send(`__**Sexualities:**__\n${output.slice(0, -2)}`); - } else { - if(args.join(" ").toLowerCase() == "attack helicopter" || args.join(" ").toLowerCase() == "apache attack helicopter" || args.join(" ").toLowerCase() == "apache") { - return message.channel.send({ - files: [new Discord.MessageAttachment("./resources/images/attackhelicopter.jpg")] - }); - } - output = sexualities[args.join(" ").toLowerCase()]; - if(!output) { - return message.channel.send("<:error:466995152976871434> No results for that query."); - }; - return message.channel.send(`__**${output.name.toProperCase()}:**__\n${output.description}`); - }; -}; - -exports.conf = { - enabled: true, - guildOnly: false, - aliases: ["sexualities"], - permLevel: "User", - requiredPerms: [] -}; - -exports.help = { - name: "sexuality", - category: "Fun", - description: "Gives you information about the specified sexuality.", - usage: "sexuality [sexuality]" -}; diff --git a/src/commands/ship.js b/src/commands/ship.js deleted file mode 100644 index 3850d87..0000000 --- a/src/commands/ship.js +++ /dev/null @@ -1,53 +0,0 @@ -exports.run = async (client, message, args) => { - - var name, name1; - var rating = Math.floor(Math.random() * 100) + 1; - var hearts = [ - "❤️", - "🧡", - "💛", - "💚", - "💙", - "💜" - ]; - - if(args.length < 2) { - return message.channel.send(`<:error:466995152976871434> Please include two names/users.`) - } - - if(message.guild && message.mentions.members && message.mentions.members.size > 0) { - name = message.mentions.members.first().displayName; - }; - - if(message.guild && message.mentions.members && message.mentions.members.size > 1) { - name1 = message.mentions.members.last().displayName; - }; - - if(!name) { - name = args[0]; - }; - - if(!name1) { - name1 = args[1]; - }; - - shipName = name.substr(0, client.intBetween(1,name.length))+name1.substr(client.intBetween(0,name1.length)); - - message.channel.send(`__**Ship Generator:**__\n${hearts.random()} Ship Name: \`${shipName}\`\n${hearts.random()} Compatibility rating: \`${rating}%\``) -}; - -exports.conf = { - enabled: true, - guildOnly: false, - aliases: [], - permLevel: "User", - requiredPerms: [] -}; - -exports.help = { - name: "ship", - category: "Fun", - description: "Ship two people together <3", - usage: "ship [name/user] [name/user]" -}; - diff --git a/src/commands/skip.js b/src/commands/skip.js deleted file mode 100644 index c997c18..0000000 --- a/src/commands/skip.js +++ /dev/null @@ -1,66 +0,0 @@ -const Discord = require("discord.js") -exports.run = (client, message, args, level) => { - let guild = client.music.getGuild(message.guild.id); - - if(guild.queue.length < 1 || !guild.playing || !guild.dispatcher) return message.channel.send( - "<:error:466995152976871434> Nothing is playing." - ); - - let vc = message.guild.members.cache.get(client.user.id).voiceChannel; - - if(vc != message.member.voiceChannel) return message.channel.send( - '<:error:466995152976871434> You need to be in my voice channel to use this command!' - ); - - if(guild.queue[0].requestedBy.id == message.author.id) { - skip_song(guild); - - message.channel.send( - `<:skip:467216735356059660> Song has been skipped by the user who requested it.` - ); - - return; - } - - if (guild.skippers.indexOf(message.author.id) == -1) { - guild.skippers.push(message.author.id); - - if (guild.skippers.length >= Math.ceil(vc.members.filter(member => !member.user.bot).size / 2)) { - - skip_song(guild); - - message.channel.send( - `<:skip:467216735356059660> Song has been skipped.` - ); - - } else { - message.channel.send( - `<:success:466995111885144095> Your vote has been acknowledged! **${guild.skippers.length + "/" + Math.ceil(vc.members.filter(member => !member.user.bot).size / 2)}**` - ); - }; - - } else { - message.channel.send( - "<:denied:466995195150336020> You cannot vote twice!" - ); - }; -}; - -exports.conf = { - enabled: true, - guildOnly: true, - aliases: ["voteskip"], - permLevel: "User", - requiredPerms: ["SPEAK"] -}; - -exports.help = { - name: "skip", - category: "Music", - description: "Vote to skip the currently playing song. Song will be skipped instantly if executed by the user who requested it.", - usage: "skip" -}; - -function skip_song(guild) { - guild.dispatcher.end("silent"); - } \ No newline at end of file diff --git a/src/commands/slap.js b/src/commands/slap.js deleted file mode 100644 index c87c783..0000000 --- a/src/commands/slap.js +++ /dev/null @@ -1,69 +0,0 @@ -const API = require('nekos.life'); -const {sfw} = new API(); -exports.run = async (client, message, args) => { - if(!args[0]) { - return message.channel.send(`<:error:466995152976871434> You didn't say who you wanted to slap! Usage: \`${client.commands.get(`slap`).help.usage}\``) - }; - - var people = ""; - - for (var i = 0; i < args.length; i++) { - var user = client.getUserFromMention(args[i]) - if (user) { - user = message.guild.members.cache.get(user.id).displayName; - } else { - users = client.searchForMembers(message.guild, args[i]); - if (users.length > 1) - return message.channel.send( - "<:error:466995152976871434> Found multiple users for `" + args[i] + "`, Please be more specific or mention the user instead." - ); - else if (users.length == 0) - return message.channel.send( - "<:error:466995152976871434> That user doesn't seem to exist. Try again!" - ); - user = users[0].displayName; - }; - if(i+1 == args.length && args.length > 1) { - people += `**and** ${user}!` - } else if(args.length < 2) { - people += `${user}!`; - } else if(args.length == 2 && i == 0) { - people += `${user} `; - } else { - people += `${user}, `; - }; - }; - - - - message.channel.startTyping(); - try { - sfw.slap().then((json) => { - embed = new Discord.MessageEmbed(); - embed.setImage(json.url) - embed.setColor(client.embedColour(message)); - embed.setDescription(`**${message.guild.members.cache.get(message.author.id).displayName}** slapped **${people}**`) - message.channel.send(embed) - message.channel.stopTyping(); - }); - } catch (err) { - client.logger.error("slap.js: " + err); - message.channel.send(`<:error:466995152976871434> An error has occurred: ${err}`) - message.channel.stopTyping(); - }; -}; - -exports.conf = { - enabled: true, - guildOnly: true, - aliases: [], - permLevel: "User", - requiredPerms: ["EMBED_LINKS"] -}; - -exports.help = { - name: "slap", - category: "Action", - description: "Slap someone >:3", - usage: "slap [@user/user] (you can slap as many people as you want!)" -}; diff --git a/src/commands/smug.js b/src/commands/smug.js deleted file mode 100644 index 011f2bd..0000000 --- a/src/commands/smug.js +++ /dev/null @@ -1,33 +0,0 @@ -const API = require('nekos.life'); -const {sfw} = new API(); -exports.run = async (client, message) => { - message.channel.startTyping(); - try { - sfw.smug().then((json) => { - embed = new Discord.MessageEmbed(); - embed.setImage(json.url) - embed.setColor(client.embedColour(message)); - message.channel.send(embed) - message.channel.stopTyping(); - }); - } catch (err) { - client.logger.error("smug.js: " + err); - message.channel.send(`<:error:466995152976871434> An error has occurred: ${err}`) - message.channel.stopTyping(); - }; -}; - -exports.conf = { - enabled: true, - guildOnly: true, - aliases: [], - permLevel: "User", - requiredPerms: ["EMBED_LINKS"] -}; - -exports.help = { - name: "smug", - category: "Action", - description: "Sends a smug gif.", - usage: "smug" -}; diff --git a/src/commands/softban.js b/src/commands/softban.js deleted file mode 100644 index 1b602c5..0000000 --- a/src/commands/softban.js +++ /dev/null @@ -1,99 +0,0 @@ -exports.run = async (client, message, args) => { - const settings = (message.settings = client.getSettings(message.guild.id)); - - if(!args[0]) { - return message.channel.send( - `<:error:466995152976871434> No username provided. Usage: \`${client.commands.get(`ban`).help.usage}\`` - ); - }; - - let user = message.mentions.members.first(); - - if (!user) { - let users; - users = client.searchForMembers(message.guild, args[0]); - if (users.length > 1) - return message.channel.send( - "<:error:466995152976871434> Found multiple users! Please be more specific or mention the user instead." - ); - else if (users.length == 0) - return message.channel.send( - "<:error:466995152976871434> That user doesn't seem to exist. Try again!" - ); - user = users[0]; - }; - - if(!user.bannable) { - return message.channel.send(`<:error:466995152976871434> Specified user is not bannable.`) - }; - - let mod = message.guild.member(message.author); - let bot = message.guild.member(client.user); - - if (user.roles.highest.position >= mod.roles.highest.position) { - return message.channel.send( - `<:error:466995152976871434> You can't softban people who are higher ranked than you are!` - ); - }; - - if (user.roles.highest.position >= bot.roles.highest.position) { - return message.channel.send( - `<:error:466995152976871434> I can't softban people who are higher ranked than you myself!` - ); - }; - - if(!user.bannable) { - return message.channel.send(`<:error:466995152976871434> Specified user is not bannable.`) - }; - - var days = args[args.length - 1] - try { - days = Number(days); - } catch(err) {}; - - console.log(typeof days) - console.log(days) - - if(isNaN(days)) { - return message.channel.send(`<:error:466995152976871434> Invalid number. Did you forget to specify how many days worth of messages to clear? Usage: \`${client.commands.get(`softban`).help.usage}\``) - } else if (days < 1 || days > 7) { - return message.channel.send(`<:error:466995152976871434> Number too large/small. The max amount of days I can clear is 7.`) - } else { - await message.guild.members.ban(user, {reason: `Softbanned by ${message.author.tag}`, days: days}); - await message.guild.members.unban(user); - message.channel.send(`<:success:466995111885144095> Softbanned \`${user.user.tag}\``); - - if (settings.modlogsChannel !== "off") { - const channel = message.guild.channels.cache.find( - channel => channel.name === settings.modlogsChannel - ); - - if (channel) { - let embed = new Discord.MessageEmbed(); - embed.setColor("#F38159"); - embed.setAuthor("User softbanned!", user.user.avatarURL({format: "png", dynamic: true, size: 2048})); - embed.setDescription( - `• User: ${user.user.tag} (${user.user.id})\n• Mod: ${message.author} (${message.author.id})\n• Days cleared: ${days}` - ); - try { - channel.send(embed); - } catch (err) {}; - }; - }; - }; -}; - -exports.conf = { - enabled: true, - guildOnly: true, - aliases: [], - permLevel: "Moderator", - requiredPerms: ["BAN_MEMBERS"] -}; - -exports.help = { - name: "softban", - category: "Moderation", - description: "Bans then unbans a user, clearing their messages.", - usage: "softban [user] [days]" -}; diff --git a/src/commands/spoilerise.js b/src/commands/spoilerise.js deleted file mode 100644 index 25ab221..0000000 --- a/src/commands/spoilerise.js +++ /dev/null @@ -1,28 +0,0 @@ -exports.run = async (client, message, args) => { - if(!args[0]) { - return message.channel.send(`<:error:466995152976871434> You didn't provide any text! Usage: \`${client.commands.get(`spoiler`).help.usage}\``) - }; - - var output = `||${[...message.cleanContent.substring(9)].join("||||")}||`; - - if(output.length > 2000) { - output = output.slice(0, -Math.abs(output.length - 2000)) - }; - - message.channel.send(output) -}; - -exports.conf = { - enabled: true, - guildOnly: false, - aliases: ["spoilerize", "spoiler"], - permLevel: "User", - requiredPerms: [] -}; - -exports.help = { - name: "spoilerise", - category: "Fun", - description: "Spoilers every letter in the provided text.", - usage: "spoiler [text]" -}; diff --git a/src/commands/stop.js b/src/commands/stop.js deleted file mode 100644 index 695dd04..0000000 --- a/src/commands/stop.js +++ /dev/null @@ -1,32 +0,0 @@ -const Discord = require("discord.js"); - -exports.run = async (client, message) => { - let guild = client.music.getGuild(message.guild.id); - - if(guild.queue.length < 1 || !guild.playing || !guild.dispatcher) return message.channel.send("<:error:466995152976871434> Nothing is playing."); - if(!message.member.voice.channel) return message.channel.send('<:error:466995152976871434> You need to be in voice channel to use this command!'); - - guild.playing = false; - guild.paused = false; - guild.queue = []; - - guild.dispatcher.end("silent"); - - message.channel.send("<:stop:467639381390262284> Playback stopped!"); -}; - -exports.conf = { - enabled: true, - guildOnly: true, - aliases: [], - permLevel: "Moderator", - requiredPerms: [] -}; - -exports.help = { - name: "stop", - category: "Music", - description: "Clears the queue and disconnects from the voice channel. (run this if music stopS working)", - usage: "stop" -}; - diff --git a/src/commands/support.js b/src/commands/support.js deleted file mode 100644 index c15de88..0000000 --- a/src/commands/support.js +++ /dev/null @@ -1,18 +0,0 @@ -exports.run = async (client, message, args) =>{ - message.channel.send("Use this link to join my support server: https://discord.gg/HCF8mdv") -}; - -exports.conf = { - enabled: true, - guildOnly: false, - aliases: [], - permLevel: "User", - requiredPerms: [] - }; - -exports.help = { - name: "support", - category: "Utility", - description: "Sends a link to Woomy's support/development server.", - usage: "support" - }; diff --git a/src/commands/takerole.js b/src/commands/takerole.js deleted file mode 100644 index 408d0e3..0000000 --- a/src/commands/takerole.js +++ /dev/null @@ -1,86 +0,0 @@ -exports.run = async (client, message, [member, ...role2add], query) => { - if (!member) { - return message.channel.send( - `<:error:466995152976871434> No user specified. Usage: \`${client.commands.get(`takerole`).help.usage}\`` - ); - } - let user = message.mentions.members.first(); - let users; - if (!user) { - users = client.searchForMembers(message.guild, member); - if (users.length > 1) - return message.channel.send( - "<:error:466995152976871434> Found multiple users, please be more specific or mention the user instead." - ); - else if (users.length == 0) - return message.channel.send( - "<:error:466995152976871434> That user doesn't seem to exist. Try again!" - ); - user = users[0]; - } - let role = role2add.join(" "); - - gRole = client.findRole(role, message); - - if (!gRole) { - return message.channel.send(`<:error:466995152976871434> That role doesn't seem to exist. Try again!`); - }; - - let moderator = message.guild.member(message.author) - if (gRole.position >= moderator.roles.highest.position) { - return message.channel.send( - "<:error:466995152976871434> You cannot take roles higher than your own!" - ); - } - - var bot = message.guild.members.cache.get(client.user.id) - if (gRole.position >= bot.roles.highest.position) { - return message.channel.send( - `<:error:466995152976871434> I can't take roles higher than my own!` - ); - } - if (!user.roles.cache.has(gRole.id)) { - return message.channel.send( - "<:error:466995152976871434> They don't have that role!" - ); - } - await user.roles.remove(gRole.id); - message.channel.send( - `<:success:466995111885144095> Took the \`${gRole.name}\` role from \`${ - user.user.tag - }\`` - ); - - if (client.getSettings(message.guild.id).modlogsChannel !== "off") { - const channel = message.guild.channels.cache.find( - channel => channel.name === client.getSettings(message.guild.id).modlogsChannel - ); - - if (channel) { - let embed = new Discord.MessageEmbed(); - embed.setColor("#008369"); - embed.setAuthor("Role taken:", user.user.avatarURL({format: "png", dynamic: true, size: 2048})); - embed.setDescription(`‏‏‎• User: ${user} (${user.user.id})\n‏‏‎• Mod: ${message.author} (${message.author.id})\n‏‏‎• Role: ${gRole}`) - try { - channel.send({ embed }); - } catch (err) { - // probably no permissions to send messages/embeds there - }; - }; - }; -}; - - exports.conf = { - enabled: true, - guildOnly: true, - aliases: ["removerole"], - permLevel: "Moderator", - requiredPerms: ["MANAGE_ROLES"] - }; - - exports.help = { - name: "takerole", - category: "Moderation", - description: "Takes a role from the specified user.", - usage: "takerole [user] [role]" - }; \ No newline at end of file diff --git a/src/commands/tickle.js b/src/commands/tickle.js deleted file mode 100644 index e75a771..0000000 --- a/src/commands/tickle.js +++ /dev/null @@ -1,69 +0,0 @@ -const API = require('nekos.life'); -const {sfw} = new API(); -exports.run = async (client, message, args) => { - if(!args[0]) { - return message.channel.send(`<:error:466995152976871434> You didn't say who you wanted to tickle! Usage: \`${client.commands.get(`tickle`).help.usage}\``) - }; - - var people = ""; - - for (var i = 0; i < args.length; i++) { - var user = client.getUserFromMention(args[i]) - if (user) { - user = message.guild.members.cache.get(user.id).displayName; - } else { - users = client.searchForMembers(message.guild, args[i]); - if (users.length > 1) - return message.channel.send( - "<:error:466995152976871434> Found multiple users for `" + args[i] + "`, Please be more specific or mention the user instead." - ); - else if (users.length == 0) - return message.channel.send( - "<:error:466995152976871434> That user doesn't seem to exist. Try again!" - ); - user = users[0].displayName; - }; - if(i+1 == args.length && args.length > 1) { - people += `**and** ${user}!` - } else if(args.length < 2) { - people += `${user}!`; - } else if(args.length == 2 && i == 0) { - people += `${user} `; - } else { - people += `${user}, `; - }; - }; - - - - message.channel.startTyping(); - try { - sfw.tickle().then((json) => { - embed = new Discord.MessageEmbed(); - embed.setImage(json.url) - embed.setColor(client.embedColour(message)); - embed.setDescription(`**${message.guild.members.cache.get(message.author.id).displayName}** tickled **${people}**`) - message.channel.send(embed) - message.channel.stopTyping(); - }); - } catch (err) { - client.logger.error("tickle.js: " + err); - message.channel.send(`<:error:466995152976871434> An error has occurred: ${err}`) - message.channel.stopTyping(); - }; -}; - -exports.conf = { - enabled: true, - guildOnly: true, - aliases: [], - permLevel: "User", - requiredPerms: ["EMBED_LINKS"] -}; - -exports.help = { - name: "tickle", - category: "Action", - description: "Tickle someone!", - usage: "tickle [@user/user] (you can tickle as many people as you want!)" -}; diff --git a/src/commands/unmute.js b/src/commands/unmute.js deleted file mode 100644 index abf38f1..0000000 --- a/src/commands/unmute.js +++ /dev/null @@ -1,90 +0,0 @@ -exports.run = async (client, message, args, level) => { - const settings = message.settings; - - if(!args[0]) { - return message.channel.send("<:error:466995152976871434> Who am I meant to unmute?") - } - let user = message.mentions.members.first(); - let users; - if (!user) { - users = client.searchForMembers(message.guild, args[0]); - if (users.length > 1) - return message.channel.send( - "<:error:466995152976871434> Found multiple users! Please be more specific or mention the user instead." - ); - else if (users.length == 0) - return message.channel.send( - "<:error:466995152976871434> That user doesn't seem to exist. Try again!" - ); - user = users[0]; - } - if (user.user.id === client.user.id) { - return message.channel.send("lol no") - } - - let moderator = message.guild.member(message.author) - if (message.settings.mutedRole.position >= moderator.roles.highest.position && level < 2) { - return message.channel.send( - "<:error:466995152976871434> The muted role is positioned above the moderator role! Please move the muted role below the moderator role." - ); - } - if (user.roles.highest.position >= moderator.roles.highest.position && moderator.user.id !== message.guild.ownerID) { - return message.channel.send( - `<:error:466995152976871434> You can't unmute people who have a higher role than you!` - ); - }; - let bot = message.guild.member(client.user) - if (user.roles.highest.position >= bot.roles.highest.position) { - return message.channel.send( - `<:error:466995152976871434> I can't unmute people who have a higher role than me!` - ); - } - - let role = message.guild.roles.cache.get(settings.mutedRole) - if(!role) { - return message.channel.send( - "<:error:466995152976871434> Mute role not found! Please set one using `~settings edit mutedRole `" - ); - } - - if (!user.roles.cache.has(role.id)) { - return message.channel.send("<:error:466995152976871434> They aren't muted!") - } - - await user.roles.remove(role.id); - message.channel.send(`<:success:466995111885144095> Unmuted \`${user.user.tag}\``) - - - if (settings.modlogsChannel !== "off") { - const channel = message.guild.channels.cache.find( - channel => channel.name === settings.modlogsChannel - ); - - if (channel) { - let embed = new Discord.MessageEmbed(); - embed.setColor("#7a2f8f"); - embed.setAuthor("User unmuted!", user.user.avatarURL({format: "png", dynamic: true, size: 2048})); - embed.setDescription(`• User: ${user} (${user.user.id})\n• Mod: ${message.author} (${message.author.id})`) - try { - channel.send({ embed }); - } catch (err) { - // probably no permissions to send messages/embeds there - } - } - } -}; - -exports.conf = { - enabled: true, - guildOnly: true, - aliases: [], - permLevel: "Moderator", - requiredPerms: ["MANAGE_ROLES", "MANAGE_CHANNELS"] -}; - -exports.help = { - name: "unmute", - category: "Moderation", - description: "Allows a muted user to type again.", - usage: "unmute [user]" -}; diff --git a/src/commands/urban.js b/src/commands/urban.js deleted file mode 100644 index b42f366..0000000 --- a/src/commands/urban.js +++ /dev/null @@ -1,48 +0,0 @@ -Discord = require("discord.js"); -urban = require("relevant-urban"); -exports.run = async (client, message, args) => { - if (message.channel.nsfw === false) return message.channel.send( - "<:error:466995152976871434> This command can only be executed in channels marked as NSFW!" - ); - if (args < 1) return message.channel.send( - `<:error:466995152976871434> You did not tell me what to search for! Usage: \`${client.commands.get(`urban`).help.usage}\` - `); - let phrase = args.join(" "); - let output = await urban(args.join(' ')).catch(e => { - return message.channel.send("<:error:466995152976871434> No results found for `" + phrase + "`") - }); - - if(output.definition.length > 2000) return message.channel.send( - `<:error:466995152976871434> Definition cannot exceed 2000 characters! Use this link instead: ${output.urbanURL}` - ); - if(output.example.length > 2000) return message.channel.send( - "<:error:466995152976871434> Example cannot exceed 2000 characters!" - ); - - embed = new Discord.MessageEmbed() - .setTitle(output.word) - .setURL(output.urbanURL) - .setColor("#EFFF00") - .setDescription(output.definition || "None") - .addFields( - {name: "Example", value: output.example || "None"}, {name: "Upvotes", value: output.thumbsUp, inline: true}, {name: "Downvotes", value: output.thumbsDown, inline: true} - ) - .setFooter(`Submitted by ${output.author}`) - message.channel.send(embed); - -}; - -exports.conf = { - enabled: true, - guildOnly: false, - aliases: [], - permLevel: "User", - requiredPerms: [] -}; - -exports.help = { - name: "urban", - category: "Fun", - description: "Grabs a definition from the urban dictonary.", - usage: "urban [word]" -}; diff --git a/src/commands/userinfo.js b/src/commands/userinfo.js deleted file mode 100644 index 98d6738..0000000 --- a/src/commands/userinfo.js +++ /dev/null @@ -1,129 +0,0 @@ -const Discord = require("discord.js"); -const coolPeople = require('../../resources/other/coolpeople.json') -exports.run = (client, message, args) => { - var user, guild, status, createdAt, avurl, tag, id; - var nick = "", roles = "", presence = "", badges = ""; - var coolPerson = false; - var friendos = coolPeople.coolPeople; - - if(message.guild) { - user = message.mentions.members.first(); - - if(!args[0]) { - user = message.guild.members.cache.get(message.author.id) - }; - - if (!user) { - var users; - users = client.searchForMembers(message.guild, args[0]); - if (users.length > 1) - return message.channel.send( - "<:error:466995152976871434> Found multiple users! Please be more specific or mention the user instead." - ); - else if (users.length == 0) - return message.channel.send( - "<:error:466995152976871434> That user doesn't seem to exist. Try again!" - ); - user = users[0]; - }; - - if(user.nickname) { - nick = `\n• **Nickname:** ${user.nickname}`; - }; - - for (var i = 0; i < friendos.length; i++) { - if (user.user.id == friendos[i]) - coolPerson = true; - }; - - if(coolPerson == true) { - badges += "🌟" - } - - if(user.user.id == message.guild.ownerID) { - badges += "<:owner:685703193694306331>" - } - - if(user.user.bot) { - badges += "<:bot:686489601678114859>" - } - - - if(badges.length > 0) { - badges += "\n" - } - - user.roles.cache.forEach((role) => { - roles = roles + role.name + "`, `" - }); - - roles = roles.substr(0, roles.length -4); - - guild = `\n• **Roles:** \`${roles}\`\n• **Server join date:** ${user.joinedAt}`; - - id = user.user.id; - tag = user.user.tag; - colour = user.displayHexColor; - avurl = user.user.avatarURL({format: "png", dynamic: true, size: 2048}); - createdAt = user.user.createdAt; - } else { - id = user.id; - tag = user.tag; - colour = ["#ff9d68", "#ff97cb", "#d789ff", "#74FFFF"].random(); - avurl = user.avatarURL({format: "png", dynamic: true, size: 2048}); - createdAt = user.createdAt; - }; - - if(user.presence.status == "online") { - status = `online <:status_online:685462758023626762>` - }; - - if(user.presence.status == "idle") { - status = `idle <:status_idle:685462771529154561>` - }; - - if(user.presence.status == "dnd") { - status = `do not disturb <:status_dnd:685462782963220495>` - }; - - if(user.presence.status == "offline") { - status = `offline <:status_offline:685462758229016633>` - }; - - if(user.presence.activities[0]) { - presence = "\n• **Presence:** "; - if(user.presence.activities[0].type == "PLAYING") { - presence += `Playing ${user.presence.activities[0].name}`; - }; - - if(user.presence.activities[0].type == "STREAMING") { - presence += `Streaming ${user.presence.activities[0].name}`; - }; - - if(user.presence.activities[0].type == "CUSTOM_STATUS") { - presence += `${user.presence.activities[0].state}`; - }; - }; - - embed = new Discord.MessageEmbed(); - embed.setTitle(tag); - embed.setThumbnail(avurl); - embed.setDescription(`${badges}• **ID:** ${id}${nick}\n• **Status:** ${status}${presence}${guild}\n• **Account created:** ${createdAt}`) - embed.setColor(colour); - message.channel.send(embed); -}; - -exports.conf = { - enabled: true, - guildOnly: false, - aliases: ["uinfo", "user"], - permLevel: "User", - requiredPerms: ["EMBED_LINKS"] -}; - -exports.help = { - name: "userinfo", - category: "Utility", - description: "Displays some useful information about the specified user.", - usage: "userinfo " -}; diff --git a/src/commands/weather.js b/src/commands/weather.js deleted file mode 100644 index ef01bc8..0000000 --- a/src/commands/weather.js +++ /dev/null @@ -1,64 +0,0 @@ -const weather = require("weather-js"); -exports.run = async (client, message, args, error) => { - if(!args[0]) { - return message.channel.send( - `<:error:466995152976871434> You didn't give me a location. Usage: \`${client.commands.get(`weather`).help.usage}\`` - ); - }; - - message.channel.startTyping(); - - try { - weather.find({search: args.join(" "), degreeType: 'C'}, function(err, result) { - if(err) return message.channel.send(`<:error:466995152976871434> API error: \`${error}\``) - if(result.length < 2 || !result) { - message.channel.stopTyping(); - return message.channel.send("<:error:466995152976871434> City not found!"); - }; - - var location = result[0].location; - var current = result[0].current; - - var warning = (`${location.alert}` || "No warnings"); - - var embedColour; - if (current.temperature < 0) { - embedColour = "#addeff"; - }else if (current.temperature < 20) { - embedColour = "#4fb8ff"; - }else if (current.temperature < 26) { - embedColour = "#ffea4f"; - }else if (current.temperature < 31) { - embedColour = "#ffa14f" - } else { - embedColour = "#ff614f" - }; - - embed = new Discord.MessageEmbed(); - embed.setAuthor(`Weather for ${location.name}:`) - embed.setDescription(`• **Condition:** ${current.skytext}\n• **Temperature:** ${current.temperature}°C\n• **Feels like:** ${current.feelslike}°C\n• **Humidity:** ${current.humidity}%\n• **Wind:** ${current.winddisplay}\n• **Warnings:** ${warning}`) - embed.setThumbnail(current.imageUrl) - embed.setFooter(`Last updated at ${current.observationtime} ${current.date}`) - embed.setColor(embedColour) - message.channel.stopTyping(); - message.channel.send(embed) - }); - } catch(err) { - return message.channel.send(`<:error:466995152976871434> API error: \`${err}\``) - }; -}; - -exports.conf = { - enabled: true, - guildOnly: false, - aliases: [], - permLevel: "User", - requiredPerms: ["EMBED_LINKS"] -}; - -exports.help = { - name: "weather", - category: "Utility", - description: "Tells you the weather", - usage: "weather [location]" -}; \ No newline at end of file diff --git a/src/commands/welcome.js b/src/commands/welcome.js deleted file mode 100644 index b183b59..0000000 --- a/src/commands/welcome.js +++ /dev/null @@ -1,45 +0,0 @@ -const Discord = require("discord.js") -exports.run = async (client, message, args, level) => { - - const settings = message.settings; - const defaults = client.config.defaultSettings; - const overrides = client.settings.get(message.guild.id); - if (!client.settings.has(message.guild.id)) client.settings.set(message.guild.id, {}); - - if (args[0]) { - const joinedValue = args.join(" "); - if (joinedValue === settings.welcomeMessage) return message.channel.send( - "<:error:466995152976871434> The welcome message is already set to that!" - ); - if (!client.settings.has(message.guild.id)) client.settings.set(message.guild.id, {}); - if (joinedValue === "off") { - if (!client.settings.has(message.guild.id)) client.settings.set(message.guild.id, {}); - client.settings.set(message.guild.id, "off", "welcomeMessage"); - return message.channel.send(`<:success:466995111885144095> Welcome messages have been disabled.`); - } - client.settings.set(message.guild.id, joinedValue, "welcomeMessage"); - client.settings.set(message.guild.id, message.channel.id, "welcomeChannel") - message.channel.send(`<:success:466995111885144095> Set the welcome message to \`${joinedValue}\``); - } else { - if (settings.welcomeMessage === "off") { - message.channel.send(`Welcome messages are off.`) - } else { - message.channel.send(`The current welcome message is: \`${settings.welcomeMessage}\``) - } - } -}; - -exports.conf = { - enabled: true, - guildOnly: true, - aliases: [], - permLevel: "Administrator", - requiredPerms: [] -}; - -exports.help = { - name: "welcome", - category: "Configure", - description: "Sets the welcome message for this server. try using [[server]], [[user]] and [[members]] in your message!", - usage: "welcome [message] **OR** welcome off" -}; diff --git a/src/commands/woomy.js b/src/commands/woomy.js deleted file mode 100644 index a9e17c4..0000000 --- a/src/commands/woomy.js +++ /dev/null @@ -1,33 +0,0 @@ -const Discord = require("discord.js") -exports.run = async (client, message) =>{ - message.channel.send("Woomy!") - - const voiceChannel = message.member.voice.channel; - - if (!voiceChannel) return; - if (!voiceChannel.permissionsFor(message.client.user).has('CONNECT')) return; - if (!voiceChannel.permissionsFor(message.client.user).has('SPEAK')) return; - - if (client.music.getGuild(message.guild.id).playing == true || !client.music.getGuild(message.guild.id).queue[0]) return; - - voiceChannel.join() - .then(connection => { - const dispatcher = connection.play(`/home/container/resources/audio/WOOMY.MP3`); - dispatcher.on("finish", end => {voiceChannel.leave()}); - }) -}; - -exports.conf = { - enabled: true, - guildOnly: false, - aliases: [], - permLevel: "User", - requiredPerms: [] - }; - - exports.help = { - name: "woomy", - category: "Fun", - description: "Woomy!", - usage: "woomy" - }; diff --git a/src/commands/yoda.js b/src/commands/yoda.js deleted file mode 100644 index 496b929..0000000 --- a/src/commands/yoda.js +++ /dev/null @@ -1,33 +0,0 @@ - -const fetch = require("node-fetch") -exports.run = async (client, message, args) => { - const speech = args.join(' '); - if (!speech) { - return message.channel.send(`<:error:466995152976871434> Please include text for me to convert to yodish. Yes.`) - }; - message.channel.startTyping(); - try{ - fetch(`http://yoda-api.appspot.com/api/v1/yodish?text=${encodeURIComponent(speech.toLowerCase())}`) - .then(res => res.json()) - .then(json => message.channel.send(json.yodish)); - message.channel.stopTyping(); - } catch(err) { - message.channel.send(`<:error:466995152976871434> An error has occurred: ${err}`); - message.channel.stopTyping(); - }; -}; - -exports.conf = { - enabled: true, - guildOnly: false, - aliases: [], - permLevel: "User", - requiredPerms: [] -}; - - exports.help = { - name: "yoda", - category: "Fun", - description: "Turns any text you input into yodish. Yes.", - usage: "yoda " -}; \ No newline at end of file diff --git a/src/commands/zalgo.js b/src/commands/zalgo.js deleted file mode 100644 index e34d404..0000000 --- a/src/commands/zalgo.js +++ /dev/null @@ -1,30 +0,0 @@ -const zalgo = require("to-zalgo") -exports.run = async (client, message, args) => { - if(!args[0]) { - return message.channel.send(`<:error:466995152976871434> You didn't provide any text! Usage: \`${client.commands.get(`zalgo`).help.usage}\``) - }; - - var output = zalgo(args.join(" ")) - - if(output.length > 2000) { - output = output.slice(0, -Math.abs(output.length - 2000)) - }; - - message.channel.send(output) - }; - - exports.conf = { - enabled: false, - guildOnly: false, - aliases: [], - permLevel: "User", - requiredPerms: [] - }; - - exports.help = { - name: "zalgo", - category: "Fun", - description: "Spoilers every letter in the provided text.", - usage: "zalgo [text]" - }; - \ No newline at end of file diff --git a/src/events/error.js b/src/events/error.js deleted file mode 100644 index 23ce03a..0000000 --- a/src/events/error.js +++ /dev/null @@ -1,3 +0,0 @@ -module.exports = async (client, error) => { - client.logger.log(`d.js err: \n${JSON.stringify(error.stack)}`, "error"); -}; diff --git a/src/events/guildCreate.js b/src/events/guildCreate.js deleted file mode 100644 index 5f0f47f..0000000 --- a/src/events/guildCreate.js +++ /dev/null @@ -1,15 +0,0 @@ -const Discord = require("discord.js"); -module.exports = (client, guild) => { - client.logger.log(`Guild joined.`, "info"); - - client.settings.ensure(guild.id, client.config.defaultSettings); - - if(client.devmode == false) { - channel = client.channels.cache.get("458896120639127552"); - embed = new Discord.MessageEmbed(); - embed.setColor("#F38159"); - embed.setDescription(`Joined a new server with \`${guild.members.cache.size}\` members! I'm now in \`${client.guilds.cache.size}\` servers.`) - channel.send(embed) - }; -}; - diff --git a/src/events/guildDelete.js b/src/events/guildDelete.js deleted file mode 100644 index a4c582d..0000000 --- a/src/events/guildDelete.js +++ /dev/null @@ -1,20 +0,0 @@ -const Discord = require('discord.js'); -module.exports = (client, guild) => { - client.logger.log(`Guild left.`, "info"); - - if(client.devmode === true) return; - - if(!guild.available) { - return; - }; - - channel = client.channels.cache.get("458896120639127552"); - embed = new Discord.MessageEmbed(); - embed.setColor("#9494FF"); - embed.setDescription(`Left a server. I'm now in \`${client.guilds.cache.size}\` servers.`) - channel.send(embed) - - if (client.settings.has(guild.id)) { - client.settings.delete(guild.id); - }; -}; diff --git a/src/events/guildMemberAdd.js b/src/events/guildMemberAdd.js deleted file mode 100644 index 8e0ac6b..0000000 --- a/src/events/guildMemberAdd.js +++ /dev/null @@ -1,94 +0,0 @@ -module.exports = async (client, member) => { - const settings = client.getSettings(member.guild.id); - - if (settings.welcomeMessage !== "off") { - let chanExists = member.guild.channels.cache.get(settings.welcomeChannel) - if (!chanExists) { - return; - }; - welcomeMessage = settings.welcomeMessage.replace("[[user]]", member.user); - welcomeMessage = welcomeMessage.replace("[[server]]", member.guild.name); - welcomeMessage = welcomeMessage.replace("[[members]]", member.guild.memberCount); - - member.guild.channels - .cache.get(settings.welcomeChannel) - .send(welcomeMessage) - .catch(console.error); - } - - if (settings.autorole !== "off") { - let aRole = member.guild.roles.cache.get(settings.autorole) - if (!aRole) { - return; - }; - await member.roles.add(aRole.id).catch(console.error); - }; - - if(settings.raidMode !== "off") { - if(settings.raidModeStrict == "on") { - member.kick("User bounced.") - - if (settings.chatlogsChannel !== "off") { - const channel = member.guild.channels.cache.find( - channel => channel.name === settings.chatlogsChannel - ); - - if (channel) { - let embed = new Discord.MessageEmbed(); - embed.setColor("#1f1f1f"); - embed.setAuthor("User bounced:", member.user.avatarURL({dynamic: true})); - embed.setDescription(`‏‏‎❯ User: ${member} (${member.user.id})`, true); - embed.setFooter(`New users are being automatically kicked because raidmode is enabled.`) - try { - channel.send(embed); - } catch (err) { - // probably no permissions to send messages/embeds there - }; - }; - return; - } - } - let mRole = member.guild.roles.cache.get(settings.mutedRole) - if (!mRole) { - return; - }; - await member.roles.add(mRole.id).catch(console.error); - if (settings.chatlogsChannel !== "off") { - const channel = member.guild.channels.cache.find( - channel => channel.name === settings.chatlogsChannel - ); - - if (channel) { - let embed = new Discord.MessageEmbed(); - embed.setColor("#1f1f1f"); - embed.setAuthor("User automatically muted:", member.user.avatarURL({dynamic: true})); - embed.setDescription(`‏‏‎❯ User: ${member} (${member.user.id})`, true); - embed.setFooter(`New users are being automatically muted because raidmode is enabled.`) - try { - channel.send(embed); - } catch (err) { - // probably no permissions to send messages/embeds there - }; - }; - }; -}; - - if (settings.chatlogsChannel !== "off") { - const channel = member.guild.channels.cache.find( - channel => channel.name === settings.chatlogsChannel - ); - - if (channel) { - let embed = new Discord.MessageEmbed(); - embed.setColor("#0099e1"); - embed.setAuthor("User joined:", member.user.avatarURL({dynamic: true})); - embed.setDescription(`‏‏‎❯ User: ${member} (${member.user.id})`, true); - try { - channel.send({ embed }); - } catch (err) { - // probably no permissions to send messages/embeds there - }; - }; - }; - -}; diff --git a/src/events/guildMemberRemove.js b/src/events/guildMemberRemove.js deleted file mode 100644 index b632ef1..0000000 --- a/src/events/guildMemberRemove.js +++ /dev/null @@ -1,36 +0,0 @@ -module.exports = async (client, member) => { - const settings = client.getSettings(member.guild.id); - - if (settings.leaveMessage !== "off") { - let chanExists = member.guild.channels.cache.get(settings.welcomeChannel) - if (!chanExists) { - return; - }; - leaveMessage = settings.leaveMessage.replace("[[user]]", member.user); - leaveMessage = leaveMessage.replace("[[server]]", member.guild.name); - leaveMessage = leaveMessage.replace("[[members]]", member.guild.memberCount); - - member.guild.channels - .cache.get(settings.welcomeChannel) - .send(leaveMessage) - .catch(console.error); - }; - - if (settings.chatlogsChannel !== "off") { - const channel = member.guild.channels.cache.find( - channel => channel.name === settings.chatlogsChannel - ); - - if (channel) { - let embed = new Discord.MessageEmbed(); - embed.setColor("#006798"); - embed.setAuthor("User left:", member.user.avatarURL({dynamic: true})); - embed.setDescription(`‏‏‎❯ ${member.user.tag} (${member.user.id})`, true); - try { - channel.send({ embed }); - } catch (err) { - // probably no permissions to send messages/embeds there - }; - }; - }; -}; diff --git a/src/events/message.js b/src/events/message.js deleted file mode 100644 index 7c399a8..0000000 --- a/src/events/message.js +++ /dev/null @@ -1,235 +0,0 @@ -const cooldown = new Set(); -module.exports = async (client, message) => { - if (message.author.bot) return; - - var settings; - - if(message.guild) { - settings = message.settings = client.getSettings(message.guild.id) || client.defaultSettings; - } else { - settings= client.config.defaultSettings; - } - - var prefix = settings.prefix; - - if(client.devmode == true) { - prefix = settings.devprefix; - } - - let blacklisted = false; - - if(message.guild) { - - perms = message.channel.permissionsFor(client.user); - - var modRole = message.guild.roles.cache.get(settings.modRole); - var adminRole = message.guild.roles.cache.get(settings.adminRole); - var autorole = message.guild.roles.cache.get(settings.autorole); - var mutedRole = message.guild.roles.cache.get(settings.mutedRole); - var welcomeChannel = message.guild.channels.cache.get(settings.welcomeChannel); - - if(!welcomeChannel && settings.welcomeChannel != "off" || !adminRole && settings.adminRole != "None set" || !modRole && settings.modRole != "None set" || !mutedRole && settings.mutedRole != "None set" || !autorole && settings.autorole != "off") { - - var adminReset = false; - var modReset = false; - var mutedReset = false; - var autoReset = false; - var welcomeReset = false; - - if(!adminRole && settings.adminRole != "None set") { - var role = message.guild.roles.cache.find(r => r.name === settings.adminRole); - if(!role) { - adminReset = true; - client.settings.set(message.guild.id, client.config.defaultSettings.adminRole, "adminRole"); - } else { - client.settings.set(message.guild.id, role.id, "adminRole"); - }; - }; - - if(!mutedRole && settings.mutedRole != "None set") { - var role = message.guild.roles.cache.find(r => r.name === settings.mutedRole); - if(!role) { - mutedReset = true; - client.settings.set(message.guild.id, client.config.defaultSettings.mutedRole, "mutedRole"); - } else { - client.settings.set(message.guild.id, role.id, "mutedRole"); - }; - }; - - if(!modRole && settings.modRole != "None set") { - var role = message.guild.roles.cache.find(r => r.name === settings.modRole); - if(!role) { - modReset = true; - client.settings.set(message.guild.id, client.config.defaultSettings.modRole, "modRole"); - } else { - client.settings.set(message.guild.id, role.id, "modRole"); - }; - }; - - if(!autorole && settings.autorole != "off") { - var role = message.guild.roles.cache.find(r => r.name === settings.autorole); - if(!role) { - autoReset = true; - client.settings.set(message.guild.id, client.config.defaultSettings.autorole, "autorole"); - } else { - client.settings.set(message.guild.id, role.id, "autorole"); - }; - }; - - if(!welcomeChannel && settings.welcomeChannel != "off") { - var channel = message.guild.channels.cache.find(c => c.name === settings.welcomeChannel); - if(!channel) { - welcomeReset = true; - client.settings.set(message.guild.id, client.config.defaultSettings.welcomeChannel, "welcomeChannel"); - } else { - client.settings.set(message.guild.id, channel.id, "welcomeChannel"); - }; - }; - - var errors = ""; - if(adminReset == true) { - adminReset = false; - errors += ", `admin role`"; - }; - - if(modReset == true) { - modReset = false; - errors += ", `mod role`"; - }; - - if(mutedReset == true) { - mutedReset = false; - errors += ", `muted role`"; - }; - - if(autoReset == true) { - autoReset = false; - errors += ", `autorole`"; - }; - - if(welcomeReset == true) { - welcomeReset = false;; - errors += ", `join/leave channel`"; - }; - - if(errors.length > 1) { - var errors = errors.substr(2); - message.channel.send(`<:error:466995152976871434> A role or channel was deleted, and the following settings have been restored to their default values: ${errors}`); - }; - }; - - if (!message.member) { - await message.guild.members.fetch(message.author); - }; - - if(message.settings.blacklisted != "ARRAY" && settings.blacklisted.length > 0) { - settings.blacklisted.forEach(function(ID) { - if(ID == message.author.id) { - blacklisted = true; - } - }); - }; - }; - - //const prefixMention = new RegExp(`^<@!?${client.user.id}>( |)$`); - const myMention = `<@&${client.user.id}>`; - const myMention2 = `<@!${client.user.id}>`; - - if (message.content.startsWith(myMention) || message.content.startsWith(myMention2)) { - if(message.content.length > myMention.length + 1 && (message.content.substr(0, myMention.length + 1) == myMention + ' ' || message.content.substr(0, myMention2.length + 1) == myMention2 + ' ')) { - prefix = message.content.substr(0, myMention.length) + ' '; - } else { - return message.channel.send(`Current prefix: \`${prefix}\``); - }; - }; - - if (message.content.indexOf(prefix) !== 0) return; - - const args = message.content.slice(prefix.length).trim().split(/ +/g); - const command = args.shift().toLowerCase(); - const cmd = client.commands.get(command) || client.commands.get(client.aliases.get(command)); - - if (!cmd) return; - - if (cooldown.has(message.author.id)) { - return message.channel.send( - `⏱️ You are being ratelimited. Please try again in 2 seconds.` - ).then(msg => { - msg.delete({timeout: 2000}); - }); - }; - - if (message.guild && !perms.has('SEND_MESSAGES')) { - return message.author.send(`<:error:466995152976871434> I don't have permission to speak in **#${message.channel.name}**, Please ask a moderator to give me the send messages permission!`); - }; - - if(message.guild && blacklisted == true) { - try { - return message.author.send( - `<:denied:466995195150336020> You have been blacklisted from using commands in \`${message.guild.name}\`` - ); - } catch(err) { - client.logger.log(err, "error") - }; - }; - - if (cmd && !message.guild && cmd.conf.guildOnly) - return message.channel.send("<:denied:466995195150336020> This command is unavailable in DM's. Try running it in a server I'm in!"); - - if (message.guild) { - var missing = cmd.conf.requiredPerms.filter(p => !perms.has(p)) - if(missing.length > 0) { - missing = "`" + (missing.join("`, `")) + "`"; - return message.channel.send(`<:error:466995152976871434> Missing permissions: ${missing}`) - }; - }; - - const level = client.permlevel(message); - - if(cmd.conf.permLevel == "Developer") { - var isDeveloper; - if(message.client.config.owners.includes(message.author.id)) { - isDeveloper = true; - } - if(isDeveloper != true) { - return message.channel.send("<:denied:466995195150336020> This command can only be used by my developers!") - } - } - - if (level < client.levelCache[cmd.conf.permLevel]) { - var usrlvl = client.levelCache[cmd.conf.permLevel]; - if (usrlvl === 1) var displevel = "Moderator"; - if (usrlvl === 2) var displevel = "Administrator"; - if (usrlvl === 3) var displevel = "Server Owner"; - - if (!modRole && usrlvl < 2 && cmd.conf.permLevel == "Moderator" && message.guild) { - return message.channel.send("<:error:466995152976871434> No moderator role set! Please ask the server owner to set one with `" + message.settings.prefix + "modrole `") - } - - if (!adminRole && usrlvl < 3 && cmd.conf.permLevel == "Administrator" && message.guild) { - return message.channel.send("<:error:466995152976871434> No administrator role set! Please ask the server owner to set one with `" + message.settings.prefix + "adminrole `") - } - - var englesh = "a"; - if (displevel === "Administrator") englesh = "an"; - if (displevel === "Server Owner") englesh = "the"; - return message.channel.send(`<:denied:466995195150336020> You need to be ${englesh} ${displevel} to run this command!`); - } - - message.author.permLevel = level; - - message.flags = []; - while (args[0] && args[0][0] === "-") { - message.flags.push(args.shift().slice(1)); - }; - - cooldown.add(message.author.id); - - setTimeout(() => { - cooldown.delete(message.author.id); - }, 2000); - - client.logger.cmd(`${client.config.permLevels.find(l => l.level === level).name} ${message.author.username} (${message.author.id}) ran command ${cmd.help.name}`); - - cmd.run(client, message, args, level); -}; diff --git a/src/events/messageDelete.js b/src/events/messageDelete.js deleted file mode 100644 index c697f3e..0000000 --- a/src/events/messageDelete.js +++ /dev/null @@ -1,40 +0,0 @@ -const Discord = require("discord.js"); - -module.exports = (client, message) => { - if (message.author.bot) return; - - const settings = (message.settings = client.getSettings(message.guild.id)); - - if (settings.chatlogsChannel !== "off") { - const channel = message.guild.channels.cache.find( - channel => channel.name === settings.chatlogsChannel - ) - - var msg = message.content; - - if(!message.member) { - return; - } - - if(msg.length + message.member.user.username.length + message.member.user.id.length + message.channel.name.length + 2 > 2048) { - return; - } - - if (channel) { - let embed = new Discord.MessageEmbed(); - embed.setColor("#f93a2f"); - embed.setAuthor("Message deleted!", message.member.user.avatarURL({dynamic: true})); - if (msg == "") { - msg = "**An image was deleted, but is not shown for privacy reasons.**" - } else { - msg = `\`${msg}\`` - }// image-only; maybe we can add image logging too but depends privacy (if someone sends like personal stuff accidentally) - embed.setDescription(`❯ Author: ${message.member} (${message.member.user.id})\n❯ Channel: ${message.channel}\n❯ Message: ${msg}`) - try { - channel.send({ embed }); - } catch (err) { - // probably no permissions to send messages/embeds there - }; - }; - }; -}; diff --git a/src/events/messageUpdate.js b/src/events/messageUpdate.js deleted file mode 100644 index c6aa6e8..0000000 --- a/src/events/messageUpdate.js +++ /dev/null @@ -1,40 +0,0 @@ -const Discord = require("discord.js"); - -module.exports = (client, omsg, nmsg) => { - if (nmsg.content === omsg.content) return; - - const settings = (omsg.settings = nmsg.settings = client.getSettings( - nmsg.guild.id - )); - - if (settings.chatlogsChannel !== "off") { - const channel = nmsg.guild.channels.cache.find( - channel => channel.name === settings.chatlogsChannel - ); - - if (channel) { - let embed = new Discord.MessageEmbed(); - embed.setColor("#fff937"); - embed.setAuthor("Message Edited!", nmsg.member.user.avatarURL({dynamic: true})); - if (omsg.content == "") { - omsg.content = "**[IMAGE]**" - } else if (nmsg.content == "") { - nmsg.content = `**[IMAGE]**` - } else { - omsg.content = `\`${omsg.content}\`` - nmsg.content = `\`${nmsg.content}\`` - } - - if(omsg.content.length + nmsg.content.length + nmsg.member.user.username.length + nmsg.member.user.id.length + nmsg.channel.name.length + 2 > 2048) { - return; - } - - embed.setDescription(`• Author: ${nmsg.member} (${nmsg.member.user.id})\n• Channel: ${nmsg.channel}\n• Old message: ${omsg.content}\n• New message: ${nmsg.content}`) - try { - channel.send({ embed }); - } catch (err) { - // probably no permissions to send messages/embeds there - }; - }; - }; -}; diff --git a/src/events/ready.js b/src/events/ready.js deleted file mode 100644 index 532cd8c..0000000 --- a/src/events/ready.js +++ /dev/null @@ -1,60 +0,0 @@ -const moment = require("moment"); -module.exports = client => { - - const timestamp = `${moment().format("YYYY-MM-DD HH:mm:ss")}`; - const activityArray = client.commands.keyArray(); - - client.lockActivity = false; - - let guild, channel, channel1; - - if(client.config.loggingServer.length > 0) { - try { - guild = client.guilds.cache.get(client.config.loggingServer) - } catch(err) { - client.logger.error("Could not find loggingServer server (is the ID valid?):\n" + err); - process.exit(1); - }; - - if(client.config.consoleLogs.length > 0) { - try { - channel1 = guild.channels.cache.get(client.config.consoleLogs) - } catch(err) { - client.logger.error("Could not find consoleLogs channel (is the ID valid?):\n" + err); - process.exit(1); - }; - }; - - if(client.config.startupLogs.length > 0) { - try { - channel = guild.channels.cache.get(client.config.startupLogs) - } catch(err) { - client.logger.error("Could not find startupLogs channel (is the ID valid?):\n" + err); - process.exit(1); - }; - }; - }; - - if(client.devmode == true) { - client.logger.warn("Running in development mode.") - prefix = client.config.defaultSettings.devprefix; - } else { - prefix = client.config.defaultSettings.prefix; - if(channel) { - channel.send(`Bot started at \`${timestamp}\``); - }; - }; - - let randomActivity = activityArray.random(); - - client.user.setActivity(`${prefix + randomActivity} | v${client.version.number}`, {type: "PLAYING"}); - - setInterval(() => { - randomActivity = activityArray.random(); - if(client.lockActivity == false) { - client.user.setActivity(`${prefix + randomActivity} | v${client.version.number}`, {type: "PLAYING"}); - }; - }, 30000); - - client.logger.log(`Connected to Discord as ${client.user.tag} | v${client.version.number}`, 'ready'); -}; diff --git a/src/modules/Logger.js b/src/modules/Logger.js deleted file mode 100644 index e924961..0000000 --- a/src/modules/Logger.js +++ /dev/null @@ -1,90 +0,0 @@ -const chalk = require("chalk"); -const moment = require("moment"); - -exports.log = (content, type = "log") => { - const timestamp = `[${moment().format("YYYY-MM-DD HH:mm:ss")}]`; - - let channel; - - try { - channel = client.guilds.cache.get(client.config.loggingServer).channels.cache.get(client.config.consoleLogs); - } catch(err) {}; - - var logToServer = false; - - if(client.devmode === false && channel && client.guilds.cache.get(client.config.loggingServer).available) { - logToServer = true; - }; - - switch (type) { - case "info": { - try { - if (logToServer == true) { - channel.send(`\`${timestamp}\` \`[${type.toUpperCase()}]\` ` + content); - }; - } catch(err) {}; - return console.log(`${timestamp} ${chalk.cyanBright(`[${type.toUpperCase()}]`)} ${content} `); - }; - - case "warn": { - try { - if (logToServer == true) { - channel.send(`\`${timestamp}\` \`[${type.toUpperCase()}]\` ` + content); - }; - } catch(err) {}; - return console.log(`${timestamp} ${chalk.yellowBright(`[${type.toUpperCase()}]`)} ${content} `); - }; - - case "error": { - try { - if (logToServer == true) { - channel.send(`\`${timestamp}\` \`[${type.toUpperCase()}]\` ` + content); - }; - } catch(err) {} - return console.log(`${timestamp} ${chalk.redBright(`[${type.toUpperCase()}]`)} ${content} `); - }; - - case "debug": { - try { - if (logToServer == true) { - channel.send(`\`${timestamp}\` \`[${type.toUpperCase()}]\` ` + content); - }; - } catch(err) {}; - return console.log(`${timestamp} ${chalk.magentaBright(`[${type.toUpperCase()}]`)} ${content} `); - }; - - case "cmd": { - try { - if (logToServer == true) { - channel.send(`\`${timestamp}\` \`[${type.toUpperCase()}]\` ` + content); - }; - } catch(err) {}; - return console.log(`${timestamp} ${chalk.whiteBright(`[${type.toUpperCase()}]`)} ${content}`); - }; - - case "ready": { - try { - if (logToServer == true) { - channel.send(`\`${timestamp}\` \`[${type.toUpperCase()}]\` ` + content); - }; - } catch(err) {}; - return console.log(`${timestamp} ${chalk.greenBright (`[${type.toUpperCase()}]`)} ${content}`); - }; - - default: throw new TypeError("Logger type must be either warn, debug, info, ready, cmd or error."); - }; -}; - -exports.error = (...args) => this.log(...args, "error"); - -exports.warn = (...args) => this.log(...args, "warn"); - -exports.debug = (...args) => this.log(...args, "debug"); - -exports.info = (...args) => this.log(...args, "info"); - -exports.cmd = (...args) => this.log(...args, "cmd"); - -exports.setClient = function(c) { - client = c; -}; diff --git a/src/modules/functions.js b/src/modules/functions.js deleted file mode 100644 index a30dd4b..0000000 --- a/src/modules/functions.js +++ /dev/null @@ -1,382 +0,0 @@ -const ytdl = require('ytdl-core-discord'); -const youtubeInfo = require('youtube-info'); -const getYoutubeId = require('get-youtube-id'); -const fetch = require('node-fetch'); - -module.exports = client => { - // Permission level function - client.permlevel = message => { - let permlvl = 0; - - const permOrder = client.config.permLevels - .slice(0) - .sort((p, c) => (p.level < c.level ? 1 : -1)); - - while (permOrder.length) { - const currentLevel = permOrder.shift(); - if (message.guild && currentLevel.guildOnly) continue; - if (currentLevel.check(message)) { - permlvl = currentLevel.level; - break; - } - } - return permlvl; - }; - - // Guild settings function - client.getSettings = guild => { - const defaults = client.config.defaultSettings || {}; - if (!guild) return defaults; - const guildData = client.settings.get(guild) || {}; - const returnObject = {}; - Object.keys(defaults).forEach(key => { - returnObject[key] = guildData[key] ? guildData[key] : defaults[key]; - }); - return returnObject; - }; - - // Single line await messages - client.awaitReply = async (msg, question, limit = 60000) => { - const filter = m => m.author.id === msg.author.id; - await msg.channel.send(question); - try { - const collected = await msg.channel.awaitMessages(filter, { - max: 1, - time: limit, - errors: ["time"] - }); - return collected.first().content; - } catch (e) { - return false; - } - }; - - // Message clean function - client.clean = async (client, text) => { - if (text && text.constructor.name == "Promise") text = await text; - if (typeof evaled !== "string") - text = require("util").inspect(text, { depth: 1 }); - - text = text - .replace(/`/g, "`" + String.fromCharCode(8203)) - .replace(/@/g, "@" + String.fromCharCode(8203)) - .replace( - client.token, - "NaKzDzgwNDef1Nitl3YmDAy.tHEvdg.r34L.whl7sTok3N.18n4Ryj094p" - ); - - return text; - }; - - client.loadCommand = commandName => { - try { - const props = require(`../commands/${commandName}`); - if (props.init) { - props.init(client); - } - client.commands.set(props.help.name, props); - props.conf.aliases.forEach(alias => { - client.aliases.set(alias, props.help.name); - }); - return false; - } catch (e) { - return `Failed to load command ${commandName}: ${e}`; - }; - }; - - client.unloadCommand = async commandName => { - let command; - if (client.commands.has(commandName)) { - command = client.commands.get(commandName); - } else if (client.aliases.has(commandName)) { - command = client.commands.get(client.aliases.get(commandName)); - }; - if (!command) - return `<:error:466995152976871434> The command \`${commandName}\` could not be found.`; - - if (command.shutdown) { - await command.shutdown(client); - }; - const mod = require.cache[require.resolve(`../commands/${commandName}`)]; - delete require.cache[require.resolve(`../commands/${commandName}.js`)]; - for (let i = 0; i < mod.parent.children.length; i++) { - if (mod.parent.children[i] === mod) { - mod.parent.children.splice(i, 1); - break; - }; - }; - return false; - }; - - // MEMBER SEARCH - client.searchForMembers = function(guild, query) { - if (!query) return; - query = query.toLowerCase(); - - var a = []; - var b; - - try { - b = guild.members.cache.find(x => x.displayName.toLowerCase() == query); - if (!b) guild.members.cache.find(x => x.user.username.toLowerCase() == query); - } catch (err) {}; - if (b) a.push(b); - guild.members.cache.forEach(member => { - if ( - (member.displayName.toLowerCase().startsWith(query) || - member.user.tag.toLowerCase().startsWith(query)) && - member.id != (b && b.id) - ) { - a.push(member); - }; - }); - return a; - }; - - // USER OBJECT FROM MENTION - client.getUserFromMention = mention => { - if (!mention) return; - - if (mention.startsWith('<@') && mention.endsWith('>')) { - mention = mention.slice(2, -1); - - if (mention.startsWith('!')) { - mention = mention.slice(1); - } - - return client.users.cache.get(mention); - } - } - - - // MUSIC - client.music = {guilds: {}}; - - client.music.isYoutubeLink = function(input) { - return input.startsWith('https://www.youtube.com/') || input.startsWith('http://www.youtube.com/') || input.startsWith('https://youtube.com/') || input.startsWith('http://youtube.com/') || input.startsWith('https://youtu.be/') || input.startsWith('http://youtu.be/') || input.startsWith('http://m.youtube.com/') || input.startsWith('https://m.youtube.com/'); - } - - client.music.search = async function(query) - { - return new Promise(function(resolve, reject) - { - try{ - fetch("https://www.googleapis.com/youtube/v3/search?part=id&type=video&q=" + encodeURIComponent(query) + "&key=" + client.config.ytkey) - .then(res => res.json()) - .then(json => { - if(!json.items) { reject(); return; } - resolve(json.items[0]); - }); - } catch (err) { - client.logger.error("Music search err: ", err); - throw err; - }; - }); - } - - client.music.getGuild = function(id) - { - if(client.music.guilds[id]) return client.music.guilds[id]; - - return client.music.guilds[id] = - { - queue: [], - playing: false, - paused: false, - dispatcher: null, - skippers: [] - } - } - - client.music.getMeta = async function(id) - { - return new Promise(function(resolve, reject) - { - youtubeInfo(id, function(err, videoInfo) - { - if(err) throw err; - - resolve(videoInfo); - }); - }); - } - - client.music.play = async function(message, input, bypassQueue) - { - let voiceChannel = message.member.voice.channel; - if(!voiceChannel) return message.channel.send('<:error:466995152976871434> You need to be in a voice channel to use this command!'); - - let permissions = voiceChannel.permissionsFor(client.user); - if (!permissions.has('CONNECT')) { - return message.channel.send('<:error:466995152976871434> I do not have permission to join your voice channel.'); - } - if (!permissions.has('SPEAK')) { - return message.channel.send('<:error:466995152976871434> I do not have permission to join your voice channel.'); - } - if (voiceChannel.joinable != true) { - return message.channel.send("<:error:466995152976871434> I do not have permission to join your voice channel.") - } - - let id = undefined; - - if(client.music.isYoutubeLink(input)) - { - id = await getYoutubeId(input) - } else { - let item = await client.music.search(input); - if(!item) { - return message.channel.send(`<:error:466995152976871434> No results found.`); - }; - id = item.id.videoId; - } - - if(client.music.getGuild(message.guild.id).queue.length == 0 || bypassQueue) - { - let meta = await client.music.getMeta(id); - - if(!bypassQueue) client.music.getGuild(message.guild.id).queue.push({input: input, id: id, requestedBy: message.author, title: meta.title, author: meta.owner, thumbnail: meta.thumbnailUrl, duration: meta.duration}); - - let connection = await new Promise((resolve, reject) => - { - voiceChannel.join().then((connection) => - { - resolve(connection); - }); - }); - - function end(silent) - { - client.music.getGuild(message.guild.id).queue.shift(); - client.music.getGuild(message.guild.id).dispatcher = null; - - if(client.music.getGuild(message.guild.id).queue.length > 0) - { - client.music.play(message, client.music.getGuild(message.guild.id).queue[0].input, true); - } else { - client.music.getGuild(message.guild.id).playing = false; - - if(!silent) { - message.channel.send("<:play:467216788187512832> Queue is empty! Disconnecting from the voice channel."); - } - - connection.disconnect(); - } - } - - client.music.getGuild(message.guild.id).playing = true; - - let song = client.music.getGuild(message.guild.id).queue[0]; - - try - { - let dispatcher = client.music.getGuild(message.guild.id).dispatcher = connection.play(await ytdl("https://www.youtube.com/watch?v=" + id, {highWaterMark: 1024 * 1024 * 32}), {type: 'opus'}); - - dispatcher.on('finish', (a, b) => - { - end(a == "silent"); - }); - } catch(err) { - message.channel.send('<:error:466995152976871434> Failed to play **' + song.title + '** ' + err); - - end(); - } - - client.music.getGuild(message.guild.id).skippers = []; - message.channel.send(`<:play:467216788187512832> Now playing: **${song.title}**`); - } else { - let meta = await client.music.getMeta(id); - let song = {input: input, id: id, requestedBy: message.author, title: meta.title, author: meta.owner, thumbnail: meta.thumbnailUrl, duration: meta.duration}; - - client.music.getGuild(message.guild.id).queue.push(song); - - message.channel.send(`<:success:466995111885144095> Added to queue: **${song.title}**`); - } - } - - // MUSIC - TIMESTAMP - client.createTimestamp = function(duration){ - hrs = ~~(duration / 60 / 60), - min = ~~(duration / 60) % 60, - sec = ~~(duration - min * 60); - - if(String(hrs).length < 2) { - hrs = "0" + String(hrs) + ":"; - }; - - if(String(min).length < 2) { - min = "0" + String(min); - }; - - if(String(sec).length < 2) { - sec = "0" + String(sec); - }; - - if(hrs == "00:") { - hrs = ""; - } - - var time = hrs + min + ":" + sec; - return time; - }; - - //FIND ROLE - client.findRole = function(input, message) { - var role; - role = message.guild.roles.cache.find(r => r.name.toLowerCase() === input.toLowerCase()); - if(!role) { - role = message.guild.roles.cache.get(input.toLowerCase()); - }; - - if(!role) { - return; - }; - - return role; - }; - - // EMBED COLOUR - client.embedColour = function(msg) { - if(!msg.guild) { - return ["#ff9d68", "#ff97cb", "#d789ff", "#74FFFF"].random(); - } else { - return msg.guild.member(client.user).displayHexColor; - }; - }; - - // FIND RANDOM INT BETWEEN TWO INTEGERS - client.intBetween = function(min, max){ - return Math.round((Math.random() * (max - min))+min); - }; - - - // .toPropercase() returns a proper-cased string - Object.defineProperty(String.prototype, "toProperCase", { - value: function() { - return this.replace( - /([^\W_]+[^\s-]*) */g, - txt => txt.charAt(0).toUpperCase() + txt.substr(1).toLowerCase() - ); - } - }); - - // .random() returns a single random element from an array - Object.defineProperty(Array.prototype, "random", { - value: function() { - return this[Math.floor(Math.random() * this.length)]; - } - }); - - // `await client.wait(1000);` to "pause" for 1 second. - client.wait = require("util").promisify(setTimeout); - - // These 2 process methods will catch exceptions and give *more details* about the error and stack trace. - process.on("uncaughtException", err => { - const errorMsg = err.stack.replace(new RegExp(`${__dirname}/`, "g"), "./"); - client.logger.error(`Uncaught Exception: ${errorMsg}`); - process.exit(1); - }); - - process.on("unhandledRejection", err => { - client.logger.error(`Unhandled rejection: ${err.stack}`); - }); -}; diff --git a/version.json b/version.json deleted file mode 100644 index 6d6b7a3..0000000 --- a/version.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "number": "1.2.3", - "changelog": "**1.2.0 CHANGELOG:**\n> • Added action commands! (`cuddle`, `feed`, `hug`, `kiss`, `pat`, `poke`, `slap`, `smug`, `tickle`)\n> • Added `fact`\n> • Added `catfact`\n> • Added `dogfact`\n> • Added `yoda`\n> • Added `dice`\n> • Added `spoilerise`\n> • Added `zalgo`\n> • Added `dog`\n> • Added `cat`\n> • Added `lizard`\n> • Added `neko`\n> • Added `nekogif`\n> • Added `kemonomimi`\n> • Added `foxgirl`\n> • Added `identity`\n> • Added `pronouns`\n> • Added `sexuality`\n> • Added `ship`\n> • Renamed `flip to `coinflip` (flip remains as an alias)\n> • Renamed `math` to `calculate` (math is an alias)\n> • @Woomy is now a prefix\n> • Added the `inspire` alias to `inspirobot`\n> • Help now displays the amount of commands in each category\n> • Bots now get a badge in `userinfo`\n> • `roleinfo` now displays what permissions a role has\n> • small changes to `weather`\n> • Woomy now has clear logging of issues that prevent her from starting\n> • request npm module has been swapped out for node-fetch\n**NOTES:**\n> Thank you to Terryiscool160 for creating multiple commands used in this update" -} From 60e27f40ad31c7d8653426c646e7ea46fb6ce057 Mon Sep 17 00:00:00 2001 From: mudkipscience Date: Sun, 29 Mar 2020 18:45:09 +1100 Subject: [PATCH 002/156] First commit woo --- .gitignore | 2 + LICENSE | 674 +++++++++++++++++++++++++++++++++++++++++++ README.md | 5 + commands/ready.js | 0 config.js | 0 events/ping.js | 0 index.js | 33 +++ modules/functions.js | 3 + modules/logger.js | 0 package-lock.json | 110 +++++++ 10 files changed, 827 insertions(+) create mode 100644 .gitignore create mode 100644 LICENSE create mode 100644 README.md create mode 100644 commands/ready.js create mode 100644 config.js create mode 100644 events/ping.js create mode 100644 index.js create mode 100644 modules/functions.js create mode 100644 modules/logger.js create mode 100644 package-lock.json diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..97aca2e --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +.env +node_modules \ No newline at end of file diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..94a9ed0 --- /dev/null +++ b/LICENSE @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/README.md b/README.md new file mode 100644 index 0000000..a13b776 --- /dev/null +++ b/README.md @@ -0,0 +1,5 @@ +# woomy-next +Rewrite of Woomy's codebase, because I'm getting really sick of working on shitty two year-old code. If you aren't a developer, please switch back to the master branch! +# notes for devs +- config.js no longer stores tokens, for that you will need to use a .env file. +- please use the StandardJS linter when writing code for Woomy. \ No newline at end of file diff --git a/commands/ready.js b/commands/ready.js new file mode 100644 index 0000000..e69de29 diff --git a/config.js b/config.js new file mode 100644 index 0000000..e69de29 diff --git a/events/ping.js b/events/ping.js new file mode 100644 index 0000000..e69de29 diff --git a/index.js b/index.js new file mode 100644 index 0000000..83c202e --- /dev/null +++ b/index.js @@ -0,0 +1,33 @@ +// Woomy version 2 +// Copyright 2020 mudkipscience + +if (Number(process.version.slice(1).split('.')[0]) < 13) { + console.log('NodeJS 12.0.0 or higher is required. Please update NodeJS on your system.') + process.exit() +} + +const fs = require('fs') + +if (fs.existsSync('./.env') === false) { + console.log('.env file not found!') + process.exit() +} + +if (fs.existsSync('./config.js') === false) { + console.log('config file not found!') + process.exit() +} + +require('dotenv').config() + +const Discord = require('discord.js') +const client = new Discord.Client({ disabledEvents: ['TYPING_START'] }) + +client.commands = new Discord.Collection() +client.aliases = new Discord.Collection() + +const init = async () => { + +} + +init() diff --git a/modules/functions.js b/modules/functions.js new file mode 100644 index 0000000..54307d6 --- /dev/null +++ b/modules/functions.js @@ -0,0 +1,3 @@ +module.exports = client => { + +} diff --git a/modules/logger.js b/modules/logger.js new file mode 100644 index 0000000..e69de29 diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 0000000..e17ec12 --- /dev/null +++ b/package-lock.json @@ -0,0 +1,110 @@ +{ + "requires": true, + "lockfileVersion": 1, + "dependencies": { + "@discordjs/collection": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/@discordjs/collection/-/collection-0.1.5.tgz", + "integrity": "sha512-CU1q0UXQUpFNzNB7gufgoisDHP7n+T3tkqTsp3MNUkVJ5+hS3BCvME8uCXAUFlz+6T2FbTCu75A+yQ7HMKqRKw==" + }, + "abort-controller": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz", + "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==", + "requires": { + "event-target-shim": "^5.0.0" + } + }, + "asynckit": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", + "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=" + }, + "combined-stream": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", + "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", + "requires": { + "delayed-stream": "~1.0.0" + } + }, + "delayed-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", + "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=" + }, + "discord.js": { + "version": "12.1.1", + "resolved": "https://registry.npmjs.org/discord.js/-/discord.js-12.1.1.tgz", + "integrity": "sha512-Y6+QfAUZkb9cy27cfNqUigAgYVSKTw9jPF3mN4UDMih3Em3VQ0WjGBdX1UbE8CwFkLOu5XWQSNPdsoStTR8c2Q==", + "requires": { + "@discordjs/collection": "^0.1.5", + "abort-controller": "^3.0.0", + "form-data": "^3.0.0", + "node-fetch": "^2.6.0", + "prism-media": "^1.2.0", + "setimmediate": "^1.0.5", + "tweetnacl": "^1.0.3", + "ws": "^7.2.1" + } + }, + "dotenv": { + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-8.2.0.tgz", + "integrity": "sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw==" + }, + "event-target-shim": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz", + "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==" + }, + "form-data": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.0.tgz", + "integrity": "sha512-CKMFDglpbMi6PyN+brwB9Q/GOw0eAnsrEZDgcsH5Krhz5Od/haKHAX0NmQfha2zPPz0JpWzA7GJHGSnvCRLWsg==", + "requires": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "mime-types": "^2.1.12" + } + }, + "mime-db": { + "version": "1.43.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.43.0.tgz", + "integrity": "sha512-+5dsGEEovYbT8UY9yD7eE4XTc4UwJ1jBYlgaQQF38ENsKR3wj/8q8RFZrF9WIZpB2V1ArTVFUva8sAul1NzRzQ==" + }, + "mime-types": { + "version": "2.1.26", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.26.tgz", + "integrity": "sha512-01paPWYgLrkqAyrlDorC1uDwl2p3qZT7yl806vW7DvDoxwXi46jsjFbg+WdwotBIk6/MbEhO/dh5aZ5sNj/dWQ==", + "requires": { + "mime-db": "1.43.0" + } + }, + "node-fetch": { + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz", + "integrity": "sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==" + }, + "prism-media": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/prism-media/-/prism-media-1.2.1.tgz", + "integrity": "sha512-R3EbKwJiYlTvGwcG1DpUt+06DsxOGS5W4AMEHT7oVOjG93MjpdhGX1whHyjnqknylLMupKAsKMEXcTNRbPe6Vw==" + }, + "setimmediate": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz", + "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=" + }, + "tweetnacl": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-1.0.3.tgz", + "integrity": "sha512-6rt+RN7aOi1nGMyC4Xa5DdYiukl2UWCbcJft7YhxReBGQD7OAM8Pbxw6YMo4r2diNEA8FEmu32YOn9rhaiE5yw==" + }, + "ws": { + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.2.3.tgz", + "integrity": "sha512-HTDl9G9hbkNDk98naoR/cHDws7+EyYMOdL1BmjsZXRUjf7d+MficC4B7HLUPlSiho0vg+CWKrGIt/VJBd1xunQ==" + } + } +} From 589676eab1dd10dc37310b11fe2138874339c9fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Hor=C3=A1=C4=8Dek?= Date: Mon, 30 Mar 2020 10:25:02 +0200 Subject: [PATCH 003/156] add data to gitignore --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 97aca2e..dce4704 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ .env -node_modules \ No newline at end of file +node_modules +data \ No newline at end of file From 07d760e0660f51f9bc20f724fec7fd38344e1e09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Hor=C3=A1=C4=8Dek?= Date: Mon, 30 Mar 2020 10:40:45 +0200 Subject: [PATCH 004/156] Move files to their correct locations --- {events => commands}/ping.js | 0 {commands => events}/ready.js | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename {events => commands}/ping.js (100%) rename {commands => events}/ready.js (100%) diff --git a/events/ping.js b/commands/ping.js similarity index 100% rename from events/ping.js rename to commands/ping.js diff --git a/commands/ready.js b/events/ready.js similarity index 100% rename from commands/ready.js rename to events/ready.js From e17877548c207a8ec810477c710ac0fc6b3c1d1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Hor=C3=A1=C4=8Dek?= Date: Mon, 30 Mar 2020 10:46:36 +0200 Subject: [PATCH 005/156] Testing ready event --- events/ready.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/events/ready.js b/events/ready.js index e69de29..3a9cd83 100644 --- a/events/ready.js +++ b/events/ready.js @@ -0,0 +1,3 @@ +module.exports = (client) => { + console.log('Discord client ready!'); +}; \ No newline at end of file From f6f0ad7a94cfd97d63eddaadf19d7813cbe691fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Hor=C3=A1=C4=8Dek?= Date: Mon, 30 Mar 2020 10:46:56 +0200 Subject: [PATCH 006/156] package-lock.json changes? --- package-lock.json | 1770 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 1770 insertions(+) diff --git a/package-lock.json b/package-lock.json index e17ec12..5b6edc5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7,6 +7,30 @@ "resolved": "https://registry.npmjs.org/@discordjs/collection/-/collection-0.1.5.tgz", "integrity": "sha512-CU1q0UXQUpFNzNB7gufgoisDHP7n+T3tkqTsp3MNUkVJ5+hS3BCvME8uCXAUFlz+6T2FbTCu75A+yQ7HMKqRKw==" }, + "@discordjs/opus": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/@discordjs/opus/-/opus-0.1.0.tgz", + "integrity": "sha512-VWsrsgqSktxOEHx9SFcnOWJhYQOsyzaW3JVN73LDSzKrycEjtRIS+axlm4qeMGx60u6RH1SY15b3pl5G4+Y+gA==", + "requires": { + "node-addon-api": "^2.0.0", + "node-pre-gyp": "^0.14.0" + } + }, + "@types/color-name": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz", + "integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==" + }, + "@types/node": { + "version": "13.9.5", + "resolved": "https://registry.npmjs.org/@types/node/-/node-13.9.5.tgz", + "integrity": "sha512-hkzMMD3xu6BrJpGVLeQ3htQQNAcOrJjX7WFmtK8zWQpz2UJf13LCFF2ALA7c9OVdvc2vQJeDdjfR35M0sBCxvw==" + }, + "abbrev": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", + "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==" + }, "abort-controller": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz", @@ -15,11 +39,209 @@ "event-target-shim": "^5.0.0" } }, + "ajv": { + "version": "6.12.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.0.tgz", + "integrity": "sha512-D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw==", + "requires": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + } + }, + "ansi-regex": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" + }, + "ansi-styles": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", + "requires": { + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" + } + }, + "aproba": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz", + "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==" + }, + "are-we-there-yet": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz", + "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==", + "requires": { + "delegates": "^1.0.0", + "readable-stream": "^2.0.6" + } + }, + "argparse": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", + "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", + "requires": { + "sprintf-js": "~1.0.2" + }, + "dependencies": { + "sprintf-js": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", + "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=" + } + } + }, + "asn1": { + "version": "0.2.4", + "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz", + "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==", + "requires": { + "safer-buffer": "~2.1.0" + } + }, + "assert-plus": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", + "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=" + }, "asynckit": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=" }, + "aws-sign2": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", + "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=" + }, + "aws4": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.9.1.tgz", + "integrity": "sha512-wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug==" + }, + "balanced-match": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", + "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=" + }, + "bcrypt-pbkdf": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz", + "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=", + "requires": { + "tweetnacl": "^0.14.3" + }, + "dependencies": { + "tweetnacl": { + "version": "0.14.5", + "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", + "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=" + } + } + }, + "better-sqlite3": { + "version": "5.4.3", + "resolved": "https://registry.npmjs.org/better-sqlite3/-/better-sqlite3-5.4.3.tgz", + "integrity": "sha512-fPp+8f363qQIhuhLyjI4bu657J/FfMtgiiHKfaTsj3RWDkHlWC1yT7c6kHZDnBxzQVoAINuzg553qKmZ4F1rEw==", + "requires": { + "integer": "^2.1.0", + "tar": "^4.4.10" + } + }, + "bluebird": { + "version": "3.7.2", + "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", + "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==" + }, + "boolbase": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz", + "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=" + }, + "boom": { + "version": "2.10.1", + "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz", + "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=", + "requires": { + "hoek": "2.x.x" + } + }, + "brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "requires": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "caseless": { + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", + "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=" + }, + "chalk": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", + "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "cheerio": { + "version": "0.22.0", + "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-0.22.0.tgz", + "integrity": "sha1-qbqoYKP5tZWmuBsahocxIe06Jp4=", + "requires": { + "css-select": "~1.2.0", + "dom-serializer": "~0.1.0", + "entities": "~1.1.1", + "htmlparser2": "^3.9.1", + "lodash.assignin": "^4.0.9", + "lodash.bind": "^4.1.4", + "lodash.defaults": "^4.0.1", + "lodash.filter": "^4.4.0", + "lodash.flatten": "^4.2.0", + "lodash.foreach": "^4.3.0", + "lodash.map": "^4.4.0", + "lodash.merge": "^4.4.0", + "lodash.pick": "^4.2.1", + "lodash.reduce": "^4.4.0", + "lodash.reject": "^4.4.0", + "lodash.some": "^4.4.0" + } + }, + "chownr": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz", + "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==" + }, + "co": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", + "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=" + }, + "code-point-at": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", + "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=" + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + }, "combined-stream": { "version": "1.0.8", "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", @@ -28,11 +250,115 @@ "delayed-stream": "~1.0.0" } }, + "commander": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-5.0.0.tgz", + "integrity": "sha512-JrDGPAKjMGSP1G0DUoaceEJ3DZgAfr/q6X7FVk4+U5KxUSKviYGM2k6zWkfyyBHy5rAtzgYJFa1ro2O9PtoxwQ==" + }, + "concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" + }, + "console-control-strings": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", + "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=" + }, + "core-util-is": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", + "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" + }, + "cryptiles": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz", + "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=", + "requires": { + "boom": "2.x.x" + } + }, + "css-select": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz", + "integrity": "sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=", + "requires": { + "boolbase": "~1.0.0", + "css-what": "2.1", + "domutils": "1.5.1", + "nth-check": "~1.0.1" + }, + "dependencies": { + "domutils": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz", + "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=", + "requires": { + "dom-serializer": "0", + "domelementtype": "1" + } + } + } + }, + "css-what": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.3.tgz", + "integrity": "sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==" + }, + "dashdash": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", + "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", + "requires": { + "assert-plus": "^1.0.0" + } + }, + "dblapi.js": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/dblapi.js/-/dblapi.js-2.4.0.tgz", + "integrity": "sha512-SqDYVcV1DBQnyhySTjd+Qvzu7jFr+4eKwl56fGpIti7OlXGF5dmDPeo3jQfRlOXTRn5/I5997MDIJukoDxE3Mg==" + }, + "debug": { + "version": "3.2.6", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", + "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", + "requires": { + "ms": "^2.1.1" + } + }, + "decompress-response": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz", + "integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=", + "requires": { + "mimic-response": "^1.0.0" + } + }, + "deep-extend": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz", + "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==" + }, + "deepmerge": { + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-1.5.2.tgz", + "integrity": "sha512-95k0GDqvBjZavkuvzx/YqVLv/6YYa17fz6ILMSf7neqQITCPbnfEnQvEgMPNjH4kgobe7+WIL0yJEHku+H3qtQ==" + }, "delayed-stream": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=" }, + "delegates": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", + "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=" + }, + "detect-libc": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz", + "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=" + }, "discord.js": { "version": "12.1.1", "resolved": "https://registry.npmjs.org/discord.js/-/discord.js-12.1.1.tgz", @@ -48,16 +374,109 @@ "ws": "^7.2.1" } }, + "dom-serializer": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.1.tgz", + "integrity": "sha512-l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA==", + "requires": { + "domelementtype": "^1.3.0", + "entities": "^1.1.1" + } + }, + "domelementtype": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz", + "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==" + }, + "domhandler": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz", + "integrity": "sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==", + "requires": { + "domelementtype": "1" + } + }, + "domutils": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz", + "integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==", + "requires": { + "dom-serializer": "0", + "domelementtype": "1" + } + }, "dotenv": { "version": "8.2.0", "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-8.2.0.tgz", "integrity": "sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw==" }, + "duplexer3": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz", + "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=" + }, + "ecc-jsbn": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz", + "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=", + "requires": { + "jsbn": "~0.1.0", + "safer-buffer": "^2.1.0" + } + }, + "enmap": { + "version": "5.2.4", + "resolved": "https://registry.npmjs.org/enmap/-/enmap-5.2.4.tgz", + "integrity": "sha512-YulKPmB3t08i1aBDBDgEew9gAWYWXVuGe8S3DLYRQ+E0FoVxTTzo2iSfcEmUX9DRLuKLDMRLRcbRqX5J0z55Uw==", + "requires": { + "lodash": "^4.17.15" + } + }, + "entities": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz", + "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==" + }, + "escape-string-regexp": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=" + }, + "esprima": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", + "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==" + }, "event-target-shim": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz", "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==" }, + "extend": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", + "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==" + }, + "extsprintf": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.4.0.tgz", + "integrity": "sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=" + }, + "fast-deep-equal": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz", + "integrity": "sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA==" + }, + "fast-json-stable-stringify": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", + "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==" + }, + "forever-agent": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", + "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=" + }, "form-data": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.0.tgz", @@ -68,6 +487,451 @@ "mime-types": "^2.1.12" } }, + "fs-minipass": { + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz", + "integrity": "sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==", + "requires": { + "minipass": "^2.6.0" + } + }, + "fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" + }, + "garfield": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/garfield/-/garfield-1.1.2.tgz", + "integrity": "sha1-C3PcRfUYmgU/9LU9eydOKf5Hy/Y=", + "requires": { + "moment": "^2.17.1" + } + }, + "gauge": { + "version": "2.7.4", + "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz", + "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=", + "requires": { + "aproba": "^1.0.3", + "console-control-strings": "^1.0.0", + "has-unicode": "^2.0.0", + "object-assign": "^4.1.0", + "signal-exit": "^3.0.0", + "string-width": "^1.0.1", + "strip-ansi": "^3.0.1", + "wide-align": "^1.1.0" + } + }, + "get-stream": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", + "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=" + }, + "get-youtube-id": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/get-youtube-id/-/get-youtube-id-1.0.1.tgz", + "integrity": "sha512-5yidLzoLXbtw82a/Wb7LrajkGn29BM6JuLWeHyNfzOGp1weGyW4+7eMz6cP23+etqj27VlOFtq8fFFDMLq/FXQ==" + }, + "getpass": { + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", + "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", + "requires": { + "assert-plus": "^1.0.0" + } + }, + "glob": { + "version": "7.1.6", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", + "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", + "requires": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + } + }, + "got": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/got/-/got-7.1.0.tgz", + "integrity": "sha512-Y5WMo7xKKq1muPsxD+KmrR8DH5auG7fBdDVueZwETwV6VytKyU9OX/ddpq2/1hp1vIPvVb4T81dKQz3BivkNLw==", + "requires": { + "decompress-response": "^3.2.0", + "duplexer3": "^0.1.4", + "get-stream": "^3.0.0", + "is-plain-obj": "^1.1.0", + "is-retry-allowed": "^1.0.0", + "is-stream": "^1.0.0", + "isurl": "^1.0.0-alpha5", + "lowercase-keys": "^1.0.0", + "p-cancelable": "^0.3.0", + "p-timeout": "^1.1.1", + "safe-buffer": "^5.0.1", + "timed-out": "^4.0.0", + "url-parse-lax": "^1.0.0", + "url-to-options": "^1.0.1" + } + }, + "har-schema": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz", + "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=" + }, + "har-validator": { + "version": "5.1.3", + "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz", + "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==", + "requires": { + "ajv": "^6.5.5", + "har-schema": "^2.0.0" + } + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" + }, + "has-symbol-support-x": { + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz", + "integrity": "sha512-3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw==" + }, + "has-to-string-tag-x": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz", + "integrity": "sha512-vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw==", + "requires": { + "has-symbol-support-x": "^1.4.1" + } + }, + "has-unicode": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", + "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=" + }, + "hastebin-gen": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/hastebin-gen/-/hastebin-gen-2.0.5.tgz", + "integrity": "sha512-At1LaKtcqh2jiP8xfE2sDGT9IshIki6FqsgLwn2y7FzAvlFJRtpUsSPh3yWjWIQIvxi/GPF07IBqSI8WhPL/gQ==", + "requires": { + "node-fetch": "^2.6.0" + } + }, + "hawk": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz", + "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=", + "requires": { + "boom": "2.x.x", + "cryptiles": "2.x.x", + "hoek": "2.x.x", + "sntp": "1.x.x" + } + }, + "hoek": { + "version": "2.16.3", + "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz", + "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=" + }, + "html-entities": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.2.1.tgz", + "integrity": "sha1-DfKTUfByEWNRXfueVUPl9u7VFi8=" + }, + "htmlparser2": { + "version": "3.10.1", + "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.1.tgz", + "integrity": "sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==", + "requires": { + "domelementtype": "^1.3.1", + "domhandler": "^2.3.0", + "domutils": "^1.5.1", + "entities": "^1.1.1", + "inherits": "^2.0.1", + "readable-stream": "^3.1.1" + }, + "dependencies": { + "readable-stream": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", + "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", + "requires": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + } + } + } + }, + "http-signature": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.3.2.tgz", + "integrity": "sha512-sjgXeFLIVJ54n1+HWOvazGkIQpaawFGIQ1PYPORaFNWpPHJ28ZuDgWljvMIhAIcOelTtrh9e5wVB3IorxjiZDA==", + "requires": { + "assert-plus": "^1.0.0", + "jsprim": "^1.2.2", + "sshpk": "^1.14.1" + } + }, + "iconv-lite": { + "version": "0.4.24", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", + "requires": { + "safer-buffer": ">= 2.1.2 < 3" + } + }, + "ignore-walk": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.3.tgz", + "integrity": "sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw==", + "requires": { + "minimatch": "^3.0.4" + } + }, + "inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", + "requires": { + "once": "^1.3.0", + "wrappy": "1" + } + }, + "inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" + }, + "ini": { + "version": "1.3.5", + "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz", + "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==" + }, + "integer": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/integer/-/integer-2.1.0.tgz", + "integrity": "sha512-vBtiSgrEiNocWvvZX1RVfeOKa2mCHLZQ2p9nkQkQZ/BvEiY+6CcUz0eyjvIiewjJoeNidzg2I+tpPJvpyspL1w==" + }, + "is-fullwidth-code-point": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", + "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", + "requires": { + "number-is-nan": "^1.0.0" + } + }, + "is-google-domain": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-google-domain/-/is-google-domain-1.0.0.tgz", + "integrity": "sha1-feHSOqFHuGrJbG0H4PFt+GYARzM=" + }, + "is-object": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-object/-/is-object-1.0.1.tgz", + "integrity": "sha1-iVJojF7C/9awPsyF52ngKQMINHA=" + }, + "is-plain-obj": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz", + "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=" + }, + "is-retry-allowed": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz", + "integrity": "sha512-RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg==" + }, + "is-stream": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", + "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=" + }, + "is-typedarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", + "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=" + }, + "is-url": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/is-url/-/is-url-1.2.4.tgz", + "integrity": "sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==" + }, + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" + }, + "isstream": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", + "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=" + }, + "isurl": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isurl/-/isurl-1.0.0.tgz", + "integrity": "sha512-1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w==", + "requires": { + "has-to-string-tag-x": "^1.2.0", + "is-object": "^1.0.1" + } + }, + "js-yaml": { + "version": "3.13.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz", + "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==", + "requires": { + "argparse": "^1.0.7", + "esprima": "^4.0.0" + } + }, + "jsbn": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", + "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=" + }, + "json-schema": { + "version": "0.2.5", + "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.5.tgz", + "integrity": "sha512-gWJOWYFrhQ8j7pVm0EM8Slr+EPVq1Phf6lvzvD/WCeqkrx/f2xBI0xOsRRS9xCn3I4vKtP519dvs3TP09r24wQ==" + }, + "json-schema-traverse": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==" + }, + "json-stable-stringify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz", + "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=", + "requires": { + "jsonify": "~0.0.0" + } + }, + "json-stringify-safe": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", + "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=" + }, + "jsonify": { + "version": "0.0.0", + "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz", + "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=" + }, + "jsprim": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz", + "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=", + "requires": { + "assert-plus": "1.0.0", + "extsprintf": "1.3.0", + "json-schema": "0.2.3", + "verror": "1.10.0" + }, + "dependencies": { + "extsprintf": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", + "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=" + }, + "json-schema": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz", + "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=" + } + } + }, + "lodash": { + "version": "4.17.15", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz", + "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==" + }, + "lodash.assignin": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/lodash.assignin/-/lodash.assignin-4.2.0.tgz", + "integrity": "sha1-uo31+4QesKPoBEIysOJjqNxqKKI=" + }, + "lodash.bind": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/lodash.bind/-/lodash.bind-4.2.1.tgz", + "integrity": "sha1-euMBfpOWIqwxt9fX3LGzTbFpDTU=" + }, + "lodash.defaults": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz", + "integrity": "sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw=" + }, + "lodash.filter": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/lodash.filter/-/lodash.filter-4.6.0.tgz", + "integrity": "sha1-ZosdSYFgOuHMWm+nYBQ+SAtMSs4=" + }, + "lodash.flatten": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz", + "integrity": "sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8=" + }, + "lodash.foreach": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/lodash.foreach/-/lodash.foreach-4.5.0.tgz", + "integrity": "sha1-Gmo16s5AEoDH8G3d7DUWWrJ+PlM=" + }, + "lodash.isfunction": { + "version": "3.0.9", + "resolved": "https://registry.npmjs.org/lodash.isfunction/-/lodash.isfunction-3.0.9.tgz", + "integrity": "sha512-AirXNj15uRIMMPihnkInB4i3NHeb4iBtNg9WRWuK2o31S+ePwwNmDPaTL3o7dTJ+VXNZim7rFs4rxN4YU1oUJw==" + }, + "lodash.map": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/lodash.map/-/lodash.map-4.6.0.tgz", + "integrity": "sha1-dx7Hg540c9nEzeKLGTlMNWL09tM=" + }, + "lodash.merge": { + "version": "4.6.2", + "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", + "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==" + }, + "lodash.pick": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/lodash.pick/-/lodash.pick-4.4.0.tgz", + "integrity": "sha1-UvBWEP/53tQiYRRB7R/BI6AwAbM=" + }, + "lodash.reduce": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/lodash.reduce/-/lodash.reduce-4.6.0.tgz", + "integrity": "sha1-8atrg5KZrUj3hKu/R2WW8DuRTTs=" + }, + "lodash.reject": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/lodash.reject/-/lodash.reject-4.6.0.tgz", + "integrity": "sha1-gNZJLcFHCGS79YNTO2UfQqn1JBU=" + }, + "lodash.some": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/lodash.some/-/lodash.some-4.6.0.tgz", + "integrity": "sha1-G7nzFO9ri63tE7VJFpsqlF62jk0=" + }, + "lowercase-keys": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz", + "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==" + }, + "m3u8stream": { + "version": "0.6.5", + "resolved": "https://registry.npmjs.org/m3u8stream/-/m3u8stream-0.6.5.tgz", + "integrity": "sha512-QZCzhcfUliZfsOboi68QkNcMejPKTEhxE+s1TApvHubDeR8ythm4ViWuYFqgUwZeoHe8q0nsPxOvA3lQvdSzyg==", + "requires": { + "miniget": "^1.6.1", + "sax": "^1.2.4" + } + }, + "mdurl": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz", + "integrity": "sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4=" + }, "mime-db": { "version": "1.43.0", "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.43.0.tgz", @@ -81,30 +945,936 @@ "mime-db": "1.43.0" } }, + "mimic-response": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz", + "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==" + }, + "miniget": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/miniget/-/miniget-1.7.0.tgz", + "integrity": "sha512-yrgaDSMRzrfYTkudB4Y6xK8pCb7oAH2bvfv6iPY2m6CedZfs9yK4b/ofh0Vzv08hCYXH/HHkoS8an6fkWtOAQA==" + }, + "minimatch": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", + "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "requires": { + "brace-expansion": "^1.1.7" + } + }, + "minimist": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==" + }, + "minipass": { + "version": "2.9.0", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz", + "integrity": "sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==", + "requires": { + "safe-buffer": "^5.1.2", + "yallist": "^3.0.0" + } + }, + "minizlib": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.3.3.tgz", + "integrity": "sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==", + "requires": { + "minipass": "^2.9.0" + } + }, + "mkdirp": { + "version": "0.5.4", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.4.tgz", + "integrity": "sha512-iG9AK/dJLtJ0XNgTuDbSyNS3zECqDlAhnQW4CsNxBG3LQJBbHmRX1egw39DmtOdCAqY+dKXV+sgPgilNWUKMVw==", + "requires": { + "minimist": "^1.2.5" + } + }, + "moment": { + "version": "2.24.0", + "resolved": "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz", + "integrity": "sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==" + }, + "moment-duration-format": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/moment-duration-format/-/moment-duration-format-2.3.2.tgz", + "integrity": "sha512-cBMXjSW+fjOb4tyaVHuaVE/A5TqkukDWiOfxxAjY+PEqmmBQlLwn+8OzwPiG3brouXKY5Un4pBjAeB6UToXHaQ==" + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + }, + "needle": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/needle/-/needle-2.3.3.tgz", + "integrity": "sha512-EkY0GeSq87rWp1hoq/sH/wnTWgFVhYlnIkbJ0YJFfRgEFlz2RraCjBpFQ+vrEgEdp0ThfyHADmkChEhcb7PKyw==", + "requires": { + "debug": "^3.2.6", + "iconv-lite": "^0.4.4", + "sax": "^1.2.4" + } + }, + "node-addon-api": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-2.0.0.tgz", + "integrity": "sha512-ASCL5U13as7HhOExbT6OlWJJUV/lLzL2voOSP1UVehpRD8FbSrSDjfScK/KwAvVTI5AS6r4VwbOMlIqtvRidnA==" + }, "node-fetch": { "version": "2.6.0", "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz", "integrity": "sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==" }, + "node-pre-gyp": { + "version": "0.14.0", + "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz", + "integrity": "sha512-+CvDC7ZttU/sSt9rFjix/P05iS43qHCOOGzcr3Ry99bXG7VX953+vFyEuph/tfqoYu8dttBkE86JSKBO2OzcxA==", + "requires": { + "detect-libc": "^1.0.2", + "mkdirp": "^0.5.1", + "needle": "^2.2.1", + "nopt": "^4.0.1", + "npm-packlist": "^1.1.6", + "npmlog": "^4.0.2", + "rc": "^1.2.7", + "rimraf": "^2.6.1", + "semver": "^5.3.0", + "tar": "^4.4.2" + } + }, + "nopt": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz", + "integrity": "sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==", + "requires": { + "abbrev": "1", + "osenv": "^0.1.4" + } + }, + "npm-bundled": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.1.1.tgz", + "integrity": "sha512-gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA==", + "requires": { + "npm-normalize-package-bin": "^1.0.1" + } + }, + "npm-normalize-package-bin": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz", + "integrity": "sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==" + }, + "npm-packlist": { + "version": "1.4.8", + "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.8.tgz", + "integrity": "sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A==", + "requires": { + "ignore-walk": "^3.0.1", + "npm-bundled": "^1.0.1", + "npm-normalize-package-bin": "^1.0.1" + } + }, + "npmlog": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz", + "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==", + "requires": { + "are-we-there-yet": "~1.1.2", + "console-control-strings": "~1.1.0", + "gauge": "~2.7.3", + "set-blocking": "~2.0.0" + } + }, + "nth-check": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz", + "integrity": "sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==", + "requires": { + "boolbase": "~1.0.0" + } + }, + "number-is-nan": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", + "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=" + }, + "oauth-sign": { + "version": "0.9.0", + "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz", + "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==" + }, + "object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" + }, + "once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", + "requires": { + "wrappy": "1" + } + }, + "os-homedir": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", + "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=" + }, + "os-tmpdir": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", + "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=" + }, + "osenv": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz", + "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==", + "requires": { + "os-homedir": "^1.0.0", + "os-tmpdir": "^1.0.0" + } + }, + "p-cancelable": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-0.3.0.tgz", + "integrity": "sha512-RVbZPLso8+jFeq1MfNvgXtCRED2raz/dKpacfTNxsx6pLEpEomM7gah6VeHSYV3+vo0OAi4MkArtQcWWXuQoyw==" + }, + "p-finally": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz", + "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=" + }, + "p-timeout": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-1.2.1.tgz", + "integrity": "sha1-XrOzU7f86Z8QGhA4iAuwVOu+o4Y=", + "requires": { + "p-finally": "^1.0.0" + } + }, + "path-is-absolute": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=" + }, + "performance-now": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", + "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=" + }, + "prepend-http": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz", + "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=" + }, "prism-media": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/prism-media/-/prism-media-1.2.1.tgz", "integrity": "sha512-R3EbKwJiYlTvGwcG1DpUt+06DsxOGS5W4AMEHT7oVOjG93MjpdhGX1whHyjnqknylLMupKAsKMEXcTNRbPe6Vw==" }, + "process-nextick-args": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", + "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==" + }, + "psl": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz", + "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==" + }, + "punycode": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", + "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==" + }, + "qs": { + "version": "6.9.3", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.3.tgz", + "integrity": "sha512-EbZYNarm6138UKKq46tdx08Yo/q9ZhFoAXAI1meAFd2GtbRDhbZY2WQSICskT0c5q99aFzLG1D4nvTk9tqfXIw==" + }, + "randomcolor": { + "version": "0.5.4", + "resolved": "https://registry.npmjs.org/randomcolor/-/randomcolor-0.5.4.tgz", + "integrity": "sha512-nYd4nmTuuwMFzHL6W+UWR5fNERGZeVauho8mrJDUSXdNDbao4rbrUwhuLgKC/j8VCS5+34Ria8CsTDuBjrIrQA==" + }, + "rc": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz", + "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==", + "requires": { + "deep-extend": "^0.6.0", + "ini": "~1.3.0", + "minimist": "^1.2.0", + "strip-json-comments": "~2.0.1" + } + }, + "readable-stream": { + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", + "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + }, + "dependencies": { + "safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "requires": { + "safe-buffer": "~5.1.0" + } + } + } + }, + "relevant-urban": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/relevant-urban/-/relevant-urban-2.0.0.tgz", + "integrity": "sha1-abvU9DpnSQjbkI4n8jCWyw8kuLk=", + "requires": { + "snekfetch": "^3.0.1" + } + }, + "request": { + "version": "2.88.2", + "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz", + "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==", + "requires": { + "aws-sign2": "~0.7.0", + "aws4": "^1.8.0", + "caseless": "~0.12.0", + "combined-stream": "~1.0.6", + "extend": "~3.0.2", + "forever-agent": "~0.6.1", + "form-data": "~2.3.2", + "har-validator": "~5.1.3", + "http-signature": "~1.2.0", + "is-typedarray": "~1.0.0", + "isstream": "~0.1.2", + "json-stringify-safe": "~5.0.1", + "mime-types": "~2.1.19", + "oauth-sign": "~0.9.0", + "performance-now": "^2.1.0", + "qs": "~6.5.2", + "safe-buffer": "^5.1.2", + "tough-cookie": "~2.5.0", + "tunnel-agent": "^0.6.0", + "uuid": "^3.3.2" + }, + "dependencies": { + "form-data": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz", + "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==", + "requires": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.6", + "mime-types": "^2.1.12" + } + }, + "http-signature": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", + "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=", + "requires": { + "assert-plus": "^1.0.0", + "jsprim": "^1.2.2", + "sshpk": "^1.7.0" + } + }, + "qs": { + "version": "6.5.2", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz", + "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==" + } + } + }, + "request-promise": { + "version": "4.2.5", + "resolved": "https://registry.npmjs.org/request-promise/-/request-promise-4.2.5.tgz", + "integrity": "sha512-ZgnepCykFdmpq86fKGwqntyTiUrHycALuGggpyCZwMvGaZWgxW6yagT0FHkgo5LzYvOaCNvxYwWYIjevSH1EDg==", + "requires": { + "bluebird": "^3.5.0", + "request-promise-core": "1.1.3", + "stealthy-require": "^1.1.1", + "tough-cookie": "^2.3.3" + } + }, + "request-promise-core": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.3.tgz", + "integrity": "sha512-QIs2+ArIGQVp5ZYbWD5ZLCY29D5CfWizP8eWnm8FoGD1TX61veauETVQbrV60662V0oFBkrDOuaBI8XgtuyYAQ==", + "requires": { + "lodash": "^4.17.15" + } + }, + "require-all": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/require-all/-/require-all-2.2.0.tgz", + "integrity": "sha1-tEIMIzrAKC0P9Jsnf7iAqLXeCJQ=" + }, + "rimraf": { + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", + "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", + "requires": { + "glob": "^7.1.3" + } + }, + "safe-buffer": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz", + "integrity": "sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg==" + }, + "safer-buffer": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" + }, + "sax": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", + "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==" + }, + "semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" + }, + "set-blocking": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", + "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=" + }, "setimmediate": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz", "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=" }, + "signal-exit": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz", + "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==" + }, + "snekfetch": { + "version": "3.6.4", + "resolved": "https://registry.npmjs.org/snekfetch/-/snekfetch-3.6.4.tgz", + "integrity": "sha512-NjxjITIj04Ffqid5lqr7XdgwM7X61c/Dns073Ly170bPQHLm6jkmelye/eglS++1nfTWktpP6Y2bFXjdPlQqdw==" + }, + "sntp": { + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz", + "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=", + "requires": { + "hoek": "2.x.x" + } + }, + "sprintf-js": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.2.tgz", + "integrity": "sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==" + }, + "sshpk": { + "version": "1.16.1", + "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz", + "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==", + "requires": { + "asn1": "~0.2.3", + "assert-plus": "^1.0.0", + "bcrypt-pbkdf": "^1.0.0", + "dashdash": "^1.12.0", + "ecc-jsbn": "~0.1.1", + "getpass": "^0.1.1", + "jsbn": "~0.1.0", + "safer-buffer": "^2.0.2", + "tweetnacl": "~0.14.0" + }, + "dependencies": { + "tweetnacl": { + "version": "0.14.5", + "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", + "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=" + } + } + }, + "stealthy-require": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz", + "integrity": "sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=" + }, + "string-width": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", + "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", + "requires": { + "code-point-at": "^1.0.0", + "is-fullwidth-code-point": "^1.0.0", + "strip-ansi": "^3.0.0" + } + }, + "string_decoder": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", + "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", + "requires": { + "safe-buffer": "~5.2.0" + } + }, + "stringstream": { + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.6.tgz", + "integrity": "sha512-87GEBAkegbBcweToUrdzf3eLhWNg06FJTebl4BVJz/JgWy8CvEr9dRtX5qWphiynMSQlxxi+QqN0z5T32SLlhA==" + }, + "strip-ansi": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", + "requires": { + "ansi-regex": "^2.0.0" + } + }, + "strip-json-comments": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", + "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=" + }, + "supports-color": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", + "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", + "requires": { + "has-flag": "^4.0.0" + } + }, + "tar": { + "version": "4.4.13", + "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.13.tgz", + "integrity": "sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==", + "requires": { + "chownr": "^1.1.1", + "fs-minipass": "^1.2.5", + "minipass": "^2.8.6", + "minizlib": "^1.2.1", + "mkdirp": "^0.5.0", + "safe-buffer": "^5.1.2", + "yallist": "^3.0.3" + } + }, + "timed-out": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-4.0.1.tgz", + "integrity": "sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8=" + }, + "tough-cookie": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz", + "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==", + "requires": { + "psl": "^1.1.28", + "punycode": "^2.1.1" + } + }, + "tunnel-agent": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", + "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", + "requires": { + "safe-buffer": "^5.0.1" + } + }, "tweetnacl": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-1.0.3.tgz", "integrity": "sha512-6rt+RN7aOi1nGMyC4Xa5DdYiukl2UWCbcJft7YhxReBGQD7OAM8Pbxw6YMo4r2diNEA8FEmu32YOn9rhaiE5yw==" }, + "urban": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/urban/-/urban-0.3.2.tgz", + "integrity": "sha512-B0/cCQNb1XCwHA0YGw1u9IavHMbHe8ruxkUNUlYHobMCAWdk0/gFfOCQQ11CQDmlFu4SUZRoVxrUF3kbE0gdog==", + "requires": { + "commander": ">=0.3.0" + } + }, + "uri-js": { + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz", + "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==", + "requires": { + "punycode": "^2.1.0" + } + }, + "url-parse-lax": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz", + "integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=", + "requires": { + "prepend-http": "^1.0.1" + } + }, + "url-to-options": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/url-to-options/-/url-to-options-1.0.1.tgz", + "integrity": "sha1-FQWgOiiaSMvXpDTvuu7FBV9WM6k=" + }, + "url-unshort": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/url-unshort/-/url-unshort-5.0.0.tgz", + "integrity": "sha1-YkqSuTFg/aXoLhdevoGBVO077Xg=", + "requires": { + "cheerio": "^0.22.0", + "deepmerge": "^1.3.1", + "escape-string-regexp": "^1.0.5", + "got": "^7.0.0", + "is-google-domain": "^1.0.0", + "js-yaml": "^3.7.0", + "mdurl": "^1.0.0", + "punycode": "^2.0.1", + "require-all": "^2.0.0" + } + }, + "url-unshorten": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/url-unshorten/-/url-unshorten-1.0.6.tgz", + "integrity": "sha512-HIdtwDnUbOUR5pD6IqdTnK58qvEGmLjPoPWi1s83K/h+O/GPS5GmFivK25MyVNbn8yfmOJnfdQD7d6RPeu8S4A==", + "requires": { + "request": "^2.88.0" + } + }, + "util-deprecate": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" + }, + "uuid": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", + "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==" + }, + "verror": { + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", + "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", + "requires": { + "assert-plus": "^1.0.0", + "core-util-is": "1.0.2", + "extsprintf": "^1.2.0" + } + }, + "weather-js": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/weather-js/-/weather-js-2.0.0.tgz", + "integrity": "sha1-DZvNsFpPhNBrm585kAKKYB6kofw=", + "requires": { + "request": "2.x.x", + "xml2js": "0.4.x" + } + }, + "wide-align": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz", + "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==", + "requires": { + "string-width": "^1.0.2 || 2" + } + }, + "wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" + }, "ws": { "version": "7.2.3", "resolved": "https://registry.npmjs.org/ws/-/ws-7.2.3.tgz", "integrity": "sha512-HTDl9G9hbkNDk98naoR/cHDws7+EyYMOdL1BmjsZXRUjf7d+MficC4B7HLUPlSiho0vg+CWKrGIt/VJBd1xunQ==" + }, + "xml2js": { + "version": "0.4.23", + "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.23.tgz", + "integrity": "sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==", + "requires": { + "sax": ">=0.6.0", + "xmlbuilder": "~11.0.0" + } + }, + "xmlbuilder": { + "version": "11.0.1", + "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz", + "integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==" + }, + "yallist": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", + "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==" + }, + "youtube-info": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/youtube-info/-/youtube-info-1.3.2.tgz", + "integrity": "sha512-LnBZxCuCof0bwFNtLSxklLYgaU1XR8OK+cGieWyPS10rn3P0TMHdIikRpO/W/duE9SR9JfzOk8ThgwDgx0B3Vw==", + "requires": { + "cheerio": "^0.19.0", + "debug": "^2.2.0", + "lodash.isfunction": "^3.0.6", + "request": "2.81.0", + "request-promise": "^4.2.2" + }, + "dependencies": { + "ajv": { + "version": "4.11.8", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz", + "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=", + "requires": { + "co": "^4.6.0", + "json-stable-stringify": "^1.0.1" + } + }, + "assert-plus": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz", + "integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ=" + }, + "aws-sign2": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz", + "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8=" + }, + "cheerio": { + "version": "0.19.0", + "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-0.19.0.tgz", + "integrity": "sha1-dy5wFfLuKZZQltcepBdbdas1SSU=", + "requires": { + "css-select": "~1.0.0", + "dom-serializer": "~0.1.0", + "entities": "~1.1.1", + "htmlparser2": "~3.8.1", + "lodash": "^3.2.0" + } + }, + "css-select": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.0.0.tgz", + "integrity": "sha1-sRIcpRhI3SZOIkTQWM7iVN7rRLA=", + "requires": { + "boolbase": "~1.0.0", + "css-what": "1.0", + "domutils": "1.4", + "nth-check": "~1.0.0" + } + }, + "css-what": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/css-what/-/css-what-1.0.0.tgz", + "integrity": "sha1-18wt9FGAZm+Z0rFEYmOUaeAPc2w=" + }, + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "requires": { + "ms": "2.0.0" + } + }, + "domhandler": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.3.0.tgz", + "integrity": "sha1-LeWaCCLVAn+r/28DLCsloqir5zg=", + "requires": { + "domelementtype": "1" + } + }, + "domutils": { + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.4.3.tgz", + "integrity": "sha1-CGVRN5bGswYDGFDhdVFrr4C3Km8=", + "requires": { + "domelementtype": "1" + } + }, + "form-data": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz", + "integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=", + "requires": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.5", + "mime-types": "^2.1.12" + } + }, + "har-schema": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz", + "integrity": "sha1-0mMTX0MwfALGAq/I/pWXDAFRNp4=" + }, + "har-validator": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz", + "integrity": "sha1-M0gdDxu/9gDdID11gSpqX7oALio=", + "requires": { + "ajv": "^4.9.1", + "har-schema": "^1.0.5" + } + }, + "htmlparser2": { + "version": "3.8.3", + "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.3.tgz", + "integrity": "sha1-mWwosZFRaovoZQGn15dX5ccMEGg=", + "requires": { + "domelementtype": "1", + "domhandler": "2.3", + "domutils": "1.5", + "entities": "1.0", + "readable-stream": "1.1" + }, + "dependencies": { + "domutils": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz", + "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=", + "requires": { + "dom-serializer": "0", + "domelementtype": "1" + } + }, + "entities": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-1.0.0.tgz", + "integrity": "sha1-sph6o4ITR/zeZCsk/fyeT7cSvyY=" + } + } + }, + "http-signature": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz", + "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=", + "requires": { + "assert-plus": "^0.2.0", + "jsprim": "^1.2.2", + "sshpk": "^1.7.0" + } + }, + "isarray": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", + "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=" + }, + "lodash": { + "version": "3.10.1", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz", + "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=" + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + }, + "oauth-sign": { + "version": "0.8.2", + "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz", + "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=" + }, + "performance-now": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz", + "integrity": "sha1-M+8wxcd9TqIcWlOGnZG1bY8lVeU=" + }, + "punycode": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", + "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=" + }, + "qs": { + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz", + "integrity": "sha1-E+JtKK1rD/qpExLNO/cI7TUecjM=" + }, + "readable-stream": { + "version": "1.1.14", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", + "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=", + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.1", + "isarray": "0.0.1", + "string_decoder": "~0.10.x" + } + }, + "request": { + "version": "2.81.0", + "resolved": "https://registry.npmjs.org/request/-/request-2.81.0.tgz", + "integrity": "sha1-xpKJRqDgbF+Nb4qTM0af/aRimKA=", + "requires": { + "aws-sign2": "~0.6.0", + "aws4": "^1.2.1", + "caseless": "~0.12.0", + "combined-stream": "~1.0.5", + "extend": "~3.0.0", + "forever-agent": "~0.6.1", + "form-data": "~2.1.1", + "har-validator": "~4.2.1", + "hawk": "~3.1.3", + "http-signature": "~1.1.0", + "is-typedarray": "~1.0.0", + "isstream": "~0.1.2", + "json-stringify-safe": "~5.0.1", + "mime-types": "~2.1.7", + "oauth-sign": "~0.8.1", + "performance-now": "^0.2.0", + "qs": "~6.4.0", + "safe-buffer": "^5.0.1", + "stringstream": "~0.0.4", + "tough-cookie": "~2.3.0", + "tunnel-agent": "^0.6.0", + "uuid": "^3.0.0" + } + }, + "string_decoder": { + "version": "0.10.31", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", + "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=" + }, + "tough-cookie": { + "version": "2.3.4", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz", + "integrity": "sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==", + "requires": { + "punycode": "^1.4.1" + } + } + } + }, + "ytdl-core": { + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/ytdl-core/-/ytdl-core-1.0.9.tgz", + "integrity": "sha512-HhFeLfjXU34h0FNHmSkSpKygdaYijSt8VNsC770VYBRFb+dyUKcm11cIKxu2MUSwT9znISZ0k1wFdaV/N5VW+Q==", + "requires": { + "html-entities": "^1.1.3", + "m3u8stream": "^0.6.3", + "miniget": "^1.6.0", + "sax": "^1.1.3" + } + }, + "ytdl-core-discord": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/ytdl-core-discord/-/ytdl-core-discord-1.1.0.tgz", + "integrity": "sha512-uiaZWa9UG+he1F9p7Si9H6Tieyxd9dEhLi4958mHuebudQSEEPaaJHUEbFikcpB++5ogzynVOcvdeC+LFJGgEw==", + "requires": { + "@types/node": "^13.5.3", + "prism-media": "^1.0.1", + "ytdl-core": "^1.0.3" + } } } } From 9a71454ec5fb9cc5846e6e381eaa7982185b83f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Hor=C3=A1=C4=8Dek?= Date: Mon, 30 Mar 2020 10:47:55 +0200 Subject: [PATCH 007/156] Add comments, basic initialization function to the core --- index.js | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/index.js b/index.js index 83c202e..2064413 100644 --- a/index.js +++ b/index.js @@ -1,11 +1,13 @@ // Woomy version 2 // Copyright 2020 mudkipscience +// Check node.js version if (Number(process.version.slice(1).split('.')[0]) < 13) { console.log('NodeJS 12.0.0 or higher is required. Please update NodeJS on your system.') process.exit() } +// Load environment variables / config const fs = require('fs') if (fs.existsSync('./.env') === false) { @@ -20,14 +22,24 @@ if (fs.existsSync('./config.js') === false) { require('dotenv').config() +// Prepare variables const Discord = require('discord.js') const client = new Discord.Client({ disabledEvents: ['TYPING_START'] }) client.commands = new Discord.Collection() client.aliases = new Discord.Collection() +// Initialization function const init = async () => { + // Register events + fs.readdir('./events', (err, files) => { + files.forEach(file => { + client.on(file.substr(0, file.length - 3), require('./events/' + file)) + }); + }); + // Login into Discord + client.login(process.env.TOKEN); } -init() +init(); From d722add09bdd72bbe5bc5b9c40aaf86e68963be5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Hor=C3=A1=C4=8Dek?= Date: Mon, 30 Mar 2020 10:52:08 +0200 Subject: [PATCH 008/156] More comments and also comment stuff out --- index.js | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/index.js b/index.js index 2064413..b3f3e69 100644 --- a/index.js +++ b/index.js @@ -26,11 +26,16 @@ require('dotenv').config() const Discord = require('discord.js') const client = new Discord.Client({ disabledEvents: ['TYPING_START'] }) -client.commands = new Discord.Collection() -client.aliases = new Discord.Collection() +//client.commands = new Discord.Collection() +//client.aliases = new Discord.Collection() + +// Command cache containing every prefix + command combination without arguments ( ~ping ) +client.commandCache = {}; // Initialization function const init = async () => { + // Load modules + // Register events fs.readdir('./events', (err, files) => { files.forEach(file => { @@ -38,6 +43,8 @@ const init = async () => { }); }); + // Load commands + // Login into Discord client.login(process.env.TOKEN); } From 36d363271b6720842197bdc0a23ebb70f28856a6 Mon Sep 17 00:00:00 2001 From: mudkipscience Date: Tue, 31 Mar 2020 03:01:13 +1100 Subject: [PATCH 009/156] awsredtyguil --- config.js | 28 + dash/dashboard maybe?.txt | 0 events/ready.js | 4 +- index.js | 33 +- modules/botlists.js | 3 + modules/music.js | 170 ++++ package-lock.json | 1820 ------------------------------------- resources/placeholder | 0 8 files changed, 221 insertions(+), 1837 deletions(-) create mode 100644 dash/dashboard maybe?.txt create mode 100644 modules/botlists.js create mode 100644 modules/music.js create mode 100644 resources/placeholder diff --git a/config.js b/config.js index e69de29..186aeef 100644 --- a/config.js +++ b/config.js @@ -0,0 +1,28 @@ +const config = { + // Users added to this embed get access to developer-level commands + devs: ['433790467830972417', '324937993972350976', '343081377249493044'], + + // Default settings for individual users + defaultUserSettings: { + prefixes: ['~'], + systemNotice: true + }, + + // Default per-guild settings + defaultGuildSettings: { + prefixes: ['~'], + systemNotice: true + }, + + // + permLevels: [ + { + level: 0, + name: 'User', + + check: () => true + } + ] +} + +module.exports = config diff --git a/dash/dashboard maybe?.txt b/dash/dashboard maybe?.txt new file mode 100644 index 0000000..e69de29 diff --git a/events/ready.js b/events/ready.js index 3a9cd83..8d1a50e 100644 --- a/events/ready.js +++ b/events/ready.js @@ -1,3 +1,3 @@ module.exports = (client) => { - console.log('Discord client ready!'); -}; \ No newline at end of file + console.log('Discord client ready!') +} diff --git a/index.js b/index.js index b3f3e69..8d25d8d 100644 --- a/index.js +++ b/index.js @@ -2,13 +2,15 @@ // Copyright 2020 mudkipscience // Check node.js version -if (Number(process.version.slice(1).split('.')[0]) < 13) { +if (Number(process.version.slice(1).split('.')[0]) < 12) { console.log('NodeJS 12.0.0 or higher is required. Please update NodeJS on your system.') process.exit() } // Load environment variables / config const fs = require('fs') +const Discord = require('discord.js') +const client = new Discord.Client({ disabledEvents: ['TYPING_START'] }) if (fs.existsSync('./.env') === false) { console.log('.env file not found!') @@ -21,32 +23,33 @@ if (fs.existsSync('./config.js') === false) { } require('dotenv').config() +client.config = require('config') -// Prepare variables -const Discord = require('discord.js') -const client = new Discord.Client({ disabledEvents: ['TYPING_START'] }) - -//client.commands = new Discord.Collection() -//client.aliases = new Discord.Collection() - -// Command cache containing every prefix + command combination without arguments ( ~ping ) -client.commandCache = {}; +// Command/alias cache +client.commands = new Discord.Collection() +client.aliases = new Discord.Collection() // Initialization function const init = async () => { // Load modules - // Register events + // Load events fs.readdir('./events', (err, files) => { + if (err) {}// Prepare variableseturn err files.forEach(file => { client.on(file.substr(0, file.length - 3), require('./events/' + file)) - }); - }); + }) + }) // Load commands + // Level cache + for (let i = 0; i < client.config.permLevels.length; i++) { + const currentlevel = client.config.permLevels[i] + client.levelCache[currentlevel.name] = currentlevel.level + } // Login into Discord - client.login(process.env.TOKEN); + client.login(process.env.TOKEN) } -init(); +init() diff --git a/modules/botlists.js b/modules/botlists.js new file mode 100644 index 0000000..54307d6 --- /dev/null +++ b/modules/botlists.js @@ -0,0 +1,3 @@ +module.exports = client => { + +} diff --git a/modules/music.js b/modules/music.js new file mode 100644 index 0000000..8121e05 --- /dev/null +++ b/modules/music.js @@ -0,0 +1,170 @@ +module.exports = client => { + client.music = {guilds: {}} + + client.music.isYoutubeLink = function(input) { + return input.startsWith('https://www.youtube.com/') || input.startsWith('http://www.youtube.com/') || input.startsWith('https://youtube.com/') || input.startsWith('http://youtube.com/') || input.startsWith('https://youtu.be/') || input.startsWith('http://youtu.be/') || input.startsWith('http://m.youtube.com/') || input.startsWith('https://m.youtube.com/') + } + + client.music.search = async function(query) + { + return new Promise(function(resolve, reject) + { + try{ + fetch("https://www.googleapis.com/youtube/v3/search?part=id&type=video&q=" + encodeURIComponent(query) + "&key=" + process.env.YTKEY) + .then(res => res.json()) + .then(json => { + if(!json.items) { reject() return } + resolve(json.items[0]) + }) + } catch (err) { + client.logger.error("Music search err: ", err) + throw err + } + }) + } + + client.music.getGuild = function(id) + { + if(client.music.guilds[id]) return client.music.guilds[id] + + return client.music.guilds[id] = + { + queue: [], + playing: false, + paused: false, + dispatcher: null, + skippers: [] + } + } + + client.music.getMeta = async function(id) + { + return new Promise(function(resolve, reject) + { + youtubeInfo(id, function(err, videoInfo) + { + if(err) throw err + + resolve(videoInfo) + }) + }) + } + + client.music.play = async function(message, input, bypassQueue) + { + let voiceChannel = message.member.voice.channel + if(!voiceChannel) return message.channel.send('<:error:466995152976871434> You need to be in a voice channel to use this command!') + + let permissions = voiceChannel.permissionsFor(client.user) + if (!permissions.has('CONNECT')) { + return message.channel.send('<:error:466995152976871434> I do not have permission to join your voice channel.') + } + if (!permissions.has('SPEAK')) { + return message.channel.send('<:error:466995152976871434> I do not have permission to join your voice channel.') + } + if (voiceChannel.joinable != true) { + return message.channel.send("<:error:466995152976871434> I do not have permission to join your voice channel.") + } + + let id = undefined + + if(client.music.isYoutubeLink(input)) + { + id = await getYoutubeId(input) + } else { + let item = await client.music.search(input) + if(!item) { + return message.channel.send(`<:error:466995152976871434> No results found.`) + } + id = item.id.videoId + } + + if(client.music.getGuild(message.guild.id).queue.length == 0 || bypassQueue) + { + let meta = await client.music.getMeta(id) + + if(!bypassQueue) client.music.getGuild(message.guild.id).queue.push({input: input, id: id, requestedBy: message.author, title: meta.title, author: meta.owner, thumbnail: meta.thumbnailUrl, duration: meta.duration}) + + let connection = await new Promise((resolve, reject) => + { + voiceChannel.join().then((connection) => + { + resolve(connection) + }) + }) + + function end(silent) + { + client.music.getGuild(message.guild.id).queue.shift() + client.music.getGuild(message.guild.id).dispatcher = null + + if(client.music.getGuild(message.guild.id).queue.length > 0) + { + client.music.play(message, client.music.getGuild(message.guild.id).queue[0].input, true) + } else { + client.music.getGuild(message.guild.id).playing = false + + if(!silent) { + message.channel.send("<:play:467216788187512832> Queue is empty! Disconnecting from the voice channel.") + } + + connection.disconnect() + } + } + + client.music.getGuild(message.guild.id).playing = true + + let song = client.music.getGuild(message.guild.id).queue[0] + + try + { + let dispatcher = client.music.getGuild(message.guild.id).dispatcher = connection.play(await ytdl("https://www.youtube.com/watch?v=" + id, {highWaterMark: 1024 * 1024 * 32}), {type: 'opus'}) + + dispatcher.on('finish', (a, b) => + { + end(a == "silent") + }) + } catch(err) { + message.channel.send('<:error:466995152976871434> Failed to play **' + song.title + '** ' + err) + + end() + } + + client.music.getGuild(message.guild.id).skippers = [] + message.channel.send(`<:play:467216788187512832> Now playing: **${song.title}**`) + } else { + let meta = await client.music.getMeta(id) + let song = {input: input, id: id, requestedBy: message.author, title: meta.title, author: meta.owner, thumbnail: meta.thumbnailUrl, duration: meta.duration} + + client.music.getGuild(message.guild.id).queue.push(song) + + message.channel.send(`<:success:466995111885144095> Added to queue: **${song.title}**`) + } + } + + // MUSIC - TIMESTAMP + client.createTimestamp = function(duration){ + hrs = ~~(duration / 60 / 60), + min = ~~(duration / 60) % 60, + sec = ~~(duration - min * 60) + + if(String(hrs).length < 2) { + hrs = "0" + String(hrs) + ":" + } + + if(String(min).length < 2) { + min = "0" + String(min) + } + + if(String(sec).length < 2) { + sec = "0" + String(sec) + } + + if(hrs == "00:") { + hrs = "" + } + + var time = hrs + min + ":" + sec + return time + } +} diff --git a/package-lock.json b/package-lock.json index 5b6edc5..2b0fe41 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2,59 +2,11 @@ "requires": true, "lockfileVersion": 1, "dependencies": { - "@discordjs/collection": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/@discordjs/collection/-/collection-0.1.5.tgz", - "integrity": "sha512-CU1q0UXQUpFNzNB7gufgoisDHP7n+T3tkqTsp3MNUkVJ5+hS3BCvME8uCXAUFlz+6T2FbTCu75A+yQ7HMKqRKw==" - }, - "@discordjs/opus": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/@discordjs/opus/-/opus-0.1.0.tgz", - "integrity": "sha512-VWsrsgqSktxOEHx9SFcnOWJhYQOsyzaW3JVN73LDSzKrycEjtRIS+axlm4qeMGx60u6RH1SY15b3pl5G4+Y+gA==", - "requires": { - "node-addon-api": "^2.0.0", - "node-pre-gyp": "^0.14.0" - } - }, "@types/color-name": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz", "integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==" }, - "@types/node": { - "version": "13.9.5", - "resolved": "https://registry.npmjs.org/@types/node/-/node-13.9.5.tgz", - "integrity": "sha512-hkzMMD3xu6BrJpGVLeQ3htQQNAcOrJjX7WFmtK8zWQpz2UJf13LCFF2ALA7c9OVdvc2vQJeDdjfR35M0sBCxvw==" - }, - "abbrev": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", - "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==" - }, - "abort-controller": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz", - "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==", - "requires": { - "event-target-shim": "^5.0.0" - } - }, - "ajv": { - "version": "6.12.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.0.tgz", - "integrity": "sha512-D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw==", - "requires": { - "fast-deep-equal": "^3.1.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - } - }, - "ansi-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" - }, "ansi-styles": { "version": "4.2.1", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", @@ -64,124 +16,6 @@ "color-convert": "^2.0.1" } }, - "aproba": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz", - "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==" - }, - "are-we-there-yet": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz", - "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==", - "requires": { - "delegates": "^1.0.0", - "readable-stream": "^2.0.6" - } - }, - "argparse": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", - "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", - "requires": { - "sprintf-js": "~1.0.2" - }, - "dependencies": { - "sprintf-js": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", - "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=" - } - } - }, - "asn1": { - "version": "0.2.4", - "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz", - "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==", - "requires": { - "safer-buffer": "~2.1.0" - } - }, - "assert-plus": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", - "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=" - }, - "asynckit": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", - "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=" - }, - "aws-sign2": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", - "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=" - }, - "aws4": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.9.1.tgz", - "integrity": "sha512-wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug==" - }, - "balanced-match": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", - "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=" - }, - "bcrypt-pbkdf": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz", - "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=", - "requires": { - "tweetnacl": "^0.14.3" - }, - "dependencies": { - "tweetnacl": { - "version": "0.14.5", - "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", - "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=" - } - } - }, - "better-sqlite3": { - "version": "5.4.3", - "resolved": "https://registry.npmjs.org/better-sqlite3/-/better-sqlite3-5.4.3.tgz", - "integrity": "sha512-fPp+8f363qQIhuhLyjI4bu657J/FfMtgiiHKfaTsj3RWDkHlWC1yT7c6kHZDnBxzQVoAINuzg553qKmZ4F1rEw==", - "requires": { - "integer": "^2.1.0", - "tar": "^4.4.10" - } - }, - "bluebird": { - "version": "3.7.2", - "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", - "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==" - }, - "boolbase": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz", - "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=" - }, - "boom": { - "version": "2.10.1", - "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz", - "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=", - "requires": { - "hoek": "2.x.x" - } - }, - "brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "caseless": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", - "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=" - }, "chalk": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", @@ -191,44 +25,6 @@ "supports-color": "^7.1.0" } }, - "cheerio": { - "version": "0.22.0", - "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-0.22.0.tgz", - "integrity": "sha1-qbqoYKP5tZWmuBsahocxIe06Jp4=", - "requires": { - "css-select": "~1.2.0", - "dom-serializer": "~0.1.0", - "entities": "~1.1.1", - "htmlparser2": "^3.9.1", - "lodash.assignin": "^4.0.9", - "lodash.bind": "^4.1.4", - "lodash.defaults": "^4.0.1", - "lodash.filter": "^4.4.0", - "lodash.flatten": "^4.2.0", - "lodash.foreach": "^4.3.0", - "lodash.map": "^4.4.0", - "lodash.merge": "^4.4.0", - "lodash.pick": "^4.2.1", - "lodash.reduce": "^4.4.0", - "lodash.reject": "^4.4.0", - "lodash.some": "^4.4.0" - } - }, - "chownr": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz", - "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==" - }, - "co": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", - "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=" - }, - "code-point-at": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", - "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=" - }, "color-convert": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", @@ -242,1216 +38,16 @@ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" }, - "combined-stream": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", - "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", - "requires": { - "delayed-stream": "~1.0.0" - } - }, - "commander": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-5.0.0.tgz", - "integrity": "sha512-JrDGPAKjMGSP1G0DUoaceEJ3DZgAfr/q6X7FVk4+U5KxUSKviYGM2k6zWkfyyBHy5rAtzgYJFa1ro2O9PtoxwQ==" - }, - "concat-map": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" - }, - "console-control-strings": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", - "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=" - }, - "core-util-is": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" - }, - "cryptiles": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz", - "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=", - "requires": { - "boom": "2.x.x" - } - }, - "css-select": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz", - "integrity": "sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=", - "requires": { - "boolbase": "~1.0.0", - "css-what": "2.1", - "domutils": "1.5.1", - "nth-check": "~1.0.1" - }, - "dependencies": { - "domutils": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz", - "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=", - "requires": { - "dom-serializer": "0", - "domelementtype": "1" - } - } - } - }, - "css-what": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.3.tgz", - "integrity": "sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==" - }, - "dashdash": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", - "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", - "requires": { - "assert-plus": "^1.0.0" - } - }, - "dblapi.js": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/dblapi.js/-/dblapi.js-2.4.0.tgz", - "integrity": "sha512-SqDYVcV1DBQnyhySTjd+Qvzu7jFr+4eKwl56fGpIti7OlXGF5dmDPeo3jQfRlOXTRn5/I5997MDIJukoDxE3Mg==" - }, - "debug": { - "version": "3.2.6", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", - "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", - "requires": { - "ms": "^2.1.1" - } - }, - "decompress-response": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz", - "integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=", - "requires": { - "mimic-response": "^1.0.0" - } - }, - "deep-extend": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz", - "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==" - }, - "deepmerge": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-1.5.2.tgz", - "integrity": "sha512-95k0GDqvBjZavkuvzx/YqVLv/6YYa17fz6ILMSf7neqQITCPbnfEnQvEgMPNjH4kgobe7+WIL0yJEHku+H3qtQ==" - }, - "delayed-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", - "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=" - }, - "delegates": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", - "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=" - }, - "detect-libc": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz", - "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=" - }, - "discord.js": { - "version": "12.1.1", - "resolved": "https://registry.npmjs.org/discord.js/-/discord.js-12.1.1.tgz", - "integrity": "sha512-Y6+QfAUZkb9cy27cfNqUigAgYVSKTw9jPF3mN4UDMih3Em3VQ0WjGBdX1UbE8CwFkLOu5XWQSNPdsoStTR8c2Q==", - "requires": { - "@discordjs/collection": "^0.1.5", - "abort-controller": "^3.0.0", - "form-data": "^3.0.0", - "node-fetch": "^2.6.0", - "prism-media": "^1.2.0", - "setimmediate": "^1.0.5", - "tweetnacl": "^1.0.3", - "ws": "^7.2.1" - } - }, - "dom-serializer": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.1.tgz", - "integrity": "sha512-l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA==", - "requires": { - "domelementtype": "^1.3.0", - "entities": "^1.1.1" - } - }, - "domelementtype": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz", - "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==" - }, - "domhandler": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz", - "integrity": "sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==", - "requires": { - "domelementtype": "1" - } - }, - "domutils": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz", - "integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==", - "requires": { - "dom-serializer": "0", - "domelementtype": "1" - } - }, - "dotenv": { - "version": "8.2.0", - "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-8.2.0.tgz", - "integrity": "sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw==" - }, - "duplexer3": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz", - "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=" - }, - "ecc-jsbn": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz", - "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=", - "requires": { - "jsbn": "~0.1.0", - "safer-buffer": "^2.1.0" - } - }, - "enmap": { - "version": "5.2.4", - "resolved": "https://registry.npmjs.org/enmap/-/enmap-5.2.4.tgz", - "integrity": "sha512-YulKPmB3t08i1aBDBDgEew9gAWYWXVuGe8S3DLYRQ+E0FoVxTTzo2iSfcEmUX9DRLuKLDMRLRcbRqX5J0z55Uw==", - "requires": { - "lodash": "^4.17.15" - } - }, - "entities": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz", - "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==" - }, - "escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=" - }, - "esprima": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", - "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==" - }, - "event-target-shim": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz", - "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==" - }, - "extend": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", - "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==" - }, - "extsprintf": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.4.0.tgz", - "integrity": "sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=" - }, - "fast-deep-equal": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz", - "integrity": "sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA==" - }, - "fast-json-stable-stringify": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", - "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==" - }, - "forever-agent": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", - "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=" - }, - "form-data": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.0.tgz", - "integrity": "sha512-CKMFDglpbMi6PyN+brwB9Q/GOw0eAnsrEZDgcsH5Krhz5Od/haKHAX0NmQfha2zPPz0JpWzA7GJHGSnvCRLWsg==", - "requires": { - "asynckit": "^0.4.0", - "combined-stream": "^1.0.8", - "mime-types": "^2.1.12" - } - }, - "fs-minipass": { - "version": "1.2.7", - "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz", - "integrity": "sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==", - "requires": { - "minipass": "^2.6.0" - } - }, - "fs.realpath": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" - }, - "garfield": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/garfield/-/garfield-1.1.2.tgz", - "integrity": "sha1-C3PcRfUYmgU/9LU9eydOKf5Hy/Y=", - "requires": { - "moment": "^2.17.1" - } - }, - "gauge": { - "version": "2.7.4", - "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz", - "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=", - "requires": { - "aproba": "^1.0.3", - "console-control-strings": "^1.0.0", - "has-unicode": "^2.0.0", - "object-assign": "^4.1.0", - "signal-exit": "^3.0.0", - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1", - "wide-align": "^1.1.0" - } - }, - "get-stream": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", - "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=" - }, - "get-youtube-id": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/get-youtube-id/-/get-youtube-id-1.0.1.tgz", - "integrity": "sha512-5yidLzoLXbtw82a/Wb7LrajkGn29BM6JuLWeHyNfzOGp1weGyW4+7eMz6cP23+etqj27VlOFtq8fFFDMLq/FXQ==" - }, - "getpass": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", - "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", - "requires": { - "assert-plus": "^1.0.0" - } - }, - "glob": { - "version": "7.1.6", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", - "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - }, - "got": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/got/-/got-7.1.0.tgz", - "integrity": "sha512-Y5WMo7xKKq1muPsxD+KmrR8DH5auG7fBdDVueZwETwV6VytKyU9OX/ddpq2/1hp1vIPvVb4T81dKQz3BivkNLw==", - "requires": { - "decompress-response": "^3.2.0", - "duplexer3": "^0.1.4", - "get-stream": "^3.0.0", - "is-plain-obj": "^1.1.0", - "is-retry-allowed": "^1.0.0", - "is-stream": "^1.0.0", - "isurl": "^1.0.0-alpha5", - "lowercase-keys": "^1.0.0", - "p-cancelable": "^0.3.0", - "p-timeout": "^1.1.1", - "safe-buffer": "^5.0.1", - "timed-out": "^4.0.0", - "url-parse-lax": "^1.0.0", - "url-to-options": "^1.0.1" - } - }, - "har-schema": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz", - "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=" - }, - "har-validator": { - "version": "5.1.3", - "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz", - "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==", - "requires": { - "ajv": "^6.5.5", - "har-schema": "^2.0.0" - } - }, "has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" }, - "has-symbol-support-x": { - "version": "1.4.2", - "resolved": "https://registry.npmjs.org/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz", - "integrity": "sha512-3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw==" - }, - "has-to-string-tag-x": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz", - "integrity": "sha512-vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw==", - "requires": { - "has-symbol-support-x": "^1.4.1" - } - }, - "has-unicode": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", - "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=" - }, - "hastebin-gen": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/hastebin-gen/-/hastebin-gen-2.0.5.tgz", - "integrity": "sha512-At1LaKtcqh2jiP8xfE2sDGT9IshIki6FqsgLwn2y7FzAvlFJRtpUsSPh3yWjWIQIvxi/GPF07IBqSI8WhPL/gQ==", - "requires": { - "node-fetch": "^2.6.0" - } - }, - "hawk": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz", - "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=", - "requires": { - "boom": "2.x.x", - "cryptiles": "2.x.x", - "hoek": "2.x.x", - "sntp": "1.x.x" - } - }, - "hoek": { - "version": "2.16.3", - "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz", - "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=" - }, - "html-entities": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.2.1.tgz", - "integrity": "sha1-DfKTUfByEWNRXfueVUPl9u7VFi8=" - }, - "htmlparser2": { - "version": "3.10.1", - "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.1.tgz", - "integrity": "sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==", - "requires": { - "domelementtype": "^1.3.1", - "domhandler": "^2.3.0", - "domutils": "^1.5.1", - "entities": "^1.1.1", - "inherits": "^2.0.1", - "readable-stream": "^3.1.1" - }, - "dependencies": { - "readable-stream": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", - "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", - "requires": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - } - } - } - }, - "http-signature": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.3.2.tgz", - "integrity": "sha512-sjgXeFLIVJ54n1+HWOvazGkIQpaawFGIQ1PYPORaFNWpPHJ28ZuDgWljvMIhAIcOelTtrh9e5wVB3IorxjiZDA==", - "requires": { - "assert-plus": "^1.0.0", - "jsprim": "^1.2.2", - "sshpk": "^1.14.1" - } - }, - "iconv-lite": { - "version": "0.4.24", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", - "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", - "requires": { - "safer-buffer": ">= 2.1.2 < 3" - } - }, - "ignore-walk": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.3.tgz", - "integrity": "sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw==", - "requires": { - "minimatch": "^3.0.4" - } - }, - "inflight": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", - "requires": { - "once": "^1.3.0", - "wrappy": "1" - } - }, - "inherits": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" - }, - "ini": { - "version": "1.3.5", - "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz", - "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==" - }, - "integer": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/integer/-/integer-2.1.0.tgz", - "integrity": "sha512-vBtiSgrEiNocWvvZX1RVfeOKa2mCHLZQ2p9nkQkQZ/BvEiY+6CcUz0eyjvIiewjJoeNidzg2I+tpPJvpyspL1w==" - }, - "is-fullwidth-code-point": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", - "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", - "requires": { - "number-is-nan": "^1.0.0" - } - }, - "is-google-domain": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-google-domain/-/is-google-domain-1.0.0.tgz", - "integrity": "sha1-feHSOqFHuGrJbG0H4PFt+GYARzM=" - }, - "is-object": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-object/-/is-object-1.0.1.tgz", - "integrity": "sha1-iVJojF7C/9awPsyF52ngKQMINHA=" - }, - "is-plain-obj": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz", - "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=" - }, - "is-retry-allowed": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz", - "integrity": "sha512-RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg==" - }, - "is-stream": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", - "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=" - }, - "is-typedarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", - "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=" - }, - "is-url": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/is-url/-/is-url-1.2.4.tgz", - "integrity": "sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==" - }, - "isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" - }, - "isstream": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", - "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=" - }, - "isurl": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isurl/-/isurl-1.0.0.tgz", - "integrity": "sha512-1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w==", - "requires": { - "has-to-string-tag-x": "^1.2.0", - "is-object": "^1.0.1" - } - }, - "js-yaml": { - "version": "3.13.1", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz", - "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==", - "requires": { - "argparse": "^1.0.7", - "esprima": "^4.0.0" - } - }, - "jsbn": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", - "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=" - }, - "json-schema": { - "version": "0.2.5", - "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.5.tgz", - "integrity": "sha512-gWJOWYFrhQ8j7pVm0EM8Slr+EPVq1Phf6lvzvD/WCeqkrx/f2xBI0xOsRRS9xCn3I4vKtP519dvs3TP09r24wQ==" - }, - "json-schema-traverse": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==" - }, - "json-stable-stringify": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz", - "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=", - "requires": { - "jsonify": "~0.0.0" - } - }, - "json-stringify-safe": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", - "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=" - }, - "jsonify": { - "version": "0.0.0", - "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz", - "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=" - }, - "jsprim": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz", - "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=", - "requires": { - "assert-plus": "1.0.0", - "extsprintf": "1.3.0", - "json-schema": "0.2.3", - "verror": "1.10.0" - }, - "dependencies": { - "extsprintf": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", - "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=" - }, - "json-schema": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz", - "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=" - } - } - }, - "lodash": { - "version": "4.17.15", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz", - "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==" - }, - "lodash.assignin": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/lodash.assignin/-/lodash.assignin-4.2.0.tgz", - "integrity": "sha1-uo31+4QesKPoBEIysOJjqNxqKKI=" - }, - "lodash.bind": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/lodash.bind/-/lodash.bind-4.2.1.tgz", - "integrity": "sha1-euMBfpOWIqwxt9fX3LGzTbFpDTU=" - }, - "lodash.defaults": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz", - "integrity": "sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw=" - }, - "lodash.filter": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/lodash.filter/-/lodash.filter-4.6.0.tgz", - "integrity": "sha1-ZosdSYFgOuHMWm+nYBQ+SAtMSs4=" - }, - "lodash.flatten": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz", - "integrity": "sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8=" - }, - "lodash.foreach": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/lodash.foreach/-/lodash.foreach-4.5.0.tgz", - "integrity": "sha1-Gmo16s5AEoDH8G3d7DUWWrJ+PlM=" - }, - "lodash.isfunction": { - "version": "3.0.9", - "resolved": "https://registry.npmjs.org/lodash.isfunction/-/lodash.isfunction-3.0.9.tgz", - "integrity": "sha512-AirXNj15uRIMMPihnkInB4i3NHeb4iBtNg9WRWuK2o31S+ePwwNmDPaTL3o7dTJ+VXNZim7rFs4rxN4YU1oUJw==" - }, - "lodash.map": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/lodash.map/-/lodash.map-4.6.0.tgz", - "integrity": "sha1-dx7Hg540c9nEzeKLGTlMNWL09tM=" - }, - "lodash.merge": { - "version": "4.6.2", - "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", - "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==" - }, - "lodash.pick": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/lodash.pick/-/lodash.pick-4.4.0.tgz", - "integrity": "sha1-UvBWEP/53tQiYRRB7R/BI6AwAbM=" - }, - "lodash.reduce": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/lodash.reduce/-/lodash.reduce-4.6.0.tgz", - "integrity": "sha1-8atrg5KZrUj3hKu/R2WW8DuRTTs=" - }, - "lodash.reject": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/lodash.reject/-/lodash.reject-4.6.0.tgz", - "integrity": "sha1-gNZJLcFHCGS79YNTO2UfQqn1JBU=" - }, - "lodash.some": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/lodash.some/-/lodash.some-4.6.0.tgz", - "integrity": "sha1-G7nzFO9ri63tE7VJFpsqlF62jk0=" - }, - "lowercase-keys": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz", - "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==" - }, - "m3u8stream": { - "version": "0.6.5", - "resolved": "https://registry.npmjs.org/m3u8stream/-/m3u8stream-0.6.5.tgz", - "integrity": "sha512-QZCzhcfUliZfsOboi68QkNcMejPKTEhxE+s1TApvHubDeR8ythm4ViWuYFqgUwZeoHe8q0nsPxOvA3lQvdSzyg==", - "requires": { - "miniget": "^1.6.1", - "sax": "^1.2.4" - } - }, - "mdurl": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz", - "integrity": "sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4=" - }, - "mime-db": { - "version": "1.43.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.43.0.tgz", - "integrity": "sha512-+5dsGEEovYbT8UY9yD7eE4XTc4UwJ1jBYlgaQQF38ENsKR3wj/8q8RFZrF9WIZpB2V1ArTVFUva8sAul1NzRzQ==" - }, - "mime-types": { - "version": "2.1.26", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.26.tgz", - "integrity": "sha512-01paPWYgLrkqAyrlDorC1uDwl2p3qZT7yl806vW7DvDoxwXi46jsjFbg+WdwotBIk6/MbEhO/dh5aZ5sNj/dWQ==", - "requires": { - "mime-db": "1.43.0" - } - }, - "mimic-response": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz", - "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==" - }, - "miniget": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/miniget/-/miniget-1.7.0.tgz", - "integrity": "sha512-yrgaDSMRzrfYTkudB4Y6xK8pCb7oAH2bvfv6iPY2m6CedZfs9yK4b/ofh0Vzv08hCYXH/HHkoS8an6fkWtOAQA==" - }, - "minimatch": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", - "requires": { - "brace-expansion": "^1.1.7" - } - }, - "minimist": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", - "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==" - }, - "minipass": { - "version": "2.9.0", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz", - "integrity": "sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==", - "requires": { - "safe-buffer": "^5.1.2", - "yallist": "^3.0.0" - } - }, - "minizlib": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.3.3.tgz", - "integrity": "sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==", - "requires": { - "minipass": "^2.9.0" - } - }, - "mkdirp": { - "version": "0.5.4", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.4.tgz", - "integrity": "sha512-iG9AK/dJLtJ0XNgTuDbSyNS3zECqDlAhnQW4CsNxBG3LQJBbHmRX1egw39DmtOdCAqY+dKXV+sgPgilNWUKMVw==", - "requires": { - "minimist": "^1.2.5" - } - }, "moment": { "version": "2.24.0", "resolved": "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz", "integrity": "sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==" }, - "moment-duration-format": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/moment-duration-format/-/moment-duration-format-2.3.2.tgz", - "integrity": "sha512-cBMXjSW+fjOb4tyaVHuaVE/A5TqkukDWiOfxxAjY+PEqmmBQlLwn+8OzwPiG3brouXKY5Un4pBjAeB6UToXHaQ==" - }, - "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" - }, - "needle": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/needle/-/needle-2.3.3.tgz", - "integrity": "sha512-EkY0GeSq87rWp1hoq/sH/wnTWgFVhYlnIkbJ0YJFfRgEFlz2RraCjBpFQ+vrEgEdp0ThfyHADmkChEhcb7PKyw==", - "requires": { - "debug": "^3.2.6", - "iconv-lite": "^0.4.4", - "sax": "^1.2.4" - } - }, - "node-addon-api": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-2.0.0.tgz", - "integrity": "sha512-ASCL5U13as7HhOExbT6OlWJJUV/lLzL2voOSP1UVehpRD8FbSrSDjfScK/KwAvVTI5AS6r4VwbOMlIqtvRidnA==" - }, - "node-fetch": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz", - "integrity": "sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==" - }, - "node-pre-gyp": { - "version": "0.14.0", - "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz", - "integrity": "sha512-+CvDC7ZttU/sSt9rFjix/P05iS43qHCOOGzcr3Ry99bXG7VX953+vFyEuph/tfqoYu8dttBkE86JSKBO2OzcxA==", - "requires": { - "detect-libc": "^1.0.2", - "mkdirp": "^0.5.1", - "needle": "^2.2.1", - "nopt": "^4.0.1", - "npm-packlist": "^1.1.6", - "npmlog": "^4.0.2", - "rc": "^1.2.7", - "rimraf": "^2.6.1", - "semver": "^5.3.0", - "tar": "^4.4.2" - } - }, - "nopt": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz", - "integrity": "sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==", - "requires": { - "abbrev": "1", - "osenv": "^0.1.4" - } - }, - "npm-bundled": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.1.1.tgz", - "integrity": "sha512-gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA==", - "requires": { - "npm-normalize-package-bin": "^1.0.1" - } - }, - "npm-normalize-package-bin": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz", - "integrity": "sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==" - }, - "npm-packlist": { - "version": "1.4.8", - "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.8.tgz", - "integrity": "sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A==", - "requires": { - "ignore-walk": "^3.0.1", - "npm-bundled": "^1.0.1", - "npm-normalize-package-bin": "^1.0.1" - } - }, - "npmlog": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz", - "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==", - "requires": { - "are-we-there-yet": "~1.1.2", - "console-control-strings": "~1.1.0", - "gauge": "~2.7.3", - "set-blocking": "~2.0.0" - } - }, - "nth-check": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz", - "integrity": "sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==", - "requires": { - "boolbase": "~1.0.0" - } - }, - "number-is-nan": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", - "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=" - }, - "oauth-sign": { - "version": "0.9.0", - "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz", - "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==" - }, - "object-assign": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" - }, - "once": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", - "requires": { - "wrappy": "1" - } - }, - "os-homedir": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", - "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=" - }, - "os-tmpdir": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", - "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=" - }, - "osenv": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz", - "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==", - "requires": { - "os-homedir": "^1.0.0", - "os-tmpdir": "^1.0.0" - } - }, - "p-cancelable": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-0.3.0.tgz", - "integrity": "sha512-RVbZPLso8+jFeq1MfNvgXtCRED2raz/dKpacfTNxsx6pLEpEomM7gah6VeHSYV3+vo0OAi4MkArtQcWWXuQoyw==" - }, - "p-finally": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz", - "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=" - }, - "p-timeout": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-1.2.1.tgz", - "integrity": "sha1-XrOzU7f86Z8QGhA4iAuwVOu+o4Y=", - "requires": { - "p-finally": "^1.0.0" - } - }, - "path-is-absolute": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=" - }, - "performance-now": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", - "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=" - }, - "prepend-http": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz", - "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=" - }, - "prism-media": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/prism-media/-/prism-media-1.2.1.tgz", - "integrity": "sha512-R3EbKwJiYlTvGwcG1DpUt+06DsxOGS5W4AMEHT7oVOjG93MjpdhGX1whHyjnqknylLMupKAsKMEXcTNRbPe6Vw==" - }, - "process-nextick-args": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", - "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==" - }, - "psl": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz", - "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==" - }, - "punycode": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", - "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==" - }, - "qs": { - "version": "6.9.3", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.3.tgz", - "integrity": "sha512-EbZYNarm6138UKKq46tdx08Yo/q9ZhFoAXAI1meAFd2GtbRDhbZY2WQSICskT0c5q99aFzLG1D4nvTk9tqfXIw==" - }, - "randomcolor": { - "version": "0.5.4", - "resolved": "https://registry.npmjs.org/randomcolor/-/randomcolor-0.5.4.tgz", - "integrity": "sha512-nYd4nmTuuwMFzHL6W+UWR5fNERGZeVauho8mrJDUSXdNDbao4rbrUwhuLgKC/j8VCS5+34Ria8CsTDuBjrIrQA==" - }, - "rc": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz", - "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==", - "requires": { - "deep-extend": "^0.6.0", - "ini": "~1.3.0", - "minimist": "^1.2.0", - "strip-json-comments": "~2.0.1" - } - }, - "readable-stream": { - "version": "2.3.7", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", - "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" - }, - "dependencies": { - "safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" - }, - "string_decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "requires": { - "safe-buffer": "~5.1.0" - } - } - } - }, - "relevant-urban": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/relevant-urban/-/relevant-urban-2.0.0.tgz", - "integrity": "sha1-abvU9DpnSQjbkI4n8jCWyw8kuLk=", - "requires": { - "snekfetch": "^3.0.1" - } - }, - "request": { - "version": "2.88.2", - "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz", - "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==", - "requires": { - "aws-sign2": "~0.7.0", - "aws4": "^1.8.0", - "caseless": "~0.12.0", - "combined-stream": "~1.0.6", - "extend": "~3.0.2", - "forever-agent": "~0.6.1", - "form-data": "~2.3.2", - "har-validator": "~5.1.3", - "http-signature": "~1.2.0", - "is-typedarray": "~1.0.0", - "isstream": "~0.1.2", - "json-stringify-safe": "~5.0.1", - "mime-types": "~2.1.19", - "oauth-sign": "~0.9.0", - "performance-now": "^2.1.0", - "qs": "~6.5.2", - "safe-buffer": "^5.1.2", - "tough-cookie": "~2.5.0", - "tunnel-agent": "^0.6.0", - "uuid": "^3.3.2" - }, - "dependencies": { - "form-data": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz", - "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==", - "requires": { - "asynckit": "^0.4.0", - "combined-stream": "^1.0.6", - "mime-types": "^2.1.12" - } - }, - "http-signature": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", - "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=", - "requires": { - "assert-plus": "^1.0.0", - "jsprim": "^1.2.2", - "sshpk": "^1.7.0" - } - }, - "qs": { - "version": "6.5.2", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz", - "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==" - } - } - }, - "request-promise": { - "version": "4.2.5", - "resolved": "https://registry.npmjs.org/request-promise/-/request-promise-4.2.5.tgz", - "integrity": "sha512-ZgnepCykFdmpq86fKGwqntyTiUrHycALuGggpyCZwMvGaZWgxW6yagT0FHkgo5LzYvOaCNvxYwWYIjevSH1EDg==", - "requires": { - "bluebird": "^3.5.0", - "request-promise-core": "1.1.3", - "stealthy-require": "^1.1.1", - "tough-cookie": "^2.3.3" - } - }, - "request-promise-core": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.3.tgz", - "integrity": "sha512-QIs2+ArIGQVp5ZYbWD5ZLCY29D5CfWizP8eWnm8FoGD1TX61veauETVQbrV60662V0oFBkrDOuaBI8XgtuyYAQ==", - "requires": { - "lodash": "^4.17.15" - } - }, - "require-all": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/require-all/-/require-all-2.2.0.tgz", - "integrity": "sha1-tEIMIzrAKC0P9Jsnf7iAqLXeCJQ=" - }, - "rimraf": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", - "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", - "requires": { - "glob": "^7.1.3" - } - }, - "safe-buffer": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz", - "integrity": "sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg==" - }, - "safer-buffer": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", - "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" - }, - "sax": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", - "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==" - }, - "semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" - }, - "set-blocking": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", - "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=" - }, - "setimmediate": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz", - "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=" - }, - "signal-exit": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz", - "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==" - }, - "snekfetch": { - "version": "3.6.4", - "resolved": "https://registry.npmjs.org/snekfetch/-/snekfetch-3.6.4.tgz", - "integrity": "sha512-NjxjITIj04Ffqid5lqr7XdgwM7X61c/Dns073Ly170bPQHLm6jkmelye/eglS++1nfTWktpP6Y2bFXjdPlQqdw==" - }, - "sntp": { - "version": "1.0.9", - "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz", - "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=", - "requires": { - "hoek": "2.x.x" - } - }, - "sprintf-js": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.2.tgz", - "integrity": "sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==" - }, - "sshpk": { - "version": "1.16.1", - "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz", - "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==", - "requires": { - "asn1": "~0.2.3", - "assert-plus": "^1.0.0", - "bcrypt-pbkdf": "^1.0.0", - "dashdash": "^1.12.0", - "ecc-jsbn": "~0.1.1", - "getpass": "^0.1.1", - "jsbn": "~0.1.0", - "safer-buffer": "^2.0.2", - "tweetnacl": "~0.14.0" - }, - "dependencies": { - "tweetnacl": { - "version": "0.14.5", - "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", - "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=" - } - } - }, - "stealthy-require": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz", - "integrity": "sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=" - }, - "string-width": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", - "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", - "requires": { - "code-point-at": "^1.0.0", - "is-fullwidth-code-point": "^1.0.0", - "strip-ansi": "^3.0.0" - } - }, - "string_decoder": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", - "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", - "requires": { - "safe-buffer": "~5.2.0" - } - }, - "stringstream": { - "version": "0.0.6", - "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.6.tgz", - "integrity": "sha512-87GEBAkegbBcweToUrdzf3eLhWNg06FJTebl4BVJz/JgWy8CvEr9dRtX5qWphiynMSQlxxi+QqN0z5T32SLlhA==" - }, - "strip-ansi": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", - "requires": { - "ansi-regex": "^2.0.0" - } - }, - "strip-json-comments": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", - "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=" - }, "supports-color": { "version": "7.1.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", @@ -1459,422 +55,6 @@ "requires": { "has-flag": "^4.0.0" } - }, - "tar": { - "version": "4.4.13", - "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.13.tgz", - "integrity": "sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==", - "requires": { - "chownr": "^1.1.1", - "fs-minipass": "^1.2.5", - "minipass": "^2.8.6", - "minizlib": "^1.2.1", - "mkdirp": "^0.5.0", - "safe-buffer": "^5.1.2", - "yallist": "^3.0.3" - } - }, - "timed-out": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-4.0.1.tgz", - "integrity": "sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8=" - }, - "tough-cookie": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz", - "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==", - "requires": { - "psl": "^1.1.28", - "punycode": "^2.1.1" - } - }, - "tunnel-agent": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", - "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", - "requires": { - "safe-buffer": "^5.0.1" - } - }, - "tweetnacl": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-1.0.3.tgz", - "integrity": "sha512-6rt+RN7aOi1nGMyC4Xa5DdYiukl2UWCbcJft7YhxReBGQD7OAM8Pbxw6YMo4r2diNEA8FEmu32YOn9rhaiE5yw==" - }, - "urban": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/urban/-/urban-0.3.2.tgz", - "integrity": "sha512-B0/cCQNb1XCwHA0YGw1u9IavHMbHe8ruxkUNUlYHobMCAWdk0/gFfOCQQ11CQDmlFu4SUZRoVxrUF3kbE0gdog==", - "requires": { - "commander": ">=0.3.0" - } - }, - "uri-js": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz", - "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==", - "requires": { - "punycode": "^2.1.0" - } - }, - "url-parse-lax": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz", - "integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=", - "requires": { - "prepend-http": "^1.0.1" - } - }, - "url-to-options": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/url-to-options/-/url-to-options-1.0.1.tgz", - "integrity": "sha1-FQWgOiiaSMvXpDTvuu7FBV9WM6k=" - }, - "url-unshort": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/url-unshort/-/url-unshort-5.0.0.tgz", - "integrity": "sha1-YkqSuTFg/aXoLhdevoGBVO077Xg=", - "requires": { - "cheerio": "^0.22.0", - "deepmerge": "^1.3.1", - "escape-string-regexp": "^1.0.5", - "got": "^7.0.0", - "is-google-domain": "^1.0.0", - "js-yaml": "^3.7.0", - "mdurl": "^1.0.0", - "punycode": "^2.0.1", - "require-all": "^2.0.0" - } - }, - "url-unshorten": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/url-unshorten/-/url-unshorten-1.0.6.tgz", - "integrity": "sha512-HIdtwDnUbOUR5pD6IqdTnK58qvEGmLjPoPWi1s83K/h+O/GPS5GmFivK25MyVNbn8yfmOJnfdQD7d6RPeu8S4A==", - "requires": { - "request": "^2.88.0" - } - }, - "util-deprecate": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" - }, - "uuid": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", - "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==" - }, - "verror": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", - "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", - "requires": { - "assert-plus": "^1.0.0", - "core-util-is": "1.0.2", - "extsprintf": "^1.2.0" - } - }, - "weather-js": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/weather-js/-/weather-js-2.0.0.tgz", - "integrity": "sha1-DZvNsFpPhNBrm585kAKKYB6kofw=", - "requires": { - "request": "2.x.x", - "xml2js": "0.4.x" - } - }, - "wide-align": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz", - "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==", - "requires": { - "string-width": "^1.0.2 || 2" - } - }, - "wrappy": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" - }, - "ws": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/ws/-/ws-7.2.3.tgz", - "integrity": "sha512-HTDl9G9hbkNDk98naoR/cHDws7+EyYMOdL1BmjsZXRUjf7d+MficC4B7HLUPlSiho0vg+CWKrGIt/VJBd1xunQ==" - }, - "xml2js": { - "version": "0.4.23", - "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.23.tgz", - "integrity": "sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==", - "requires": { - "sax": ">=0.6.0", - "xmlbuilder": "~11.0.0" - } - }, - "xmlbuilder": { - "version": "11.0.1", - "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz", - "integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==" - }, - "yallist": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", - "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==" - }, - "youtube-info": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/youtube-info/-/youtube-info-1.3.2.tgz", - "integrity": "sha512-LnBZxCuCof0bwFNtLSxklLYgaU1XR8OK+cGieWyPS10rn3P0TMHdIikRpO/W/duE9SR9JfzOk8ThgwDgx0B3Vw==", - "requires": { - "cheerio": "^0.19.0", - "debug": "^2.2.0", - "lodash.isfunction": "^3.0.6", - "request": "2.81.0", - "request-promise": "^4.2.2" - }, - "dependencies": { - "ajv": { - "version": "4.11.8", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz", - "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=", - "requires": { - "co": "^4.6.0", - "json-stable-stringify": "^1.0.1" - } - }, - "assert-plus": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz", - "integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ=" - }, - "aws-sign2": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz", - "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8=" - }, - "cheerio": { - "version": "0.19.0", - "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-0.19.0.tgz", - "integrity": "sha1-dy5wFfLuKZZQltcepBdbdas1SSU=", - "requires": { - "css-select": "~1.0.0", - "dom-serializer": "~0.1.0", - "entities": "~1.1.1", - "htmlparser2": "~3.8.1", - "lodash": "^3.2.0" - } - }, - "css-select": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.0.0.tgz", - "integrity": "sha1-sRIcpRhI3SZOIkTQWM7iVN7rRLA=", - "requires": { - "boolbase": "~1.0.0", - "css-what": "1.0", - "domutils": "1.4", - "nth-check": "~1.0.0" - } - }, - "css-what": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/css-what/-/css-what-1.0.0.tgz", - "integrity": "sha1-18wt9FGAZm+Z0rFEYmOUaeAPc2w=" - }, - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "requires": { - "ms": "2.0.0" - } - }, - "domhandler": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.3.0.tgz", - "integrity": "sha1-LeWaCCLVAn+r/28DLCsloqir5zg=", - "requires": { - "domelementtype": "1" - } - }, - "domutils": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.4.3.tgz", - "integrity": "sha1-CGVRN5bGswYDGFDhdVFrr4C3Km8=", - "requires": { - "domelementtype": "1" - } - }, - "form-data": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz", - "integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=", - "requires": { - "asynckit": "^0.4.0", - "combined-stream": "^1.0.5", - "mime-types": "^2.1.12" - } - }, - "har-schema": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz", - "integrity": "sha1-0mMTX0MwfALGAq/I/pWXDAFRNp4=" - }, - "har-validator": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz", - "integrity": "sha1-M0gdDxu/9gDdID11gSpqX7oALio=", - "requires": { - "ajv": "^4.9.1", - "har-schema": "^1.0.5" - } - }, - "htmlparser2": { - "version": "3.8.3", - "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.3.tgz", - "integrity": "sha1-mWwosZFRaovoZQGn15dX5ccMEGg=", - "requires": { - "domelementtype": "1", - "domhandler": "2.3", - "domutils": "1.5", - "entities": "1.0", - "readable-stream": "1.1" - }, - "dependencies": { - "domutils": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz", - "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=", - "requires": { - "dom-serializer": "0", - "domelementtype": "1" - } - }, - "entities": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/entities/-/entities-1.0.0.tgz", - "integrity": "sha1-sph6o4ITR/zeZCsk/fyeT7cSvyY=" - } - } - }, - "http-signature": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz", - "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=", - "requires": { - "assert-plus": "^0.2.0", - "jsprim": "^1.2.2", - "sshpk": "^1.7.0" - } - }, - "isarray": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", - "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=" - }, - "lodash": { - "version": "3.10.1", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz", - "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=" - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" - }, - "oauth-sign": { - "version": "0.8.2", - "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz", - "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=" - }, - "performance-now": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz", - "integrity": "sha1-M+8wxcd9TqIcWlOGnZG1bY8lVeU=" - }, - "punycode": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", - "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=" - }, - "qs": { - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz", - "integrity": "sha1-E+JtKK1rD/qpExLNO/cI7TUecjM=" - }, - "readable-stream": { - "version": "1.1.14", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", - "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=", - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.1", - "isarray": "0.0.1", - "string_decoder": "~0.10.x" - } - }, - "request": { - "version": "2.81.0", - "resolved": "https://registry.npmjs.org/request/-/request-2.81.0.tgz", - "integrity": "sha1-xpKJRqDgbF+Nb4qTM0af/aRimKA=", - "requires": { - "aws-sign2": "~0.6.0", - "aws4": "^1.2.1", - "caseless": "~0.12.0", - "combined-stream": "~1.0.5", - "extend": "~3.0.0", - "forever-agent": "~0.6.1", - "form-data": "~2.1.1", - "har-validator": "~4.2.1", - "hawk": "~3.1.3", - "http-signature": "~1.1.0", - "is-typedarray": "~1.0.0", - "isstream": "~0.1.2", - "json-stringify-safe": "~5.0.1", - "mime-types": "~2.1.7", - "oauth-sign": "~0.8.1", - "performance-now": "^0.2.0", - "qs": "~6.4.0", - "safe-buffer": "^5.0.1", - "stringstream": "~0.0.4", - "tough-cookie": "~2.3.0", - "tunnel-agent": "^0.6.0", - "uuid": "^3.0.0" - } - }, - "string_decoder": { - "version": "0.10.31", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", - "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=" - }, - "tough-cookie": { - "version": "2.3.4", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz", - "integrity": "sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==", - "requires": { - "punycode": "^1.4.1" - } - } - } - }, - "ytdl-core": { - "version": "1.0.9", - "resolved": "https://registry.npmjs.org/ytdl-core/-/ytdl-core-1.0.9.tgz", - "integrity": "sha512-HhFeLfjXU34h0FNHmSkSpKygdaYijSt8VNsC770VYBRFb+dyUKcm11cIKxu2MUSwT9znISZ0k1wFdaV/N5VW+Q==", - "requires": { - "html-entities": "^1.1.3", - "m3u8stream": "^0.6.3", - "miniget": "^1.6.0", - "sax": "^1.1.3" - } - }, - "ytdl-core-discord": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/ytdl-core-discord/-/ytdl-core-discord-1.1.0.tgz", - "integrity": "sha512-uiaZWa9UG+he1F9p7Si9H6Tieyxd9dEhLi4958mHuebudQSEEPaaJHUEbFikcpB++5ogzynVOcvdeC+LFJGgEw==", - "requires": { - "@types/node": "^13.5.3", - "prism-media": "^1.0.1", - "ytdl-core": "^1.0.3" - } } } } diff --git a/resources/placeholder b/resources/placeholder new file mode 100644 index 0000000..e69de29 From 8db6ff539f464b6d4fef98e141666adc90416f06 Mon Sep 17 00:00:00 2001 From: mudkipscience Date: Tue, 31 Mar 2020 00:25:29 +0000 Subject: [PATCH 010/156] Delete dashboard maybe?.txt --- dash/dashboard maybe?.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 dash/dashboard maybe?.txt diff --git a/dash/dashboard maybe?.txt b/dash/dashboard maybe?.txt deleted file mode 100644 index e69de29..0000000 From 57fb111d3b282d4d7044d5acdfbba755d5eb9240 Mon Sep 17 00:00:00 2001 From: mudkipscience Date: Tue, 31 Mar 2020 15:09:50 +1100 Subject: [PATCH 011/156] did logging stuff --- events/ready.js | 2 +- index.js | 21 ++- modules/logger.js | 44 +++++ modules/music.js | 92 +++++----- package-lock.json | 416 ++++++++++++++++++++++++++++++++++++++++++---- 5 files changed, 489 insertions(+), 86 deletions(-) diff --git a/events/ready.js b/events/ready.js index 8d1a50e..69acca8 100644 --- a/events/ready.js +++ b/events/ready.js @@ -1,3 +1,3 @@ module.exports = (client) => { - console.log('Discord client ready!') + client.logger.log.ready('Discord client ready!') } diff --git a/index.js b/index.js index 8d25d8d..8451e8f 100644 --- a/index.js +++ b/index.js @@ -12,18 +12,21 @@ const fs = require('fs') const Discord = require('discord.js') const client = new Discord.Client({ disabledEvents: ['TYPING_START'] }) +require('./modules/functions')(client) +client.logger = require('./modules/logger') + if (fs.existsSync('./.env') === false) { - console.log('.env file not found!') + client.logger.log.error('The .env file is missing! Please create a .env file.') process.exit() } if (fs.existsSync('./config.js') === false) { - console.log('config file not found!') + client.logger.log.error('The config.js file is missing! Please create a config.js file.') process.exit() } require('dotenv').config() -client.config = require('config') +client.config = require('./config') // Command/alias cache client.commands = new Discord.Collection() @@ -35,19 +38,23 @@ const init = async () => { // Load events fs.readdir('./events', (err, files) => { - if (err) {}// Prepare variableseturn err + if (err) {} + client.logger.log.info(`Loading ${files.length} events.`) files.forEach(file => { - client.on(file.substr(0, file.length - 3), require('./events/' + file)) + const event = require(`./events/${file}`) + client.on(file.substr(0, file.length - 3), event.bind(null, client)) }) }) // Load commands // Level cache + client.levelCache = {} for (let i = 0; i < client.config.permLevels.length; i++) { - const currentlevel = client.config.permLevels[i] - client.levelCache[currentlevel.name] = currentlevel.level + const thisLevel = client.config.permLevels[i] + client.levelCache[thisLevel.name] = thisLevel.level } + // Login into Discord client.login(process.env.TOKEN) } diff --git a/modules/logger.js b/modules/logger.js index e69de29..3112b9b 100644 --- a/modules/logger.js +++ b/modules/logger.js @@ -0,0 +1,44 @@ +const winston = require('winston') +const path = require('path') +const root = path.join(__dirname, '..') + +const levels = { + levels: { + error: 0, + warn: 1, + ready: 2, + info: 3, + cmd: 4 + }, + colors: { + error: 'red', + warn: 'yellow', + ready: 'green', + info: 'cyan', + cmd: 'white' + } +} + +winston.addColors(levels.colors) + +const format = winston.format.combine( + winston.format.colorize(), + winston.format.timestamp({ + format: 'DD-MM-YYYY HH:mm:ss' + }), + winston.format.printf( + info => `${info.timestamp} - ${info.level}: ${info.message}` + ) +) + +const logger = winston.createLogger({ + levels: levels.levels, + format: format, + transports: [ + new winston.transports.Console() + ] +}) + +logger.exitOnError = false + +module.exports.log = logger diff --git a/modules/music.js b/modules/music.js index 8121e05..b9046f5 100644 --- a/modules/music.js +++ b/modules/music.js @@ -1,40 +1,40 @@ -module.exports = client => { - client.music = {guilds: {}} +const ytdl = require('ytdl-core-discord') +const youtubeInfo = require('youtube-info') +const getYoutubeId = require('get-youtube-id') +const fetch = require('node-fetch') - client.music.isYoutubeLink = function(input) { +module.exports = client => { + client.music = { guilds: {} } + + client.music.isYoutubeLink = function (input) { return input.startsWith('https://www.youtube.com/') || input.startsWith('http://www.youtube.com/') || input.startsWith('https://youtube.com/') || input.startsWith('http://youtube.com/') || input.startsWith('https://youtu.be/') || input.startsWith('http://youtu.be/') || input.startsWith('http://m.youtube.com/') || input.startsWith('https://m.youtube.com/') } - client.music.search = async function(query) - { - return new Promise(function(resolve, reject) - { - try{ - fetch("https://www.googleapis.com/youtube/v3/search?part=id&type=video&q=" + encodeURIComponent(query) + "&key=" + process.env.YTKEY) - .then(res => res.json()) - .then(json => { - if(!json.items) { reject() return } - resolve(json.items[0]) - }) - } catch (err) { - client.logger.error("Music search err: ", err) - throw err - } - }) + client.music.search = async function (query) { + return new Promise(function (resolve, reject) { + try { + fetch('https://www.googleapis.com/youtube/v3/search?part=id&type=video&q=' + encodeURIComponent(query) + '&key=' + process.env.YTKEY) + .then(res => res.json()) + .then(json => { + if (!json.items) { reject() } + resolve(json.items[0]) + }) + } catch (err) { + client.logger.error('Music search err: ', err) + throw err + } + }) } - client.music.getGuild = function(id) - { - if(client.music.guilds[id]) return client.music.guilds[id] - - return client.music.guilds[id] = - { - queue: [], - playing: false, - paused: false, - dispatcher: null, - skippers: [] - } + client.music.getGuild = function (id) { + if (client.music.guilds[id]) return client.music.guilds[id] + return client.music.guilds[id] = { + queue: [], + playing: false, + paused: false, + dispatcher: null, + skippers: [] + } } client.music.getMeta = async function(id) @@ -141,30 +141,30 @@ module.exports = client => { message.channel.send(`<:success:466995111885144095> Added to queue: **${song.title}**`) } } - + // MUSIC - TIMESTAMP - client.createTimestamp = function(duration){ - hrs = ~~(duration / 60 / 60), - min = ~~(duration / 60) % 60, - sec = ~~(duration - min * 60) + client.createTimestamp = function (duration) { + var hrs = ~~(duration / 60 / 60) + var min = ~~(duration / 60) % 60 + var sec = ~~(duration - min * 60) - if(String(hrs).length < 2) { - hrs = "0" + String(hrs) + ":" + if (String(hrs).length < 2) { + hrs = '0' + String(hrs) + ':' } - if(String(min).length < 2) { - min = "0" + String(min) + if (String(min).length < 2) { + min = '0' + String(min) } - if(String(sec).length < 2) { - sec = "0" + String(sec) + if (String(sec).length < 2) { + sec = '0' + String(sec) } - if(hrs == "00:") { - hrs = "" + if (hrs === '00:') { + hrs = '' } - - var time = hrs + min + ":" + sec + + var time = hrs + min + ':' + sec return time } } diff --git a/package-lock.json b/package-lock.json index 2b0fe41..83b25b1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2,35 +2,54 @@ "requires": true, "lockfileVersion": 1, "dependencies": { - "@types/color-name": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz", - "integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==" + "@discordjs/collection": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/@discordjs/collection/-/collection-0.1.5.tgz", + "integrity": "sha512-CU1q0UXQUpFNzNB7gufgoisDHP7n+T3tkqTsp3MNUkVJ5+hS3BCvME8uCXAUFlz+6T2FbTCu75A+yQ7HMKqRKw==" }, - "ansi-styles": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", - "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", - "requires": { - "@types/color-name": "^1.1.1", - "color-convert": "^2.0.1" - } - }, - "chalk": { + "abort-controller": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", - "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", + "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz", + "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==", "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" + "event-target-shim": "^5.0.0" } }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "async": { + "version": "2.6.3", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz", + "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==", "requires": { - "color-name": "~1.1.4" + "lodash": "^4.17.14" + } + }, + "asynckit": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", + "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=" + }, + "color": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/color/-/color-3.0.0.tgz", + "integrity": "sha512-jCpd5+s0s0t7p3pHQKpnJ0TpQKKdleP71LWcA0aqiljpiuAkOSUFN/dyH8ZwF0hRmFlrIuRhufds1QyEP9EB+w==", + "requires": { + "color-convert": "^1.9.1", + "color-string": "^1.5.2" + }, + "dependencies": { + "color-convert": { + "version": "1.9.3", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", + "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", + "requires": { + "color-name": "1.1.3" + } + }, + "color-name": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", + "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=" + } } }, "color-name": { @@ -38,23 +57,356 @@ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" + "color-string": { + "version": "1.5.3", + "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.5.3.tgz", + "integrity": "sha512-dC2C5qeWoYkxki5UAXapdjqO672AM4vZuPGRQfO8b5HKuKGBbKWpITyDYN7TOFKvRW7kOgAn3746clDBMDJyQw==", + "requires": { + "color-name": "^1.0.0", + "simple-swizzle": "^0.2.2" + } + }, + "colornames": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/colornames/-/colornames-1.1.1.tgz", + "integrity": "sha1-+IiQMGhcfE/54qVZ9Qd+t2qBb5Y=" + }, + "colors": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz", + "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==" + }, + "colorspace": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/colorspace/-/colorspace-1.1.2.tgz", + "integrity": "sha512-vt+OoIP2d76xLhjwbBaucYlNSpPsrJWPlBTtwCpQKIu6/CSMutyzX93O/Do0qzpH3YoHEes8YEFXyZ797rEhzQ==", + "requires": { + "color": "3.0.x", + "text-hex": "1.0.x" + } + }, + "combined-stream": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", + "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", + "requires": { + "delayed-stream": "~1.0.0" + } + }, + "core-util-is": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", + "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" + }, + "delayed-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", + "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=" + }, + "diagnostics": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/diagnostics/-/diagnostics-1.1.1.tgz", + "integrity": "sha512-8wn1PmdunLJ9Tqbx+Fx/ZEuHfJf4NKSN2ZBj7SJC/OWRWha843+WsTjqMe1B5E3p28jqBlp+mJ2fPVxPyNgYKQ==", + "requires": { + "colorspace": "1.1.x", + "enabled": "1.0.x", + "kuler": "1.0.x" + } + }, + "discord.js": { + "version": "12.1.1", + "resolved": "https://registry.npmjs.org/discord.js/-/discord.js-12.1.1.tgz", + "integrity": "sha512-Y6+QfAUZkb9cy27cfNqUigAgYVSKTw9jPF3mN4UDMih3Em3VQ0WjGBdX1UbE8CwFkLOu5XWQSNPdsoStTR8c2Q==", + "requires": { + "@discordjs/collection": "^0.1.5", + "abort-controller": "^3.0.0", + "form-data": "^3.0.0", + "node-fetch": "^2.6.0", + "prism-media": "^1.2.0", + "setimmediate": "^1.0.5", + "tweetnacl": "^1.0.3", + "ws": "^7.2.1" + } + }, + "dotenv": { + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-8.2.0.tgz", + "integrity": "sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw==" + }, + "enabled": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/enabled/-/enabled-1.0.2.tgz", + "integrity": "sha1-ll9lE9LC0cX0ZStkouM5ZGf8L5M=", + "requires": { + "env-variable": "0.0.x" + } + }, + "env-variable": { + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/env-variable/-/env-variable-0.0.6.tgz", + "integrity": "sha512-bHz59NlBbtS0NhftmR8+ExBEekE7br0e01jw+kk0NDro7TtZzBYZ5ScGPs3OmwnpyfHTHOtr1Y6uedCdrIldtg==" + }, + "event-target-shim": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz", + "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==" + }, + "fast-safe-stringify": { + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.0.7.tgz", + "integrity": "sha512-Utm6CdzT+6xsDk2m8S6uL8VHxNwI6Jub+e9NYTcAms28T84pTa25GJQV9j0CY0N1rM8hK4x6grpF2BQf+2qwVA==" + }, + "fecha": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/fecha/-/fecha-2.3.3.tgz", + "integrity": "sha512-lUGBnIamTAwk4znq5BcqsDaxSmZ9nDVJaij6NvRt/Tg4R69gERA+otPKbS86ROw9nxVMw2/mp1fnaiWqbs6Sdg==" + }, + "form-data": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.0.tgz", + "integrity": "sha512-CKMFDglpbMi6PyN+brwB9Q/GOw0eAnsrEZDgcsH5Krhz5Od/haKHAX0NmQfha2zPPz0JpWzA7GJHGSnvCRLWsg==", + "requires": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "mime-types": "^2.1.12" + } + }, + "inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" + }, + "is-arrayish": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz", + "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==" + }, + "is-stream": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", + "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=" + }, + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" + }, + "kuler": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/kuler/-/kuler-1.0.1.tgz", + "integrity": "sha512-J9nVUucG1p/skKul6DU3PUZrhs0LPulNaeUOox0IyXDi8S4CztTHs1gQphhuZmzXG7VOQSf6NJfKuzteQLv9gQ==", + "requires": { + "colornames": "^1.1.1" + } + }, + "lodash": { + "version": "4.17.15", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz", + "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==" + }, + "logform": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/logform/-/logform-2.1.2.tgz", + "integrity": "sha512-+lZh4OpERDBLqjiwDLpAWNQu6KMjnlXH2ByZwCuSqVPJletw0kTWJf5CgSNAUKn1KUkv3m2cUz/LK8zyEy7wzQ==", + "requires": { + "colors": "^1.2.1", + "fast-safe-stringify": "^2.0.4", + "fecha": "^2.3.3", + "ms": "^2.1.1", + "triple-beam": "^1.3.0" + } + }, + "mime-db": { + "version": "1.43.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.43.0.tgz", + "integrity": "sha512-+5dsGEEovYbT8UY9yD7eE4XTc4UwJ1jBYlgaQQF38ENsKR3wj/8q8RFZrF9WIZpB2V1ArTVFUva8sAul1NzRzQ==" + }, + "mime-types": { + "version": "2.1.26", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.26.tgz", + "integrity": "sha512-01paPWYgLrkqAyrlDorC1uDwl2p3qZT7yl806vW7DvDoxwXi46jsjFbg+WdwotBIk6/MbEhO/dh5aZ5sNj/dWQ==", + "requires": { + "mime-db": "1.43.0" + } }, "moment": { "version": "2.24.0", "resolved": "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz", "integrity": "sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==" }, - "supports-color": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", - "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + }, + "node-fetch": { + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz", + "integrity": "sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==" + }, + "one-time": { + "version": "0.0.4", + "resolved": "https://registry.npmjs.org/one-time/-/one-time-0.0.4.tgz", + "integrity": "sha1-+M33eISCb+Tf+T46nMN7HkSAdC4=" + }, + "path": { + "version": "0.12.7", + "resolved": "https://registry.npmjs.org/path/-/path-0.12.7.tgz", + "integrity": "sha1-1NwqUGxM4hl+tIHr/NWzbAFAsQ8=", "requires": { - "has-flag": "^4.0.0" + "process": "^0.11.1", + "util": "^0.10.3" } + }, + "prism-media": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/prism-media/-/prism-media-1.2.1.tgz", + "integrity": "sha512-R3EbKwJiYlTvGwcG1DpUt+06DsxOGS5W4AMEHT7oVOjG93MjpdhGX1whHyjnqknylLMupKAsKMEXcTNRbPe6Vw==" + }, + "process": { + "version": "0.11.10", + "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", + "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=" + }, + "process-nextick-args": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", + "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==" + }, + "readable-stream": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", + "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", + "requires": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + } + }, + "safe-buffer": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz", + "integrity": "sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg==" + }, + "setimmediate": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz", + "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=" + }, + "simple-swizzle": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz", + "integrity": "sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo=", + "requires": { + "is-arrayish": "^0.3.1" + } + }, + "stack-trace": { + "version": "0.0.10", + "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz", + "integrity": "sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=" + }, + "string_decoder": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", + "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", + "requires": { + "safe-buffer": "~5.2.0" + } + }, + "text-hex": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/text-hex/-/text-hex-1.0.0.tgz", + "integrity": "sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg==" + }, + "triple-beam": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/triple-beam/-/triple-beam-1.3.0.tgz", + "integrity": "sha512-XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw==" + }, + "tweetnacl": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-1.0.3.tgz", + "integrity": "sha512-6rt+RN7aOi1nGMyC4Xa5DdYiukl2UWCbcJft7YhxReBGQD7OAM8Pbxw6YMo4r2diNEA8FEmu32YOn9rhaiE5yw==" + }, + "util": { + "version": "0.10.4", + "resolved": "https://registry.npmjs.org/util/-/util-0.10.4.tgz", + "integrity": "sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==", + "requires": { + "inherits": "2.0.3" + }, + "dependencies": { + "inherits": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", + "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" + } + } + }, + "util-deprecate": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" + }, + "winston": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/winston/-/winston-3.2.1.tgz", + "integrity": "sha512-zU6vgnS9dAWCEKg/QYigd6cgMVVNwyTzKs81XZtTFuRwJOcDdBg7AU0mXVyNbs7O5RH2zdv+BdNZUlx7mXPuOw==", + "requires": { + "async": "^2.6.1", + "diagnostics": "^1.1.1", + "is-stream": "^1.1.0", + "logform": "^2.1.1", + "one-time": "0.0.4", + "readable-stream": "^3.1.1", + "stack-trace": "0.0.x", + "triple-beam": "^1.3.0", + "winston-transport": "^4.3.0" + } + }, + "winston-transport": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/winston-transport/-/winston-transport-4.3.0.tgz", + "integrity": "sha512-B2wPuwUi3vhzn/51Uukcao4dIduEiPOcOt9HJ3QeaXgkJ5Z7UwpBzxS4ZGNHtrxrUvTwemsQiSys0ihOf8Mp1A==", + "requires": { + "readable-stream": "^2.3.6", + "triple-beam": "^1.2.0" + }, + "dependencies": { + "readable-stream": { + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", + "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "requires": { + "safe-buffer": "~5.1.0" + } + } + } + }, + "ws": { + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.2.3.tgz", + "integrity": "sha512-HTDl9G9hbkNDk98naoR/cHDws7+EyYMOdL1BmjsZXRUjf7d+MficC4B7HLUPlSiho0vg+CWKrGIt/VJBd1xunQ==" } } } From 10a0a7aca70fef8b1847886b59650711d887edc0 Mon Sep 17 00:00:00 2001 From: mudkipscience Date: Tue, 31 Mar 2020 18:59:09 +1100 Subject: [PATCH 012/156] did stuff --- {resources => assets}/placeholder | 0 commands/ping.js | 22 + config.js | 3 +- events/message.js | 49 ++ events/ready.js | 2 +- index.js | 41 +- modules/functions.js | 24 + modules/logger.js | 44 -- package-lock.json | 1095 +++++++++++++++++++++++++++++ 9 files changed, 1229 insertions(+), 51 deletions(-) rename {resources => assets}/placeholder (100%) create mode 100644 events/message.js delete mode 100644 modules/logger.js diff --git a/resources/placeholder b/assets/placeholder similarity index 100% rename from resources/placeholder rename to assets/placeholder diff --git a/commands/ping.js b/commands/ping.js index e69de29..9336f44 100644 --- a/commands/ping.js +++ b/commands/ping.js @@ -0,0 +1,22 @@ +exports.conf = { + enabled: true, + guildOnly: false, + aliases: [], + permLevel: 'User', + requiredPerms: [], + cooldown: 2000 +} + +exports.help = { + name: 'ping', + category: 'Utility', + description: 'Displays bot latency in miliseconds.', + usage: 'ping' +} + +exports.run = async (client, message) => { + const msg = await message.channel.send('⏱️ Please wait...') + msg.edit( + `:ping_pong: Pong! Latency is ${msg.createdTimestamp - message.createdTimestamp}ms, API Latency is ${Math.round(client.ws.ping)}ms` + ) +} diff --git a/config.js b/config.js index 186aeef..6aa9c53 100644 --- a/config.js +++ b/config.js @@ -4,8 +4,7 @@ const config = { // Default settings for individual users defaultUserSettings: { - prefixes: ['~'], - systemNotice: true + prefixes: ['~'] }, // Default per-guild settings diff --git a/events/message.js b/events/message.js new file mode 100644 index 0000000..42de5e0 --- /dev/null +++ b/events/message.js @@ -0,0 +1,49 @@ + +const Discord = require('discord.js') +const cooldown = new Discord.Collection() +module.exports = async (client, message) => { + if (message.author.bot) return + + var prefix = '~' + + const myMention = `<@&${client.user.id}>` + const myMention2 = `<@!${client.user.id}>` + + if (message.content.startsWith(myMention) || message.content.startsWith(myMention2)) { + if (message.content.length > myMention.length + 1 && (message.content.substr(0, myMention.length + 1) === myMention + ' ' || message.content.substr(0, myMention2.length + 1) === myMention2 + ' ')) { + prefix = message.content.substr(0, myMention.length) + ' ' + } else { + return message.channel.send(`Current prefix: \`${prefix}\``) + }; + }; + + if (message.content.indexOf(prefix) !== 0) return + + const args = message.content.slice(prefix.length).trim().split(/ +/g) + const command = args.shift().toLowerCase() + + if (message.guild && !message.member) await message.guild.fetchMember(message.author) + + const level = client.permlevel(message) + + const cmd = client.commands.get(command) || client.commands.get(client.aliases.get(command)) + if (!cmd) return + + if (cmd && !message.guild && cmd.conf.guildOnly) { + return message.channel.send('This command is unavailable via private message. Please run this command in a guild.') + } + + if (level < client.levelCache[cmd.conf.permLevel]) { + return message.channel.send('You don\'t have permission to run this command!') + } + + message.author.permLevel = level + + message.flags = [] + while (args[0] && args[0][0] === '-') { + message.flags.push(args.shift().slice(1)) + } + + client.logger.log(`Command ran: ${cmd.help.name}`) + cmd.run(client, message, args, level) +} diff --git a/events/ready.js b/events/ready.js index 69acca8..02d66b7 100644 --- a/events/ready.js +++ b/events/ready.js @@ -1,3 +1,3 @@ module.exports = (client) => { - client.logger.log.ready('Discord client ready!') + client.logger.ready('Connected to Discord as ' + client.user.tag) } diff --git a/index.js b/index.js index 8451e8f..93daa0d 100644 --- a/index.js +++ b/index.js @@ -9,19 +9,36 @@ if (Number(process.version.slice(1).split('.')[0]) < 12) { // Load environment variables / config const fs = require('fs') +const colors = require('colors') const Discord = require('discord.js') const client = new Discord.Client({ disabledEvents: ['TYPING_START'] }) require('./modules/functions')(client) -client.logger = require('./modules/logger') + +client.logger = require('tracer').colorConsole({ + format: [ + '{{timestamp}} <{{title}}> ({{file}}) {{message}}' + ], + dateformat: 'dd-mm-yyyy HH:MM:ss', + methods: ['log', 'debug', 'info', 'ready', 'warn', 'error', 'fatal'], + filters: [{ + log: colors.white, + debug: colors.magenta, + info: colors.cyan, + ready: colors.green, + warn: colors.yellow, + error: colors.red, + fatal: [colors.red, colors.bold] + }] +}) if (fs.existsSync('./.env') === false) { - client.logger.log.error('The .env file is missing! Please create a .env file.') + client.logger.fatal('The .env file is missing! Please create a .env file.') process.exit() } if (fs.existsSync('./config.js') === false) { - client.logger.log.error('The config.js file is missing! Please create a config.js file.') + client.logger.fatal('The config.js file is missing! Please create a config.js file.') process.exit() } @@ -39,14 +56,30 @@ const init = async () => { // Load events fs.readdir('./events', (err, files) => { if (err) {} - client.logger.log.info(`Loading ${files.length} events.`) + client.logger.info(`Loading ${files.length} events.`) files.forEach(file => { + if (!file.endsWith('.js')) { + return + } const event = require(`./events/${file}`) client.on(file.substr(0, file.length - 3), event.bind(null, client)) }) }) // Load commands + fs.readdir('./commands', (err, files) => { + if (err) {} + client.logger.info(`Loading ${files.length} commands.`) + files.forEach(file => { + if (!file.endsWith('.js')) { + return + } + const response = client.loadCommand(file) + if (response) { + client.logger.error(response) + } + }) + }) // Level cache client.levelCache = {} diff --git a/modules/functions.js b/modules/functions.js index 54307d6..bf10964 100644 --- a/modules/functions.js +++ b/modules/functions.js @@ -1,3 +1,27 @@ module.exports = client => { + client.loadCommand = (commandName) => { + try { + const props = require(`../commands/${commandName}`) + if (props.init) { + props.init(client) + } + client.commands.set(props.help.name, props) + props.conf.aliases.forEach(alias => { + client.aliases.set(alias, props.help.name) + }) + return false + } catch (e) { + return `Failed to load ${commandName}: ${e}` + } + } + process.on('uncaughtException', (err) => { + const errorMsg = err.stack.replace(new RegExp(`${__dirname}/`, 'g'), './') + client.logger.fatal(`Uncaught Exception: ${errorMsg}`) + process.exit(1) + }) + + process.on('unhandledRejection', err => { + client.logger.error(`Unhandled rejection: ${err}`) + }) } diff --git a/modules/logger.js b/modules/logger.js deleted file mode 100644 index 3112b9b..0000000 --- a/modules/logger.js +++ /dev/null @@ -1,44 +0,0 @@ -const winston = require('winston') -const path = require('path') -const root = path.join(__dirname, '..') - -const levels = { - levels: { - error: 0, - warn: 1, - ready: 2, - info: 3, - cmd: 4 - }, - colors: { - error: 'red', - warn: 'yellow', - ready: 'green', - info: 'cyan', - cmd: 'white' - } -} - -winston.addColors(levels.colors) - -const format = winston.format.combine( - winston.format.colorize(), - winston.format.timestamp({ - format: 'DD-MM-YYYY HH:mm:ss' - }), - winston.format.printf( - info => `${info.timestamp} - ${info.level}: ${info.message}` - ) -) - -const logger = winston.createLogger({ - levels: levels.levels, - format: format, - transports: [ - new winston.transports.Console() - ] -}) - -logger.exitOnError = false - -module.exports.log = logger diff --git a/package-lock.json b/package-lock.json index 83b25b1..bea0cf0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2,11 +2,277 @@ "requires": true, "lockfileVersion": 1, "dependencies": { + "@babel/code-frame": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz", + "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==", + "requires": { + "@babel/highlight": "^7.8.3" + } + }, + "@babel/core": { + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.9.0.tgz", + "integrity": "sha512-kWc7L0fw1xwvI0zi8OKVBuxRVefwGOrKSQMvrQ3dW+bIIavBY3/NpXmpjMy7bQnLgwgzWQZ8TlM57YHpHNHz4w==", + "requires": { + "@babel/code-frame": "^7.8.3", + "@babel/generator": "^7.9.0", + "@babel/helper-module-transforms": "^7.9.0", + "@babel/helpers": "^7.9.0", + "@babel/parser": "^7.9.0", + "@babel/template": "^7.8.6", + "@babel/traverse": "^7.9.0", + "@babel/types": "^7.9.0", + "convert-source-map": "^1.7.0", + "debug": "^4.1.0", + "gensync": "^1.0.0-beta.1", + "json5": "^2.1.2", + "lodash": "^4.17.13", + "resolve": "^1.3.2", + "semver": "^5.4.1", + "source-map": "^0.5.0" + }, + "dependencies": { + "semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" + } + } + }, + "@babel/generator": { + "version": "7.9.4", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.9.4.tgz", + "integrity": "sha512-rjP8ahaDy/ouhrvCoU1E5mqaitWrxwuNGU+dy1EpaoK48jZay4MdkskKGIMHLZNewg8sAsqpGSREJwP0zH3YQA==", + "requires": { + "@babel/types": "^7.9.0", + "jsesc": "^2.5.1", + "lodash": "^4.17.13", + "source-map": "^0.5.0" + } + }, + "@babel/helper-function-name": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.8.3.tgz", + "integrity": "sha512-BCxgX1BC2hD/oBlIFUgOCQDOPV8nSINxCwM3o93xP4P9Fq6aV5sgv2cOOITDMtCfQ+3PvHp3l689XZvAM9QyOA==", + "requires": { + "@babel/helper-get-function-arity": "^7.8.3", + "@babel/template": "^7.8.3", + "@babel/types": "^7.8.3" + } + }, + "@babel/helper-get-function-arity": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz", + "integrity": "sha512-FVDR+Gd9iLjUMY1fzE2SR0IuaJToR4RkCDARVfsBBPSP53GEqSFjD8gNyxg246VUyc/ALRxFaAK8rVG7UT7xRA==", + "requires": { + "@babel/types": "^7.8.3" + } + }, + "@babel/helper-member-expression-to-functions": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.8.3.tgz", + "integrity": "sha512-fO4Egq88utkQFjbPrSHGmGLFqmrshs11d46WI+WZDESt7Wu7wN2G2Iu+NMMZJFDOVRHAMIkB5SNh30NtwCA7RA==", + "requires": { + "@babel/types": "^7.8.3" + } + }, + "@babel/helper-module-imports": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.8.3.tgz", + "integrity": "sha512-R0Bx3jippsbAEtzkpZ/6FIiuzOURPcMjHp+Z6xPe6DtApDJx+w7UYyOLanZqO8+wKR9G10s/FmHXvxaMd9s6Kg==", + "requires": { + "@babel/types": "^7.8.3" + } + }, + "@babel/helper-module-transforms": { + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.9.0.tgz", + "integrity": "sha512-0FvKyu0gpPfIQ8EkxlrAydOWROdHpBmiCiRwLkUiBGhCUPRRbVD2/tm3sFr/c/GWFrQ/ffutGUAnx7V0FzT2wA==", + "requires": { + "@babel/helper-module-imports": "^7.8.3", + "@babel/helper-replace-supers": "^7.8.6", + "@babel/helper-simple-access": "^7.8.3", + "@babel/helper-split-export-declaration": "^7.8.3", + "@babel/template": "^7.8.6", + "@babel/types": "^7.9.0", + "lodash": "^4.17.13" + } + }, + "@babel/helper-optimise-call-expression": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.8.3.tgz", + "integrity": "sha512-Kag20n86cbO2AvHca6EJsvqAd82gc6VMGule4HwebwMlwkpXuVqrNRj6CkCV2sKxgi9MyAUnZVnZ6lJ1/vKhHQ==", + "requires": { + "@babel/types": "^7.8.3" + } + }, + "@babel/helper-replace-supers": { + "version": "7.8.6", + "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.8.6.tgz", + "integrity": "sha512-PeMArdA4Sv/Wf4zXwBKPqVj7n9UF/xg6slNRtZW84FM7JpE1CbG8B612FyM4cxrf4fMAMGO0kR7voy1ForHHFA==", + "requires": { + "@babel/helper-member-expression-to-functions": "^7.8.3", + "@babel/helper-optimise-call-expression": "^7.8.3", + "@babel/traverse": "^7.8.6", + "@babel/types": "^7.8.6" + } + }, + "@babel/helper-simple-access": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.8.3.tgz", + "integrity": "sha512-VNGUDjx5cCWg4vvCTR8qQ7YJYZ+HBjxOgXEl7ounz+4Sn7+LMD3CFrCTEU6/qXKbA2nKg21CwhhBzO0RpRbdCw==", + "requires": { + "@babel/template": "^7.8.3", + "@babel/types": "^7.8.3" + } + }, + "@babel/helper-split-export-declaration": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz", + "integrity": "sha512-3x3yOeyBhW851hroze7ElzdkeRXQYQbFIb7gLK1WQYsw2GWDay5gAJNw1sWJ0VFP6z5J1whqeXH/WCdCjZv6dA==", + "requires": { + "@babel/types": "^7.8.3" + } + }, + "@babel/helper-validator-identifier": { + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.0.tgz", + "integrity": "sha512-6G8bQKjOh+of4PV/ThDm/rRqlU7+IGoJuofpagU5GlEl29Vv0RGqqt86ZGRV8ZuSOY3o+8yXl5y782SMcG7SHw==" + }, + "@babel/helpers": { + "version": "7.9.2", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.9.2.tgz", + "integrity": "sha512-JwLvzlXVPjO8eU9c/wF9/zOIN7X6h8DYf7mG4CiFRZRvZNKEF5dQ3H3V+ASkHoIB3mWhatgl5ONhyqHRI6MppA==", + "requires": { + "@babel/template": "^7.8.3", + "@babel/traverse": "^7.9.0", + "@babel/types": "^7.9.0" + } + }, + "@babel/highlight": { + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz", + "integrity": "sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==", + "requires": { + "@babel/helper-validator-identifier": "^7.9.0", + "chalk": "^2.0.0", + "js-tokens": "^4.0.0" + }, + "dependencies": { + "ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "requires": { + "color-convert": "^1.9.0" + } + }, + "chalk": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "requires": { + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" + } + }, + "color-convert": { + "version": "1.9.3", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", + "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", + "requires": { + "color-name": "1.1.3" + } + }, + "color-name": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", + "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=" + }, + "has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=" + }, + "supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, + "@babel/parser": { + "version": "7.9.4", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.9.4.tgz", + "integrity": "sha512-bC49otXX6N0/VYhgOMh4gnP26E9xnDZK3TmbNpxYzzz9BQLBosQwfyOe9/cXUU3txYhTzLCbcqd5c8y/OmCjHA==" + }, + "@babel/template": { + "version": "7.8.6", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.8.6.tgz", + "integrity": "sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg==", + "requires": { + "@babel/code-frame": "^7.8.3", + "@babel/parser": "^7.8.6", + "@babel/types": "^7.8.6" + } + }, + "@babel/traverse": { + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.0.tgz", + "integrity": "sha512-jAZQj0+kn4WTHO5dUZkZKhbFrqZE7K5LAQ5JysMnmvGij+wOdr+8lWqPeW0BcF4wFwrEXXtdGO7wcV6YPJcf3w==", + "requires": { + "@babel/code-frame": "^7.8.3", + "@babel/generator": "^7.9.0", + "@babel/helper-function-name": "^7.8.3", + "@babel/helper-split-export-declaration": "^7.8.3", + "@babel/parser": "^7.9.0", + "@babel/types": "^7.9.0", + "debug": "^4.1.0", + "globals": "^11.1.0", + "lodash": "^4.17.13" + } + }, + "@babel/types": { + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.0.tgz", + "integrity": "sha512-BS9JKfXkzzJl8RluW4JGknzpiUV7ZrvTayM6yfqLTVBEnFtyowVIOu6rqxRd5cVO6yGoWf4T8u8dgK9oB+GCng==", + "requires": { + "@babel/helper-validator-identifier": "^7.9.0", + "lodash": "^4.17.13", + "to-fast-properties": "^2.0.0" + } + }, "@discordjs/collection": { "version": "0.1.5", "resolved": "https://registry.npmjs.org/@discordjs/collection/-/collection-0.1.5.tgz", "integrity": "sha512-CU1q0UXQUpFNzNB7gufgoisDHP7n+T3tkqTsp3MNUkVJ5+hS3BCvME8uCXAUFlz+6T2FbTCu75A+yQ7HMKqRKw==" }, + "@istanbuljs/load-nyc-config": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.0.0.tgz", + "integrity": "sha512-ZR0rq/f/E4f4XcgnDvtMWXCUJpi8eO0rssVhmztsZqLIEFA9UUP9zmpE0VxlM+kv/E1ul2I876Fwil2ayptDVg==", + "requires": { + "camelcase": "^5.3.1", + "find-up": "^4.1.0", + "js-yaml": "^3.13.1", + "resolve-from": "^5.0.0" + } + }, + "@istanbuljs/schema": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.2.tgz", + "integrity": "sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw==" + }, + "@types/color-name": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz", + "integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==" + }, "abort-controller": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz", @@ -15,6 +281,50 @@ "event-target-shim": "^5.0.0" } }, + "aggregate-error": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.0.1.tgz", + "integrity": "sha512-quoaXsZ9/BLNae5yiNoUz+Nhkwz83GhWwtYFglcjEQB2NDHCIpApbqXxIFnm4Pq/Nvhrsq5sYJFyohrrxnTGAA==", + "requires": { + "clean-stack": "^2.0.0", + "indent-string": "^4.0.0" + } + }, + "ansi-regex": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", + "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==" + }, + "ansi-styles": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", + "requires": { + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" + } + }, + "append-transform": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/append-transform/-/append-transform-2.0.0.tgz", + "integrity": "sha512-7yeyCEurROLQJFv5Xj4lEGTy0borxepjFv1g22oAdqFu//SrAlDl1O1Nxx15SH1RoliUml6p8dwJW9jvZughhg==", + "requires": { + "default-require-extensions": "^3.0.0" + } + }, + "archy": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz", + "integrity": "sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=" + }, + "argparse": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", + "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", + "requires": { + "sprintf-js": "~1.0.2" + } + }, "async": { "version": "2.6.3", "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz", @@ -28,6 +338,51 @@ "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=" }, + "balanced-match": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", + "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=" + }, + "brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "requires": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "caching-transform": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/caching-transform/-/caching-transform-4.0.0.tgz", + "integrity": "sha512-kpqOvwXnjjN44D89K5ccQC+RUrsy7jB/XLlRrx0D7/2HNcTPqzsb6XgYoErwko6QsV184CA2YgS1fxDiiDZMWA==", + "requires": { + "hasha": "^5.0.0", + "make-dir": "^3.0.0", + "package-hash": "^4.0.0", + "write-file-atomic": "^3.0.0" + } + }, + "camelcase": { + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", + "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==" + }, + "clean-stack": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz", + "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==" + }, + "cliui": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz", + "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==", + "requires": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.0", + "wrap-ansi": "^6.2.0" + } + }, "color": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/color/-/color-3.0.0.tgz", @@ -52,6 +407,14 @@ } } }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "requires": { + "color-name": "~1.1.4" + } + }, "color-name": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", @@ -93,11 +456,72 @@ "delayed-stream": "~1.0.0" } }, + "commondir": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz", + "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=" + }, + "concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" + }, + "convert-source-map": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz", + "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==", + "requires": { + "safe-buffer": "~5.1.1" + }, + "dependencies": { + "safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" + } + } + }, "core-util-is": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" }, + "cross-spawn": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.1.tgz", + "integrity": "sha512-u7v4o84SwFpD32Z8IIcPZ6z1/ie24O6RU3RbtL5Y316l3KuHVPx9ItBgWQ6VlfAFnRnTtMUrsQ9MUUTuEZjogg==", + "requires": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + } + }, + "dateformat": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-3.0.3.tgz", + "integrity": "sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==" + }, + "debug": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "requires": { + "ms": "^2.1.1" + } + }, + "decamelize": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", + "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=" + }, + "default-require-extensions": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/default-require-extensions/-/default-require-extensions-3.0.0.tgz", + "integrity": "sha512-ek6DpXq/SCpvjhpFsLFRVtIxJCRw6fUR42lYMVZuUMK7n8eMz4Uh5clckdBjEpLhn/gEBZo7hDJnJcwdKLKQjg==", + "requires": { + "strip-bom": "^4.0.0" + } + }, "delayed-stream": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", @@ -133,6 +557,11 @@ "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-8.2.0.tgz", "integrity": "sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw==" }, + "emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" + }, "enabled": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/enabled/-/enabled-1.0.2.tgz", @@ -146,6 +575,21 @@ "resolved": "https://registry.npmjs.org/env-variable/-/env-variable-0.0.6.tgz", "integrity": "sha512-bHz59NlBbtS0NhftmR8+ExBEekE7br0e01jw+kk0NDro7TtZzBYZ5ScGPs3OmwnpyfHTHOtr1Y6uedCdrIldtg==" }, + "es6-error": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz", + "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==" + }, + "escape-string-regexp": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=" + }, + "esprima": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", + "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==" + }, "event-target-shim": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz", @@ -161,6 +605,34 @@ "resolved": "https://registry.npmjs.org/fecha/-/fecha-2.3.3.tgz", "integrity": "sha512-lUGBnIamTAwk4znq5BcqsDaxSmZ9nDVJaij6NvRt/Tg4R69gERA+otPKbS86ROw9nxVMw2/mp1fnaiWqbs6Sdg==" }, + "find-cache-dir": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.1.tgz", + "integrity": "sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ==", + "requires": { + "commondir": "^1.0.1", + "make-dir": "^3.0.2", + "pkg-dir": "^4.1.0" + } + }, + "find-up": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "requires": { + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" + } + }, + "foreground-child": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-2.0.0.tgz", + "integrity": "sha512-dCIq9FpEcyQyXKCkyzmlPTFNgrCzPudOe+mhvJU5zAtlBnGVy2yKxtfsxK2tQBThwq225jcvBjpw1Gr40uzZCA==", + "requires": { + "cross-spawn": "^7.0.0", + "signal-exit": "^3.0.2" + } + }, "form-data": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.0.tgz", @@ -171,6 +643,94 @@ "mime-types": "^2.1.12" } }, + "fromentries": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/fromentries/-/fromentries-1.2.0.tgz", + "integrity": "sha512-33X7H/wdfO99GdRLLgkjUrD4geAFdq/Uv0kl3HD4da6HDixd2GUg8Mw7dahLCV9r/EARkmtYBB6Tch4EEokFTQ==" + }, + "fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" + }, + "gensync": { + "version": "1.0.0-beta.1", + "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.1.tgz", + "integrity": "sha512-r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg==" + }, + "get-caller-file": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", + "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==" + }, + "glob": { + "version": "7.1.6", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", + "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", + "requires": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + } + }, + "globals": { + "version": "11.12.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", + "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==" + }, + "graceful-fs": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz", + "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==" + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" + }, + "hasha": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/hasha/-/hasha-5.2.0.tgz", + "integrity": "sha512-2W+jKdQbAdSIrggA8Q35Br8qKadTrqCTC8+XZvBWepKDK6m9XkX6Iz1a2yh2KP01kzAR/dpuMeUnocoLYDcskw==", + "requires": { + "is-stream": "^2.0.0", + "type-fest": "^0.8.0" + }, + "dependencies": { + "is-stream": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz", + "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==" + } + } + }, + "html-escaper": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz", + "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==" + }, + "imurmurhash": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", + "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=" + }, + "indent-string": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", + "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==" + }, + "inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", + "requires": { + "once": "^1.3.0", + "wrappy": "1" + } + }, "inherits": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", @@ -181,16 +741,140 @@ "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz", "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==" }, + "is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==" + }, "is-stream": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=" }, + "is-typedarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", + "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=" + }, + "is-windows": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz", + "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==" + }, "isarray": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" }, + "isexe": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", + "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=" + }, + "istanbul-lib-coverage": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz", + "integrity": "sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg==" + }, + "istanbul-lib-hook": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/istanbul-lib-hook/-/istanbul-lib-hook-3.0.0.tgz", + "integrity": "sha512-Pt/uge1Q9s+5VAZ+pCo16TYMWPBIl+oaNIjgLQxcX0itS6ueeaA+pEfThZpH8WxhFgCiEb8sAJY6MdUKgiIWaQ==", + "requires": { + "append-transform": "^2.0.0" + } + }, + "istanbul-lib-instrument": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.1.tgz", + "integrity": "sha512-imIchxnodll7pvQBYOqUu88EufLCU56LMeFPZZM/fJZ1irYcYdqroaV+ACK1Ila8ls09iEYArp+nqyC6lW1Vfg==", + "requires": { + "@babel/core": "^7.7.5", + "@babel/parser": "^7.7.5", + "@babel/template": "^7.7.4", + "@babel/traverse": "^7.7.4", + "@istanbuljs/schema": "^0.1.2", + "istanbul-lib-coverage": "^3.0.0", + "semver": "^6.3.0" + } + }, + "istanbul-lib-processinfo": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/istanbul-lib-processinfo/-/istanbul-lib-processinfo-2.0.2.tgz", + "integrity": "sha512-kOwpa7z9hme+IBPZMzQ5vdQj8srYgAtaRqeI48NGmAQ+/5yKiHLV0QbYqQpxsdEF0+w14SoB8YbnHKcXE2KnYw==", + "requires": { + "archy": "^1.0.0", + "cross-spawn": "^7.0.0", + "istanbul-lib-coverage": "^3.0.0-alpha.1", + "make-dir": "^3.0.0", + "p-map": "^3.0.0", + "rimraf": "^3.0.0", + "uuid": "^3.3.3" + } + }, + "istanbul-lib-report": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz", + "integrity": "sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==", + "requires": { + "istanbul-lib-coverage": "^3.0.0", + "make-dir": "^3.0.0", + "supports-color": "^7.1.0" + } + }, + "istanbul-lib-source-maps": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.0.tgz", + "integrity": "sha512-c16LpFRkR8vQXyHZ5nLpY35JZtzj1PQY1iZmesUbf1FZHbIupcWfjgOXBY9YHkLEQ6puz1u4Dgj6qmU/DisrZg==", + "requires": { + "debug": "^4.1.1", + "istanbul-lib-coverage": "^3.0.0", + "source-map": "^0.6.1" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" + } + } + }, + "istanbul-reports": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.0.1.tgz", + "integrity": "sha512-Vm9xwCiQ8t2cNNnckyeAV0UdxKpcQUz4nMxsBvIu8n2kmPSiyb5uaF/8LpmKr+yqL/MdOXaX2Nmdo4Qyxium9Q==", + "requires": { + "html-escaper": "^2.0.0", + "istanbul-lib-report": "^3.0.0" + } + }, + "js-tokens": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", + "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==" + }, + "js-yaml": { + "version": "3.13.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz", + "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==", + "requires": { + "argparse": "^1.0.7", + "esprima": "^4.0.0" + } + }, + "jsesc": { + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", + "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==" + }, + "json5": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.2.tgz", + "integrity": "sha512-MoUOQ4WdiN3yxhm7NEVJSJrieAo5hNSLQ5sj05OTRHPL9HOBy8u4Bu88jsC1jvqAdN+E1bJmsUcZH+1HQxliqQ==", + "requires": { + "minimist": "^1.2.5" + } + }, "kuler": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/kuler/-/kuler-1.0.1.tgz", @@ -199,11 +883,24 @@ "colornames": "^1.1.1" } }, + "locate-path": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "requires": { + "p-locate": "^4.1.0" + } + }, "lodash": { "version": "4.17.15", "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz", "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==" }, + "lodash.flattendeep": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz", + "integrity": "sha1-+wMJF/hqMTTlvJvsDWngAT3f7bI=" + }, "logform": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/logform/-/logform-2.1.2.tgz", @@ -216,6 +913,14 @@ "triple-beam": "^1.3.0" } }, + "make-dir": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.0.2.tgz", + "integrity": "sha512-rYKABKutXa6vXTXhoV18cBE7PaewPXHe/Bdq4v+ZLMhxbWApkFFplT0LcbMW+6BbjnQXzZ/sAvSE/JdguApG5w==", + "requires": { + "semver": "^6.0.0" + } + }, "mime-db": { "version": "1.43.0", "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.43.0.tgz", @@ -229,6 +934,27 @@ "mime-db": "1.43.0" } }, + "minimatch": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", + "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "requires": { + "brace-expansion": "^1.1.7" + } + }, + "minimist": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==" + }, + "mkdirp": { + "version": "0.5.4", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.4.tgz", + "integrity": "sha512-iG9AK/dJLtJ0XNgTuDbSyNS3zECqDlAhnQW4CsNxBG3LQJBbHmRX1egw39DmtOdCAqY+dKXV+sgPgilNWUKMVw==", + "requires": { + "minimist": "^1.2.5" + } + }, "moment": { "version": "2.24.0", "resolved": "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz", @@ -244,11 +970,102 @@ "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz", "integrity": "sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==" }, + "node-preload": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/node-preload/-/node-preload-0.2.1.tgz", + "integrity": "sha512-RM5oyBy45cLEoHqCeh+MNuFAxO0vTFBLskvQbOKnEE7YTTSN4tbN8QWDIPQ6L+WvKsB/qLEGpYe2ZZ9d4W9OIQ==", + "requires": { + "process-on-spawn": "^1.0.0" + } + }, + "nyc": { + "version": "15.0.0", + "resolved": "https://registry.npmjs.org/nyc/-/nyc-15.0.0.tgz", + "integrity": "sha512-qcLBlNCKMDVuKb7d1fpxjPR8sHeMVX0CHarXAVzrVWoFrigCkYR8xcrjfXSPi5HXM7EU78L6ywO7w1c5rZNCNg==", + "requires": { + "@istanbuljs/load-nyc-config": "^1.0.0", + "@istanbuljs/schema": "^0.1.2", + "caching-transform": "^4.0.0", + "convert-source-map": "^1.7.0", + "decamelize": "^1.2.0", + "find-cache-dir": "^3.2.0", + "find-up": "^4.1.0", + "foreground-child": "^2.0.0", + "glob": "^7.1.6", + "istanbul-lib-coverage": "^3.0.0", + "istanbul-lib-hook": "^3.0.0", + "istanbul-lib-instrument": "^4.0.0", + "istanbul-lib-processinfo": "^2.0.2", + "istanbul-lib-report": "^3.0.0", + "istanbul-lib-source-maps": "^4.0.0", + "istanbul-reports": "^3.0.0", + "js-yaml": "^3.13.1", + "make-dir": "^3.0.0", + "node-preload": "^0.2.0", + "p-map": "^3.0.0", + "process-on-spawn": "^1.0.0", + "resolve-from": "^5.0.0", + "rimraf": "^3.0.0", + "signal-exit": "^3.0.2", + "spawn-wrap": "^2.0.0", + "test-exclude": "^6.0.0", + "uuid": "^3.3.3", + "yargs": "^15.0.2" + } + }, + "once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", + "requires": { + "wrappy": "1" + } + }, "one-time": { "version": "0.0.4", "resolved": "https://registry.npmjs.org/one-time/-/one-time-0.0.4.tgz", "integrity": "sha1-+M33eISCb+Tf+T46nMN7HkSAdC4=" }, + "p-limit": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.2.tgz", + "integrity": "sha512-WGR+xHecKTr7EbUEhyLSh5Dube9JtdiG78ufaeLxTgpudf/20KqyMioIUZJAezlTIi6evxuoUs9YXc11cU+yzQ==", + "requires": { + "p-try": "^2.0.0" + } + }, + "p-locate": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "requires": { + "p-limit": "^2.2.0" + } + }, + "p-map": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/p-map/-/p-map-3.0.0.tgz", + "integrity": "sha512-d3qXVTF/s+W+CdJ5A29wywV2n8CQQYahlgz2bFiA+4eVNJbHJodPZ+/gXwPGh0bOqA+j8S+6+ckmvLGPk1QpxQ==", + "requires": { + "aggregate-error": "^3.0.0" + } + }, + "p-try": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", + "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==" + }, + "package-hash": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/package-hash/-/package-hash-4.0.0.tgz", + "integrity": "sha512-whdkPIooSu/bASggZ96BWVvZTRMOFxnyUG5PnTSGKoJE2gd5mbVNmR2Nj20QFzxYYgAXpoqC+AiXzl+UMRh7zQ==", + "requires": { + "graceful-fs": "^4.1.15", + "hasha": "^5.0.0", + "lodash.flattendeep": "^4.4.0", + "release-zalgo": "^1.0.0" + } + }, "path": { "version": "0.12.7", "resolved": "https://registry.npmjs.org/path/-/path-0.12.7.tgz", @@ -258,6 +1075,34 @@ "util": "^0.10.3" } }, + "path-exists": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==" + }, + "path-is-absolute": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=" + }, + "path-key": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==" + }, + "path-parse": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz", + "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==" + }, + "pkg-dir": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", + "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", + "requires": { + "find-up": "^4.0.0" + } + }, "prism-media": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/prism-media/-/prism-media-1.2.1.tgz", @@ -273,6 +1118,14 @@ "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==" }, + "process-on-spawn": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/process-on-spawn/-/process-on-spawn-1.0.0.tgz", + "integrity": "sha512-1WsPDsUSMmZH5LeMLegqkPDrsGgsWwk1Exipy2hvB0o/F0ASzbpIctSCcZIK1ykJvtTJULEH+20WOFjMvGnCTg==", + "requires": { + "fromentries": "^1.2.0" + } + }, "readable-stream": { "version": "3.6.0", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", @@ -283,16 +1136,83 @@ "util-deprecate": "^1.0.1" } }, + "release-zalgo": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/release-zalgo/-/release-zalgo-1.0.0.tgz", + "integrity": "sha1-CXALflB0Mpc5Mw5TXFqQ+2eFFzA=", + "requires": { + "es6-error": "^4.0.1" + } + }, + "require-directory": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", + "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=" + }, + "require-main-filename": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz", + "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==" + }, + "resolve": { + "version": "1.15.1", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.15.1.tgz", + "integrity": "sha512-84oo6ZTtoTUpjgNEr5SJyzQhzL72gaRodsSfyxC/AXRvwu0Yse9H8eF9IpGo7b8YetZhlI6v7ZQ6bKBFV/6S7w==", + "requires": { + "path-parse": "^1.0.6" + } + }, + "resolve-from": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", + "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==" + }, + "rimraf": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", + "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "requires": { + "glob": "^7.1.3" + } + }, "safe-buffer": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz", "integrity": "sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg==" }, + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" + }, + "set-blocking": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", + "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=" + }, "setimmediate": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz", "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=" }, + "shebang-command": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "requires": { + "shebang-regex": "^3.0.0" + } + }, + "shebang-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==" + }, + "signal-exit": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz", + "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==" + }, "simple-swizzle": { "version": "0.2.2", "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz", @@ -301,11 +1221,44 @@ "is-arrayish": "^0.3.1" } }, + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=" + }, + "spawn-wrap": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/spawn-wrap/-/spawn-wrap-2.0.0.tgz", + "integrity": "sha512-EeajNjfN9zMnULLwhZZQU3GWBoFNkbngTUPfaawT4RkMiviTxcX0qfhVbGey39mfctfDHkWtuecgQ8NJcyQWHg==", + "requires": { + "foreground-child": "^2.0.0", + "is-windows": "^1.0.2", + "make-dir": "^3.0.0", + "rimraf": "^3.0.0", + "signal-exit": "^3.0.2", + "which": "^2.0.1" + } + }, + "sprintf-js": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", + "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=" + }, "stack-trace": { "version": "0.0.10", "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz", "integrity": "sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=" }, + "string-width": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz", + "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==", + "requires": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.0" + } + }, "string_decoder": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", @@ -314,11 +1267,64 @@ "safe-buffer": "~5.2.0" } }, + "strip-ansi": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", + "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", + "requires": { + "ansi-regex": "^5.0.0" + } + }, + "strip-bom": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz", + "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==" + }, + "supports-color": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", + "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", + "requires": { + "has-flag": "^4.0.0" + } + }, + "test-exclude": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz", + "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==", + "requires": { + "@istanbuljs/schema": "^0.1.2", + "glob": "^7.1.4", + "minimatch": "^3.0.4" + } + }, "text-hex": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/text-hex/-/text-hex-1.0.0.tgz", "integrity": "sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg==" }, + "tinytim": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/tinytim/-/tinytim-0.1.1.tgz", + "integrity": "sha1-yWih5VWa2VUyJO92J7qzTjyu+Kg=" + }, + "to-fast-properties": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", + "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=" + }, + "tracer": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/tracer/-/tracer-1.0.2.tgz", + "integrity": "sha512-ukzih7M8odyOW97hKIj0pXZs8k4lCAiW4jBO6oUtZXx7RTMzrsoAMP/YHILYAu9BtjPL7GV7YJAlxeZ6GNx7YQ==", + "requires": { + "colors": "1.4.0", + "dateformat": "3.0.3", + "mkdirp": "^0.5.1", + "nyc": "^15.0.0", + "tinytim": "0.1.1" + } + }, "triple-beam": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/triple-beam/-/triple-beam-1.3.0.tgz", @@ -329,6 +1335,19 @@ "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-1.0.3.tgz", "integrity": "sha512-6rt+RN7aOi1nGMyC4Xa5DdYiukl2UWCbcJft7YhxReBGQD7OAM8Pbxw6YMo4r2diNEA8FEmu32YOn9rhaiE5yw==" }, + "type-fest": { + "version": "0.8.1", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz", + "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==" + }, + "typedarray-to-buffer": { + "version": "3.1.5", + "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz", + "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==", + "requires": { + "is-typedarray": "^1.0.0" + } + }, "util": { "version": "0.10.4", "resolved": "https://registry.npmjs.org/util/-/util-0.10.4.tgz", @@ -349,6 +1368,24 @@ "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" }, + "uuid": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", + "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==" + }, + "which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "requires": { + "isexe": "^2.0.0" + } + }, + "which-module": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", + "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=" + }, "winston": { "version": "3.2.1", "resolved": "https://registry.npmjs.org/winston/-/winston-3.2.1.tgz", @@ -403,10 +1440,68 @@ } } }, + "wrap-ansi": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", + "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==", + "requires": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + } + }, + "wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" + }, + "write-file-atomic": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz", + "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==", + "requires": { + "imurmurhash": "^0.1.4", + "is-typedarray": "^1.0.0", + "signal-exit": "^3.0.2", + "typedarray-to-buffer": "^3.1.5" + } + }, "ws": { "version": "7.2.3", "resolved": "https://registry.npmjs.org/ws/-/ws-7.2.3.tgz", "integrity": "sha512-HTDl9G9hbkNDk98naoR/cHDws7+EyYMOdL1BmjsZXRUjf7d+MficC4B7HLUPlSiho0vg+CWKrGIt/VJBd1xunQ==" + }, + "y18n": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz", + "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==" + }, + "yargs": { + "version": "15.3.1", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.3.1.tgz", + "integrity": "sha512-92O1HWEjw27sBfgmXiixJWT5hRBp2eobqXicLtPBIDBhYB+1HpwZlXmbW2luivBJHBzki+7VyCLRtAkScbTBQA==", + "requires": { + "cliui": "^6.0.0", + "decamelize": "^1.2.0", + "find-up": "^4.1.0", + "get-caller-file": "^2.0.1", + "require-directory": "^2.1.1", + "require-main-filename": "^2.0.0", + "set-blocking": "^2.0.0", + "string-width": "^4.2.0", + "which-module": "^2.0.0", + "y18n": "^4.0.0", + "yargs-parser": "^18.1.1" + } + }, + "yargs-parser": { + "version": "18.1.2", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.2.tgz", + "integrity": "sha512-hlIPNR3IzC1YuL1c2UwwDKpXlNFBqD1Fswwh1khz5+d8Cq/8yc/Mn0i+rQXduu8hcrFKvO7Eryk+09NecTQAAQ==", + "requires": { + "camelcase": "^5.0.0", + "decamelize": "^1.2.0" + } } } } From 2b6ac43e9b8cdaef55c19ee36d0198a6a710f6a0 Mon Sep 17 00:00:00 2001 From: mudkipscience Date: Tue, 31 Mar 2020 19:24:51 +1100 Subject: [PATCH 013/156] Did lots of unfinished stuff --- events/message.js | 13 +++++++++---- events/ready.js | 1 + index.js | 7 ++++++- modules/functions.js | 19 +++++++++++++++++++ 4 files changed, 35 insertions(+), 5 deletions(-) diff --git a/events/message.js b/events/message.js index 42de5e0..53d1fc5 100644 --- a/events/message.js +++ b/events/message.js @@ -1,10 +1,7 @@ - -const Discord = require('discord.js') -const cooldown = new Discord.Collection() module.exports = async (client, message) => { if (message.author.bot) return - var prefix = '~' + var prefix = '!' const myMention = `<@&${client.user.id}>` const myMention2 = `<@!${client.user.id}>` @@ -37,6 +34,14 @@ module.exports = async (client, message) => { return message.channel.send('You don\'t have permission to run this command!') } + const delay = () => { + setTimeout(() => { + client.cooldown.get(cmd).delete(message.author.id); + message.channel.send(`${message.member} cooldown has expired for ${command} command.`) + }, commands.get(command) * 1000); +} + + message.author.permLevel = level message.flags = [] diff --git a/events/ready.js b/events/ready.js index 02d66b7..3ab2ca2 100644 --- a/events/ready.js +++ b/events/ready.js @@ -1,3 +1,4 @@ module.exports = (client) => { client.logger.ready('Connected to Discord as ' + client.user.tag) + client.logger.debug(client.cooldown) } diff --git a/index.js b/index.js index 93daa0d..c3b56cd 100644 --- a/index.js +++ b/index.js @@ -17,7 +17,11 @@ require('./modules/functions')(client) client.logger = require('tracer').colorConsole({ format: [ - '{{timestamp}} <{{title}}> ({{file}}) {{message}}' + '{{timestamp}} <{{title}}> {{message}}', + { + error: '{{timestamp}} <{{title}}> ({{file}}) {{message}}', + fatal: '{{timestamp}} <{{title}}> ({{file}}) {{message}}' + } ], dateformat: 'dd-mm-yyyy HH:MM:ss', methods: ['log', 'debug', 'info', 'ready', 'warn', 'error', 'fatal'], @@ -47,6 +51,7 @@ client.config = require('./config') // Command/alias cache client.commands = new Discord.Collection() +client.cooldown = new Discord.Collection() client.aliases = new Discord.Collection() // Initialization function diff --git a/modules/functions.js b/modules/functions.js index bf10964..6c3e61c 100644 --- a/modules/functions.js +++ b/modules/functions.js @@ -1,4 +1,21 @@ module.exports = client => { + + client.permlevel = message => { + let permlvl = 0 + + const permOrder = client.config.permLevels.slice(0).sort((p, c) => p.level < c.level ? 1 : -1) + + while (permOrder.length) { + const currentLevel = permOrder.shift() + if (message.guild && currentLevel.guildOnly) continue + if (currentLevel.check(message)) { + permlvl = currentLevel.level + break + } + } + return permlvl + } + client.loadCommand = (commandName) => { try { const props = require(`../commands/${commandName}`) @@ -6,6 +23,8 @@ module.exports = client => { props.init(client) } client.commands.set(props.help.name, props) + // So commands can each have their own cooldown time + client.cooldown.set(props.help.name, new Map()) props.conf.aliases.forEach(alias => { client.aliases.set(alias, props.help.name) }) From a78e759ba9b77f185d38465d50d672aabeda2700 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Hor=C3=A1=C4=8Dek?= Date: Tue, 31 Mar 2020 13:33:32 +0200 Subject: [PATCH 014/156] comments --- index.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/index.js b/index.js index c3b56cd..22625c7 100644 --- a/index.js +++ b/index.js @@ -13,8 +13,10 @@ const colors = require('colors') const Discord = require('discord.js') const client = new Discord.Client({ disabledEvents: ['TYPING_START'] }) +// Load functions module require('./modules/functions')(client) +// Logger client.logger = require('tracer').colorConsole({ format: [ '{{timestamp}} <{{title}}> {{message}}', @@ -36,6 +38,7 @@ client.logger = require('tracer').colorConsole({ }] }) +// Load environment variables / config if (fs.existsSync('./.env') === false) { client.logger.fatal('The .env file is missing! Please create a .env file.') process.exit() @@ -56,8 +59,6 @@ client.aliases = new Discord.Collection() // Initialization function const init = async () => { - // Load modules - // Load events fs.readdir('./events', (err, files) => { if (err) {} From 204977952d1453f4b4ef393021772ddf4b590f69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Hor=C3=A1=C4=8Dek?= Date: Tue, 31 Mar 2020 13:36:17 +0200 Subject: [PATCH 015/156] error handling for events & commands --- index.js | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/index.js b/index.js index 22625c7..9999bff 100644 --- a/index.js +++ b/index.js @@ -61,7 +61,12 @@ client.aliases = new Discord.Collection() const init = async () => { // Load events fs.readdir('./events', (err, files) => { - if (err) {} + if (err) { + client.logger.error('Failed to get files in events directory! ' + err); + + return; + }; + client.logger.info(`Loading ${files.length} events.`) files.forEach(file => { if (!file.endsWith('.js')) { @@ -74,7 +79,12 @@ const init = async () => { // Load commands fs.readdir('./commands', (err, files) => { - if (err) {} + if (err) { + client.logger.error('Failed to get files in commands directory! ' + err); + + return; + }; + client.logger.info(`Loading ${files.length} commands.`) files.forEach(file => { if (!file.endsWith('.js')) { From 4a36da8d271f6cb8b7b4303f120d31e559bb0619 Mon Sep 17 00:00:00 2001 From: mudkipscience Date: Tue, 31 Mar 2020 22:36:35 +1100 Subject: [PATCH 016/156] fixed index.js --- index.js | 11 +- package-lock.json | 846 ++++++++++++++++++++++++++++++++-------------- 2 files changed, 603 insertions(+), 254 deletions(-) diff --git a/index.js b/index.js index c3b56cd..6f07db9 100644 --- a/index.js +++ b/index.js @@ -13,8 +13,7 @@ const colors = require('colors') const Discord = require('discord.js') const client = new Discord.Client({ disabledEvents: ['TYPING_START'] }) -require('./modules/functions')(client) - +// Logger client.logger = require('tracer').colorConsole({ format: [ '{{timestamp}} <{{title}}> {{message}}', @@ -36,6 +35,12 @@ client.logger = require('tracer').colorConsole({ }] }) +// Load modules +require('./modules/functions')(client) +require('./modules/music')(client) +require('./modules/botlists')(client) + +// Checks to make sure config.js and .env exist if (fs.existsSync('./.env') === false) { client.logger.fatal('The .env file is missing! Please create a .env file.') process.exit() @@ -49,7 +54,7 @@ if (fs.existsSync('./config.js') === false) { require('dotenv').config() client.config = require('./config') -// Command/alias cache +// Collections that client.commands = new Discord.Collection() client.cooldown = new Discord.Collection() client.aliases = new Discord.Collection() diff --git a/package-lock.json b/package-lock.json index bea0cf0..d32167c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -273,6 +273,11 @@ "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz", "integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==" }, + "@types/node": { + "version": "13.9.8", + "resolved": "https://registry.npmjs.org/@types/node/-/node-13.9.8.tgz", + "integrity": "sha512-1WgO8hsyHynlx7nhP1kr0OFzsgKz5XDQL+Lfc3b1Q3qIln/n8cKD4m09NJ0+P1Rq7Zgnc7N0+SsMnoD1rEb0kA==" + }, "abort-controller": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz", @@ -290,6 +295,15 @@ "indent-string": "^4.0.0" } }, + "ajv": { + "version": "4.11.8", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz", + "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=", + "requires": { + "co": "^4.6.0", + "json-stable-stringify": "^1.0.1" + } + }, "ansi-regex": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", @@ -325,24 +339,72 @@ "sprintf-js": "~1.0.2" } }, - "async": { - "version": "2.6.3", - "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz", - "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==", + "asn1": { + "version": "0.2.4", + "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz", + "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==", "requires": { - "lodash": "^4.17.14" + "safer-buffer": "~2.1.0" } }, + "assert-plus": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz", + "integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ=" + }, "asynckit": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=" }, + "aws-sign2": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz", + "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8=" + }, + "aws4": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.9.1.tgz", + "integrity": "sha512-wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug==" + }, "balanced-match": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=" }, + "bcrypt-pbkdf": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz", + "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=", + "requires": { + "tweetnacl": "^0.14.3" + }, + "dependencies": { + "tweetnacl": { + "version": "0.14.5", + "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", + "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=" + } + } + }, + "bluebird": { + "version": "3.7.2", + "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", + "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==" + }, + "boolbase": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz", + "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=" + }, + "boom": { + "version": "2.10.1", + "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz", + "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=", + "requires": { + "hoek": "2.x.x" + } + }, "brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", @@ -368,6 +430,39 @@ "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==" }, + "caseless": { + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", + "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=" + }, + "chalk": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", + "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "cheerio": { + "version": "0.19.0", + "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-0.19.0.tgz", + "integrity": "sha1-dy5wFfLuKZZQltcepBdbdas1SSU=", + "requires": { + "css-select": "~1.0.0", + "dom-serializer": "~0.1.0", + "entities": "~1.1.1", + "htmlparser2": "~3.8.1", + "lodash": "^3.2.0" + }, + "dependencies": { + "lodash": { + "version": "3.10.1", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz", + "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=" + } + } + }, "clean-stack": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz", @@ -383,29 +478,10 @@ "wrap-ansi": "^6.2.0" } }, - "color": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/color/-/color-3.0.0.tgz", - "integrity": "sha512-jCpd5+s0s0t7p3pHQKpnJ0TpQKKdleP71LWcA0aqiljpiuAkOSUFN/dyH8ZwF0hRmFlrIuRhufds1QyEP9EB+w==", - "requires": { - "color-convert": "^1.9.1", - "color-string": "^1.5.2" - }, - "dependencies": { - "color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "requires": { - "color-name": "1.1.3" - } - }, - "color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=" - } - } + "co": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", + "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=" }, "color-convert": { "version": "2.0.1", @@ -420,34 +496,11 @@ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" }, - "color-string": { - "version": "1.5.3", - "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.5.3.tgz", - "integrity": "sha512-dC2C5qeWoYkxki5UAXapdjqO672AM4vZuPGRQfO8b5HKuKGBbKWpITyDYN7TOFKvRW7kOgAn3746clDBMDJyQw==", - "requires": { - "color-name": "^1.0.0", - "simple-swizzle": "^0.2.2" - } - }, - "colornames": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/colornames/-/colornames-1.1.1.tgz", - "integrity": "sha1-+IiQMGhcfE/54qVZ9Qd+t2qBb5Y=" - }, "colors": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz", "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==" }, - "colorspace": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/colorspace/-/colorspace-1.1.2.tgz", - "integrity": "sha512-vt+OoIP2d76xLhjwbBaucYlNSpPsrJWPlBTtwCpQKIu6/CSMutyzX93O/Do0qzpH3YoHEes8YEFXyZ797rEhzQ==", - "requires": { - "color": "3.0.x", - "text-hex": "1.0.x" - } - }, "combined-stream": { "version": "1.0.8", "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", @@ -472,13 +525,6 @@ "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==", "requires": { "safe-buffer": "~5.1.1" - }, - "dependencies": { - "safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" - } } }, "core-util-is": { @@ -496,6 +542,45 @@ "which": "^2.0.1" } }, + "cryptiles": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz", + "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=", + "requires": { + "boom": "2.x.x" + } + }, + "css-select": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.0.0.tgz", + "integrity": "sha1-sRIcpRhI3SZOIkTQWM7iVN7rRLA=", + "requires": { + "boolbase": "~1.0.0", + "css-what": "1.0", + "domutils": "1.4", + "nth-check": "~1.0.0" + } + }, + "css-what": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/css-what/-/css-what-1.0.0.tgz", + "integrity": "sha1-18wt9FGAZm+Z0rFEYmOUaeAPc2w=" + }, + "dashdash": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", + "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", + "requires": { + "assert-plus": "^1.0.0" + }, + "dependencies": { + "assert-plus": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", + "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=" + } + } + }, "dateformat": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-3.0.3.tgz", @@ -527,16 +612,6 @@ "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=" }, - "diagnostics": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/diagnostics/-/diagnostics-1.1.1.tgz", - "integrity": "sha512-8wn1PmdunLJ9Tqbx+Fx/ZEuHfJf4NKSN2ZBj7SJC/OWRWha843+WsTjqMe1B5E3p28jqBlp+mJ2fPVxPyNgYKQ==", - "requires": { - "colorspace": "1.1.x", - "enabled": "1.0.x", - "kuler": "1.0.x" - } - }, "discord.js": { "version": "12.1.1", "resolved": "https://registry.npmjs.org/discord.js/-/discord.js-12.1.1.tgz", @@ -552,28 +627,59 @@ "ws": "^7.2.1" } }, + "dom-serializer": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.1.tgz", + "integrity": "sha512-l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA==", + "requires": { + "domelementtype": "^1.3.0", + "entities": "^1.1.1" + } + }, + "domelementtype": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz", + "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==" + }, + "domhandler": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.3.0.tgz", + "integrity": "sha1-LeWaCCLVAn+r/28DLCsloqir5zg=", + "requires": { + "domelementtype": "1" + } + }, + "domutils": { + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.4.3.tgz", + "integrity": "sha1-CGVRN5bGswYDGFDhdVFrr4C3Km8=", + "requires": { + "domelementtype": "1" + } + }, "dotenv": { "version": "8.2.0", "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-8.2.0.tgz", "integrity": "sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw==" }, + "ecc-jsbn": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz", + "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=", + "requires": { + "jsbn": "~0.1.0", + "safer-buffer": "^2.1.0" + } + }, "emoji-regex": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" }, - "enabled": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/enabled/-/enabled-1.0.2.tgz", - "integrity": "sha1-ll9lE9LC0cX0ZStkouM5ZGf8L5M=", - "requires": { - "env-variable": "0.0.x" - } - }, - "env-variable": { - "version": "0.0.6", - "resolved": "https://registry.npmjs.org/env-variable/-/env-variable-0.0.6.tgz", - "integrity": "sha512-bHz59NlBbtS0NhftmR8+ExBEekE7br0e01jw+kk0NDro7TtZzBYZ5ScGPs3OmwnpyfHTHOtr1Y6uedCdrIldtg==" + "entities": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz", + "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==" }, "es6-error": { "version": "4.1.1", @@ -595,15 +701,15 @@ "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz", "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==" }, - "fast-safe-stringify": { - "version": "2.0.7", - "resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.0.7.tgz", - "integrity": "sha512-Utm6CdzT+6xsDk2m8S6uL8VHxNwI6Jub+e9NYTcAms28T84pTa25GJQV9j0CY0N1rM8hK4x6grpF2BQf+2qwVA==" + "extend": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", + "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==" }, - "fecha": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/fecha/-/fecha-2.3.3.tgz", - "integrity": "sha512-lUGBnIamTAwk4znq5BcqsDaxSmZ9nDVJaij6NvRt/Tg4R69gERA+otPKbS86ROw9nxVMw2/mp1fnaiWqbs6Sdg==" + "extsprintf": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", + "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=" }, "find-cache-dir": { "version": "3.3.1", @@ -633,6 +739,11 @@ "signal-exit": "^3.0.2" } }, + "forever-agent": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", + "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=" + }, "form-data": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.0.tgz", @@ -663,6 +774,26 @@ "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==" }, + "get-youtube-id": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/get-youtube-id/-/get-youtube-id-1.0.1.tgz", + "integrity": "sha512-5yidLzoLXbtw82a/Wb7LrajkGn29BM6JuLWeHyNfzOGp1weGyW4+7eMz6cP23+etqj27VlOFtq8fFFDMLq/FXQ==" + }, + "getpass": { + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", + "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", + "requires": { + "assert-plus": "^1.0.0" + }, + "dependencies": { + "assert-plus": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", + "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=" + } + } + }, "glob": { "version": "7.1.6", "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", @@ -686,6 +817,20 @@ "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz", "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==" }, + "har-schema": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz", + "integrity": "sha1-0mMTX0MwfALGAq/I/pWXDAFRNp4=" + }, + "har-validator": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz", + "integrity": "sha1-M0gdDxu/9gDdID11gSpqX7oALio=", + "requires": { + "ajv": "^4.9.1", + "har-schema": "^1.0.5" + } + }, "has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", @@ -698,20 +843,72 @@ "requires": { "is-stream": "^2.0.0", "type-fest": "^0.8.0" - }, - "dependencies": { - "is-stream": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz", - "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==" - } } }, + "hawk": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz", + "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=", + "requires": { + "boom": "2.x.x", + "cryptiles": "2.x.x", + "hoek": "2.x.x", + "sntp": "1.x.x" + } + }, + "hoek": { + "version": "2.16.3", + "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz", + "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=" + }, + "html-entities": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.2.1.tgz", + "integrity": "sha1-DfKTUfByEWNRXfueVUPl9u7VFi8=" + }, "html-escaper": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz", "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==" }, + "htmlparser2": { + "version": "3.8.3", + "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.3.tgz", + "integrity": "sha1-mWwosZFRaovoZQGn15dX5ccMEGg=", + "requires": { + "domelementtype": "1", + "domhandler": "2.3", + "domutils": "1.5", + "entities": "1.0", + "readable-stream": "1.1" + }, + "dependencies": { + "domutils": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz", + "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=", + "requires": { + "dom-serializer": "0", + "domelementtype": "1" + } + }, + "entities": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-1.0.0.tgz", + "integrity": "sha1-sph6o4ITR/zeZCsk/fyeT7cSvyY=" + } + } + }, + "http-signature": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz", + "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=", + "requires": { + "assert-plus": "^0.2.0", + "jsprim": "^1.2.2", + "sshpk": "^1.7.0" + } + }, "imurmurhash": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", @@ -736,20 +933,15 @@ "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" }, - "is-arrayish": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz", - "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==" - }, "is-fullwidth-code-point": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==" }, "is-stream": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", - "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=" + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz", + "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==" }, "is-typedarray": { "version": "1.0.0", @@ -762,15 +954,20 @@ "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==" }, "isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", + "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=" }, "isexe": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=" }, + "isstream": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", + "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=" + }, "istanbul-lib-coverage": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz", @@ -862,11 +1059,34 @@ "esprima": "^4.0.0" } }, + "jsbn": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", + "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=" + }, "jsesc": { "version": "2.5.2", "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==" }, + "json-schema": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz", + "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=" + }, + "json-stable-stringify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz", + "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=", + "requires": { + "jsonify": "~0.0.0" + } + }, + "json-stringify-safe": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", + "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=" + }, "json5": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.2.tgz", @@ -875,12 +1095,27 @@ "minimist": "^1.2.5" } }, - "kuler": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/kuler/-/kuler-1.0.1.tgz", - "integrity": "sha512-J9nVUucG1p/skKul6DU3PUZrhs0LPulNaeUOox0IyXDi8S4CztTHs1gQphhuZmzXG7VOQSf6NJfKuzteQLv9gQ==", + "jsonify": { + "version": "0.0.0", + "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz", + "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=" + }, + "jsprim": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz", + "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=", "requires": { - "colornames": "^1.1.1" + "assert-plus": "1.0.0", + "extsprintf": "1.3.0", + "json-schema": "0.2.3", + "verror": "1.10.0" + }, + "dependencies": { + "assert-plus": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", + "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=" + } } }, "locate-path": { @@ -901,16 +1136,18 @@ "resolved": "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz", "integrity": "sha1-+wMJF/hqMTTlvJvsDWngAT3f7bI=" }, - "logform": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/logform/-/logform-2.1.2.tgz", - "integrity": "sha512-+lZh4OpERDBLqjiwDLpAWNQu6KMjnlXH2ByZwCuSqVPJletw0kTWJf5CgSNAUKn1KUkv3m2cUz/LK8zyEy7wzQ==", + "lodash.isfunction": { + "version": "3.0.9", + "resolved": "https://registry.npmjs.org/lodash.isfunction/-/lodash.isfunction-3.0.9.tgz", + "integrity": "sha512-AirXNj15uRIMMPihnkInB4i3NHeb4iBtNg9WRWuK2o31S+ePwwNmDPaTL3o7dTJ+VXNZim7rFs4rxN4YU1oUJw==" + }, + "m3u8stream": { + "version": "0.6.5", + "resolved": "https://registry.npmjs.org/m3u8stream/-/m3u8stream-0.6.5.tgz", + "integrity": "sha512-QZCzhcfUliZfsOboi68QkNcMejPKTEhxE+s1TApvHubDeR8ythm4ViWuYFqgUwZeoHe8q0nsPxOvA3lQvdSzyg==", "requires": { - "colors": "^1.2.1", - "fast-safe-stringify": "^2.0.4", - "fecha": "^2.3.3", - "ms": "^2.1.1", - "triple-beam": "^1.3.0" + "miniget": "^1.6.1", + "sax": "^1.2.4" } }, "make-dir": { @@ -934,6 +1171,11 @@ "mime-db": "1.43.0" } }, + "miniget": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/miniget/-/miniget-1.7.0.tgz", + "integrity": "sha512-yrgaDSMRzrfYTkudB4Y6xK8pCb7oAH2bvfv6iPY2m6CedZfs9yK4b/ofh0Vzv08hCYXH/HHkoS8an6fkWtOAQA==" + }, "minimatch": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", @@ -978,6 +1220,14 @@ "process-on-spawn": "^1.0.0" } }, + "nth-check": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz", + "integrity": "sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==", + "requires": { + "boolbase": "~1.0.0" + } + }, "nyc": { "version": "15.0.0", "resolved": "https://registry.npmjs.org/nyc/-/nyc-15.0.0.tgz", @@ -1013,6 +1263,11 @@ "yargs": "^15.0.2" } }, + "oauth-sign": { + "version": "0.8.2", + "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz", + "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=" + }, "once": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", @@ -1021,11 +1276,6 @@ "wrappy": "1" } }, - "one-time": { - "version": "0.0.4", - "resolved": "https://registry.npmjs.org/one-time/-/one-time-0.0.4.tgz", - "integrity": "sha1-+M33eISCb+Tf+T46nMN7HkSAdC4=" - }, "p-limit": { "version": "2.2.2", "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.2.tgz", @@ -1066,15 +1316,6 @@ "release-zalgo": "^1.0.0" } }, - "path": { - "version": "0.12.7", - "resolved": "https://registry.npmjs.org/path/-/path-0.12.7.tgz", - "integrity": "sha1-1NwqUGxM4hl+tIHr/NWzbAFAsQ8=", - "requires": { - "process": "^0.11.1", - "util": "^0.10.3" - } - }, "path-exists": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", @@ -1095,6 +1336,11 @@ "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz", "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==" }, + "performance-now": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz", + "integrity": "sha1-M+8wxcd9TqIcWlOGnZG1bY8lVeU=" + }, "pkg-dir": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", @@ -1108,16 +1354,6 @@ "resolved": "https://registry.npmjs.org/prism-media/-/prism-media-1.2.1.tgz", "integrity": "sha512-R3EbKwJiYlTvGwcG1DpUt+06DsxOGS5W4AMEHT7oVOjG93MjpdhGX1whHyjnqknylLMupKAsKMEXcTNRbPe6Vw==" }, - "process": { - "version": "0.11.10", - "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", - "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=" - }, - "process-nextick-args": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", - "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==" - }, "process-on-spawn": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/process-on-spawn/-/process-on-spawn-1.0.0.tgz", @@ -1126,14 +1362,25 @@ "fromentries": "^1.2.0" } }, + "punycode": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", + "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=" + }, + "qs": { + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz", + "integrity": "sha1-E+JtKK1rD/qpExLNO/cI7TUecjM=" + }, "readable-stream": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", - "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", + "version": "1.1.14", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", + "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=", "requires": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" + "core-util-is": "~1.0.0", + "inherits": "~2.0.1", + "isarray": "0.0.1", + "string_decoder": "~0.10.x" } }, "release-zalgo": { @@ -1144,6 +1391,66 @@ "es6-error": "^4.0.1" } }, + "request": { + "version": "2.81.0", + "resolved": "https://registry.npmjs.org/request/-/request-2.81.0.tgz", + "integrity": "sha1-xpKJRqDgbF+Nb4qTM0af/aRimKA=", + "requires": { + "aws-sign2": "~0.6.0", + "aws4": "^1.2.1", + "caseless": "~0.12.0", + "combined-stream": "~1.0.5", + "extend": "~3.0.0", + "forever-agent": "~0.6.1", + "form-data": "~2.1.1", + "har-validator": "~4.2.1", + "hawk": "~3.1.3", + "http-signature": "~1.1.0", + "is-typedarray": "~1.0.0", + "isstream": "~0.1.2", + "json-stringify-safe": "~5.0.1", + "mime-types": "~2.1.7", + "oauth-sign": "~0.8.1", + "performance-now": "^0.2.0", + "qs": "~6.4.0", + "safe-buffer": "^5.0.1", + "stringstream": "~0.0.4", + "tough-cookie": "~2.3.0", + "tunnel-agent": "^0.6.0", + "uuid": "^3.0.0" + }, + "dependencies": { + "form-data": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz", + "integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=", + "requires": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.5", + "mime-types": "^2.1.12" + } + } + } + }, + "request-promise": { + "version": "4.2.5", + "resolved": "https://registry.npmjs.org/request-promise/-/request-promise-4.2.5.tgz", + "integrity": "sha512-ZgnepCykFdmpq86fKGwqntyTiUrHycALuGggpyCZwMvGaZWgxW6yagT0FHkgo5LzYvOaCNvxYwWYIjevSH1EDg==", + "requires": { + "bluebird": "^3.5.0", + "request-promise-core": "1.1.3", + "stealthy-require": "^1.1.1", + "tough-cookie": "^2.3.3" + } + }, + "request-promise-core": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.3.tgz", + "integrity": "sha512-QIs2+ArIGQVp5ZYbWD5ZLCY29D5CfWizP8eWnm8FoGD1TX61veauETVQbrV60662V0oFBkrDOuaBI8XgtuyYAQ==", + "requires": { + "lodash": "^4.17.15" + } + }, "require-directory": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", @@ -1176,9 +1483,19 @@ } }, "safe-buffer": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz", - "integrity": "sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg==" + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" + }, + "safer-buffer": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" + }, + "sax": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", + "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==" }, "semver": { "version": "6.3.0", @@ -1213,12 +1530,12 @@ "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz", "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==" }, - "simple-swizzle": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz", - "integrity": "sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo=", + "sntp": { + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz", + "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=", "requires": { - "is-arrayish": "^0.3.1" + "hoek": "2.x.x" } }, "source-map": { @@ -1244,10 +1561,38 @@ "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=" }, - "stack-trace": { - "version": "0.0.10", - "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz", - "integrity": "sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=" + "sshpk": { + "version": "1.16.1", + "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz", + "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==", + "requires": { + "asn1": "~0.2.3", + "assert-plus": "^1.0.0", + "bcrypt-pbkdf": "^1.0.0", + "dashdash": "^1.12.0", + "ecc-jsbn": "~0.1.1", + "getpass": "^0.1.1", + "jsbn": "~0.1.0", + "safer-buffer": "^2.0.2", + "tweetnacl": "~0.14.0" + }, + "dependencies": { + "assert-plus": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", + "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=" + }, + "tweetnacl": { + "version": "0.14.5", + "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", + "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=" + } + } + }, + "stealthy-require": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz", + "integrity": "sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=" }, "string-width": { "version": "4.2.0", @@ -1260,12 +1605,14 @@ } }, "string_decoder": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", - "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", - "requires": { - "safe-buffer": "~5.2.0" - } + "version": "0.10.31", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", + "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=" + }, + "stringstream": { + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.6.tgz", + "integrity": "sha512-87GEBAkegbBcweToUrdzf3eLhWNg06FJTebl4BVJz/JgWy8CvEr9dRtX5qWphiynMSQlxxi+QqN0z5T32SLlhA==" }, "strip-ansi": { "version": "6.0.0", @@ -1298,11 +1645,6 @@ "minimatch": "^3.0.4" } }, - "text-hex": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/text-hex/-/text-hex-1.0.0.tgz", - "integrity": "sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg==" - }, "tinytim": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/tinytim/-/tinytim-0.1.1.tgz", @@ -1313,6 +1655,14 @@ "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=" }, + "tough-cookie": { + "version": "2.3.4", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz", + "integrity": "sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==", + "requires": { + "punycode": "^1.4.1" + } + }, "tracer": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/tracer/-/tracer-1.0.2.tgz", @@ -1325,10 +1675,13 @@ "tinytim": "0.1.1" } }, - "triple-beam": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/triple-beam/-/triple-beam-1.3.0.tgz", - "integrity": "sha512-XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw==" + "tunnel-agent": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", + "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", + "requires": { + "safe-buffer": "^5.0.1" + } }, "tweetnacl": { "version": "1.0.3", @@ -1348,31 +1701,28 @@ "is-typedarray": "^1.0.0" } }, - "util": { - "version": "0.10.4", - "resolved": "https://registry.npmjs.org/util/-/util-0.10.4.tgz", - "integrity": "sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==", - "requires": { - "inherits": "2.0.3" - }, - "dependencies": { - "inherits": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" - } - } - }, - "util-deprecate": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" - }, "uuid": { "version": "3.4.0", "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==" }, + "verror": { + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", + "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", + "requires": { + "assert-plus": "^1.0.0", + "core-util-is": "1.0.2", + "extsprintf": "^1.2.0" + }, + "dependencies": { + "assert-plus": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", + "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=" + } + } + }, "which": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", @@ -1386,60 +1736,6 @@ "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=" }, - "winston": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/winston/-/winston-3.2.1.tgz", - "integrity": "sha512-zU6vgnS9dAWCEKg/QYigd6cgMVVNwyTzKs81XZtTFuRwJOcDdBg7AU0mXVyNbs7O5RH2zdv+BdNZUlx7mXPuOw==", - "requires": { - "async": "^2.6.1", - "diagnostics": "^1.1.1", - "is-stream": "^1.1.0", - "logform": "^2.1.1", - "one-time": "0.0.4", - "readable-stream": "^3.1.1", - "stack-trace": "0.0.x", - "triple-beam": "^1.3.0", - "winston-transport": "^4.3.0" - } - }, - "winston-transport": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/winston-transport/-/winston-transport-4.3.0.tgz", - "integrity": "sha512-B2wPuwUi3vhzn/51Uukcao4dIduEiPOcOt9HJ3QeaXgkJ5Z7UwpBzxS4ZGNHtrxrUvTwemsQiSys0ihOf8Mp1A==", - "requires": { - "readable-stream": "^2.3.6", - "triple-beam": "^1.2.0" - }, - "dependencies": { - "readable-stream": { - "version": "2.3.7", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", - "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" - } - }, - "safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" - }, - "string_decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "requires": { - "safe-buffer": "~5.1.0" - } - } - } - }, "wrap-ansi": { "version": "6.2.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", @@ -1502,6 +1798,54 @@ "camelcase": "^5.0.0", "decamelize": "^1.2.0" } + }, + "youtube-info": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/youtube-info/-/youtube-info-1.3.2.tgz", + "integrity": "sha512-LnBZxCuCof0bwFNtLSxklLYgaU1XR8OK+cGieWyPS10rn3P0TMHdIikRpO/W/duE9SR9JfzOk8ThgwDgx0B3Vw==", + "requires": { + "cheerio": "^0.19.0", + "debug": "^2.2.0", + "lodash.isfunction": "^3.0.6", + "request": "2.81.0", + "request-promise": "^4.2.2" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "requires": { + "ms": "2.0.0" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + } + } + }, + "ytdl-core": { + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/ytdl-core/-/ytdl-core-1.0.9.tgz", + "integrity": "sha512-HhFeLfjXU34h0FNHmSkSpKygdaYijSt8VNsC770VYBRFb+dyUKcm11cIKxu2MUSwT9znISZ0k1wFdaV/N5VW+Q==", + "requires": { + "html-entities": "^1.1.3", + "m3u8stream": "^0.6.3", + "miniget": "^1.6.0", + "sax": "^1.1.3" + } + }, + "ytdl-core-discord": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/ytdl-core-discord/-/ytdl-core-discord-1.1.0.tgz", + "integrity": "sha512-uiaZWa9UG+he1F9p7Si9H6Tieyxd9dEhLi4958mHuebudQSEEPaaJHUEbFikcpB++5ogzynVOcvdeC+LFJGgEw==", + "requires": { + "@types/node": "^13.5.3", + "prism-media": "^1.0.1", + "ytdl-core": "^1.0.3" + } } } } From 9180cf1d173161ba8686a88ed769b0c016044583 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Hor=C3=A1=C4=8Dek?= Date: Tue, 31 Mar 2020 13:38:01 +0200 Subject: [PATCH 017/156] update package lock i guess --- package-lock.json | 2550 ++++++++++++++++++++++++++------------------- 1 file changed, 1464 insertions(+), 1086 deletions(-) diff --git a/package-lock.json b/package-lock.json index bea0cf0..a8d45c7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2,277 +2,35 @@ "requires": true, "lockfileVersion": 1, "dependencies": { - "@babel/code-frame": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz", - "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==", - "requires": { - "@babel/highlight": "^7.8.3" - } - }, - "@babel/core": { - "version": "7.9.0", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.9.0.tgz", - "integrity": "sha512-kWc7L0fw1xwvI0zi8OKVBuxRVefwGOrKSQMvrQ3dW+bIIavBY3/NpXmpjMy7bQnLgwgzWQZ8TlM57YHpHNHz4w==", - "requires": { - "@babel/code-frame": "^7.8.3", - "@babel/generator": "^7.9.0", - "@babel/helper-module-transforms": "^7.9.0", - "@babel/helpers": "^7.9.0", - "@babel/parser": "^7.9.0", - "@babel/template": "^7.8.6", - "@babel/traverse": "^7.9.0", - "@babel/types": "^7.9.0", - "convert-source-map": "^1.7.0", - "debug": "^4.1.0", - "gensync": "^1.0.0-beta.1", - "json5": "^2.1.2", - "lodash": "^4.17.13", - "resolve": "^1.3.2", - "semver": "^5.4.1", - "source-map": "^0.5.0" - }, - "dependencies": { - "semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" - } - } - }, - "@babel/generator": { - "version": "7.9.4", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.9.4.tgz", - "integrity": "sha512-rjP8ahaDy/ouhrvCoU1E5mqaitWrxwuNGU+dy1EpaoK48jZay4MdkskKGIMHLZNewg8sAsqpGSREJwP0zH3YQA==", - "requires": { - "@babel/types": "^7.9.0", - "jsesc": "^2.5.1", - "lodash": "^4.17.13", - "source-map": "^0.5.0" - } - }, - "@babel/helper-function-name": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.8.3.tgz", - "integrity": "sha512-BCxgX1BC2hD/oBlIFUgOCQDOPV8nSINxCwM3o93xP4P9Fq6aV5sgv2cOOITDMtCfQ+3PvHp3l689XZvAM9QyOA==", - "requires": { - "@babel/helper-get-function-arity": "^7.8.3", - "@babel/template": "^7.8.3", - "@babel/types": "^7.8.3" - } - }, - "@babel/helper-get-function-arity": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz", - "integrity": "sha512-FVDR+Gd9iLjUMY1fzE2SR0IuaJToR4RkCDARVfsBBPSP53GEqSFjD8gNyxg246VUyc/ALRxFaAK8rVG7UT7xRA==", - "requires": { - "@babel/types": "^7.8.3" - } - }, - "@babel/helper-member-expression-to-functions": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.8.3.tgz", - "integrity": "sha512-fO4Egq88utkQFjbPrSHGmGLFqmrshs11d46WI+WZDESt7Wu7wN2G2Iu+NMMZJFDOVRHAMIkB5SNh30NtwCA7RA==", - "requires": { - "@babel/types": "^7.8.3" - } - }, - "@babel/helper-module-imports": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.8.3.tgz", - "integrity": "sha512-R0Bx3jippsbAEtzkpZ/6FIiuzOURPcMjHp+Z6xPe6DtApDJx+w7UYyOLanZqO8+wKR9G10s/FmHXvxaMd9s6Kg==", - "requires": { - "@babel/types": "^7.8.3" - } - }, - "@babel/helper-module-transforms": { - "version": "7.9.0", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.9.0.tgz", - "integrity": "sha512-0FvKyu0gpPfIQ8EkxlrAydOWROdHpBmiCiRwLkUiBGhCUPRRbVD2/tm3sFr/c/GWFrQ/ffutGUAnx7V0FzT2wA==", - "requires": { - "@babel/helper-module-imports": "^7.8.3", - "@babel/helper-replace-supers": "^7.8.6", - "@babel/helper-simple-access": "^7.8.3", - "@babel/helper-split-export-declaration": "^7.8.3", - "@babel/template": "^7.8.6", - "@babel/types": "^7.9.0", - "lodash": "^4.17.13" - } - }, - "@babel/helper-optimise-call-expression": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.8.3.tgz", - "integrity": "sha512-Kag20n86cbO2AvHca6EJsvqAd82gc6VMGule4HwebwMlwkpXuVqrNRj6CkCV2sKxgi9MyAUnZVnZ6lJ1/vKhHQ==", - "requires": { - "@babel/types": "^7.8.3" - } - }, - "@babel/helper-replace-supers": { - "version": "7.8.6", - "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.8.6.tgz", - "integrity": "sha512-PeMArdA4Sv/Wf4zXwBKPqVj7n9UF/xg6slNRtZW84FM7JpE1CbG8B612FyM4cxrf4fMAMGO0kR7voy1ForHHFA==", - "requires": { - "@babel/helper-member-expression-to-functions": "^7.8.3", - "@babel/helper-optimise-call-expression": "^7.8.3", - "@babel/traverse": "^7.8.6", - "@babel/types": "^7.8.6" - } - }, - "@babel/helper-simple-access": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.8.3.tgz", - "integrity": "sha512-VNGUDjx5cCWg4vvCTR8qQ7YJYZ+HBjxOgXEl7ounz+4Sn7+LMD3CFrCTEU6/qXKbA2nKg21CwhhBzO0RpRbdCw==", - "requires": { - "@babel/template": "^7.8.3", - "@babel/types": "^7.8.3" - } - }, - "@babel/helper-split-export-declaration": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz", - "integrity": "sha512-3x3yOeyBhW851hroze7ElzdkeRXQYQbFIb7gLK1WQYsw2GWDay5gAJNw1sWJ0VFP6z5J1whqeXH/WCdCjZv6dA==", - "requires": { - "@babel/types": "^7.8.3" - } - }, - "@babel/helper-validator-identifier": { - "version": "7.9.0", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.0.tgz", - "integrity": "sha512-6G8bQKjOh+of4PV/ThDm/rRqlU7+IGoJuofpagU5GlEl29Vv0RGqqt86ZGRV8ZuSOY3o+8yXl5y782SMcG7SHw==" - }, - "@babel/helpers": { - "version": "7.9.2", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.9.2.tgz", - "integrity": "sha512-JwLvzlXVPjO8eU9c/wF9/zOIN7X6h8DYf7mG4CiFRZRvZNKEF5dQ3H3V+ASkHoIB3mWhatgl5ONhyqHRI6MppA==", - "requires": { - "@babel/template": "^7.8.3", - "@babel/traverse": "^7.9.0", - "@babel/types": "^7.9.0" - } - }, - "@babel/highlight": { - "version": "7.9.0", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz", - "integrity": "sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==", - "requires": { - "@babel/helper-validator-identifier": "^7.9.0", - "chalk": "^2.0.0", - "js-tokens": "^4.0.0" - }, - "dependencies": { - "ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "requires": { - "color-convert": "^1.9.0" - } - }, - "chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - } - }, - "color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "requires": { - "color-name": "1.1.3" - } - }, - "color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=" - }, - "has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=" - }, - "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "requires": { - "has-flag": "^3.0.0" - } - } - } - }, - "@babel/parser": { - "version": "7.9.4", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.9.4.tgz", - "integrity": "sha512-bC49otXX6N0/VYhgOMh4gnP26E9xnDZK3TmbNpxYzzz9BQLBosQwfyOe9/cXUU3txYhTzLCbcqd5c8y/OmCjHA==" - }, - "@babel/template": { - "version": "7.8.6", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.8.6.tgz", - "integrity": "sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg==", - "requires": { - "@babel/code-frame": "^7.8.3", - "@babel/parser": "^7.8.6", - "@babel/types": "^7.8.6" - } - }, - "@babel/traverse": { - "version": "7.9.0", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.0.tgz", - "integrity": "sha512-jAZQj0+kn4WTHO5dUZkZKhbFrqZE7K5LAQ5JysMnmvGij+wOdr+8lWqPeW0BcF4wFwrEXXtdGO7wcV6YPJcf3w==", - "requires": { - "@babel/code-frame": "^7.8.3", - "@babel/generator": "^7.9.0", - "@babel/helper-function-name": "^7.8.3", - "@babel/helper-split-export-declaration": "^7.8.3", - "@babel/parser": "^7.9.0", - "@babel/types": "^7.9.0", - "debug": "^4.1.0", - "globals": "^11.1.0", - "lodash": "^4.17.13" - } - }, - "@babel/types": { - "version": "7.9.0", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.0.tgz", - "integrity": "sha512-BS9JKfXkzzJl8RluW4JGknzpiUV7ZrvTayM6yfqLTVBEnFtyowVIOu6rqxRd5cVO6yGoWf4T8u8dgK9oB+GCng==", - "requires": { - "@babel/helper-validator-identifier": "^7.9.0", - "lodash": "^4.17.13", - "to-fast-properties": "^2.0.0" - } - }, "@discordjs/collection": { "version": "0.1.5", "resolved": "https://registry.npmjs.org/@discordjs/collection/-/collection-0.1.5.tgz", "integrity": "sha512-CU1q0UXQUpFNzNB7gufgoisDHP7n+T3tkqTsp3MNUkVJ5+hS3BCvME8uCXAUFlz+6T2FbTCu75A+yQ7HMKqRKw==" }, - "@istanbuljs/load-nyc-config": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.0.0.tgz", - "integrity": "sha512-ZR0rq/f/E4f4XcgnDvtMWXCUJpi8eO0rssVhmztsZqLIEFA9UUP9zmpE0VxlM+kv/E1ul2I876Fwil2ayptDVg==", + "@discordjs/opus": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/@discordjs/opus/-/opus-0.1.0.tgz", + "integrity": "sha512-VWsrsgqSktxOEHx9SFcnOWJhYQOsyzaW3JVN73LDSzKrycEjtRIS+axlm4qeMGx60u6RH1SY15b3pl5G4+Y+gA==", "requires": { - "camelcase": "^5.3.1", - "find-up": "^4.1.0", - "js-yaml": "^3.13.1", - "resolve-from": "^5.0.0" + "node-addon-api": "^2.0.0", + "node-pre-gyp": "^0.14.0" } }, - "@istanbuljs/schema": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.2.tgz", - "integrity": "sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw==" - }, "@types/color-name": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz", "integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==" }, + "@types/node": { + "version": "13.9.8", + "resolved": "https://registry.npmjs.org/@types/node/-/node-13.9.8.tgz", + "integrity": "sha512-1WgO8hsyHynlx7nhP1kr0OFzsgKz5XDQL+Lfc3b1Q3qIln/n8cKD4m09NJ0+P1Rq7Zgnc7N0+SsMnoD1rEb0kA==" + }, + "abbrev": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", + "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==" + }, "abort-controller": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz", @@ -281,19 +39,21 @@ "event-target-shim": "^5.0.0" } }, - "aggregate-error": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.0.1.tgz", - "integrity": "sha512-quoaXsZ9/BLNae5yiNoUz+Nhkwz83GhWwtYFglcjEQB2NDHCIpApbqXxIFnm4Pq/Nvhrsq5sYJFyohrrxnTGAA==", + "ajv": { + "version": "6.12.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.0.tgz", + "integrity": "sha512-D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw==", "requires": { - "clean-stack": "^2.0.0", - "indent-string": "^4.0.0" + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" } }, "ansi-regex": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", - "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==" + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" }, "ansi-styles": { "version": "4.2.1", @@ -304,18 +64,19 @@ "color-convert": "^2.0.1" } }, - "append-transform": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/append-transform/-/append-transform-2.0.0.tgz", - "integrity": "sha512-7yeyCEurROLQJFv5Xj4lEGTy0borxepjFv1g22oAdqFu//SrAlDl1O1Nxx15SH1RoliUml6p8dwJW9jvZughhg==", - "requires": { - "default-require-extensions": "^3.0.0" - } + "aproba": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz", + "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==" }, - "archy": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz", - "integrity": "sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=" + "are-we-there-yet": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz", + "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==", + "requires": { + "delegates": "^1.0.0", + "readable-stream": "^2.0.6" + } }, "argparse": { "version": "1.0.10", @@ -323,26 +84,90 @@ "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", "requires": { "sprintf-js": "~1.0.2" + }, + "dependencies": { + "sprintf-js": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", + "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=" + } } }, - "async": { - "version": "2.6.3", - "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz", - "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==", + "asn1": { + "version": "0.2.4", + "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz", + "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==", "requires": { - "lodash": "^4.17.14" + "safer-buffer": "~2.1.0" } }, + "assert-plus": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", + "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=" + }, "asynckit": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=" }, + "aws-sign2": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", + "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=" + }, + "aws4": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.9.1.tgz", + "integrity": "sha512-wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug==" + }, "balanced-match": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=" }, + "bcrypt-pbkdf": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz", + "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=", + "requires": { + "tweetnacl": "^0.14.3" + }, + "dependencies": { + "tweetnacl": { + "version": "0.14.5", + "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", + "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=" + } + } + }, + "better-sqlite3": { + "version": "5.4.3", + "resolved": "https://registry.npmjs.org/better-sqlite3/-/better-sqlite3-5.4.3.tgz", + "integrity": "sha512-fPp+8f363qQIhuhLyjI4bu657J/FfMtgiiHKfaTsj3RWDkHlWC1yT7c6kHZDnBxzQVoAINuzg553qKmZ4F1rEw==", + "requires": { + "integer": "^2.1.0", + "tar": "^4.4.10" + } + }, + "bluebird": { + "version": "3.7.2", + "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", + "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==" + }, + "boolbase": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz", + "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=" + }, + "boom": { + "version": "2.10.1", + "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz", + "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=", + "requires": { + "hoek": "2.x.x" + } + }, "brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", @@ -352,61 +177,58 @@ "concat-map": "0.0.1" } }, - "caching-transform": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/caching-transform/-/caching-transform-4.0.0.tgz", - "integrity": "sha512-kpqOvwXnjjN44D89K5ccQC+RUrsy7jB/XLlRrx0D7/2HNcTPqzsb6XgYoErwko6QsV184CA2YgS1fxDiiDZMWA==", - "requires": { - "hasha": "^5.0.0", - "make-dir": "^3.0.0", - "package-hash": "^4.0.0", - "write-file-atomic": "^3.0.0" - } + "caseless": { + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", + "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=" }, - "camelcase": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", - "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==" - }, - "clean-stack": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz", - "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==" - }, - "cliui": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz", - "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==", - "requires": { - "string-width": "^4.2.0", - "strip-ansi": "^6.0.0", - "wrap-ansi": "^6.2.0" - } - }, - "color": { + "chalk": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/color/-/color-3.0.0.tgz", - "integrity": "sha512-jCpd5+s0s0t7p3pHQKpnJ0TpQKKdleP71LWcA0aqiljpiuAkOSUFN/dyH8ZwF0hRmFlrIuRhufds1QyEP9EB+w==", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", + "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", "requires": { - "color-convert": "^1.9.1", - "color-string": "^1.5.2" - }, - "dependencies": { - "color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "requires": { - "color-name": "1.1.3" - } - }, - "color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=" - } + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" } }, + "cheerio": { + "version": "0.22.0", + "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-0.22.0.tgz", + "integrity": "sha1-qbqoYKP5tZWmuBsahocxIe06Jp4=", + "requires": { + "css-select": "~1.2.0", + "dom-serializer": "~0.1.0", + "entities": "~1.1.1", + "htmlparser2": "^3.9.1", + "lodash.assignin": "^4.0.9", + "lodash.bind": "^4.1.4", + "lodash.defaults": "^4.0.1", + "lodash.filter": "^4.4.0", + "lodash.flatten": "^4.2.0", + "lodash.foreach": "^4.3.0", + "lodash.map": "^4.4.0", + "lodash.merge": "^4.4.0", + "lodash.pick": "^4.2.1", + "lodash.reduce": "^4.4.0", + "lodash.reject": "^4.4.0", + "lodash.some": "^4.4.0" + } + }, + "chownr": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz", + "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==" + }, + "co": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", + "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=" + }, + "code-point-at": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", + "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=" + }, "color-convert": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", @@ -420,34 +242,11 @@ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" }, - "color-string": { - "version": "1.5.3", - "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.5.3.tgz", - "integrity": "sha512-dC2C5qeWoYkxki5UAXapdjqO672AM4vZuPGRQfO8b5HKuKGBbKWpITyDYN7TOFKvRW7kOgAn3746clDBMDJyQw==", - "requires": { - "color-name": "^1.0.0", - "simple-swizzle": "^0.2.2" - } - }, - "colornames": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/colornames/-/colornames-1.1.1.tgz", - "integrity": "sha1-+IiQMGhcfE/54qVZ9Qd+t2qBb5Y=" - }, "colors": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz", "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==" }, - "colorspace": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/colorspace/-/colorspace-1.1.2.tgz", - "integrity": "sha512-vt+OoIP2d76xLhjwbBaucYlNSpPsrJWPlBTtwCpQKIu6/CSMutyzX93O/Do0qzpH3YoHEes8YEFXyZ797rEhzQ==", - "requires": { - "color": "3.0.x", - "text-hex": "1.0.x" - } - }, "combined-stream": { "version": "1.0.8", "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", @@ -456,86 +255,114 @@ "delayed-stream": "~1.0.0" } }, - "commondir": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz", - "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=" + "commander": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-5.0.0.tgz", + "integrity": "sha512-JrDGPAKjMGSP1G0DUoaceEJ3DZgAfr/q6X7FVk4+U5KxUSKviYGM2k6zWkfyyBHy5rAtzgYJFa1ro2O9PtoxwQ==" }, "concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" }, - "convert-source-map": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz", - "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==", - "requires": { - "safe-buffer": "~5.1.1" - }, - "dependencies": { - "safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" - } - } + "console-control-strings": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", + "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=" }, "core-util-is": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" }, - "cross-spawn": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.1.tgz", - "integrity": "sha512-u7v4o84SwFpD32Z8IIcPZ6z1/ie24O6RU3RbtL5Y316l3KuHVPx9ItBgWQ6VlfAFnRnTtMUrsQ9MUUTuEZjogg==", + "cryptiles": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz", + "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=", "requires": { - "path-key": "^3.1.0", - "shebang-command": "^2.0.0", - "which": "^2.0.1" + "boom": "2.x.x" } }, - "dateformat": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-3.0.3.tgz", - "integrity": "sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==" + "css-select": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz", + "integrity": "sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=", + "requires": { + "boolbase": "~1.0.0", + "css-what": "2.1", + "domutils": "1.5.1", + "nth-check": "~1.0.1" + }, + "dependencies": { + "domutils": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz", + "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=", + "requires": { + "dom-serializer": "0", + "domelementtype": "1" + } + } + } + }, + "css-what": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.3.tgz", + "integrity": "sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==" + }, + "dashdash": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", + "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", + "requires": { + "assert-plus": "^1.0.0" + } + }, + "dblapi.js": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/dblapi.js/-/dblapi.js-2.4.0.tgz", + "integrity": "sha512-SqDYVcV1DBQnyhySTjd+Qvzu7jFr+4eKwl56fGpIti7OlXGF5dmDPeo3jQfRlOXTRn5/I5997MDIJukoDxE3Mg==" }, "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "version": "3.2.6", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", + "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", "requires": { "ms": "^2.1.1" } }, - "decamelize": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", - "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=" - }, - "default-require-extensions": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/default-require-extensions/-/default-require-extensions-3.0.0.tgz", - "integrity": "sha512-ek6DpXq/SCpvjhpFsLFRVtIxJCRw6fUR42lYMVZuUMK7n8eMz4Uh5clckdBjEpLhn/gEBZo7hDJnJcwdKLKQjg==", + "decompress-response": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz", + "integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=", "requires": { - "strip-bom": "^4.0.0" + "mimic-response": "^1.0.0" } }, + "deep-extend": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz", + "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==" + }, + "deepmerge": { + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-1.5.2.tgz", + "integrity": "sha512-95k0GDqvBjZavkuvzx/YqVLv/6YYa17fz6ILMSf7neqQITCPbnfEnQvEgMPNjH4kgobe7+WIL0yJEHku+H3qtQ==" + }, "delayed-stream": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=" }, - "diagnostics": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/diagnostics/-/diagnostics-1.1.1.tgz", - "integrity": "sha512-8wn1PmdunLJ9Tqbx+Fx/ZEuHfJf4NKSN2ZBj7SJC/OWRWha843+WsTjqMe1B5E3p28jqBlp+mJ2fPVxPyNgYKQ==", - "requires": { - "colorspace": "1.1.x", - "enabled": "1.0.x", - "kuler": "1.0.x" - } + "delegates": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", + "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=" + }, + "detect-libc": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz", + "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=" }, "discord.js": { "version": "12.1.1", @@ -552,33 +379,68 @@ "ws": "^7.2.1" } }, + "dom-serializer": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.1.tgz", + "integrity": "sha512-l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA==", + "requires": { + "domelementtype": "^1.3.0", + "entities": "^1.1.1" + } + }, + "domelementtype": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz", + "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==" + }, + "domhandler": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz", + "integrity": "sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==", + "requires": { + "domelementtype": "1" + } + }, + "domutils": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz", + "integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==", + "requires": { + "dom-serializer": "0", + "domelementtype": "1" + } + }, "dotenv": { "version": "8.2.0", "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-8.2.0.tgz", "integrity": "sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw==" }, - "emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" + "duplexer3": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz", + "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=" }, - "enabled": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/enabled/-/enabled-1.0.2.tgz", - "integrity": "sha1-ll9lE9LC0cX0ZStkouM5ZGf8L5M=", + "ecc-jsbn": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz", + "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=", "requires": { - "env-variable": "0.0.x" + "jsbn": "~0.1.0", + "safer-buffer": "^2.1.0" } }, - "env-variable": { - "version": "0.0.6", - "resolved": "https://registry.npmjs.org/env-variable/-/env-variable-0.0.6.tgz", - "integrity": "sha512-bHz59NlBbtS0NhftmR8+ExBEekE7br0e01jw+kk0NDro7TtZzBYZ5ScGPs3OmwnpyfHTHOtr1Y6uedCdrIldtg==" + "enmap": { + "version": "5.2.4", + "resolved": "https://registry.npmjs.org/enmap/-/enmap-5.2.4.tgz", + "integrity": "sha512-YulKPmB3t08i1aBDBDgEew9gAWYWXVuGe8S3DLYRQ+E0FoVxTTzo2iSfcEmUX9DRLuKLDMRLRcbRqX5J0z55Uw==", + "requires": { + "lodash": "^4.17.15" + } }, - "es6-error": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz", - "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==" + "entities": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz", + "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==" }, "escape-string-regexp": { "version": "1.0.5", @@ -595,43 +457,30 @@ "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz", "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==" }, - "fast-safe-stringify": { - "version": "2.0.7", - "resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.0.7.tgz", - "integrity": "sha512-Utm6CdzT+6xsDk2m8S6uL8VHxNwI6Jub+e9NYTcAms28T84pTa25GJQV9j0CY0N1rM8hK4x6grpF2BQf+2qwVA==" + "extend": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", + "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==" }, - "fecha": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/fecha/-/fecha-2.3.3.tgz", - "integrity": "sha512-lUGBnIamTAwk4znq5BcqsDaxSmZ9nDVJaij6NvRt/Tg4R69gERA+otPKbS86ROw9nxVMw2/mp1fnaiWqbs6Sdg==" + "extsprintf": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.4.0.tgz", + "integrity": "sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=" }, - "find-cache-dir": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.1.tgz", - "integrity": "sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ==", - "requires": { - "commondir": "^1.0.1", - "make-dir": "^3.0.2", - "pkg-dir": "^4.1.0" - } + "fast-deep-equal": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz", + "integrity": "sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA==" }, - "find-up": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", - "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", - "requires": { - "locate-path": "^5.0.0", - "path-exists": "^4.0.0" - } + "fast-json-stable-stringify": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", + "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==" }, - "foreground-child": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-2.0.0.tgz", - "integrity": "sha512-dCIq9FpEcyQyXKCkyzmlPTFNgrCzPudOe+mhvJU5zAtlBnGVy2yKxtfsxK2tQBThwq225jcvBjpw1Gr40uzZCA==", - "requires": { - "cross-spawn": "^7.0.0", - "signal-exit": "^3.0.2" - } + "forever-agent": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", + "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=" }, "form-data": { "version": "3.0.0", @@ -643,25 +492,59 @@ "mime-types": "^2.1.12" } }, - "fromentries": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/fromentries/-/fromentries-1.2.0.tgz", - "integrity": "sha512-33X7H/wdfO99GdRLLgkjUrD4geAFdq/Uv0kl3HD4da6HDixd2GUg8Mw7dahLCV9r/EARkmtYBB6Tch4EEokFTQ==" + "fs-minipass": { + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz", + "integrity": "sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==", + "requires": { + "minipass": "^2.6.0" + } }, "fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" }, - "gensync": { - "version": "1.0.0-beta.1", - "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.1.tgz", - "integrity": "sha512-r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg==" + "garfield": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/garfield/-/garfield-1.1.2.tgz", + "integrity": "sha1-C3PcRfUYmgU/9LU9eydOKf5Hy/Y=", + "requires": { + "moment": "^2.17.1" + } }, - "get-caller-file": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", - "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==" + "gauge": { + "version": "2.7.4", + "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz", + "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=", + "requires": { + "aproba": "^1.0.3", + "console-control-strings": "^1.0.0", + "has-unicode": "^2.0.0", + "object-assign": "^4.1.0", + "signal-exit": "^3.0.0", + "string-width": "^1.0.1", + "strip-ansi": "^3.0.1", + "wide-align": "^1.1.0" + } + }, + "get-stream": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", + "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=" + }, + "get-youtube-id": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/get-youtube-id/-/get-youtube-id-1.0.1.tgz", + "integrity": "sha512-5yidLzoLXbtw82a/Wb7LrajkGn29BM6JuLWeHyNfzOGp1weGyW4+7eMz6cP23+etqj27VlOFtq8fFFDMLq/FXQ==" + }, + "getpass": { + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", + "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", + "requires": { + "assert-plus": "^1.0.0" + } }, "glob": { "version": "7.1.6", @@ -676,51 +559,143 @@ "path-is-absolute": "^1.0.0" } }, - "globals": { - "version": "11.12.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", - "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==" + "got": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/got/-/got-7.1.0.tgz", + "integrity": "sha512-Y5WMo7xKKq1muPsxD+KmrR8DH5auG7fBdDVueZwETwV6VytKyU9OX/ddpq2/1hp1vIPvVb4T81dKQz3BivkNLw==", + "requires": { + "decompress-response": "^3.2.0", + "duplexer3": "^0.1.4", + "get-stream": "^3.0.0", + "is-plain-obj": "^1.1.0", + "is-retry-allowed": "^1.0.0", + "is-stream": "^1.0.0", + "isurl": "^1.0.0-alpha5", + "lowercase-keys": "^1.0.0", + "p-cancelable": "^0.3.0", + "p-timeout": "^1.1.1", + "safe-buffer": "^5.0.1", + "timed-out": "^4.0.0", + "url-parse-lax": "^1.0.0", + "url-to-options": "^1.0.1" + } }, - "graceful-fs": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz", - "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==" + "har-schema": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz", + "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=" + }, + "har-validator": { + "version": "5.1.3", + "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz", + "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==", + "requires": { + "ajv": "^6.5.5", + "har-schema": "^2.0.0" + } }, "has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" }, - "hasha": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/hasha/-/hasha-5.2.0.tgz", - "integrity": "sha512-2W+jKdQbAdSIrggA8Q35Br8qKadTrqCTC8+XZvBWepKDK6m9XkX6Iz1a2yh2KP01kzAR/dpuMeUnocoLYDcskw==", + "has-symbol-support-x": { + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz", + "integrity": "sha512-3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw==" + }, + "has-to-string-tag-x": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz", + "integrity": "sha512-vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw==", "requires": { - "is-stream": "^2.0.0", - "type-fest": "^0.8.0" + "has-symbol-support-x": "^1.4.1" + } + }, + "has-unicode": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", + "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=" + }, + "hastebin-gen": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/hastebin-gen/-/hastebin-gen-2.0.5.tgz", + "integrity": "sha512-At1LaKtcqh2jiP8xfE2sDGT9IshIki6FqsgLwn2y7FzAvlFJRtpUsSPh3yWjWIQIvxi/GPF07IBqSI8WhPL/gQ==", + "requires": { + "node-fetch": "^2.6.0" + } + }, + "hawk": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz", + "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=", + "requires": { + "boom": "2.x.x", + "cryptiles": "2.x.x", + "hoek": "2.x.x", + "sntp": "1.x.x" + } + }, + "hoek": { + "version": "2.16.3", + "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz", + "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=" + }, + "html-entities": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.2.1.tgz", + "integrity": "sha1-DfKTUfByEWNRXfueVUPl9u7VFi8=" + }, + "htmlparser2": { + "version": "3.10.1", + "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.1.tgz", + "integrity": "sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==", + "requires": { + "domelementtype": "^1.3.1", + "domhandler": "^2.3.0", + "domutils": "^1.5.1", + "entities": "^1.1.1", + "inherits": "^2.0.1", + "readable-stream": "^3.1.1" }, "dependencies": { - "is-stream": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz", - "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==" + "readable-stream": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", + "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", + "requires": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + } } } }, - "html-escaper": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz", - "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==" + "http-signature": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.3.2.tgz", + "integrity": "sha512-sjgXeFLIVJ54n1+HWOvazGkIQpaawFGIQ1PYPORaFNWpPHJ28ZuDgWljvMIhAIcOelTtrh9e5wVB3IorxjiZDA==", + "requires": { + "assert-plus": "^1.0.0", + "jsprim": "^1.2.2", + "sshpk": "^1.14.1" + } }, - "imurmurhash": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", - "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=" + "iconv-lite": { + "version": "0.4.24", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", + "requires": { + "safer-buffer": ">= 2.1.2 < 3" + } }, - "indent-string": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", - "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==" + "ignore-walk": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.3.tgz", + "integrity": "sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw==", + "requires": { + "minimatch": "^3.0.4" + } }, "inflight": { "version": "1.0.6", @@ -736,15 +711,43 @@ "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" }, - "is-arrayish": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz", - "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==" + "ini": { + "version": "1.3.5", + "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz", + "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==" + }, + "integer": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/integer/-/integer-2.1.0.tgz", + "integrity": "sha512-vBtiSgrEiNocWvvZX1RVfeOKa2mCHLZQ2p9nkQkQZ/BvEiY+6CcUz0eyjvIiewjJoeNidzg2I+tpPJvpyspL1w==" }, "is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==" + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", + "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", + "requires": { + "number-is-nan": "^1.0.0" + } + }, + "is-google-domain": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-google-domain/-/is-google-domain-1.0.0.tgz", + "integrity": "sha1-feHSOqFHuGrJbG0H4PFt+GYARzM=" + }, + "is-object": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-object/-/is-object-1.0.1.tgz", + "integrity": "sha1-iVJojF7C/9awPsyF52ngKQMINHA=" + }, + "is-plain-obj": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz", + "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=" + }, + "is-retry-allowed": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz", + "integrity": "sha512-RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg==" }, "is-stream": { "version": "1.1.0", @@ -756,103 +759,30 @@ "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=" }, - "is-windows": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz", - "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==" + "is-url": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/is-url/-/is-url-1.2.4.tgz", + "integrity": "sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==" }, "isarray": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" }, - "isexe": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=" + "isstream": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", + "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=" }, - "istanbul-lib-coverage": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz", - "integrity": "sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg==" - }, - "istanbul-lib-hook": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/istanbul-lib-hook/-/istanbul-lib-hook-3.0.0.tgz", - "integrity": "sha512-Pt/uge1Q9s+5VAZ+pCo16TYMWPBIl+oaNIjgLQxcX0itS6ueeaA+pEfThZpH8WxhFgCiEb8sAJY6MdUKgiIWaQ==", + "isurl": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isurl/-/isurl-1.0.0.tgz", + "integrity": "sha512-1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w==", "requires": { - "append-transform": "^2.0.0" + "has-to-string-tag-x": "^1.2.0", + "is-object": "^1.0.1" } }, - "istanbul-lib-instrument": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.1.tgz", - "integrity": "sha512-imIchxnodll7pvQBYOqUu88EufLCU56LMeFPZZM/fJZ1irYcYdqroaV+ACK1Ila8ls09iEYArp+nqyC6lW1Vfg==", - "requires": { - "@babel/core": "^7.7.5", - "@babel/parser": "^7.7.5", - "@babel/template": "^7.7.4", - "@babel/traverse": "^7.7.4", - "@istanbuljs/schema": "^0.1.2", - "istanbul-lib-coverage": "^3.0.0", - "semver": "^6.3.0" - } - }, - "istanbul-lib-processinfo": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/istanbul-lib-processinfo/-/istanbul-lib-processinfo-2.0.2.tgz", - "integrity": "sha512-kOwpa7z9hme+IBPZMzQ5vdQj8srYgAtaRqeI48NGmAQ+/5yKiHLV0QbYqQpxsdEF0+w14SoB8YbnHKcXE2KnYw==", - "requires": { - "archy": "^1.0.0", - "cross-spawn": "^7.0.0", - "istanbul-lib-coverage": "^3.0.0-alpha.1", - "make-dir": "^3.0.0", - "p-map": "^3.0.0", - "rimraf": "^3.0.0", - "uuid": "^3.3.3" - } - }, - "istanbul-lib-report": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz", - "integrity": "sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==", - "requires": { - "istanbul-lib-coverage": "^3.0.0", - "make-dir": "^3.0.0", - "supports-color": "^7.1.0" - } - }, - "istanbul-lib-source-maps": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.0.tgz", - "integrity": "sha512-c16LpFRkR8vQXyHZ5nLpY35JZtzj1PQY1iZmesUbf1FZHbIupcWfjgOXBY9YHkLEQ6puz1u4Dgj6qmU/DisrZg==", - "requires": { - "debug": "^4.1.1", - "istanbul-lib-coverage": "^3.0.0", - "source-map": "^0.6.1" - }, - "dependencies": { - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" - } - } - }, - "istanbul-reports": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.0.1.tgz", - "integrity": "sha512-Vm9xwCiQ8t2cNNnckyeAV0UdxKpcQUz4nMxsBvIu8n2kmPSiyb5uaF/8LpmKr+yqL/MdOXaX2Nmdo4Qyxium9Q==", - "requires": { - "html-escaper": "^2.0.0", - "istanbul-lib-report": "^3.0.0" - } - }, - "js-tokens": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", - "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==" - }, "js-yaml": { "version": "3.13.1", "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz", @@ -862,33 +792,60 @@ "esprima": "^4.0.0" } }, - "jsesc": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", - "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==" + "jsbn": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", + "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=" }, - "json5": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.2.tgz", - "integrity": "sha512-MoUOQ4WdiN3yxhm7NEVJSJrieAo5hNSLQ5sj05OTRHPL9HOBy8u4Bu88jsC1jvqAdN+E1bJmsUcZH+1HQxliqQ==", - "requires": { - "minimist": "^1.2.5" - } + "json-schema": { + "version": "0.2.5", + "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.5.tgz", + "integrity": "sha512-gWJOWYFrhQ8j7pVm0EM8Slr+EPVq1Phf6lvzvD/WCeqkrx/f2xBI0xOsRRS9xCn3I4vKtP519dvs3TP09r24wQ==" }, - "kuler": { + "json-schema-traverse": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==" + }, + "json-stable-stringify": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/kuler/-/kuler-1.0.1.tgz", - "integrity": "sha512-J9nVUucG1p/skKul6DU3PUZrhs0LPulNaeUOox0IyXDi8S4CztTHs1gQphhuZmzXG7VOQSf6NJfKuzteQLv9gQ==", + "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz", + "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=", "requires": { - "colornames": "^1.1.1" + "jsonify": "~0.0.0" } }, - "locate-path": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", - "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "json-stringify-safe": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", + "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=" + }, + "jsonify": { + "version": "0.0.0", + "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz", + "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=" + }, + "jsprim": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz", + "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=", "requires": { - "p-locate": "^4.1.0" + "assert-plus": "1.0.0", + "extsprintf": "1.3.0", + "json-schema": "0.2.3", + "verror": "1.10.0" + }, + "dependencies": { + "extsprintf": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", + "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=" + }, + "json-schema": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz", + "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=" + } } }, "lodash": { @@ -896,30 +853,89 @@ "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz", "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==" }, - "lodash.flattendeep": { + "lodash.assignin": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/lodash.assignin/-/lodash.assignin-4.2.0.tgz", + "integrity": "sha1-uo31+4QesKPoBEIysOJjqNxqKKI=" + }, + "lodash.bind": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/lodash.bind/-/lodash.bind-4.2.1.tgz", + "integrity": "sha1-euMBfpOWIqwxt9fX3LGzTbFpDTU=" + }, + "lodash.defaults": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz", + "integrity": "sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw=" + }, + "lodash.filter": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/lodash.filter/-/lodash.filter-4.6.0.tgz", + "integrity": "sha1-ZosdSYFgOuHMWm+nYBQ+SAtMSs4=" + }, + "lodash.flatten": { "version": "4.4.0", - "resolved": "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz", - "integrity": "sha1-+wMJF/hqMTTlvJvsDWngAT3f7bI=" + "resolved": "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz", + "integrity": "sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8=" }, - "logform": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/logform/-/logform-2.1.2.tgz", - "integrity": "sha512-+lZh4OpERDBLqjiwDLpAWNQu6KMjnlXH2ByZwCuSqVPJletw0kTWJf5CgSNAUKn1KUkv3m2cUz/LK8zyEy7wzQ==", + "lodash.foreach": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/lodash.foreach/-/lodash.foreach-4.5.0.tgz", + "integrity": "sha1-Gmo16s5AEoDH8G3d7DUWWrJ+PlM=" + }, + "lodash.isfunction": { + "version": "3.0.9", + "resolved": "https://registry.npmjs.org/lodash.isfunction/-/lodash.isfunction-3.0.9.tgz", + "integrity": "sha512-AirXNj15uRIMMPihnkInB4i3NHeb4iBtNg9WRWuK2o31S+ePwwNmDPaTL3o7dTJ+VXNZim7rFs4rxN4YU1oUJw==" + }, + "lodash.map": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/lodash.map/-/lodash.map-4.6.0.tgz", + "integrity": "sha1-dx7Hg540c9nEzeKLGTlMNWL09tM=" + }, + "lodash.merge": { + "version": "4.6.2", + "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", + "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==" + }, + "lodash.pick": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/lodash.pick/-/lodash.pick-4.4.0.tgz", + "integrity": "sha1-UvBWEP/53tQiYRRB7R/BI6AwAbM=" + }, + "lodash.reduce": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/lodash.reduce/-/lodash.reduce-4.6.0.tgz", + "integrity": "sha1-8atrg5KZrUj3hKu/R2WW8DuRTTs=" + }, + "lodash.reject": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/lodash.reject/-/lodash.reject-4.6.0.tgz", + "integrity": "sha1-gNZJLcFHCGS79YNTO2UfQqn1JBU=" + }, + "lodash.some": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/lodash.some/-/lodash.some-4.6.0.tgz", + "integrity": "sha1-G7nzFO9ri63tE7VJFpsqlF62jk0=" + }, + "lowercase-keys": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz", + "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==" + }, + "m3u8stream": { + "version": "0.6.5", + "resolved": "https://registry.npmjs.org/m3u8stream/-/m3u8stream-0.6.5.tgz", + "integrity": "sha512-QZCzhcfUliZfsOboi68QkNcMejPKTEhxE+s1TApvHubDeR8ythm4ViWuYFqgUwZeoHe8q0nsPxOvA3lQvdSzyg==", "requires": { - "colors": "^1.2.1", - "fast-safe-stringify": "^2.0.4", - "fecha": "^2.3.3", - "ms": "^2.1.1", - "triple-beam": "^1.3.0" + "miniget": "^1.6.1", + "sax": "^1.2.4" } }, - "make-dir": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.0.2.tgz", - "integrity": "sha512-rYKABKutXa6vXTXhoV18cBE7PaewPXHe/Bdq4v+ZLMhxbWApkFFplT0LcbMW+6BbjnQXzZ/sAvSE/JdguApG5w==", - "requires": { - "semver": "^6.0.0" - } + "mdurl": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz", + "integrity": "sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4=" }, "mime-db": { "version": "1.43.0", @@ -934,6 +950,16 @@ "mime-db": "1.43.0" } }, + "mimic-response": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz", + "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==" + }, + "miniget": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/miniget/-/miniget-1.7.0.tgz", + "integrity": "sha512-yrgaDSMRzrfYTkudB4Y6xK8pCb7oAH2bvfv6iPY2m6CedZfs9yK4b/ofh0Vzv08hCYXH/HHkoS8an6fkWtOAQA==" + }, "minimatch": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", @@ -947,6 +973,23 @@ "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==" }, + "minipass": { + "version": "2.9.0", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz", + "integrity": "sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==", + "requires": { + "safe-buffer": "^5.1.2", + "yallist": "^3.0.0" + } + }, + "minizlib": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.3.3.tgz", + "integrity": "sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==", + "requires": { + "minipass": "^2.9.0" + } + }, "mkdirp": { "version": "0.5.4", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.4.tgz", @@ -960,59 +1003,119 @@ "resolved": "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz", "integrity": "sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==" }, + "moment-duration-format": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/moment-duration-format/-/moment-duration-format-2.3.2.tgz", + "integrity": "sha512-cBMXjSW+fjOb4tyaVHuaVE/A5TqkukDWiOfxxAjY+PEqmmBQlLwn+8OzwPiG3brouXKY5Un4pBjAeB6UToXHaQ==" + }, "ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" }, + "needle": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/needle/-/needle-2.3.3.tgz", + "integrity": "sha512-EkY0GeSq87rWp1hoq/sH/wnTWgFVhYlnIkbJ0YJFfRgEFlz2RraCjBpFQ+vrEgEdp0ThfyHADmkChEhcb7PKyw==", + "requires": { + "debug": "^3.2.6", + "iconv-lite": "^0.4.4", + "sax": "^1.2.4" + } + }, + "node-addon-api": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-2.0.0.tgz", + "integrity": "sha512-ASCL5U13as7HhOExbT6OlWJJUV/lLzL2voOSP1UVehpRD8FbSrSDjfScK/KwAvVTI5AS6r4VwbOMlIqtvRidnA==" + }, "node-fetch": { "version": "2.6.0", "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz", "integrity": "sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==" }, - "node-preload": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/node-preload/-/node-preload-0.2.1.tgz", - "integrity": "sha512-RM5oyBy45cLEoHqCeh+MNuFAxO0vTFBLskvQbOKnEE7YTTSN4tbN8QWDIPQ6L+WvKsB/qLEGpYe2ZZ9d4W9OIQ==", + "node-pre-gyp": { + "version": "0.14.0", + "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz", + "integrity": "sha512-+CvDC7ZttU/sSt9rFjix/P05iS43qHCOOGzcr3Ry99bXG7VX953+vFyEuph/tfqoYu8dttBkE86JSKBO2OzcxA==", "requires": { - "process-on-spawn": "^1.0.0" + "detect-libc": "^1.0.2", + "mkdirp": "^0.5.1", + "needle": "^2.2.1", + "nopt": "^4.0.1", + "npm-packlist": "^1.1.6", + "npmlog": "^4.0.2", + "rc": "^1.2.7", + "rimraf": "^2.6.1", + "semver": "^5.3.0", + "tar": "^4.4.2" } }, - "nyc": { - "version": "15.0.0", - "resolved": "https://registry.npmjs.org/nyc/-/nyc-15.0.0.tgz", - "integrity": "sha512-qcLBlNCKMDVuKb7d1fpxjPR8sHeMVX0CHarXAVzrVWoFrigCkYR8xcrjfXSPi5HXM7EU78L6ywO7w1c5rZNCNg==", + "nopt": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz", + "integrity": "sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==", "requires": { - "@istanbuljs/load-nyc-config": "^1.0.0", - "@istanbuljs/schema": "^0.1.2", - "caching-transform": "^4.0.0", - "convert-source-map": "^1.7.0", - "decamelize": "^1.2.0", - "find-cache-dir": "^3.2.0", - "find-up": "^4.1.0", - "foreground-child": "^2.0.0", - "glob": "^7.1.6", - "istanbul-lib-coverage": "^3.0.0", - "istanbul-lib-hook": "^3.0.0", - "istanbul-lib-instrument": "^4.0.0", - "istanbul-lib-processinfo": "^2.0.2", - "istanbul-lib-report": "^3.0.0", - "istanbul-lib-source-maps": "^4.0.0", - "istanbul-reports": "^3.0.0", - "js-yaml": "^3.13.1", - "make-dir": "^3.0.0", - "node-preload": "^0.2.0", - "p-map": "^3.0.0", - "process-on-spawn": "^1.0.0", - "resolve-from": "^5.0.0", - "rimraf": "^3.0.0", - "signal-exit": "^3.0.2", - "spawn-wrap": "^2.0.0", - "test-exclude": "^6.0.0", - "uuid": "^3.3.3", - "yargs": "^15.0.2" + "abbrev": "1", + "osenv": "^0.1.4" } }, + "npm-bundled": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.1.1.tgz", + "integrity": "sha512-gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA==", + "requires": { + "npm-normalize-package-bin": "^1.0.1" + } + }, + "npm-normalize-package-bin": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz", + "integrity": "sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==" + }, + "npm-packlist": { + "version": "1.4.8", + "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.8.tgz", + "integrity": "sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A==", + "requires": { + "ignore-walk": "^3.0.1", + "npm-bundled": "^1.0.1", + "npm-normalize-package-bin": "^1.0.1" + } + }, + "npmlog": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz", + "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==", + "requires": { + "are-we-there-yet": "~1.1.2", + "console-control-strings": "~1.1.0", + "gauge": "~2.7.3", + "set-blocking": "~2.0.0" + } + }, + "nth-check": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz", + "integrity": "sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==", + "requires": { + "boolbase": "~1.0.0" + } + }, + "number-is-nan": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", + "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=" + }, + "oauth-sign": { + "version": "0.9.0", + "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz", + "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==" + }, + "object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" + }, "once": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", @@ -1021,410 +1124,113 @@ "wrappy": "1" } }, - "one-time": { - "version": "0.0.4", - "resolved": "https://registry.npmjs.org/one-time/-/one-time-0.0.4.tgz", - "integrity": "sha1-+M33eISCb+Tf+T46nMN7HkSAdC4=" + "os-homedir": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", + "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=" }, - "p-limit": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.2.tgz", - "integrity": "sha512-WGR+xHecKTr7EbUEhyLSh5Dube9JtdiG78ufaeLxTgpudf/20KqyMioIUZJAezlTIi6evxuoUs9YXc11cU+yzQ==", + "os-tmpdir": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", + "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=" + }, + "osenv": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz", + "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==", "requires": { - "p-try": "^2.0.0" + "os-homedir": "^1.0.0", + "os-tmpdir": "^1.0.0" } }, - "p-locate": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", - "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "p-cancelable": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-0.3.0.tgz", + "integrity": "sha512-RVbZPLso8+jFeq1MfNvgXtCRED2raz/dKpacfTNxsx6pLEpEomM7gah6VeHSYV3+vo0OAi4MkArtQcWWXuQoyw==" + }, + "p-finally": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz", + "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=" + }, + "p-timeout": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-1.2.1.tgz", + "integrity": "sha1-XrOzU7f86Z8QGhA4iAuwVOu+o4Y=", "requires": { - "p-limit": "^2.2.0" + "p-finally": "^1.0.0" } }, - "p-map": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/p-map/-/p-map-3.0.0.tgz", - "integrity": "sha512-d3qXVTF/s+W+CdJ5A29wywV2n8CQQYahlgz2bFiA+4eVNJbHJodPZ+/gXwPGh0bOqA+j8S+6+ckmvLGPk1QpxQ==", - "requires": { - "aggregate-error": "^3.0.0" - } - }, - "p-try": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", - "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==" - }, - "package-hash": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/package-hash/-/package-hash-4.0.0.tgz", - "integrity": "sha512-whdkPIooSu/bASggZ96BWVvZTRMOFxnyUG5PnTSGKoJE2gd5mbVNmR2Nj20QFzxYYgAXpoqC+AiXzl+UMRh7zQ==", - "requires": { - "graceful-fs": "^4.1.15", - "hasha": "^5.0.0", - "lodash.flattendeep": "^4.4.0", - "release-zalgo": "^1.0.0" - } - }, - "path": { - "version": "0.12.7", - "resolved": "https://registry.npmjs.org/path/-/path-0.12.7.tgz", - "integrity": "sha1-1NwqUGxM4hl+tIHr/NWzbAFAsQ8=", - "requires": { - "process": "^0.11.1", - "util": "^0.10.3" - } - }, - "path-exists": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", - "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==" - }, "path-is-absolute": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=" }, - "path-key": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", - "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==" + "performance-now": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", + "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=" }, - "path-parse": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz", - "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==" - }, - "pkg-dir": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", - "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", - "requires": { - "find-up": "^4.0.0" - } + "prepend-http": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz", + "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=" }, "prism-media": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/prism-media/-/prism-media-1.2.1.tgz", "integrity": "sha512-R3EbKwJiYlTvGwcG1DpUt+06DsxOGS5W4AMEHT7oVOjG93MjpdhGX1whHyjnqknylLMupKAsKMEXcTNRbPe6Vw==" }, - "process": { - "version": "0.11.10", - "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", - "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=" - }, "process-nextick-args": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==" }, - "process-on-spawn": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/process-on-spawn/-/process-on-spawn-1.0.0.tgz", - "integrity": "sha512-1WsPDsUSMmZH5LeMLegqkPDrsGgsWwk1Exipy2hvB0o/F0ASzbpIctSCcZIK1ykJvtTJULEH+20WOFjMvGnCTg==", + "psl": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz", + "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==" + }, + "punycode": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", + "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==" + }, + "qs": { + "version": "6.9.3", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.3.tgz", + "integrity": "sha512-EbZYNarm6138UKKq46tdx08Yo/q9ZhFoAXAI1meAFd2GtbRDhbZY2WQSICskT0c5q99aFzLG1D4nvTk9tqfXIw==" + }, + "randomcolor": { + "version": "0.5.4", + "resolved": "https://registry.npmjs.org/randomcolor/-/randomcolor-0.5.4.tgz", + "integrity": "sha512-nYd4nmTuuwMFzHL6W+UWR5fNERGZeVauho8mrJDUSXdNDbao4rbrUwhuLgKC/j8VCS5+34Ria8CsTDuBjrIrQA==" + }, + "rc": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz", + "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==", "requires": { - "fromentries": "^1.2.0" + "deep-extend": "^0.6.0", + "ini": "~1.3.0", + "minimist": "^1.2.0", + "strip-json-comments": "~2.0.1" } }, "readable-stream": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", - "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", + "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", "requires": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - } - }, - "release-zalgo": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/release-zalgo/-/release-zalgo-1.0.0.tgz", - "integrity": "sha1-CXALflB0Mpc5Mw5TXFqQ+2eFFzA=", - "requires": { - "es6-error": "^4.0.1" - } - }, - "require-directory": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", - "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=" - }, - "require-main-filename": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz", - "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==" - }, - "resolve": { - "version": "1.15.1", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.15.1.tgz", - "integrity": "sha512-84oo6ZTtoTUpjgNEr5SJyzQhzL72gaRodsSfyxC/AXRvwu0Yse9H8eF9IpGo7b8YetZhlI6v7ZQ6bKBFV/6S7w==", - "requires": { - "path-parse": "^1.0.6" - } - }, - "resolve-from": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", - "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==" - }, - "rimraf": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", - "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", - "requires": { - "glob": "^7.1.3" - } - }, - "safe-buffer": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz", - "integrity": "sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg==" - }, - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" - }, - "set-blocking": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", - "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=" - }, - "setimmediate": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz", - "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=" - }, - "shebang-command": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", - "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", - "requires": { - "shebang-regex": "^3.0.0" - } - }, - "shebang-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", - "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==" - }, - "signal-exit": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz", - "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==" - }, - "simple-swizzle": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz", - "integrity": "sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo=", - "requires": { - "is-arrayish": "^0.3.1" - } - }, - "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=" - }, - "spawn-wrap": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/spawn-wrap/-/spawn-wrap-2.0.0.tgz", - "integrity": "sha512-EeajNjfN9zMnULLwhZZQU3GWBoFNkbngTUPfaawT4RkMiviTxcX0qfhVbGey39mfctfDHkWtuecgQ8NJcyQWHg==", - "requires": { - "foreground-child": "^2.0.0", - "is-windows": "^1.0.2", - "make-dir": "^3.0.0", - "rimraf": "^3.0.0", - "signal-exit": "^3.0.2", - "which": "^2.0.1" - } - }, - "sprintf-js": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", - "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=" - }, - "stack-trace": { - "version": "0.0.10", - "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz", - "integrity": "sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=" - }, - "string-width": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz", - "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==", - "requires": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.0" - } - }, - "string_decoder": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", - "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", - "requires": { - "safe-buffer": "~5.2.0" - } - }, - "strip-ansi": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", - "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", - "requires": { - "ansi-regex": "^5.0.0" - } - }, - "strip-bom": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz", - "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==" - }, - "supports-color": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", - "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", - "requires": { - "has-flag": "^4.0.0" - } - }, - "test-exclude": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz", - "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==", - "requires": { - "@istanbuljs/schema": "^0.1.2", - "glob": "^7.1.4", - "minimatch": "^3.0.4" - } - }, - "text-hex": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/text-hex/-/text-hex-1.0.0.tgz", - "integrity": "sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg==" - }, - "tinytim": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/tinytim/-/tinytim-0.1.1.tgz", - "integrity": "sha1-yWih5VWa2VUyJO92J7qzTjyu+Kg=" - }, - "to-fast-properties": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", - "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=" - }, - "tracer": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/tracer/-/tracer-1.0.2.tgz", - "integrity": "sha512-ukzih7M8odyOW97hKIj0pXZs8k4lCAiW4jBO6oUtZXx7RTMzrsoAMP/YHILYAu9BtjPL7GV7YJAlxeZ6GNx7YQ==", - "requires": { - "colors": "1.4.0", - "dateformat": "3.0.3", - "mkdirp": "^0.5.1", - "nyc": "^15.0.0", - "tinytim": "0.1.1" - } - }, - "triple-beam": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/triple-beam/-/triple-beam-1.3.0.tgz", - "integrity": "sha512-XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw==" - }, - "tweetnacl": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-1.0.3.tgz", - "integrity": "sha512-6rt+RN7aOi1nGMyC4Xa5DdYiukl2UWCbcJft7YhxReBGQD7OAM8Pbxw6YMo4r2diNEA8FEmu32YOn9rhaiE5yw==" - }, - "type-fest": { - "version": "0.8.1", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz", - "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==" - }, - "typedarray-to-buffer": { - "version": "3.1.5", - "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz", - "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==", - "requires": { - "is-typedarray": "^1.0.0" - } - }, - "util": { - "version": "0.10.4", - "resolved": "https://registry.npmjs.org/util/-/util-0.10.4.tgz", - "integrity": "sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==", - "requires": { - "inherits": "2.0.3" + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" }, "dependencies": { - "inherits": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" - } - } - }, - "util-deprecate": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" - }, - "uuid": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", - "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==" - }, - "which": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", - "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", - "requires": { - "isexe": "^2.0.0" - } - }, - "which-module": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", - "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=" - }, - "winston": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/winston/-/winston-3.2.1.tgz", - "integrity": "sha512-zU6vgnS9dAWCEKg/QYigd6cgMVVNwyTzKs81XZtTFuRwJOcDdBg7AU0mXVyNbs7O5RH2zdv+BdNZUlx7mXPuOw==", - "requires": { - "async": "^2.6.1", - "diagnostics": "^1.1.1", - "is-stream": "^1.1.0", - "logform": "^2.1.1", - "one-time": "0.0.4", - "readable-stream": "^3.1.1", - "stack-trace": "0.0.x", - "triple-beam": "^1.3.0", - "winston-transport": "^4.3.0" - } - }, - "winston-transport": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/winston-transport/-/winston-transport-4.3.0.tgz", - "integrity": "sha512-B2wPuwUi3vhzn/51Uukcao4dIduEiPOcOt9HJ3QeaXgkJ5Z7UwpBzxS4ZGNHtrxrUvTwemsQiSys0ihOf8Mp1A==", - "requires": { - "readable-stream": "^2.3.6", - "triple-beam": "^1.2.0" - }, - "dependencies": { - "readable-stream": { - "version": "2.3.7", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", - "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" - } - }, "safe-buffer": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", @@ -1440,14 +1246,354 @@ } } }, - "wrap-ansi": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", - "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==", + "relevant-urban": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/relevant-urban/-/relevant-urban-2.0.0.tgz", + "integrity": "sha1-abvU9DpnSQjbkI4n8jCWyw8kuLk=", "requires": { - "ansi-styles": "^4.0.0", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0" + "snekfetch": "^3.0.1" + } + }, + "request": { + "version": "2.88.2", + "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz", + "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==", + "requires": { + "aws-sign2": "~0.7.0", + "aws4": "^1.8.0", + "caseless": "~0.12.0", + "combined-stream": "~1.0.6", + "extend": "~3.0.2", + "forever-agent": "~0.6.1", + "form-data": "~2.3.2", + "har-validator": "~5.1.3", + "http-signature": "~1.2.0", + "is-typedarray": "~1.0.0", + "isstream": "~0.1.2", + "json-stringify-safe": "~5.0.1", + "mime-types": "~2.1.19", + "oauth-sign": "~0.9.0", + "performance-now": "^2.1.0", + "qs": "~6.5.2", + "safe-buffer": "^5.1.2", + "tough-cookie": "~2.5.0", + "tunnel-agent": "^0.6.0", + "uuid": "^3.3.2" + }, + "dependencies": { + "form-data": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz", + "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==", + "requires": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.6", + "mime-types": "^2.1.12" + } + }, + "http-signature": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", + "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=", + "requires": { + "assert-plus": "^1.0.0", + "jsprim": "^1.2.2", + "sshpk": "^1.7.0" + } + }, + "qs": { + "version": "6.5.2", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz", + "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==" + } + } + }, + "request-promise": { + "version": "4.2.5", + "resolved": "https://registry.npmjs.org/request-promise/-/request-promise-4.2.5.tgz", + "integrity": "sha512-ZgnepCykFdmpq86fKGwqntyTiUrHycALuGggpyCZwMvGaZWgxW6yagT0FHkgo5LzYvOaCNvxYwWYIjevSH1EDg==", + "requires": { + "bluebird": "^3.5.0", + "request-promise-core": "1.1.3", + "stealthy-require": "^1.1.1", + "tough-cookie": "^2.3.3" + } + }, + "request-promise-core": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.3.tgz", + "integrity": "sha512-QIs2+ArIGQVp5ZYbWD5ZLCY29D5CfWizP8eWnm8FoGD1TX61veauETVQbrV60662V0oFBkrDOuaBI8XgtuyYAQ==", + "requires": { + "lodash": "^4.17.15" + } + }, + "require-all": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/require-all/-/require-all-2.2.0.tgz", + "integrity": "sha1-tEIMIzrAKC0P9Jsnf7iAqLXeCJQ=" + }, + "rimraf": { + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", + "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", + "requires": { + "glob": "^7.1.3" + } + }, + "safe-buffer": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz", + "integrity": "sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg==" + }, + "safer-buffer": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" + }, + "sax": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", + "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==" + }, + "semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" + }, + "set-blocking": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", + "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=" + }, + "setimmediate": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz", + "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=" + }, + "signal-exit": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz", + "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==" + }, + "snekfetch": { + "version": "3.6.4", + "resolved": "https://registry.npmjs.org/snekfetch/-/snekfetch-3.6.4.tgz", + "integrity": "sha512-NjxjITIj04Ffqid5lqr7XdgwM7X61c/Dns073Ly170bPQHLm6jkmelye/eglS++1nfTWktpP6Y2bFXjdPlQqdw==" + }, + "sntp": { + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz", + "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=", + "requires": { + "hoek": "2.x.x" + } + }, + "sprintf-js": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.2.tgz", + "integrity": "sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==" + }, + "sshpk": { + "version": "1.16.1", + "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz", + "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==", + "requires": { + "asn1": "~0.2.3", + "assert-plus": "^1.0.0", + "bcrypt-pbkdf": "^1.0.0", + "dashdash": "^1.12.0", + "ecc-jsbn": "~0.1.1", + "getpass": "^0.1.1", + "jsbn": "~0.1.0", + "safer-buffer": "^2.0.2", + "tweetnacl": "~0.14.0" + }, + "dependencies": { + "tweetnacl": { + "version": "0.14.5", + "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", + "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=" + } + } + }, + "stealthy-require": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz", + "integrity": "sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=" + }, + "string-width": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", + "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", + "requires": { + "code-point-at": "^1.0.0", + "is-fullwidth-code-point": "^1.0.0", + "strip-ansi": "^3.0.0" + } + }, + "string_decoder": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", + "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", + "requires": { + "safe-buffer": "~5.2.0" + } + }, + "stringstream": { + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.6.tgz", + "integrity": "sha512-87GEBAkegbBcweToUrdzf3eLhWNg06FJTebl4BVJz/JgWy8CvEr9dRtX5qWphiynMSQlxxi+QqN0z5T32SLlhA==" + }, + "strip-ansi": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", + "requires": { + "ansi-regex": "^2.0.0" + } + }, + "strip-json-comments": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", + "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=" + }, + "supports-color": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", + "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", + "requires": { + "has-flag": "^4.0.0" + } + }, + "tar": { + "version": "4.4.13", + "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.13.tgz", + "integrity": "sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==", + "requires": { + "chownr": "^1.1.1", + "fs-minipass": "^1.2.5", + "minipass": "^2.8.6", + "minizlib": "^1.2.1", + "mkdirp": "^0.5.0", + "safe-buffer": "^5.1.2", + "yallist": "^3.0.3" + } + }, + "timed-out": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-4.0.1.tgz", + "integrity": "sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8=" + }, + "tough-cookie": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz", + "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==", + "requires": { + "psl": "^1.1.28", + "punycode": "^2.1.1" + } + }, + "tunnel-agent": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", + "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", + "requires": { + "safe-buffer": "^5.0.1" + } + }, + "tweetnacl": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-1.0.3.tgz", + "integrity": "sha512-6rt+RN7aOi1nGMyC4Xa5DdYiukl2UWCbcJft7YhxReBGQD7OAM8Pbxw6YMo4r2diNEA8FEmu32YOn9rhaiE5yw==" + }, + "urban": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/urban/-/urban-0.3.2.tgz", + "integrity": "sha512-B0/cCQNb1XCwHA0YGw1u9IavHMbHe8ruxkUNUlYHobMCAWdk0/gFfOCQQ11CQDmlFu4SUZRoVxrUF3kbE0gdog==", + "requires": { + "commander": ">=0.3.0" + } + }, + "uri-js": { + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz", + "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==", + "requires": { + "punycode": "^2.1.0" + } + }, + "url-parse-lax": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz", + "integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=", + "requires": { + "prepend-http": "^1.0.1" + } + }, + "url-to-options": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/url-to-options/-/url-to-options-1.0.1.tgz", + "integrity": "sha1-FQWgOiiaSMvXpDTvuu7FBV9WM6k=" + }, + "url-unshort": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/url-unshort/-/url-unshort-5.0.0.tgz", + "integrity": "sha1-YkqSuTFg/aXoLhdevoGBVO077Xg=", + "requires": { + "cheerio": "^0.22.0", + "deepmerge": "^1.3.1", + "escape-string-regexp": "^1.0.5", + "got": "^7.0.0", + "is-google-domain": "^1.0.0", + "js-yaml": "^3.7.0", + "mdurl": "^1.0.0", + "punycode": "^2.0.1", + "require-all": "^2.0.0" + } + }, + "url-unshorten": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/url-unshorten/-/url-unshorten-1.0.6.tgz", + "integrity": "sha512-HIdtwDnUbOUR5pD6IqdTnK58qvEGmLjPoPWi1s83K/h+O/GPS5GmFivK25MyVNbn8yfmOJnfdQD7d6RPeu8S4A==", + "requires": { + "request": "^2.88.0" + } + }, + "util-deprecate": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" + }, + "uuid": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", + "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==" + }, + "verror": { + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", + "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", + "requires": { + "assert-plus": "^1.0.0", + "core-util-is": "1.0.2", + "extsprintf": "^1.2.0" + } + }, + "weather-js": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/weather-js/-/weather-js-2.0.0.tgz", + "integrity": "sha1-DZvNsFpPhNBrm585kAKKYB6kofw=", + "requires": { + "request": "2.x.x", + "xml2js": "0.4.x" + } + }, + "wide-align": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz", + "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==", + "requires": { + "string-width": "^1.0.2 || 2" } }, "wrappy": { @@ -1455,52 +1601,284 @@ "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" }, - "write-file-atomic": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz", - "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==", - "requires": { - "imurmurhash": "^0.1.4", - "is-typedarray": "^1.0.0", - "signal-exit": "^3.0.2", - "typedarray-to-buffer": "^3.1.5" - } - }, "ws": { "version": "7.2.3", "resolved": "https://registry.npmjs.org/ws/-/ws-7.2.3.tgz", "integrity": "sha512-HTDl9G9hbkNDk98naoR/cHDws7+EyYMOdL1BmjsZXRUjf7d+MficC4B7HLUPlSiho0vg+CWKrGIt/VJBd1xunQ==" }, - "y18n": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz", - "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==" - }, - "yargs": { - "version": "15.3.1", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.3.1.tgz", - "integrity": "sha512-92O1HWEjw27sBfgmXiixJWT5hRBp2eobqXicLtPBIDBhYB+1HpwZlXmbW2luivBJHBzki+7VyCLRtAkScbTBQA==", + "xml2js": { + "version": "0.4.23", + "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.23.tgz", + "integrity": "sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==", "requires": { - "cliui": "^6.0.0", - "decamelize": "^1.2.0", - "find-up": "^4.1.0", - "get-caller-file": "^2.0.1", - "require-directory": "^2.1.1", - "require-main-filename": "^2.0.0", - "set-blocking": "^2.0.0", - "string-width": "^4.2.0", - "which-module": "^2.0.0", - "y18n": "^4.0.0", - "yargs-parser": "^18.1.1" + "sax": ">=0.6.0", + "xmlbuilder": "~11.0.0" } }, - "yargs-parser": { - "version": "18.1.2", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.2.tgz", - "integrity": "sha512-hlIPNR3IzC1YuL1c2UwwDKpXlNFBqD1Fswwh1khz5+d8Cq/8yc/Mn0i+rQXduu8hcrFKvO7Eryk+09NecTQAAQ==", + "xmlbuilder": { + "version": "11.0.1", + "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz", + "integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==" + }, + "yallist": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", + "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==" + }, + "youtube-info": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/youtube-info/-/youtube-info-1.3.2.tgz", + "integrity": "sha512-LnBZxCuCof0bwFNtLSxklLYgaU1XR8OK+cGieWyPS10rn3P0TMHdIikRpO/W/duE9SR9JfzOk8ThgwDgx0B3Vw==", "requires": { - "camelcase": "^5.0.0", - "decamelize": "^1.2.0" + "cheerio": "^0.19.0", + "debug": "^2.2.0", + "lodash.isfunction": "^3.0.6", + "request": "2.81.0", + "request-promise": "^4.2.2" + }, + "dependencies": { + "ajv": { + "version": "4.11.8", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz", + "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=", + "requires": { + "co": "^4.6.0", + "json-stable-stringify": "^1.0.1" + } + }, + "assert-plus": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz", + "integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ=" + }, + "aws-sign2": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz", + "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8=" + }, + "cheerio": { + "version": "0.19.0", + "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-0.19.0.tgz", + "integrity": "sha1-dy5wFfLuKZZQltcepBdbdas1SSU=", + "requires": { + "css-select": "~1.0.0", + "dom-serializer": "~0.1.0", + "entities": "~1.1.1", + "htmlparser2": "~3.8.1", + "lodash": "^3.2.0" + } + }, + "css-select": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.0.0.tgz", + "integrity": "sha1-sRIcpRhI3SZOIkTQWM7iVN7rRLA=", + "requires": { + "boolbase": "~1.0.0", + "css-what": "1.0", + "domutils": "1.4", + "nth-check": "~1.0.0" + } + }, + "css-what": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/css-what/-/css-what-1.0.0.tgz", + "integrity": "sha1-18wt9FGAZm+Z0rFEYmOUaeAPc2w=" + }, + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "requires": { + "ms": "2.0.0" + } + }, + "domhandler": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.3.0.tgz", + "integrity": "sha1-LeWaCCLVAn+r/28DLCsloqir5zg=", + "requires": { + "domelementtype": "1" + } + }, + "domutils": { + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.4.3.tgz", + "integrity": "sha1-CGVRN5bGswYDGFDhdVFrr4C3Km8=", + "requires": { + "domelementtype": "1" + } + }, + "form-data": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz", + "integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=", + "requires": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.5", + "mime-types": "^2.1.12" + } + }, + "har-schema": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz", + "integrity": "sha1-0mMTX0MwfALGAq/I/pWXDAFRNp4=" + }, + "har-validator": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz", + "integrity": "sha1-M0gdDxu/9gDdID11gSpqX7oALio=", + "requires": { + "ajv": "^4.9.1", + "har-schema": "^1.0.5" + } + }, + "htmlparser2": { + "version": "3.8.3", + "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.3.tgz", + "integrity": "sha1-mWwosZFRaovoZQGn15dX5ccMEGg=", + "requires": { + "domelementtype": "1", + "domhandler": "2.3", + "domutils": "1.5", + "entities": "1.0", + "readable-stream": "1.1" + }, + "dependencies": { + "domutils": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz", + "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=", + "requires": { + "dom-serializer": "0", + "domelementtype": "1" + } + }, + "entities": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-1.0.0.tgz", + "integrity": "sha1-sph6o4ITR/zeZCsk/fyeT7cSvyY=" + } + } + }, + "http-signature": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz", + "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=", + "requires": { + "assert-plus": "^0.2.0", + "jsprim": "^1.2.2", + "sshpk": "^1.7.0" + } + }, + "isarray": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", + "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=" + }, + "lodash": { + "version": "3.10.1", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz", + "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=" + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + }, + "oauth-sign": { + "version": "0.8.2", + "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz", + "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=" + }, + "performance-now": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz", + "integrity": "sha1-M+8wxcd9TqIcWlOGnZG1bY8lVeU=" + }, + "punycode": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", + "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=" + }, + "qs": { + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz", + "integrity": "sha1-E+JtKK1rD/qpExLNO/cI7TUecjM=" + }, + "readable-stream": { + "version": "1.1.14", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", + "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=", + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.1", + "isarray": "0.0.1", + "string_decoder": "~0.10.x" + } + }, + "request": { + "version": "2.81.0", + "resolved": "https://registry.npmjs.org/request/-/request-2.81.0.tgz", + "integrity": "sha1-xpKJRqDgbF+Nb4qTM0af/aRimKA=", + "requires": { + "aws-sign2": "~0.6.0", + "aws4": "^1.2.1", + "caseless": "~0.12.0", + "combined-stream": "~1.0.5", + "extend": "~3.0.0", + "forever-agent": "~0.6.1", + "form-data": "~2.1.1", + "har-validator": "~4.2.1", + "hawk": "~3.1.3", + "http-signature": "~1.1.0", + "is-typedarray": "~1.0.0", + "isstream": "~0.1.2", + "json-stringify-safe": "~5.0.1", + "mime-types": "~2.1.7", + "oauth-sign": "~0.8.1", + "performance-now": "^0.2.0", + "qs": "~6.4.0", + "safe-buffer": "^5.0.1", + "stringstream": "~0.0.4", + "tough-cookie": "~2.3.0", + "tunnel-agent": "^0.6.0", + "uuid": "^3.0.0" + } + }, + "string_decoder": { + "version": "0.10.31", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", + "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=" + }, + "tough-cookie": { + "version": "2.3.4", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz", + "integrity": "sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==", + "requires": { + "punycode": "^1.4.1" + } + } + } + }, + "ytdl-core": { + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/ytdl-core/-/ytdl-core-1.0.9.tgz", + "integrity": "sha512-HhFeLfjXU34h0FNHmSkSpKygdaYijSt8VNsC770VYBRFb+dyUKcm11cIKxu2MUSwT9znISZ0k1wFdaV/N5VW+Q==", + "requires": { + "html-entities": "^1.1.3", + "m3u8stream": "^0.6.3", + "miniget": "^1.6.0", + "sax": "^1.1.3" + } + }, + "ytdl-core-discord": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/ytdl-core-discord/-/ytdl-core-discord-1.1.0.tgz", + "integrity": "sha512-uiaZWa9UG+he1F9p7Si9H6Tieyxd9dEhLi4958mHuebudQSEEPaaJHUEbFikcpB++5ogzynVOcvdeC+LFJGgEw==", + "requires": { + "@types/node": "^13.5.3", + "prism-media": "^1.0.1", + "ytdl-core": "^1.0.3" } } } From c570f549e5b277a85b5c065c32e28c3369455144 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Hor=C3=A1=C4=8Dek?= Date: Tue, 31 Mar 2020 13:40:51 +0200 Subject: [PATCH 018/156] changes --- index.js | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/index.js b/index.js index 9999bff..d3c9c8c 100644 --- a/index.js +++ b/index.js @@ -7,15 +7,12 @@ if (Number(process.version.slice(1).split('.')[0]) < 12) { process.exit() } -// Load environment variables / config +// Libraries const fs = require('fs') const colors = require('colors') const Discord = require('discord.js') const client = new Discord.Client({ disabledEvents: ['TYPING_START'] }) -// Load functions module -require('./modules/functions')(client) - // Logger client.logger = require('tracer').colorConsole({ format: [ @@ -52,6 +49,9 @@ if (fs.existsSync('./config.js') === false) { require('dotenv').config() client.config = require('./config') +// Load functions module +require('./modules/functions')(client) + // Command/alias cache client.commands = new Discord.Collection() client.cooldown = new Discord.Collection() @@ -62,7 +62,9 @@ const init = async () => { // Load events fs.readdir('./events', (err, files) => { if (err) { - client.logger.error('Failed to get files in events directory! ' + err); + client.logger.fatal('Failed to get files in events directory! ' + err); + + process.exit(); return; }; @@ -80,7 +82,9 @@ const init = async () => { // Load commands fs.readdir('./commands', (err, files) => { if (err) { - client.logger.error('Failed to get files in commands directory! ' + err); + client.logger.fatal('Failed to get files in commands directory! ' + err); + + process.exit(); return; }; From 709cf975cb84ce09dcc43ad216c89ac654c88add Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Hor=C3=A1=C4=8Dek?= Date: Tue, 31 Mar 2020 13:42:08 +0200 Subject: [PATCH 019/156] packages --- package-lock.json | 1029 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 1029 insertions(+) diff --git a/package-lock.json b/package-lock.json index a8d45c7..408c780 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2,6 +2,264 @@ "requires": true, "lockfileVersion": 1, "dependencies": { + "@babel/code-frame": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz", + "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==", + "requires": { + "@babel/highlight": "^7.8.3" + } + }, + "@babel/core": { + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.9.0.tgz", + "integrity": "sha512-kWc7L0fw1xwvI0zi8OKVBuxRVefwGOrKSQMvrQ3dW+bIIavBY3/NpXmpjMy7bQnLgwgzWQZ8TlM57YHpHNHz4w==", + "requires": { + "@babel/code-frame": "^7.8.3", + "@babel/generator": "^7.9.0", + "@babel/helper-module-transforms": "^7.9.0", + "@babel/helpers": "^7.9.0", + "@babel/parser": "^7.9.0", + "@babel/template": "^7.8.6", + "@babel/traverse": "^7.9.0", + "@babel/types": "^7.9.0", + "convert-source-map": "^1.7.0", + "debug": "^4.1.0", + "gensync": "^1.0.0-beta.1", + "json5": "^2.1.2", + "lodash": "^4.17.13", + "resolve": "^1.3.2", + "semver": "^5.4.1", + "source-map": "^0.5.0" + }, + "dependencies": { + "debug": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "requires": { + "ms": "^2.1.1" + } + } + } + }, + "@babel/generator": { + "version": "7.9.4", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.9.4.tgz", + "integrity": "sha512-rjP8ahaDy/ouhrvCoU1E5mqaitWrxwuNGU+dy1EpaoK48jZay4MdkskKGIMHLZNewg8sAsqpGSREJwP0zH3YQA==", + "requires": { + "@babel/types": "^7.9.0", + "jsesc": "^2.5.1", + "lodash": "^4.17.13", + "source-map": "^0.5.0" + } + }, + "@babel/helper-function-name": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.8.3.tgz", + "integrity": "sha512-BCxgX1BC2hD/oBlIFUgOCQDOPV8nSINxCwM3o93xP4P9Fq6aV5sgv2cOOITDMtCfQ+3PvHp3l689XZvAM9QyOA==", + "requires": { + "@babel/helper-get-function-arity": "^7.8.3", + "@babel/template": "^7.8.3", + "@babel/types": "^7.8.3" + } + }, + "@babel/helper-get-function-arity": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz", + "integrity": "sha512-FVDR+Gd9iLjUMY1fzE2SR0IuaJToR4RkCDARVfsBBPSP53GEqSFjD8gNyxg246VUyc/ALRxFaAK8rVG7UT7xRA==", + "requires": { + "@babel/types": "^7.8.3" + } + }, + "@babel/helper-member-expression-to-functions": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.8.3.tgz", + "integrity": "sha512-fO4Egq88utkQFjbPrSHGmGLFqmrshs11d46WI+WZDESt7Wu7wN2G2Iu+NMMZJFDOVRHAMIkB5SNh30NtwCA7RA==", + "requires": { + "@babel/types": "^7.8.3" + } + }, + "@babel/helper-module-imports": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.8.3.tgz", + "integrity": "sha512-R0Bx3jippsbAEtzkpZ/6FIiuzOURPcMjHp+Z6xPe6DtApDJx+w7UYyOLanZqO8+wKR9G10s/FmHXvxaMd9s6Kg==", + "requires": { + "@babel/types": "^7.8.3" + } + }, + "@babel/helper-module-transforms": { + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.9.0.tgz", + "integrity": "sha512-0FvKyu0gpPfIQ8EkxlrAydOWROdHpBmiCiRwLkUiBGhCUPRRbVD2/tm3sFr/c/GWFrQ/ffutGUAnx7V0FzT2wA==", + "requires": { + "@babel/helper-module-imports": "^7.8.3", + "@babel/helper-replace-supers": "^7.8.6", + "@babel/helper-simple-access": "^7.8.3", + "@babel/helper-split-export-declaration": "^7.8.3", + "@babel/template": "^7.8.6", + "@babel/types": "^7.9.0", + "lodash": "^4.17.13" + } + }, + "@babel/helper-optimise-call-expression": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.8.3.tgz", + "integrity": "sha512-Kag20n86cbO2AvHca6EJsvqAd82gc6VMGule4HwebwMlwkpXuVqrNRj6CkCV2sKxgi9MyAUnZVnZ6lJ1/vKhHQ==", + "requires": { + "@babel/types": "^7.8.3" + } + }, + "@babel/helper-replace-supers": { + "version": "7.8.6", + "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.8.6.tgz", + "integrity": "sha512-PeMArdA4Sv/Wf4zXwBKPqVj7n9UF/xg6slNRtZW84FM7JpE1CbG8B612FyM4cxrf4fMAMGO0kR7voy1ForHHFA==", + "requires": { + "@babel/helper-member-expression-to-functions": "^7.8.3", + "@babel/helper-optimise-call-expression": "^7.8.3", + "@babel/traverse": "^7.8.6", + "@babel/types": "^7.8.6" + } + }, + "@babel/helper-simple-access": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.8.3.tgz", + "integrity": "sha512-VNGUDjx5cCWg4vvCTR8qQ7YJYZ+HBjxOgXEl7ounz+4Sn7+LMD3CFrCTEU6/qXKbA2nKg21CwhhBzO0RpRbdCw==", + "requires": { + "@babel/template": "^7.8.3", + "@babel/types": "^7.8.3" + } + }, + "@babel/helper-split-export-declaration": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz", + "integrity": "sha512-3x3yOeyBhW851hroze7ElzdkeRXQYQbFIb7gLK1WQYsw2GWDay5gAJNw1sWJ0VFP6z5J1whqeXH/WCdCjZv6dA==", + "requires": { + "@babel/types": "^7.8.3" + } + }, + "@babel/helper-validator-identifier": { + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.0.tgz", + "integrity": "sha512-6G8bQKjOh+of4PV/ThDm/rRqlU7+IGoJuofpagU5GlEl29Vv0RGqqt86ZGRV8ZuSOY3o+8yXl5y782SMcG7SHw==" + }, + "@babel/helpers": { + "version": "7.9.2", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.9.2.tgz", + "integrity": "sha512-JwLvzlXVPjO8eU9c/wF9/zOIN7X6h8DYf7mG4CiFRZRvZNKEF5dQ3H3V+ASkHoIB3mWhatgl5ONhyqHRI6MppA==", + "requires": { + "@babel/template": "^7.8.3", + "@babel/traverse": "^7.9.0", + "@babel/types": "^7.9.0" + } + }, + "@babel/highlight": { + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz", + "integrity": "sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==", + "requires": { + "@babel/helper-validator-identifier": "^7.9.0", + "chalk": "^2.0.0", + "js-tokens": "^4.0.0" + }, + "dependencies": { + "ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "requires": { + "color-convert": "^1.9.0" + } + }, + "chalk": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "requires": { + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" + } + }, + "color-convert": { + "version": "1.9.3", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", + "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", + "requires": { + "color-name": "1.1.3" + } + }, + "color-name": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", + "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=" + }, + "has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=" + }, + "supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, + "@babel/parser": { + "version": "7.9.4", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.9.4.tgz", + "integrity": "sha512-bC49otXX6N0/VYhgOMh4gnP26E9xnDZK3TmbNpxYzzz9BQLBosQwfyOe9/cXUU3txYhTzLCbcqd5c8y/OmCjHA==" + }, + "@babel/template": { + "version": "7.8.6", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.8.6.tgz", + "integrity": "sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg==", + "requires": { + "@babel/code-frame": "^7.8.3", + "@babel/parser": "^7.8.6", + "@babel/types": "^7.8.6" + } + }, + "@babel/traverse": { + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.0.tgz", + "integrity": "sha512-jAZQj0+kn4WTHO5dUZkZKhbFrqZE7K5LAQ5JysMnmvGij+wOdr+8lWqPeW0BcF4wFwrEXXtdGO7wcV6YPJcf3w==", + "requires": { + "@babel/code-frame": "^7.8.3", + "@babel/generator": "^7.9.0", + "@babel/helper-function-name": "^7.8.3", + "@babel/helper-split-export-declaration": "^7.8.3", + "@babel/parser": "^7.9.0", + "@babel/types": "^7.9.0", + "debug": "^4.1.0", + "globals": "^11.1.0", + "lodash": "^4.17.13" + }, + "dependencies": { + "debug": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "requires": { + "ms": "^2.1.1" + } + } + } + }, + "@babel/types": { + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.0.tgz", + "integrity": "sha512-BS9JKfXkzzJl8RluW4JGknzpiUV7ZrvTayM6yfqLTVBEnFtyowVIOu6rqxRd5cVO6yGoWf4T8u8dgK9oB+GCng==", + "requires": { + "@babel/helper-validator-identifier": "^7.9.0", + "lodash": "^4.17.13", + "to-fast-properties": "^2.0.0" + } + }, "@discordjs/collection": { "version": "0.1.5", "resolved": "https://registry.npmjs.org/@discordjs/collection/-/collection-0.1.5.tgz", @@ -16,6 +274,22 @@ "node-pre-gyp": "^0.14.0" } }, + "@istanbuljs/load-nyc-config": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.0.0.tgz", + "integrity": "sha512-ZR0rq/f/E4f4XcgnDvtMWXCUJpi8eO0rssVhmztsZqLIEFA9UUP9zmpE0VxlM+kv/E1ul2I876Fwil2ayptDVg==", + "requires": { + "camelcase": "^5.3.1", + "find-up": "^4.1.0", + "js-yaml": "^3.13.1", + "resolve-from": "^5.0.0" + } + }, + "@istanbuljs/schema": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.2.tgz", + "integrity": "sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw==" + }, "@types/color-name": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz", @@ -39,6 +313,15 @@ "event-target-shim": "^5.0.0" } }, + "aggregate-error": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.0.1.tgz", + "integrity": "sha512-quoaXsZ9/BLNae5yiNoUz+Nhkwz83GhWwtYFglcjEQB2NDHCIpApbqXxIFnm4Pq/Nvhrsq5sYJFyohrrxnTGAA==", + "requires": { + "clean-stack": "^2.0.0", + "indent-string": "^4.0.0" + } + }, "ajv": { "version": "6.12.0", "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.0.tgz", @@ -64,11 +347,24 @@ "color-convert": "^2.0.1" } }, + "append-transform": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/append-transform/-/append-transform-2.0.0.tgz", + "integrity": "sha512-7yeyCEurROLQJFv5Xj4lEGTy0borxepjFv1g22oAdqFu//SrAlDl1O1Nxx15SH1RoliUml6p8dwJW9jvZughhg==", + "requires": { + "default-require-extensions": "^3.0.0" + } + }, "aproba": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz", "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==" }, + "archy": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz", + "integrity": "sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=" + }, "are-we-there-yet": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz", @@ -177,6 +473,22 @@ "concat-map": "0.0.1" } }, + "caching-transform": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/caching-transform/-/caching-transform-4.0.0.tgz", + "integrity": "sha512-kpqOvwXnjjN44D89K5ccQC+RUrsy7jB/XLlRrx0D7/2HNcTPqzsb6XgYoErwko6QsV184CA2YgS1fxDiiDZMWA==", + "requires": { + "hasha": "^5.0.0", + "make-dir": "^3.0.0", + "package-hash": "^4.0.0", + "write-file-atomic": "^3.0.0" + } + }, + "camelcase": { + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", + "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==" + }, "caseless": { "version": "0.12.0", "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", @@ -219,6 +531,51 @@ "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz", "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==" }, + "clean-stack": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz", + "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==" + }, + "cliui": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz", + "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==", + "requires": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.0", + "wrap-ansi": "^6.2.0" + }, + "dependencies": { + "ansi-regex": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", + "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==" + }, + "is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==" + }, + "string-width": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz", + "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==", + "requires": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.0" + } + }, + "strip-ansi": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", + "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", + "requires": { + "ansi-regex": "^5.0.0" + } + } + } + }, "co": { "version": "4.6.0", "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", @@ -260,6 +617,11 @@ "resolved": "https://registry.npmjs.org/commander/-/commander-5.0.0.tgz", "integrity": "sha512-JrDGPAKjMGSP1G0DUoaceEJ3DZgAfr/q6X7FVk4+U5KxUSKviYGM2k6zWkfyyBHy5rAtzgYJFa1ro2O9PtoxwQ==" }, + "commondir": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz", + "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=" + }, "concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", @@ -270,11 +632,36 @@ "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=" }, + "convert-source-map": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz", + "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==", + "requires": { + "safe-buffer": "~5.1.1" + }, + "dependencies": { + "safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" + } + } + }, "core-util-is": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" }, + "cross-spawn": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.1.tgz", + "integrity": "sha512-u7v4o84SwFpD32Z8IIcPZ6z1/ie24O6RU3RbtL5Y316l3KuHVPx9ItBgWQ6VlfAFnRnTtMUrsQ9MUUTuEZjogg==", + "requires": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + } + }, "cryptiles": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz", @@ -318,6 +705,11 @@ "assert-plus": "^1.0.0" } }, + "dateformat": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-3.0.3.tgz", + "integrity": "sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==" + }, "dblapi.js": { "version": "2.4.0", "resolved": "https://registry.npmjs.org/dblapi.js/-/dblapi.js-2.4.0.tgz", @@ -331,6 +723,11 @@ "ms": "^2.1.1" } }, + "decamelize": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", + "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=" + }, "decompress-response": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz", @@ -349,6 +746,14 @@ "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-1.5.2.tgz", "integrity": "sha512-95k0GDqvBjZavkuvzx/YqVLv/6YYa17fz6ILMSf7neqQITCPbnfEnQvEgMPNjH4kgobe7+WIL0yJEHku+H3qtQ==" }, + "default-require-extensions": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/default-require-extensions/-/default-require-extensions-3.0.0.tgz", + "integrity": "sha512-ek6DpXq/SCpvjhpFsLFRVtIxJCRw6fUR42lYMVZuUMK7n8eMz4Uh5clckdBjEpLhn/gEBZo7hDJnJcwdKLKQjg==", + "requires": { + "strip-bom": "^4.0.0" + } + }, "delayed-stream": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", @@ -429,6 +834,11 @@ "safer-buffer": "^2.1.0" } }, + "emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" + }, "enmap": { "version": "5.2.4", "resolved": "https://registry.npmjs.org/enmap/-/enmap-5.2.4.tgz", @@ -442,6 +852,11 @@ "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz", "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==" }, + "es6-error": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz", + "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==" + }, "escape-string-regexp": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", @@ -477,6 +892,34 @@ "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==" }, + "find-cache-dir": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.1.tgz", + "integrity": "sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ==", + "requires": { + "commondir": "^1.0.1", + "make-dir": "^3.0.2", + "pkg-dir": "^4.1.0" + } + }, + "find-up": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "requires": { + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" + } + }, + "foreground-child": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-2.0.0.tgz", + "integrity": "sha512-dCIq9FpEcyQyXKCkyzmlPTFNgrCzPudOe+mhvJU5zAtlBnGVy2yKxtfsxK2tQBThwq225jcvBjpw1Gr40uzZCA==", + "requires": { + "cross-spawn": "^7.0.0", + "signal-exit": "^3.0.2" + } + }, "forever-agent": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", @@ -492,6 +935,11 @@ "mime-types": "^2.1.12" } }, + "fromentries": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/fromentries/-/fromentries-1.2.0.tgz", + "integrity": "sha512-33X7H/wdfO99GdRLLgkjUrD4geAFdq/Uv0kl3HD4da6HDixd2GUg8Mw7dahLCV9r/EARkmtYBB6Tch4EEokFTQ==" + }, "fs-minipass": { "version": "1.2.7", "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz", @@ -528,6 +976,16 @@ "wide-align": "^1.1.0" } }, + "gensync": { + "version": "1.0.0-beta.1", + "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.1.tgz", + "integrity": "sha512-r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg==" + }, + "get-caller-file": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", + "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==" + }, "get-stream": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", @@ -559,6 +1017,11 @@ "path-is-absolute": "^1.0.0" } }, + "globals": { + "version": "11.12.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", + "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==" + }, "got": { "version": "7.1.0", "resolved": "https://registry.npmjs.org/got/-/got-7.1.0.tgz", @@ -580,6 +1043,11 @@ "url-to-options": "^1.0.1" } }, + "graceful-fs": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz", + "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==" + }, "har-schema": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz", @@ -617,6 +1085,22 @@ "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=" }, + "hasha": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/hasha/-/hasha-5.2.0.tgz", + "integrity": "sha512-2W+jKdQbAdSIrggA8Q35Br8qKadTrqCTC8+XZvBWepKDK6m9XkX6Iz1a2yh2KP01kzAR/dpuMeUnocoLYDcskw==", + "requires": { + "is-stream": "^2.0.0", + "type-fest": "^0.8.0" + }, + "dependencies": { + "is-stream": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz", + "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==" + } + } + }, "hastebin-gen": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/hastebin-gen/-/hastebin-gen-2.0.5.tgz", @@ -646,6 +1130,11 @@ "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.2.1.tgz", "integrity": "sha1-DfKTUfByEWNRXfueVUPl9u7VFi8=" }, + "html-escaper": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz", + "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==" + }, "htmlparser2": { "version": "3.10.1", "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.1.tgz", @@ -697,6 +1186,16 @@ "minimatch": "^3.0.4" } }, + "imurmurhash": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", + "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=" + }, + "indent-string": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", + "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==" + }, "inflight": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", @@ -764,16 +1263,128 @@ "resolved": "https://registry.npmjs.org/is-url/-/is-url-1.2.4.tgz", "integrity": "sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==" }, + "is-windows": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz", + "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==" + }, "isarray": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" }, + "isexe": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", + "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=" + }, "isstream": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=" }, + "istanbul-lib-coverage": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz", + "integrity": "sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg==" + }, + "istanbul-lib-hook": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/istanbul-lib-hook/-/istanbul-lib-hook-3.0.0.tgz", + "integrity": "sha512-Pt/uge1Q9s+5VAZ+pCo16TYMWPBIl+oaNIjgLQxcX0itS6ueeaA+pEfThZpH8WxhFgCiEb8sAJY6MdUKgiIWaQ==", + "requires": { + "append-transform": "^2.0.0" + } + }, + "istanbul-lib-instrument": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.1.tgz", + "integrity": "sha512-imIchxnodll7pvQBYOqUu88EufLCU56LMeFPZZM/fJZ1irYcYdqroaV+ACK1Ila8ls09iEYArp+nqyC6lW1Vfg==", + "requires": { + "@babel/core": "^7.7.5", + "@babel/parser": "^7.7.5", + "@babel/template": "^7.7.4", + "@babel/traverse": "^7.7.4", + "@istanbuljs/schema": "^0.1.2", + "istanbul-lib-coverage": "^3.0.0", + "semver": "^6.3.0" + }, + "dependencies": { + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" + } + } + }, + "istanbul-lib-processinfo": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/istanbul-lib-processinfo/-/istanbul-lib-processinfo-2.0.2.tgz", + "integrity": "sha512-kOwpa7z9hme+IBPZMzQ5vdQj8srYgAtaRqeI48NGmAQ+/5yKiHLV0QbYqQpxsdEF0+w14SoB8YbnHKcXE2KnYw==", + "requires": { + "archy": "^1.0.0", + "cross-spawn": "^7.0.0", + "istanbul-lib-coverage": "^3.0.0-alpha.1", + "make-dir": "^3.0.0", + "p-map": "^3.0.0", + "rimraf": "^3.0.0", + "uuid": "^3.3.3" + }, + "dependencies": { + "rimraf": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", + "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "requires": { + "glob": "^7.1.3" + } + } + } + }, + "istanbul-lib-report": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz", + "integrity": "sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==", + "requires": { + "istanbul-lib-coverage": "^3.0.0", + "make-dir": "^3.0.0", + "supports-color": "^7.1.0" + } + }, + "istanbul-lib-source-maps": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.0.tgz", + "integrity": "sha512-c16LpFRkR8vQXyHZ5nLpY35JZtzj1PQY1iZmesUbf1FZHbIupcWfjgOXBY9YHkLEQ6puz1u4Dgj6qmU/DisrZg==", + "requires": { + "debug": "^4.1.1", + "istanbul-lib-coverage": "^3.0.0", + "source-map": "^0.6.1" + }, + "dependencies": { + "debug": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "requires": { + "ms": "^2.1.1" + } + }, + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" + } + } + }, + "istanbul-reports": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.0.1.tgz", + "integrity": "sha512-Vm9xwCiQ8t2cNNnckyeAV0UdxKpcQUz4nMxsBvIu8n2kmPSiyb5uaF/8LpmKr+yqL/MdOXaX2Nmdo4Qyxium9Q==", + "requires": { + "html-escaper": "^2.0.0", + "istanbul-lib-report": "^3.0.0" + } + }, "isurl": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/isurl/-/isurl-1.0.0.tgz", @@ -783,6 +1394,11 @@ "is-object": "^1.0.1" } }, + "js-tokens": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", + "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==" + }, "js-yaml": { "version": "3.13.1", "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz", @@ -797,6 +1413,11 @@ "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=" }, + "jsesc": { + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", + "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==" + }, "json-schema": { "version": "0.2.5", "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.5.tgz", @@ -820,6 +1441,14 @@ "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=" }, + "json5": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.2.tgz", + "integrity": "sha512-MoUOQ4WdiN3yxhm7NEVJSJrieAo5hNSLQ5sj05OTRHPL9HOBy8u4Bu88jsC1jvqAdN+E1bJmsUcZH+1HQxliqQ==", + "requires": { + "minimist": "^1.2.5" + } + }, "jsonify": { "version": "0.0.0", "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz", @@ -848,6 +1477,14 @@ } } }, + "locate-path": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "requires": { + "p-locate": "^4.1.0" + } + }, "lodash": { "version": "4.17.15", "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz", @@ -878,6 +1515,11 @@ "resolved": "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz", "integrity": "sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8=" }, + "lodash.flattendeep": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz", + "integrity": "sha1-+wMJF/hqMTTlvJvsDWngAT3f7bI=" + }, "lodash.foreach": { "version": "4.5.0", "resolved": "https://registry.npmjs.org/lodash.foreach/-/lodash.foreach-4.5.0.tgz", @@ -932,6 +1574,21 @@ "sax": "^1.2.4" } }, + "make-dir": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.0.2.tgz", + "integrity": "sha512-rYKABKutXa6vXTXhoV18cBE7PaewPXHe/Bdq4v+ZLMhxbWApkFFplT0LcbMW+6BbjnQXzZ/sAvSE/JdguApG5w==", + "requires": { + "semver": "^6.0.0" + }, + "dependencies": { + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" + } + } + }, "mdurl": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz", @@ -1050,6 +1707,14 @@ "tar": "^4.4.2" } }, + "node-preload": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/node-preload/-/node-preload-0.2.1.tgz", + "integrity": "sha512-RM5oyBy45cLEoHqCeh+MNuFAxO0vTFBLskvQbOKnEE7YTTSN4tbN8QWDIPQ6L+WvKsB/qLEGpYe2ZZ9d4W9OIQ==", + "requires": { + "process-on-spawn": "^1.0.0" + } + }, "nopt": { "version": "4.0.3", "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz", @@ -1106,6 +1771,51 @@ "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=" }, + "nyc": { + "version": "15.0.0", + "resolved": "https://registry.npmjs.org/nyc/-/nyc-15.0.0.tgz", + "integrity": "sha512-qcLBlNCKMDVuKb7d1fpxjPR8sHeMVX0CHarXAVzrVWoFrigCkYR8xcrjfXSPi5HXM7EU78L6ywO7w1c5rZNCNg==", + "requires": { + "@istanbuljs/load-nyc-config": "^1.0.0", + "@istanbuljs/schema": "^0.1.2", + "caching-transform": "^4.0.0", + "convert-source-map": "^1.7.0", + "decamelize": "^1.2.0", + "find-cache-dir": "^3.2.0", + "find-up": "^4.1.0", + "foreground-child": "^2.0.0", + "glob": "^7.1.6", + "istanbul-lib-coverage": "^3.0.0", + "istanbul-lib-hook": "^3.0.0", + "istanbul-lib-instrument": "^4.0.0", + "istanbul-lib-processinfo": "^2.0.2", + "istanbul-lib-report": "^3.0.0", + "istanbul-lib-source-maps": "^4.0.0", + "istanbul-reports": "^3.0.0", + "js-yaml": "^3.13.1", + "make-dir": "^3.0.0", + "node-preload": "^0.2.0", + "p-map": "^3.0.0", + "process-on-spawn": "^1.0.0", + "resolve-from": "^5.0.0", + "rimraf": "^3.0.0", + "signal-exit": "^3.0.2", + "spawn-wrap": "^2.0.0", + "test-exclude": "^6.0.0", + "uuid": "^3.3.3", + "yargs": "^15.0.2" + }, + "dependencies": { + "rimraf": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", + "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "requires": { + "glob": "^7.1.3" + } + } + } + }, "oauth-sign": { "version": "0.9.0", "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz", @@ -1153,6 +1863,30 @@ "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz", "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=" }, + "p-limit": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.2.tgz", + "integrity": "sha512-WGR+xHecKTr7EbUEhyLSh5Dube9JtdiG78ufaeLxTgpudf/20KqyMioIUZJAezlTIi6evxuoUs9YXc11cU+yzQ==", + "requires": { + "p-try": "^2.0.0" + } + }, + "p-locate": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "requires": { + "p-limit": "^2.2.0" + } + }, + "p-map": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/p-map/-/p-map-3.0.0.tgz", + "integrity": "sha512-d3qXVTF/s+W+CdJ5A29wywV2n8CQQYahlgz2bFiA+4eVNJbHJodPZ+/gXwPGh0bOqA+j8S+6+ckmvLGPk1QpxQ==", + "requires": { + "aggregate-error": "^3.0.0" + } + }, "p-timeout": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-1.2.1.tgz", @@ -1161,16 +1895,55 @@ "p-finally": "^1.0.0" } }, + "p-try": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", + "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==" + }, + "package-hash": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/package-hash/-/package-hash-4.0.0.tgz", + "integrity": "sha512-whdkPIooSu/bASggZ96BWVvZTRMOFxnyUG5PnTSGKoJE2gd5mbVNmR2Nj20QFzxYYgAXpoqC+AiXzl+UMRh7zQ==", + "requires": { + "graceful-fs": "^4.1.15", + "hasha": "^5.0.0", + "lodash.flattendeep": "^4.4.0", + "release-zalgo": "^1.0.0" + } + }, + "path-exists": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==" + }, "path-is-absolute": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=" }, + "path-key": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==" + }, + "path-parse": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz", + "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==" + }, "performance-now": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=" }, + "pkg-dir": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", + "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", + "requires": { + "find-up": "^4.0.0" + } + }, "prepend-http": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz", @@ -1186,6 +1959,14 @@ "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==" }, + "process-on-spawn": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/process-on-spawn/-/process-on-spawn-1.0.0.tgz", + "integrity": "sha512-1WsPDsUSMmZH5LeMLegqkPDrsGgsWwk1Exipy2hvB0o/F0ASzbpIctSCcZIK1ykJvtTJULEH+20WOFjMvGnCTg==", + "requires": { + "fromentries": "^1.2.0" + } + }, "psl": { "version": "1.8.0", "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz", @@ -1246,6 +2027,14 @@ } } }, + "release-zalgo": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/release-zalgo/-/release-zalgo-1.0.0.tgz", + "integrity": "sha1-CXALflB0Mpc5Mw5TXFqQ+2eFFzA=", + "requires": { + "es6-error": "^4.0.1" + } + }, "relevant-urban": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/relevant-urban/-/relevant-urban-2.0.0.tgz", @@ -1332,6 +2121,29 @@ "resolved": "https://registry.npmjs.org/require-all/-/require-all-2.2.0.tgz", "integrity": "sha1-tEIMIzrAKC0P9Jsnf7iAqLXeCJQ=" }, + "require-directory": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", + "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=" + }, + "require-main-filename": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz", + "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==" + }, + "resolve": { + "version": "1.15.1", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.15.1.tgz", + "integrity": "sha512-84oo6ZTtoTUpjgNEr5SJyzQhzL72gaRodsSfyxC/AXRvwu0Yse9H8eF9IpGo7b8YetZhlI6v7ZQ6bKBFV/6S7w==", + "requires": { + "path-parse": "^1.0.6" + } + }, + "resolve-from": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", + "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==" + }, "rimraf": { "version": "2.7.1", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", @@ -1370,6 +2182,19 @@ "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz", "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=" }, + "shebang-command": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "requires": { + "shebang-regex": "^3.0.0" + } + }, + "shebang-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==" + }, "signal-exit": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz", @@ -1388,6 +2213,34 @@ "hoek": "2.x.x" } }, + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=" + }, + "spawn-wrap": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/spawn-wrap/-/spawn-wrap-2.0.0.tgz", + "integrity": "sha512-EeajNjfN9zMnULLwhZZQU3GWBoFNkbngTUPfaawT4RkMiviTxcX0qfhVbGey39mfctfDHkWtuecgQ8NJcyQWHg==", + "requires": { + "foreground-child": "^2.0.0", + "is-windows": "^1.0.2", + "make-dir": "^3.0.0", + "rimraf": "^3.0.0", + "signal-exit": "^3.0.2", + "which": "^2.0.1" + }, + "dependencies": { + "rimraf": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", + "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "requires": { + "glob": "^7.1.3" + } + } + } + }, "sprintf-js": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.2.tgz", @@ -1452,6 +2305,11 @@ "ansi-regex": "^2.0.0" } }, + "strip-bom": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz", + "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==" + }, "strip-json-comments": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", @@ -1479,11 +2337,31 @@ "yallist": "^3.0.3" } }, + "test-exclude": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz", + "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==", + "requires": { + "@istanbuljs/schema": "^0.1.2", + "glob": "^7.1.4", + "minimatch": "^3.0.4" + } + }, "timed-out": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-4.0.1.tgz", "integrity": "sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8=" }, + "tinytim": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/tinytim/-/tinytim-0.1.1.tgz", + "integrity": "sha1-yWih5VWa2VUyJO92J7qzTjyu+Kg=" + }, + "to-fast-properties": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", + "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=" + }, "tough-cookie": { "version": "2.5.0", "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz", @@ -1493,6 +2371,18 @@ "punycode": "^2.1.1" } }, + "tracer": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/tracer/-/tracer-1.0.2.tgz", + "integrity": "sha512-ukzih7M8odyOW97hKIj0pXZs8k4lCAiW4jBO6oUtZXx7RTMzrsoAMP/YHILYAu9BtjPL7GV7YJAlxeZ6GNx7YQ==", + "requires": { + "colors": "1.4.0", + "dateformat": "3.0.3", + "mkdirp": "^0.5.1", + "nyc": "^15.0.0", + "tinytim": "0.1.1" + } + }, "tunnel-agent": { "version": "0.6.0", "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", @@ -1506,6 +2396,19 @@ "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-1.0.3.tgz", "integrity": "sha512-6rt+RN7aOi1nGMyC4Xa5DdYiukl2UWCbcJft7YhxReBGQD7OAM8Pbxw6YMo4r2diNEA8FEmu32YOn9rhaiE5yw==" }, + "type-fest": { + "version": "0.8.1", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz", + "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==" + }, + "typedarray-to-buffer": { + "version": "3.1.5", + "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz", + "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==", + "requires": { + "is-typedarray": "^1.0.0" + } + }, "urban": { "version": "0.3.2", "resolved": "https://registry.npmjs.org/urban/-/urban-0.3.2.tgz", @@ -1588,6 +2491,19 @@ "xml2js": "0.4.x" } }, + "which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "requires": { + "isexe": "^2.0.0" + } + }, + "which-module": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", + "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=" + }, "wide-align": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz", @@ -1596,11 +2512,62 @@ "string-width": "^1.0.2 || 2" } }, + "wrap-ansi": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", + "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==", + "requires": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "dependencies": { + "ansi-regex": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", + "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==" + }, + "is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==" + }, + "string-width": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz", + "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==", + "requires": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.0" + } + }, + "strip-ansi": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", + "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", + "requires": { + "ansi-regex": "^5.0.0" + } + } + } + }, "wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" }, + "write-file-atomic": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz", + "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==", + "requires": { + "imurmurhash": "^0.1.4", + "is-typedarray": "^1.0.0", + "signal-exit": "^3.0.2", + "typedarray-to-buffer": "^3.1.5" + } + }, "ws": { "version": "7.2.3", "resolved": "https://registry.npmjs.org/ws/-/ws-7.2.3.tgz", @@ -1620,11 +2587,73 @@ "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz", "integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==" }, + "y18n": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz", + "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==" + }, "yallist": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==" }, + "yargs": { + "version": "15.3.1", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.3.1.tgz", + "integrity": "sha512-92O1HWEjw27sBfgmXiixJWT5hRBp2eobqXicLtPBIDBhYB+1HpwZlXmbW2luivBJHBzki+7VyCLRtAkScbTBQA==", + "requires": { + "cliui": "^6.0.0", + "decamelize": "^1.2.0", + "find-up": "^4.1.0", + "get-caller-file": "^2.0.1", + "require-directory": "^2.1.1", + "require-main-filename": "^2.0.0", + "set-blocking": "^2.0.0", + "string-width": "^4.2.0", + "which-module": "^2.0.0", + "y18n": "^4.0.0", + "yargs-parser": "^18.1.1" + }, + "dependencies": { + "ansi-regex": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", + "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==" + }, + "is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==" + }, + "string-width": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz", + "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==", + "requires": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.0" + } + }, + "strip-ansi": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", + "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", + "requires": { + "ansi-regex": "^5.0.0" + } + } + } + }, + "yargs-parser": { + "version": "18.1.2", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.2.tgz", + "integrity": "sha512-hlIPNR3IzC1YuL1c2UwwDKpXlNFBqD1Fswwh1khz5+d8Cq/8yc/Mn0i+rQXduu8hcrFKvO7Eryk+09NecTQAAQ==", + "requires": { + "camelcase": "^5.0.0", + "decamelize": "^1.2.0" + } + }, "youtube-info": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/youtube-info/-/youtube-info-1.3.2.tgz", From 0f2f8b03185a5d8c0823fcf76d30f97ed94364d4 Mon Sep 17 00:00:00 2001 From: mudkipscience Date: Tue, 31 Mar 2020 22:43:58 +1100 Subject: [PATCH 020/156] Merge branch 'next' of https://www.github.com/mudkipscience/woomy into next --- index.js | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/index.js b/index.js index 6f07db9..53aa208 100644 --- a/index.js +++ b/index.js @@ -61,11 +61,14 @@ client.aliases = new Discord.Collection() // Initialization function const init = async () => { - // Load modules - // Load events fs.readdir('./events', (err, files) => { - if (err) {} + if (err) { + client.logger.error('Failed to get files in events directory! ' + err); + + return; + }; + client.logger.info(`Loading ${files.length} events.`) files.forEach(file => { if (!file.endsWith('.js')) { @@ -78,7 +81,12 @@ const init = async () => { // Load commands fs.readdir('./commands', (err, files) => { - if (err) {} + if (err) { + client.logger.error('Failed to get files in commands directory! ' + err); + + return; + }; + client.logger.info(`Loading ${files.length} commands.`) files.forEach(file => { if (!file.endsWith('.js')) { From 9f02a5956b553d94dd3c83460b3ca907367b60d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Hor=C3=A1=C4=8Dek?= Date: Tue, 31 Mar 2020 13:46:46 +0200 Subject: [PATCH 021/156] fix music --- modules/music.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/modules/music.js b/modules/music.js index b9046f5..daa8fa9 100644 --- a/modules/music.js +++ b/modules/music.js @@ -79,6 +79,15 @@ module.exports = client => { id = item.id.videoId } + // music "playing", nothing in queue + if((client.music.getGuild(message.guild.id).playing || client.music.getGuild(message.guild.id).dispatcher) && client.music.getGuild(message.guild.id).queue.length == 0) { + client.music.getGuild(message.guild.id).playing = false; + client.music.getGuild(message.guild.id).dispatcher = null; + // music not playing, something is in queue + } else if(!client.music.getGuild(message.guild.id).playing && !client.music.getGuild(message.guild.id).dispatcher && client.music.getGuild(message.guild.id).queue.length > 0) { + client.music.getGuild(message.guild.id).queue = []; + }; + if(client.music.getGuild(message.guild.id).queue.length == 0 || bypassQueue) { let meta = await client.music.getMeta(id) From c0111e0943d6d80009af0da6b94de9ca3046f714 Mon Sep 17 00:00:00 2001 From: mudkipscience Date: Wed, 1 Apr 2020 02:45:45 +1100 Subject: [PATCH 022/156] Synced changes --- commands/ping.js | 6 +- events/message.js | 19 +++-- events/ready.js | 1 - index.js | 38 ++++------ package-lock.json | 189 ++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 220 insertions(+), 33 deletions(-) diff --git a/commands/ping.js b/commands/ping.js index 9336f44..ea1ead3 100644 --- a/commands/ping.js +++ b/commands/ping.js @@ -4,7 +4,7 @@ exports.conf = { aliases: [], permLevel: 'User', requiredPerms: [], - cooldown: 2000 + cooldown: 5000 } exports.help = { @@ -15,8 +15,8 @@ exports.help = { } exports.run = async (client, message) => { - const msg = await message.channel.send('⏱️ Please wait...') + const msg = await message.channel.send('Pinging...') msg.edit( - `:ping_pong: Pong! Latency is ${msg.createdTimestamp - message.createdTimestamp}ms, API Latency is ${Math.round(client.ws.ping)}ms` + `Pong! \`${msg.createdTimestamp - message.createdTimestamp}ms\` (💗\`${Math.round(client.ws.ping)}ms\`)` ) } diff --git a/events/message.js b/events/message.js index 53d1fc5..75d3401 100644 --- a/events/message.js +++ b/events/message.js @@ -34,13 +34,20 @@ module.exports = async (client, message) => { return message.channel.send('You don\'t have permission to run this command!') } - const delay = () => { - setTimeout(() => { - client.cooldown.get(cmd).delete(message.author.id); - message.channel.send(`${message.member} cooldown has expired for ${command} command.`) - }, commands.get(command) * 1000); -} + // Cooldown + if (client.cooldown.get(cmd.help.name).has(message.author.id)) { + const init = client.cooldown.get(command).get(message.author.id) + const curr = new Date() + const diff = Math.round((curr - init) / 1000) + const time = cmd.conf.cooldown / 1000 + return message.reply(`this command is on cooldown! You'll be able to use it again in ${time - diff} seconds.`) + } else { + client.cooldown.get(cmd.help.name).set(message.author.id, new Date()) + setTimeout(() => { + client.cooldown.get(cmd.help.name).delete(message.author.id) + }, client.commands.get(cmd.help.name).conf.cooldown) + } message.author.permLevel = level diff --git a/events/ready.js b/events/ready.js index 3ab2ca2..02d66b7 100644 --- a/events/ready.js +++ b/events/ready.js @@ -1,4 +1,3 @@ module.exports = (client) => { client.logger.ready('Connected to Discord as ' + client.user.tag) - client.logger.debug(client.cooldown) } diff --git a/index.js b/index.js index 2ea9310..e23c650 100644 --- a/index.js +++ b/index.js @@ -16,23 +16,20 @@ const client = new Discord.Client({ disabledEvents: ['TYPING_START'] }) // Logger client.logger = require('tracer').colorConsole({ format: [ - '{{timestamp}} <{{title}}> {{message}}', + '{{timestamp}} [{{title}}] {{file}}: {{message}}', { - error: '{{timestamp}} <{{title}}> ({{file}}) {{message}}', - fatal: '{{timestamp}} <{{title}}> ({{file}}) {{message}}' + log: `{{timestamp}} ${'[{{title}}]'.white} {{file}}: {{message}}`, + debug: `{{timestamp}} ${'[{{title}}]'.magenta} {{file}}: {{message}}`, + info: `{{timestamp}} ${'[{{title}}]'.cyan} {{file}}: {{message}}`, + ready: `{{timestamp}} ${'[{{title}}]'.green} {{file}}: {{message}}`, + warn: `{{timestamp}} ${'[{{title}}]'.yellow} {{file}}: {{message}}`, + error: `{{timestamp}} ${'[{{title}}]'.red} {{file}}: {{message}}`, + fatal: `{{timestamp}} ${'[{{title}}]'.red.bold} {{file}}: {{message}}` } ], - dateformat: 'dd-mm-yyyy HH:MM:ss', + dateformat: 'yyyy-mm-dd HH:MM:ss', methods: ['log', 'debug', 'info', 'ready', 'warn', 'error', 'fatal'], - filters: [{ - log: colors.white, - debug: colors.magenta, - info: colors.cyan, - ready: colors.green, - warn: colors.yellow, - error: colors.red, - fatal: [colors.red, colors.bold] - }] + filters: [colors.white] }) // Load modules @@ -54,7 +51,7 @@ if (fs.existsSync('./config.js') === false) { require('dotenv').config() client.config = require('./config') -// Collections that +// Collections that client.commands = new Discord.Collection() client.cooldown = new Discord.Collection() client.aliases = new Discord.Collection() @@ -64,11 +61,8 @@ const init = async () => { // Load events fs.readdir('./events', (err, files) => { if (err) { - client.logger.fatal('Failed to get files in events directory! ' + err); - - process.exit(); - - return; + client.logger.fatal('Failed to get files in events directory: ' + err) + process.exit() }; client.logger.info(`Loading ${files.length} events.`) @@ -84,11 +78,9 @@ const init = async () => { // Load commands fs.readdir('./commands', (err, files) => { if (err) { - client.logger.fatal('Failed to get files in commands directory! ' + err); + client.logger.fatal('Failed to get files in commands directory: ' + err) - process.exit(); - - return; + process.exit() }; client.logger.info(`Loading ${files.length} commands.`) diff --git a/package-lock.json b/package-lock.json index d32167c..e7ae8ee 100644 --- a/package-lock.json +++ b/package-lock.json @@ -352,6 +352,14 @@ "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz", "integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ=" }, + "async": { + "version": "2.6.3", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz", + "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==", + "requires": { + "lodash": "^4.17.14" + } + }, "asynckit": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", @@ -483,6 +491,30 @@ "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=" }, + "color": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/color/-/color-3.0.0.tgz", + "integrity": "sha512-jCpd5+s0s0t7p3pHQKpnJ0TpQKKdleP71LWcA0aqiljpiuAkOSUFN/dyH8ZwF0hRmFlrIuRhufds1QyEP9EB+w==", + "requires": { + "color-convert": "^1.9.1", + "color-string": "^1.5.2" + }, + "dependencies": { + "color-convert": { + "version": "1.9.3", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", + "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", + "requires": { + "color-name": "1.1.3" + } + }, + "color-name": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", + "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=" + } + } + }, "color-convert": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", @@ -496,11 +528,34 @@ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" }, + "color-string": { + "version": "1.5.3", + "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.5.3.tgz", + "integrity": "sha512-dC2C5qeWoYkxki5UAXapdjqO672AM4vZuPGRQfO8b5HKuKGBbKWpITyDYN7TOFKvRW7kOgAn3746clDBMDJyQw==", + "requires": { + "color-name": "^1.0.0", + "simple-swizzle": "^0.2.2" + } + }, + "colornames": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/colornames/-/colornames-1.1.1.tgz", + "integrity": "sha1-+IiQMGhcfE/54qVZ9Qd+t2qBb5Y=" + }, "colors": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz", "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==" }, + "colorspace": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/colorspace/-/colorspace-1.1.2.tgz", + "integrity": "sha512-vt+OoIP2d76xLhjwbBaucYlNSpPsrJWPlBTtwCpQKIu6/CSMutyzX93O/Do0qzpH3YoHEes8YEFXyZ797rEhzQ==", + "requires": { + "color": "3.0.x", + "text-hex": "1.0.x" + } + }, "combined-stream": { "version": "1.0.8", "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", @@ -612,6 +667,16 @@ "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=" }, + "diagnostics": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/diagnostics/-/diagnostics-1.1.1.tgz", + "integrity": "sha512-8wn1PmdunLJ9Tqbx+Fx/ZEuHfJf4NKSN2ZBj7SJC/OWRWha843+WsTjqMe1B5E3p28jqBlp+mJ2fPVxPyNgYKQ==", + "requires": { + "colorspace": "1.1.x", + "enabled": "1.0.x", + "kuler": "1.0.x" + } + }, "discord.js": { "version": "12.1.1", "resolved": "https://registry.npmjs.org/discord.js/-/discord.js-12.1.1.tgz", @@ -676,11 +741,24 @@ "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" }, + "enabled": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/enabled/-/enabled-1.0.2.tgz", + "integrity": "sha1-ll9lE9LC0cX0ZStkouM5ZGf8L5M=", + "requires": { + "env-variable": "0.0.x" + } + }, "entities": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz", "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==" }, + "env-variable": { + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/env-variable/-/env-variable-0.0.6.tgz", + "integrity": "sha512-bHz59NlBbtS0NhftmR8+ExBEekE7br0e01jw+kk0NDro7TtZzBYZ5ScGPs3OmwnpyfHTHOtr1Y6uedCdrIldtg==" + }, "es6-error": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz", @@ -711,6 +789,16 @@ "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=" }, + "fast-safe-stringify": { + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.0.7.tgz", + "integrity": "sha512-Utm6CdzT+6xsDk2m8S6uL8VHxNwI6Jub+e9NYTcAms28T84pTa25GJQV9j0CY0N1rM8hK4x6grpF2BQf+2qwVA==" + }, + "fecha": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/fecha/-/fecha-2.3.3.tgz", + "integrity": "sha512-lUGBnIamTAwk4znq5BcqsDaxSmZ9nDVJaij6NvRt/Tg4R69gERA+otPKbS86ROw9nxVMw2/mp1fnaiWqbs6Sdg==" + }, "find-cache-dir": { "version": "3.3.1", "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.1.tgz", @@ -933,6 +1021,11 @@ "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" }, + "is-arrayish": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz", + "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==" + }, "is-fullwidth-code-point": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", @@ -1118,6 +1211,14 @@ } } }, + "kuler": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/kuler/-/kuler-1.0.1.tgz", + "integrity": "sha512-J9nVUucG1p/skKul6DU3PUZrhs0LPulNaeUOox0IyXDi8S4CztTHs1gQphhuZmzXG7VOQSf6NJfKuzteQLv9gQ==", + "requires": { + "colornames": "^1.1.1" + } + }, "locate-path": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", @@ -1141,6 +1242,18 @@ "resolved": "https://registry.npmjs.org/lodash.isfunction/-/lodash.isfunction-3.0.9.tgz", "integrity": "sha512-AirXNj15uRIMMPihnkInB4i3NHeb4iBtNg9WRWuK2o31S+ePwwNmDPaTL3o7dTJ+VXNZim7rFs4rxN4YU1oUJw==" }, + "logform": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/logform/-/logform-2.1.2.tgz", + "integrity": "sha512-+lZh4OpERDBLqjiwDLpAWNQu6KMjnlXH2ByZwCuSqVPJletw0kTWJf5CgSNAUKn1KUkv3m2cUz/LK8zyEy7wzQ==", + "requires": { + "colors": "^1.2.1", + "fast-safe-stringify": "^2.0.4", + "fecha": "^2.3.3", + "ms": "^2.1.1", + "triple-beam": "^1.3.0" + } + }, "m3u8stream": { "version": "0.6.5", "resolved": "https://registry.npmjs.org/m3u8stream/-/m3u8stream-0.6.5.tgz", @@ -1276,6 +1389,11 @@ "wrappy": "1" } }, + "one-time": { + "version": "0.0.4", + "resolved": "https://registry.npmjs.org/one-time/-/one-time-0.0.4.tgz", + "integrity": "sha1-+M33eISCb+Tf+T46nMN7HkSAdC4=" + }, "p-limit": { "version": "2.2.2", "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.2.tgz", @@ -1354,6 +1472,11 @@ "resolved": "https://registry.npmjs.org/prism-media/-/prism-media-1.2.1.tgz", "integrity": "sha512-R3EbKwJiYlTvGwcG1DpUt+06DsxOGS5W4AMEHT7oVOjG93MjpdhGX1whHyjnqknylLMupKAsKMEXcTNRbPe6Vw==" }, + "process-nextick-args": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", + "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==" + }, "process-on-spawn": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/process-on-spawn/-/process-on-spawn-1.0.0.tgz", @@ -1530,6 +1653,14 @@ "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz", "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==" }, + "simple-swizzle": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz", + "integrity": "sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo=", + "requires": { + "is-arrayish": "^0.3.1" + } + }, "sntp": { "version": "1.0.9", "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz", @@ -1589,6 +1720,11 @@ } } }, + "stack-trace": { + "version": "0.0.10", + "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz", + "integrity": "sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=" + }, "stealthy-require": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz", @@ -1645,6 +1781,11 @@ "minimatch": "^3.0.4" } }, + "text-hex": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/text-hex/-/text-hex-1.0.0.tgz", + "integrity": "sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg==" + }, "tinytim": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/tinytim/-/tinytim-0.1.1.tgz", @@ -1675,6 +1816,11 @@ "tinytim": "0.1.1" } }, + "triple-beam": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/triple-beam/-/triple-beam-1.3.0.tgz", + "integrity": "sha512-XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw==" + }, "tunnel-agent": { "version": "0.6.0", "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", @@ -1701,6 +1847,11 @@ "is-typedarray": "^1.0.0" } }, + "util-deprecate": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" + }, "uuid": { "version": "3.4.0", "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", @@ -1736,6 +1887,44 @@ "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=" }, + "winston-transport": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/winston-transport/-/winston-transport-4.3.0.tgz", + "integrity": "sha512-B2wPuwUi3vhzn/51Uukcao4dIduEiPOcOt9HJ3QeaXgkJ5Z7UwpBzxS4ZGNHtrxrUvTwemsQiSys0ihOf8Mp1A==", + "requires": { + "readable-stream": "^2.3.6", + "triple-beam": "^1.2.0" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" + }, + "readable-stream": { + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", + "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "requires": { + "safe-buffer": "~5.1.0" + } + } + } + }, "wrap-ansi": { "version": "6.2.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", From 8b7eb29866dc358b6de3e39c8b967eb3d8e12094 Mon Sep 17 00:00:00 2001 From: mudkipscience Date: Wed, 1 Apr 2020 03:37:17 +1100 Subject: [PATCH 023/156] Added dev mode --- index.js | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/index.js b/index.js index e23c650..e31d882 100644 --- a/index.js +++ b/index.js @@ -51,6 +51,14 @@ if (fs.existsSync('./config.js') === false) { require('dotenv').config() client.config = require('./config') +if (process.env.DEV_MODE === 'true') { + client.devmode = true + client.logger.warn('Running in development mode.') +} else { + client.devmode = false + // load botlist stuff here eventually +} + // Collections that client.commands = new Discord.Collection() client.cooldown = new Discord.Collection() @@ -104,6 +112,12 @@ const init = async () => { // Login into Discord client.login(process.env.TOKEN) + + if(client.devmode === true) { + client.login(process.env.DEVTOKEN) + } else { + client.login(process.env.TOKEN) + } } init() From db57128ebfcffa94feace44ce83c8edd5c498b7f Mon Sep 17 00:00:00 2001 From: mudkipscience Date: Wed, 1 Apr 2020 19:33:02 +1100 Subject: [PATCH 024/156] Did stuff --- assets/audio/WOOMY.mp3 | Bin 0 -> 26469 bytes assets/img/attackhelicopter.jpg | Bin 0 -> 101789 bytes assets/img/fax.png | Bin 0 -> 16880 bytes assets/json/coolpeople.json | 21 +++++ assets/json/identities.json | 110 +++++++++++++++++++++++ assets/json/lyrics.json | 122 +++++++++++++++++++++++++ assets/json/pronouns.json | 154 ++++++++++++++++++++++++++++++++ assets/json/sexualities.json | 102 +++++++++++++++++++++ assets/placeholder | 0 commands/level.js | 24 +++++ commands/ping.js | 4 +- config.js | 34 ++++++- events/message.js | 8 ++ index.js | 77 +++++++--------- modules/functions.js | 97 +++++++++++++++++++- package-lock.json | 51 +++++------ 16 files changed, 726 insertions(+), 78 deletions(-) create mode 100644 assets/audio/WOOMY.mp3 create mode 100644 assets/img/attackhelicopter.jpg create mode 100644 assets/img/fax.png create mode 100644 assets/json/coolpeople.json create mode 100644 assets/json/identities.json create mode 100644 assets/json/lyrics.json create mode 100644 assets/json/pronouns.json create mode 100644 assets/json/sexualities.json delete mode 100644 assets/placeholder create mode 100644 commands/level.js diff --git a/assets/audio/WOOMY.mp3 b/assets/audio/WOOMY.mp3 new file mode 100644 index 0000000000000000000000000000000000000000..9b3989193dede59c1495d97229aec4e603b8f5d8 GIT binary patch literal 26469 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

LP?s}>_8ENxMl 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 { + try { + const friendly = client.config.permLevels.find(l => l.level === level).name + message.reply(`your permission level is ${level} (${friendly}).`) + } catch (err) { + message.channel.send('There was an error!\n' + err).catch() + } +} diff --git a/commands/ping.js b/commands/ping.js index ea1ead3..56c76a7 100644 --- a/commands/ping.js +++ b/commands/ping.js @@ -4,7 +4,7 @@ exports.conf = { aliases: [], permLevel: 'User', requiredPerms: [], - cooldown: 5000 + cooldown: 2000 } exports.help = { @@ -17,6 +17,6 @@ exports.help = { exports.run = async (client, message) => { const msg = await message.channel.send('Pinging...') msg.edit( - `Pong! \`${msg.createdTimestamp - message.createdTimestamp}ms\` (💗\`${Math.round(client.ws.ping)}ms\`)` + `Pong! \`${msg.createdTimestamp - message.createdTimestamp}ms\` (💗 \`${Math.round(client.ws.ping)}ms\`)` ) } diff --git a/config.js b/config.js index 6aa9c53..5cebe98 100644 --- a/config.js +++ b/config.js @@ -13,13 +13,43 @@ const config = { systemNotice: true }, - // + // Permission levels permLevels: [ { level: 0, name: 'User', - check: () => true + }, + + { + level: 1, + name: 'Moderator', + check: (message) => { + try { + if (message.member.roles.cache.has(message.settings.modRole)) return true + } catch (e) { + return false + } + } + }, + + { + level: 2, + name: 'Administrator', + check: (message) => { + try { + if (message.member.roles.cache.has(message.settings.adminRole) || message.member.permissions.has('ADMINISTRATOR')) return true + } catch (e) { + return false + } + } + }, + + { + level: 3, + name: 'Server Owner', + + check: (message) => message.channel.type === 'text' ? (message.guild.ownerID === message.author.id) : false } ] } diff --git a/events/message.js b/events/message.js index 75d3401..d6579f9 100644 --- a/events/message.js +++ b/events/message.js @@ -30,6 +30,13 @@ module.exports = async (client, message) => { return message.channel.send('This command is unavailable via private message. Please run this command in a guild.') } + // Dev perm level is separate so dev's don't get owner perms where they shouldn't have them + if (cmd.conf.permLevel === 'Developer') { + if (!message.client.config.owners.includes(message.author.id)) { + return message.channel.send('You don\'t have permission to run this command!') + } + } + if (level < client.levelCache[cmd.conf.permLevel]) { return message.channel.send('You don\'t have permission to run this command!') } @@ -51,6 +58,7 @@ module.exports = async (client, message) => { message.author.permLevel = level + // Might use this message.flags = [] while (args[0] && args[0][0] === '-') { message.flags.push(args.shift().slice(1)) diff --git a/index.js b/index.js index e31d882..b5119d0 100644 --- a/index.js +++ b/index.js @@ -18,25 +18,20 @@ client.logger = require('tracer').colorConsole({ format: [ '{{timestamp}} [{{title}}] {{file}}: {{message}}', { - log: `{{timestamp}} ${'[{{title}}]'.white} {{file}}: {{message}}`, - debug: `{{timestamp}} ${'[{{title}}]'.magenta} {{file}}: {{message}}`, - info: `{{timestamp}} ${'[{{title}}]'.cyan} {{file}}: {{message}}`, - ready: `{{timestamp}} ${'[{{title}}]'.green} {{file}}: {{message}}`, - warn: `{{timestamp}} ${'[{{title}}]'.yellow} {{file}}: {{message}}`, - error: `{{timestamp}} ${'[{{title}}]'.red} {{file}}: {{message}}`, - fatal: `{{timestamp}} ${'[{{title}}]'.red.bold} {{file}}: {{message}}` + debug: `{{timestamp}} ${'<{{title}}>'.magenta} {{file}}:{{line}} {{message}}`, + log: `{{timestamp}} ${'<{{title}}>'.white} {{file}}:{{line}} {{message}}`, + info: `{{timestamp}} ${'<{{title}}>'.cyan} {{file}}:{{line}} {{message}}`, + ready: `{{timestamp}} ${'<{{title}}>'.green} {{file}}:{{line}} {{message}}`, + warn: `{{timestamp}} ${'<{{title}}>'.yellow} {{file}}:{{line}} {{message}}`, + error: `{{timestamp}} ${'<{{title}}>'.red} {{file}}:{{line}} {{message}}`, + fatal: `{{timestamp}} ${'<{{title}}>'.red.bold} {{file}}:{{line}} {{message}}` } ], - dateformat: 'yyyy-mm-dd HH:MM:ss', + dateformat: 'yyyy-mm-dd"T"HH:MM:ss', methods: ['log', 'debug', 'info', 'ready', 'warn', 'error', 'fatal'], filters: [colors.white] }) -// Load modules -require('./modules/functions')(client) -require('./modules/music')(client) -require('./modules/botlists')(client) - // Checks to make sure config.js and .env exist if (fs.existsSync('./.env') === false) { client.logger.fatal('The .env file is missing! Please create a .env file.') @@ -48,49 +43,32 @@ if (fs.existsSync('./config.js') === false) { process.exit() } -require('dotenv').config() client.config = require('./config') +require('dotenv').config() +require('./modules/functions')(client) +require('./modules/music')(client) +require('./modules/botlists')(client) -if (process.env.DEV_MODE === 'true') { +if (process.env.DEV_MODE) { client.devmode = true client.logger.warn('Running in development mode.') } else { client.devmode = false - // load botlist stuff here eventually } -// Collections that +client.levelCache = {} client.commands = new Discord.Collection() client.cooldown = new Discord.Collection() client.aliases = new Discord.Collection() // Initialization function const init = async () => { - // Load events - fs.readdir('./events', (err, files) => { - if (err) { - client.logger.fatal('Failed to get files in events directory: ' + err) - process.exit() - }; - - client.logger.info(`Loading ${files.length} events.`) - files.forEach(file => { - if (!file.endsWith('.js')) { - return - } - const event = require(`./events/${file}`) - client.on(file.substr(0, file.length - 3), event.bind(null, client)) - }) - }) - - // Load commands + // Command handler fs.readdir('./commands', (err, files) => { if (err) { client.logger.fatal('Failed to get files in commands directory: ' + err) - process.exit() }; - client.logger.info(`Loading ${files.length} commands.`) files.forEach(file => { if (!file.endsWith('.js')) { @@ -103,17 +81,30 @@ const init = async () => { }) }) - // Level cache - client.levelCache = {} + // Event handler + fs.readdir('./events', (err, files) => { + if (err) { + client.logger.fatal('Failed to get files in events directory: ' + err) + process.exit() + }; + client.logger.info(`Loading ${files.length} events.`) + files.forEach(file => { + if (!file.endsWith('.js')) { + return + } + const event = require(`./events/${file}`) + client.on(file.substr(0, file.length - 3), event.bind(null, client)) + }) + }) + + // Cache client permissions for (let i = 0; i < client.config.permLevels.length; i++) { const thisLevel = client.config.permLevels[i] client.levelCache[thisLevel.name] = thisLevel.level } - // Login into Discord - client.login(process.env.TOKEN) - - if(client.devmode === true) { + // Log into Discord + if (client.devmode === true) { client.login(process.env.DEVTOKEN) } else { client.login(process.env.TOKEN) diff --git a/modules/functions.js b/modules/functions.js index 6c3e61c..e3c3064 100644 --- a/modules/functions.js +++ b/modules/functions.js @@ -1,5 +1,4 @@ module.exports = client => { - client.permlevel = message => { let permlvl = 0 @@ -34,6 +33,102 @@ module.exports = client => { } } + client.unloadCommand = async (commandName) => { + let command + if (client.commands.has(commandName)) { + command = client.commands.get(commandName) + } else if (client.aliases.has(commandName)) { + command = client.commands.get(client.aliases.get(commandName)) + } + if (!command) return `The command \`${commandName}\` doesn"t seem to exist, nor is it an alias. Try again!` + + if (command.shutdown) { + await command.shutdown(client) + } + const mod = require.cache[require.resolve(`../commands/${command.help.name}`)] + delete require.cache[require.resolve(`../commands/${command.help.name}.js`)] + for (let i = 0; i < mod.parent.children.length; i++) { + if (mod.parent.children[i] === mod) { + mod.parent.children.splice(i, 1) + break + } + } + return false + } + + client.getUser = async function (search) { + let user = null + if (!search || typeof search !== 'string') return + // Try ID search + if (search.match(/^<@!?(\d+)>$/)) { + const id = search.match(/^<@!?(\d+)>$/)[1] + user = this.users.fetch(id).catch(() => {}) + if (user) return user + } + // Try username search + if (search.match(/^!?(\w+)#(\d+)$/)) { + const username = search.match(/^!?(\w+)#(\d+)$/)[0] + const discriminator = search.match(/^!?(\w+)#(\d+)$/)[1] + user = this.users.find((u) => u.username === username && u.discriminator === discriminator) + if (user) return user + } + user = await this.users.fetch(search).catch(() => {}) + return user + } + + client.getMembers = function (guild, query) { + if (!query) return + query = query.toLowerCase() + + var a = [] + var b + + // MAKE IT SO IT CAN TAKE AN ID + + try { + b = guild.members.cache.find(x => x.displayName.toLowerCase() === query) + if (!b) guild.members.cache.find(x => x.user.username.toLowerCase() === query) + } catch (err) {} + if (b) a.push(b) + guild.members.cache.forEach(member => { + if ( + (member.displayName.toLowerCase().startsWith(query) || + member.user.tag.toLowerCase().startsWith(query)) && + member.id !== (b && b.id) + ) { + a.push(member) + } + }) + return a + } + + client.getUsers = function (guild, query) { + if (!query) return + query = query.toLowerCase() + + var a = [] + var b + + // MAKE IT SO IT CAN TAKE AN ID + + try { + b = guild.members.cache.find(x => x.displayName.toLowerCase() === query) + if (!b) guild.members.cache.find(x => x.user.username.toLowerCase() === query) + } catch (err) {} + if (b) a.push(b) + guild.members.cache.forEach(member => { + if ( + (member.displayName.toLowerCase().startsWith(query) || + member.user.tag.toLowerCase().startsWith(query)) && + member.id !== (b && b.id) + ) { + a.push(member) + } + }) + return a + } + + // Both of these functions catch errors and log them process.on('uncaughtException', (err) => { const errorMsg = err.stack.replace(new RegExp(`${__dirname}/`, 'g'), './') client.logger.fatal(`Uncaught Exception: ${errorMsg}`) diff --git a/package-lock.json b/package-lock.json index e7ae8ee..0a654cb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -443,15 +443,6 @@ "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=" }, - "chalk": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", - "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, "cheerio": { "version": "0.19.0", "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-0.19.0.tgz", @@ -984,6 +975,27 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/entities/-/entities-1.0.0.tgz", "integrity": "sha1-sph6o4ITR/zeZCsk/fyeT7cSvyY=" + }, + "isarray": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", + "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=" + }, + "readable-stream": { + "version": "1.1.14", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", + "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=", + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.1", + "isarray": "0.0.1", + "string_decoder": "~0.10.x" + } + }, + "string_decoder": { + "version": "0.10.31", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", + "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=" } } }, @@ -1046,11 +1058,6 @@ "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz", "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==" }, - "isarray": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", - "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=" - }, "isexe": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", @@ -1495,17 +1502,6 @@ "resolved": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz", "integrity": "sha1-E+JtKK1rD/qpExLNO/cI7TUecjM=" }, - "readable-stream": { - "version": "1.1.14", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", - "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=", - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.1", - "isarray": "0.0.1", - "string_decoder": "~0.10.x" - } - }, "release-zalgo": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/release-zalgo/-/release-zalgo-1.0.0.tgz", @@ -1740,11 +1736,6 @@ "strip-ansi": "^6.0.0" } }, - "string_decoder": { - "version": "0.10.31", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", - "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=" - }, "stringstream": { "version": "0.0.6", "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.6.tgz", From 5d42b0c60201f20f9a2919bf606d4887aecbfda8 Mon Sep 17 00:00:00 2001 From: mudkipscience Date: Thu, 2 Apr 2020 19:17:42 +1100 Subject: [PATCH 025/156] Sync changes --- .eslintrc.js | 16 + index.js | 8 +- package-lock.json | 999 ++++++++++++++++++++++++++++++++++++++-------- package.json | 37 ++ 4 files changed, 882 insertions(+), 178 deletions(-) create mode 100644 .eslintrc.js create mode 100644 package.json diff --git a/.eslintrc.js b/.eslintrc.js new file mode 100644 index 0000000..0033eb9 --- /dev/null +++ b/.eslintrc.js @@ -0,0 +1,16 @@ +module.exports = { + "env": { + "es6": true, + "node": true + }, + "extends": "eslint:recommended", + "globals": { + "Atomics": "readonly", + "SharedArrayBuffer": "readonly" + }, + "parserOptions": { + "ecmaVersion": 2018 + }, + "rules": { + } +}; \ No newline at end of file diff --git a/index.js b/index.js index b5119d0..3e0871a 100644 --- a/index.js +++ b/index.js @@ -10,6 +10,7 @@ if (Number(process.version.slice(1).split('.')[0]) < 12) { // Libraries const fs = require('fs') const colors = require('colors') +const isDocker = require('is-docker') const Discord = require('discord.js') const client = new Discord.Client({ disabledEvents: ['TYPING_START'] }) @@ -49,7 +50,8 @@ require('./modules/functions')(client) require('./modules/music')(client) require('./modules/botlists')(client) -if (process.env.DEV_MODE) { +// Logs into Discord as WoomyDev if a docker container is not detected. Delete this if self-hosting. +if (isDocker() === true) { client.devmode = true client.logger.warn('Running in development mode.') } else { @@ -68,7 +70,7 @@ const init = async () => { if (err) { client.logger.fatal('Failed to get files in commands directory: ' + err) process.exit() - }; + } client.logger.info(`Loading ${files.length} commands.`) files.forEach(file => { if (!file.endsWith('.js')) { @@ -86,7 +88,7 @@ const init = async () => { if (err) { client.logger.fatal('Failed to get files in events directory: ' + err) process.exit() - }; + } client.logger.info(`Loading ${files.length} events.`) files.forEach(file => { if (!file.endsWith('.js')) { diff --git a/package-lock.json b/package-lock.json index 0a654cb..e9002e9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,8 @@ { - "requires": true, + "name": "woomy", + "version": "2.0.0", "lockfileVersion": 1, + "requires": true, "dependencies": { "@babel/code-frame": { "version": "7.8.3", @@ -286,6 +288,18 @@ "event-target-shim": "^5.0.0" } }, + "acorn": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.1.1.tgz", + "integrity": "sha512-add7dgA5ppRPxCFJoAGfMDi7PIBXq1RtGo7BhbLaxwrXPOmw8gq48Y9ozT01hUKy9byMjlR20EJhu5zlkErEkg==", + "dev": true + }, + "acorn-jsx": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.2.0.tgz", + "integrity": "sha512-HiUX/+K2YpkpJ+SzBffkM/AQ2YE03S0U1kjTLVpoJdhZMOWy8qvXVN9JdLqv2QsaQ6MPYQIuNmwD8zOiYUofLQ==", + "dev": true + }, "aggregate-error": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.0.1.tgz", @@ -304,6 +318,23 @@ "json-stable-stringify": "^1.0.1" } }, + "ansi-escapes": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz", + "integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==", + "dev": true, + "requires": { + "type-fest": "^0.11.0" + }, + "dependencies": { + "type-fest": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz", + "integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==", + "dev": true + } + } + }, "ansi-regex": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", @@ -352,13 +383,11 @@ "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz", "integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ=" }, - "async": { - "version": "2.6.3", - "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz", - "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==", - "requires": { - "lodash": "^4.17.14" - } + "astral-regex": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz", + "integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==", + "dev": true }, "asynckit": { "version": "0.4.0", @@ -433,6 +462,12 @@ "write-file-atomic": "^3.0.0" } }, + "callsites": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", + "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", + "dev": true + }, "camelcase": { "version": "5.3.1", "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", @@ -443,6 +478,64 @@ "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=" }, + "chalk": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "dev": true, + "requires": { + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" + }, + "dependencies": { + "ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, + "requires": { + "color-convert": "^1.9.0" + } + }, + "color-convert": { + "version": "1.9.3", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", + "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", + "dev": true, + "requires": { + "color-name": "1.1.3" + } + }, + "color-name": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", + "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", + "dev": true + }, + "has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", + "dev": true + }, + "supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, + "chardet": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz", + "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==", + "dev": true + }, "cheerio": { "version": "0.19.0", "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-0.19.0.tgz", @@ -467,6 +560,21 @@ "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz", "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==" }, + "cli-cursor": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz", + "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==", + "dev": true, + "requires": { + "restore-cursor": "^3.1.0" + } + }, + "cli-width": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz", + "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=", + "dev": true + }, "cliui": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz", @@ -482,30 +590,6 @@ "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=" }, - "color": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/color/-/color-3.0.0.tgz", - "integrity": "sha512-jCpd5+s0s0t7p3pHQKpnJ0TpQKKdleP71LWcA0aqiljpiuAkOSUFN/dyH8ZwF0hRmFlrIuRhufds1QyEP9EB+w==", - "requires": { - "color-convert": "^1.9.1", - "color-string": "^1.5.2" - }, - "dependencies": { - "color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "requires": { - "color-name": "1.1.3" - } - }, - "color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=" - } - } - }, "color-convert": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", @@ -519,34 +603,11 @@ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" }, - "color-string": { - "version": "1.5.3", - "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.5.3.tgz", - "integrity": "sha512-dC2C5qeWoYkxki5UAXapdjqO672AM4vZuPGRQfO8b5HKuKGBbKWpITyDYN7TOFKvRW7kOgAn3746clDBMDJyQw==", - "requires": { - "color-name": "^1.0.0", - "simple-swizzle": "^0.2.2" - } - }, - "colornames": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/colornames/-/colornames-1.1.1.tgz", - "integrity": "sha1-+IiQMGhcfE/54qVZ9Qd+t2qBb5Y=" - }, "colors": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz", "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==" }, - "colorspace": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/colorspace/-/colorspace-1.1.2.tgz", - "integrity": "sha512-vt+OoIP2d76xLhjwbBaucYlNSpPsrJWPlBTtwCpQKIu6/CSMutyzX93O/Do0qzpH3YoHEes8YEFXyZ797rEhzQ==", - "requires": { - "color": "3.0.x", - "text-hex": "1.0.x" - } - }, "combined-stream": { "version": "1.0.8", "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", @@ -645,6 +706,12 @@ "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=" }, + "deep-is": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz", + "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=", + "dev": true + }, "default-require-extensions": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/default-require-extensions/-/default-require-extensions-3.0.0.tgz", @@ -658,16 +725,6 @@ "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=" }, - "diagnostics": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/diagnostics/-/diagnostics-1.1.1.tgz", - "integrity": "sha512-8wn1PmdunLJ9Tqbx+Fx/ZEuHfJf4NKSN2ZBj7SJC/OWRWha843+WsTjqMe1B5E3p28jqBlp+mJ2fPVxPyNgYKQ==", - "requires": { - "colorspace": "1.1.x", - "enabled": "1.0.x", - "kuler": "1.0.x" - } - }, "discord.js": { "version": "12.1.1", "resolved": "https://registry.npmjs.org/discord.js/-/discord.js-12.1.1.tgz", @@ -683,6 +740,15 @@ "ws": "^7.2.1" } }, + "doctrine": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", + "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", + "dev": true, + "requires": { + "esutils": "^2.0.2" + } + }, "dom-serializer": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.1.tgz", @@ -732,24 +798,11 @@ "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" }, - "enabled": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/enabled/-/enabled-1.0.2.tgz", - "integrity": "sha1-ll9lE9LC0cX0ZStkouM5ZGf8L5M=", - "requires": { - "env-variable": "0.0.x" - } - }, "entities": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz", "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==" }, - "env-variable": { - "version": "0.0.6", - "resolved": "https://registry.npmjs.org/env-variable/-/env-variable-0.0.6.tgz", - "integrity": "sha512-bHz59NlBbtS0NhftmR8+ExBEekE7br0e01jw+kk0NDro7TtZzBYZ5ScGPs3OmwnpyfHTHOtr1Y6uedCdrIldtg==" - }, "es6-error": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz", @@ -760,11 +813,219 @@ "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=" }, + "eslint": { + "version": "6.8.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-6.8.0.tgz", + "integrity": "sha512-K+Iayyo2LtyYhDSYwz5D5QdWw0hCacNzyq1Y821Xna2xSJj7cijoLLYmLxTQgcgZ9mC61nryMy9S7GRbYpI5Ig==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "ajv": "^6.10.0", + "chalk": "^2.1.0", + "cross-spawn": "^6.0.5", + "debug": "^4.0.1", + "doctrine": "^3.0.0", + "eslint-scope": "^5.0.0", + "eslint-utils": "^1.4.3", + "eslint-visitor-keys": "^1.1.0", + "espree": "^6.1.2", + "esquery": "^1.0.1", + "esutils": "^2.0.2", + "file-entry-cache": "^5.0.1", + "functional-red-black-tree": "^1.0.1", + "glob-parent": "^5.0.0", + "globals": "^12.1.0", + "ignore": "^4.0.6", + "import-fresh": "^3.0.0", + "imurmurhash": "^0.1.4", + "inquirer": "^7.0.0", + "is-glob": "^4.0.0", + "js-yaml": "^3.13.1", + "json-stable-stringify-without-jsonify": "^1.0.1", + "levn": "^0.3.0", + "lodash": "^4.17.14", + "minimatch": "^3.0.4", + "mkdirp": "^0.5.1", + "natural-compare": "^1.4.0", + "optionator": "^0.8.3", + "progress": "^2.0.0", + "regexpp": "^2.0.1", + "semver": "^6.1.2", + "strip-ansi": "^5.2.0", + "strip-json-comments": "^3.0.1", + "table": "^5.2.3", + "text-table": "^0.2.0", + "v8-compile-cache": "^2.0.3" + }, + "dependencies": { + "ajv": { + "version": "6.12.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.0.tgz", + "integrity": "sha512-D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw==", + "dev": true, + "requires": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + } + }, + "ansi-regex": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", + "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", + "dev": true + }, + "cross-spawn": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "dev": true, + "requires": { + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + }, + "dependencies": { + "semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "dev": true + } + } + }, + "globals": { + "version": "12.4.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-12.4.0.tgz", + "integrity": "sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==", + "dev": true, + "requires": { + "type-fest": "^0.8.1" + } + }, + "path-key": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz", + "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=", + "dev": true + }, + "shebang-command": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", + "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=", + "dev": true, + "requires": { + "shebang-regex": "^1.0.0" + } + }, + "shebang-regex": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz", + "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=", + "dev": true + }, + "strip-ansi": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "dev": true, + "requires": { + "ansi-regex": "^4.1.0" + } + }, + "which": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", + "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", + "dev": true, + "requires": { + "isexe": "^2.0.0" + } + } + } + }, + "eslint-scope": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.0.0.tgz", + "integrity": "sha512-oYrhJW7S0bxAFDvWqzvMPRm6pcgcnWc4QnofCAqRTRfQC0JcwenzGglTtsLyIuuWFfkqDG9vz67cnttSd53djw==", + "dev": true, + "requires": { + "esrecurse": "^4.1.0", + "estraverse": "^4.1.1" + } + }, + "eslint-utils": { + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.3.tgz", + "integrity": "sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q==", + "dev": true, + "requires": { + "eslint-visitor-keys": "^1.1.0" + } + }, + "eslint-visitor-keys": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz", + "integrity": "sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==", + "dev": true + }, + "espree": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/espree/-/espree-6.2.1.tgz", + "integrity": "sha512-ysCxRQY3WaXJz9tdbWOwuWr5Y/XrPTGX9Kiz3yoUXwW0VZ4w30HTkQLaGx/+ttFjF8i+ACbArnB4ce68a9m5hw==", + "dev": true, + "requires": { + "acorn": "^7.1.1", + "acorn-jsx": "^5.2.0", + "eslint-visitor-keys": "^1.1.0" + } + }, "esprima": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==" }, + "esquery": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.2.0.tgz", + "integrity": "sha512-weltsSqdeWIX9G2qQZz7KlTRJdkkOCTPgLYJUz1Hacf48R4YOwGPHO3+ORfWedqJKbq5WQmsgK90n+pFLIKt/Q==", + "dev": true, + "requires": { + "estraverse": "^5.0.0" + }, + "dependencies": { + "estraverse": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.0.0.tgz", + "integrity": "sha512-j3acdrMzqrxmJTNj5dbr1YbjacrYgAxVMeF0gK16E3j494mOe7xygM/ZLIguEQ0ETwAg2hlJCtHRGav+y0Ny5A==", + "dev": true + } + } + }, + "esrecurse": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz", + "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==", + "dev": true, + "requires": { + "estraverse": "^4.1.0" + } + }, + "estraverse": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", + "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", + "dev": true + }, + "esutils": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", + "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", + "dev": true + }, "event-target-shim": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz", @@ -775,20 +1036,57 @@ "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==" }, + "external-editor": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz", + "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==", + "dev": true, + "requires": { + "chardet": "^0.7.0", + "iconv-lite": "^0.4.24", + "tmp": "^0.0.33" + } + }, "extsprintf": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=" }, - "fast-safe-stringify": { - "version": "2.0.7", - "resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.0.7.tgz", - "integrity": "sha512-Utm6CdzT+6xsDk2m8S6uL8VHxNwI6Jub+e9NYTcAms28T84pTa25GJQV9j0CY0N1rM8hK4x6grpF2BQf+2qwVA==" + "fast-deep-equal": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz", + "integrity": "sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA==", + "dev": true }, - "fecha": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/fecha/-/fecha-2.3.3.tgz", - "integrity": "sha512-lUGBnIamTAwk4znq5BcqsDaxSmZ9nDVJaij6NvRt/Tg4R69gERA+otPKbS86ROw9nxVMw2/mp1fnaiWqbs6Sdg==" + "fast-json-stable-stringify": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", + "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", + "dev": true + }, + "fast-levenshtein": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", + "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=", + "dev": true + }, + "figures": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz", + "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==", + "dev": true, + "requires": { + "escape-string-regexp": "^1.0.5" + } + }, + "file-entry-cache": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz", + "integrity": "sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==", + "dev": true, + "requires": { + "flat-cache": "^2.0.1" + } }, "find-cache-dir": { "version": "3.3.1", @@ -809,6 +1107,34 @@ "path-exists": "^4.0.0" } }, + "flat-cache": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz", + "integrity": "sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==", + "dev": true, + "requires": { + "flatted": "^2.0.0", + "rimraf": "2.6.3", + "write": "1.0.3" + }, + "dependencies": { + "rimraf": { + "version": "2.6.3", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz", + "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==", + "dev": true, + "requires": { + "glob": "^7.1.3" + } + } + } + }, + "flatted": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.2.tgz", + "integrity": "sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==", + "dev": true + }, "foreground-child": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-2.0.0.tgz", @@ -843,6 +1169,12 @@ "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" }, + "functional-red-black-tree": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz", + "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=", + "dev": true + }, "gensync": { "version": "1.0.0-beta.1", "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.1.tgz", @@ -886,6 +1218,15 @@ "path-is-absolute": "^1.0.0" } }, + "glob-parent": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz", + "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==", + "dev": true, + "requires": { + "is-glob": "^4.0.1" + } + }, "globals": { "version": "11.12.0", "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", @@ -1009,6 +1350,39 @@ "sshpk": "^1.7.0" } }, + "iconv-lite": { + "version": "0.4.24", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", + "dev": true, + "requires": { + "safer-buffer": ">= 2.1.2 < 3" + } + }, + "ignore": { + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz", + "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==", + "dev": true + }, + "import-fresh": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.1.tgz", + "integrity": "sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ==", + "dev": true, + "requires": { + "parent-module": "^1.0.0", + "resolve-from": "^4.0.0" + }, + "dependencies": { + "resolve-from": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", + "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", + "dev": true + } + } + }, "imurmurhash": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", @@ -1033,16 +1407,70 @@ "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" }, - "is-arrayish": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz", - "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==" + "inquirer": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.1.0.tgz", + "integrity": "sha512-5fJMWEmikSYu0nv/flMc475MhGbB7TSPd/2IpFV4I4rMklboCH2rQjYY5kKiYGHqUF9gvaambupcJFFG9dvReg==", + "dev": true, + "requires": { + "ansi-escapes": "^4.2.1", + "chalk": "^3.0.0", + "cli-cursor": "^3.1.0", + "cli-width": "^2.0.0", + "external-editor": "^3.0.3", + "figures": "^3.0.0", + "lodash": "^4.17.15", + "mute-stream": "0.0.8", + "run-async": "^2.4.0", + "rxjs": "^6.5.3", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0", + "through": "^2.3.6" + }, + "dependencies": { + "chalk": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", + "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + } + } + }, + "is-docker": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.0.0.tgz", + "integrity": "sha512-pJEdRugimx4fBMra5z2/5iRdZ63OhYV0vr0Dwm5+xtW4D1FvRkB8hamMIhnWfyJeDdyr/aa7BDyNbtG38VxgoQ==" + }, + "is-extglob": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", + "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=", + "dev": true }, "is-fullwidth-code-point": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==" }, + "is-glob": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz", + "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==", + "dev": true, + "requires": { + "is-extglob": "^2.1.1" + } + }, + "is-promise": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz", + "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=", + "dev": true + }, "is-stream": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz", @@ -1174,6 +1602,12 @@ "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz", "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=" }, + "json-schema-traverse": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", + "dev": true + }, "json-stable-stringify": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz", @@ -1182,6 +1616,12 @@ "jsonify": "~0.0.0" } }, + "json-stable-stringify-without-jsonify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", + "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=", + "dev": true + }, "json-stringify-safe": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", @@ -1218,12 +1658,14 @@ } } }, - "kuler": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/kuler/-/kuler-1.0.1.tgz", - "integrity": "sha512-J9nVUucG1p/skKul6DU3PUZrhs0LPulNaeUOox0IyXDi8S4CztTHs1gQphhuZmzXG7VOQSf6NJfKuzteQLv9gQ==", + "levn": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", + "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=", + "dev": true, "requires": { - "colornames": "^1.1.1" + "prelude-ls": "~1.1.2", + "type-check": "~0.3.2" } }, "locate-path": { @@ -1249,18 +1691,6 @@ "resolved": "https://registry.npmjs.org/lodash.isfunction/-/lodash.isfunction-3.0.9.tgz", "integrity": "sha512-AirXNj15uRIMMPihnkInB4i3NHeb4iBtNg9WRWuK2o31S+ePwwNmDPaTL3o7dTJ+VXNZim7rFs4rxN4YU1oUJw==" }, - "logform": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/logform/-/logform-2.1.2.tgz", - "integrity": "sha512-+lZh4OpERDBLqjiwDLpAWNQu6KMjnlXH2ByZwCuSqVPJletw0kTWJf5CgSNAUKn1KUkv3m2cUz/LK8zyEy7wzQ==", - "requires": { - "colors": "^1.2.1", - "fast-safe-stringify": "^2.0.4", - "fecha": "^2.3.3", - "ms": "^2.1.1", - "triple-beam": "^1.3.0" - } - }, "m3u8stream": { "version": "0.6.5", "resolved": "https://registry.npmjs.org/m3u8stream/-/m3u8stream-0.6.5.tgz", @@ -1291,6 +1721,12 @@ "mime-db": "1.43.0" } }, + "mimic-fn": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", + "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", + "dev": true + }, "miniget": { "version": "1.7.0", "resolved": "https://registry.npmjs.org/miniget/-/miniget-1.7.0.tgz", @@ -1327,6 +1763,24 @@ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" }, + "mute-stream": { + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz", + "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==", + "dev": true + }, + "natural-compare": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", + "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=", + "dev": true + }, + "nice-try": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz", + "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==", + "dev": true + }, "node-fetch": { "version": "2.6.0", "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz", @@ -1396,10 +1850,34 @@ "wrappy": "1" } }, - "one-time": { - "version": "0.0.4", - "resolved": "https://registry.npmjs.org/one-time/-/one-time-0.0.4.tgz", - "integrity": "sha1-+M33eISCb+Tf+T46nMN7HkSAdC4=" + "onetime": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.0.tgz", + "integrity": "sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q==", + "dev": true, + "requires": { + "mimic-fn": "^2.1.0" + } + }, + "optionator": { + "version": "0.8.3", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz", + "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==", + "dev": true, + "requires": { + "deep-is": "~0.1.3", + "fast-levenshtein": "~2.0.6", + "levn": "~0.3.0", + "prelude-ls": "~1.1.2", + "type-check": "~0.3.2", + "word-wrap": "~1.2.3" + } + }, + "os-tmpdir": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", + "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=", + "dev": true }, "p-limit": { "version": "2.2.2", @@ -1441,6 +1919,15 @@ "release-zalgo": "^1.0.0" } }, + "parent-module": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", + "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", + "dev": true, + "requires": { + "callsites": "^3.0.0" + } + }, "path-exists": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", @@ -1474,16 +1961,17 @@ "find-up": "^4.0.0" } }, + "prelude-ls": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz", + "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=", + "dev": true + }, "prism-media": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/prism-media/-/prism-media-1.2.1.tgz", "integrity": "sha512-R3EbKwJiYlTvGwcG1DpUt+06DsxOGS5W4AMEHT7oVOjG93MjpdhGX1whHyjnqknylLMupKAsKMEXcTNRbPe6Vw==" }, - "process-nextick-args": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", - "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==" - }, "process-on-spawn": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/process-on-spawn/-/process-on-spawn-1.0.0.tgz", @@ -1492,6 +1980,12 @@ "fromentries": "^1.2.0" } }, + "progress": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz", + "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==", + "dev": true + }, "punycode": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", @@ -1502,6 +1996,12 @@ "resolved": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz", "integrity": "sha1-E+JtKK1rD/qpExLNO/cI7TUecjM=" }, + "regexpp": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-2.0.1.tgz", + "integrity": "sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==", + "dev": true + }, "release-zalgo": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/release-zalgo/-/release-zalgo-1.0.0.tgz", @@ -1593,6 +2093,16 @@ "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==" }, + "restore-cursor": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz", + "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==", + "dev": true, + "requires": { + "onetime": "^5.1.0", + "signal-exit": "^3.0.2" + } + }, "rimraf": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", @@ -1601,6 +2111,24 @@ "glob": "^7.1.3" } }, + "run-async": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.0.tgz", + "integrity": "sha512-xJTbh/d7Lm7SBhc1tNvTpeCHaEzoyxPrqNlvSdMfBTYwaY++UJFyXUOxAtsRUXjlqOfj8luNaR9vjCh4KeV+pg==", + "dev": true, + "requires": { + "is-promise": "^2.1.0" + } + }, + "rxjs": { + "version": "6.5.4", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.4.tgz", + "integrity": "sha512-naMQXcgEo3csAEGvw/NydRA0fuS2nDZJiw1YUWFKU7aPPAPGZEsD4Iimit96qwCieH6y614MCLYwdkrWx7z/7Q==", + "dev": true, + "requires": { + "tslib": "^1.9.0" + } + }, "safe-buffer": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", @@ -1649,12 +2177,47 @@ "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz", "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==" }, - "simple-swizzle": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz", - "integrity": "sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo=", + "slice-ansi": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz", + "integrity": "sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==", + "dev": true, "requires": { - "is-arrayish": "^0.3.1" + "ansi-styles": "^3.2.0", + "astral-regex": "^1.0.0", + "is-fullwidth-code-point": "^2.0.0" + }, + "dependencies": { + "ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, + "requires": { + "color-convert": "^1.9.0" + } + }, + "color-convert": { + "version": "1.9.3", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", + "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", + "dev": true, + "requires": { + "color-name": "1.1.3" + } + }, + "color-name": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", + "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", + "dev": true + }, + "is-fullwidth-code-point": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", + "dev": true + } } }, "sntp": { @@ -1716,11 +2279,6 @@ } } }, - "stack-trace": { - "version": "0.0.10", - "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz", - "integrity": "sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=" - }, "stealthy-require": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz", @@ -1754,6 +2312,12 @@ "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz", "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==" }, + "strip-json-comments": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.0.1.tgz", + "integrity": "sha512-VTyMAUfdm047mwKl+u79WIdrZxtFtn+nBxHeb844XBQ9uMNTuTHdx2hc5RiAJYqwTj3wc/xe5HLSdJSkJ+WfZw==", + "dev": true + }, "supports-color": { "version": "7.1.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", @@ -1762,6 +2326,70 @@ "has-flag": "^4.0.0" } }, + "table": { + "version": "5.4.6", + "resolved": "https://registry.npmjs.org/table/-/table-5.4.6.tgz", + "integrity": "sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==", + "dev": true, + "requires": { + "ajv": "^6.10.2", + "lodash": "^4.17.14", + "slice-ansi": "^2.1.0", + "string-width": "^3.0.0" + }, + "dependencies": { + "ajv": { + "version": "6.12.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.0.tgz", + "integrity": "sha512-D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw==", + "dev": true, + "requires": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + } + }, + "ansi-regex": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", + "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", + "dev": true + }, + "emoji-regex": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", + "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==", + "dev": true + }, + "is-fullwidth-code-point": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", + "dev": true + }, + "string-width": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", + "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", + "dev": true, + "requires": { + "emoji-regex": "^7.0.1", + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^5.1.0" + } + }, + "strip-ansi": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "dev": true, + "requires": { + "ansi-regex": "^4.1.0" + } + } + } + }, "test-exclude": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz", @@ -1772,16 +2400,32 @@ "minimatch": "^3.0.4" } }, - "text-hex": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/text-hex/-/text-hex-1.0.0.tgz", - "integrity": "sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg==" + "text-table": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", + "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=", + "dev": true + }, + "through": { + "version": "2.3.8", + "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", + "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=", + "dev": true }, "tinytim": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/tinytim/-/tinytim-0.1.1.tgz", "integrity": "sha1-yWih5VWa2VUyJO92J7qzTjyu+Kg=" }, + "tmp": { + "version": "0.0.33", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", + "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", + "dev": true, + "requires": { + "os-tmpdir": "~1.0.2" + } + }, "to-fast-properties": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", @@ -1807,10 +2451,11 @@ "tinytim": "0.1.1" } }, - "triple-beam": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/triple-beam/-/triple-beam-1.3.0.tgz", - "integrity": "sha512-XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw==" + "tslib": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.11.1.tgz", + "integrity": "sha512-aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA==", + "dev": true }, "tunnel-agent": { "version": "0.6.0", @@ -1825,6 +2470,15 @@ "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-1.0.3.tgz", "integrity": "sha512-6rt+RN7aOi1nGMyC4Xa5DdYiukl2UWCbcJft7YhxReBGQD7OAM8Pbxw6YMo4r2diNEA8FEmu32YOn9rhaiE5yw==" }, + "type-check": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", + "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=", + "dev": true, + "requires": { + "prelude-ls": "~1.1.2" + } + }, "type-fest": { "version": "0.8.1", "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz", @@ -1838,16 +2492,34 @@ "is-typedarray": "^1.0.0" } }, - "util-deprecate": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" + "uri-js": { + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz", + "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==", + "dev": true, + "requires": { + "punycode": "^2.1.0" + }, + "dependencies": { + "punycode": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", + "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", + "dev": true + } + } }, "uuid": { "version": "3.4.0", "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==" }, + "v8-compile-cache": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.1.0.tgz", + "integrity": "sha512-usZBT3PW+LOjM25wbqIlZwPeJV+3OSz3M1k1Ws8snlW39dZyYL9lOGC5FgPVHfk0jKmjiDV8Z0mIbVQPiwFs7g==", + "dev": true + }, "verror": { "version": "1.10.0", "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", @@ -1878,43 +2550,11 @@ "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=" }, - "winston-transport": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/winston-transport/-/winston-transport-4.3.0.tgz", - "integrity": "sha512-B2wPuwUi3vhzn/51Uukcao4dIduEiPOcOt9HJ3QeaXgkJ5Z7UwpBzxS4ZGNHtrxrUvTwemsQiSys0ihOf8Mp1A==", - "requires": { - "readable-stream": "^2.3.6", - "triple-beam": "^1.2.0" - }, - "dependencies": { - "isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" - }, - "readable-stream": { - "version": "2.3.7", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", - "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" - } - }, - "string_decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "requires": { - "safe-buffer": "~5.1.0" - } - } - } + "word-wrap": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", + "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==", + "dev": true }, "wrap-ansi": { "version": "6.2.0", @@ -1931,6 +2571,15 @@ "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" }, + "write": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/write/-/write-1.0.3.tgz", + "integrity": "sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==", + "dev": true, + "requires": { + "mkdirp": "^0.5.1" + } + }, "write-file-atomic": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz", diff --git a/package.json b/package.json new file mode 100644 index 0000000..18775f1 --- /dev/null +++ b/package.json @@ -0,0 +1,37 @@ +{ + "name": "woomy", + "version": "2.0.0", + "description": "uwu", + "main": "index.js", + "dependencies": { + "colors": "^1.4.0", + "discord.js": "^12.1.1", + "dotenv": "^8.2.0", + "eslint-config-airbnb-base": "^14.1.0", + "eslint-plugin-import": "^2.20.2", + "get-youtube-id": "^1.0.1", + "is-docker": "^2.0.0", + "moment": "^2.24.0", + "node-fetch": "^2.6.0", + "prism-media": "^1.2.1", + "tracer": "^1.0.2", + "youtube-info": "^1.3.2", + "ytdl-core-discord": "^1.1.0" + }, + "devDependencies": { + "eslint": "^6.8.0" + }, + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1" + }, + "repository": { + "type": "git", + "url": "git+https://github.com/mudkipscience/woomy.git" + }, + "author": "mudkipscience", + "license": "GPL-3.0", + "bugs": { + "url": "https://github.com/mudkipscience/woomy/issues" + }, + "homepage": "https://github.com/mudkipscience/woomy#readme" +} From 19e8c4e744be7588497ff63521fbfe6edccf1005 Mon Sep 17 00:00:00 2001 From: mudkipscience Date: Thu, 2 Apr 2020 19:24:36 +1100 Subject: [PATCH 026/156] did stuff --- modules/functions.js | 33 +++++++++++++-------------------- 1 file changed, 13 insertions(+), 20 deletions(-) diff --git a/modules/functions.js b/modules/functions.js index e3c3064..0f9dd60 100644 --- a/modules/functions.js +++ b/modules/functions.js @@ -56,26 +56,6 @@ module.exports = client => { return false } - client.getUser = async function (search) { - let user = null - if (!search || typeof search !== 'string') return - // Try ID search - if (search.match(/^<@!?(\d+)>$/)) { - const id = search.match(/^<@!?(\d+)>$/)[1] - user = this.users.fetch(id).catch(() => {}) - if (user) return user - } - // Try username search - if (search.match(/^!?(\w+)#(\d+)$/)) { - const username = search.match(/^!?(\w+)#(\d+)$/)[0] - const discriminator = search.match(/^!?(\w+)#(\d+)$/)[1] - user = this.users.find((u) => u.username === username && u.discriminator === discriminator) - if (user) return user - } - user = await this.users.fetch(search).catch(() => {}) - return user - } - client.getMembers = function (guild, query) { if (!query) return query = query.toLowerCase() @@ -102,6 +82,19 @@ module.exports = client => { return a } + client.findUser = function (query) { + if (!query || typeof query !== "string") return + query = query.toLowerCase() + + let user + + if (query.match(/^<@!?(\d+)>$/)) { + let id = query.match(/^<@!?(\d+)>$/)[1] + user = this.users.fetch(id).catch((err) => {}) + if(user) return user + } + } + client.getUsers = function (guild, query) { if (!query) return query = query.toLowerCase() From 529744f5d55d917162da09771f403b912faf442f Mon Sep 17 00:00:00 2001 From: mudkipscience Date: Fri, 3 Apr 2020 11:07:51 +1100 Subject: [PATCH 027/156] maybe we can just check everything in config --- .gitignore | 5 ++--- index.js | 30 ++++++++++++------------------ 2 files changed, 14 insertions(+), 21 deletions(-) diff --git a/.gitignore b/.gitignore index dce4704..215737b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,2 @@ -.env -node_modules -data \ No newline at end of file +config.js +node_modules \ No newline at end of file diff --git a/index.js b/index.js index 3e0871a..ed8ee85 100644 --- a/index.js +++ b/index.js @@ -17,15 +17,15 @@ const client = new Discord.Client({ disabledEvents: ['TYPING_START'] }) // Logger client.logger = require('tracer').colorConsole({ format: [ - '{{timestamp}} [{{title}}] {{file}}: {{message}}', + '{{timestamp}} | {{title}} | {{file}}:{{line}} | {{message}}', { - debug: `{{timestamp}} ${'<{{title}}>'.magenta} {{file}}:{{line}} {{message}}`, - log: `{{timestamp}} ${'<{{title}}>'.white} {{file}}:{{line}} {{message}}`, - info: `{{timestamp}} ${'<{{title}}>'.cyan} {{file}}:{{line}} {{message}}`, - ready: `{{timestamp}} ${'<{{title}}>'.green} {{file}}:{{line}} {{message}}`, - warn: `{{timestamp}} ${'<{{title}}>'.yellow} {{file}}:{{line}} {{message}}`, - error: `{{timestamp}} ${'<{{title}}>'.red} {{file}}:{{line}} {{message}}`, - fatal: `{{timestamp}} ${'<{{title}}>'.red.bold} {{file}}:{{line}} {{message}}` + debug: `{{timestamp}} | ${'{{title}}'.magenta} | {{file}}:{{line}} | {{message}}`, + log: `{{timestamp}} | ${'{{title}}'.white} | {{file}}:{{line}} | {{message}}`, + info: `{{timestamp}} | ${'{{title}}'.cyan} | {{file}}:{{line}} | {{message}}`, + ready: `{{timestamp}} | ${'{{title}}'.green} | {{file}}:{{line}} | {{message}}`, + warn: `{{timestamp}} | ${'{{title}}'.yellow} | {{file}}:{{line}} | {{message}}`, + error: `{{timestamp}} | ${'{{title}}'.red} | {{file}}:{{line}} | {{message}}`, + fatal: `{{timestamp}} | ${'{{title}}'.red.bold} | {{file}}:{{line}} | {{message}}` } ], dateformat: 'yyyy-mm-dd"T"HH:MM:ss', @@ -33,19 +33,13 @@ client.logger = require('tracer').colorConsole({ filters: [colors.white] }) -// Checks to make sure config.js and .env exist -if (fs.existsSync('./.env') === false) { - client.logger.fatal('The .env file is missing! Please create a .env file.') - process.exit() -} - +// Check to make sure config exists if (fs.existsSync('./config.js') === false) { client.logger.fatal('The config.js file is missing! Please create a config.js file.') process.exit() } client.config = require('./config') -require('dotenv').config() require('./modules/functions')(client) require('./modules/music')(client) require('./modules/botlists')(client) @@ -106,10 +100,10 @@ const init = async () => { } // Log into Discord - if (client.devmode === true) { - client.login(process.env.DEVTOKEN) + if (client.devmode !== true) { + client.login(client.config.token) } else { - client.login(process.env.TOKEN) + client.login(client.config.token_dev) } } From 559b86261faf7d7f335b99b7ac49afc8b1261c68 Mon Sep 17 00:00:00 2001 From: mudkipscience Date: Fri, 3 Apr 2020 11:16:43 +1100 Subject: [PATCH 028/156] gitignore work please --- config.js | 57 ------------------------------------------------------- 1 file changed, 57 deletions(-) delete mode 100644 config.js diff --git a/config.js b/config.js deleted file mode 100644 index 5cebe98..0000000 --- a/config.js +++ /dev/null @@ -1,57 +0,0 @@ -const config = { - // Users added to this embed get access to developer-level commands - devs: ['433790467830972417', '324937993972350976', '343081377249493044'], - - // Default settings for individual users - defaultUserSettings: { - prefixes: ['~'] - }, - - // Default per-guild settings - defaultGuildSettings: { - prefixes: ['~'], - systemNotice: true - }, - - // Permission levels - permLevels: [ - { - level: 0, - name: 'User', - check: () => true - }, - - { - level: 1, - name: 'Moderator', - check: (message) => { - try { - if (message.member.roles.cache.has(message.settings.modRole)) return true - } catch (e) { - return false - } - } - }, - - { - level: 2, - name: 'Administrator', - check: (message) => { - try { - if (message.member.roles.cache.has(message.settings.adminRole) || message.member.permissions.has('ADMINISTRATOR')) return true - } catch (e) { - return false - } - } - }, - - { - level: 3, - name: 'Server Owner', - - check: (message) => message.channel.type === 'text' ? (message.guild.ownerID === message.author.id) : false - } - ] -} - -module.exports = config From 1f267e1cfb1b67634bde546bbbeee01ce1d7aaad Mon Sep 17 00:00:00 2001 From: mudkipscience Date: Fri, 3 Apr 2020 11:35:54 +1100 Subject: [PATCH 029/156] Added configTemplate.js, fixed .gitignore --- .gitignore | 2 +- configTemplate.js | 87 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 88 insertions(+), 1 deletion(-) create mode 100644 configTemplate.js diff --git a/.gitignore b/.gitignore index 215737b..c0c738c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -config.js +*config.js node_modules \ No newline at end of file diff --git a/configTemplate.js b/configTemplate.js new file mode 100644 index 0000000..396be45 --- /dev/null +++ b/configTemplate.js @@ -0,0 +1,87 @@ +const config = { + // Discord tokens + token: '', + devtoken: '', + + // API keys that are required for some features/commands + keys: { + dbl: '', // top.gg key + yt: '' // youtube API key + }, + + // Users added to this embed get access to developer-level commands + devs: [''], + + // ID for the support server and the various channels Woomy logs to (leave blank if not used) + support: { + id: '', + logs: '', + startupLogs: '', + serverLogs: '' + }, + + // URL of MongoDB database + mongoDB: 'mongodb://localhost:27017/woomy', + + // Default prefix + prefix: '~', + + // Emojis used by Woomy + emojis: { + success: '', + error: '', + denied: '', + search: '', + crown: '', + boost: '', + bot: '', + status: { + online: '', + idle: '', + dnd: '', + offline: '' + } + }, + + // Permission levels + permLevels: [ + { + level: 0, + name: 'User', + check: () => true + }, + + { + level: 1, + name: 'Moderator', + check: (message) => { + try { + if (message.member.roles.cache.has(message.settings.modRole)) return true + } catch (e) { + return false + } + } + }, + + { + level: 2, + name: 'Administrator', + check: (message) => { + try { + if (message.member.roles.cache.has(message.settings.adminRole) || message.member.permissions.has('ADMINISTRATOR')) return true + } catch (e) { + return false + } + } + }, + + { + level: 3, + name: 'Server Owner', + + check: (message) => message.channel.type === 'text' ? (message.guild.ownerID === message.author.id) : false + } + ] +} + +module.exports = config \ No newline at end of file From 02e570eb009a5598e285004296e3ea0b6dd64108 Mon Sep 17 00:00:00 2001 From: mudkipscience Date: Fri, 3 Apr 2020 17:26:16 +1100 Subject: [PATCH 030/156] adfghjfx --- .eslintrc.js | 32 ++- commands/eval.js | 48 ++++ configTemplate.js | 2 +- events/message.js | 2 +- index.js | 16 +- modules/functions.js | 72 ++--- modules/music.js | 149 +--------- package-lock.json | 655 ++++++++++++++++++++++++++++++++++++++++++- package.json | 9 +- 9 files changed, 773 insertions(+), 212 deletions(-) create mode 100644 commands/eval.js diff --git a/.eslintrc.js b/.eslintrc.js index 0033eb9..67acfd6 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -1,16 +1,18 @@ module.exports = { - "env": { - "es6": true, - "node": true - }, - "extends": "eslint:recommended", - "globals": { - "Atomics": "readonly", - "SharedArrayBuffer": "readonly" - }, - "parserOptions": { - "ecmaVersion": 2018 - }, - "rules": { - } -}; \ No newline at end of file + env: { + es6: true, + node: true + }, + extends: [ + 'standard' + ], + globals: { + Atomics: 'readonly', + SharedArrayBuffer: 'readonly' + }, + parserOptions: { + ecmaVersion: 2018 + }, + rules: { + } +} diff --git a/commands/eval.js b/commands/eval.js new file mode 100644 index 0000000..1ea4b5d --- /dev/null +++ b/commands/eval.js @@ -0,0 +1,48 @@ +/* eslint-disable no-eval */ + +exports.conf = { + enabled: true, + guildOnly: false, + aliases: [], + permLevel: 'Developer', + requiredPerms: [] +} + +exports.help = { + name: 'eval', + category: 'Owner', + description: 'Evaluates arbitrary javascript.', + usage: 'eval [code]' +} + +exports.run = async (client, message, args) => { + const hastebin = require('hastebin-gen') + const code = args.join(' ') + try { + const evaled = eval(code) + const clean = await client.clean(client, evaled) + + if (clean.length > 2000) { + hastebin(clean, { extension: 'txt' }).then(haste => { + return message.channel.send('`OUTPUT`\n' + haste) + }).catch(error => { + client.logger.error(error) + }) + + return + } + message.channel.send(`\`OUTPUT\` \`\`\`js\n${await clean}\n\`\`\``) + } catch (err) { + const errclean = await client.clean(client, err) + if (errclean.length > 2000) { + hastebin(errclean, { extension: 'txt' }).then(haste => { + return message.channel.send('`ERROR`\n' + haste) + }).catch(error => { + client.logger.error(error) + }) + + return + } + message.channel.send(`\`ERROR\` \`\`\`xl\n${await errclean}\n\`\`\``) + } +} diff --git a/configTemplate.js b/configTemplate.js index 396be45..09bef32 100644 --- a/configTemplate.js +++ b/configTemplate.js @@ -84,4 +84,4 @@ const config = { ] } -module.exports = config \ No newline at end of file +module.exports = config diff --git a/events/message.js b/events/message.js index d6579f9..cc3a44e 100644 --- a/events/message.js +++ b/events/message.js @@ -32,7 +32,7 @@ module.exports = async (client, message) => { // Dev perm level is separate so dev's don't get owner perms where they shouldn't have them if (cmd.conf.permLevel === 'Developer') { - if (!message.client.config.owners.includes(message.author.id)) { + if (!client.config.devs.includes(message.author.id)) { return message.channel.send('You don\'t have permission to run this command!') } } diff --git a/index.js b/index.js index ed8ee85..475c693 100644 --- a/index.js +++ b/index.js @@ -17,15 +17,15 @@ const client = new Discord.Client({ disabledEvents: ['TYPING_START'] }) // Logger client.logger = require('tracer').colorConsole({ format: [ - '{{timestamp}} | {{title}} | {{file}}:{{line}} | {{message}}', + '{{timestamp}} | {{title}} | {{file}} | {{message}}', { - debug: `{{timestamp}} | ${'{{title}}'.magenta} | {{file}}:{{line}} | {{message}}`, - log: `{{timestamp}} | ${'{{title}}'.white} | {{file}}:{{line}} | {{message}}`, - info: `{{timestamp}} | ${'{{title}}'.cyan} | {{file}}:{{line}} | {{message}}`, - ready: `{{timestamp}} | ${'{{title}}'.green} | {{file}}:{{line}} | {{message}}`, - warn: `{{timestamp}} | ${'{{title}}'.yellow} | {{file}}:{{line}} | {{message}}`, - error: `{{timestamp}} | ${'{{title}}'.red} | {{file}}:{{line}} | {{message}}`, - fatal: `{{timestamp}} | ${'{{title}}'.red.bold} | {{file}}:{{line}} | {{message}}` + debug: `{{timestamp}} | ${'{{title}}'.magenta} | {{file}} | {{message}}`, + log: `{{timestamp}} | ${'{{title}}'.white} | {{file}} | {{message}}`, + info: `{{timestamp}} | ${'{{title}}'.cyan} | {{file}} | {{message}}`, + ready: `{{timestamp}} | ${'{{title}}'.green} | {{file}} | {{message}}`, + warn: `{{timestamp}} | ${'{{title}}'.yellow} | {{file}} | {{message}}`, + error: `{{timestamp}} | ${'{{title}}'.red} | {{file}} | {{message}}`, + fatal: `{{timestamp}} | ${'{{title}}'.red.bold} | {{file}} | {{message}}` } ], dateformat: 'yyyy-mm-dd"T"HH:MM:ss', diff --git a/modules/functions.js b/modules/functions.js index 0f9dd60..da18d9b 100644 --- a/modules/functions.js +++ b/modules/functions.js @@ -40,7 +40,7 @@ module.exports = client => { } else if (client.aliases.has(commandName)) { command = client.commands.get(client.aliases.get(commandName)) } - if (!command) return `The command \`${commandName}\` doesn"t seem to exist, nor is it an alias. Try again!` + if (!command) return `The command \`${commandName}\` doesn't seem to exist, nor is it an alias. Try again!` if (command.shutdown) { await command.shutdown(client) @@ -56,6 +56,21 @@ module.exports = client => { return false } + client.clean = async (client, text) => { + if (text && text.constructor.name === 'Promise') { + text = await text + } + if (typeof text !== 'string') { + text = require('util').inspect(text, { depth: 1 }) + } + text = text + .replace(/`/g, '`' + String.fromCharCode(8203)) + .replace(/@/g, '@' + String.fromCharCode(8203)) + .replace(client.token, 'mfa.VkO_2G4Qv3T--NO--lWetW_tjND--TOKEN--QFTm6YGtzq9PH--4U--tG0') + + return text + } + client.getMembers = function (guild, query) { if (!query) return query = query.toLowerCase() @@ -82,43 +97,30 @@ module.exports = client => { return a } - client.findUser = function (query) { - if (!query || typeof query !== "string") return - query = query.toLowerCase() + client.getMembers = function (guild, query) { + if (!query || typeof query !== 'string') return - let user + const members = [] - if (query.match(/^<@!?(\d+)>$/)) { - let id = query.match(/^<@!?(\d+)>$/)[1] - user = this.users.fetch(id).catch((err) => {}) - if(user) return user - } - } - - client.getUsers = function (guild, query) { - if (!query) return - query = query.toLowerCase() - - var a = [] - var b - - // MAKE IT SO IT CAN TAKE AN ID - - try { - b = guild.members.cache.find(x => x.displayName.toLowerCase() === query) - if (!b) guild.members.cache.find(x => x.user.username.toLowerCase() === query) - } catch (err) {} - if (b) a.push(b) - guild.members.cache.forEach(member => { - if ( - (member.displayName.toLowerCase().startsWith(query) || - member.user.tag.toLowerCase().startsWith(query)) && - member.id !== (b && b.id) - ) { - a.push(member) + // Try ID search + if (!isNaN(query) === true) { + members.push(guild.members.cache.get(query)) + if (members[0]) { + return members[0] } - }) - return a + } + + // Try username search + try { + guild.members.cache.forEach(m => { + if (m.displayName.toLowerCase().startsWith(query) || m.user.tag.toLowerCase.startsWith(query)) { + members.push(m) + console.log(m) + } + }) + + return members + } catch (err) {} } // Both of these functions catch errors and log them diff --git a/modules/music.js b/modules/music.js index daa8fa9..a985a04 100644 --- a/modules/music.js +++ b/modules/music.js @@ -1,156 +1,11 @@ +/* const ytdl = require('ytdl-core-discord') const youtubeInfo = require('youtube-info') const getYoutubeId = require('get-youtube-id') const fetch = require('node-fetch') +*/ module.exports = client => { - client.music = { guilds: {} } - - client.music.isYoutubeLink = function (input) { - return input.startsWith('https://www.youtube.com/') || input.startsWith('http://www.youtube.com/') || input.startsWith('https://youtube.com/') || input.startsWith('http://youtube.com/') || input.startsWith('https://youtu.be/') || input.startsWith('http://youtu.be/') || input.startsWith('http://m.youtube.com/') || input.startsWith('https://m.youtube.com/') - } - - client.music.search = async function (query) { - return new Promise(function (resolve, reject) { - try { - fetch('https://www.googleapis.com/youtube/v3/search?part=id&type=video&q=' + encodeURIComponent(query) + '&key=' + process.env.YTKEY) - .then(res => res.json()) - .then(json => { - if (!json.items) { reject() } - resolve(json.items[0]) - }) - } catch (err) { - client.logger.error('Music search err: ', err) - throw err - } - }) - } - - client.music.getGuild = function (id) { - if (client.music.guilds[id]) return client.music.guilds[id] - return client.music.guilds[id] = { - queue: [], - playing: false, - paused: false, - dispatcher: null, - skippers: [] - } - } - - client.music.getMeta = async function(id) - { - return new Promise(function(resolve, reject) - { - youtubeInfo(id, function(err, videoInfo) - { - if(err) throw err - - resolve(videoInfo) - }) - }) - } - - client.music.play = async function(message, input, bypassQueue) - { - let voiceChannel = message.member.voice.channel - if(!voiceChannel) return message.channel.send('<:error:466995152976871434> You need to be in a voice channel to use this command!') - - let permissions = voiceChannel.permissionsFor(client.user) - if (!permissions.has('CONNECT')) { - return message.channel.send('<:error:466995152976871434> I do not have permission to join your voice channel.') - } - if (!permissions.has('SPEAK')) { - return message.channel.send('<:error:466995152976871434> I do not have permission to join your voice channel.') - } - if (voiceChannel.joinable != true) { - return message.channel.send("<:error:466995152976871434> I do not have permission to join your voice channel.") - } - - let id = undefined - - if(client.music.isYoutubeLink(input)) - { - id = await getYoutubeId(input) - } else { - let item = await client.music.search(input) - if(!item) { - return message.channel.send(`<:error:466995152976871434> No results found.`) - } - id = item.id.videoId - } - - // music "playing", nothing in queue - if((client.music.getGuild(message.guild.id).playing || client.music.getGuild(message.guild.id).dispatcher) && client.music.getGuild(message.guild.id).queue.length == 0) { - client.music.getGuild(message.guild.id).playing = false; - client.music.getGuild(message.guild.id).dispatcher = null; - // music not playing, something is in queue - } else if(!client.music.getGuild(message.guild.id).playing && !client.music.getGuild(message.guild.id).dispatcher && client.music.getGuild(message.guild.id).queue.length > 0) { - client.music.getGuild(message.guild.id).queue = []; - }; - - if(client.music.getGuild(message.guild.id).queue.length == 0 || bypassQueue) - { - let meta = await client.music.getMeta(id) - - if(!bypassQueue) client.music.getGuild(message.guild.id).queue.push({input: input, id: id, requestedBy: message.author, title: meta.title, author: meta.owner, thumbnail: meta.thumbnailUrl, duration: meta.duration}) - - let connection = await new Promise((resolve, reject) => - { - voiceChannel.join().then((connection) => - { - resolve(connection) - }) - }) - - function end(silent) - { - client.music.getGuild(message.guild.id).queue.shift() - client.music.getGuild(message.guild.id).dispatcher = null - - if(client.music.getGuild(message.guild.id).queue.length > 0) - { - client.music.play(message, client.music.getGuild(message.guild.id).queue[0].input, true) - } else { - client.music.getGuild(message.guild.id).playing = false - - if(!silent) { - message.channel.send("<:play:467216788187512832> Queue is empty! Disconnecting from the voice channel.") - } - - connection.disconnect() - } - } - - client.music.getGuild(message.guild.id).playing = true - - let song = client.music.getGuild(message.guild.id).queue[0] - - try - { - let dispatcher = client.music.getGuild(message.guild.id).dispatcher = connection.play(await ytdl("https://www.youtube.com/watch?v=" + id, {highWaterMark: 1024 * 1024 * 32}), {type: 'opus'}) - - dispatcher.on('finish', (a, b) => - { - end(a == "silent") - }) - } catch(err) { - message.channel.send('<:error:466995152976871434> Failed to play **' + song.title + '** ' + err) - - end() - } - - client.music.getGuild(message.guild.id).skippers = [] - message.channel.send(`<:play:467216788187512832> Now playing: **${song.title}**`) - } else { - let meta = await client.music.getMeta(id) - let song = {input: input, id: id, requestedBy: message.author, title: meta.title, author: meta.owner, thumbnail: meta.thumbnailUrl, duration: meta.duration} - - client.music.getGuild(message.guild.id).queue.push(song) - - message.channel.send(`<:success:466995111885144095> Added to queue: **${song.title}**`) - } - } - // MUSIC - TIMESTAMP client.createTimestamp = function (duration) { var hrs = ~~(duration / 60 / 60) diff --git a/package-lock.json b/package-lock.json index e9002e9..3def006 100644 --- a/package-lock.json +++ b/package-lock.json @@ -370,6 +370,27 @@ "sprintf-js": "~1.0.2" } }, + "array-includes": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.1.tgz", + "integrity": "sha512-c2VXaCHl7zPsvpkFsw4nxvFie4fh1ur9bpcgsVkIjqn0H/Xwdg+7fv3n2r/isyS8EBj5b06M9kHyZuIr4El6WQ==", + "dev": true, + "requires": { + "define-properties": "^1.1.3", + "es-abstract": "^1.17.0", + "is-string": "^1.0.5" + } + }, + "array.prototype.flat": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.2.3.tgz", + "integrity": "sha512-gBlRZV0VSmfPIeWfuuy56XZMvbVfbEUnOXUvt3F/eUUUSyzlgLxhEX4YAEpxNAogRGehPSnfXyPtYyKAhkzQhQ==", + "dev": true, + "requires": { + "define-properties": "^1.1.3", + "es-abstract": "^1.17.0-next.1" + } + }, "asn1": { "version": "0.2.4", "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz", @@ -626,6 +647,12 @@ "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" }, + "contains-path": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/contains-path/-/contains-path-0.1.0.tgz", + "integrity": "sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo=", + "dev": true + }, "convert-source-map": { "version": "1.7.0", "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz", @@ -720,6 +747,15 @@ "strip-bom": "^4.0.0" } }, + "define-properties": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz", + "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==", + "dev": true, + "requires": { + "object-keys": "^1.0.12" + } + }, "delayed-stream": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", @@ -803,6 +839,45 @@ "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz", "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==" }, + "error-ex": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", + "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", + "dev": true, + "requires": { + "is-arrayish": "^0.2.1" + } + }, + "es-abstract": { + "version": "1.17.5", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.5.tgz", + "integrity": "sha512-BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg==", + "dev": true, + "requires": { + "es-to-primitive": "^1.2.1", + "function-bind": "^1.1.1", + "has": "^1.0.3", + "has-symbols": "^1.0.1", + "is-callable": "^1.1.5", + "is-regex": "^1.0.5", + "object-inspect": "^1.7.0", + "object-keys": "^1.1.1", + "object.assign": "^4.1.0", + "string.prototype.trimleft": "^2.1.1", + "string.prototype.trimright": "^2.1.1" + } + }, + "es-to-primitive": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", + "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==", + "dev": true, + "requires": { + "is-callable": "^1.1.4", + "is-date-object": "^1.0.1", + "is-symbol": "^1.0.2" + } + }, "es6-error": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz", @@ -947,6 +1022,241 @@ } } }, + "eslint-config-standard": { + "version": "14.1.1", + "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-14.1.1.tgz", + "integrity": "sha512-Z9B+VR+JIXRxz21udPTL9HpFMyoMUEeX1G251EQ6e05WD9aPVtVBn09XUmZ259wCMlCDmYDSZG62Hhm+ZTJcUg==", + "dev": true + }, + "eslint-import-resolver-node": { + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.3.tgz", + "integrity": "sha512-b8crLDo0M5RSe5YG8Pu2DYBj71tSB6OvXkfzwbJU2w7y8P4/yo0MyF8jU26IEuEuHF2K5/gcAJE3LhQGqBBbVg==", + "dev": true, + "requires": { + "debug": "^2.6.9", + "resolve": "^1.13.1" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "requires": { + "ms": "2.0.0" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "dev": true + } + } + }, + "eslint-module-utils": { + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.6.0.tgz", + "integrity": "sha512-6j9xxegbqe8/kZY8cYpcp0xhbK0EgJlg3g9mib3/miLaExuuwc3n5UEfSnU6hWMbT0FAYVvDbL9RrRgpUeQIvA==", + "dev": true, + "requires": { + "debug": "^2.6.9", + "pkg-dir": "^2.0.0" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "requires": { + "ms": "2.0.0" + } + }, + "find-up": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", + "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", + "dev": true, + "requires": { + "locate-path": "^2.0.0" + } + }, + "locate-path": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", + "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", + "dev": true, + "requires": { + "p-locate": "^2.0.0", + "path-exists": "^3.0.0" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "dev": true + }, + "p-limit": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz", + "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==", + "dev": true, + "requires": { + "p-try": "^1.0.0" + } + }, + "p-locate": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", + "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", + "dev": true, + "requires": { + "p-limit": "^1.1.0" + } + }, + "p-try": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", + "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=", + "dev": true + }, + "path-exists": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", + "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", + "dev": true + }, + "pkg-dir": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz", + "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=", + "dev": true, + "requires": { + "find-up": "^2.1.0" + } + } + } + }, + "eslint-plugin-es": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-3.0.0.tgz", + "integrity": "sha512-6/Jb/J/ZvSebydwbBJO1R9E5ky7YeElfK56Veh7e4QGFHCXoIXGH9HhVz+ibJLM3XJ1XjP+T7rKBLUa/Y7eIng==", + "dev": true, + "requires": { + "eslint-utils": "^2.0.0", + "regexpp": "^3.0.0" + }, + "dependencies": { + "eslint-utils": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.0.0.tgz", + "integrity": "sha512-0HCPuJv+7Wv1bACm8y5/ECVfYdfsAm9xmVb7saeFlxjPYALefjhbYoCkBjPdPzGH8wWyTpAez82Fh3VKYEZ8OA==", + "dev": true, + "requires": { + "eslint-visitor-keys": "^1.1.0" + } + }, + "regexpp": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.0.0.tgz", + "integrity": "sha512-Z+hNr7RAVWxznLPuA7DIh8UNX1j9CDrUQxskw9IrBE1Dxue2lyXT+shqEIeLUjrokxIP8CMy1WkjgG3rTsd5/g==", + "dev": true + } + } + }, + "eslint-plugin-import": { + "version": "2.20.2", + "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.20.2.tgz", + "integrity": "sha512-FObidqpXrR8OnCh4iNsxy+WACztJLXAHBO5hK79T1Hc77PgQZkyDGA5Ag9xAvRpglvLNxhH/zSmZ70/pZ31dHg==", + "dev": true, + "requires": { + "array-includes": "^3.0.3", + "array.prototype.flat": "^1.2.1", + "contains-path": "^0.1.0", + "debug": "^2.6.9", + "doctrine": "1.5.0", + "eslint-import-resolver-node": "^0.3.2", + "eslint-module-utils": "^2.4.1", + "has": "^1.0.3", + "minimatch": "^3.0.4", + "object.values": "^1.1.0", + "read-pkg-up": "^2.0.0", + "resolve": "^1.12.0" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "requires": { + "ms": "2.0.0" + } + }, + "doctrine": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz", + "integrity": "sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=", + "dev": true, + "requires": { + "esutils": "^2.0.2", + "isarray": "^1.0.0" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "dev": true + } + } + }, + "eslint-plugin-node": { + "version": "11.1.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-node/-/eslint-plugin-node-11.1.0.tgz", + "integrity": "sha512-oUwtPJ1W0SKD0Tr+wqu92c5xuCeQqB3hSCHasn/ZgjFdA9iDGNkNf2Zi9ztY7X+hNuMib23LNGRm6+uN+KLE3g==", + "dev": true, + "requires": { + "eslint-plugin-es": "^3.0.0", + "eslint-utils": "^2.0.0", + "ignore": "^5.1.1", + "minimatch": "^3.0.4", + "resolve": "^1.10.1", + "semver": "^6.1.0" + }, + "dependencies": { + "eslint-utils": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.0.0.tgz", + "integrity": "sha512-0HCPuJv+7Wv1bACm8y5/ECVfYdfsAm9xmVb7saeFlxjPYALefjhbYoCkBjPdPzGH8wWyTpAez82Fh3VKYEZ8OA==", + "dev": true, + "requires": { + "eslint-visitor-keys": "^1.1.0" + } + }, + "ignore": { + "version": "5.1.4", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.4.tgz", + "integrity": "sha512-MzbUSahkTW1u7JpKKjY7LCARd1fU5W2rLdxlM4kdkayuCwZImjkpluF9CM1aLewYJguPDqewLam18Y6AU69A8A==", + "dev": true + } + } + }, + "eslint-plugin-promise": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-4.2.1.tgz", + "integrity": "sha512-VoM09vT7bfA7D+upt+FjeBO5eHIJQBUWki1aPvB+vbNiHS3+oGIJGIeyBtKQTME6UPXXy3vV07OL1tHd3ANuDw==", + "dev": true + }, + "eslint-plugin-standard": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-standard/-/eslint-plugin-standard-4.0.1.tgz", + "integrity": "sha512-v/KBnfyaOMPmZc/dmc6ozOdWqekGp7bBGq4jLAecEfPGmfKiWS4sA8sC0LqiV9w5qmXAtXVn4M3p1jSyhY85SQ==", + "dev": true + }, "eslint-scope": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.0.0.tgz", @@ -1169,6 +1479,12 @@ "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" }, + "function-bind": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", + "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", + "dev": true + }, "functional-red-black-tree": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz", @@ -1251,11 +1567,26 @@ "har-schema": "^1.0.5" } }, + "has": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", + "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", + "dev": true, + "requires": { + "function-bind": "^1.1.1" + } + }, "has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" }, + "has-symbols": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz", + "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==", + "dev": true + }, "hasha": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/hasha/-/hasha-5.2.0.tgz", @@ -1265,6 +1596,14 @@ "type-fest": "^0.8.0" } }, + "hastebin-gen": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/hastebin-gen/-/hastebin-gen-2.0.5.tgz", + "integrity": "sha512-At1LaKtcqh2jiP8xfE2sDGT9IshIki6FqsgLwn2y7FzAvlFJRtpUsSPh3yWjWIQIvxi/GPF07IBqSI8WhPL/gQ==", + "requires": { + "node-fetch": "^2.6.0" + } + }, "hawk": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz", @@ -1281,6 +1620,12 @@ "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz", "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=" }, + "hosted-git-info": { + "version": "2.8.8", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz", + "integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==", + "dev": true + }, "html-entities": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.2.1.tgz", @@ -1440,6 +1785,24 @@ } } }, + "is-arrayish": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", + "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=", + "dev": true + }, + "is-callable": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.5.tgz", + "integrity": "sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q==", + "dev": true + }, + "is-date-object": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz", + "integrity": "sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==", + "dev": true + }, "is-docker": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.0.0.tgz", @@ -1471,11 +1834,35 @@ "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=", "dev": true }, + "is-regex": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz", + "integrity": "sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ==", + "dev": true, + "requires": { + "has": "^1.0.3" + } + }, "is-stream": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz", "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==" }, + "is-string": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.5.tgz", + "integrity": "sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ==", + "dev": true + }, + "is-symbol": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz", + "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==", + "dev": true, + "requires": { + "has-symbols": "^1.0.1" + } + }, "is-typedarray": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", @@ -1486,6 +1873,12 @@ "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz", "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==" }, + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, "isexe": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", @@ -1668,6 +2061,26 @@ "type-check": "~0.3.2" } }, + "load-json-file": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz", + "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=", + "dev": true, + "requires": { + "graceful-fs": "^4.1.2", + "parse-json": "^2.2.0", + "pify": "^2.0.0", + "strip-bom": "^3.0.0" + }, + "dependencies": { + "strip-bom": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", + "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=", + "dev": true + } + } + }, "locate-path": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", @@ -1794,6 +2207,26 @@ "process-on-spawn": "^1.0.0" } }, + "normalize-package-data": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", + "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==", + "dev": true, + "requires": { + "hosted-git-info": "^2.1.4", + "resolve": "^1.10.0", + "semver": "2 || 3 || 4 || 5", + "validate-npm-package-license": "^3.0.1" + }, + "dependencies": { + "semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "dev": true + } + } + }, "nth-check": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz", @@ -1842,6 +2275,42 @@ "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz", "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=" }, + "object-inspect": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.7.0.tgz", + "integrity": "sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw==", + "dev": true + }, + "object-keys": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", + "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", + "dev": true + }, + "object.assign": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz", + "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==", + "dev": true, + "requires": { + "define-properties": "^1.1.2", + "function-bind": "^1.1.1", + "has-symbols": "^1.0.0", + "object-keys": "^1.0.11" + } + }, + "object.values": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.1.tgz", + "integrity": "sha512-WTa54g2K8iu0kmS/us18jEmdv1a4Wi//BZ/DTVYEcH0XhLM5NYdpDHja3gt57VrZLcNAO2WGA+KpWsDBaHt6eA==", + "dev": true, + "requires": { + "define-properties": "^1.1.3", + "es-abstract": "^1.17.0-next.1", + "function-bind": "^1.1.1", + "has": "^1.0.3" + } + }, "once": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", @@ -1928,6 +2397,15 @@ "callsites": "^3.0.0" } }, + "parse-json": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz", + "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=", + "dev": true, + "requires": { + "error-ex": "^1.2.0" + } + }, "path-exists": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", @@ -1948,11 +2426,26 @@ "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz", "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==" }, + "path-type": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz", + "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=", + "dev": true, + "requires": { + "pify": "^2.0.0" + } + }, "performance-now": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz", "integrity": "sha1-M+8wxcd9TqIcWlOGnZG1bY8lVeU=" }, + "pify": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", + "dev": true + }, "pkg-dir": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", @@ -1996,6 +2489,78 @@ "resolved": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz", "integrity": "sha1-E+JtKK1rD/qpExLNO/cI7TUecjM=" }, + "read-pkg": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz", + "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=", + "dev": true, + "requires": { + "load-json-file": "^2.0.0", + "normalize-package-data": "^2.3.2", + "path-type": "^2.0.0" + } + }, + "read-pkg-up": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz", + "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=", + "dev": true, + "requires": { + "find-up": "^2.0.0", + "read-pkg": "^2.0.0" + }, + "dependencies": { + "find-up": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", + "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", + "dev": true, + "requires": { + "locate-path": "^2.0.0" + } + }, + "locate-path": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", + "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", + "dev": true, + "requires": { + "p-locate": "^2.0.0", + "path-exists": "^3.0.0" + } + }, + "p-limit": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz", + "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==", + "dev": true, + "requires": { + "p-try": "^1.0.0" + } + }, + "p-locate": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", + "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", + "dev": true, + "requires": { + "p-limit": "^1.1.0" + } + }, + "p-try": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", + "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=", + "dev": true + }, + "path-exists": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", + "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", + "dev": true + } + } + }, "regexpp": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-2.0.1.tgz", @@ -2121,9 +2686,9 @@ } }, "rxjs": { - "version": "6.5.4", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.4.tgz", - "integrity": "sha512-naMQXcgEo3csAEGvw/NydRA0fuS2nDZJiw1YUWFKU7aPPAPGZEsD4Iimit96qwCieH6y614MCLYwdkrWx7z/7Q==", + "version": "6.5.5", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.5.tgz", + "integrity": "sha512-WfQI+1gohdf0Dai/Bbmk5L5ItH5tYqm3ki2c5GdWhKjalzjg93N3avFjVStyZZz+A2Em+ZxKH5bNghw9UeylGQ==", "dev": true, "requires": { "tslib": "^1.9.0" @@ -2246,6 +2811,38 @@ "which": "^2.0.1" } }, + "spdx-correct": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz", + "integrity": "sha512-lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q==", + "dev": true, + "requires": { + "spdx-expression-parse": "^3.0.0", + "spdx-license-ids": "^3.0.0" + } + }, + "spdx-exceptions": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz", + "integrity": "sha512-2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA==", + "dev": true + }, + "spdx-expression-parse": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz", + "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==", + "dev": true, + "requires": { + "spdx-exceptions": "^2.1.0", + "spdx-license-ids": "^3.0.0" + } + }, + "spdx-license-ids": { + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz", + "integrity": "sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q==", + "dev": true + }, "sprintf-js": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", @@ -2294,6 +2891,48 @@ "strip-ansi": "^6.0.0" } }, + "string.prototype.trimend": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.0.tgz", + "integrity": "sha512-EEJnGqa/xNfIg05SxiPSqRS7S9qwDhYts1TSLR1BQfYUfPe1stofgGKvwERK9+9yf+PpfBMlpBaCHucXGPQfUA==", + "dev": true, + "requires": { + "define-properties": "^1.1.3", + "es-abstract": "^1.17.5" + } + }, + "string.prototype.trimleft": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz", + "integrity": "sha512-gCA0tza1JBvqr3bfAIFJGqfdRTyPae82+KTnm3coDXkZN9wnuW3HjGgN386D7hfv5CHQYCI022/rJPVlqXyHSw==", + "dev": true, + "requires": { + "define-properties": "^1.1.3", + "es-abstract": "^1.17.5", + "string.prototype.trimstart": "^1.0.0" + } + }, + "string.prototype.trimright": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.2.tgz", + "integrity": "sha512-ZNRQ7sY3KroTaYjRS6EbNiiHrOkjihL9aQE/8gfQ4DtAC/aEBRHFJa44OmoWxGGqXuJlfKkZW4WcXErGr+9ZFg==", + "dev": true, + "requires": { + "define-properties": "^1.1.3", + "es-abstract": "^1.17.5", + "string.prototype.trimend": "^1.0.0" + } + }, + "string.prototype.trimstart": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.0.tgz", + "integrity": "sha512-iCP8g01NFYiiBOnwG1Xc3WZLyoo+RuBymwIlWncShXDDJYWN6DbnM3odslBJdgCdRlq94B5s63NWAZlcn2CS4w==", + "dev": true, + "requires": { + "define-properties": "^1.1.3", + "es-abstract": "^1.17.5" + } + }, "stringstream": { "version": "0.0.6", "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.6.tgz", @@ -2520,6 +3159,16 @@ "integrity": "sha512-usZBT3PW+LOjM25wbqIlZwPeJV+3OSz3M1k1Ws8snlW39dZyYL9lOGC5FgPVHfk0jKmjiDV8Z0mIbVQPiwFs7g==", "dev": true }, + "validate-npm-package-license": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", + "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==", + "dev": true, + "requires": { + "spdx-correct": "^3.0.0", + "spdx-expression-parse": "^3.0.0" + } + }, "verror": { "version": "1.10.0", "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", diff --git a/package.json b/package.json index 18775f1..1a99456 100644 --- a/package.json +++ b/package.json @@ -8,8 +8,8 @@ "discord.js": "^12.1.1", "dotenv": "^8.2.0", "eslint-config-airbnb-base": "^14.1.0", - "eslint-plugin-import": "^2.20.2", "get-youtube-id": "^1.0.1", + "hastebin-gen": "^2.0.5", "is-docker": "^2.0.0", "moment": "^2.24.0", "node-fetch": "^2.6.0", @@ -19,7 +19,12 @@ "ytdl-core-discord": "^1.1.0" }, "devDependencies": { - "eslint": "^6.8.0" + "eslint": "^6.8.0", + "eslint-config-standard": "^14.1.1", + "eslint-plugin-import": "^2.20.2", + "eslint-plugin-node": "^11.1.0", + "eslint-plugin-promise": "^4.2.1", + "eslint-plugin-standard": "^4.0.1" }, "scripts": { "test": "echo \"Error: no test specified\" && exit 1" From 123f5c9c11bbf4ae3464e9f4106b1b9765ac5cc6 Mon Sep 17 00:00:00 2001 From: mudkipscience Date: Fri, 3 Apr 2020 19:31:48 +1100 Subject: [PATCH 031/156] Added back all the missing functions --- modules/functions.js | 119 ++++++++++++++++++++++++++++++------------- modules/music.js | 6 +-- 2 files changed, 87 insertions(+), 38 deletions(-) diff --git a/modules/functions.js b/modules/functions.js index da18d9b..83229d1 100644 --- a/modules/functions.js +++ b/modules/functions.js @@ -1,4 +1,5 @@ module.exports = client => { + // Permission level function client.permlevel = message => { let permlvl = 0 @@ -15,6 +16,7 @@ module.exports = client => { return permlvl } + // Loads commands client.loadCommand = (commandName) => { try { const props = require(`../commands/${commandName}`) @@ -33,6 +35,7 @@ module.exports = client => { } } + // Command unloader client.unloadCommand = async (commandName) => { let command if (client.commands.has(commandName)) { @@ -56,6 +59,7 @@ module.exports = client => { return false } + // Clean up input to remove @everyone, token, etc client.clean = async (client, text) => { if (text && text.constructor.name === 'Promise') { text = await text @@ -71,40 +75,65 @@ module.exports = client => { return text } - client.getMembers = function (guild, query) { - if (!query) return - query = query.toLowerCase() - - var a = [] - var b - - // MAKE IT SO IT CAN TAKE AN ID - + // Single line await messages + client.awaitReply = async (msg, question, limit = 60000) => { + const filter = m => m.author.id === msg.author.id + await msg.channel.send(question) try { - b = guild.members.cache.find(x => x.displayName.toLowerCase() === query) - if (!b) guild.members.cache.find(x => x.user.username.toLowerCase() === query) - } catch (err) {} - if (b) a.push(b) - guild.members.cache.forEach(member => { - if ( - (member.displayName.toLowerCase().startsWith(query) || - member.user.tag.toLowerCase().startsWith(query)) && - member.id !== (b && b.id) - ) { - a.push(member) - } - }) - return a + const collected = await msg.channel.awaitMessages(filter, { + max: 1, + time: limit, + errors: ['time'] + }) + return collected.first().content + } catch (e) { + return false + } } - client.getMembers = function (guild, query) { - if (!query || typeof query !== 'string') return + client.embedColour = function (guild) { + if (!guild || guild.member(client.user).displayHexColor === '#000000') { + return ['#ff9d68', '#ff97cb', '#d789ff', '#74FFFF'].random() + } else { + return guild.member(client.user).displayHexColor + } + } + + // FIND RANDOM INT BETWEEN TWO INTEGERS + client.intBetween = function (min, max) { + return Math.round((Math.random() * (max - min)) + min) + } + + Object.defineProperty(Array.prototype, 'random', { + value: function() { + return this[Math.floor(Math.random() * this.length)] + } + }) + + // `await client.wait(1000);` to 'pause' for 1 second. + client.wait = require('util').promisify(setTimeout) + + // Find guild members + client.findMembers = function (guild, search) { + if (!search || typeof search !== 'string') return const members = [] + let member + + // Try mention + if (search.startsWith('<@') && search.endsWith('>')) { + let mention = search.slice(2, -1) + + if (mention.startsWith('!')) { + mention = mention.slice(1) + } + + return guild.members.cache.get(mention) + } // Try ID search - if (!isNaN(query) === true) { - members.push(guild.members.cache.get(query)) + if (!isNaN(search) === true) { + members.push(guild.members.cache.get(search)) if (members[0]) { return members[0] } @@ -112,15 +141,35 @@ module.exports = client => { // Try username search try { - guild.members.cache.forEach(m => { - if (m.displayName.toLowerCase().startsWith(query) || m.user.tag.toLowerCase.startsWith(query)) { - members.push(m) - console.log(m) - } - }) - - return members + member = guild.members.cache.find(m => m.displayName.toLowerCase() === search) + if (!member) { + guild.members.cache.find(m => m.user.tag.toLowerCase() === search) + } } catch (err) {} + if (member) { + members.push(member) + } + guild.members.cache.forEach(m => { + if (m.displayName.toLowerCase().startsWith(search) || m.user.tag.toLowerCase().startsWith(search)) { + members.push(m) + } + }) + + return members + } + + client.findRole = function (guild, search) { + var role + role = guild.roles.cache.find(r => r.name.toLowerCase() === search.toLowerCase()) + if (!role) { + role = guild.roles.cache.get(search.toLowerCase()) + } + + if (!role) { + return + } + + return role } // Both of these functions catch errors and log them diff --git a/modules/music.js b/modules/music.js index a985a04..0d40e90 100644 --- a/modules/music.js +++ b/modules/music.js @@ -11,15 +11,15 @@ module.exports = client => { var hrs = ~~(duration / 60 / 60) var min = ~~(duration / 60) % 60 var sec = ~~(duration - min * 60) - + if (String(hrs).length < 2) { hrs = '0' + String(hrs) + ':' } - + if (String(min).length < 2) { min = '0' + String(min) } - + if (String(sec).length < 2) { sec = '0' + String(sec) } From 187835991ec7537f5f14609c1085e811300813b5 Mon Sep 17 00:00:00 2001 From: mudkipscience Date: Sat, 4 Apr 2020 01:55:35 +1100 Subject: [PATCH 032/156] idk --- index.js | 76 +++-------- modules/commands.js | 28 ++++ modules/dbfix.js | 0 modules/events.js | 21 +++ modules/functions.js | 6 +- modules/mongoose.js | 33 +++++ modules/{botlists.js => webhooks.js} | 0 package-lock.json | 192 ++++++++++++++++++++++++++- package.json | 1 + 9 files changed, 296 insertions(+), 61 deletions(-) create mode 100644 modules/commands.js create mode 100644 modules/dbfix.js create mode 100644 modules/events.js create mode 100644 modules/mongoose.js rename modules/{botlists.js => webhooks.js} (100%) diff --git a/index.js b/index.js index 475c693..3827160 100644 --- a/index.js +++ b/index.js @@ -14,7 +14,6 @@ const isDocker = require('is-docker') const Discord = require('discord.js') const client = new Discord.Client({ disabledEvents: ['TYPING_START'] }) -// Logger client.logger = require('tracer').colorConsole({ format: [ '{{timestamp}} | {{title}} | {{file}} | {{message}}', @@ -39,12 +38,23 @@ if (fs.existsSync('./config.js') === false) { process.exit() } +client.levelCache = {} +client.commands = new Discord.Collection() +client.cooldown = new Discord.Collection() +client.aliases = new Discord.Collection() + client.config = require('./config') +client.mongoose = require('./modules/mongoose') require('./modules/functions')(client) require('./modules/music')(client) -require('./modules/botlists')(client) +require('./modules/commands')(client) +require('./modules/events')(client) + +for (let i = 0; i < client.config.permLevels.length; i++) { + const thisLevel = client.config.permLevels[i] + client.levelCache[thisLevel.name] = thisLevel.level +} -// Logs into Discord as WoomyDev if a docker container is not detected. Delete this if self-hosting. if (isDocker() === true) { client.devmode = true client.logger.warn('Running in development mode.') @@ -52,59 +62,11 @@ if (isDocker() === true) { client.devmode = false } -client.levelCache = {} -client.commands = new Discord.Collection() -client.cooldown = new Discord.Collection() -client.aliases = new Discord.Collection() +console.log(client.mongoose) +client.mongoose.init() -// Initialization function -const init = async () => { - // Command handler - fs.readdir('./commands', (err, files) => { - if (err) { - client.logger.fatal('Failed to get files in commands directory: ' + err) - process.exit() - } - client.logger.info(`Loading ${files.length} commands.`) - files.forEach(file => { - if (!file.endsWith('.js')) { - return - } - const response = client.loadCommand(file) - if (response) { - client.logger.error(response) - } - }) - }) - - // Event handler - fs.readdir('./events', (err, files) => { - if (err) { - client.logger.fatal('Failed to get files in events directory: ' + err) - process.exit() - } - client.logger.info(`Loading ${files.length} events.`) - files.forEach(file => { - if (!file.endsWith('.js')) { - return - } - const event = require(`./events/${file}`) - client.on(file.substr(0, file.length - 3), event.bind(null, client)) - }) - }) - - // Cache client permissions - for (let i = 0; i < client.config.permLevels.length; i++) { - const thisLevel = client.config.permLevels[i] - client.levelCache[thisLevel.name] = thisLevel.level - } - - // Log into Discord - if (client.devmode !== true) { - client.login(client.config.token) - } else { - client.login(client.config.token_dev) - } +if (client.devmode !== true) { + client.login(client.config.token) +} else { + client.login(client.config.token_dev) } - -init() diff --git a/modules/commands.js b/modules/commands.js new file mode 100644 index 0000000..2646a7d --- /dev/null +++ b/modules/commands.js @@ -0,0 +1,28 @@ +const fs = require('fs') +module.exports = client => { + fs.readdir('./commands', (err, files) => { + if (err) { + client.logger.fatal('Failed to get files in commands directory: ' + err) + process.exit() + } + client.logger.info(`Loading ${files.length} commands.`) + files.forEach(file => { + if (!file.endsWith('.js')) { + return + } + try { + const props = require(`../commands/${file}`) + if (props.init) { + props.init(client) + } + client.commands.set(props.help.name, props) + client.cooldown.set(props.help.name, new Map()) + props.conf.aliases.forEach(alias => { + client.aliases.set(alias, props.help.name) + }) + } catch (err) { + client.logger.error(`Failed to load ${file}: ${err}`) + } + }) + }) +} diff --git a/modules/dbfix.js b/modules/dbfix.js new file mode 100644 index 0000000..e69de29 diff --git a/modules/events.js b/modules/events.js new file mode 100644 index 0000000..dbb7229 --- /dev/null +++ b/modules/events.js @@ -0,0 +1,21 @@ +const fs = require('fs') +module.exports = client => { + fs.readdir('./events', (err, files) => { + if (err) { + client.logger.fatal('Failed to get files in events directory: ' + err) + process.exit() + } + client.logger.info(`Loading ${files.length} events.`) + files.forEach(file => { + if (!file.endsWith('.js')) { + return + } + try { + const event = require(`../events/${file}`) + client.on(file.substr(0, file.length - 3), event.bind(null, client)) + } catch (err) { + client.logger.error(`Failed to load ${file}: ${err}`) + } + }) + }) +} diff --git a/modules/functions.js b/modules/functions.js index 83229d1..a0725fc 100644 --- a/modules/functions.js +++ b/modules/functions.js @@ -104,8 +104,10 @@ module.exports = client => { return Math.round((Math.random() * (max - min)) + min) } + // Get random array object + // eslint-disable-next-line no-extend-native Object.defineProperty(Array.prototype, 'random', { - value: function() { + value: function () { return this[Math.floor(Math.random() * this.length)] } }) @@ -172,7 +174,7 @@ module.exports = client => { return role } - // Both of these functions catch errors and log them + // Both of these functions catch errors and log them (maybe we could use sentry?) process.on('uncaughtException', (err) => { const errorMsg = err.stack.replace(new RegExp(`${__dirname}/`, 'g'), './') client.logger.fatal(`Uncaught Exception: ${errorMsg}`) diff --git a/modules/mongoose.js b/modules/mongoose.js new file mode 100644 index 0000000..3dd45d5 --- /dev/null +++ b/modules/mongoose.js @@ -0,0 +1,33 @@ +const mongoose = require('mongoose') + +// doesnt work + +module.exports = { + init: () => { + const dbOps = { + useNewUrlParser: true, + autoIndex: false, + reconnectTries: Number.MAX_VALUE, + reconnectInterval: 500, + poolSize: 5, + connectTimeoutMS: 10000, + family: 4 + } + + mongoose.connect(client.config.mongoDB, dbOps) + mongoose.set('useFindAndModify', false) + mongoose.Promise = global.Promise + + mongoose.connection.on('connected', () => { + client.logger.info('Database connection established.') + }) + + mongoose.connection.on('err', err => { + client.logger.error(`Database connection error:\n ${err.stack}`) + }) + + mongoose.connection.on('disconnected', () => { + client.logger.info('Disconected from database.') + }) + } +} diff --git a/modules/botlists.js b/modules/webhooks.js similarity index 100% rename from modules/botlists.js rename to modules/webhooks.js diff --git a/package-lock.json b/package-lock.json index 3def006..de8afb6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -445,6 +445,15 @@ } } }, + "bl": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/bl/-/bl-2.2.0.tgz", + "integrity": "sha512-wbgvOpqopSr7uq6fJrLH8EsvYMJf9gzfo2jCsL2eTy75qXPukA4pCgHamOQkZtY5vmfVtjB+P3LNlMHW5CEZXA==", + "requires": { + "readable-stream": "^2.3.5", + "safe-buffer": "^5.1.1" + } + }, "bluebird": { "version": "3.7.2", "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", @@ -472,6 +481,11 @@ "concat-map": "0.0.1" } }, + "bson": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/bson/-/bson-1.1.4.tgz", + "integrity": "sha512-S/yKGU1syOMzO86+dGpg2qGoDL0zvzcb262G+gqEy6TgP6rt6z6qxSFX/8X6vLC91P7G7C3nLs0+bvDzmvBA3Q==" + }, "caching-transform": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/caching-transform/-/caching-transform-4.0.0.tgz", @@ -761,6 +775,11 @@ "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=" }, + "denque": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/denque/-/denque-1.4.1.tgz", + "integrity": "sha512-OfzPuSZKGcgr96rf1oODnfjqBFmr1DVoc/TrItj3Ohe0Ah1C5WX5Baquw/9U9KovnQ88EqmJbD66rKYUQYN1tQ==" + }, "discord.js": { "version": "12.1.1", "resolved": "https://registry.npmjs.org/discord.js/-/discord.js-12.1.1.tgz", @@ -1876,8 +1895,7 @@ "isarray": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", - "dev": true + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" }, "isexe": { "version": "2.0.0", @@ -2051,6 +2069,11 @@ } } }, + "kareem": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/kareem/-/kareem-2.3.1.tgz", + "integrity": "sha512-l3hLhffs9zqoDe8zjmb/mAN4B8VT3L56EUvKNqLFVs9YlFA+zx7ke1DO8STAdDyYNkeSo1nKmjuvQeI12So8Xw==" + }, "levn": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", @@ -2121,6 +2144,12 @@ "semver": "^6.0.0" } }, + "memory-pager": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/memory-pager/-/memory-pager-1.5.0.tgz", + "integrity": "sha512-ZS4Bp4r/Zoeq6+NLJpP+0Zzm0pR8whtGPf1XExKLJBAczGMnSi3It14OiNCStjQjM6NU1okjQGSxgEZN8eBYKg==", + "optional": true + }, "mime-db": { "version": "1.43.0", "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.43.0.tgz", @@ -2171,6 +2200,79 @@ "resolved": "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz", "integrity": "sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==" }, + "mongodb": { + "version": "3.5.5", + "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-3.5.5.tgz", + "integrity": "sha512-GCjDxR3UOltDq00Zcpzql6dQo1sVry60OXJY3TDmFc2SWFY6c8Gn1Ardidc5jDirvJrx2GC3knGOImKphbSL3A==", + "requires": { + "bl": "^2.2.0", + "bson": "^1.1.1", + "denque": "^1.4.1", + "require_optional": "^1.0.1", + "safe-buffer": "^5.1.2", + "saslprep": "^1.0.0" + } + }, + "mongoose": { + "version": "5.9.7", + "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-5.9.7.tgz", + "integrity": "sha512-WJOBh9WMvivqBK8my9HFtSzSySKdUxJPNGAwswEakAasWUcPXJl3yHMtZ4ngGnKbwTT9KnAr75xamlt/PouR9w==", + "requires": { + "bson": "~1.1.1", + "kareem": "2.3.1", + "mongodb": "3.5.5", + "mongoose-legacy-pluralize": "1.0.2", + "mpath": "0.6.0", + "mquery": "3.2.2", + "ms": "2.1.2", + "regexp-clone": "1.0.0", + "safe-buffer": "5.1.2", + "sift": "7.0.1", + "sliced": "1.0.1" + } + }, + "mongoose-legacy-pluralize": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/mongoose-legacy-pluralize/-/mongoose-legacy-pluralize-1.0.2.tgz", + "integrity": "sha512-Yo/7qQU4/EyIS8YDFSeenIvXxZN+ld7YdV9LqFVQJzTLye8unujAWPZ4NWKfFA+RNjh+wvTWKY9Z3E5XM6ZZiQ==" + }, + "mpath": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/mpath/-/mpath-0.6.0.tgz", + "integrity": "sha512-i75qh79MJ5Xo/sbhxrDrPSEG0H/mr1kcZXJ8dH6URU5jD/knFxCVqVC/gVSW7GIXL/9hHWlT9haLbCXWOll3qw==" + }, + "mquery": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/mquery/-/mquery-3.2.2.tgz", + "integrity": "sha512-XB52992COp0KP230I3qloVUbkLUxJIu328HBP2t2EsxSFtf4W1HPSOBWOXf1bqxK4Xbb66lfMJ+Bpfd9/yZE1Q==", + "requires": { + "bluebird": "3.5.1", + "debug": "3.1.0", + "regexp-clone": "^1.0.0", + "safe-buffer": "5.1.2", + "sliced": "1.0.1" + }, + "dependencies": { + "bluebird": { + "version": "3.5.1", + "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz", + "integrity": "sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA==" + }, + "debug": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", + "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", + "requires": { + "ms": "2.0.0" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + } + } + }, "ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", @@ -2465,6 +2567,11 @@ "resolved": "https://registry.npmjs.org/prism-media/-/prism-media-1.2.1.tgz", "integrity": "sha512-R3EbKwJiYlTvGwcG1DpUt+06DsxOGS5W4AMEHT7oVOjG93MjpdhGX1whHyjnqknylLMupKAsKMEXcTNRbPe6Vw==" }, + "process-nextick-args": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", + "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==" + }, "process-on-spawn": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/process-on-spawn/-/process-on-spawn-1.0.0.tgz", @@ -2561,6 +2668,25 @@ } } }, + "readable-stream": { + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", + "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "regexp-clone": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/regexp-clone/-/regexp-clone-1.0.0.tgz", + "integrity": "sha512-TuAasHQNamyyJ2hb97IuBEif4qBHGjPHBS64sZwytpLEqtBQ1gPJTnOaQ6qmpET16cK14kkjbazl6+p0RRv0yw==" + }, "regexpp": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-2.0.1.tgz", @@ -2645,6 +2771,27 @@ "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz", "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==" }, + "require_optional": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/require_optional/-/require_optional-1.0.1.tgz", + "integrity": "sha512-qhM/y57enGWHAe3v/NcwML6a3/vfESLe/sGM2dII+gEO0BpKRUkWZow/tyloNqJyN6kXSl3RyyM8Ll5D/sJP8g==", + "requires": { + "resolve-from": "^2.0.0", + "semver": "^5.1.0" + }, + "dependencies": { + "resolve-from": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-2.0.0.tgz", + "integrity": "sha1-lICrIOlP+h2egKgEx+oUdhGWa1c=" + }, + "semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" + } + } + }, "resolve": { "version": "1.15.1", "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.15.1.tgz", @@ -2704,6 +2851,15 @@ "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" }, + "saslprep": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/saslprep/-/saslprep-1.0.3.tgz", + "integrity": "sha512-/MY/PEMbk2SuY5sScONwhUDsV2p77Znkb/q3nSVstq/yQzYJOH/Azh29p9oJLsl3LnQwSvZDKagDGBsBwSooag==", + "optional": true, + "requires": { + "sparse-bitfield": "^3.0.3" + } + }, "sax": { "version": "1.2.4", "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", @@ -2737,6 +2893,11 @@ "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==" }, + "sift": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/sift/-/sift-7.0.1.tgz", + "integrity": "sha512-oqD7PMJ+uO6jV9EQCl0LrRw1OwsiPsiFQR5AR30heR+4Dl7jBBbDLnNvWiak20tzZlSE1H7RB30SX/1j/YYT7g==" + }, "signal-exit": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz", @@ -2785,6 +2946,11 @@ } } }, + "sliced": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/sliced/-/sliced-1.0.1.tgz", + "integrity": "sha1-CzpmK10Ewxd7GSa+qCsD+Dei70E=" + }, "sntp": { "version": "1.0.9", "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz", @@ -2798,6 +2964,15 @@ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=" }, + "sparse-bitfield": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/sparse-bitfield/-/sparse-bitfield-3.0.3.tgz", + "integrity": "sha1-/0rm5oZWBWuks+eSqzM004JzyhE=", + "optional": true, + "requires": { + "memory-pager": "^1.0.2" + } + }, "spawn-wrap": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/spawn-wrap/-/spawn-wrap-2.0.0.tgz", @@ -2933,6 +3108,14 @@ "es-abstract": "^1.17.5" } }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "requires": { + "safe-buffer": "~5.1.0" + } + }, "stringstream": { "version": "0.0.6", "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.6.tgz", @@ -3148,6 +3331,11 @@ } } }, + "util-deprecate": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" + }, "uuid": { "version": "3.4.0", "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", diff --git a/package.json b/package.json index 1a99456..6cbb2cd 100644 --- a/package.json +++ b/package.json @@ -12,6 +12,7 @@ "hastebin-gen": "^2.0.5", "is-docker": "^2.0.0", "moment": "^2.24.0", + "mongoose": "^5.9.7", "node-fetch": "^2.6.0", "prism-media": "^1.2.1", "tracer": "^1.0.2", From a82c054ce303e0d32b133c30e5a86ced428266b7 Mon Sep 17 00:00:00 2001 From: mudkipscience Date: Sat, 4 Apr 2020 17:59:22 +1100 Subject: [PATCH 033/156] Mongo works, added new events --- commands/level.js | 2 +- configTemplate.js | 9 ++- events/disconnect.js | 3 + events/error.js | 3 + events/guildCreate.js | 24 ++++++++ events/message.js | 33 +++++++++-- events/reconnecting.js | 3 + index.js | 85 ++++++++++++++++++++-------- models/guild.js | 29 ++++++++++ modules/dbfix.js => models/member.js | 0 models/user.js | 0 modules/commands.js | 28 --------- modules/events.js | 21 ------- modules/mongoose.js | 33 ----------- util/dbfix.js | 1 + {modules => util}/functions.js | 50 +++++++++++++++- util/mongoose.js | 36 ++++++++++++ {modules => util}/music.js | 0 {modules => util}/webhooks.js | 0 19 files changed, 246 insertions(+), 114 deletions(-) create mode 100644 events/disconnect.js create mode 100644 events/error.js create mode 100644 events/guildCreate.js create mode 100644 events/reconnecting.js create mode 100644 models/guild.js rename modules/dbfix.js => models/member.js (100%) create mode 100644 models/user.js delete mode 100644 modules/commands.js delete mode 100644 modules/events.js delete mode 100644 modules/mongoose.js create mode 100644 util/dbfix.js rename {modules => util}/functions.js (78%) create mode 100644 util/mongoose.js rename {modules => util}/music.js (100%) rename {modules => util}/webhooks.js (100%) diff --git a/commands/level.js b/commands/level.js index ec9ad8f..1c53a7f 100644 --- a/commands/level.js +++ b/commands/level.js @@ -2,7 +2,7 @@ exports.conf = { enabled: true, guildOnly: false, aliases: ['plevel', 'permlevel'], - permLevel: 'User', + permLevel: 'Administrator', requiredPerms: [], cooldown: 2000 } diff --git a/configTemplate.js b/configTemplate.js index 09bef32..e8b940d 100644 --- a/configTemplate.js +++ b/configTemplate.js @@ -23,8 +23,13 @@ const config = { // URL of MongoDB database mongoDB: 'mongodb://localhost:27017/woomy', - // Default prefix - prefix: '~', + // Default settings for guilds + defaultGuildSettings: { + prefix: '~', + systemNotice: true, + modRole: 'Moderator', + adminRole: 'Administrator' + }, // Emojis used by Woomy emojis: { diff --git a/events/disconnect.js b/events/disconnect.js new file mode 100644 index 0000000..0e44cc0 --- /dev/null +++ b/events/disconnect.js @@ -0,0 +1,3 @@ +module.exports = (client) => { + client.logger.warn('Lost connection to Discord.') +} diff --git a/events/error.js b/events/error.js new file mode 100644 index 0000000..f1e3615 --- /dev/null +++ b/events/error.js @@ -0,0 +1,3 @@ +module.exports = async (client, error) => { + client.logger.error(JSON.stringify(error.stack)) +} diff --git a/events/guildCreate.js b/events/guildCreate.js new file mode 100644 index 0000000..40cce63 --- /dev/null +++ b/events/guildCreate.js @@ -0,0 +1,24 @@ +const Discord = require('discord.js') +module.exports = async (client, guild) => { + client.logger.info('Guild joined.') + + // Create DB entry for newly joined guild + try { + const newGuild = { + guildID: guild.id, + guildName: guild.name + } + await client.createGuild(newGuild) + } catch (err) { + client.logger.error('Failed to create DB entry for newly joined guild: ' + err) + } + + if (client.devmode === false) { + const channel = client.channels.cache.get(client.config.support.serverLogs) + // check if has perms, channel exists + const embed = new Discord.MessageEmbed() + embed.setColor('#F38159') + embed.setDescription(`Joined a new server with \`${guild.members.cache.size}\` members! I'm now in \`${client.guilds.cache.size}\` servers.`) + channel.send(embed) + } +} diff --git a/events/message.js b/events/message.js index cc3a44e..01693fb 100644 --- a/events/message.js +++ b/events/message.js @@ -1,7 +1,23 @@ module.exports = async (client, message) => { if (message.author.bot) return - var prefix = '!' + try { + await client.getGuild(message.guild) + } catch (err) { + try { + const newGuild = { + guildID: message.guild.id, + guildName: message.guild.name + } + await client.createGuild(newGuild) + } catch (err) { + client.logger.error('Failed to create DB entry for existing guild: ' + err) + } + } + + const settings = await client.getGuild(message.guild) + + let prefix = settings.prefix const myMention = `<@&${client.user.id}>` const myMention2 = `<@!${client.user.id}>` @@ -33,12 +49,21 @@ module.exports = async (client, message) => { // Dev perm level is separate so dev's don't get owner perms where they shouldn't have them if (cmd.conf.permLevel === 'Developer') { if (!client.config.devs.includes(message.author.id)) { - return message.channel.send('You don\'t have permission to run this command!') + if (settings.systemNotice === true) { + return message.channel.send('You don\'t have permission to run this command!') + } else { + return + } } } + console.log(settings.systemNotice) if (level < client.levelCache[cmd.conf.permLevel]) { - return message.channel.send('You don\'t have permission to run this command!') + if (settings.systemNotice === true) { + return message.channel.send('You don\'t have permission to run this command!') + } else { + return + } } // Cooldown @@ -65,5 +90,5 @@ module.exports = async (client, message) => { } client.logger.log(`Command ran: ${cmd.help.name}`) - cmd.run(client, message, args, level) + cmd.run(client, message, args, level, settings) } diff --git a/events/reconnecting.js b/events/reconnecting.js new file mode 100644 index 0000000..7178034 --- /dev/null +++ b/events/reconnecting.js @@ -0,0 +1,3 @@ +module.exports = (client) => { + client.logger.info('Reconnecting to Discord...') +} diff --git a/index.js b/index.js index 3827160..1340dda 100644 --- a/index.js +++ b/index.js @@ -44,29 +44,68 @@ client.cooldown = new Discord.Collection() client.aliases = new Discord.Collection() client.config = require('./config') -client.mongoose = require('./modules/mongoose') -require('./modules/functions')(client) -require('./modules/music')(client) -require('./modules/commands')(client) -require('./modules/events')(client) +client.db = require('./util/mongoose') +require('./util/functions')(client) +require('./util/music')(client) -for (let i = 0; i < client.config.permLevels.length; i++) { - const thisLevel = client.config.permLevels[i] - client.levelCache[thisLevel.name] = thisLevel.level +// Initialization function +const init = async () => { + // Command handler + fs.readdir('./commands', (err, files) => { + if (err) { + client.logger.fatal('Failed to get files in commands directory: ' + err) + process.exit() + } + client.logger.info(`Loading ${files.length} commands.`) + files.forEach(file => { + if (!file.endsWith('.js')) { + return + } + const response = client.loadCommand(file) + if (response) { + client.logger.error(response) + } + }) + }) + + // Event handler + fs.readdir('./events', (err, files) => { + if (err) { + client.logger.fatal('Failed to get files in events directory: ' + err) + process.exit() + } + client.logger.info(`Loading ${files.length} events.`) + files.forEach(file => { + if (!file.endsWith('.js')) { + return + } + const event = require(`./events/${file}`) + client.on(file.substr(0, file.length - 3), event.bind(null, client)) + }) + }) + + // Cache client permissions + for (let i = 0; i < client.config.permLevels.length; i++) { + const thisLevel = client.config.permLevels[i] + client.levelCache[thisLevel.name] = thisLevel.level + } + + if (isDocker() === true) { + client.devmode = true + client.logger.warn('Running in development mode.') + } else { + client.devmode = false + } + + // Initialise DB + await client.db.init(client) + + // Login to Discord + if (client.devmode !== true) { + client.login(client.config.token) + } else { + client.login(client.config.token_dev) + } } -if (isDocker() === true) { - client.devmode = true - client.logger.warn('Running in development mode.') -} else { - client.devmode = false -} - -console.log(client.mongoose) -client.mongoose.init() - -if (client.devmode !== true) { - client.login(client.config.token) -} else { - client.login(client.config.token_dev) -} +init() diff --git a/models/guild.js b/models/guild.js new file mode 100644 index 0000000..d565018 --- /dev/null +++ b/models/guild.js @@ -0,0 +1,29 @@ +const mongoose = require('mongoose') +const Schema = mongoose.Schema +const { defaultGuildSettings: defaults } = require('../config') + +module.exports = mongoose.model('Guild', new Schema({ + _id: mongoose.Schema.Types.ObjectId, + guildID: String, + guildName: String, + + prefix: { + type: String, + default: defaults.prefix + }, + + systemNotice: { + type: Boolean, + default: defaults.systemNotice + }, + + modRole: { + type: String, + default: defaults.modRole + }, + + adminRole: { + type: String, + default: defaults.modRole + } +})) diff --git a/modules/dbfix.js b/models/member.js similarity index 100% rename from modules/dbfix.js rename to models/member.js diff --git a/models/user.js b/models/user.js new file mode 100644 index 0000000..e69de29 diff --git a/modules/commands.js b/modules/commands.js deleted file mode 100644 index 2646a7d..0000000 --- a/modules/commands.js +++ /dev/null @@ -1,28 +0,0 @@ -const fs = require('fs') -module.exports = client => { - fs.readdir('./commands', (err, files) => { - if (err) { - client.logger.fatal('Failed to get files in commands directory: ' + err) - process.exit() - } - client.logger.info(`Loading ${files.length} commands.`) - files.forEach(file => { - if (!file.endsWith('.js')) { - return - } - try { - const props = require(`../commands/${file}`) - if (props.init) { - props.init(client) - } - client.commands.set(props.help.name, props) - client.cooldown.set(props.help.name, new Map()) - props.conf.aliases.forEach(alias => { - client.aliases.set(alias, props.help.name) - }) - } catch (err) { - client.logger.error(`Failed to load ${file}: ${err}`) - } - }) - }) -} diff --git a/modules/events.js b/modules/events.js deleted file mode 100644 index dbb7229..0000000 --- a/modules/events.js +++ /dev/null @@ -1,21 +0,0 @@ -const fs = require('fs') -module.exports = client => { - fs.readdir('./events', (err, files) => { - if (err) { - client.logger.fatal('Failed to get files in events directory: ' + err) - process.exit() - } - client.logger.info(`Loading ${files.length} events.`) - files.forEach(file => { - if (!file.endsWith('.js')) { - return - } - try { - const event = require(`../events/${file}`) - client.on(file.substr(0, file.length - 3), event.bind(null, client)) - } catch (err) { - client.logger.error(`Failed to load ${file}: ${err}`) - } - }) - }) -} diff --git a/modules/mongoose.js b/modules/mongoose.js deleted file mode 100644 index 3dd45d5..0000000 --- a/modules/mongoose.js +++ /dev/null @@ -1,33 +0,0 @@ -const mongoose = require('mongoose') - -// doesnt work - -module.exports = { - init: () => { - const dbOps = { - useNewUrlParser: true, - autoIndex: false, - reconnectTries: Number.MAX_VALUE, - reconnectInterval: 500, - poolSize: 5, - connectTimeoutMS: 10000, - family: 4 - } - - mongoose.connect(client.config.mongoDB, dbOps) - mongoose.set('useFindAndModify', false) - mongoose.Promise = global.Promise - - mongoose.connection.on('connected', () => { - client.logger.info('Database connection established.') - }) - - mongoose.connection.on('err', err => { - client.logger.error(`Database connection error:\n ${err.stack}`) - }) - - mongoose.connection.on('disconnected', () => { - client.logger.info('Disconected from database.') - }) - } -} diff --git a/util/dbfix.js b/util/dbfix.js new file mode 100644 index 0000000..b03aec6 --- /dev/null +++ b/util/dbfix.js @@ -0,0 +1 @@ +// will fix invalid db entries (invalid ids and stuff) diff --git a/modules/functions.js b/util/functions.js similarity index 78% rename from modules/functions.js rename to util/functions.js index a0725fc..d5922b4 100644 --- a/modules/functions.js +++ b/util/functions.js @@ -1,3 +1,6 @@ +const mongoose = require('mongoose') +const Guild = require('../models/guild') + module.exports = client => { // Permission level function client.permlevel = message => { @@ -16,6 +19,49 @@ module.exports = client => { return permlvl } + // Get settings + client.getGuild = async (guild) => { + const data = await Guild.findOne({ guildID: guild.id }) + if (data) { + return data + } else { + throw new Error('No entry for this guild was found in the database!') + } + } + + // Update settings + client.updateGuild = async (guild, settings) => { + const data = await client.getGuild(guild) + for (const key in settings) { + // eslint-disable-next-line no-prototype-builtins + if (settings.hasOwnProperty(key)) { + if (data[key] !== settings[key]) { + data[key] = settings[key] + } else { + return + } + } + client.logger.debug(`Updated settings for ${data.guildName}: ${Object.keys(settings)}`) + } + } + + // Create new entry for new guild + client.createGuild = async (settings) => { + const merged = Object.assign({ _id: mongoose.Types.ObjectId() }, settings) + const newGuild = await new Guild(merged) + return newGuild.save().then(g => { + client.logger.debug(`Created settings for guild ${g.guildName}`) + }) + } + + // Delete guild data + client.deleteGuild = async (guild) => { + const data = await client.getGuild(guild) + if (data) { + data.deleteOne({ guildID: guild.id }) + } + } + // Loads commands client.loadCommand = (commandName) => { try { @@ -99,9 +145,9 @@ module.exports = client => { } } - // FIND RANDOM INT BETWEEN TWO INTEGERS + // Returns a random number between min and max client.intBetween = function (min, max) { - return Math.round((Math.random() * (max - min)) + min) + return Math.floor((Math.random() * (max - min)) + min) } // Get random array object diff --git a/util/mongoose.js b/util/mongoose.js new file mode 100644 index 0000000..af45541 --- /dev/null +++ b/util/mongoose.js @@ -0,0 +1,36 @@ +const mongoose = require('mongoose') + +module.exports = { + init: (client) => { + const options = { + useNewUrlParser: true, + useUnifiedTopology: true, + autoIndex: false, + family: 4 + } + + try { + mongoose.connect(client.config.mongoDB, options) + mongoose.set('useFindAndModify', false) + mongoose.Promise = global.Promise + } catch (err) { + client.logger.fatal(`Could not connect to the database:\n ${err.stack}`) + } + + mongoose.connection.on('connected', () => { + client.logger.info('Connected to the database.') + }) + + mongoose.connection.on('err', err => { + client.logger.error(`Database connection error:\n ${err.stack}`) + }) + + mongoose.connection.on('disconnected', () => { + client.logger.info('Disconected from the database.') + }) + + mongoose.connection.on('reconnected', () => { + client.logger.info('Reconnected to the database.') + }) + } +} diff --git a/modules/music.js b/util/music.js similarity index 100% rename from modules/music.js rename to util/music.js diff --git a/modules/webhooks.js b/util/webhooks.js similarity index 100% rename from modules/webhooks.js rename to util/webhooks.js From 4b66acc01d4eef5b2d67cec9aca0d9fd78de0509 Mon Sep 17 00:00:00 2001 From: mudkipscience Date: Sat, 4 Apr 2020 20:16:05 +1100 Subject: [PATCH 034/156] Perm levels fixed, guild create/delete --- commands/eval.js | 2 +- commands/level.js | 4 ++-- commands/ping.js | 2 +- events/guildCreate.js | 3 +-- events/guildDelete.js | 21 +++++++++++++++++++++ events/message.js | 5 ++--- events/ready.js | 12 ++++++++++++ index.js | 1 + models/guild.js | 2 +- util/functions.js | 5 +++-- version.json | 4 ++++ 11 files changed, 49 insertions(+), 12 deletions(-) create mode 100644 events/guildDelete.js create mode 100644 version.json diff --git a/commands/eval.js b/commands/eval.js index 1ea4b5d..a9fde3e 100644 --- a/commands/eval.js +++ b/commands/eval.js @@ -15,7 +15,7 @@ exports.help = { usage: 'eval [code]' } -exports.run = async (client, message, args) => { +exports.run = async (client, message, args, level, settings) => { const hastebin = require('hastebin-gen') const code = args.join(' ') try { diff --git a/commands/level.js b/commands/level.js index 1c53a7f..4e09980 100644 --- a/commands/level.js +++ b/commands/level.js @@ -2,7 +2,7 @@ exports.conf = { enabled: true, guildOnly: false, aliases: ['plevel', 'permlevel'], - permLevel: 'Administrator', + permLevel: 'User', requiredPerms: [], cooldown: 2000 } @@ -14,7 +14,7 @@ exports.help = { usage: 'level' } -exports.run = async (client, message, args, level) => { +exports.run = async (client, message, args, level, settings) => { try { const friendly = client.config.permLevels.find(l => l.level === level).name message.reply(`your permission level is ${level} (${friendly}).`) diff --git a/commands/ping.js b/commands/ping.js index 56c76a7..6384847 100644 --- a/commands/ping.js +++ b/commands/ping.js @@ -14,7 +14,7 @@ exports.help = { usage: 'ping' } -exports.run = async (client, message) => { +exports.run = async (client, message, args, level, settings) => { const msg = await message.channel.send('Pinging...') msg.edit( `Pong! \`${msg.createdTimestamp - message.createdTimestamp}ms\` (💗 \`${Math.round(client.ws.ping)}ms\`)` diff --git a/events/guildCreate.js b/events/guildCreate.js index 40cce63..6903c0f 100644 --- a/events/guildCreate.js +++ b/events/guildCreate.js @@ -5,8 +5,7 @@ module.exports = async (client, guild) => { // Create DB entry for newly joined guild try { const newGuild = { - guildID: guild.id, - guildName: guild.name + guildID: guild.id } await client.createGuild(newGuild) } catch (err) { diff --git a/events/guildDelete.js b/events/guildDelete.js new file mode 100644 index 0000000..80bfa91 --- /dev/null +++ b/events/guildDelete.js @@ -0,0 +1,21 @@ +const Discord = require('discord.js') +module.exports = async (client, guild) => { + if (!guild.available) return + + client.logger.info('Guild left.') + + // Delete this guild's data from our database + try { + await client.deleteGuild(guild) + } catch (err) { + client.logger.error('Failed to delete DB entry for guild: ' + err) + } + + if (client.devmode === false) { + const channel = client.channels.cache.get(client.config.support.serverLogs) + const embed = new Discord.MessageEmbed() + embed.setColor('#9494FF') + embed.setDescription(`Left a server. I'm now in \`${client.guilds.cache.size}\` servers.`) + channel.send(embed) + } +} diff --git a/events/message.js b/events/message.js index 01693fb..acc67ae 100644 --- a/events/message.js +++ b/events/message.js @@ -6,8 +6,7 @@ module.exports = async (client, message) => { } catch (err) { try { const newGuild = { - guildID: message.guild.id, - guildName: message.guild.name + guildID: message.guild.id } await client.createGuild(newGuild) } catch (err) { @@ -37,7 +36,7 @@ module.exports = async (client, message) => { if (message.guild && !message.member) await message.guild.fetchMember(message.author) - const level = client.permlevel(message) + const level = client.permlevel(message, settings) const cmd = client.commands.get(command) || client.commands.get(client.aliases.get(command)) if (!cmd) return diff --git a/events/ready.js b/events/ready.js index 02d66b7..2f581a2 100644 --- a/events/ready.js +++ b/events/ready.js @@ -1,3 +1,15 @@ module.exports = (client) => { + const activities = client.commands.keyArray() + let activity = activities.random() + + client.user.setActivity(`${client.config.defaultGuildSettings.prefix + activity} | v${client.version.number}`, { type: 'PLAYING' }) + + setInterval(() => { + activity = activities.random() + if (client.lockActivity === false) { + client.user.setActivity(`${client.config.defaultGuildSettings.prefix + activity} | v${client.version.number}`, { type: 'PLAYING' }) + }; + }, 30000) + client.logger.ready('Connected to Discord as ' + client.user.tag) } diff --git a/index.js b/index.js index 1340dda..9287de0 100644 --- a/index.js +++ b/index.js @@ -44,6 +44,7 @@ client.cooldown = new Discord.Collection() client.aliases = new Discord.Collection() client.config = require('./config') +client.version = require('./version.json') client.db = require('./util/mongoose') require('./util/functions')(client) require('./util/music')(client) diff --git a/models/guild.js b/models/guild.js index d565018..f29838a 100644 --- a/models/guild.js +++ b/models/guild.js @@ -24,6 +24,6 @@ module.exports = mongoose.model('Guild', new Schema({ adminRole: { type: String, - default: defaults.modRole + default: defaults.adminRole } })) diff --git a/util/functions.js b/util/functions.js index d5922b4..05c0dc4 100644 --- a/util/functions.js +++ b/util/functions.js @@ -3,15 +3,16 @@ const Guild = require('../models/guild') module.exports = client => { // Permission level function - client.permlevel = message => { + client.permlevel = (message, settings) => { let permlvl = 0 const permOrder = client.config.permLevels.slice(0).sort((p, c) => p.level < c.level ? 1 : -1) + console.log(permOrder) while (permOrder.length) { const currentLevel = permOrder.shift() if (message.guild && currentLevel.guildOnly) continue - if (currentLevel.check(message)) { + if (currentLevel.check(message, settings)) { permlvl = currentLevel.level break } diff --git a/version.json b/version.json new file mode 100644 index 0000000..e1cffe8 --- /dev/null +++ b/version.json @@ -0,0 +1,4 @@ +{ + "number": "2.0", + "changelog": "uwu" +} \ No newline at end of file From a94671dc06c576a0e684ec16c9c0735844e83e10 Mon Sep 17 00:00:00 2001 From: mudkipscience Date: Sun, 5 Apr 2020 02:13:18 +1000 Subject: [PATCH 035/156] fgdshhf --- events/message.js | 1 - file.log | 4 ++++ index.js | 7 +++++++ util/functions.js | 29 ++++++++++++----------------- 4 files changed, 23 insertions(+), 18 deletions(-) create mode 100644 file.log diff --git a/events/message.js b/events/message.js index acc67ae..85099be 100644 --- a/events/message.js +++ b/events/message.js @@ -56,7 +56,6 @@ module.exports = async (client, message) => { } } - console.log(settings.systemNotice) if (level < client.levelCache[cmd.conf.permLevel]) { if (settings.systemNotice === true) { return message.channel.send('You don\'t have permission to run this command!') diff --git a/file.log b/file.log new file mode 100644 index 0000000..5cdbdca --- /dev/null +++ b/file.log @@ -0,0 +1,4 @@ +2020-04-05T02:10:36 | info | index.js | Loading 3 commands. +2020-04-05T02:10:36 | info | index.js | Loading 7 events. +2020-04-05T02:10:36 | info | mongoose.js | Connected to the database. +2020-04-05T02:10:41 | ready | ready.js | Connected to Discord as WoomyDev#4547 diff --git a/index.js b/index.js index 9287de0..39d58a3 100644 --- a/index.js +++ b/index.js @@ -15,6 +15,13 @@ const Discord = require('discord.js') const client = new Discord.Client({ disabledEvents: ['TYPING_START'] }) client.logger = require('tracer').colorConsole({ + transport: function (data) { + console.log(data.output) + fs.appendFile('./file.log', data.rawoutput + '\n', err => { + if (err) throw err + }) + }, + format: [ '{{timestamp}} | {{title}} | {{file}} | {{message}}', { diff --git a/util/functions.js b/util/functions.js index 05c0dc4..af64cd5 100644 --- a/util/functions.js +++ b/util/functions.js @@ -7,7 +7,6 @@ module.exports = client => { let permlvl = 0 const permOrder = client.config.permLevels.slice(0).sort((p, c) => p.level < c.level ? 1 : -1) - console.log(permOrder) while (permOrder.length) { const currentLevel = permOrder.shift() @@ -32,27 +31,23 @@ module.exports = client => { // Update settings client.updateGuild = async (guild, settings) => { - const data = await client.getGuild(guild) + let data = await client.getGuild(guild) + + if (typeof data !== 'object') data = {} for (const key in settings) { - // eslint-disable-next-line no-prototype-builtins - if (settings.hasOwnProperty(key)) { - if (data[key] !== settings[key]) { - data[key] = settings[key] - } else { - return - } - } - client.logger.debug(`Updated settings for ${data.guildName}: ${Object.keys(settings)}`) + if (data[key] !== settings[key]) { + data[key] = settings[key] + } else return } + + return data.updateOne(settings) } // Create new entry for new guild client.createGuild = async (settings) => { const merged = Object.assign({ _id: mongoose.Types.ObjectId() }, settings) const newGuild = await new Guild(merged) - return newGuild.save().then(g => { - client.logger.debug(`Created settings for guild ${g.guildName}`) - }) + return newGuild.save() } // Delete guild data @@ -138,6 +133,7 @@ module.exports = client => { } } + // Embed colour function client.embedColour = function (guild) { if (!guild || guild.member(client.user).displayHexColor === '#000000') { return ['#ff9d68', '#ff97cb', '#d789ff', '#74FFFF'].random() @@ -146,7 +142,7 @@ module.exports = client => { } } - // Returns a random number between min and max + // Returns a random int between min and max client.intBetween = function (min, max) { return Math.floor((Math.random() * (max - min)) + min) } @@ -208,8 +204,7 @@ module.exports = client => { } client.findRole = function (guild, search) { - var role - role = guild.roles.cache.find(r => r.name.toLowerCase() === search.toLowerCase()) + var role = guild.roles.cache.find(r => r.name.toLowerCase() === search.toLowerCase()) if (!role) { role = guild.roles.cache.get(search.toLowerCase()) } From da505f855470a7c196f9a836280e5c81351d0cc5 Mon Sep 17 00:00:00 2001 From: mudkipscience Date: Sun, 5 Apr 2020 18:48:15 +1000 Subject: [PATCH 036/156] IM FUCKING STUPID LOL --- file.log | 37 +++++++++++++++++++++++++++++++ models/guild.js | 7 ++++++ package-lock.json | 55 +++++++++++++++++++++++++++-------------------- 3 files changed, 76 insertions(+), 23 deletions(-) diff --git a/file.log b/file.log index 5cdbdca..b450a36 100644 --- a/file.log +++ b/file.log @@ -2,3 +2,40 @@ 2020-04-05T02:10:36 | info | index.js | Loading 7 events. 2020-04-05T02:10:36 | info | mongoose.js | Connected to the database. 2020-04-05T02:10:41 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-05T18:25:54 | info | index.js | Loading 3 commands. +2020-04-05T18:25:54 | info | index.js | Loading 7 events. +2020-04-05T18:25:54 | info | mongoose.js | Connected to the database. +2020-04-05T18:25:56 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-05T18:26:06 | log | message.js | Command ran: ping +2020-04-05T18:26:12 | log | message.js | Command ran: eval +2020-04-05T18:27:44 | log | message.js | Command ran: ping +2020-04-05T18:28:11 | log | message.js | Command ran: eval +2020-04-05T18:28:43 | log | message.js | Command ran: eval +2020-04-05T18:30:41 | log | message.js | Command ran: eval +2020-04-05T18:30:52 | log | message.js | Command ran: eval +2020-04-05T18:31:03 | log | message.js | Command ran: level +2020-04-05T18:33:18 | log | message.js | Command ran: eval +2020-04-05T18:34:14 | info | index.js | Loading 3 commands. +2020-04-05T18:34:14 | info | index.js | Loading 7 events. +2020-04-05T18:34:15 | info | mongoose.js | Connected to the database. +2020-04-05T18:34:17 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-05T18:34:59 | info | index.js | Loading 3 commands. +2020-04-05T18:34:59 | info | index.js | Loading 7 events. +2020-04-05T18:34:59 | info | mongoose.js | Connected to the database. +2020-04-05T18:35:01 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-05T18:35:25 | log | message.js | Command ran: ping +2020-04-05T18:35:42 | log | message.js | Command ran: eval +2020-04-05T18:36:06 | log | message.js | Command ran: eval +2020-04-05T18:36:36 | info | index.js | Loading 3 commands. +2020-04-05T18:36:36 | info | index.js | Loading 7 events. +2020-04-05T18:36:36 | info | mongoose.js | Connected to the database. +2020-04-05T18:36:38 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-05T18:36:44 | log | message.js | Command ran: eval +2020-04-05T18:47:31 | info | index.js | Loading 3 commands. +2020-04-05T18:47:31 | info | index.js | Loading 7 events. +2020-04-05T18:47:31 | info | mongoose.js | Connected to the database. +2020-04-05T18:47:34 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-05T18:47:39 | info | index.js | Loading 3 commands. +2020-04-05T18:47:39 | info | index.js | Loading 7 events. +2020-04-05T18:47:39 | info | mongoose.js | Connected to the database. +2020-04-05T18:47:41 | ready | ready.js | Connected to Discord as WoomyDev#4547 diff --git a/models/guild.js b/models/guild.js index f29838a..6b7001a 100644 --- a/models/guild.js +++ b/models/guild.js @@ -25,5 +25,12 @@ module.exports = mongoose.model('Guild', new Schema({ adminRole: { type: String, default: defaults.adminRole + }, + + mutedRole: { + type: String, + default: defaults.mutedRole } })) + +// I SPWENT TWO FUCKONG DAUYS TRYING TO FIGURE OUT HOW TO UPDATE EXISTING DB ENTRIES WITH NEW SCHEMA SHIT AND IT DOES THIS BY FUCKING DEFAULT diff --git a/package-lock.json b/package-lock.json index de8afb6..8447144 100644 --- a/package-lock.json +++ b/package-lock.json @@ -661,6 +661,11 @@ "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" }, + "confusing-browser-globals": { + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/confusing-browser-globals/-/confusing-browser-globals-1.0.9.tgz", + "integrity": "sha512-KbS1Y0jMtyPgIxjO7ZzMAuUpAKMt1SzCL9fsrKsX6b0zJPTaT0SiSPmewwVZg9UAO83HVIlEhZF84LIjZ0lmAw==" + }, "contains-path": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/contains-path/-/contains-path-0.1.0.tgz", @@ -765,7 +770,6 @@ "version": "1.1.3", "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz", "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==", - "dev": true, "requires": { "object-keys": "^1.0.12" } @@ -871,7 +875,6 @@ "version": "1.17.5", "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.5.tgz", "integrity": "sha512-BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg==", - "dev": true, "requires": { "es-to-primitive": "^1.2.1", "function-bind": "^1.1.1", @@ -890,7 +893,6 @@ "version": "1.2.1", "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==", - "dev": true, "requires": { "is-callable": "^1.1.4", "is-date-object": "^1.0.1", @@ -1041,6 +1043,16 @@ } } }, + "eslint-config-airbnb-base": { + "version": "14.1.0", + "resolved": "https://registry.npmjs.org/eslint-config-airbnb-base/-/eslint-config-airbnb-base-14.1.0.tgz", + "integrity": "sha512-+XCcfGyCnbzOnktDVhwsCAx+9DmrzEmuwxyHUJpw+kqBVT744OUBrB09khgFKlK1lshVww6qXGsYPZpavoNjJw==", + "requires": { + "confusing-browser-globals": "^1.0.9", + "object.assign": "^4.1.0", + "object.entries": "^1.1.1" + } + }, "eslint-config-standard": { "version": "14.1.1", "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-14.1.1.tgz", @@ -1501,8 +1513,7 @@ "function-bind": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", - "dev": true + "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" }, "functional-red-black-tree": { "version": "1.0.1", @@ -1590,7 +1601,6 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", - "dev": true, "requires": { "function-bind": "^1.1.1" } @@ -1603,8 +1613,7 @@ "has-symbols": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz", - "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==", - "dev": true + "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==" }, "hasha": { "version": "5.2.0", @@ -1813,14 +1822,12 @@ "is-callable": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.5.tgz", - "integrity": "sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q==", - "dev": true + "integrity": "sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q==" }, "is-date-object": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz", - "integrity": "sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==", - "dev": true + "integrity": "sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==" }, "is-docker": { "version": "2.0.0", @@ -1857,7 +1864,6 @@ "version": "1.0.5", "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz", "integrity": "sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ==", - "dev": true, "requires": { "has": "^1.0.3" } @@ -1877,7 +1883,6 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz", "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==", - "dev": true, "requires": { "has-symbols": "^1.0.1" } @@ -2380,20 +2385,17 @@ "object-inspect": { "version": "1.7.0", "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.7.0.tgz", - "integrity": "sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw==", - "dev": true + "integrity": "sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw==" }, "object-keys": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", - "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", - "dev": true + "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==" }, "object.assign": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz", "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==", - "dev": true, "requires": { "define-properties": "^1.1.2", "function-bind": "^1.1.1", @@ -2401,6 +2403,17 @@ "object-keys": "^1.0.11" } }, + "object.entries": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.1.tgz", + "integrity": "sha512-ilqR7BgdyZetJutmDPfXCDffGa0/Yzl2ivVNpbx/g4UeWrCdRnFDUBrKJGLhGieRHDATnyZXWBeCb29k9CJysQ==", + "requires": { + "define-properties": "^1.1.3", + "es-abstract": "^1.17.0-next.1", + "function-bind": "^1.1.1", + "has": "^1.0.3" + } + }, "object.values": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.1.tgz", @@ -3070,7 +3083,6 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.0.tgz", "integrity": "sha512-EEJnGqa/xNfIg05SxiPSqRS7S9qwDhYts1TSLR1BQfYUfPe1stofgGKvwERK9+9yf+PpfBMlpBaCHucXGPQfUA==", - "dev": true, "requires": { "define-properties": "^1.1.3", "es-abstract": "^1.17.5" @@ -3080,7 +3092,6 @@ "version": "2.1.2", "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz", "integrity": "sha512-gCA0tza1JBvqr3bfAIFJGqfdRTyPae82+KTnm3coDXkZN9wnuW3HjGgN386D7hfv5CHQYCI022/rJPVlqXyHSw==", - "dev": true, "requires": { "define-properties": "^1.1.3", "es-abstract": "^1.17.5", @@ -3091,7 +3102,6 @@ "version": "2.1.2", "resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.2.tgz", "integrity": "sha512-ZNRQ7sY3KroTaYjRS6EbNiiHrOkjihL9aQE/8gfQ4DtAC/aEBRHFJa44OmoWxGGqXuJlfKkZW4WcXErGr+9ZFg==", - "dev": true, "requires": { "define-properties": "^1.1.3", "es-abstract": "^1.17.5", @@ -3102,7 +3112,6 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.0.tgz", "integrity": "sha512-iCP8g01NFYiiBOnwG1Xc3WZLyoo+RuBymwIlWncShXDDJYWN6DbnM3odslBJdgCdRlq94B5s63NWAZlcn2CS4w==", - "dev": true, "requires": { "define-properties": "^1.1.3", "es-abstract": "^1.17.5" From cdddb4d11de36e455395e5910e6008b46acba8f6 Mon Sep 17 00:00:00 2001 From: mudkipscience Date: Mon, 6 Apr 2020 15:53:41 +1000 Subject: [PATCH 037/156] combined getGuild & createGuild, added user funcs --- events/guildCreate.js | 5 +- util/functions.js => helpers/_functions.js | 54 +++++++++++++++++----- util/webhooks.js => helpers/botlists.js | 0 {util => helpers}/mongoose.js | 0 {util => helpers}/music.js | 0 util/dbfix.js | 1 - 6 files changed, 43 insertions(+), 17 deletions(-) rename util/functions.js => helpers/_functions.js (83%) rename util/webhooks.js => helpers/botlists.js (100%) rename {util => helpers}/mongoose.js (100%) rename {util => helpers}/music.js (100%) delete mode 100644 util/dbfix.js diff --git a/events/guildCreate.js b/events/guildCreate.js index 6903c0f..3eb2e46 100644 --- a/events/guildCreate.js +++ b/events/guildCreate.js @@ -4,10 +4,7 @@ module.exports = async (client, guild) => { // Create DB entry for newly joined guild try { - const newGuild = { - guildID: guild.id - } - await client.createGuild(newGuild) + await client.findOrCreateGuild(guild) } catch (err) { client.logger.error('Failed to create DB entry for newly joined guild: ' + err) } diff --git a/util/functions.js b/helpers/_functions.js similarity index 83% rename from util/functions.js rename to helpers/_functions.js index af64cd5..59a4ec0 100644 --- a/util/functions.js +++ b/helpers/_functions.js @@ -1,5 +1,6 @@ const mongoose = require('mongoose') const Guild = require('../models/guild') +const User = require('../models/user') module.exports = client => { // Permission level function @@ -19,17 +20,19 @@ module.exports = client => { return permlvl } - // Get settings - client.getGuild = async (guild) => { + // Get guild settings + client.findOrCreateGuild = async (guild) => { const data = await Guild.findOne({ guildID: guild.id }) if (data) { return data } else { - throw new Error('No entry for this guild was found in the database!') + const merged = Object.assign({ _id: mongoose.Types.ObjectId() }, { guildID: guild.id }) + const newGuild = await new Guild(merged) + return newGuild.save() } } - // Update settings + // Update guild settings client.updateGuild = async (guild, settings) => { let data = await client.getGuild(guild) @@ -43,14 +46,7 @@ module.exports = client => { return data.updateOne(settings) } - // Create new entry for new guild - client.createGuild = async (settings) => { - const merged = Object.assign({ _id: mongoose.Types.ObjectId() }, settings) - const newGuild = await new Guild(merged) - return newGuild.save() - } - - // Delete guild data + // Delete guild settings client.deleteGuild = async (guild) => { const data = await client.getGuild(guild) if (data) { @@ -58,6 +54,40 @@ module.exports = client => { } } + // Get user settings + client.findOrCreateUser = async (user) => { + const data = await User.findOne({ userID: user.id }) + if (data) { + return data + } else { + const merged = Object.assign({ _id: mongoose.Types.ObjectId() }, { userID: user.id }) + const newUser = await new User(merged) + return newUser.save() + } + } + + // Update user settings + client.updateUser = async (user, settings) => { + let data = await client.getUser(user) + + if (typeof data !== 'object') data = {} + for (const key in settings) { + if (data[key] !== settings[key]) { + data[key] = settings[key] + } else return + } + + return data.updateOne(settings) + } + + // Delete user settings + client.deleteUser = async (user) => { + const data = await client.getUser(user) + if (data) { + data.deleteOne({ userID: user.id }) + } + } + // Loads commands client.loadCommand = (commandName) => { try { diff --git a/util/webhooks.js b/helpers/botlists.js similarity index 100% rename from util/webhooks.js rename to helpers/botlists.js diff --git a/util/mongoose.js b/helpers/mongoose.js similarity index 100% rename from util/mongoose.js rename to helpers/mongoose.js diff --git a/util/music.js b/helpers/music.js similarity index 100% rename from util/music.js rename to helpers/music.js diff --git a/util/dbfix.js b/util/dbfix.js deleted file mode 100644 index b03aec6..0000000 --- a/util/dbfix.js +++ /dev/null @@ -1 +0,0 @@ -// will fix invalid db entries (invalid ids and stuff) From 95d84cfaef958134a173b2f5f2874e5a884f7d44 Mon Sep 17 00:00:00 2001 From: mudkipscience Date: Mon, 6 Apr 2020 15:54:09 +1000 Subject: [PATCH 038/156] random --- README.md | 3 +-- changelog.txt | 7 +++++++ commandTemplate.js | 19 +++++++++++++++++++ configTemplate.js | 9 ++------- 4 files changed, 29 insertions(+), 9 deletions(-) create mode 100644 changelog.txt create mode 100644 commandTemplate.js diff --git a/README.md b/README.md index a13b776..8b09475 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,4 @@ # woomy-next Rewrite of Woomy's codebase, because I'm getting really sick of working on shitty two year-old code. If you aren't a developer, please switch back to the master branch! # notes for devs -- config.js no longer stores tokens, for that you will need to use a .env file. -- please use the StandardJS linter when writing code for Woomy. \ No newline at end of file +- please install ESLint and use the included .eslintrc.js file to have properly formatted code when you're writing Woomy \ No newline at end of file diff --git a/changelog.txt b/changelog.txt new file mode 100644 index 0000000..865f355 --- /dev/null +++ b/changelog.txt @@ -0,0 +1,7 @@ +Woomy 2.0: +- A lot of Woomy's code has been rewritten +- Woomy now uses MongoDB for settings storage instead of enmap +- Logger now logs which file a log came from +- Functions file has been separated into multiple helpers +- Added systemNotice feature, stops Woomy from outputting permission errors and stuff +- New ping command \ No newline at end of file diff --git a/commandTemplate.js b/commandTemplate.js new file mode 100644 index 0000000..31f6a60 --- /dev/null +++ b/commandTemplate.js @@ -0,0 +1,19 @@ +exports.conf = { + enabled: true, + guildOnly: false, + aliases: [], + permLevel: 'User', + requiredPerms: [], + cooldown: 2000 // miliseconds +} + +exports.help = { + name: '', + category: '', + description: '', + usage: '' +} + +exports.run = async (client, message, args, level, data) => { + // epic code goes here +} diff --git a/configTemplate.js b/configTemplate.js index e8b940d..bddc250 100644 --- a/configTemplate.js +++ b/configTemplate.js @@ -23,13 +23,8 @@ const config = { // URL of MongoDB database mongoDB: 'mongodb://localhost:27017/woomy', - // Default settings for guilds - defaultGuildSettings: { - prefix: '~', - systemNotice: true, - modRole: 'Moderator', - adminRole: 'Administrator' - }, + // Default prefix Woomy uses + defaultPrefix: '~', // Emojis used by Woomy emojis: { From b2531d49b0645b276536c3e71b2499cf568b27d8 Mon Sep 17 00:00:00 2001 From: mudkipscience Date: Mon, 6 Apr 2020 15:54:45 +1000 Subject: [PATCH 039/156] Reformatted stuff, added data to imports --- commands/eval.js | 2 +- commands/help.js | 21 ++++++++++++ commands/level.js | 2 +- commands/ping.js | 2 +- events/message.js | 64 +++++++++++++++++++++-------------- events/ready.js | 4 +-- index.js | 28 ++++++++-------- models/guild.js | 85 ++++++++++++++++++++++++++++++++++++++--------- models/member.js | 8 +++++ models/user.js | 28 ++++++++++++++++ 10 files changed, 184 insertions(+), 60 deletions(-) create mode 100644 commands/help.js diff --git a/commands/eval.js b/commands/eval.js index a9fde3e..10ba1ee 100644 --- a/commands/eval.js +++ b/commands/eval.js @@ -15,7 +15,7 @@ exports.help = { usage: 'eval [code]' } -exports.run = async (client, message, args, level, settings) => { +exports.run = async (client, message, args, level, data) => { const hastebin = require('hastebin-gen') const code = args.join(' ') try { diff --git a/commands/help.js b/commands/help.js new file mode 100644 index 0000000..279bdfa --- /dev/null +++ b/commands/help.js @@ -0,0 +1,21 @@ +exports.conf = { + enabled: true, + guildOnly: false, + aliases: ['commands', 'cmds', 'h'], + permLevel: 'User', + requiredPerms: ['EMBED_LINKS'], + cooldown: 2000 +} + +exports.help = { + name: 'help', + category: 'General', + description: 'Returns your permission level.', + usage: 'help ' +} + +const Discord = require('discord.js') +exports.run = (client, message, args, level, data) => { + const embed = new Discord.MessageEmbed() + embed.setColor(client.embedColour(message.guild)) +} diff --git a/commands/level.js b/commands/level.js index 4e09980..8295366 100644 --- a/commands/level.js +++ b/commands/level.js @@ -14,7 +14,7 @@ exports.help = { usage: 'level' } -exports.run = async (client, message, args, level, settings) => { +exports.run = async (client, message, args, level, data) => { try { const friendly = client.config.permLevels.find(l => l.level === level).name message.reply(`your permission level is ${level} (${friendly}).`) diff --git a/commands/ping.js b/commands/ping.js index 6384847..07d3552 100644 --- a/commands/ping.js +++ b/commands/ping.js @@ -14,7 +14,7 @@ exports.help = { usage: 'ping' } -exports.run = async (client, message, args, level, settings) => { +exports.run = async (client, message, args, level, data) => { const msg = await message.channel.send('Pinging...') msg.edit( `Pong! \`${msg.createdTimestamp - message.createdTimestamp}ms\` (💗 \`${Math.round(client.ws.ping)}ms\`)` diff --git a/events/message.js b/events/message.js index 85099be..2792ae8 100644 --- a/events/message.js +++ b/events/message.js @@ -1,33 +1,31 @@ module.exports = async (client, message) => { if (message.author.bot) return - try { - await client.getGuild(message.guild) - } catch (err) { - try { - const newGuild = { - guildID: message.guild.id - } - await client.createGuild(newGuild) - } catch (err) { - client.logger.error('Failed to create DB entry for existing guild: ' + err) + const data = {} + + data.userData = await client.findOrCreateUser(message.author) + + if (message.guild) { + if (!message.channel.permissionsFor(client.user).has('SEND_MESSAGES')) { + try { + return message.author.send(`I don't have permission to speak in **#${message.channel.name}**, Please ask a moderator to give me the send messages permission!`) + } catch (err) {} } + data.guildData = await client.findOrCreateGuild(message.guild) } - const settings = await client.getGuild(message.guild) + const prefixes = [data.userData.prefix, data.guildData.prefix] - let prefix = settings.prefix + let prefix - const myMention = `<@&${client.user.id}>` - const myMention2 = `<@!${client.user.id}>` + const prefixMention = new RegExp(`^<@!?${client.user.id}> `) + if (message.content.match(prefixMention) ? message.content.match(prefixMention)[0] : '!') { + prefix = message.content.match(prefixMention) ? message.content.match(prefixMention)[0] : '!' + } - if (message.content.startsWith(myMention) || message.content.startsWith(myMention2)) { - if (message.content.length > myMention.length + 1 && (message.content.substr(0, myMention.length + 1) === myMention + ' ' || message.content.substr(0, myMention2.length + 1) === myMention2 + ' ')) { - prefix = message.content.substr(0, myMention.length) + ' ' - } else { - return message.channel.send(`Current prefix: \`${prefix}\``) - }; - }; + for (const thisPrefix of prefixes) { + if (message.content.startsWith(thisPrefix)) prefix = thisPrefix + } if (message.content.indexOf(prefix) !== 0) return @@ -36,19 +34,35 @@ module.exports = async (client, message) => { if (message.guild && !message.member) await message.guild.fetchMember(message.author) - const level = client.permlevel(message, settings) + const level = client.permlevel(message, data.guildSettings) const cmd = client.commands.get(command) || client.commands.get(client.aliases.get(command)) if (!cmd) return + if (!cmd.conf.enabled) { + if (data.guildData.systemNotice.enabled === true) { + return message.channel.send('This command has been disabled by my developers.') + } else { + return + } + } + if (cmd && !message.guild && cmd.conf.guildOnly) { return message.channel.send('This command is unavailable via private message. Please run this command in a guild.') } + if (message.guild) { + var missing = cmd.conf.requiredPerms.filter(p => !message.channel.permissionsFor(client.user).has(p)) + if (missing.length > 0) { + missing = '`' + (missing.join('`, `')) + '`' + return message.channel.send(`Missing permissions: ${missing}`) + } + } + // Dev perm level is separate so dev's don't get owner perms where they shouldn't have them if (cmd.conf.permLevel === 'Developer') { if (!client.config.devs.includes(message.author.id)) { - if (settings.systemNotice === true) { + if (data.guildData.systemNotice.enabled === true) { return message.channel.send('You don\'t have permission to run this command!') } else { return @@ -57,7 +71,7 @@ module.exports = async (client, message) => { } if (level < client.levelCache[cmd.conf.permLevel]) { - if (settings.systemNotice === true) { + if (data.guildData.systemNotice.enabled === true) { return message.channel.send('You don\'t have permission to run this command!') } else { return @@ -88,5 +102,5 @@ module.exports = async (client, message) => { } client.logger.log(`Command ran: ${cmd.help.name}`) - cmd.run(client, message, args, level, settings) + cmd.run(client, message, args, level, data) } diff --git a/events/ready.js b/events/ready.js index 2f581a2..12b6365 100644 --- a/events/ready.js +++ b/events/ready.js @@ -2,12 +2,12 @@ module.exports = (client) => { const activities = client.commands.keyArray() let activity = activities.random() - client.user.setActivity(`${client.config.defaultGuildSettings.prefix + activity} | v${client.version.number}`, { type: 'PLAYING' }) + client.user.setActivity(`${client.config.defaultPrefix + activity} | v${client.version.number}`, { type: 'PLAYING' }) setInterval(() => { activity = activities.random() if (client.lockActivity === false) { - client.user.setActivity(`${client.config.defaultGuildSettings.prefix + activity} | v${client.version.number}`, { type: 'PLAYING' }) + client.user.setActivity(`${client.config.defaultPrefix + activity} | v${client.version.number}`, { type: 'PLAYING' }) }; }, 30000) diff --git a/index.js b/index.js index 39d58a3..353a155 100644 --- a/index.js +++ b/index.js @@ -8,12 +8,20 @@ if (Number(process.version.slice(1).split('.')[0]) < 12) { } // Libraries +const Discord = require('discord.js') +const client = new Discord.Client({ disabledEvents: ['TYPING_START'] }) const fs = require('fs') const colors = require('colors') const isDocker = require('is-docker') -const Discord = require('discord.js') -const client = new Discord.Client({ disabledEvents: ['TYPING_START'] }) +// Helpers +client.config = require('./config') +client.version = require('./version.json') +client.db = require('./helpers/mongoose') +require('./helpers/_functions')(client) +require('./helpers/music')(client) + +// Initialise logger client.logger = require('tracer').colorConsole({ transport: function (data) { console.log(data.output) @@ -39,24 +47,13 @@ client.logger = require('tracer').colorConsole({ filters: [colors.white] }) -// Check to make sure config exists -if (fs.existsSync('./config.js') === false) { - client.logger.fatal('The config.js file is missing! Please create a config.js file.') - process.exit() -} - +// Create caches for permissions, commands, cooldowns and aliases client.levelCache = {} client.commands = new Discord.Collection() client.cooldown = new Discord.Collection() client.aliases = new Discord.Collection() -client.config = require('./config') -client.version = require('./version.json') -client.db = require('./util/mongoose') -require('./util/functions')(client) -require('./util/music')(client) - -// Initialization function +// Main initialisation function const init = async () => { // Command handler fs.readdir('./commands', (err, files) => { @@ -98,6 +95,7 @@ const init = async () => { client.levelCache[thisLevel.name] = thisLevel.level } + // Check if Woomy is running inside a Docker container if (isDocker() === true) { client.devmode = true client.logger.warn('Running in development mode.') diff --git a/models/guild.js b/models/guild.js index 6b7001a..23ccbb8 100644 --- a/models/guild.js +++ b/models/guild.js @@ -1,35 +1,90 @@ -const mongoose = require('mongoose') -const Schema = mongoose.Schema -const { defaultGuildSettings: defaults } = require('../config') +const { Schema, model } = require('mongoose') +const { defaultPrefix } = require('../config') -module.exports = mongoose.model('Guild', new Schema({ - _id: mongoose.Schema.Types.ObjectId, +module.exports = model('Guild', new Schema({ + _id: Schema.Types.ObjectId, guildID: String, - guildName: String, prefix: { type: String, - default: defaults.prefix - }, - - systemNotice: { - type: Boolean, - default: defaults.systemNotice + default: defaultPrefix }, modRole: { type: String, - default: defaults.modRole + default: null }, adminRole: { type: String, - default: defaults.adminRole + default: null }, mutedRole: { type: String, - default: defaults.mutedRole + default: null + }, + + autoRole: { + type: String, + default: null + }, + + systemNotice: { + type: Object, + default: { + enabled: true, + autoDelete: 0 + } + }, + + plugins: { + type: Object, + default: { + welcome: { + enabled: false, + channel: null, + message: null + }, + goodbye: { + enabled: false, + channel: null, + message: null + }, + chatLogs: { + enabled: false, + channel: null + }, + modLogs: { + enabled: false, + channel: null + } + } + }, + + botChannels: { + type: Array, + default: [] + }, + + blacklisted: { + type: Array, + default: [] + }, + + customCommands: { + type: Array, + default: [] + }, + + disabledCommands: { + type: Array, + default: [] + }, + + disabledCategories: { + type: Array, + default: [] } })) diff --git a/models/member.js b/models/member.js index e69de29..9a367c8 100644 --- a/models/member.js +++ b/models/member.js @@ -0,0 +1,8 @@ +const { Schema, model } = require('mongoose') + +module.exports = model('Member', new Schema({ + _id: Schema.Types.ObjectId, + userID: String + + // Will chuck in some stuff like timed mutes, warning system, levelling, etc +})) diff --git a/models/user.js b/models/user.js index e69de29..5400bd7 100644 --- a/models/user.js +++ b/models/user.js @@ -0,0 +1,28 @@ +const { Schema, model } = require('mongoose') +const { defaultPrefix } = require('../config') + +module.exports = model('User', new Schema({ + _id: Schema.Types.ObjectId, + userID: String, + + prefix: { + type: String, + default: defaultPrefix + }, + + profile: { + type: Object, + default: { + bio: 'I should run ~setbio :P', + birthdate: null, + pronouns: null, + favColour: null + } + }, + + // polyamory uwu + marriages: { + type: Array, + default: [] + } +})) From 3b8234fea7d70cb62a24468188addeec18935802 Mon Sep 17 00:00:00 2001 From: mudkipscience Date: Mon, 6 Apr 2020 19:36:32 +1000 Subject: [PATCH 040/156] help command (unfinished) --- commandTemplate.js | 3 +- commands/eval.js | 3 +- commands/help.js | 61 +++++- commands/level.js | 3 +- events/message.js | 10 +- events/ready.js | 14 +- file.log | 489 +++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 572 insertions(+), 11 deletions(-) diff --git a/commandTemplate.js b/commandTemplate.js index 31f6a60..278b134 100644 --- a/commandTemplate.js +++ b/commandTemplate.js @@ -11,7 +11,8 @@ exports.help = { name: '', category: '', description: '', - usage: '' + usage: '', + params: '' } exports.run = async (client, message, args, level, data) => { diff --git a/commands/eval.js b/commands/eval.js index 10ba1ee..b3efc82 100644 --- a/commands/eval.js +++ b/commands/eval.js @@ -12,7 +12,8 @@ exports.help = { name: 'eval', category: 'Owner', description: 'Evaluates arbitrary javascript.', - usage: 'eval [code]' + usage: 'eval [code]', + params: '`[code] - Javascript code you want to execute.' } exports.run = async (client, message, args, level, data) => { diff --git a/commands/help.js b/commands/help.js index 279bdfa..8f733f5 100644 --- a/commands/help.js +++ b/commands/help.js @@ -11,11 +11,70 @@ exports.help = { name: 'help', category: 'General', description: 'Returns your permission level.', - usage: 'help ' + usage: 'help **OR** help all', + params: '`` - The name of the command you want more information on.' } const Discord = require('discord.js') exports.run = (client, message, args, level, data) => { const embed = new Discord.MessageEmbed() embed.setColor(client.embedColour(message.guild)) + + const prefixes = [data.userData.prefix] + if (message.guild && data.userData.prefix !== data.guildData.prefix) { + prefixes.push(data.guildData.prefix) + } + prefixes.push('@Woomy') + + const categories = [] + + if (!args[0]) { + embed.setTitle('Woomy Help') + embed.setDescription(`• Prefixes: ${'`' + prefixes.join('`, `') + '`'}\n• Use \`help \` to recieve more information about a command!\n• Use \`help all\` to view hidden commands!\n• [Join my support server](https://discord.gg/HCF8mdv) if you have any issues/questions while using me!\n• [click here](https://discordapp.com/oauth2/authorize?client_id=435961704145485835&permissions=8&scope=bot) to add me to your own server!`) + const commands = message.guild ? client.commands.filter( + cmd => client.levelCache[cmd.conf.permLevel] <= level + ) : client.commands.filter( + cmd => client.levelCache[cmd.conf.permLevel] <= level && cmd.conf.guildOnly !== true + ) + + commands.forEach((cmd) => { + if (!categories.includes(cmd.help.category)) { + categories.push(cmd.help.category) + } + }) + + categories.sort().forEach((cat) => { + const filtered = commands.filter((cmd) => cmd.help.category === cat) + embed.addField(cat + ` [${filtered.size}]`, filtered.map((cmd) => '`' + cmd.help.name + '`').join(' ')) + }) + + if (message.guild && data.guildData.customCommands.length > 0) { + embed.addField('Custom', data.guildData.customCommands.map((cmd) => '`' + cmd.name + '`').join(' ')) + } + + return message.channel.send(embed) + } else if (args[0].toLowerCase() === 'all') { + embed.setTitle('Woomy Help') + embed.setDescription(`• Prefixes: ${'`' + prefixes.join('`, `') + '`'}\n• Use \`help \` to recieve more information about a command!\n• [Join my support server](https://discord.gg/HCF8mdv) if you have any issues/questions while using me!\n• [click here](https://discordapp.com/oauth2/authorize?client_id=435961704145485835&permissions=8&scope=bot) to add me to your own server!`) + const commands = client.commands + + commands.forEach((cmd) => { + if (!categories.includes(cmd.help.category)) { + categories.push(cmd.help.category) + } + }) + + categories.sort().forEach((cat) => { + const filtered = commands.filter((cmd) => cmd.help.category === cat) + embed.addField(cat + ` [${filtered.size}]`, filtered.map((cmd) => '`' + cmd.help.name + '`').join(' ')) + }) + + if (message.guild && data.guildData.customCommands.length > 0) { + embed.addField('Custom', data.guildData.customCommands.map((cmd) => '`' + cmd.name + '`').join(' ')) + } + + return message.channel.send(embed) + } else { + + } } diff --git a/commands/level.js b/commands/level.js index 8295366..731d688 100644 --- a/commands/level.js +++ b/commands/level.js @@ -11,7 +11,8 @@ exports.help = { name: 'level', category: 'Utility', description: 'Returns your permission level.', - usage: 'level' + usage: 'level', + params: null } exports.run = async (client, message, args, level, data) => { diff --git a/events/message.js b/events/message.js index 2792ae8..ec745c4 100644 --- a/events/message.js +++ b/events/message.js @@ -5,6 +5,8 @@ module.exports = async (client, message) => { data.userData = await client.findOrCreateUser(message.author) + const prefixes = [data.userData.prefix] + if (message.guild) { if (!message.channel.permissionsFor(client.user).has('SEND_MESSAGES')) { try { @@ -12,17 +14,13 @@ module.exports = async (client, message) => { } catch (err) {} } data.guildData = await client.findOrCreateGuild(message.guild) + prefixes.push(data.guildData.prefix) } - const prefixes = [data.userData.prefix, data.guildData.prefix] + prefixes.push(`<@${client.user.id}> `, `<@!${client.user.id}> `) let prefix - const prefixMention = new RegExp(`^<@!?${client.user.id}> `) - if (message.content.match(prefixMention) ? message.content.match(prefixMention)[0] : '!') { - prefix = message.content.match(prefixMention) ? message.content.match(prefixMention)[0] : '!' - } - for (const thisPrefix of prefixes) { if (message.content.startsWith(thisPrefix)) prefix = thisPrefix } diff --git a/events/ready.js b/events/ready.js index 12b6365..8ff65ac 100644 --- a/events/ready.js +++ b/events/ready.js @@ -1,4 +1,6 @@ +const moment = require('moment') module.exports = (client) => { + const timestamp = moment().format('YYYY-MM-DD HH:mm:ss') const activities = client.commands.keyArray() let activity = activities.random() @@ -9,7 +11,17 @@ module.exports = (client) => { if (client.lockActivity === false) { client.user.setActivity(`${client.config.defaultPrefix + activity} | v${client.version.number}`, { type: 'PLAYING' }) }; - }, 30000) + }, 20000) + + // REMOVE ! IN FRONT OF CLIENT.CONFIG.SUPPORT.ID WHEN DEVMODE WORKS + + if (!client.config.support.id && client.config.support.startupLogs && client.devmode === false) { + try { + const guild = client.guilds.cache.get(client.config.support.id) + const channel = guild.channels.cache.get(client.config.support.startupLogs) + channel.send(`Bot started at \`${timestamp}\``) + } catch (err) {} + } client.logger.ready('Connected to Discord as ' + client.user.tag) } diff --git a/file.log b/file.log index b450a36..36c2938 100644 --- a/file.log +++ b/file.log @@ -39,3 +39,492 @@ 2020-04-05T18:47:39 | info | index.js | Loading 7 events. 2020-04-05T18:47:39 | info | mongoose.js | Connected to the database. 2020-04-05T18:47:41 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-06T15:58:08 | info | index.js | Loading 4 commands. +2020-04-06T15:58:08 | info | index.js | Loading 7 events. +2020-04-06T15:58:08 | info | mongoose.js | Connected to the database. +2020-04-06T15:58:10 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-06T16:02:49 | info | index.js | Loading 4 commands. +2020-04-06T16:02:49 | info | index.js | Loading 7 events. +2020-04-06T16:02:49 | info | mongoose.js | Connected to the database. +2020-04-06T16:02:51 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-06T16:03:11 | info | index.js | Loading 4 commands. +2020-04-06T16:03:11 | info | index.js | Loading 7 events. +2020-04-06T16:03:11 | info | mongoose.js | Connected to the database. +2020-04-06T16:03:13 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-06T16:03:44 | log | message.js | Command ran: eval +2020-04-06T16:03:52 | log | message.js | Command ran: eval +2020-04-06T16:03:58 | log | message.js | Command ran: eval +2020-04-06T16:04:06 | info | index.js | Loading 4 commands. +2020-04-06T16:04:06 | info | index.js | Loading 7 events. +2020-04-06T16:04:06 | info | mongoose.js | Connected to the database. +2020-04-06T16:04:10 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-06T16:04:23 | info | index.js | Loading 4 commands. +2020-04-06T16:04:23 | info | index.js | Loading 7 events. +2020-04-06T16:04:23 | info | mongoose.js | Connected to the database. +2020-04-06T16:04:25 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-06T16:05:01 | info | index.js | Loading 4 commands. +2020-04-06T16:05:01 | info | index.js | Loading 7 events. +2020-04-06T16:05:01 | info | mongoose.js | Connected to the database. +2020-04-06T16:05:05 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-06T16:05:38 | info | index.js | Loading 4 commands. +2020-04-06T16:05:38 | info | index.js | Loading 7 events. +2020-04-06T16:05:38 | info | mongoose.js | Connected to the database. +2020-04-06T16:05:41 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-06T16:05:44 | info | index.js | Loading 4 commands. +2020-04-06T16:05:44 | info | index.js | Loading 7 events. +2020-04-06T16:05:44 | info | mongoose.js | Connected to the database. +2020-04-06T16:05:46 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-06T16:06:24 | info | index.js | Loading 4 commands. +2020-04-06T16:06:24 | info | index.js | Loading 7 events. +2020-04-06T16:06:24 | info | mongoose.js | Connected to the database. +2020-04-06T16:06:26 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-06T16:08:13 | info | index.js | Loading 4 commands. +2020-04-06T16:08:13 | info | index.js | Loading 7 events. +2020-04-06T16:08:13 | info | mongoose.js | Connected to the database. +2020-04-06T16:08:15 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-06T16:08:23 | info | index.js | Loading 4 commands. +2020-04-06T16:08:23 | info | index.js | Loading 7 events. +2020-04-06T16:08:23 | info | mongoose.js | Connected to the database. +2020-04-06T16:08:25 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-06T16:08:40 | info | index.js | Loading 4 commands. +2020-04-06T16:08:40 | info | index.js | Loading 7 events. +2020-04-06T16:08:40 | info | mongoose.js | Connected to the database. +2020-04-06T16:08:42 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-06T16:10:22 | info | index.js | Loading 4 commands. +2020-04-06T16:10:22 | info | index.js | Loading 7 events. +2020-04-06T16:10:22 | info | mongoose.js | Connected to the database. +2020-04-06T16:10:24 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-06T16:13:09 | info | index.js | Loading 4 commands. +2020-04-06T16:13:09 | info | index.js | Loading 7 events. +2020-04-06T16:13:09 | info | mongoose.js | Connected to the database. +2020-04-06T16:13:12 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-06T16:13:38 | info | index.js | Loading 4 commands. +2020-04-06T16:13:38 | info | index.js | Loading 7 events. +2020-04-06T16:13:38 | info | mongoose.js | Connected to the database. +2020-04-06T16:13:42 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-06T16:16:52 | info | index.js | Loading 7 events. +2020-04-06T16:16:52 | info | index.js | Loading 4 commands. +2020-04-06T16:16:52 | info | mongoose.js | Connected to the database. +2020-04-06T16:16:55 | info | index.js | Loading 4 commands. +2020-04-06T16:16:55 | info | index.js | Loading 7 events. +2020-04-06T16:16:55 | info | mongoose.js | Connected to the database. +2020-04-06T16:17:07 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-06T16:17:08 | log | message.js | Command ran: ping +2020-04-06T16:17:18 | log | message.js | Command ran: ping +2020-04-06T16:17:28 | info | index.js | Loading 4 commands. +2020-04-06T16:17:28 | info | index.js | Loading 7 events. +2020-04-06T16:17:28 | info | mongoose.js | Connected to the database. +2020-04-06T16:17:33 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-06T16:17:53 | info | index.js | Loading 7 events. +2020-04-06T16:17:53 | info | index.js | Loading 4 commands. +2020-04-06T16:17:53 | info | mongoose.js | Connected to the database. +2020-04-06T16:17:55 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-06T16:18:10 | info | index.js | Loading 7 events. +2020-04-06T16:18:10 | info | index.js | Loading 4 commands. +2020-04-06T16:18:10 | info | mongoose.js | Connected to the database. +2020-04-06T16:18:12 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-06T16:18:22 | log | message.js | Command ran: eval +2020-04-06T16:18:33 | log | message.js | Command ran: eval +2020-04-06T16:18:41 | log | message.js | Command ran: eval +2020-04-06T16:18:51 | log | message.js | Command ran: ping +2020-04-06T16:18:54 | log | message.js | Command ran: ping +2020-04-06T16:55:32 | log | message.js | Command ran: help +2020-04-06T16:55:35 | log | message.js | Command ran: help +2020-04-06T17:09:45 | info | index.js | Loading 4 commands. +2020-04-06T17:09:45 | info | index.js | Loading 7 events. +2020-04-06T17:09:45 | info | mongoose.js | Connected to the database. +2020-04-06T17:09:47 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-06T17:10:11 | log | message.js | Command ran: help +2020-04-06T17:17:13 | log | message.js | Command ran: help +2020-04-06T17:17:33 | log | message.js | Command ran: help +2020-04-06T17:18:12 | info | index.js | Loading 4 commands. +2020-04-06T17:18:12 | info | index.js | Loading 7 events. +2020-04-06T17:18:12 | info | mongoose.js | Connected to the database. +2020-04-06T17:18:16 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-06T17:18:16 | log | message.js | Command ran: help +2020-04-06T17:18:34 | log | message.js | Command ran: help +2020-04-06T17:18:37 | log | message.js | Command ran: help +2020-04-06T17:19:06 | info | index.js | Loading 7 events. +2020-04-06T17:19:06 | info | index.js | Loading 4 commands. +2020-04-06T17:19:06 | info | mongoose.js | Connected to the database. +2020-04-06T17:19:08 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-06T17:19:08 | log | message.js | Command ran: help +2020-04-06T17:19:23 | log | message.js | Command ran: help +2020-04-06T17:19:48 | log | message.js | Command ran: eval +2020-04-06T17:20:38 | log | message.js | Command ran: help +2020-04-06T17:20:57 | log | message.js | Command ran: help +2020-04-06T17:21:53 | info | index.js | Loading 4 commands. +2020-04-06T17:21:53 | info | index.js | Loading 7 events. +2020-04-06T17:21:53 | info | mongoose.js | Connected to the database. +2020-04-06T17:21:55 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-06T17:22:04 | log | message.js | Command ran: help +2020-04-06T17:22:11 | info | index.js | Loading 4 commands. +2020-04-06T17:22:11 | info | index.js | Loading 7 events. +2020-04-06T17:22:11 | info | mongoose.js | Connected to the database. +2020-04-06T17:22:13 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-06T17:22:16 | log | message.js | Command ran: help +2020-04-06T17:40:10 | info | index.js | Loading 4 commands. +2020-04-06T17:40:10 | info | index.js | Loading 7 events. +2020-04-06T17:40:10 | info | mongoose.js | Connected to the database. +2020-04-06T17:40:12 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-06T17:41:45 | info | index.js | Loading 4 commands. +2020-04-06T17:41:45 | info | index.js | Loading 7 events. +2020-04-06T17:41:45 | info | mongoose.js | Connected to the database. +2020-04-06T17:41:47 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-06T17:43:13 | info | index.js | Loading 4 commands. +2020-04-06T17:43:13 | info | index.js | Loading 7 events. +2020-04-06T17:43:13 | info | mongoose.js | Connected to the database. +2020-04-06T17:43:15 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-06T17:46:05 | info | index.js | Loading 4 commands. +2020-04-06T17:46:05 | info | index.js | Loading 7 events. +2020-04-06T17:46:05 | info | mongoose.js | Connected to the database. +2020-04-06T17:46:08 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-06T17:49:51 | info | index.js | Loading 4 commands. +2020-04-06T17:49:51 | info | index.js | Loading 7 events. +2020-04-06T17:49:51 | info | mongoose.js | Connected to the database. +2020-04-06T17:49:53 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-06T17:51:11 | info | index.js | Loading 4 commands. +2020-04-06T17:51:11 | info | index.js | Loading 7 events. +2020-04-06T17:51:11 | info | mongoose.js | Connected to the database. +2020-04-06T17:51:13 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-06T17:51:32 | info | index.js | Loading 4 commands. +2020-04-06T17:51:32 | info | index.js | Loading 7 events. +2020-04-06T17:51:32 | info | mongoose.js | Connected to the database. +2020-04-06T17:51:34 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-06T17:51:44 | info | index.js | Loading 4 commands. +2020-04-06T17:51:44 | info | index.js | Loading 7 events. +2020-04-06T17:51:44 | info | mongoose.js | Connected to the database. +2020-04-06T17:51:46 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-06T17:52:16 | info | index.js | Loading 4 commands. +2020-04-06T17:52:16 | info | index.js | Loading 7 events. +2020-04-06T17:52:16 | info | mongoose.js | Connected to the database. +2020-04-06T17:52:18 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-06T17:53:50 | info | index.js | Loading 4 commands. +2020-04-06T17:53:50 | info | index.js | Loading 7 events. +2020-04-06T17:53:50 | info | mongoose.js | Connected to the database. +2020-04-06T17:53:52 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-06T17:53:54 | info | index.js | Loading 7 events. +2020-04-06T17:53:54 | info | index.js | Loading 4 commands. +2020-04-06T17:53:54 | info | mongoose.js | Connected to the database. +2020-04-06T17:54:03 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-06T17:55:18 | info | index.js | Loading 4 commands. +2020-04-06T17:55:18 | info | index.js | Loading 7 events. +2020-04-06T17:55:18 | info | mongoose.js | Connected to the database. +2020-04-06T17:55:20 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-06T17:55:37 | info | index.js | Loading 4 commands. +2020-04-06T17:55:37 | info | index.js | Loading 7 events. +2020-04-06T17:55:37 | info | mongoose.js | Connected to the database. +2020-04-06T17:55:39 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-06T17:55:40 | info | index.js | Loading 4 commands. +2020-04-06T17:55:40 | info | index.js | Loading 7 events. +2020-04-06T17:55:40 | info | mongoose.js | Connected to the database. +2020-04-06T17:55:50 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-06T17:57:18 | info | index.js | Loading 4 commands. +2020-04-06T17:57:18 | info | index.js | Loading 7 events. +2020-04-06T17:57:18 | info | mongoose.js | Connected to the database. +2020-04-06T17:57:20 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-06T18:01:47 | info | index.js | Loading 4 commands. +2020-04-06T18:01:47 | info | index.js | Loading 7 events. +2020-04-06T18:01:47 | info | mongoose.js | Connected to the database. +2020-04-06T18:01:51 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-06T18:01:51 | error | _functions.js | Unhandled rejection: ReferenceError: prefixRegex is not defined +2020-04-06T18:01:55 | error | _functions.js | Unhandled rejection: ReferenceError: prefixRegex is not defined +2020-04-06T18:02:04 | error | _functions.js | Unhandled rejection: ReferenceError: prefixRegex is not defined +2020-04-06T18:02:51 | info | index.js | Loading 7 events. +2020-04-06T18:02:51 | info | index.js | Loading 4 commands. +2020-04-06T18:02:51 | info | mongoose.js | Connected to the database. +2020-04-06T18:02:56 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-06T18:03:03 | log | message.js | Command ran: ping +2020-04-06T18:03:44 | info | index.js | Loading 4 commands. +2020-04-06T18:03:44 | info | index.js | Loading 7 events. +2020-04-06T18:03:44 | info | mongoose.js | Connected to the database. +2020-04-06T18:03:46 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-06T18:03:55 | info | index.js | Loading 4 commands. +2020-04-06T18:03:55 | info | index.js | Loading 7 events. +2020-04-06T18:03:55 | info | mongoose.js | Connected to the database. +2020-04-06T18:03:56 | info | index.js | Loading 4 commands. +2020-04-06T18:03:56 | info | index.js | Loading 7 events. +2020-04-06T18:03:56 | info | mongoose.js | Connected to the database. +2020-04-06T18:03:58 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-06T18:04:03 | info | index.js | Loading 4 commands. +2020-04-06T18:04:03 | info | index.js | Loading 7 events. +2020-04-06T18:04:03 | info | mongoose.js | Connected to the database. +2020-04-06T18:04:05 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-06T18:06:26 | info | index.js | Loading 4 commands. +2020-04-06T18:06:26 | info | index.js | Loading 7 events. +2020-04-06T18:06:26 | info | mongoose.js | Connected to the database. +2020-04-06T18:06:29 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-06T18:06:33 | log | message.js | Command ran: help +2020-04-06T18:06:45 | log | message.js | Command ran: help +2020-04-06T18:36:30 | log | message.js | Command ran: help +2020-04-06T18:39:46 | info | index.js | Loading 4 commands. +2020-04-06T18:39:46 | info | index.js | Loading 7 events. +2020-04-06T18:39:46 | info | mongoose.js | Connected to the database. +2020-04-06T18:39:48 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-06T18:39:50 | log | message.js | Command ran: help +2020-04-06T18:39:50 | error | _functions.js | Unhandled rejection: TypeError: Cannot read property 'customCommands' of undefined +2020-04-06T18:40:03 | info | index.js | Loading 4 commands. +2020-04-06T18:40:03 | info | index.js | Loading 7 events. +2020-04-06T18:40:03 | info | mongoose.js | Connected to the database. +2020-04-06T18:40:05 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-06T18:40:05 | log | message.js | Command ran: help +2020-04-06T18:41:07 | info | index.js | Loading 4 commands. +2020-04-06T18:41:07 | info | index.js | Loading 7 events. +2020-04-06T18:41:07 | info | mongoose.js | Connected to the database. +2020-04-06T18:41:11 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-06T18:41:12 | log | message.js | Command ran: help +2020-04-06T18:43:16 | info | index.js | Loading 7 events. +2020-04-06T18:43:16 | info | index.js | Loading 4 commands. +2020-04-06T18:43:16 | info | mongoose.js | Connected to the database. +2020-04-06T18:43:20 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-06T18:43:25 | log | message.js | Command ran: help +2020-04-06T18:45:59 | info | index.js | Loading 4 commands. +2020-04-06T18:45:59 | info | index.js | Loading 7 events. +2020-04-06T18:45:59 | info | mongoose.js | Connected to the database. +2020-04-06T18:46:02 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-06T18:47:17 | info | index.js | Loading 4 commands. +2020-04-06T18:47:17 | info | index.js | Loading 7 events. +2020-04-06T18:47:17 | info | mongoose.js | Connected to the database. +2020-04-06T18:47:19 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-06T18:47:35 | info | index.js | Loading 4 commands. +2020-04-06T18:47:35 | info | index.js | Loading 7 events. +2020-04-06T18:47:35 | info | mongoose.js | Connected to the database. +2020-04-06T18:47:37 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-06T18:47:48 | error | _functions.js | Unhandled rejection: TypeError: Cannot read property 'prefix' of undefined +2020-04-06T18:47:51 | error | _functions.js | Unhandled rejection: TypeError: Cannot read property 'prefix' of undefined +2020-04-06T18:48:30 | info | index.js | Loading 4 commands. +2020-04-06T18:48:30 | info | index.js | Loading 7 events. +2020-04-06T18:48:30 | info | mongoose.js | Connected to the database. +2020-04-06T18:48:32 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-06T18:48:35 | log | message.js | Command ran: help +2020-04-06T18:48:35 | error | _functions.js | Unhandled rejection: TypeError: Cannot read property 'prefix' of undefined +2020-04-06T18:48:41 | info | index.js | Loading 4 commands. +2020-04-06T18:48:41 | info | index.js | Loading 7 events. +2020-04-06T18:48:41 | info | mongoose.js | Connected to the database. +2020-04-06T18:48:44 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-06T18:48:56 | info | index.js | Loading 4 commands. +2020-04-06T18:48:56 | info | index.js | Loading 7 events. +2020-04-06T18:48:56 | info | mongoose.js | Connected to the database. +2020-04-06T18:48:58 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-06T18:49:00 | error | _functions.js | Unhandled rejection: TypeError: Cannot read property 'prefix' of undefined + at module.exports (C:\Users\Emily\Desktop\woomy stuff\woomy\events\message.js:17:58) + at processTicksAndRejections (internal/process/task_queues.js:94:5) +2020-04-06T18:49:09 | info | index.js | Loading 4 commands. +2020-04-06T18:49:09 | info | index.js | Loading 7 events. +2020-04-06T18:49:09 | info | mongoose.js | Connected to the database. +2020-04-06T18:49:11 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-06T18:51:23 | info | index.js | Loading 4 commands. +2020-04-06T18:51:23 | info | index.js | Loading 7 events. +2020-04-06T18:51:23 | info | mongoose.js | Connected to the database. +2020-04-06T18:51:25 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-06T18:51:32 | info | index.js | Loading 4 commands. +2020-04-06T18:51:32 | info | index.js | Loading 7 events. +2020-04-06T18:51:32 | info | mongoose.js | Connected to the database. +2020-04-06T18:51:35 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-06T18:51:39 | log | message.js | Command ran: help +2020-04-06T18:51:39 | error | _functions.js | Unhandled rejection: TypeError: Cannot read property 'prefix' of undefined +2020-04-06T18:51:48 | log | message.js | Command ran: help +2020-04-06T18:51:54 | log | message.js | Command ran: help +2020-04-06T18:52:43 | info | index.js | Loading 4 commands. +2020-04-06T18:52:43 | info | index.js | Loading 7 events. +2020-04-06T18:52:43 | info | mongoose.js | Connected to the database. +2020-04-06T18:52:45 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-06T18:52:46 | log | message.js | Command ran: help +2020-04-06T18:52:46 | error | _functions.js | Unhandled rejection: TypeError: Cannot read property 'prefix' of undefined + at Object.exports.run (C:\Users\Emily\Desktop\woomy stuff\woomy\commands\help.js:22:56) + at module.exports (C:\Users\Emily\Desktop\woomy stuff\woomy\events\message.js:105:7) + at processTicksAndRejections (internal/process/task_queues.js:94:5) +2020-04-06T18:54:47 | info | index.js | Loading 4 commands. +2020-04-06T18:54:47 | info | index.js | Loading 7 events. +2020-04-06T18:54:47 | info | mongoose.js | Connected to the database. +2020-04-06T18:54:49 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-06T18:54:49 | log | message.js | Command ran: help +2020-04-06T18:54:49 | error | _functions.js | Unhandled rejection: TypeError: Cannot read property 'prefix' of undefined + at Object.exports.run (C:\Users\Emily\Desktop\woomy stuff\woomy\commands\help.js:27:47) + at module.exports (C:\Users\Emily\Desktop\woomy stuff\woomy\events\message.js:105:7) + at processTicksAndRejections (internal/process/task_queues.js:94:5) +2020-04-06T18:56:15 | info | index.js | Loading 7 events. +2020-04-06T18:56:15 | info | index.js | Loading 4 commands. +2020-04-06T18:56:15 | info | mongoose.js | Connected to the database. +2020-04-06T18:56:18 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-06T18:56:18 | log | message.js | Command ran: help +2020-04-06T18:56:23 | log | message.js | Command ran: help +2020-04-06T18:56:52 | info | index.js | Loading 4 commands. +2020-04-06T18:56:52 | info | index.js | Loading 7 events. +2020-04-06T18:56:52 | info | mongoose.js | Connected to the database. +2020-04-06T18:56:56 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-06T18:57:11 | info | index.js | Loading 4 commands. +2020-04-06T18:57:11 | info | index.js | Loading 7 events. +2020-04-06T18:57:11 | info | mongoose.js | Connected to the database. +2020-04-06T18:57:13 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-06T18:58:55 | info | index.js | Loading 4 commands. +2020-04-06T18:58:55 | info | index.js | Loading 7 events. +2020-04-06T18:58:55 | info | mongoose.js | Connected to the database. +2020-04-06T18:58:57 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-06T18:58:58 | log | message.js | Command ran: help +2020-04-06T18:59:16 | log | message.js | Command ran: help +2020-04-06T19:00:46 | info | index.js | Loading 4 commands. +2020-04-06T19:00:46 | info | index.js | Loading 7 events. +2020-04-06T19:00:46 | info | mongoose.js | Connected to the database. +2020-04-06T19:00:48 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-06T19:00:50 | log | message.js | Command ran: help +2020-04-06T19:02:04 | info | index.js | Loading 4 commands. +2020-04-06T19:02:04 | info | index.js | Loading 7 events. +2020-04-06T19:02:04 | info | mongoose.js | Connected to the database. +2020-04-06T19:02:06 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-06T19:02:06 | log | message.js | Command ran: help +2020-04-06T19:04:11 | info | index.js | Loading 4 commands. +2020-04-06T19:04:11 | info | index.js | Loading 7 events. +2020-04-06T19:04:11 | info | mongoose.js | Connected to the database. +2020-04-06T19:04:13 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-06T19:04:13 | log | message.js | Command ran: help +2020-04-06T19:04:19 | log | message.js | Command ran: help +2020-04-06T19:06:08 | info | index.js | Loading 4 commands. +2020-04-06T19:06:08 | info | index.js | Loading 7 events. +2020-04-06T19:06:08 | info | mongoose.js | Connected to the database. +2020-04-06T19:06:10 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-06T19:06:12 | log | message.js | Command ran: help +2020-04-06T19:06:37 | log | message.js | Command ran: help +2020-04-06T19:06:57 | info | index.js | Loading 4 commands. +2020-04-06T19:06:57 | info | index.js | Loading 7 events. +2020-04-06T19:06:57 | info | mongoose.js | Connected to the database. +2020-04-06T19:06:59 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-06T19:06:59 | log | message.js | Command ran: help +2020-04-06T19:07:03 | log | message.js | Command ran: help +2020-04-06T19:08:03 | info | index.js | Loading 4 commands. +2020-04-06T19:08:03 | info | index.js | Loading 7 events. +2020-04-06T19:08:03 | info | mongoose.js | Connected to the database. +2020-04-06T19:08:05 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-06T19:08:05 | log | message.js | Command ran: help +2020-04-06T19:08:09 | log | message.js | Command ran: help +2020-04-06T19:11:47 | info | index.js | Loading 4 commands. +2020-04-06T19:11:47 | info | index.js | Loading 7 events. +2020-04-06T19:11:47 | info | mongoose.js | Connected to the database. +2020-04-06T19:11:49 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-06T19:11:53 | log | message.js | Command ran: help +2020-04-06T19:12:14 | info | index.js | Loading 7 events. +2020-04-06T19:12:14 | info | index.js | Loading 4 commands. +2020-04-06T19:12:14 | info | mongoose.js | Connected to the database. +2020-04-06T19:12:16 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-06T19:12:17 | log | message.js | Command ran: help +2020-04-06T19:12:42 | info | index.js | Loading 4 commands. +2020-04-06T19:12:42 | info | index.js | Loading 7 events. +2020-04-06T19:12:42 | info | mongoose.js | Connected to the database. +2020-04-06T19:12:47 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-06T19:12:47 | log | message.js | Command ran: help +2020-04-06T19:13:06 | info | index.js | Loading 4 commands. +2020-04-06T19:13:06 | info | index.js | Loading 7 events. +2020-04-06T19:13:06 | info | mongoose.js | Connected to the database. +2020-04-06T19:13:08 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-06T19:13:08 | log | message.js | Command ran: help +2020-04-06T19:13:19 | info | index.js | Loading 4 commands. +2020-04-06T19:13:19 | info | index.js | Loading 7 events. +2020-04-06T19:13:19 | info | mongoose.js | Connected to the database. +2020-04-06T19:13:21 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-06T19:13:21 | log | message.js | Command ran: help +2020-04-06T19:14:01 | info | index.js | Loading 4 commands. +2020-04-06T19:14:01 | info | index.js | Loading 7 events. +2020-04-06T19:14:01 | info | mongoose.js | Connected to the database. +2020-04-06T19:14:03 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-06T19:15:08 | info | index.js | Loading 4 commands. +2020-04-06T19:15:08 | info | index.js | Loading 7 events. +2020-04-06T19:15:08 | info | mongoose.js | Connected to the database. +2020-04-06T19:15:12 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-06T19:15:30 | log | message.js | Command ran: help +2020-04-06T19:15:44 | log | message.js | Command ran: help +2020-04-06T19:17:18 | info | index.js | Loading 4 commands. +2020-04-06T19:17:18 | info | index.js | Loading 7 events. +2020-04-06T19:17:18 | info | mongoose.js | Connected to the database. +2020-04-06T19:17:20 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-06T19:17:23 | log | message.js | Command ran: help +2020-04-06T19:17:41 | info | index.js | Loading 4 commands. +2020-04-06T19:17:41 | info | index.js | Loading 7 events. +2020-04-06T19:17:41 | info | mongoose.js | Connected to the database. +2020-04-06T19:17:43 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-06T19:17:46 | log | message.js | Command ran: help +2020-04-06T19:20:52 | info | index.js | Loading 4 commands. +2020-04-06T19:20:52 | info | index.js | Loading 7 events. +2020-04-06T19:20:52 | info | mongoose.js | Connected to the database. +2020-04-06T19:20:54 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-06T19:20:57 | info | index.js | Loading 4 commands. +2020-04-06T19:20:57 | info | index.js | Loading 7 events. +2020-04-06T19:20:57 | info | mongoose.js | Connected to the database. +2020-04-06T19:21:04 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-06T19:21:10 | log | message.js | Command ran: help +2020-04-06T19:23:00 | info | index.js | Loading 4 commands. +2020-04-06T19:23:00 | info | index.js | Loading 7 events. +2020-04-06T19:23:00 | info | mongoose.js | Connected to the database. +2020-04-06T19:23:02 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-06T19:23:06 | log | message.js | Command ran: help +2020-04-06T19:23:53 | info | index.js | Loading 4 commands. +2020-04-06T19:23:53 | info | index.js | Loading 7 events. +2020-04-06T19:23:53 | info | mongoose.js | Connected to the database. +2020-04-06T19:23:55 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-06T19:24:05 | log | message.js | Command ran: help +2020-04-06T19:24:28 | info | index.js | Loading 4 commands. +2020-04-06T19:24:28 | info | index.js | Loading 7 events. +2020-04-06T19:24:28 | info | mongoose.js | Connected to the database. +2020-04-06T19:24:33 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-06T19:24:33 | log | message.js | Command ran: help +2020-04-06T19:24:59 | info | index.js | Loading 4 commands. +2020-04-06T19:24:59 | info | index.js | Loading 7 events. +2020-04-06T19:24:59 | info | mongoose.js | Connected to the database. +2020-04-06T19:25:01 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-06T19:25:01 | log | message.js | Command ran: help +2020-04-06T19:25:17 | info | index.js | Loading 4 commands. +2020-04-06T19:25:17 | info | index.js | Loading 7 events. +2020-04-06T19:25:17 | info | mongoose.js | Connected to the database. +2020-04-06T19:25:20 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-06T19:25:42 | info | index.js | Loading 4 commands. +2020-04-06T19:25:42 | info | index.js | Loading 7 events. +2020-04-06T19:25:42 | info | mongoose.js | Connected to the database. +2020-04-06T19:25:44 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-06T19:25:45 | log | message.js | Command ran: help +2020-04-06T19:26:20 | log | message.js | Command ran: help +2020-04-06T19:26:45 | info | index.js | Loading 4 commands. +2020-04-06T19:26:45 | info | index.js | Loading 7 events. +2020-04-06T19:26:45 | info | mongoose.js | Connected to the database. +2020-04-06T19:26:48 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-06T19:26:48 | log | message.js | Command ran: help +2020-04-06T19:27:12 | info | index.js | Loading 4 commands. +2020-04-06T19:27:12 | info | index.js | Loading 7 events. +2020-04-06T19:27:12 | info | mongoose.js | Connected to the database. +2020-04-06T19:27:14 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-06T19:27:14 | log | message.js | Command ran: help +2020-04-06T19:27:16 | log | message.js | Command ran: help +2020-04-06T19:28:59 | log | message.js | Command ran: help +2020-04-06T19:29:59 | info | index.js | Loading 4 commands. +2020-04-06T19:29:59 | info | index.js | Loading 7 events. +2020-04-06T19:30:00 | info | mongoose.js | Connected to the database. +2020-04-06T19:30:02 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-06T19:30:13 | info | index.js | Loading 4 commands. +2020-04-06T19:30:13 | info | index.js | Loading 7 events. +2020-04-06T19:30:13 | info | mongoose.js | Connected to the database. +2020-04-06T19:30:15 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-06T19:32:32 | info | index.js | Loading 4 commands. +2020-04-06T19:32:32 | info | index.js | Loading 7 events. +2020-04-06T19:32:32 | info | mongoose.js | Connected to the database. +2020-04-06T19:32:37 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-06T19:32:44 | info | index.js | Loading 4 commands. +2020-04-06T19:32:44 | info | index.js | Loading 7 events. +2020-04-06T19:32:44 | info | mongoose.js | Connected to the database. +2020-04-06T19:32:49 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-06T19:33:11 | info | index.js | Loading 4 commands. +2020-04-06T19:33:11 | info | index.js | Loading 7 events. +2020-04-06T19:33:11 | info | mongoose.js | Connected to the database. +2020-04-06T19:33:13 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-06T19:33:50 | log | message.js | Command ran: eval +2020-04-06T19:34:05 | log | message.js | Command ran: eval +2020-04-06T19:34:13 | info | index.js | Loading 4 commands. +2020-04-06T19:34:13 | info | index.js | Loading 7 events. +2020-04-06T19:34:13 | info | mongoose.js | Connected to the database. +2020-04-06T19:34:15 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-06T19:34:44 | info | index.js | Loading 4 commands. +2020-04-06T19:34:44 | info | index.js | Loading 7 events. +2020-04-06T19:34:44 | info | mongoose.js | Connected to the database. +2020-04-06T19:34:46 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-06T19:34:51 | info | index.js | Loading 4 commands. +2020-04-06T19:34:51 | info | index.js | Loading 7 events. +2020-04-06T19:34:51 | info | mongoose.js | Connected to the database. +2020-04-06T19:34:53 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-06T19:35:16 | log | message.js | Command ran: help From 1b9c4c900ae5106a4b7c689063e3462ec6e8a0d7 Mon Sep 17 00:00:00 2001 From: mudkipscience Date: Tue, 7 Apr 2020 02:35:06 +1000 Subject: [PATCH 041/156] fixed help --- commands/help.js | 50 +++++-- commands/level.js | 4 +- commands/ping.js | 3 +- commands/ship.js | 55 +++++++ events/message.js | 14 +- file.log | 371 ++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 474 insertions(+), 23 deletions(-) create mode 100644 commands/ship.js diff --git a/commands/help.js b/commands/help.js index 8f733f5..a8adb30 100644 --- a/commands/help.js +++ b/commands/help.js @@ -1,7 +1,7 @@ exports.conf = { enabled: true, guildOnly: false, - aliases: ['commands', 'cmds', 'h'], + aliases: ['commands', 'cmds', 'halp'], permLevel: 'User', requiredPerms: ['EMBED_LINKS'], cooldown: 2000 @@ -10,8 +10,8 @@ exports.conf = { exports.help = { name: 'help', category: 'General', - description: 'Returns your permission level.', - usage: 'help **OR** help all', + description: 'Sends you a list of Woomy\'s commands.', + usage: '`help `\n`help all` - View full command list.', params: '`` - The name of the command you want more information on.' } @@ -20,9 +20,9 @@ exports.run = (client, message, args, level, data) => { const embed = new Discord.MessageEmbed() embed.setColor(client.embedColour(message.guild)) - const prefixes = [data.userData.prefix] - if (message.guild && data.userData.prefix !== data.guildData.prefix) { - prefixes.push(data.guildData.prefix) + const prefixes = [data.user.prefix] + if (message.guild && data.user.prefix !== data.guild.prefix) { + prefixes.push(data.guild.prefix) } prefixes.push('@Woomy') @@ -45,11 +45,11 @@ exports.run = (client, message, args, level, data) => { categories.sort().forEach((cat) => { const filtered = commands.filter((cmd) => cmd.help.category === cat) - embed.addField(cat + ` [${filtered.size}]`, filtered.map((cmd) => '`' + cmd.help.name + '`').join(' ')) + embed.addField(cat + ` [${filtered.size}]`, filtered.map((cmd) => '`' + cmd.help.name + '`').join(', ')) }) - if (message.guild && data.guildData.customCommands.length > 0) { - embed.addField('Custom', data.guildData.customCommands.map((cmd) => '`' + cmd.name + '`').join(' ')) + if (message.guild && data.guild.customCommands.length > 0) { + embed.addField('Custom', data.guild.customCommands.map((cmd) => '`' + cmd.name + '`').join(' ')) } return message.channel.send(embed) @@ -69,12 +69,36 @@ exports.run = (client, message, args, level, data) => { embed.addField(cat + ` [${filtered.size}]`, filtered.map((cmd) => '`' + cmd.help.name + '`').join(' ')) }) - if (message.guild && data.guildData.customCommands.length > 0) { - embed.addField('Custom', data.guildData.customCommands.map((cmd) => '`' + cmd.name + '`').join(' ')) + if (message.guild && data.guild.customCommands.length > 0) { + embed.addField('Custom', data.guild.customCommands.map((cmd) => '`' + cmd.name + '`').join(' ')) } return message.channel.send(embed) - } else { - + } else if (args[0]) { + const command = args.shift().toLowerCase() + const cmd = client.commands.get(command) || client.commands.get(client.aliases.get(command)) + if (!cmd) { + return message.channel.send('Command/alias doesn\'t exist') + } + + let aliases = '' + if (cmd.conf.aliases.length > 0) { + aliases = '`' + cmd.conf.aliases.join('`, `') + '`' + } + + embed.setTitle(cmd.help.name) + embed.setDescription(cmd.help.description) + embed.addField('**Usage:**', cmd.help.usage) + if (cmd.help.params.length > 0) { + embed.addField('**Parameters:**', cmd.help.params) + } + if (aliases) { + embed.addField('**Aliases:**', aliases) + } + embed.addField('**Permission level:**', cmd.conf.permLevel, true) + embed.addField('**Server only**', cmd.conf.guildOnly, true) + embed.addField('**Cooldown**', cmd.conf.cooldown / 1000 + ' seconds', true) + embed.setFooter('< > = optional, [ ] = required. Don\'t include the brackets in the command itself!') + message.channel.send(embed) } } diff --git a/commands/level.js b/commands/level.js index 731d688..fda1e4e 100644 --- a/commands/level.js +++ b/commands/level.js @@ -12,13 +12,13 @@ exports.help = { category: 'Utility', description: 'Returns your permission level.', usage: 'level', - params: null + params: '' } exports.run = async (client, message, args, level, data) => { try { const friendly = client.config.permLevels.find(l => l.level === level).name - message.reply(`your permission level is ${level} (${friendly}).`) + message.reply(`Your permission level is: ${friendly} (${level})`) } catch (err) { message.channel.send('There was an error!\n' + err).catch() } diff --git a/commands/ping.js b/commands/ping.js index 07d3552..ae1dc3b 100644 --- a/commands/ping.js +++ b/commands/ping.js @@ -11,7 +11,8 @@ exports.help = { name: 'ping', category: 'Utility', description: 'Displays bot latency in miliseconds.', - usage: 'ping' + usage: 'ping', + params: '' } exports.run = async (client, message, args, level, data) => { diff --git a/commands/ship.js b/commands/ship.js new file mode 100644 index 0000000..882b899 --- /dev/null +++ b/commands/ship.js @@ -0,0 +1,55 @@ + +exports.conf = { + enabled: true, + guildOnly: false, + aliases: [], + permLevel: 'User', + requiredPerms: [] +} + +exports.help = { + name: 'ship', + category: 'Fun', + description: 'Ship two people together <3', + usage: 'ship [name/user] [name/user]' +} + +exports.run = async (client, message, args, level, data) => { + var firstName, secondName + var rating = Math.floor(Math.random() * 100) + 1 + var hearts = [ + '❤️', + '🧡', + '💛', + '💚', + '💙', + '💜' + ] + + if (args.length < 2) { + return message.channel.send('<:error:466995152976871434> Please include two names/users.') + } + + if (message.guild && message.mentions.members && message.mentions.members.size > 0) { + firstName = message.mentions.members.first().displayName + } + + if (message.guild && message.mentions.members && message.mentions.members.size > 1) { + secondName = message.mentions.members.last().displayName + } + + if (!firstName) { + firstName = args[0] + } + + if (!secondName) { + secondName = args[1] + } + + const shipName = firstName.substr(0, firstName.length * 0.5) + secondName.substr(secondName.length * 0.5) + + if (shipName.toLowerCase() === 'teily' || shipName.toLowerCase() === 'emrra') { + rating = '100' + } + message.channel.send(`__**Ship Generator:**__\n${hearts.random()} Ship Name: \`${shipName}\`\n${hearts.random()} Compatibility: \`${rating}%\``) +} diff --git a/events/message.js b/events/message.js index ec745c4..50f299a 100644 --- a/events/message.js +++ b/events/message.js @@ -3,9 +3,9 @@ module.exports = async (client, message) => { const data = {} - data.userData = await client.findOrCreateUser(message.author) + data.user = await client.findOrCreateUser(message.author) - const prefixes = [data.userData.prefix] + const prefixes = [data.user.prefix] if (message.guild) { if (!message.channel.permissionsFor(client.user).has('SEND_MESSAGES')) { @@ -13,8 +13,8 @@ module.exports = async (client, message) => { return message.author.send(`I don't have permission to speak in **#${message.channel.name}**, Please ask a moderator to give me the send messages permission!`) } catch (err) {} } - data.guildData = await client.findOrCreateGuild(message.guild) - prefixes.push(data.guildData.prefix) + data.guild = await client.findOrCreateGuild(message.guild) + prefixes.push(data.guild.prefix) } prefixes.push(`<@${client.user.id}> `, `<@!${client.user.id}> `) @@ -38,7 +38,7 @@ module.exports = async (client, message) => { if (!cmd) return if (!cmd.conf.enabled) { - if (data.guildData.systemNotice.enabled === true) { + if (data.guild.systemNotice.enabled === true) { return message.channel.send('This command has been disabled by my developers.') } else { return @@ -60,7 +60,7 @@ module.exports = async (client, message) => { // Dev perm level is separate so dev's don't get owner perms where they shouldn't have them if (cmd.conf.permLevel === 'Developer') { if (!client.config.devs.includes(message.author.id)) { - if (data.guildData.systemNotice.enabled === true) { + if (data.guild.systemNotice.enabled === true) { return message.channel.send('You don\'t have permission to run this command!') } else { return @@ -69,7 +69,7 @@ module.exports = async (client, message) => { } if (level < client.levelCache[cmd.conf.permLevel]) { - if (data.guildData.systemNotice.enabled === true) { + if (data.guild.systemNotice.enabled === true) { return message.channel.send('You don\'t have permission to run this command!') } else { return diff --git a/file.log b/file.log index 36c2938..5d23832 100644 --- a/file.log +++ b/file.log @@ -528,3 +528,374 @@ 2020-04-06T19:34:51 | info | mongoose.js | Connected to the database. 2020-04-06T19:34:53 | ready | ready.js | Connected to Discord as WoomyDev#4547 2020-04-06T19:35:16 | log | message.js | Command ran: help +2020-04-06T23:24:40 | info | index.js | Loading 4 commands. +2020-04-06T23:24:40 | info | index.js | Loading 7 events. +2020-04-06T23:24:40 | info | mongoose.js | Connected to the database. +2020-04-06T23:24:43 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-06T23:26:12 | info | index.js | Loading 4 commands. +2020-04-06T23:26:12 | info | index.js | Loading 7 events. +2020-04-06T23:26:12 | info | mongoose.js | Connected to the database. +2020-04-06T23:26:15 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-06T23:26:56 | log | message.js | Command ran: help +2020-04-06T23:27:01 | log | message.js | Command ran: help +2020-04-06T23:27:08 | log | message.js | Command ran: help +2020-04-07T00:00:13 | info | index.js | Loading 4 commands. +2020-04-07T00:00:13 | info | index.js | Loading 7 events. +2020-04-07T00:00:13 | info | mongoose.js | Connected to the database. +2020-04-07T00:00:15 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-07T00:00:28 | info | index.js | Loading 4 commands. +2020-04-07T00:00:28 | info | index.js | Loading 7 events. +2020-04-07T00:00:28 | info | mongoose.js | Connected to the database. +2020-04-07T00:00:31 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-07T00:00:31 | log | message.js | Command ran: help +2020-04-07T00:00:31 | error | _functions.js | Unhandled rejection: ReferenceError: parameters is not defined +2020-04-07T00:00:35 | log | message.js | Command ran: help +2020-04-07T00:00:35 | error | _functions.js | Unhandled rejection: ReferenceError: parameters is not defined +2020-04-07T00:01:10 | info | index.js | Loading 4 commands. +2020-04-07T00:01:10 | info | index.js | Loading 7 events. +2020-04-07T00:01:10 | info | mongoose.js | Connected to the database. +2020-04-07T00:01:12 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-07T00:01:13 | log | message.js | Command ran: help +2020-04-07T00:02:07 | info | index.js | Loading 4 commands. +2020-04-07T00:02:07 | info | index.js | Loading 7 events. +2020-04-07T00:02:07 | info | mongoose.js | Connected to the database. +2020-04-07T00:02:09 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-07T00:02:10 | log | message.js | Command ran: help +2020-04-07T00:02:22 | info | index.js | Loading 4 commands. +2020-04-07T00:02:22 | info | index.js | Loading 7 events. +2020-04-07T00:02:22 | info | mongoose.js | Connected to the database. +2020-04-07T00:02:24 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-07T00:02:25 | log | message.js | Command ran: help +2020-04-07T00:06:16 | info | index.js | Loading 4 commands. +2020-04-07T00:06:16 | info | index.js | Loading 7 events. +2020-04-07T00:06:16 | info | mongoose.js | Connected to the database. +2020-04-07T00:06:19 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-07T00:06:22 | log | message.js | Command ran: help +2020-04-07T00:08:01 | info | index.js | Loading 4 commands. +2020-04-07T00:08:01 | info | index.js | Loading 7 events. +2020-04-07T00:08:01 | info | mongoose.js | Connected to the database. +2020-04-07T00:08:03 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-07T00:08:52 | info | index.js | Loading 4 commands. +2020-04-07T00:08:52 | info | index.js | Loading 7 events. +2020-04-07T00:08:52 | info | mongoose.js | Connected to the database. +2020-04-07T00:08:54 | info | index.js | Loading 4 commands. +2020-04-07T00:08:54 | info | index.js | Loading 7 events. +2020-04-07T00:08:54 | info | mongoose.js | Connected to the database. +2020-04-07T00:08:56 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-07T00:28:37 | info | index.js | Loading 4 commands. +2020-04-07T00:28:37 | info | index.js | Loading 7 events. +2020-04-07T00:28:37 | info | mongoose.js | Connected to the database. +2020-04-07T00:28:39 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-07T00:30:07 | info | index.js | Loading 7 events. +2020-04-07T00:30:07 | info | index.js | Loading 4 commands. +2020-04-07T00:30:07 | info | mongoose.js | Connected to the database. +2020-04-07T00:30:10 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-07T00:32:09 | info | index.js | Loading 4 commands. +2020-04-07T00:32:09 | info | index.js | Loading 7 events. +2020-04-07T00:32:10 | info | mongoose.js | Connected to the database. +2020-04-07T00:32:12 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-07T00:32:12 | log | message.js | Command ran: help +2020-04-07T00:35:47 | info | index.js | Loading 4 commands. +2020-04-07T00:35:47 | info | index.js | Loading 7 events. +2020-04-07T00:35:47 | info | mongoose.js | Connected to the database. +2020-04-07T00:35:49 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-07T00:35:50 | log | message.js | Command ran: help +2020-04-07T00:39:53 | info | index.js | Loading 4 commands. +2020-04-07T00:39:53 | info | index.js | Loading 7 events. +2020-04-07T00:39:54 | info | mongoose.js | Connected to the database. +2020-04-07T00:39:56 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-07T00:39:56 | log | message.js | Command ran: help +2020-04-07T00:40:12 | info | index.js | Loading 4 commands. +2020-04-07T00:40:12 | info | index.js | Loading 7 events. +2020-04-07T00:40:13 | info | mongoose.js | Connected to the database. +2020-04-07T00:40:16 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-07T00:40:17 | log | message.js | Command ran: help +2020-04-07T00:40:58 | info | index.js | Loading 4 commands. +2020-04-07T00:40:58 | info | index.js | Loading 7 events. +2020-04-07T00:40:58 | info | mongoose.js | Connected to the database. +2020-04-07T00:41:01 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-07T00:41:01 | log | message.js | Command ran: help +2020-04-07T00:41:20 | log | message.js | Command ran: help +2020-04-07T00:41:36 | log | message.js | Command ran: help +2020-04-07T00:41:36 | error | _functions.js | Unhandled rejection: TypeError: Cannot read property 'length' of null +2020-04-07T00:43:16 | info | index.js | Loading 4 commands. +2020-04-07T00:43:16 | info | index.js | Loading 7 events. +2020-04-07T00:43:16 | info | mongoose.js | Connected to the database. +2020-04-07T00:43:19 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-07T00:43:19 | log | message.js | Command ran: help +2020-04-07T00:44:02 | info | index.js | Loading 4 commands. +2020-04-07T00:44:02 | info | index.js | Loading 7 events. +2020-04-07T00:44:02 | info | mongoose.js | Connected to the database. +2020-04-07T00:44:07 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-07T00:46:06 | info | index.js | Loading 4 commands. +2020-04-07T00:46:06 | info | index.js | Loading 7 events. +2020-04-07T00:46:06 | info | mongoose.js | Connected to the database. +2020-04-07T00:46:08 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-07T00:46:09 | log | message.js | Command ran: help +2020-04-07T00:46:20 | info | index.js | Loading 4 commands. +2020-04-07T00:46:20 | info | index.js | Loading 7 events. +2020-04-07T00:46:20 | info | mongoose.js | Connected to the database. +2020-04-07T00:46:23 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-07T00:46:27 | info | index.js | Loading 4 commands. +2020-04-07T00:46:27 | info | index.js | Loading 7 events. +2020-04-07T00:46:28 | info | mongoose.js | Connected to the database. +2020-04-07T00:46:30 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-07T00:46:50 | info | index.js | Loading 4 commands. +2020-04-07T00:46:50 | info | index.js | Loading 7 events. +2020-04-07T00:46:50 | info | mongoose.js | Connected to the database. +2020-04-07T00:46:52 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-07T00:47:00 | log | message.js | Command ran: help +2020-04-07T01:15:42 | log | message.js | Command ran: help +2020-04-07T01:17:37 | info | index.js | Loading 4 commands. +2020-04-07T01:17:37 | info | index.js | Loading 7 events. +2020-04-07T01:17:38 | info | mongoose.js | Connected to the database. +2020-04-07T01:17:40 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-07T01:17:45 | log | message.js | Command ran: help +2020-04-07T01:18:08 | info | index.js | Loading 4 commands. +2020-04-07T01:18:08 | info | index.js | Loading 7 events. +2020-04-07T01:18:08 | info | mongoose.js | Connected to the database. +2020-04-07T01:18:10 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-07T01:18:11 | log | message.js | Command ran: help +2020-04-07T01:19:15 | info | index.js | Loading 4 commands. +2020-04-07T01:19:15 | info | index.js | Loading 7 events. +2020-04-07T01:19:15 | info | mongoose.js | Connected to the database. +2020-04-07T01:19:17 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-07T01:19:17 | log | message.js | Command ran: help +2020-04-07T01:19:38 | info | index.js | Loading 4 commands. +2020-04-07T01:19:38 | info | index.js | Loading 7 events. +2020-04-07T01:19:38 | info | mongoose.js | Connected to the database. +2020-04-07T01:19:41 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-07T01:19:41 | log | message.js | Command ran: help +2020-04-07T01:19:50 | info | index.js | Loading 4 commands. +2020-04-07T01:19:50 | info | index.js | Loading 7 events. +2020-04-07T01:19:50 | info | mongoose.js | Connected to the database. +2020-04-07T01:19:53 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-07T01:19:53 | log | message.js | Command ran: help +2020-04-07T01:20:45 | log | message.js | Command ran: help +2020-04-07T01:20:48 | log | message.js | Command ran: help +2020-04-07T01:21:32 | info | index.js | Loading 4 commands. +2020-04-07T01:21:32 | info | index.js | Loading 7 events. +2020-04-07T01:21:32 | info | mongoose.js | Connected to the database. +2020-04-07T01:21:34 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-07T01:22:23 | info | index.js | Loading 4 commands. +2020-04-07T01:22:23 | info | index.js | Loading 7 events. +2020-04-07T01:22:23 | info | mongoose.js | Connected to the database. +2020-04-07T01:22:25 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-07T01:22:27 | log | message.js | Command ran: help +2020-04-07T01:22:38 | info | index.js | Loading 4 commands. +2020-04-07T01:22:38 | info | index.js | Loading 7 events. +2020-04-07T01:22:38 | info | mongoose.js | Connected to the database. +2020-04-07T01:22:41 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-07T01:22:41 | log | message.js | Command ran: help +2020-04-07T01:22:49 | log | message.js | Command ran: help +2020-04-07T01:23:03 | info | index.js | Loading 4 commands. +2020-04-07T01:23:03 | info | index.js | Loading 7 events. +2020-04-07T01:23:03 | info | mongoose.js | Connected to the database. +2020-04-07T01:23:05 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-07T01:23:05 | log | message.js | Command ran: help +2020-04-07T01:24:12 | info | index.js | Loading 4 commands. +2020-04-07T01:24:12 | info | index.js | Loading 7 events. +2020-04-07T01:24:12 | info | mongoose.js | Connected to the database. +2020-04-07T01:24:15 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-07T01:24:36 | info | index.js | Loading 4 commands. +2020-04-07T01:24:36 | info | index.js | Loading 7 events. +2020-04-07T01:24:36 | info | mongoose.js | Connected to the database. +2020-04-07T01:24:38 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-07T01:25:00 | info | index.js | Loading 4 commands. +2020-04-07T01:25:00 | info | index.js | Loading 7 events. +2020-04-07T01:25:00 | info | mongoose.js | Connected to the database. +2020-04-07T01:25:05 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-07T01:25:11 | log | message.js | Command ran: help +2020-04-07T01:25:14 | log | message.js | Command ran: help +2020-04-07T01:25:48 | log | message.js | Command ran: help +2020-04-07T01:26:26 | log | message.js | Command ran: help +2020-04-07T01:26:33 | log | message.js | Command ran: help +2020-04-07T01:26:38 | log | message.js | Command ran: help +2020-04-07T01:27:00 | info | index.js | Loading 4 commands. +2020-04-07T01:27:00 | info | index.js | Loading 7 events. +2020-04-07T01:27:00 | info | mongoose.js | Connected to the database. +2020-04-07T01:27:03 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-07T01:27:03 | log | message.js | Command ran: help +2020-04-07T01:27:18 | log | message.js | Command ran: help +2020-04-07T01:28:58 | info | index.js | Loading 4 commands. +2020-04-07T01:28:58 | info | index.js | Loading 7 events. +2020-04-07T01:28:58 | info | mongoose.js | Connected to the database. +2020-04-07T01:29:01 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-07T01:29:01 | log | message.js | Command ran: help +2020-04-07T01:29:30 | info | index.js | Loading 4 commands. +2020-04-07T01:29:30 | info | index.js | Loading 7 events. +2020-04-07T01:29:30 | info | mongoose.js | Connected to the database. +2020-04-07T01:29:33 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-07T01:29:34 | log | message.js | Command ran: help +2020-04-07T01:29:46 | info | index.js | Loading 4 commands. +2020-04-07T01:29:46 | info | index.js | Loading 7 events. +2020-04-07T01:29:46 | info | mongoose.js | Connected to the database. +2020-04-07T01:29:48 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-07T01:29:53 | log | message.js | Command ran: help +2020-04-07T01:32:58 | info | index.js | Loading 4 commands. +2020-04-07T01:32:58 | info | index.js | Loading 7 events. +2020-04-07T01:32:58 | info | mongoose.js | Connected to the database. +2020-04-07T01:33:01 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-07T01:38:33 | log | message.js | Command ran: level +2020-04-07T01:38:50 | log | message.js | Command ran: level +2020-04-07T01:40:46 | info | index.js | Loading 4 commands. +2020-04-07T01:40:46 | info | index.js | Loading 7 events. +2020-04-07T01:40:46 | info | mongoose.js | Connected to the database. +2020-04-07T01:40:49 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-07T01:40:55 | log | message.js | Command ran: level +2020-04-07T01:41:05 | log | message.js | Command ran: level +2020-04-07T01:41:28 | info | index.js | Loading 4 commands. +2020-04-07T01:41:28 | info | index.js | Loading 7 events. +2020-04-07T01:41:28 | info | mongoose.js | Connected to the database. +2020-04-07T01:41:30 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-07T01:41:50 | info | index.js | Loading 4 commands. +2020-04-07T01:41:50 | info | index.js | Loading 7 events. +2020-04-07T01:41:50 | info | mongoose.js | Connected to the database. +2020-04-07T01:41:53 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-07T01:41:53 | log | message.js | Command ran: level +2020-04-07T01:43:49 | info | index.js | Loading 5 commands. +2020-04-07T01:43:49 | error | index.js | Failed to load ship.js: TypeError: Cannot read property 'name' of undefined +2020-04-07T01:43:49 | info | index.js | Loading 7 events. +2020-04-07T01:43:49 | info | mongoose.js | Connected to the database. +2020-04-07T01:43:52 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-07T01:47:15 | info | index.js | Loading 5 commands. +2020-04-07T01:47:15 | info | index.js | Loading 7 events. +2020-04-07T01:47:15 | info | mongoose.js | Connected to the database. +2020-04-07T01:47:17 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-07T01:47:29 | log | message.js | Command ran: ship +2020-04-07T01:47:45 | log | message.js | Command ran: ship +2020-04-07T01:47:54 | log | message.js | Command ran: ship +2020-04-07T01:48:01 | log | message.js | Command ran: ship +2020-04-07T01:48:19 | log | message.js | Command ran: ship +2020-04-07T01:51:45 | log | message.js | Command ran: ship +2020-04-07T01:51:54 | log | message.js | Command ran: ship +2020-04-07T01:54:38 | info | index.js | Loading 5 commands. +2020-04-07T01:54:39 | info | index.js | Loading 7 events. +2020-04-07T01:54:39 | info | mongoose.js | Connected to the database. +2020-04-07T01:54:42 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-07T01:54:46 | log | message.js | Command ran: ship +2020-04-07T01:54:50 | log | message.js | Command ran: ship +2020-04-07T01:55:36 | log | message.js | Command ran: ship +2020-04-07T01:55:47 | log | message.js | Command ran: ship +2020-04-07T01:55:59 | log | message.js | Command ran: ship +2020-04-07T01:56:40 | info | index.js | Loading 5 commands. +2020-04-07T01:56:40 | info | index.js | Loading 7 events. +2020-04-07T01:56:40 | info | mongoose.js | Connected to the database. +2020-04-07T01:56:43 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-07T01:56:46 | log | message.js | Command ran: ship +2020-04-07T01:56:54 | log | message.js | Command ran: ship +2020-04-07T01:57:01 | log | message.js | Command ran: ship +2020-04-07T01:57:06 | log | message.js | Command ran: ship +2020-04-07T01:57:10 | log | message.js | Command ran: ship +2020-04-07T01:58:37 | log | message.js | Command ran: ship +2020-04-07T01:59:28 | info | index.js | Loading 5 commands. +2020-04-07T01:59:28 | info | index.js | Loading 7 events. +2020-04-07T01:59:28 | info | mongoose.js | Connected to the database. +2020-04-07T01:59:30 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-07T01:59:31 | log | message.js | Command ran: ship +2020-04-07T01:59:38 | log | message.js | Command ran: ship +2020-04-07T01:59:49 | info | index.js | Loading 5 commands. +2020-04-07T01:59:49 | info | index.js | Loading 7 events. +2020-04-07T01:59:49 | info | mongoose.js | Connected to the database. +2020-04-07T01:59:51 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-07T01:59:55 | info | index.js | Loading 5 commands. +2020-04-07T01:59:55 | info | index.js | Loading 7 events. +2020-04-07T01:59:55 | info | mongoose.js | Connected to the database. +2020-04-07T01:59:57 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-07T02:00:07 | log | message.js | Command ran: ship +2020-04-07T02:04:00 | info | index.js | Loading 5 commands. +2020-04-07T02:04:00 | info | index.js | Loading 7 events. +2020-04-07T02:04:00 | info | mongoose.js | Connected to the database. +2020-04-07T02:04:03 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-07T02:04:09 | log | message.js | Command ran: ship +2020-04-07T02:04:09 | error | _functions.js | Unhandled rejection: TypeError: client.embedClour is not a function +2020-04-07T02:04:25 | info | index.js | Loading 5 commands. +2020-04-07T02:04:25 | info | index.js | Loading 7 events. +2020-04-07T02:04:26 | info | mongoose.js | Connected to the database. +2020-04-07T02:04:30 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-07T02:04:30 | log | message.js | Command ran: ship +2020-04-07T02:04:30 | error | _functions.js | Unhandled rejection: TypeError: guild.member is not a function +2020-04-07T02:05:10 | info | index.js | Loading 5 commands. +2020-04-07T02:05:10 | info | index.js | Loading 7 events. +2020-04-07T02:05:10 | info | mongoose.js | Connected to the database. +2020-04-07T02:05:12 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-07T02:05:35 | info | index.js | Loading 5 commands. +2020-04-07T02:05:35 | info | index.js | Loading 7 events. +2020-04-07T02:05:35 | info | mongoose.js | Connected to the database. +2020-04-07T02:05:40 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-07T02:05:40 | log | message.js | Command ran: ship +2020-04-07T02:05:40 | error | _functions.js | Unhandled rejection: TypeError: embed.setColour is not a function +2020-04-07T02:05:53 | info | index.js | Loading 5 commands. +2020-04-07T02:05:53 | info | index.js | Loading 7 events. +2020-04-07T02:05:53 | info | mongoose.js | Connected to the database. +2020-04-07T02:05:55 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-07T02:05:57 | log | message.js | Command ran: ship +2020-04-07T02:06:59 | info | index.js | Loading 5 commands. +2020-04-07T02:06:59 | info | index.js | Loading 7 events. +2020-04-07T02:06:59 | info | mongoose.js | Connected to the database. +2020-04-07T02:07:01 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-07T02:07:05 | log | message.js | Command ran: ship +2020-04-07T02:09:30 | info | index.js | Loading 5 commands. +2020-04-07T02:09:30 | info | index.js | Loading 7 events. +2020-04-07T02:09:30 | info | mongoose.js | Connected to the database. +2020-04-07T02:09:33 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-07T02:09:36 | log | message.js | Command ran: ship +2020-04-07T02:10:26 | info | index.js | Loading 5 commands. +2020-04-07T02:10:26 | info | index.js | Loading 7 events. +2020-04-07T02:10:26 | info | mongoose.js | Connected to the database. +2020-04-07T02:10:28 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-07T02:10:31 | log | message.js | Command ran: ship +2020-04-07T02:10:55 | info | index.js | Loading 5 commands. +2020-04-07T02:10:55 | info | index.js | Loading 7 events. +2020-04-07T02:10:55 | info | mongoose.js | Connected to the database. +2020-04-07T02:10:57 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-07T02:11:08 | info | index.js | Loading 5 commands. +2020-04-07T02:11:08 | info | index.js | Loading 7 events. +2020-04-07T02:11:08 | info | mongoose.js | Connected to the database. +2020-04-07T02:11:10 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-07T02:12:30 | info | index.js | Loading 5 commands. +2020-04-07T02:12:30 | info | index.js | Loading 7 events. +2020-04-07T02:12:30 | info | mongoose.js | Connected to the database. +2020-04-07T02:12:32 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-07T02:15:47 | log | message.js | Command ran: ship +2020-04-07T02:15:59 | log | message.js | Command ran: ship +2020-04-07T02:22:02 | info | index.js | Loading 5 commands. +2020-04-07T02:22:02 | info | index.js | Loading 7 events. +2020-04-07T02:22:02 | info | mongoose.js | Connected to the database. +2020-04-07T02:22:05 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-07T02:22:20 | log | message.js | Command ran: ship +2020-04-07T02:22:20 | error | _functions.js | Unhandled rejection: TypeError: Discord.RichEmbed is not a constructor +2020-04-07T02:23:00 | info | index.js | Loading 5 commands. +2020-04-07T02:23:00 | info | index.js | Loading 7 events. +2020-04-07T02:23:00 | info | mongoose.js | Connected to the database. +2020-04-07T02:23:02 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-07T02:23:06 | log | message.js | Command ran: ship +2020-04-07T02:24:47 | info | index.js | Loading 5 commands. +2020-04-07T02:24:47 | info | index.js | Loading 7 events. +2020-04-07T02:24:47 | info | mongoose.js | Connected to the database. +2020-04-07T02:24:52 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-07T02:24:54 | log | message.js | Command ran: ship +2020-04-07T02:30:34 | info | index.js | Loading 5 commands. +2020-04-07T02:30:34 | info | index.js | Loading 7 events. +2020-04-07T02:30:34 | info | mongoose.js | Connected to the database. +2020-04-07T02:30:36 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-07T02:30:42 | log | message.js | Command ran: ship +2020-04-07T02:32:02 | info | index.js | Loading 5 commands. +2020-04-07T02:32:02 | info | index.js | Loading 7 events. +2020-04-07T02:32:02 | info | mongoose.js | Connected to the database. +2020-04-07T02:32:05 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-07T02:33:52 | info | index.js | Loading 5 commands. +2020-04-07T02:33:52 | info | index.js | Loading 7 events. +2020-04-07T02:33:52 | info | mongoose.js | Connected to the database. +2020-04-07T02:33:54 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-07T02:34:15 | log | message.js | Command ran: ship +2020-04-07T02:34:26 | info | index.js | Loading 5 commands. +2020-04-07T02:34:26 | info | index.js | Loading 7 events. +2020-04-07T02:34:26 | info | mongoose.js | Connected to the database. +2020-04-07T02:34:29 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-07T02:34:30 | log | message.js | Command ran: ship +2020-04-07T02:34:30 | error | _functions.js | Unhandled rejection: TypeError: Cannot read property 'substr' of undefined +2020-04-07T02:34:55 | info | index.js | Loading 5 commands. +2020-04-07T02:34:55 | info | index.js | Loading 7 events. +2020-04-07T02:34:55 | info | mongoose.js | Connected to the database. +2020-04-07T02:34:57 | ready | ready.js | Connected to Discord as WoomyDev#4547 From 0ac043371f76d6c727f3f88a435511f0b39c4b04 Mon Sep 17 00:00:00 2001 From: mudkipscience Date: Tue, 7 Apr 2020 18:10:01 +1000 Subject: [PATCH 042/156] stiff --- commands/help.js | 2 +- commands/ship.js | 18 +------- file.log | 102 ++++++++++++++++++++++++++++++++++++++++++ helpers/_functions.js | 26 ++++++----- 4 files changed, 120 insertions(+), 28 deletions(-) diff --git a/commands/help.js b/commands/help.js index a8adb30..5f1bfa6 100644 --- a/commands/help.js +++ b/commands/help.js @@ -45,7 +45,7 @@ exports.run = (client, message, args, level, data) => { categories.sort().forEach((cat) => { const filtered = commands.filter((cmd) => cmd.help.category === cat) - embed.addField(cat + ` [${filtered.size}]`, filtered.map((cmd) => '`' + cmd.help.name + '`').join(', ')) + embed.addField(cat + ` [${filtered.size}]`, filtered.map((cmd) => '`' + cmd.help.name + '`').join(', '), true) }) if (message.guild && data.guild.customCommands.length > 0) { diff --git a/commands/ship.js b/commands/ship.js index 882b899..301d53d 100644 --- a/commands/ship.js +++ b/commands/ship.js @@ -15,7 +15,6 @@ exports.help = { } exports.run = async (client, message, args, level, data) => { - var firstName, secondName var rating = Math.floor(Math.random() * 100) + 1 var hearts = [ '❤️', @@ -30,21 +29,8 @@ exports.run = async (client, message, args, level, data) => { return message.channel.send('<:error:466995152976871434> Please include two names/users.') } - if (message.guild && message.mentions.members && message.mentions.members.size > 0) { - firstName = message.mentions.members.first().displayName - } - - if (message.guild && message.mentions.members && message.mentions.members.size > 1) { - secondName = message.mentions.members.last().displayName - } - - if (!firstName) { - firstName = args[0] - } - - if (!secondName) { - secondName = args[1] - } + const firstName = args[0] + const secondName = args[1] const shipName = firstName.substr(0, firstName.length * 0.5) + secondName.substr(secondName.length * 0.5) diff --git a/file.log b/file.log index 5d23832..48e7adf 100644 --- a/file.log +++ b/file.log @@ -899,3 +899,105 @@ 2020-04-07T02:34:55 | info | index.js | Loading 7 events. 2020-04-07T02:34:55 | info | mongoose.js | Connected to the database. 2020-04-07T02:34:57 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-07T11:48:46 | info | index.js | Loading 5 commands. +2020-04-07T11:48:46 | info | index.js | Loading 7 events. +2020-04-07T11:48:46 | info | mongoose.js | Connected to the database. +2020-04-07T11:48:48 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-07T11:59:26 | log | message.js | Command ran: help +2020-04-07T12:06:42 | log | message.js | Command ran: help +2020-04-07T12:12:46 | log | message.js | Command ran: help +2020-04-07T12:17:41 | log | message.js | Command ran: help +2020-04-07T12:18:17 | info | index.js | Loading 5 commands. +2020-04-07T12:18:17 | info | index.js | Loading 7 events. +2020-04-07T12:18:17 | info | mongoose.js | Connected to the database. +2020-04-07T12:18:19 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-07T12:18:19 | log | message.js | Command ran: help +2020-04-07T12:36:21 | info | index.js | Loading 5 commands. +2020-04-07T12:36:21 | info | index.js | Loading 7 events. +2020-04-07T12:36:21 | info | mongoose.js | Connected to the database. +2020-04-07T12:36:24 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-07T12:37:20 | log | message.js | Command ran: ship +2020-04-07T12:37:23 | log | message.js | Command ran: ship +2020-04-07T16:24:09 | info | index.js | Loading 5 commands. +2020-04-07T16:24:09 | info | index.js | Loading 7 events. +2020-04-07T16:24:09 | info | mongoose.js | Connected to the database. +2020-04-07T16:24:11 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-07T16:24:22 | log | message.js | Command ran: help +2020-04-07T16:30:54 | log | message.js | Command ran: help +2020-04-07T17:08:39 | log | message.js | Command ran: ship +2020-04-07T17:16:50 | log | message.js | Command ran: help +2020-04-07T17:19:27 | info | index.js | Loading 5 commands. +2020-04-07T17:19:27 | info | index.js | Loading 7 events. +2020-04-07T17:19:27 | info | mongoose.js | Connected to the database. +2020-04-07T17:19:30 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-07T17:20:24 | info | index.js | Loading 5 commands. +2020-04-07T17:20:24 | info | index.js | Loading 7 events. +2020-04-07T17:20:24 | info | mongoose.js | Connected to the database. +2020-04-07T17:20:26 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-07T17:20:28 | log | message.js | Command ran: ship +2020-04-07T17:21:08 | info | index.js | Loading 5 commands. +2020-04-07T17:21:08 | info | index.js | Loading 7 events. +2020-04-07T17:21:08 | info | mongoose.js | Connected to the database. +2020-04-07T17:21:10 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-07T17:21:19 | log | message.js | Command ran: ship +2020-04-07T17:21:41 | info | index.js | Loading 5 commands. +2020-04-07T17:21:41 | info | index.js | Loading 7 events. +2020-04-07T17:21:41 | info | mongoose.js | Connected to the database. +2020-04-07T17:21:43 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-07T17:21:46 | log | message.js | Command ran: ship +2020-04-07T17:22:01 | info | index.js | Loading 5 commands. +2020-04-07T17:22:01 | info | index.js | Loading 7 events. +2020-04-07T17:22:01 | info | mongoose.js | Connected to the database. +2020-04-07T17:22:04 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-07T17:22:05 | log | message.js | Command ran: ship +2020-04-07T17:22:26 | info | index.js | Loading 5 commands. +2020-04-07T17:22:27 | info | index.js | Loading 7 events. +2020-04-07T17:22:27 | info | mongoose.js | Connected to the database. +2020-04-07T17:22:29 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-07T17:22:31 | log | message.js | Command ran: ship +2020-04-07T17:22:52 | info | index.js | Loading 5 commands. +2020-04-07T17:22:52 | info | index.js | Loading 7 events. +2020-04-07T17:22:52 | info | mongoose.js | Connected to the database. +2020-04-07T17:22:55 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-07T17:22:56 | log | message.js | Command ran: ship +2020-04-07T17:24:17 | info | index.js | Loading 5 commands. +2020-04-07T17:24:17 | info | index.js | Loading 7 events. +2020-04-07T17:24:17 | info | mongoose.js | Connected to the database. +2020-04-07T17:24:20 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-07T17:24:22 | info | index.js | Loading 5 commands. +2020-04-07T17:24:22 | info | index.js | Loading 7 events. +2020-04-07T17:24:22 | info | mongoose.js | Connected to the database. +2020-04-07T17:24:30 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-07T17:24:35 | log | message.js | Command ran: ship +2020-04-07T17:25:51 | info | index.js | Loading 5 commands. +2020-04-07T17:25:51 | info | index.js | Loading 7 events. +2020-04-07T17:25:51 | info | mongoose.js | Connected to the database. +2020-04-07T17:25:54 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-07T17:26:46 | log | message.js | Command ran: eval +2020-04-07T17:27:13 | log | message.js | Command ran: eval +2020-04-07T17:27:25 | log | message.js | Command ran: eval +2020-04-07T17:29:21 | info | index.js | Loading 5 commands. +2020-04-07T17:29:21 | info | index.js | Loading 7 events. +2020-04-07T17:29:21 | info | mongoose.js | Connected to the database. +2020-04-07T17:29:23 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-07T17:29:37 | info | index.js | Loading 5 commands. +2020-04-07T17:29:37 | info | index.js | Loading 7 events. +2020-04-07T17:29:37 | info | mongoose.js | Connected to the database. +2020-04-07T17:29:39 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-07T17:31:03 | log | message.js | Command ran: eval +2020-04-07T17:58:55 | info | index.js | Loading 5 commands. +2020-04-07T17:58:55 | info | index.js | Loading 7 events. +2020-04-07T17:58:55 | info | mongoose.js | Connected to the database. +2020-04-07T17:59:00 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-07T17:59:02 | log | message.js | Command ran: ship +2020-04-07T17:59:17 | log | message.js | Command ran: ship +2020-04-07T18:00:43 | info | index.js | Loading 5 commands. +2020-04-07T18:00:43 | info | index.js | Loading 7 events. +2020-04-07T18:00:43 | info | mongoose.js | Connected to the database. +2020-04-07T18:00:45 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-07T18:00:50 | log | message.js | Command ran: ship +2020-04-07T18:07:47 | info | index.js | Loading 5 commands. +2020-04-07T18:07:47 | info | index.js | Loading 7 events. +2020-04-07T18:07:47 | info | mongoose.js | Connected to the database. +2020-04-07T18:07:49 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-07T18:07:57 | log | message.js | Command ran: ship diff --git a/helpers/_functions.js b/helpers/_functions.js index 59a4ec0..003007d 100644 --- a/helpers/_functions.js +++ b/helpers/_functions.js @@ -195,17 +195,6 @@ module.exports = client => { const members = [] let member - // Try mention - if (search.startsWith('<@') && search.endsWith('>')) { - let mention = search.slice(2, -1) - - if (mention.startsWith('!')) { - mention = mention.slice(1) - } - - return guild.members.cache.get(mention) - } - // Try ID search if (!isNaN(search) === true) { members.push(guild.members.cache.get(search)) @@ -233,6 +222,21 @@ module.exports = client => { return members } + // USER OBJECT FROM MENTION + client.getUserFromMention = mention => { + if (!mention) return + + if (mention.startsWith('<@') && mention.endsWith('>')) { + mention = mention.slice(2, -1) + + if (mention.startsWith('!')) { + mention = mention.slice(1) + } + + return client.users.cache.get(mention) + } + } + client.findRole = function (guild, search) { var role = guild.roles.cache.find(r => r.name.toLowerCase() === search.toLowerCase()) if (!role) { From 491751a58bc5c4dfd30f74579feaee2fe5c51cea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Hor=C3=A1=C4=8Dek?= Date: Wed, 8 Apr 2020 09:43:45 +0200 Subject: [PATCH 043/156] gitignore & data placeholder --- .gitignore | 5 ++++- data/PLACEHOLDER | 0 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 data/PLACEHOLDER diff --git a/.gitignore b/.gitignore index c0c738c..0d63826 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,5 @@ +.vscode +.env *config.js -node_modules \ No newline at end of file +node_modules +data/enmap* \ No newline at end of file diff --git a/data/PLACEHOLDER b/data/PLACEHOLDER new file mode 100644 index 0000000..e69de29 From 59d883642732d785d9d68f603c5028de65ee499e Mon Sep 17 00:00:00 2001 From: mudkipscience Date: Wed, 8 Apr 2020 18:12:01 +1000 Subject: [PATCH 044/156] updated ship and functions --- commands/ship.js | 27 ++- file.log | 405 ++++++++++++++++++++++++++++++++++++++++++ helpers/_functions.js | 2 +- version.json | 3 +- 4 files changed, 433 insertions(+), 4 deletions(-) diff --git a/commands/ship.js b/commands/ship.js index 301d53d..ba6693f 100644 --- a/commands/ship.js +++ b/commands/ship.js @@ -11,11 +11,14 @@ exports.help = { name: 'ship', category: 'Fun', description: 'Ship two people together <3', - usage: 'ship [name/user] [name/user]' + usage: 'ship [name/user] [name/user]', + params: '' } +const { MessageEmbed } = require('discord.js') exports.run = async (client, message, args, level, data) => { var rating = Math.floor(Math.random() * 100) + 1 + var meter = ['▬', '▬', '▬', '▬', '▬', '▬', '▬', '▬', '▬'] var hearts = [ '❤️', '🧡', @@ -37,5 +40,25 @@ exports.run = async (client, message, args, level, data) => { if (shipName.toLowerCase() === 'teily' || shipName.toLowerCase() === 'emrra') { rating = '100' } - message.channel.send(`__**Ship Generator:**__\n${hearts.random()} Ship Name: \`${shipName}\`\n${hearts.random()} Compatibility: \`${rating}%\``) + + var pos = 0 + var under = 9 + while (pos < 10) { + if (rating < under) { + meter.splice(pos, 0, hearts.random()) + break + } + pos++ + under += 10 + } + + if (rating > 99) { + meter.splice(9, 0, hearts.random()) + } + + const embed = new MessageEmbed() + embed.setTitle(`Original Names: ${firstName}, ${secondName}`) + embed.setColor(client.embedColour(message.guild)) + embed.setDescription(`Ship Name: **${shipName}**\nCompatibility: **${rating}%**\n**[**${meter.join('')}**]**`) + message.channel.send(embed) } diff --git a/file.log b/file.log index 48e7adf..845d64c 100644 --- a/file.log +++ b/file.log @@ -1001,3 +1001,408 @@ 2020-04-07T18:07:47 | info | mongoose.js | Connected to the database. 2020-04-07T18:07:49 | ready | ready.js | Connected to Discord as WoomyDev#4547 2020-04-07T18:07:57 | log | message.js | Command ran: ship +2020-04-08T14:30:50 | info | index.js | Loading 5 commands. +2020-04-08T14:30:50 | info | index.js | Loading 7 events. +2020-04-08T14:30:50 | info | mongoose.js | Connected to the database. +2020-04-08T14:30:52 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T14:30:57 | log | message.js | Command ran: ship +2020-04-08T14:31:19 | info | index.js | Loading 5 commands. +2020-04-08T14:31:19 | info | index.js | Loading 7 events. +2020-04-08T14:31:19 | info | mongoose.js | Connected to the database. +2020-04-08T14:31:21 | info | index.js | Loading 5 commands. +2020-04-08T14:31:21 | info | index.js | Loading 7 events. +2020-04-08T14:31:21 | info | mongoose.js | Connected to the database. +2020-04-08T14:31:31 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T14:31:33 | log | message.js | Command ran: ship +2020-04-08T14:31:50 | info | index.js | Loading 5 commands. +2020-04-08T14:31:50 | info | index.js | Loading 7 events. +2020-04-08T14:31:50 | info | mongoose.js | Connected to the database. +2020-04-08T14:31:53 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T14:31:54 | log | message.js | Command ran: ship +2020-04-08T14:32:05 | info | index.js | Loading 5 commands. +2020-04-08T14:32:05 | info | index.js | Loading 7 events. +2020-04-08T14:32:05 | info | mongoose.js | Connected to the database. +2020-04-08T14:32:08 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T14:32:09 | log | message.js | Command ran: ship +2020-04-08T14:32:16 | info | index.js | Loading 5 commands. +2020-04-08T14:32:16 | info | index.js | Loading 7 events. +2020-04-08T14:32:16 | info | mongoose.js | Connected to the database. +2020-04-08T14:32:19 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T14:32:21 | log | message.js | Command ran: ship +2020-04-08T14:33:11 | info | index.js | Loading 5 commands. +2020-04-08T14:33:11 | info | index.js | Loading 7 events. +2020-04-08T14:33:11 | info | mongoose.js | Connected to the database. +2020-04-08T14:33:13 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T14:33:18 | log | message.js | Command ran: ship +2020-04-08T14:33:27 | info | index.js | Loading 5 commands. +2020-04-08T14:33:27 | info | index.js | Loading 7 events. +2020-04-08T14:33:27 | info | mongoose.js | Connected to the database. +2020-04-08T14:33:29 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T14:33:31 | log | message.js | Command ran: ship +2020-04-08T14:33:39 | info | index.js | Loading 5 commands. +2020-04-08T14:33:39 | info | index.js | Loading 7 events. +2020-04-08T14:33:39 | info | mongoose.js | Connected to the database. +2020-04-08T14:33:41 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T14:33:43 | log | message.js | Command ran: ship +2020-04-08T14:34:09 | info | index.js | Loading 5 commands. +2020-04-08T14:34:09 | info | index.js | Loading 7 events. +2020-04-08T14:34:09 | info | mongoose.js | Connected to the database. +2020-04-08T14:34:11 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T14:34:14 | log | message.js | Command ran: ship +2020-04-08T14:34:22 | log | message.js | Command ran: ship +2020-04-08T14:34:26 | log | message.js | Command ran: ship +2020-04-08T14:34:44 | info | index.js | Loading 5 commands. +2020-04-08T14:34:44 | info | index.js | Loading 7 events. +2020-04-08T14:34:44 | info | mongoose.js | Connected to the database. +2020-04-08T14:34:47 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T14:34:50 | log | message.js | Command ran: ship +2020-04-08T14:34:55 | log | message.js | Command ran: ship +2020-04-08T14:36:42 | log | message.js | Command ran: help +2020-04-08T14:38:12 | info | index.js | Loading 5 commands. +2020-04-08T14:38:12 | info | index.js | Loading 7 events. +2020-04-08T14:38:12 | info | mongoose.js | Connected to the database. +2020-04-08T14:38:15 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T14:38:16 | log | message.js | Command ran: ship +2020-04-08T14:38:28 | info | index.js | Loading 5 commands. +2020-04-08T14:38:28 | info | index.js | Loading 7 events. +2020-04-08T14:38:28 | info | mongoose.js | Connected to the database. +2020-04-08T14:38:30 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T14:38:31 | log | message.js | Command ran: ship +2020-04-08T14:39:29 | info | index.js | Loading 7 events. +2020-04-08T14:39:29 | info | index.js | Loading 5 commands. +2020-04-08T14:39:29 | info | mongoose.js | Connected to the database. +2020-04-08T14:39:31 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T14:39:33 | log | message.js | Command ran: ship +2020-04-08T14:41:20 | info | index.js | Loading 5 commands. +2020-04-08T14:41:20 | info | index.js | Loading 7 events. +2020-04-08T14:41:20 | info | mongoose.js | Connected to the database. +2020-04-08T14:41:24 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T14:41:28 | log | message.js | Command ran: ship +2020-04-08T14:41:46 | info | index.js | Loading 5 commands. +2020-04-08T14:41:46 | info | index.js | Loading 7 events. +2020-04-08T14:41:46 | info | mongoose.js | Connected to the database. +2020-04-08T14:41:48 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T14:41:49 | log | message.js | Command ran: ship +2020-04-08T14:42:09 | info | index.js | Loading 5 commands. +2020-04-08T14:42:09 | info | index.js | Loading 7 events. +2020-04-08T14:42:09 | info | mongoose.js | Connected to the database. +2020-04-08T14:42:12 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T14:42:14 | log | message.js | Command ran: ship +2020-04-08T14:42:28 | log | message.js | Command ran: ship +2020-04-08T14:43:30 | info | index.js | Loading 5 commands. +2020-04-08T14:43:30 | info | index.js | Loading 7 events. +2020-04-08T14:43:30 | info | mongoose.js | Connected to the database. +2020-04-08T14:43:33 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T14:43:34 | log | message.js | Command ran: ship +2020-04-08T14:43:47 | info | index.js | Loading 5 commands. +2020-04-08T14:43:47 | info | index.js | Loading 7 events. +2020-04-08T14:43:47 | info | mongoose.js | Connected to the database. +2020-04-08T14:43:48 | info | index.js | Loading 5 commands. +2020-04-08T14:43:48 | info | index.js | Loading 7 events. +2020-04-08T14:43:48 | info | mongoose.js | Connected to the database. +2020-04-08T14:43:50 | info | index.js | Loading 5 commands. +2020-04-08T14:43:50 | info | index.js | Loading 7 events. +2020-04-08T14:43:50 | info | mongoose.js | Connected to the database. +2020-04-08T14:43:57 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T14:43:57 | log | message.js | Command ran: ship +2020-04-08T14:44:25 | info | index.js | Loading 5 commands. +2020-04-08T14:44:25 | info | index.js | Loading 7 events. +2020-04-08T14:44:25 | info | mongoose.js | Connected to the database. +2020-04-08T14:44:27 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T14:44:30 | log | message.js | Command ran: ship +2020-04-08T14:45:28 | info | index.js | Loading 5 commands. +2020-04-08T14:45:28 | info | index.js | Loading 7 events. +2020-04-08T14:45:28 | info | mongoose.js | Connected to the database. +2020-04-08T14:45:31 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T14:45:32 | log | message.js | Command ran: ship +2020-04-08T14:45:47 | info | index.js | Loading 5 commands. +2020-04-08T14:45:47 | info | index.js | Loading 7 events. +2020-04-08T14:45:47 | info | mongoose.js | Connected to the database. +2020-04-08T14:45:50 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T14:45:53 | log | message.js | Command ran: ship +2020-04-08T14:46:04 | info | index.js | Loading 5 commands. +2020-04-08T14:46:04 | info | index.js | Loading 7 events. +2020-04-08T14:46:04 | info | mongoose.js | Connected to the database. +2020-04-08T14:46:06 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T14:46:07 | log | message.js | Command ran: ship +2020-04-08T14:46:22 | info | index.js | Loading 5 commands. +2020-04-08T14:46:22 | info | index.js | Loading 7 events. +2020-04-08T14:46:22 | info | mongoose.js | Connected to the database. +2020-04-08T14:46:24 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T14:46:26 | log | message.js | Command ran: ship +2020-04-08T14:46:54 | info | index.js | Loading 5 commands. +2020-04-08T14:46:54 | info | index.js | Loading 7 events. +2020-04-08T14:46:55 | info | mongoose.js | Connected to the database. +2020-04-08T14:46:57 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T14:47:00 | log | message.js | Command ran: ship +2020-04-08T14:47:14 | info | index.js | Loading 5 commands. +2020-04-08T14:47:14 | info | index.js | Loading 7 events. +2020-04-08T14:47:15 | info | mongoose.js | Connected to the database. +2020-04-08T14:47:16 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T14:47:21 | log | message.js | Command ran: ship +2020-04-08T14:47:46 | info | index.js | Loading 5 commands. +2020-04-08T14:47:46 | info | index.js | Loading 7 events. +2020-04-08T14:47:46 | info | mongoose.js | Connected to the database. +2020-04-08T14:47:48 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T14:47:52 | log | message.js | Command ran: ship +2020-04-08T14:48:09 | info | index.js | Loading 5 commands. +2020-04-08T14:48:09 | info | index.js | Loading 7 events. +2020-04-08T14:48:09 | info | mongoose.js | Connected to the database. +2020-04-08T14:48:11 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T14:48:13 | log | message.js | Command ran: ship +2020-04-08T14:48:42 | info | index.js | Loading 5 commands. +2020-04-08T14:48:42 | info | index.js | Loading 7 events. +2020-04-08T14:48:42 | info | mongoose.js | Connected to the database. +2020-04-08T14:48:45 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T14:48:46 | log | message.js | Command ran: ship +2020-04-08T14:51:13 | info | index.js | Loading 5 commands. +2020-04-08T14:51:13 | info | index.js | Loading 7 events. +2020-04-08T14:51:13 | info | mongoose.js | Connected to the database. +2020-04-08T14:51:15 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T14:51:16 | info | index.js | Loading 5 commands. +2020-04-08T14:51:16 | info | index.js | Loading 7 events. +2020-04-08T14:51:16 | info | mongoose.js | Connected to the database. +2020-04-08T14:51:25 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T14:51:36 | log | message.js | Command ran: ship +2020-04-08T14:53:16 | info | index.js | Loading 5 commands. +2020-04-08T14:53:16 | info | index.js | Loading 7 events. +2020-04-08T14:53:16 | info | mongoose.js | Connected to the database. +2020-04-08T14:53:18 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T14:53:25 | log | message.js | Command ran: ship +2020-04-08T14:53:25 | error | _functions.js | Unhandled rejection: ReferenceError: lastName is not defined +2020-04-08T14:53:29 | log | message.js | Command ran: ship +2020-04-08T14:53:29 | error | _functions.js | Unhandled rejection: ReferenceError: lastName is not defined +2020-04-08T14:53:38 | info | index.js | Loading 5 commands. +2020-04-08T14:53:38 | info | index.js | Loading 7 events. +2020-04-08T14:53:38 | info | mongoose.js | Connected to the database. +2020-04-08T14:53:40 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T14:53:45 | log | message.js | Command ran: ship +2020-04-08T14:54:33 | info | index.js | Loading 5 commands. +2020-04-08T14:54:33 | info | index.js | Loading 7 events. +2020-04-08T14:54:33 | error | index.js | Failed to load ship.js: SyntaxError: Unexpected end of input +2020-04-08T14:54:33 | info | mongoose.js | Connected to the database. +2020-04-08T14:54:36 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T14:55:08 | info | index.js | Loading 5 commands. +2020-04-08T14:55:08 | info | index.js | Loading 7 events. +2020-04-08T14:55:08 | info | mongoose.js | Connected to the database. +2020-04-08T14:55:10 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T14:55:11 | log | message.js | Command ran: ship +2020-04-08T14:55:23 | info | index.js | Loading 5 commands. +2020-04-08T14:55:23 | info | index.js | Loading 7 events. +2020-04-08T14:55:23 | info | mongoose.js | Connected to the database. +2020-04-08T14:55:26 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T14:55:30 | log | message.js | Command ran: ship +2020-04-08T14:55:47 | info | index.js | Loading 7 events. +2020-04-08T14:55:47 | info | index.js | Loading 5 commands. +2020-04-08T14:55:47 | info | mongoose.js | Connected to the database. +2020-04-08T14:55:49 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T14:55:51 | log | message.js | Command ran: ship +2020-04-08T14:56:00 | info | index.js | Loading 5 commands. +2020-04-08T14:56:00 | info | index.js | Loading 7 events. +2020-04-08T14:56:00 | info | mongoose.js | Connected to the database. +2020-04-08T14:56:02 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T14:56:04 | log | message.js | Command ran: ship +2020-04-08T14:56:08 | log | message.js | Command ran: ship +2020-04-08T14:56:16 | info | index.js | Loading 5 commands. +2020-04-08T14:56:16 | info | index.js | Loading 7 events. +2020-04-08T14:56:16 | info | mongoose.js | Connected to the database. +2020-04-08T14:56:19 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T14:56:31 | info | index.js | Loading 5 commands. +2020-04-08T14:56:31 | info | index.js | Loading 7 events. +2020-04-08T14:56:31 | info | mongoose.js | Connected to the database. +2020-04-08T14:56:34 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T14:56:35 | log | message.js | Command ran: ship +2020-04-08T14:57:00 | info | index.js | Loading 5 commands. +2020-04-08T14:57:00 | info | index.js | Loading 7 events. +2020-04-08T14:57:00 | info | mongoose.js | Connected to the database. +2020-04-08T14:57:02 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T14:57:03 | log | message.js | Command ran: ship +2020-04-08T14:57:24 | info | index.js | Loading 5 commands. +2020-04-08T14:57:24 | info | index.js | Loading 7 events. +2020-04-08T14:57:24 | info | mongoose.js | Connected to the database. +2020-04-08T14:57:26 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T14:57:27 | log | message.js | Command ran: ship +2020-04-08T14:57:35 | info | index.js | Loading 5 commands. +2020-04-08T14:57:35 | info | index.js | Loading 7 events. +2020-04-08T14:57:35 | info | mongoose.js | Connected to the database. +2020-04-08T14:57:37 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T14:57:39 | log | message.js | Command ran: ship +2020-04-08T15:00:56 | log | message.js | Command ran: help +2020-04-08T15:01:25 | log | message.js | Command ran: help +2020-04-08T15:28:24 | log | message.js | Command ran: help +2020-04-08T16:21:07 | log | message.js | Command ran: ship +2020-04-08T16:22:30 | log | message.js | Command ran: ship +2020-04-08T16:32:55 | log | message.js | Command ran: help +2020-04-08T16:33:00 | log | message.js | Command ran: help +2020-04-08T16:34:45 | info | index.js | Loading 5 commands. +2020-04-08T16:34:45 | info | index.js | Loading 7 events. +2020-04-08T16:34:45 | info | mongoose.js | Connected to the database. +2020-04-08T16:34:47 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T16:34:49 | log | message.js | Command ran: help +2020-04-08T16:34:52 | log | message.js | Command ran: help +2020-04-08T16:34:52 | error | _functions.js | Unhandled rejection: TypeError: Cannot read property 'length' of undefined +2020-04-08T16:35:18 | log | message.js | Command ran: eval +2020-04-08T16:35:51 | log | message.js | Command ran: help +2020-04-08T16:35:51 | error | _functions.js | Unhandled rejection: TypeError: Cannot read property 'length' of undefined +2020-04-08T16:36:00 | log | message.js | Command ran: help +2020-04-08T16:36:52 | info | index.js | Loading 5 commands. +2020-04-08T16:36:52 | info | index.js | Loading 7 events. +2020-04-08T16:36:52 | info | mongoose.js | Connected to the database. +2020-04-08T16:36:58 | info | index.js | Loading 5 commands. +2020-04-08T16:36:58 | info | index.js | Loading 7 events. +2020-04-08T16:36:58 | info | mongoose.js | Connected to the database. +2020-04-08T16:37:00 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T16:37:05 | log | message.js | Command ran: help +2020-04-08T16:37:05 | error | _functions.js | Unhandled rejection: RangeError [EMBED_FIELD_VALUE]: MessageEmbed field values may not be empty. +2020-04-08T16:40:22 | error | _functions.js | Unhandled rejection: RangeError [EMBED_FIELD_VALUE]: MessageEmbed field values may not be empty. +2020-04-08T16:39:01 | log | message.js | Command ran: help +2020-04-08T16:40:22 | log | message.js | Command ran: help +2020-04-08T16:40:22 | error | _functions.js | Unhandled rejection: RangeError [EMBED_FIELD_VALUE]: MessageEmbed field values may not be empty. +2020-04-08T16:40:23 | info | index.js | Loading 5 commands. +2020-04-08T16:40:23 | info | index.js | Loading 7 events. +2020-04-08T16:40:23 | info | mongoose.js | Connected to the database. +2020-04-08T16:40:25 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T16:40:28 | log | message.js | Command ran: help +2020-04-08T16:42:03 | info | index.js | Loading 5 commands. +2020-04-08T16:42:03 | info | index.js | Loading 7 events. +2020-04-08T16:42:03 | info | mongoose.js | Connected to the database. +2020-04-08T16:42:05 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T16:42:06 | log | message.js | Command ran: help +2020-04-08T16:42:46 | info | index.js | Loading 5 commands. +2020-04-08T16:42:46 | info | index.js | Loading 7 events. +2020-04-08T16:42:46 | info | mongoose.js | Connected to the database. +2020-04-08T16:42:48 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T16:42:50 | log | message.js | Command ran: help +2020-04-08T16:44:42 | info | index.js | Loading 5 commands. +2020-04-08T16:44:42 | info | index.js | Loading 7 events. +2020-04-08T16:44:42 | info | mongoose.js | Connected to the database. +2020-04-08T16:44:44 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T16:48:03 | info | index.js | Loading 5 commands. +2020-04-08T16:48:03 | info | index.js | Loading 7 events. +2020-04-08T16:48:03 | info | mongoose.js | Connected to the database. +2020-04-08T16:48:07 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T16:48:07 | log | message.js | Command ran: help +2020-04-08T16:48:38 | info | index.js | Loading 5 commands. +2020-04-08T16:48:38 | info | index.js | Loading 7 events. +2020-04-08T16:48:38 | info | mongoose.js | Connected to the database. +2020-04-08T16:48:40 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T16:48:43 | log | message.js | Command ran: help +2020-04-08T16:48:54 | info | index.js | Loading 5 commands. +2020-04-08T16:48:54 | info | index.js | Loading 7 events. +2020-04-08T16:48:54 | info | mongoose.js | Connected to the database. +2020-04-08T16:48:56 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T16:48:59 | info | index.js | Loading 5 commands. +2020-04-08T16:48:59 | info | index.js | Loading 7 events. +2020-04-08T16:48:59 | info | mongoose.js | Connected to the database. +2020-04-08T16:49:01 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T16:49:04 | log | message.js | Command ran: help +2020-04-08T16:49:11 | info | index.js | Loading 5 commands. +2020-04-08T16:49:11 | info | index.js | Loading 7 events. +2020-04-08T16:49:11 | info | mongoose.js | Connected to the database. +2020-04-08T16:49:13 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T16:50:20 | info | index.js | Loading 7 events. +2020-04-08T16:50:20 | info | index.js | Loading 5 commands. +2020-04-08T16:50:20 | error | index.js | Failed to load help.js: SyntaxError: missing ) after argument list +2020-04-08T16:50:20 | info | mongoose.js | Connected to the database. +2020-04-08T16:50:23 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T16:50:31 | info | index.js | Loading 5 commands. +2020-04-08T16:50:31 | info | index.js | Loading 7 events. +2020-04-08T16:50:31 | info | mongoose.js | Connected to the database. +2020-04-08T16:50:33 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T16:50:34 | log | message.js | Command ran: help +2020-04-08T16:51:51 | log | message.js | Command ran: help +2020-04-08T16:52:21 | info | index.js | Loading 5 commands. +2020-04-08T16:52:21 | info | index.js | Loading 7 events. +2020-04-08T16:52:21 | info | mongoose.js | Connected to the database. +2020-04-08T16:52:25 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T16:52:26 | log | message.js | Command ran: help +2020-04-08T16:59:20 | info | index.js | Loading 5 commands. +2020-04-08T16:59:20 | info | index.js | Loading 7 events. +2020-04-08T16:59:20 | info | mongoose.js | Connected to the database. +2020-04-08T16:59:23 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T16:59:24 | log | message.js | Command ran: help +2020-04-08T17:00:14 | info | index.js | Loading 5 commands. +2020-04-08T17:00:14 | info | index.js | Loading 7 events. +2020-04-08T17:00:14 | info | mongoose.js | Connected to the database. +2020-04-08T17:00:16 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T17:00:16 | log | message.js | Command ran: help +2020-04-08T17:01:24 | info | index.js | Loading 5 commands. +2020-04-08T17:01:24 | info | index.js | Loading 7 events. +2020-04-08T17:01:24 | info | mongoose.js | Connected to the database. +2020-04-08T17:01:26 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T17:01:31 | log | message.js | Command ran: help +2020-04-08T17:05:01 | info | index.js | Loading 5 commands. +2020-04-08T17:05:01 | info | index.js | Loading 7 events. +2020-04-08T17:05:01 | info | mongoose.js | Connected to the database. +2020-04-08T17:05:03 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T17:05:05 | log | message.js | Command ran: help +2020-04-08T17:13:28 | info | index.js | Loading 5 commands. +2020-04-08T17:13:28 | error | index.js | Failed to load help.js: SyntaxError: missing ) after argument list +2020-04-08T17:13:28 | info | index.js | Loading 7 events. +2020-04-08T17:13:28 | info | mongoose.js | Connected to the database. +2020-04-08T17:13:30 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T17:14:21 | info | index.js | Loading 5 commands. +2020-04-08T17:14:21 | info | index.js | Loading 7 events. +2020-04-08T17:14:21 | info | mongoose.js | Connected to the database. +2020-04-08T17:14:24 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T17:14:40 | info | index.js | Loading 5 commands. +2020-04-08T17:14:40 | info | index.js | Loading 7 events. +2020-04-08T17:14:40 | info | mongoose.js | Connected to the database. +2020-04-08T17:14:42 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T17:14:42 | log | message.js | Command ran: help +2020-04-08T17:15:15 | info | index.js | Loading 5 commands. +2020-04-08T17:15:15 | info | index.js | Loading 7 events. +2020-04-08T17:15:15 | info | mongoose.js | Connected to the database. +2020-04-08T17:15:18 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T17:15:18 | log | message.js | Command ran: help +2020-04-08T17:21:36 | info | index.js | Loading 5 commands. +2020-04-08T17:21:36 | info | index.js | Loading 7 events. +2020-04-08T17:21:36 | info | mongoose.js | Connected to the database. +2020-04-08T17:21:38 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T17:21:43 | log | message.js | Command ran: help +2020-04-08T17:22:33 | info | index.js | Loading 5 commands. +2020-04-08T17:22:33 | info | index.js | Loading 7 events. +2020-04-08T17:22:33 | info | mongoose.js | Connected to the database. +2020-04-08T17:22:36 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T17:22:47 | log | message.js | Command ran: help +2020-04-08T17:22:57 | log | message.js | Command ran: help +2020-04-08T17:22:57 | error | _functions.js | Unhandled rejection: TypeError: Cannot read property 'length' of undefined + at Object.exports.run (C:\Users\Emily\Desktop\woomy stuff\woomy\commands\help.js:92:25) + at module.exports (C:\Users\Emily\Desktop\woomy stuff\woomy\events\message.js:103:7) + at processTicksAndRejections (internal/process/task_queues.js:94:5) +2020-04-08T17:23:34 | info | index.js | Loading 5 commands. +2020-04-08T17:23:34 | info | index.js | Loading 7 events. +2020-04-08T17:23:34 | info | mongoose.js | Connected to the database. +2020-04-08T17:23:36 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T17:23:38 | info | index.js | Loading 5 commands. +2020-04-08T17:23:38 | info | index.js | Loading 7 events. +2020-04-08T17:23:38 | info | mongoose.js | Connected to the database. +2020-04-08T17:23:42 | info | index.js | Loading 5 commands. +2020-04-08T17:23:42 | info | index.js | Loading 7 events. +2020-04-08T17:23:42 | info | mongoose.js | Connected to the database. +2020-04-08T17:23:45 | info | index.js | Loading 5 commands. +2020-04-08T17:23:45 | info | index.js | Loading 7 events. +2020-04-08T17:23:45 | info | mongoose.js | Connected to the database. +2020-04-08T17:23:55 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T17:39:03 | log | message.js | Command ran: help +2020-04-08T17:40:29 | log | message.js | Command ran: help +2020-04-08T17:49:01 | info | index.js | Loading 7 events. +2020-04-08T17:49:01 | info | index.js | Loading 5 commands. +2020-04-08T17:49:01 | info | mongoose.js | Connected to the database. +2020-04-08T17:49:04 | info | index.js | Loading 5 commands. +2020-04-08T17:49:04 | info | index.js | Loading 7 events. +2020-04-08T17:49:05 | info | mongoose.js | Connected to the database. +2020-04-08T17:49:07 | info | index.js | Loading 5 commands. +2020-04-08T17:49:07 | info | index.js | Loading 7 events. +2020-04-08T17:49:08 | info | index.js | Loading 5 commands. +2020-04-08T17:49:08 | info | index.js | Loading 7 events. +2020-04-08T17:49:08 | info | mongoose.js | Connected to the database. +2020-04-08T17:49:10 | info | index.js | Loading 5 commands. +2020-04-08T17:49:10 | info | index.js | Loading 7 events. +2020-04-08T17:49:10 | info | mongoose.js | Connected to the database. +2020-04-08T17:49:12 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T17:56:05 | log | message.js | Command ran: help +2020-04-08T17:58:34 | log | message.js | Command ran: help +2020-04-08T17:59:37 | log | message.js | Command ran: help +2020-04-08T17:59:41 | log | message.js | Command ran: help +2020-04-08T18:00:33 | log | message.js | Command ran: ship diff --git a/helpers/_functions.js b/helpers/_functions.js index 003007d..1e48de9 100644 --- a/helpers/_functions.js +++ b/helpers/_functions.js @@ -258,6 +258,6 @@ module.exports = client => { }) process.on('unhandledRejection', err => { - client.logger.error(`Unhandled rejection: ${err}`) + client.logger.error(`Unhandled rejection: ${err.stack}`) }) } diff --git a/version.json b/version.json index e1cffe8..4142965 100644 --- a/version.json +++ b/version.json @@ -1,4 +1,5 @@ { "number": "2.0", - "changelog": "uwu" + "changelog": "uwu", + "news": "A massive update has just been released! Lots of commands and features have been added or redone and my code has been rewritten to use lots of cool new stuff. To view the full changelog, run `changelog`" } \ No newline at end of file From da1ca8f9861782d7f55496cb1921499ea80651a6 Mon Sep 17 00:00:00 2001 From: mudkipscience Date: Wed, 8 Apr 2020 19:30:17 +1000 Subject: [PATCH 045/156] sans --- commands/help.js | 6 +++--- file.log | 30 ++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 3 deletions(-) diff --git a/commands/help.js b/commands/help.js index 5f1bfa6..71fb776 100644 --- a/commands/help.js +++ b/commands/help.js @@ -83,11 +83,11 @@ exports.run = (client, message, args, level, data) => { let aliases = '' if (cmd.conf.aliases.length > 0) { - aliases = '`' + cmd.conf.aliases.join('`, `') + '`' + aliases = cmd.conf.aliases.join(', ') } - embed.setTitle(cmd.help.name) - embed.setDescription(cmd.help.description) + embed.setTitle(cmd.help.category.toLowerCase() + ':' + cmd.help.name) + embed.setDescription(`*(Aliases: ${aliases})*\n\n${cmd.help.description}`) embed.addField('**Usage:**', cmd.help.usage) if (cmd.help.params.length > 0) { embed.addField('**Parameters:**', cmd.help.params) diff --git a/file.log b/file.log index 845d64c..5c41ad4 100644 --- a/file.log +++ b/file.log @@ -1406,3 +1406,33 @@ 2020-04-08T17:59:37 | log | message.js | Command ran: help 2020-04-08T17:59:41 | log | message.js | Command ran: help 2020-04-08T18:00:33 | log | message.js | Command ran: ship +2020-04-08T19:28:29 | info | index.js | Loading 5 commands. +2020-04-08T19:28:29 | info | index.js | Loading 7 events. +2020-04-08T19:28:29 | info | mongoose.js | Connected to the database. +2020-04-08T19:28:31 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T19:28:36 | info | index.js | Loading 5 commands. +2020-04-08T19:28:36 | info | index.js | Loading 7 events. +2020-04-08T19:28:36 | info | mongoose.js | Connected to the database. +2020-04-08T19:28:37 | info | index.js | Loading 5 commands. +2020-04-08T19:28:37 | info | index.js | Loading 7 events. +2020-04-08T19:28:37 | info | mongoose.js | Connected to the database. +2020-04-08T19:28:40 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T19:28:40 | log | message.js | Command ran: help +2020-04-08T19:29:04 | info | index.js | Loading 5 commands. +2020-04-08T19:29:04 | info | index.js | Loading 7 events. +2020-04-08T19:29:04 | info | mongoose.js | Connected to the database. +2020-04-08T19:29:06 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T19:29:14 | log | message.js | Command ran: help +2020-04-08T19:29:24 | info | index.js | Loading 5 commands. +2020-04-08T19:29:24 | info | index.js | Loading 7 events. +2020-04-08T19:29:24 | info | mongoose.js | Connected to the database. +2020-04-08T19:29:26 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T19:29:28 | log | message.js | Command ran: help +2020-04-08T19:29:41 | info | index.js | Loading 5 commands. +2020-04-08T19:29:41 | info | index.js | Loading 7 events. +2020-04-08T19:29:41 | info | mongoose.js | Connected to the database. +2020-04-08T19:29:43 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T19:30:12 | info | index.js | Loading 5 commands. +2020-04-08T19:30:12 | info | index.js | Loading 7 events. +2020-04-08T19:30:12 | info | mongoose.js | Connected to the database. +2020-04-08T19:30:15 | ready | ready.js | Connected to Discord as WoomyDev#4547 From 1a6cd52d0660f43640a2ec8dd7e349a002a16851 Mon Sep 17 00:00:00 2001 From: mudkipscience Date: Thu, 9 Apr 2020 00:09:55 +1000 Subject: [PATCH 046/156] sans --- commands/help.js | 62 ++++++++------------------ file.log | 110 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 129 insertions(+), 43 deletions(-) diff --git a/commands/help.js b/commands/help.js index 71fb776..3805e7e 100644 --- a/commands/help.js +++ b/commands/help.js @@ -11,8 +11,8 @@ exports.help = { name: 'help', category: 'General', description: 'Sends you a list of Woomy\'s commands.', - usage: '`help `\n`help all` - View full command list.', - params: '`` - The name of the command you want more information on.' + usage: '`help` - Lists all commands.\n`help ` - Receive more information on a command.', + examples: '`help`\n`help roleinfo`' } const Discord = require('discord.js') @@ -29,75 +29,51 @@ exports.run = (client, message, args, level, data) => { const categories = [] if (!args[0]) { - embed.setTitle('Woomy Help') - embed.setDescription(`• Prefixes: ${'`' + prefixes.join('`, `') + '`'}\n• Use \`help \` to recieve more information about a command!\n• Use \`help all\` to view hidden commands!\n• [Join my support server](https://discord.gg/HCF8mdv) if you have any issues/questions while using me!\n• [click here](https://discordapp.com/oauth2/authorize?client_id=435961704145485835&permissions=8&scope=bot) to add me to your own server!`) - const commands = message.guild ? client.commands.filter( - cmd => client.levelCache[cmd.conf.permLevel] <= level - ) : client.commands.filter( - cmd => client.levelCache[cmd.conf.permLevel] <= level && cmd.conf.guildOnly !== true - ) - - commands.forEach((cmd) => { - if (!categories.includes(cmd.help.category)) { - categories.push(cmd.help.category) - } - }) - - categories.sort().forEach((cat) => { - const filtered = commands.filter((cmd) => cmd.help.category === cat) - embed.addField(cat + ` [${filtered.size}]`, filtered.map((cmd) => '`' + cmd.help.name + '`').join(', '), true) - }) - - if (message.guild && data.guild.customCommands.length > 0) { - embed.addField('Custom', data.guild.customCommands.map((cmd) => '`' + cmd.name + '`').join(' ')) - } - - return message.channel.send(embed) - } else if (args[0].toLowerCase() === 'all') { - embed.setTitle('Woomy Help') - embed.setDescription(`• Prefixes: ${'`' + prefixes.join('`, `') + '`'}\n• Use \`help \` to recieve more information about a command!\n• [Join my support server](https://discord.gg/HCF8mdv) if you have any issues/questions while using me!\n• [click here](https://discordapp.com/oauth2/authorize?client_id=435961704145485835&permissions=8&scope=bot) to add me to your own server!`) + embed.setTitle('Woomy Commands') + embed.setDescription(`• Prefixes: ${'`' + prefixes.join('`, `') + '`'}\n• Use \`help \` to recieve more information about a command!\n• [Join my support server](https://discord.gg/HCF8mdv)`) const commands = client.commands commands.forEach((cmd) => { if (!categories.includes(cmd.help.category)) { + if (cmd.help.category === 'Developer' && !client.config.devs.includes('message.author.id')) { + return + } categories.push(cmd.help.category) } }) categories.sort().forEach((cat) => { const filtered = commands.filter((cmd) => cmd.help.category === cat) - embed.addField(cat + ` [${filtered.size}]`, filtered.map((cmd) => '`' + cmd.help.name + '`').join(' ')) + embed.addField(cat, filtered.map((cmd) => '`' + cmd.help.name + '`').join(', ')) }) if (message.guild && data.guild.customCommands.length > 0) { embed.addField('Custom', data.guild.customCommands.map((cmd) => '`' + cmd.name + '`').join(' ')) } + embed.addField('Invite', '[Invite](https://discordapp.com/oauth2/authorize?client_id=435961704145485835&permissions=8&scope=bot) | [Discord Server](https://discord.gg/HCF8mdv)') return message.channel.send(embed) - } else if (args[0]) { + } else { const command = args.shift().toLowerCase() const cmd = client.commands.get(command) || client.commands.get(client.aliases.get(command)) if (!cmd) { return message.channel.send('Command/alias doesn\'t exist') } - let aliases = '' + let desc = '' + if (cmd.conf.aliases.length > 0) { - aliases = cmd.conf.aliases.join(', ') + desc += `*(Aliases: ${cmd.conf.aliases.join(', ')})*\n\n` } + desc += cmd.help.description + `\n\n**You need the \`${cmd.conf.permLevel}\` rank to run this command! This command has a cooldown of \`${cmd.conf.cooldown / 1000}\` seconds per user.**` + embed.setTitle(cmd.help.category.toLowerCase() + ':' + cmd.help.name) - embed.setDescription(`*(Aliases: ${aliases})*\n\n${cmd.help.description}`) - embed.addField('**Usage:**', cmd.help.usage) - if (cmd.help.params.length > 0) { - embed.addField('**Parameters:**', cmd.help.params) + embed.setDescription(desc) + embed.addField('**Usage**', cmd.help.usage) + if (cmd.help.examples.length > 0) { + embed.addField('**Examples**', cmd.help.examples) } - if (aliases) { - embed.addField('**Aliases:**', aliases) - } - embed.addField('**Permission level:**', cmd.conf.permLevel, true) - embed.addField('**Server only**', cmd.conf.guildOnly, true) - embed.addField('**Cooldown**', cmd.conf.cooldown / 1000 + ' seconds', true) embed.setFooter('< > = optional, [ ] = required. Don\'t include the brackets in the command itself!') message.channel.send(embed) } diff --git a/file.log b/file.log index 5c41ad4..50fd9de 100644 --- a/file.log +++ b/file.log @@ -1436,3 +1436,113 @@ 2020-04-08T19:30:12 | info | index.js | Loading 7 events. 2020-04-08T19:30:12 | info | mongoose.js | Connected to the database. 2020-04-08T19:30:15 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T22:26:56 | info | index.js | Loading 5 commands. +2020-04-08T22:26:56 | info | index.js | Loading 7 events. +2020-04-08T22:26:56 | info | mongoose.js | Connected to the database. +2020-04-08T22:26:59 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T22:39:52 | log | message.js | Command ran: help +2020-04-08T22:40:35 | log | message.js | Command ran: help +2020-04-08T22:40:46 | log | message.js | Command ran: help +2020-04-08T22:40:52 | log | message.js | Command ran: help +2020-04-08T22:44:22 | info | index.js | Loading 5 commands. +2020-04-08T22:44:22 | info | index.js | Loading 7 events. +2020-04-08T22:44:23 | info | mongoose.js | Connected to the database. +2020-04-08T22:44:26 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T22:44:32 | log | message.js | Command ran: help +2020-04-08T22:44:37 | log | message.js | Command ran: help +2020-04-08T22:44:43 | log | message.js | Command ran: help +2020-04-08T22:49:00 | info | index.js | Loading 5 commands. +2020-04-08T22:49:00 | info | index.js | Loading 7 events. +2020-04-08T22:49:00 | info | mongoose.js | Connected to the database. +2020-04-08T22:49:03 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T22:49:03 | log | message.js | Command ran: help +2020-04-08T23:01:27 | info | index.js | Loading 5 commands. +2020-04-08T23:01:27 | info | index.js | Loading 7 events. +2020-04-08T23:01:27 | info | mongoose.js | Connected to the database. +2020-04-08T23:01:30 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T23:10:20 | info | index.js | Loading 5 commands. +2020-04-08T23:10:20 | info | index.js | Loading 7 events. +2020-04-08T23:10:20 | info | mongoose.js | Connected to the database. +2020-04-08T23:10:23 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T23:10:30 | log | message.js | Command ran: help +2020-04-08T23:10:44 | log | message.js | Command ran: help +2020-04-08T23:10:59 | info | index.js | Loading 5 commands. +2020-04-08T23:11:00 | info | index.js | Loading 7 events. +2020-04-08T23:11:00 | info | mongoose.js | Connected to the database. +2020-04-08T23:11:02 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T23:11:07 | log | message.js | Command ran: help +2020-04-08T23:13:14 | log | message.js | Command ran: help +2020-04-08T23:13:28 | info | index.js | Loading 5 commands. +2020-04-08T23:13:28 | info | index.js | Loading 7 events. +2020-04-08T23:13:28 | info | mongoose.js | Connected to the database. +2020-04-08T23:13:31 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T23:13:40 | info | index.js | Loading 5 commands. +2020-04-08T23:13:40 | info | index.js | Loading 7 events. +2020-04-08T23:13:40 | info | mongoose.js | Connected to the database. +2020-04-08T23:13:42 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T23:13:42 | log | message.js | Command ran: help +2020-04-08T23:13:46 | log | message.js | Command ran: help +2020-04-08T23:14:01 | info | index.js | Loading 5 commands. +2020-04-08T23:14:01 | info | index.js | Loading 7 events. +2020-04-08T23:14:02 | info | mongoose.js | Connected to the database. +2020-04-08T23:14:04 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T23:14:06 | log | message.js | Command ran: help +2020-04-08T23:14:39 | log | message.js | Command ran: help +2020-04-08T23:26:22 | info | index.js | Loading 5 commands. +2020-04-08T23:26:22 | info | index.js | Loading 7 events. +2020-04-08T23:26:22 | info | mongoose.js | Connected to the database. +2020-04-08T23:26:25 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T23:27:27 | info | index.js | Loading 5 commands. +2020-04-08T23:27:27 | info | index.js | Loading 7 events. +2020-04-08T23:27:27 | info | mongoose.js | Connected to the database. +2020-04-08T23:27:29 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T23:27:48 | log | message.js | Command ran: help +2020-04-08T23:28:53 | info | index.js | Loading 5 commands. +2020-04-08T23:28:53 | info | index.js | Loading 7 events. +2020-04-08T23:28:53 | info | mongoose.js | Connected to the database. +2020-04-08T23:28:56 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T23:28:56 | log | message.js | Command ran: help +2020-04-08T23:29:12 | info | index.js | Loading 5 commands. +2020-04-08T23:29:12 | info | index.js | Loading 7 events. +2020-04-08T23:29:12 | info | mongoose.js | Connected to the database. +2020-04-08T23:29:14 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T23:29:34 | info | index.js | Loading 5 commands. +2020-04-08T23:29:34 | info | index.js | Loading 7 events. +2020-04-08T23:29:34 | info | mongoose.js | Connected to the database. +2020-04-08T23:29:37 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T23:29:37 | log | message.js | Command ran: help +2020-04-08T23:30:14 | info | index.js | Loading 5 commands. +2020-04-08T23:30:14 | info | index.js | Loading 7 events. +2020-04-08T23:30:14 | info | mongoose.js | Connected to the database. +2020-04-08T23:30:16 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T23:30:18 | log | message.js | Command ran: help +2020-04-08T23:30:32 | info | index.js | Loading 5 commands. +2020-04-08T23:30:32 | info | index.js | Loading 7 events. +2020-04-08T23:30:32 | info | mongoose.js | Connected to the database. +2020-04-08T23:30:34 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T23:30:38 | log | message.js | Command ran: help +2020-04-08T23:34:18 | info | index.js | Loading 5 commands. +2020-04-08T23:34:18 | info | index.js | Loading 7 events. +2020-04-08T23:34:18 | info | mongoose.js | Connected to the database. +2020-04-08T23:34:21 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T23:34:23 | log | message.js | Command ran: help +2020-04-08T23:34:30 | log | message.js | Command ran: help +2020-04-08T23:35:00 | log | message.js | Command ran: help +2020-04-08T23:35:24 | info | index.js | Loading 5 commands. +2020-04-08T23:35:24 | info | index.js | Loading 7 events. +2020-04-08T23:35:24 | info | mongoose.js | Connected to the database. +2020-04-08T23:35:26 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T23:35:38 | info | index.js | Loading 5 commands. +2020-04-08T23:35:38 | info | index.js | Loading 7 events. +2020-04-08T23:35:38 | info | mongoose.js | Connected to the database. +2020-04-08T23:35:41 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T23:35:41 | log | message.js | Command ran: help +2020-04-08T23:39:05 | info | index.js | Loading 5 commands. +2020-04-08T23:39:05 | info | index.js | Loading 7 events. +2020-04-08T23:39:05 | info | mongoose.js | Connected to the database. +2020-04-08T23:39:07 | ready | ready.js | Connected to Discord as WoomyDev#4547 +2020-04-08T23:39:15 | log | message.js | Command ran: help +2020-04-09T00:06:52 | info | index.js | Loading 5 commands. +2020-04-09T00:06:52 | info | index.js | Loading 7 events. +2020-04-09T00:06:53 | info | mongoose.js | Connected to the database. +2020-04-09T00:06:56 | ready | ready.js | Connected to Discord as WoomyDev#4547 From 2962de2931949c7052fa0b1c79d8511172b4d101 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Hor=C3=A1=C4=8Dek?= Date: Wed, 8 Apr 2020 21:44:55 +0200 Subject: [PATCH 047/156] readd emoji --- commands/emoji.js | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 commands/emoji.js diff --git a/commands/emoji.js b/commands/emoji.js new file mode 100644 index 0000000..f5a747a --- /dev/null +++ b/commands/emoji.js @@ -0,0 +1,44 @@ +exports.conf = { + enabled: true, + guildOnly: false, + aliases: [], + permLevel: 'User', + requiredPerms: [] + }; + +exports.help = { + name: 'emoji', + category: 'Utility', + description: 'Enlarges and links an custom emoji', + usage: 'emoji [emoji]', + params: '`[emoji] - Discord emoji you want to enlarge.' +}; + +exports.run = async (client, message, args) => { + if(!args[0]) { + return message.channel.send(`You need to specify a custom emoji. Usage: \`${client.commands.get(`emoji`).help.usage}\``) + }; + + var ID; + var format = ".png" + var string = args[0].replace(/\D/g,''); + + if(args[0].charAt(1) == "a" && args[0].charAt(2) == ":") { + format = ".gif" + }; + + if(string.length > 18) { + ID = string.slice(string.length - 18); + } else { + ID = string; + }; + + if(!ID) { + return message.channel.send(`<:error:466995152976871434> Invalid emoji. This command only works with custom emojis.`) + }; + + + + message.channel.send("https://cdn.discordapp.com/emojis/" + ID + format) +}; + \ No newline at end of file From 7fa12b105d40a8a2921f51a436a93e94c935bb68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Hor=C3=A1=C4=8Dek?= Date: Wed, 8 Apr 2020 21:47:46 +0200 Subject: [PATCH 048/156] add botName --- configTemplate.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configTemplate.js b/configTemplate.js index bddc250..3489f17 100644 --- a/configTemplate.js +++ b/configTemplate.js @@ -3,6 +3,9 @@ const config = { token: '', devtoken: '', + // Bot name + botName: '', + // API keys that are required for some features/commands keys: { dbl: '', // top.gg key From ae0240ef4798497851783f6650aca31c0032fb69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Hor=C3=A1=C4=8Dek?= Date: Wed, 8 Apr 2020 21:47:56 +0200 Subject: [PATCH 049/156] emoji replace " with ' --- commands/emoji.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/commands/emoji.js b/commands/emoji.js index f5a747a..b95bbea 100644 --- a/commands/emoji.js +++ b/commands/emoji.js @@ -20,11 +20,11 @@ exports.run = async (client, message, args) => { }; var ID; - var format = ".png" + var format = '.png' var string = args[0].replace(/\D/g,''); - if(args[0].charAt(1) == "a" && args[0].charAt(2) == ":") { - format = ".gif" + if(args[0].charAt(1) == 'a' && args[0].charAt(2) == ':') { + format = '.gif' }; if(string.length > 18) { @@ -39,6 +39,6 @@ exports.run = async (client, message, args) => { - message.channel.send("https://cdn.discordapp.com/emojis/" + ID + format) + message.channel.send('https://cdn.discordapp.com/emojis/' + ID + format) }; \ No newline at end of file From 46b81f9c605f9915bdc05235ac1ce180dbd0aa32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Hor=C3=A1=C4=8Dek?= Date: Wed, 8 Apr 2020 21:48:53 +0200 Subject: [PATCH 050/156] readd support command --- commands/support.js | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 commands/support.js diff --git a/commands/support.js b/commands/support.js new file mode 100644 index 0000000..7042430 --- /dev/null +++ b/commands/support.js @@ -0,0 +1,18 @@ +exports.conf = { + enabled: true, + guildOnly: false, + aliases: [], + permLevel: 'User', + requiredPerms: [] +}; + +exports.help = { + name: 'support', + category: 'Utility', + description: "Sends a link to " + client.config.botName + "'s support/development server.", + usage: 'support' +}; + +exports.run = async (client, message, args) =>{ + message.channel.send('Use this link to join my support server: https://discord.gg/' + client.config.support.id); +}; \ No newline at end of file From 82985b957a761f1d69496d6099785fe7b47dc389 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Hor=C3=A1=C4=8Dek?= Date: Wed, 8 Apr 2020 21:52:20 +0200 Subject: [PATCH 051/156] readd avatar command --- commands/avatar.js | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 commands/avatar.js diff --git a/commands/avatar.js b/commands/avatar.js new file mode 100644 index 0000000..6288ca5 --- /dev/null +++ b/commands/avatar.js @@ -0,0 +1,39 @@ +exports.conf = { + enabled: true, + guildOnly: false, + aliases: [], + permLevel: 'User', + requiredPerms: ['EMBED_LINKS'] +}; + +exports.help = { + name: 'avatar', + category: 'Utility', + description: 'Gives you the specified users avatar.', + usage: 'avatar ', + params: '' +}; + +exports.run = (client, message, args) => { + let user = message.mentions.users.first(); + let users; + if (!args[0] || !message.guild) { + user = message.author; + }; + + if (!user && message.guild) { + users = client.searchForMembers(message.guild, args[0]); + if (users.length > 1) { + return message.channel.send( + '<:error:466995152976871434> Found multiple users, please be more specific or mention the user instead.' + ); + } else if (users.length == 0) { + return message.channel.send( + "<:error:466995152976871434> That user doesn't seem to exist, try again!" + ); + }; + user = users[0]; + user = user.user; + } + message.channel.send(`**${user.tag}'s** avatar is: ${user.avatarURL({format: 'png', dynamic: true, size: 2048})}`); +}; \ No newline at end of file From 00f3280cdc2e9d30f0cefc1caf11b72146de61a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Hor=C3=A1=C4=8Dek?= Date: Wed, 8 Apr 2020 21:53:17 +0200 Subject: [PATCH 052/156] remove file.log --- file.log | 1548 ------------------------------------------------------ 1 file changed, 1548 deletions(-) delete mode 100644 file.log diff --git a/file.log b/file.log deleted file mode 100644 index 50fd9de..0000000 --- a/file.log +++ /dev/null @@ -1,1548 +0,0 @@ -2020-04-05T02:10:36 | info | index.js | Loading 3 commands. -2020-04-05T02:10:36 | info | index.js | Loading 7 events. -2020-04-05T02:10:36 | info | mongoose.js | Connected to the database. -2020-04-05T02:10:41 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-05T18:25:54 | info | index.js | Loading 3 commands. -2020-04-05T18:25:54 | info | index.js | Loading 7 events. -2020-04-05T18:25:54 | info | mongoose.js | Connected to the database. -2020-04-05T18:25:56 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-05T18:26:06 | log | message.js | Command ran: ping -2020-04-05T18:26:12 | log | message.js | Command ran: eval -2020-04-05T18:27:44 | log | message.js | Command ran: ping -2020-04-05T18:28:11 | log | message.js | Command ran: eval -2020-04-05T18:28:43 | log | message.js | Command ran: eval -2020-04-05T18:30:41 | log | message.js | Command ran: eval -2020-04-05T18:30:52 | log | message.js | Command ran: eval -2020-04-05T18:31:03 | log | message.js | Command ran: level -2020-04-05T18:33:18 | log | message.js | Command ran: eval -2020-04-05T18:34:14 | info | index.js | Loading 3 commands. -2020-04-05T18:34:14 | info | index.js | Loading 7 events. -2020-04-05T18:34:15 | info | mongoose.js | Connected to the database. -2020-04-05T18:34:17 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-05T18:34:59 | info | index.js | Loading 3 commands. -2020-04-05T18:34:59 | info | index.js | Loading 7 events. -2020-04-05T18:34:59 | info | mongoose.js | Connected to the database. -2020-04-05T18:35:01 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-05T18:35:25 | log | message.js | Command ran: ping -2020-04-05T18:35:42 | log | message.js | Command ran: eval -2020-04-05T18:36:06 | log | message.js | Command ran: eval -2020-04-05T18:36:36 | info | index.js | Loading 3 commands. -2020-04-05T18:36:36 | info | index.js | Loading 7 events. -2020-04-05T18:36:36 | info | mongoose.js | Connected to the database. -2020-04-05T18:36:38 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-05T18:36:44 | log | message.js | Command ran: eval -2020-04-05T18:47:31 | info | index.js | Loading 3 commands. -2020-04-05T18:47:31 | info | index.js | Loading 7 events. -2020-04-05T18:47:31 | info | mongoose.js | Connected to the database. -2020-04-05T18:47:34 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-05T18:47:39 | info | index.js | Loading 3 commands. -2020-04-05T18:47:39 | info | index.js | Loading 7 events. -2020-04-05T18:47:39 | info | mongoose.js | Connected to the database. -2020-04-05T18:47:41 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-06T15:58:08 | info | index.js | Loading 4 commands. -2020-04-06T15:58:08 | info | index.js | Loading 7 events. -2020-04-06T15:58:08 | info | mongoose.js | Connected to the database. -2020-04-06T15:58:10 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-06T16:02:49 | info | index.js | Loading 4 commands. -2020-04-06T16:02:49 | info | index.js | Loading 7 events. -2020-04-06T16:02:49 | info | mongoose.js | Connected to the database. -2020-04-06T16:02:51 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-06T16:03:11 | info | index.js | Loading 4 commands. -2020-04-06T16:03:11 | info | index.js | Loading 7 events. -2020-04-06T16:03:11 | info | mongoose.js | Connected to the database. -2020-04-06T16:03:13 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-06T16:03:44 | log | message.js | Command ran: eval -2020-04-06T16:03:52 | log | message.js | Command ran: eval -2020-04-06T16:03:58 | log | message.js | Command ran: eval -2020-04-06T16:04:06 | info | index.js | Loading 4 commands. -2020-04-06T16:04:06 | info | index.js | Loading 7 events. -2020-04-06T16:04:06 | info | mongoose.js | Connected to the database. -2020-04-06T16:04:10 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-06T16:04:23 | info | index.js | Loading 4 commands. -2020-04-06T16:04:23 | info | index.js | Loading 7 events. -2020-04-06T16:04:23 | info | mongoose.js | Connected to the database. -2020-04-06T16:04:25 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-06T16:05:01 | info | index.js | Loading 4 commands. -2020-04-06T16:05:01 | info | index.js | Loading 7 events. -2020-04-06T16:05:01 | info | mongoose.js | Connected to the database. -2020-04-06T16:05:05 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-06T16:05:38 | info | index.js | Loading 4 commands. -2020-04-06T16:05:38 | info | index.js | Loading 7 events. -2020-04-06T16:05:38 | info | mongoose.js | Connected to the database. -2020-04-06T16:05:41 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-06T16:05:44 | info | index.js | Loading 4 commands. -2020-04-06T16:05:44 | info | index.js | Loading 7 events. -2020-04-06T16:05:44 | info | mongoose.js | Connected to the database. -2020-04-06T16:05:46 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-06T16:06:24 | info | index.js | Loading 4 commands. -2020-04-06T16:06:24 | info | index.js | Loading 7 events. -2020-04-06T16:06:24 | info | mongoose.js | Connected to the database. -2020-04-06T16:06:26 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-06T16:08:13 | info | index.js | Loading 4 commands. -2020-04-06T16:08:13 | info | index.js | Loading 7 events. -2020-04-06T16:08:13 | info | mongoose.js | Connected to the database. -2020-04-06T16:08:15 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-06T16:08:23 | info | index.js | Loading 4 commands. -2020-04-06T16:08:23 | info | index.js | Loading 7 events. -2020-04-06T16:08:23 | info | mongoose.js | Connected to the database. -2020-04-06T16:08:25 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-06T16:08:40 | info | index.js | Loading 4 commands. -2020-04-06T16:08:40 | info | index.js | Loading 7 events. -2020-04-06T16:08:40 | info | mongoose.js | Connected to the database. -2020-04-06T16:08:42 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-06T16:10:22 | info | index.js | Loading 4 commands. -2020-04-06T16:10:22 | info | index.js | Loading 7 events. -2020-04-06T16:10:22 | info | mongoose.js | Connected to the database. -2020-04-06T16:10:24 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-06T16:13:09 | info | index.js | Loading 4 commands. -2020-04-06T16:13:09 | info | index.js | Loading 7 events. -2020-04-06T16:13:09 | info | mongoose.js | Connected to the database. -2020-04-06T16:13:12 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-06T16:13:38 | info | index.js | Loading 4 commands. -2020-04-06T16:13:38 | info | index.js | Loading 7 events. -2020-04-06T16:13:38 | info | mongoose.js | Connected to the database. -2020-04-06T16:13:42 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-06T16:16:52 | info | index.js | Loading 7 events. -2020-04-06T16:16:52 | info | index.js | Loading 4 commands. -2020-04-06T16:16:52 | info | mongoose.js | Connected to the database. -2020-04-06T16:16:55 | info | index.js | Loading 4 commands. -2020-04-06T16:16:55 | info | index.js | Loading 7 events. -2020-04-06T16:16:55 | info | mongoose.js | Connected to the database. -2020-04-06T16:17:07 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-06T16:17:08 | log | message.js | Command ran: ping -2020-04-06T16:17:18 | log | message.js | Command ran: ping -2020-04-06T16:17:28 | info | index.js | Loading 4 commands. -2020-04-06T16:17:28 | info | index.js | Loading 7 events. -2020-04-06T16:17:28 | info | mongoose.js | Connected to the database. -2020-04-06T16:17:33 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-06T16:17:53 | info | index.js | Loading 7 events. -2020-04-06T16:17:53 | info | index.js | Loading 4 commands. -2020-04-06T16:17:53 | info | mongoose.js | Connected to the database. -2020-04-06T16:17:55 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-06T16:18:10 | info | index.js | Loading 7 events. -2020-04-06T16:18:10 | info | index.js | Loading 4 commands. -2020-04-06T16:18:10 | info | mongoose.js | Connected to the database. -2020-04-06T16:18:12 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-06T16:18:22 | log | message.js | Command ran: eval -2020-04-06T16:18:33 | log | message.js | Command ran: eval -2020-04-06T16:18:41 | log | message.js | Command ran: eval -2020-04-06T16:18:51 | log | message.js | Command ran: ping -2020-04-06T16:18:54 | log | message.js | Command ran: ping -2020-04-06T16:55:32 | log | message.js | Command ran: help -2020-04-06T16:55:35 | log | message.js | Command ran: help -2020-04-06T17:09:45 | info | index.js | Loading 4 commands. -2020-04-06T17:09:45 | info | index.js | Loading 7 events. -2020-04-06T17:09:45 | info | mongoose.js | Connected to the database. -2020-04-06T17:09:47 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-06T17:10:11 | log | message.js | Command ran: help -2020-04-06T17:17:13 | log | message.js | Command ran: help -2020-04-06T17:17:33 | log | message.js | Command ran: help -2020-04-06T17:18:12 | info | index.js | Loading 4 commands. -2020-04-06T17:18:12 | info | index.js | Loading 7 events. -2020-04-06T17:18:12 | info | mongoose.js | Connected to the database. -2020-04-06T17:18:16 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-06T17:18:16 | log | message.js | Command ran: help -2020-04-06T17:18:34 | log | message.js | Command ran: help -2020-04-06T17:18:37 | log | message.js | Command ran: help -2020-04-06T17:19:06 | info | index.js | Loading 7 events. -2020-04-06T17:19:06 | info | index.js | Loading 4 commands. -2020-04-06T17:19:06 | info | mongoose.js | Connected to the database. -2020-04-06T17:19:08 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-06T17:19:08 | log | message.js | Command ran: help -2020-04-06T17:19:23 | log | message.js | Command ran: help -2020-04-06T17:19:48 | log | message.js | Command ran: eval -2020-04-06T17:20:38 | log | message.js | Command ran: help -2020-04-06T17:20:57 | log | message.js | Command ran: help -2020-04-06T17:21:53 | info | index.js | Loading 4 commands. -2020-04-06T17:21:53 | info | index.js | Loading 7 events. -2020-04-06T17:21:53 | info | mongoose.js | Connected to the database. -2020-04-06T17:21:55 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-06T17:22:04 | log | message.js | Command ran: help -2020-04-06T17:22:11 | info | index.js | Loading 4 commands. -2020-04-06T17:22:11 | info | index.js | Loading 7 events. -2020-04-06T17:22:11 | info | mongoose.js | Connected to the database. -2020-04-06T17:22:13 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-06T17:22:16 | log | message.js | Command ran: help -2020-04-06T17:40:10 | info | index.js | Loading 4 commands. -2020-04-06T17:40:10 | info | index.js | Loading 7 events. -2020-04-06T17:40:10 | info | mongoose.js | Connected to the database. -2020-04-06T17:40:12 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-06T17:41:45 | info | index.js | Loading 4 commands. -2020-04-06T17:41:45 | info | index.js | Loading 7 events. -2020-04-06T17:41:45 | info | mongoose.js | Connected to the database. -2020-04-06T17:41:47 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-06T17:43:13 | info | index.js | Loading 4 commands. -2020-04-06T17:43:13 | info | index.js | Loading 7 events. -2020-04-06T17:43:13 | info | mongoose.js | Connected to the database. -2020-04-06T17:43:15 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-06T17:46:05 | info | index.js | Loading 4 commands. -2020-04-06T17:46:05 | info | index.js | Loading 7 events. -2020-04-06T17:46:05 | info | mongoose.js | Connected to the database. -2020-04-06T17:46:08 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-06T17:49:51 | info | index.js | Loading 4 commands. -2020-04-06T17:49:51 | info | index.js | Loading 7 events. -2020-04-06T17:49:51 | info | mongoose.js | Connected to the database. -2020-04-06T17:49:53 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-06T17:51:11 | info | index.js | Loading 4 commands. -2020-04-06T17:51:11 | info | index.js | Loading 7 events. -2020-04-06T17:51:11 | info | mongoose.js | Connected to the database. -2020-04-06T17:51:13 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-06T17:51:32 | info | index.js | Loading 4 commands. -2020-04-06T17:51:32 | info | index.js | Loading 7 events. -2020-04-06T17:51:32 | info | mongoose.js | Connected to the database. -2020-04-06T17:51:34 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-06T17:51:44 | info | index.js | Loading 4 commands. -2020-04-06T17:51:44 | info | index.js | Loading 7 events. -2020-04-06T17:51:44 | info | mongoose.js | Connected to the database. -2020-04-06T17:51:46 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-06T17:52:16 | info | index.js | Loading 4 commands. -2020-04-06T17:52:16 | info | index.js | Loading 7 events. -2020-04-06T17:52:16 | info | mongoose.js | Connected to the database. -2020-04-06T17:52:18 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-06T17:53:50 | info | index.js | Loading 4 commands. -2020-04-06T17:53:50 | info | index.js | Loading 7 events. -2020-04-06T17:53:50 | info | mongoose.js | Connected to the database. -2020-04-06T17:53:52 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-06T17:53:54 | info | index.js | Loading 7 events. -2020-04-06T17:53:54 | info | index.js | Loading 4 commands. -2020-04-06T17:53:54 | info | mongoose.js | Connected to the database. -2020-04-06T17:54:03 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-06T17:55:18 | info | index.js | Loading 4 commands. -2020-04-06T17:55:18 | info | index.js | Loading 7 events. -2020-04-06T17:55:18 | info | mongoose.js | Connected to the database. -2020-04-06T17:55:20 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-06T17:55:37 | info | index.js | Loading 4 commands. -2020-04-06T17:55:37 | info | index.js | Loading 7 events. -2020-04-06T17:55:37 | info | mongoose.js | Connected to the database. -2020-04-06T17:55:39 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-06T17:55:40 | info | index.js | Loading 4 commands. -2020-04-06T17:55:40 | info | index.js | Loading 7 events. -2020-04-06T17:55:40 | info | mongoose.js | Connected to the database. -2020-04-06T17:55:50 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-06T17:57:18 | info | index.js | Loading 4 commands. -2020-04-06T17:57:18 | info | index.js | Loading 7 events. -2020-04-06T17:57:18 | info | mongoose.js | Connected to the database. -2020-04-06T17:57:20 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-06T18:01:47 | info | index.js | Loading 4 commands. -2020-04-06T18:01:47 | info | index.js | Loading 7 events. -2020-04-06T18:01:47 | info | mongoose.js | Connected to the database. -2020-04-06T18:01:51 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-06T18:01:51 | error | _functions.js | Unhandled rejection: ReferenceError: prefixRegex is not defined -2020-04-06T18:01:55 | error | _functions.js | Unhandled rejection: ReferenceError: prefixRegex is not defined -2020-04-06T18:02:04 | error | _functions.js | Unhandled rejection: ReferenceError: prefixRegex is not defined -2020-04-06T18:02:51 | info | index.js | Loading 7 events. -2020-04-06T18:02:51 | info | index.js | Loading 4 commands. -2020-04-06T18:02:51 | info | mongoose.js | Connected to the database. -2020-04-06T18:02:56 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-06T18:03:03 | log | message.js | Command ran: ping -2020-04-06T18:03:44 | info | index.js | Loading 4 commands. -2020-04-06T18:03:44 | info | index.js | Loading 7 events. -2020-04-06T18:03:44 | info | mongoose.js | Connected to the database. -2020-04-06T18:03:46 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-06T18:03:55 | info | index.js | Loading 4 commands. -2020-04-06T18:03:55 | info | index.js | Loading 7 events. -2020-04-06T18:03:55 | info | mongoose.js | Connected to the database. -2020-04-06T18:03:56 | info | index.js | Loading 4 commands. -2020-04-06T18:03:56 | info | index.js | Loading 7 events. -2020-04-06T18:03:56 | info | mongoose.js | Connected to the database. -2020-04-06T18:03:58 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-06T18:04:03 | info | index.js | Loading 4 commands. -2020-04-06T18:04:03 | info | index.js | Loading 7 events. -2020-04-06T18:04:03 | info | mongoose.js | Connected to the database. -2020-04-06T18:04:05 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-06T18:06:26 | info | index.js | Loading 4 commands. -2020-04-06T18:06:26 | info | index.js | Loading 7 events. -2020-04-06T18:06:26 | info | mongoose.js | Connected to the database. -2020-04-06T18:06:29 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-06T18:06:33 | log | message.js | Command ran: help -2020-04-06T18:06:45 | log | message.js | Command ran: help -2020-04-06T18:36:30 | log | message.js | Command ran: help -2020-04-06T18:39:46 | info | index.js | Loading 4 commands. -2020-04-06T18:39:46 | info | index.js | Loading 7 events. -2020-04-06T18:39:46 | info | mongoose.js | Connected to the database. -2020-04-06T18:39:48 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-06T18:39:50 | log | message.js | Command ran: help -2020-04-06T18:39:50 | error | _functions.js | Unhandled rejection: TypeError: Cannot read property 'customCommands' of undefined -2020-04-06T18:40:03 | info | index.js | Loading 4 commands. -2020-04-06T18:40:03 | info | index.js | Loading 7 events. -2020-04-06T18:40:03 | info | mongoose.js | Connected to the database. -2020-04-06T18:40:05 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-06T18:40:05 | log | message.js | Command ran: help -2020-04-06T18:41:07 | info | index.js | Loading 4 commands. -2020-04-06T18:41:07 | info | index.js | Loading 7 events. -2020-04-06T18:41:07 | info | mongoose.js | Connected to the database. -2020-04-06T18:41:11 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-06T18:41:12 | log | message.js | Command ran: help -2020-04-06T18:43:16 | info | index.js | Loading 7 events. -2020-04-06T18:43:16 | info | index.js | Loading 4 commands. -2020-04-06T18:43:16 | info | mongoose.js | Connected to the database. -2020-04-06T18:43:20 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-06T18:43:25 | log | message.js | Command ran: help -2020-04-06T18:45:59 | info | index.js | Loading 4 commands. -2020-04-06T18:45:59 | info | index.js | Loading 7 events. -2020-04-06T18:45:59 | info | mongoose.js | Connected to the database. -2020-04-06T18:46:02 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-06T18:47:17 | info | index.js | Loading 4 commands. -2020-04-06T18:47:17 | info | index.js | Loading 7 events. -2020-04-06T18:47:17 | info | mongoose.js | Connected to the database. -2020-04-06T18:47:19 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-06T18:47:35 | info | index.js | Loading 4 commands. -2020-04-06T18:47:35 | info | index.js | Loading 7 events. -2020-04-06T18:47:35 | info | mongoose.js | Connected to the database. -2020-04-06T18:47:37 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-06T18:47:48 | error | _functions.js | Unhandled rejection: TypeError: Cannot read property 'prefix' of undefined -2020-04-06T18:47:51 | error | _functions.js | Unhandled rejection: TypeError: Cannot read property 'prefix' of undefined -2020-04-06T18:48:30 | info | index.js | Loading 4 commands. -2020-04-06T18:48:30 | info | index.js | Loading 7 events. -2020-04-06T18:48:30 | info | mongoose.js | Connected to the database. -2020-04-06T18:48:32 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-06T18:48:35 | log | message.js | Command ran: help -2020-04-06T18:48:35 | error | _functions.js | Unhandled rejection: TypeError: Cannot read property 'prefix' of undefined -2020-04-06T18:48:41 | info | index.js | Loading 4 commands. -2020-04-06T18:48:41 | info | index.js | Loading 7 events. -2020-04-06T18:48:41 | info | mongoose.js | Connected to the database. -2020-04-06T18:48:44 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-06T18:48:56 | info | index.js | Loading 4 commands. -2020-04-06T18:48:56 | info | index.js | Loading 7 events. -2020-04-06T18:48:56 | info | mongoose.js | Connected to the database. -2020-04-06T18:48:58 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-06T18:49:00 | error | _functions.js | Unhandled rejection: TypeError: Cannot read property 'prefix' of undefined - at module.exports (C:\Users\Emily\Desktop\woomy stuff\woomy\events\message.js:17:58) - at processTicksAndRejections (internal/process/task_queues.js:94:5) -2020-04-06T18:49:09 | info | index.js | Loading 4 commands. -2020-04-06T18:49:09 | info | index.js | Loading 7 events. -2020-04-06T18:49:09 | info | mongoose.js | Connected to the database. -2020-04-06T18:49:11 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-06T18:51:23 | info | index.js | Loading 4 commands. -2020-04-06T18:51:23 | info | index.js | Loading 7 events. -2020-04-06T18:51:23 | info | mongoose.js | Connected to the database. -2020-04-06T18:51:25 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-06T18:51:32 | info | index.js | Loading 4 commands. -2020-04-06T18:51:32 | info | index.js | Loading 7 events. -2020-04-06T18:51:32 | info | mongoose.js | Connected to the database. -2020-04-06T18:51:35 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-06T18:51:39 | log | message.js | Command ran: help -2020-04-06T18:51:39 | error | _functions.js | Unhandled rejection: TypeError: Cannot read property 'prefix' of undefined -2020-04-06T18:51:48 | log | message.js | Command ran: help -2020-04-06T18:51:54 | log | message.js | Command ran: help -2020-04-06T18:52:43 | info | index.js | Loading 4 commands. -2020-04-06T18:52:43 | info | index.js | Loading 7 events. -2020-04-06T18:52:43 | info | mongoose.js | Connected to the database. -2020-04-06T18:52:45 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-06T18:52:46 | log | message.js | Command ran: help -2020-04-06T18:52:46 | error | _functions.js | Unhandled rejection: TypeError: Cannot read property 'prefix' of undefined - at Object.exports.run (C:\Users\Emily\Desktop\woomy stuff\woomy\commands\help.js:22:56) - at module.exports (C:\Users\Emily\Desktop\woomy stuff\woomy\events\message.js:105:7) - at processTicksAndRejections (internal/process/task_queues.js:94:5) -2020-04-06T18:54:47 | info | index.js | Loading 4 commands. -2020-04-06T18:54:47 | info | index.js | Loading 7 events. -2020-04-06T18:54:47 | info | mongoose.js | Connected to the database. -2020-04-06T18:54:49 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-06T18:54:49 | log | message.js | Command ran: help -2020-04-06T18:54:49 | error | _functions.js | Unhandled rejection: TypeError: Cannot read property 'prefix' of undefined - at Object.exports.run (C:\Users\Emily\Desktop\woomy stuff\woomy\commands\help.js:27:47) - at module.exports (C:\Users\Emily\Desktop\woomy stuff\woomy\events\message.js:105:7) - at processTicksAndRejections (internal/process/task_queues.js:94:5) -2020-04-06T18:56:15 | info | index.js | Loading 7 events. -2020-04-06T18:56:15 | info | index.js | Loading 4 commands. -2020-04-06T18:56:15 | info | mongoose.js | Connected to the database. -2020-04-06T18:56:18 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-06T18:56:18 | log | message.js | Command ran: help -2020-04-06T18:56:23 | log | message.js | Command ran: help -2020-04-06T18:56:52 | info | index.js | Loading 4 commands. -2020-04-06T18:56:52 | info | index.js | Loading 7 events. -2020-04-06T18:56:52 | info | mongoose.js | Connected to the database. -2020-04-06T18:56:56 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-06T18:57:11 | info | index.js | Loading 4 commands. -2020-04-06T18:57:11 | info | index.js | Loading 7 events. -2020-04-06T18:57:11 | info | mongoose.js | Connected to the database. -2020-04-06T18:57:13 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-06T18:58:55 | info | index.js | Loading 4 commands. -2020-04-06T18:58:55 | info | index.js | Loading 7 events. -2020-04-06T18:58:55 | info | mongoose.js | Connected to the database. -2020-04-06T18:58:57 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-06T18:58:58 | log | message.js | Command ran: help -2020-04-06T18:59:16 | log | message.js | Command ran: help -2020-04-06T19:00:46 | info | index.js | Loading 4 commands. -2020-04-06T19:00:46 | info | index.js | Loading 7 events. -2020-04-06T19:00:46 | info | mongoose.js | Connected to the database. -2020-04-06T19:00:48 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-06T19:00:50 | log | message.js | Command ran: help -2020-04-06T19:02:04 | info | index.js | Loading 4 commands. -2020-04-06T19:02:04 | info | index.js | Loading 7 events. -2020-04-06T19:02:04 | info | mongoose.js | Connected to the database. -2020-04-06T19:02:06 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-06T19:02:06 | log | message.js | Command ran: help -2020-04-06T19:04:11 | info | index.js | Loading 4 commands. -2020-04-06T19:04:11 | info | index.js | Loading 7 events. -2020-04-06T19:04:11 | info | mongoose.js | Connected to the database. -2020-04-06T19:04:13 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-06T19:04:13 | log | message.js | Command ran: help -2020-04-06T19:04:19 | log | message.js | Command ran: help -2020-04-06T19:06:08 | info | index.js | Loading 4 commands. -2020-04-06T19:06:08 | info | index.js | Loading 7 events. -2020-04-06T19:06:08 | info | mongoose.js | Connected to the database. -2020-04-06T19:06:10 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-06T19:06:12 | log | message.js | Command ran: help -2020-04-06T19:06:37 | log | message.js | Command ran: help -2020-04-06T19:06:57 | info | index.js | Loading 4 commands. -2020-04-06T19:06:57 | info | index.js | Loading 7 events. -2020-04-06T19:06:57 | info | mongoose.js | Connected to the database. -2020-04-06T19:06:59 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-06T19:06:59 | log | message.js | Command ran: help -2020-04-06T19:07:03 | log | message.js | Command ran: help -2020-04-06T19:08:03 | info | index.js | Loading 4 commands. -2020-04-06T19:08:03 | info | index.js | Loading 7 events. -2020-04-06T19:08:03 | info | mongoose.js | Connected to the database. -2020-04-06T19:08:05 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-06T19:08:05 | log | message.js | Command ran: help -2020-04-06T19:08:09 | log | message.js | Command ran: help -2020-04-06T19:11:47 | info | index.js | Loading 4 commands. -2020-04-06T19:11:47 | info | index.js | Loading 7 events. -2020-04-06T19:11:47 | info | mongoose.js | Connected to the database. -2020-04-06T19:11:49 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-06T19:11:53 | log | message.js | Command ran: help -2020-04-06T19:12:14 | info | index.js | Loading 7 events. -2020-04-06T19:12:14 | info | index.js | Loading 4 commands. -2020-04-06T19:12:14 | info | mongoose.js | Connected to the database. -2020-04-06T19:12:16 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-06T19:12:17 | log | message.js | Command ran: help -2020-04-06T19:12:42 | info | index.js | Loading 4 commands. -2020-04-06T19:12:42 | info | index.js | Loading 7 events. -2020-04-06T19:12:42 | info | mongoose.js | Connected to the database. -2020-04-06T19:12:47 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-06T19:12:47 | log | message.js | Command ran: help -2020-04-06T19:13:06 | info | index.js | Loading 4 commands. -2020-04-06T19:13:06 | info | index.js | Loading 7 events. -2020-04-06T19:13:06 | info | mongoose.js | Connected to the database. -2020-04-06T19:13:08 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-06T19:13:08 | log | message.js | Command ran: help -2020-04-06T19:13:19 | info | index.js | Loading 4 commands. -2020-04-06T19:13:19 | info | index.js | Loading 7 events. -2020-04-06T19:13:19 | info | mongoose.js | Connected to the database. -2020-04-06T19:13:21 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-06T19:13:21 | log | message.js | Command ran: help -2020-04-06T19:14:01 | info | index.js | Loading 4 commands. -2020-04-06T19:14:01 | info | index.js | Loading 7 events. -2020-04-06T19:14:01 | info | mongoose.js | Connected to the database. -2020-04-06T19:14:03 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-06T19:15:08 | info | index.js | Loading 4 commands. -2020-04-06T19:15:08 | info | index.js | Loading 7 events. -2020-04-06T19:15:08 | info | mongoose.js | Connected to the database. -2020-04-06T19:15:12 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-06T19:15:30 | log | message.js | Command ran: help -2020-04-06T19:15:44 | log | message.js | Command ran: help -2020-04-06T19:17:18 | info | index.js | Loading 4 commands. -2020-04-06T19:17:18 | info | index.js | Loading 7 events. -2020-04-06T19:17:18 | info | mongoose.js | Connected to the database. -2020-04-06T19:17:20 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-06T19:17:23 | log | message.js | Command ran: help -2020-04-06T19:17:41 | info | index.js | Loading 4 commands. -2020-04-06T19:17:41 | info | index.js | Loading 7 events. -2020-04-06T19:17:41 | info | mongoose.js | Connected to the database. -2020-04-06T19:17:43 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-06T19:17:46 | log | message.js | Command ran: help -2020-04-06T19:20:52 | info | index.js | Loading 4 commands. -2020-04-06T19:20:52 | info | index.js | Loading 7 events. -2020-04-06T19:20:52 | info | mongoose.js | Connected to the database. -2020-04-06T19:20:54 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-06T19:20:57 | info | index.js | Loading 4 commands. -2020-04-06T19:20:57 | info | index.js | Loading 7 events. -2020-04-06T19:20:57 | info | mongoose.js | Connected to the database. -2020-04-06T19:21:04 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-06T19:21:10 | log | message.js | Command ran: help -2020-04-06T19:23:00 | info | index.js | Loading 4 commands. -2020-04-06T19:23:00 | info | index.js | Loading 7 events. -2020-04-06T19:23:00 | info | mongoose.js | Connected to the database. -2020-04-06T19:23:02 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-06T19:23:06 | log | message.js | Command ran: help -2020-04-06T19:23:53 | info | index.js | Loading 4 commands. -2020-04-06T19:23:53 | info | index.js | Loading 7 events. -2020-04-06T19:23:53 | info | mongoose.js | Connected to the database. -2020-04-06T19:23:55 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-06T19:24:05 | log | message.js | Command ran: help -2020-04-06T19:24:28 | info | index.js | Loading 4 commands. -2020-04-06T19:24:28 | info | index.js | Loading 7 events. -2020-04-06T19:24:28 | info | mongoose.js | Connected to the database. -2020-04-06T19:24:33 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-06T19:24:33 | log | message.js | Command ran: help -2020-04-06T19:24:59 | info | index.js | Loading 4 commands. -2020-04-06T19:24:59 | info | index.js | Loading 7 events. -2020-04-06T19:24:59 | info | mongoose.js | Connected to the database. -2020-04-06T19:25:01 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-06T19:25:01 | log | message.js | Command ran: help -2020-04-06T19:25:17 | info | index.js | Loading 4 commands. -2020-04-06T19:25:17 | info | index.js | Loading 7 events. -2020-04-06T19:25:17 | info | mongoose.js | Connected to the database. -2020-04-06T19:25:20 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-06T19:25:42 | info | index.js | Loading 4 commands. -2020-04-06T19:25:42 | info | index.js | Loading 7 events. -2020-04-06T19:25:42 | info | mongoose.js | Connected to the database. -2020-04-06T19:25:44 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-06T19:25:45 | log | message.js | Command ran: help -2020-04-06T19:26:20 | log | message.js | Command ran: help -2020-04-06T19:26:45 | info | index.js | Loading 4 commands. -2020-04-06T19:26:45 | info | index.js | Loading 7 events. -2020-04-06T19:26:45 | info | mongoose.js | Connected to the database. -2020-04-06T19:26:48 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-06T19:26:48 | log | message.js | Command ran: help -2020-04-06T19:27:12 | info | index.js | Loading 4 commands. -2020-04-06T19:27:12 | info | index.js | Loading 7 events. -2020-04-06T19:27:12 | info | mongoose.js | Connected to the database. -2020-04-06T19:27:14 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-06T19:27:14 | log | message.js | Command ran: help -2020-04-06T19:27:16 | log | message.js | Command ran: help -2020-04-06T19:28:59 | log | message.js | Command ran: help -2020-04-06T19:29:59 | info | index.js | Loading 4 commands. -2020-04-06T19:29:59 | info | index.js | Loading 7 events. -2020-04-06T19:30:00 | info | mongoose.js | Connected to the database. -2020-04-06T19:30:02 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-06T19:30:13 | info | index.js | Loading 4 commands. -2020-04-06T19:30:13 | info | index.js | Loading 7 events. -2020-04-06T19:30:13 | info | mongoose.js | Connected to the database. -2020-04-06T19:30:15 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-06T19:32:32 | info | index.js | Loading 4 commands. -2020-04-06T19:32:32 | info | index.js | Loading 7 events. -2020-04-06T19:32:32 | info | mongoose.js | Connected to the database. -2020-04-06T19:32:37 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-06T19:32:44 | info | index.js | Loading 4 commands. -2020-04-06T19:32:44 | info | index.js | Loading 7 events. -2020-04-06T19:32:44 | info | mongoose.js | Connected to the database. -2020-04-06T19:32:49 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-06T19:33:11 | info | index.js | Loading 4 commands. -2020-04-06T19:33:11 | info | index.js | Loading 7 events. -2020-04-06T19:33:11 | info | mongoose.js | Connected to the database. -2020-04-06T19:33:13 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-06T19:33:50 | log | message.js | Command ran: eval -2020-04-06T19:34:05 | log | message.js | Command ran: eval -2020-04-06T19:34:13 | info | index.js | Loading 4 commands. -2020-04-06T19:34:13 | info | index.js | Loading 7 events. -2020-04-06T19:34:13 | info | mongoose.js | Connected to the database. -2020-04-06T19:34:15 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-06T19:34:44 | info | index.js | Loading 4 commands. -2020-04-06T19:34:44 | info | index.js | Loading 7 events. -2020-04-06T19:34:44 | info | mongoose.js | Connected to the database. -2020-04-06T19:34:46 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-06T19:34:51 | info | index.js | Loading 4 commands. -2020-04-06T19:34:51 | info | index.js | Loading 7 events. -2020-04-06T19:34:51 | info | mongoose.js | Connected to the database. -2020-04-06T19:34:53 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-06T19:35:16 | log | message.js | Command ran: help -2020-04-06T23:24:40 | info | index.js | Loading 4 commands. -2020-04-06T23:24:40 | info | index.js | Loading 7 events. -2020-04-06T23:24:40 | info | mongoose.js | Connected to the database. -2020-04-06T23:24:43 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-06T23:26:12 | info | index.js | Loading 4 commands. -2020-04-06T23:26:12 | info | index.js | Loading 7 events. -2020-04-06T23:26:12 | info | mongoose.js | Connected to the database. -2020-04-06T23:26:15 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-06T23:26:56 | log | message.js | Command ran: help -2020-04-06T23:27:01 | log | message.js | Command ran: help -2020-04-06T23:27:08 | log | message.js | Command ran: help -2020-04-07T00:00:13 | info | index.js | Loading 4 commands. -2020-04-07T00:00:13 | info | index.js | Loading 7 events. -2020-04-07T00:00:13 | info | mongoose.js | Connected to the database. -2020-04-07T00:00:15 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-07T00:00:28 | info | index.js | Loading 4 commands. -2020-04-07T00:00:28 | info | index.js | Loading 7 events. -2020-04-07T00:00:28 | info | mongoose.js | Connected to the database. -2020-04-07T00:00:31 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-07T00:00:31 | log | message.js | Command ran: help -2020-04-07T00:00:31 | error | _functions.js | Unhandled rejection: ReferenceError: parameters is not defined -2020-04-07T00:00:35 | log | message.js | Command ran: help -2020-04-07T00:00:35 | error | _functions.js | Unhandled rejection: ReferenceError: parameters is not defined -2020-04-07T00:01:10 | info | index.js | Loading 4 commands. -2020-04-07T00:01:10 | info | index.js | Loading 7 events. -2020-04-07T00:01:10 | info | mongoose.js | Connected to the database. -2020-04-07T00:01:12 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-07T00:01:13 | log | message.js | Command ran: help -2020-04-07T00:02:07 | info | index.js | Loading 4 commands. -2020-04-07T00:02:07 | info | index.js | Loading 7 events. -2020-04-07T00:02:07 | info | mongoose.js | Connected to the database. -2020-04-07T00:02:09 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-07T00:02:10 | log | message.js | Command ran: help -2020-04-07T00:02:22 | info | index.js | Loading 4 commands. -2020-04-07T00:02:22 | info | index.js | Loading 7 events. -2020-04-07T00:02:22 | info | mongoose.js | Connected to the database. -2020-04-07T00:02:24 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-07T00:02:25 | log | message.js | Command ran: help -2020-04-07T00:06:16 | info | index.js | Loading 4 commands. -2020-04-07T00:06:16 | info | index.js | Loading 7 events. -2020-04-07T00:06:16 | info | mongoose.js | Connected to the database. -2020-04-07T00:06:19 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-07T00:06:22 | log | message.js | Command ran: help -2020-04-07T00:08:01 | info | index.js | Loading 4 commands. -2020-04-07T00:08:01 | info | index.js | Loading 7 events. -2020-04-07T00:08:01 | info | mongoose.js | Connected to the database. -2020-04-07T00:08:03 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-07T00:08:52 | info | index.js | Loading 4 commands. -2020-04-07T00:08:52 | info | index.js | Loading 7 events. -2020-04-07T00:08:52 | info | mongoose.js | Connected to the database. -2020-04-07T00:08:54 | info | index.js | Loading 4 commands. -2020-04-07T00:08:54 | info | index.js | Loading 7 events. -2020-04-07T00:08:54 | info | mongoose.js | Connected to the database. -2020-04-07T00:08:56 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-07T00:28:37 | info | index.js | Loading 4 commands. -2020-04-07T00:28:37 | info | index.js | Loading 7 events. -2020-04-07T00:28:37 | info | mongoose.js | Connected to the database. -2020-04-07T00:28:39 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-07T00:30:07 | info | index.js | Loading 7 events. -2020-04-07T00:30:07 | info | index.js | Loading 4 commands. -2020-04-07T00:30:07 | info | mongoose.js | Connected to the database. -2020-04-07T00:30:10 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-07T00:32:09 | info | index.js | Loading 4 commands. -2020-04-07T00:32:09 | info | index.js | Loading 7 events. -2020-04-07T00:32:10 | info | mongoose.js | Connected to the database. -2020-04-07T00:32:12 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-07T00:32:12 | log | message.js | Command ran: help -2020-04-07T00:35:47 | info | index.js | Loading 4 commands. -2020-04-07T00:35:47 | info | index.js | Loading 7 events. -2020-04-07T00:35:47 | info | mongoose.js | Connected to the database. -2020-04-07T00:35:49 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-07T00:35:50 | log | message.js | Command ran: help -2020-04-07T00:39:53 | info | index.js | Loading 4 commands. -2020-04-07T00:39:53 | info | index.js | Loading 7 events. -2020-04-07T00:39:54 | info | mongoose.js | Connected to the database. -2020-04-07T00:39:56 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-07T00:39:56 | log | message.js | Command ran: help -2020-04-07T00:40:12 | info | index.js | Loading 4 commands. -2020-04-07T00:40:12 | info | index.js | Loading 7 events. -2020-04-07T00:40:13 | info | mongoose.js | Connected to the database. -2020-04-07T00:40:16 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-07T00:40:17 | log | message.js | Command ran: help -2020-04-07T00:40:58 | info | index.js | Loading 4 commands. -2020-04-07T00:40:58 | info | index.js | Loading 7 events. -2020-04-07T00:40:58 | info | mongoose.js | Connected to the database. -2020-04-07T00:41:01 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-07T00:41:01 | log | message.js | Command ran: help -2020-04-07T00:41:20 | log | message.js | Command ran: help -2020-04-07T00:41:36 | log | message.js | Command ran: help -2020-04-07T00:41:36 | error | _functions.js | Unhandled rejection: TypeError: Cannot read property 'length' of null -2020-04-07T00:43:16 | info | index.js | Loading 4 commands. -2020-04-07T00:43:16 | info | index.js | Loading 7 events. -2020-04-07T00:43:16 | info | mongoose.js | Connected to the database. -2020-04-07T00:43:19 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-07T00:43:19 | log | message.js | Command ran: help -2020-04-07T00:44:02 | info | index.js | Loading 4 commands. -2020-04-07T00:44:02 | info | index.js | Loading 7 events. -2020-04-07T00:44:02 | info | mongoose.js | Connected to the database. -2020-04-07T00:44:07 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-07T00:46:06 | info | index.js | Loading 4 commands. -2020-04-07T00:46:06 | info | index.js | Loading 7 events. -2020-04-07T00:46:06 | info | mongoose.js | Connected to the database. -2020-04-07T00:46:08 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-07T00:46:09 | log | message.js | Command ran: help -2020-04-07T00:46:20 | info | index.js | Loading 4 commands. -2020-04-07T00:46:20 | info | index.js | Loading 7 events. -2020-04-07T00:46:20 | info | mongoose.js | Connected to the database. -2020-04-07T00:46:23 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-07T00:46:27 | info | index.js | Loading 4 commands. -2020-04-07T00:46:27 | info | index.js | Loading 7 events. -2020-04-07T00:46:28 | info | mongoose.js | Connected to the database. -2020-04-07T00:46:30 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-07T00:46:50 | info | index.js | Loading 4 commands. -2020-04-07T00:46:50 | info | index.js | Loading 7 events. -2020-04-07T00:46:50 | info | mongoose.js | Connected to the database. -2020-04-07T00:46:52 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-07T00:47:00 | log | message.js | Command ran: help -2020-04-07T01:15:42 | log | message.js | Command ran: help -2020-04-07T01:17:37 | info | index.js | Loading 4 commands. -2020-04-07T01:17:37 | info | index.js | Loading 7 events. -2020-04-07T01:17:38 | info | mongoose.js | Connected to the database. -2020-04-07T01:17:40 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-07T01:17:45 | log | message.js | Command ran: help -2020-04-07T01:18:08 | info | index.js | Loading 4 commands. -2020-04-07T01:18:08 | info | index.js | Loading 7 events. -2020-04-07T01:18:08 | info | mongoose.js | Connected to the database. -2020-04-07T01:18:10 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-07T01:18:11 | log | message.js | Command ran: help -2020-04-07T01:19:15 | info | index.js | Loading 4 commands. -2020-04-07T01:19:15 | info | index.js | Loading 7 events. -2020-04-07T01:19:15 | info | mongoose.js | Connected to the database. -2020-04-07T01:19:17 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-07T01:19:17 | log | message.js | Command ran: help -2020-04-07T01:19:38 | info | index.js | Loading 4 commands. -2020-04-07T01:19:38 | info | index.js | Loading 7 events. -2020-04-07T01:19:38 | info | mongoose.js | Connected to the database. -2020-04-07T01:19:41 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-07T01:19:41 | log | message.js | Command ran: help -2020-04-07T01:19:50 | info | index.js | Loading 4 commands. -2020-04-07T01:19:50 | info | index.js | Loading 7 events. -2020-04-07T01:19:50 | info | mongoose.js | Connected to the database. -2020-04-07T01:19:53 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-07T01:19:53 | log | message.js | Command ran: help -2020-04-07T01:20:45 | log | message.js | Command ran: help -2020-04-07T01:20:48 | log | message.js | Command ran: help -2020-04-07T01:21:32 | info | index.js | Loading 4 commands. -2020-04-07T01:21:32 | info | index.js | Loading 7 events. -2020-04-07T01:21:32 | info | mongoose.js | Connected to the database. -2020-04-07T01:21:34 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-07T01:22:23 | info | index.js | Loading 4 commands. -2020-04-07T01:22:23 | info | index.js | Loading 7 events. -2020-04-07T01:22:23 | info | mongoose.js | Connected to the database. -2020-04-07T01:22:25 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-07T01:22:27 | log | message.js | Command ran: help -2020-04-07T01:22:38 | info | index.js | Loading 4 commands. -2020-04-07T01:22:38 | info | index.js | Loading 7 events. -2020-04-07T01:22:38 | info | mongoose.js | Connected to the database. -2020-04-07T01:22:41 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-07T01:22:41 | log | message.js | Command ran: help -2020-04-07T01:22:49 | log | message.js | Command ran: help -2020-04-07T01:23:03 | info | index.js | Loading 4 commands. -2020-04-07T01:23:03 | info | index.js | Loading 7 events. -2020-04-07T01:23:03 | info | mongoose.js | Connected to the database. -2020-04-07T01:23:05 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-07T01:23:05 | log | message.js | Command ran: help -2020-04-07T01:24:12 | info | index.js | Loading 4 commands. -2020-04-07T01:24:12 | info | index.js | Loading 7 events. -2020-04-07T01:24:12 | info | mongoose.js | Connected to the database. -2020-04-07T01:24:15 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-07T01:24:36 | info | index.js | Loading 4 commands. -2020-04-07T01:24:36 | info | index.js | Loading 7 events. -2020-04-07T01:24:36 | info | mongoose.js | Connected to the database. -2020-04-07T01:24:38 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-07T01:25:00 | info | index.js | Loading 4 commands. -2020-04-07T01:25:00 | info | index.js | Loading 7 events. -2020-04-07T01:25:00 | info | mongoose.js | Connected to the database. -2020-04-07T01:25:05 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-07T01:25:11 | log | message.js | Command ran: help -2020-04-07T01:25:14 | log | message.js | Command ran: help -2020-04-07T01:25:48 | log | message.js | Command ran: help -2020-04-07T01:26:26 | log | message.js | Command ran: help -2020-04-07T01:26:33 | log | message.js | Command ran: help -2020-04-07T01:26:38 | log | message.js | Command ran: help -2020-04-07T01:27:00 | info | index.js | Loading 4 commands. -2020-04-07T01:27:00 | info | index.js | Loading 7 events. -2020-04-07T01:27:00 | info | mongoose.js | Connected to the database. -2020-04-07T01:27:03 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-07T01:27:03 | log | message.js | Command ran: help -2020-04-07T01:27:18 | log | message.js | Command ran: help -2020-04-07T01:28:58 | info | index.js | Loading 4 commands. -2020-04-07T01:28:58 | info | index.js | Loading 7 events. -2020-04-07T01:28:58 | info | mongoose.js | Connected to the database. -2020-04-07T01:29:01 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-07T01:29:01 | log | message.js | Command ran: help -2020-04-07T01:29:30 | info | index.js | Loading 4 commands. -2020-04-07T01:29:30 | info | index.js | Loading 7 events. -2020-04-07T01:29:30 | info | mongoose.js | Connected to the database. -2020-04-07T01:29:33 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-07T01:29:34 | log | message.js | Command ran: help -2020-04-07T01:29:46 | info | index.js | Loading 4 commands. -2020-04-07T01:29:46 | info | index.js | Loading 7 events. -2020-04-07T01:29:46 | info | mongoose.js | Connected to the database. -2020-04-07T01:29:48 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-07T01:29:53 | log | message.js | Command ran: help -2020-04-07T01:32:58 | info | index.js | Loading 4 commands. -2020-04-07T01:32:58 | info | index.js | Loading 7 events. -2020-04-07T01:32:58 | info | mongoose.js | Connected to the database. -2020-04-07T01:33:01 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-07T01:38:33 | log | message.js | Command ran: level -2020-04-07T01:38:50 | log | message.js | Command ran: level -2020-04-07T01:40:46 | info | index.js | Loading 4 commands. -2020-04-07T01:40:46 | info | index.js | Loading 7 events. -2020-04-07T01:40:46 | info | mongoose.js | Connected to the database. -2020-04-07T01:40:49 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-07T01:40:55 | log | message.js | Command ran: level -2020-04-07T01:41:05 | log | message.js | Command ran: level -2020-04-07T01:41:28 | info | index.js | Loading 4 commands. -2020-04-07T01:41:28 | info | index.js | Loading 7 events. -2020-04-07T01:41:28 | info | mongoose.js | Connected to the database. -2020-04-07T01:41:30 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-07T01:41:50 | info | index.js | Loading 4 commands. -2020-04-07T01:41:50 | info | index.js | Loading 7 events. -2020-04-07T01:41:50 | info | mongoose.js | Connected to the database. -2020-04-07T01:41:53 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-07T01:41:53 | log | message.js | Command ran: level -2020-04-07T01:43:49 | info | index.js | Loading 5 commands. -2020-04-07T01:43:49 | error | index.js | Failed to load ship.js: TypeError: Cannot read property 'name' of undefined -2020-04-07T01:43:49 | info | index.js | Loading 7 events. -2020-04-07T01:43:49 | info | mongoose.js | Connected to the database. -2020-04-07T01:43:52 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-07T01:47:15 | info | index.js | Loading 5 commands. -2020-04-07T01:47:15 | info | index.js | Loading 7 events. -2020-04-07T01:47:15 | info | mongoose.js | Connected to the database. -2020-04-07T01:47:17 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-07T01:47:29 | log | message.js | Command ran: ship -2020-04-07T01:47:45 | log | message.js | Command ran: ship -2020-04-07T01:47:54 | log | message.js | Command ran: ship -2020-04-07T01:48:01 | log | message.js | Command ran: ship -2020-04-07T01:48:19 | log | message.js | Command ran: ship -2020-04-07T01:51:45 | log | message.js | Command ran: ship -2020-04-07T01:51:54 | log | message.js | Command ran: ship -2020-04-07T01:54:38 | info | index.js | Loading 5 commands. -2020-04-07T01:54:39 | info | index.js | Loading 7 events. -2020-04-07T01:54:39 | info | mongoose.js | Connected to the database. -2020-04-07T01:54:42 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-07T01:54:46 | log | message.js | Command ran: ship -2020-04-07T01:54:50 | log | message.js | Command ran: ship -2020-04-07T01:55:36 | log | message.js | Command ran: ship -2020-04-07T01:55:47 | log | message.js | Command ran: ship -2020-04-07T01:55:59 | log | message.js | Command ran: ship -2020-04-07T01:56:40 | info | index.js | Loading 5 commands. -2020-04-07T01:56:40 | info | index.js | Loading 7 events. -2020-04-07T01:56:40 | info | mongoose.js | Connected to the database. -2020-04-07T01:56:43 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-07T01:56:46 | log | message.js | Command ran: ship -2020-04-07T01:56:54 | log | message.js | Command ran: ship -2020-04-07T01:57:01 | log | message.js | Command ran: ship -2020-04-07T01:57:06 | log | message.js | Command ran: ship -2020-04-07T01:57:10 | log | message.js | Command ran: ship -2020-04-07T01:58:37 | log | message.js | Command ran: ship -2020-04-07T01:59:28 | info | index.js | Loading 5 commands. -2020-04-07T01:59:28 | info | index.js | Loading 7 events. -2020-04-07T01:59:28 | info | mongoose.js | Connected to the database. -2020-04-07T01:59:30 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-07T01:59:31 | log | message.js | Command ran: ship -2020-04-07T01:59:38 | log | message.js | Command ran: ship -2020-04-07T01:59:49 | info | index.js | Loading 5 commands. -2020-04-07T01:59:49 | info | index.js | Loading 7 events. -2020-04-07T01:59:49 | info | mongoose.js | Connected to the database. -2020-04-07T01:59:51 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-07T01:59:55 | info | index.js | Loading 5 commands. -2020-04-07T01:59:55 | info | index.js | Loading 7 events. -2020-04-07T01:59:55 | info | mongoose.js | Connected to the database. -2020-04-07T01:59:57 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-07T02:00:07 | log | message.js | Command ran: ship -2020-04-07T02:04:00 | info | index.js | Loading 5 commands. -2020-04-07T02:04:00 | info | index.js | Loading 7 events. -2020-04-07T02:04:00 | info | mongoose.js | Connected to the database. -2020-04-07T02:04:03 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-07T02:04:09 | log | message.js | Command ran: ship -2020-04-07T02:04:09 | error | _functions.js | Unhandled rejection: TypeError: client.embedClour is not a function -2020-04-07T02:04:25 | info | index.js | Loading 5 commands. -2020-04-07T02:04:25 | info | index.js | Loading 7 events. -2020-04-07T02:04:26 | info | mongoose.js | Connected to the database. -2020-04-07T02:04:30 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-07T02:04:30 | log | message.js | Command ran: ship -2020-04-07T02:04:30 | error | _functions.js | Unhandled rejection: TypeError: guild.member is not a function -2020-04-07T02:05:10 | info | index.js | Loading 5 commands. -2020-04-07T02:05:10 | info | index.js | Loading 7 events. -2020-04-07T02:05:10 | info | mongoose.js | Connected to the database. -2020-04-07T02:05:12 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-07T02:05:35 | info | index.js | Loading 5 commands. -2020-04-07T02:05:35 | info | index.js | Loading 7 events. -2020-04-07T02:05:35 | info | mongoose.js | Connected to the database. -2020-04-07T02:05:40 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-07T02:05:40 | log | message.js | Command ran: ship -2020-04-07T02:05:40 | error | _functions.js | Unhandled rejection: TypeError: embed.setColour is not a function -2020-04-07T02:05:53 | info | index.js | Loading 5 commands. -2020-04-07T02:05:53 | info | index.js | Loading 7 events. -2020-04-07T02:05:53 | info | mongoose.js | Connected to the database. -2020-04-07T02:05:55 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-07T02:05:57 | log | message.js | Command ran: ship -2020-04-07T02:06:59 | info | index.js | Loading 5 commands. -2020-04-07T02:06:59 | info | index.js | Loading 7 events. -2020-04-07T02:06:59 | info | mongoose.js | Connected to the database. -2020-04-07T02:07:01 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-07T02:07:05 | log | message.js | Command ran: ship -2020-04-07T02:09:30 | info | index.js | Loading 5 commands. -2020-04-07T02:09:30 | info | index.js | Loading 7 events. -2020-04-07T02:09:30 | info | mongoose.js | Connected to the database. -2020-04-07T02:09:33 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-07T02:09:36 | log | message.js | Command ran: ship -2020-04-07T02:10:26 | info | index.js | Loading 5 commands. -2020-04-07T02:10:26 | info | index.js | Loading 7 events. -2020-04-07T02:10:26 | info | mongoose.js | Connected to the database. -2020-04-07T02:10:28 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-07T02:10:31 | log | message.js | Command ran: ship -2020-04-07T02:10:55 | info | index.js | Loading 5 commands. -2020-04-07T02:10:55 | info | index.js | Loading 7 events. -2020-04-07T02:10:55 | info | mongoose.js | Connected to the database. -2020-04-07T02:10:57 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-07T02:11:08 | info | index.js | Loading 5 commands. -2020-04-07T02:11:08 | info | index.js | Loading 7 events. -2020-04-07T02:11:08 | info | mongoose.js | Connected to the database. -2020-04-07T02:11:10 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-07T02:12:30 | info | index.js | Loading 5 commands. -2020-04-07T02:12:30 | info | index.js | Loading 7 events. -2020-04-07T02:12:30 | info | mongoose.js | Connected to the database. -2020-04-07T02:12:32 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-07T02:15:47 | log | message.js | Command ran: ship -2020-04-07T02:15:59 | log | message.js | Command ran: ship -2020-04-07T02:22:02 | info | index.js | Loading 5 commands. -2020-04-07T02:22:02 | info | index.js | Loading 7 events. -2020-04-07T02:22:02 | info | mongoose.js | Connected to the database. -2020-04-07T02:22:05 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-07T02:22:20 | log | message.js | Command ran: ship -2020-04-07T02:22:20 | error | _functions.js | Unhandled rejection: TypeError: Discord.RichEmbed is not a constructor -2020-04-07T02:23:00 | info | index.js | Loading 5 commands. -2020-04-07T02:23:00 | info | index.js | Loading 7 events. -2020-04-07T02:23:00 | info | mongoose.js | Connected to the database. -2020-04-07T02:23:02 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-07T02:23:06 | log | message.js | Command ran: ship -2020-04-07T02:24:47 | info | index.js | Loading 5 commands. -2020-04-07T02:24:47 | info | index.js | Loading 7 events. -2020-04-07T02:24:47 | info | mongoose.js | Connected to the database. -2020-04-07T02:24:52 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-07T02:24:54 | log | message.js | Command ran: ship -2020-04-07T02:30:34 | info | index.js | Loading 5 commands. -2020-04-07T02:30:34 | info | index.js | Loading 7 events. -2020-04-07T02:30:34 | info | mongoose.js | Connected to the database. -2020-04-07T02:30:36 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-07T02:30:42 | log | message.js | Command ran: ship -2020-04-07T02:32:02 | info | index.js | Loading 5 commands. -2020-04-07T02:32:02 | info | index.js | Loading 7 events. -2020-04-07T02:32:02 | info | mongoose.js | Connected to the database. -2020-04-07T02:32:05 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-07T02:33:52 | info | index.js | Loading 5 commands. -2020-04-07T02:33:52 | info | index.js | Loading 7 events. -2020-04-07T02:33:52 | info | mongoose.js | Connected to the database. -2020-04-07T02:33:54 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-07T02:34:15 | log | message.js | Command ran: ship -2020-04-07T02:34:26 | info | index.js | Loading 5 commands. -2020-04-07T02:34:26 | info | index.js | Loading 7 events. -2020-04-07T02:34:26 | info | mongoose.js | Connected to the database. -2020-04-07T02:34:29 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-07T02:34:30 | log | message.js | Command ran: ship -2020-04-07T02:34:30 | error | _functions.js | Unhandled rejection: TypeError: Cannot read property 'substr' of undefined -2020-04-07T02:34:55 | info | index.js | Loading 5 commands. -2020-04-07T02:34:55 | info | index.js | Loading 7 events. -2020-04-07T02:34:55 | info | mongoose.js | Connected to the database. -2020-04-07T02:34:57 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-07T11:48:46 | info | index.js | Loading 5 commands. -2020-04-07T11:48:46 | info | index.js | Loading 7 events. -2020-04-07T11:48:46 | info | mongoose.js | Connected to the database. -2020-04-07T11:48:48 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-07T11:59:26 | log | message.js | Command ran: help -2020-04-07T12:06:42 | log | message.js | Command ran: help -2020-04-07T12:12:46 | log | message.js | Command ran: help -2020-04-07T12:17:41 | log | message.js | Command ran: help -2020-04-07T12:18:17 | info | index.js | Loading 5 commands. -2020-04-07T12:18:17 | info | index.js | Loading 7 events. -2020-04-07T12:18:17 | info | mongoose.js | Connected to the database. -2020-04-07T12:18:19 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-07T12:18:19 | log | message.js | Command ran: help -2020-04-07T12:36:21 | info | index.js | Loading 5 commands. -2020-04-07T12:36:21 | info | index.js | Loading 7 events. -2020-04-07T12:36:21 | info | mongoose.js | Connected to the database. -2020-04-07T12:36:24 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-07T12:37:20 | log | message.js | Command ran: ship -2020-04-07T12:37:23 | log | message.js | Command ran: ship -2020-04-07T16:24:09 | info | index.js | Loading 5 commands. -2020-04-07T16:24:09 | info | index.js | Loading 7 events. -2020-04-07T16:24:09 | info | mongoose.js | Connected to the database. -2020-04-07T16:24:11 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-07T16:24:22 | log | message.js | Command ran: help -2020-04-07T16:30:54 | log | message.js | Command ran: help -2020-04-07T17:08:39 | log | message.js | Command ran: ship -2020-04-07T17:16:50 | log | message.js | Command ran: help -2020-04-07T17:19:27 | info | index.js | Loading 5 commands. -2020-04-07T17:19:27 | info | index.js | Loading 7 events. -2020-04-07T17:19:27 | info | mongoose.js | Connected to the database. -2020-04-07T17:19:30 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-07T17:20:24 | info | index.js | Loading 5 commands. -2020-04-07T17:20:24 | info | index.js | Loading 7 events. -2020-04-07T17:20:24 | info | mongoose.js | Connected to the database. -2020-04-07T17:20:26 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-07T17:20:28 | log | message.js | Command ran: ship -2020-04-07T17:21:08 | info | index.js | Loading 5 commands. -2020-04-07T17:21:08 | info | index.js | Loading 7 events. -2020-04-07T17:21:08 | info | mongoose.js | Connected to the database. -2020-04-07T17:21:10 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-07T17:21:19 | log | message.js | Command ran: ship -2020-04-07T17:21:41 | info | index.js | Loading 5 commands. -2020-04-07T17:21:41 | info | index.js | Loading 7 events. -2020-04-07T17:21:41 | info | mongoose.js | Connected to the database. -2020-04-07T17:21:43 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-07T17:21:46 | log | message.js | Command ran: ship -2020-04-07T17:22:01 | info | index.js | Loading 5 commands. -2020-04-07T17:22:01 | info | index.js | Loading 7 events. -2020-04-07T17:22:01 | info | mongoose.js | Connected to the database. -2020-04-07T17:22:04 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-07T17:22:05 | log | message.js | Command ran: ship -2020-04-07T17:22:26 | info | index.js | Loading 5 commands. -2020-04-07T17:22:27 | info | index.js | Loading 7 events. -2020-04-07T17:22:27 | info | mongoose.js | Connected to the database. -2020-04-07T17:22:29 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-07T17:22:31 | log | message.js | Command ran: ship -2020-04-07T17:22:52 | info | index.js | Loading 5 commands. -2020-04-07T17:22:52 | info | index.js | Loading 7 events. -2020-04-07T17:22:52 | info | mongoose.js | Connected to the database. -2020-04-07T17:22:55 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-07T17:22:56 | log | message.js | Command ran: ship -2020-04-07T17:24:17 | info | index.js | Loading 5 commands. -2020-04-07T17:24:17 | info | index.js | Loading 7 events. -2020-04-07T17:24:17 | info | mongoose.js | Connected to the database. -2020-04-07T17:24:20 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-07T17:24:22 | info | index.js | Loading 5 commands. -2020-04-07T17:24:22 | info | index.js | Loading 7 events. -2020-04-07T17:24:22 | info | mongoose.js | Connected to the database. -2020-04-07T17:24:30 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-07T17:24:35 | log | message.js | Command ran: ship -2020-04-07T17:25:51 | info | index.js | Loading 5 commands. -2020-04-07T17:25:51 | info | index.js | Loading 7 events. -2020-04-07T17:25:51 | info | mongoose.js | Connected to the database. -2020-04-07T17:25:54 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-07T17:26:46 | log | message.js | Command ran: eval -2020-04-07T17:27:13 | log | message.js | Command ran: eval -2020-04-07T17:27:25 | log | message.js | Command ran: eval -2020-04-07T17:29:21 | info | index.js | Loading 5 commands. -2020-04-07T17:29:21 | info | index.js | Loading 7 events. -2020-04-07T17:29:21 | info | mongoose.js | Connected to the database. -2020-04-07T17:29:23 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-07T17:29:37 | info | index.js | Loading 5 commands. -2020-04-07T17:29:37 | info | index.js | Loading 7 events. -2020-04-07T17:29:37 | info | mongoose.js | Connected to the database. -2020-04-07T17:29:39 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-07T17:31:03 | log | message.js | Command ran: eval -2020-04-07T17:58:55 | info | index.js | Loading 5 commands. -2020-04-07T17:58:55 | info | index.js | Loading 7 events. -2020-04-07T17:58:55 | info | mongoose.js | Connected to the database. -2020-04-07T17:59:00 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-07T17:59:02 | log | message.js | Command ran: ship -2020-04-07T17:59:17 | log | message.js | Command ran: ship -2020-04-07T18:00:43 | info | index.js | Loading 5 commands. -2020-04-07T18:00:43 | info | index.js | Loading 7 events. -2020-04-07T18:00:43 | info | mongoose.js | Connected to the database. -2020-04-07T18:00:45 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-07T18:00:50 | log | message.js | Command ran: ship -2020-04-07T18:07:47 | info | index.js | Loading 5 commands. -2020-04-07T18:07:47 | info | index.js | Loading 7 events. -2020-04-07T18:07:47 | info | mongoose.js | Connected to the database. -2020-04-07T18:07:49 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-07T18:07:57 | log | message.js | Command ran: ship -2020-04-08T14:30:50 | info | index.js | Loading 5 commands. -2020-04-08T14:30:50 | info | index.js | Loading 7 events. -2020-04-08T14:30:50 | info | mongoose.js | Connected to the database. -2020-04-08T14:30:52 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-08T14:30:57 | log | message.js | Command ran: ship -2020-04-08T14:31:19 | info | index.js | Loading 5 commands. -2020-04-08T14:31:19 | info | index.js | Loading 7 events. -2020-04-08T14:31:19 | info | mongoose.js | Connected to the database. -2020-04-08T14:31:21 | info | index.js | Loading 5 commands. -2020-04-08T14:31:21 | info | index.js | Loading 7 events. -2020-04-08T14:31:21 | info | mongoose.js | Connected to the database. -2020-04-08T14:31:31 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-08T14:31:33 | log | message.js | Command ran: ship -2020-04-08T14:31:50 | info | index.js | Loading 5 commands. -2020-04-08T14:31:50 | info | index.js | Loading 7 events. -2020-04-08T14:31:50 | info | mongoose.js | Connected to the database. -2020-04-08T14:31:53 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-08T14:31:54 | log | message.js | Command ran: ship -2020-04-08T14:32:05 | info | index.js | Loading 5 commands. -2020-04-08T14:32:05 | info | index.js | Loading 7 events. -2020-04-08T14:32:05 | info | mongoose.js | Connected to the database. -2020-04-08T14:32:08 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-08T14:32:09 | log | message.js | Command ran: ship -2020-04-08T14:32:16 | info | index.js | Loading 5 commands. -2020-04-08T14:32:16 | info | index.js | Loading 7 events. -2020-04-08T14:32:16 | info | mongoose.js | Connected to the database. -2020-04-08T14:32:19 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-08T14:32:21 | log | message.js | Command ran: ship -2020-04-08T14:33:11 | info | index.js | Loading 5 commands. -2020-04-08T14:33:11 | info | index.js | Loading 7 events. -2020-04-08T14:33:11 | info | mongoose.js | Connected to the database. -2020-04-08T14:33:13 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-08T14:33:18 | log | message.js | Command ran: ship -2020-04-08T14:33:27 | info | index.js | Loading 5 commands. -2020-04-08T14:33:27 | info | index.js | Loading 7 events. -2020-04-08T14:33:27 | info | mongoose.js | Connected to the database. -2020-04-08T14:33:29 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-08T14:33:31 | log | message.js | Command ran: ship -2020-04-08T14:33:39 | info | index.js | Loading 5 commands. -2020-04-08T14:33:39 | info | index.js | Loading 7 events. -2020-04-08T14:33:39 | info | mongoose.js | Connected to the database. -2020-04-08T14:33:41 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-08T14:33:43 | log | message.js | Command ran: ship -2020-04-08T14:34:09 | info | index.js | Loading 5 commands. -2020-04-08T14:34:09 | info | index.js | Loading 7 events. -2020-04-08T14:34:09 | info | mongoose.js | Connected to the database. -2020-04-08T14:34:11 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-08T14:34:14 | log | message.js | Command ran: ship -2020-04-08T14:34:22 | log | message.js | Command ran: ship -2020-04-08T14:34:26 | log | message.js | Command ran: ship -2020-04-08T14:34:44 | info | index.js | Loading 5 commands. -2020-04-08T14:34:44 | info | index.js | Loading 7 events. -2020-04-08T14:34:44 | info | mongoose.js | Connected to the database. -2020-04-08T14:34:47 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-08T14:34:50 | log | message.js | Command ran: ship -2020-04-08T14:34:55 | log | message.js | Command ran: ship -2020-04-08T14:36:42 | log | message.js | Command ran: help -2020-04-08T14:38:12 | info | index.js | Loading 5 commands. -2020-04-08T14:38:12 | info | index.js | Loading 7 events. -2020-04-08T14:38:12 | info | mongoose.js | Connected to the database. -2020-04-08T14:38:15 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-08T14:38:16 | log | message.js | Command ran: ship -2020-04-08T14:38:28 | info | index.js | Loading 5 commands. -2020-04-08T14:38:28 | info | index.js | Loading 7 events. -2020-04-08T14:38:28 | info | mongoose.js | Connected to the database. -2020-04-08T14:38:30 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-08T14:38:31 | log | message.js | Command ran: ship -2020-04-08T14:39:29 | info | index.js | Loading 7 events. -2020-04-08T14:39:29 | info | index.js | Loading 5 commands. -2020-04-08T14:39:29 | info | mongoose.js | Connected to the database. -2020-04-08T14:39:31 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-08T14:39:33 | log | message.js | Command ran: ship -2020-04-08T14:41:20 | info | index.js | Loading 5 commands. -2020-04-08T14:41:20 | info | index.js | Loading 7 events. -2020-04-08T14:41:20 | info | mongoose.js | Connected to the database. -2020-04-08T14:41:24 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-08T14:41:28 | log | message.js | Command ran: ship -2020-04-08T14:41:46 | info | index.js | Loading 5 commands. -2020-04-08T14:41:46 | info | index.js | Loading 7 events. -2020-04-08T14:41:46 | info | mongoose.js | Connected to the database. -2020-04-08T14:41:48 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-08T14:41:49 | log | message.js | Command ran: ship -2020-04-08T14:42:09 | info | index.js | Loading 5 commands. -2020-04-08T14:42:09 | info | index.js | Loading 7 events. -2020-04-08T14:42:09 | info | mongoose.js | Connected to the database. -2020-04-08T14:42:12 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-08T14:42:14 | log | message.js | Command ran: ship -2020-04-08T14:42:28 | log | message.js | Command ran: ship -2020-04-08T14:43:30 | info | index.js | Loading 5 commands. -2020-04-08T14:43:30 | info | index.js | Loading 7 events. -2020-04-08T14:43:30 | info | mongoose.js | Connected to the database. -2020-04-08T14:43:33 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-08T14:43:34 | log | message.js | Command ran: ship -2020-04-08T14:43:47 | info | index.js | Loading 5 commands. -2020-04-08T14:43:47 | info | index.js | Loading 7 events. -2020-04-08T14:43:47 | info | mongoose.js | Connected to the database. -2020-04-08T14:43:48 | info | index.js | Loading 5 commands. -2020-04-08T14:43:48 | info | index.js | Loading 7 events. -2020-04-08T14:43:48 | info | mongoose.js | Connected to the database. -2020-04-08T14:43:50 | info | index.js | Loading 5 commands. -2020-04-08T14:43:50 | info | index.js | Loading 7 events. -2020-04-08T14:43:50 | info | mongoose.js | Connected to the database. -2020-04-08T14:43:57 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-08T14:43:57 | log | message.js | Command ran: ship -2020-04-08T14:44:25 | info | index.js | Loading 5 commands. -2020-04-08T14:44:25 | info | index.js | Loading 7 events. -2020-04-08T14:44:25 | info | mongoose.js | Connected to the database. -2020-04-08T14:44:27 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-08T14:44:30 | log | message.js | Command ran: ship -2020-04-08T14:45:28 | info | index.js | Loading 5 commands. -2020-04-08T14:45:28 | info | index.js | Loading 7 events. -2020-04-08T14:45:28 | info | mongoose.js | Connected to the database. -2020-04-08T14:45:31 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-08T14:45:32 | log | message.js | Command ran: ship -2020-04-08T14:45:47 | info | index.js | Loading 5 commands. -2020-04-08T14:45:47 | info | index.js | Loading 7 events. -2020-04-08T14:45:47 | info | mongoose.js | Connected to the database. -2020-04-08T14:45:50 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-08T14:45:53 | log | message.js | Command ran: ship -2020-04-08T14:46:04 | info | index.js | Loading 5 commands. -2020-04-08T14:46:04 | info | index.js | Loading 7 events. -2020-04-08T14:46:04 | info | mongoose.js | Connected to the database. -2020-04-08T14:46:06 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-08T14:46:07 | log | message.js | Command ran: ship -2020-04-08T14:46:22 | info | index.js | Loading 5 commands. -2020-04-08T14:46:22 | info | index.js | Loading 7 events. -2020-04-08T14:46:22 | info | mongoose.js | Connected to the database. -2020-04-08T14:46:24 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-08T14:46:26 | log | message.js | Command ran: ship -2020-04-08T14:46:54 | info | index.js | Loading 5 commands. -2020-04-08T14:46:54 | info | index.js | Loading 7 events. -2020-04-08T14:46:55 | info | mongoose.js | Connected to the database. -2020-04-08T14:46:57 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-08T14:47:00 | log | message.js | Command ran: ship -2020-04-08T14:47:14 | info | index.js | Loading 5 commands. -2020-04-08T14:47:14 | info | index.js | Loading 7 events. -2020-04-08T14:47:15 | info | mongoose.js | Connected to the database. -2020-04-08T14:47:16 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-08T14:47:21 | log | message.js | Command ran: ship -2020-04-08T14:47:46 | info | index.js | Loading 5 commands. -2020-04-08T14:47:46 | info | index.js | Loading 7 events. -2020-04-08T14:47:46 | info | mongoose.js | Connected to the database. -2020-04-08T14:47:48 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-08T14:47:52 | log | message.js | Command ran: ship -2020-04-08T14:48:09 | info | index.js | Loading 5 commands. -2020-04-08T14:48:09 | info | index.js | Loading 7 events. -2020-04-08T14:48:09 | info | mongoose.js | Connected to the database. -2020-04-08T14:48:11 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-08T14:48:13 | log | message.js | Command ran: ship -2020-04-08T14:48:42 | info | index.js | Loading 5 commands. -2020-04-08T14:48:42 | info | index.js | Loading 7 events. -2020-04-08T14:48:42 | info | mongoose.js | Connected to the database. -2020-04-08T14:48:45 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-08T14:48:46 | log | message.js | Command ran: ship -2020-04-08T14:51:13 | info | index.js | Loading 5 commands. -2020-04-08T14:51:13 | info | index.js | Loading 7 events. -2020-04-08T14:51:13 | info | mongoose.js | Connected to the database. -2020-04-08T14:51:15 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-08T14:51:16 | info | index.js | Loading 5 commands. -2020-04-08T14:51:16 | info | index.js | Loading 7 events. -2020-04-08T14:51:16 | info | mongoose.js | Connected to the database. -2020-04-08T14:51:25 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-08T14:51:36 | log | message.js | Command ran: ship -2020-04-08T14:53:16 | info | index.js | Loading 5 commands. -2020-04-08T14:53:16 | info | index.js | Loading 7 events. -2020-04-08T14:53:16 | info | mongoose.js | Connected to the database. -2020-04-08T14:53:18 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-08T14:53:25 | log | message.js | Command ran: ship -2020-04-08T14:53:25 | error | _functions.js | Unhandled rejection: ReferenceError: lastName is not defined -2020-04-08T14:53:29 | log | message.js | Command ran: ship -2020-04-08T14:53:29 | error | _functions.js | Unhandled rejection: ReferenceError: lastName is not defined -2020-04-08T14:53:38 | info | index.js | Loading 5 commands. -2020-04-08T14:53:38 | info | index.js | Loading 7 events. -2020-04-08T14:53:38 | info | mongoose.js | Connected to the database. -2020-04-08T14:53:40 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-08T14:53:45 | log | message.js | Command ran: ship -2020-04-08T14:54:33 | info | index.js | Loading 5 commands. -2020-04-08T14:54:33 | info | index.js | Loading 7 events. -2020-04-08T14:54:33 | error | index.js | Failed to load ship.js: SyntaxError: Unexpected end of input -2020-04-08T14:54:33 | info | mongoose.js | Connected to the database. -2020-04-08T14:54:36 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-08T14:55:08 | info | index.js | Loading 5 commands. -2020-04-08T14:55:08 | info | index.js | Loading 7 events. -2020-04-08T14:55:08 | info | mongoose.js | Connected to the database. -2020-04-08T14:55:10 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-08T14:55:11 | log | message.js | Command ran: ship -2020-04-08T14:55:23 | info | index.js | Loading 5 commands. -2020-04-08T14:55:23 | info | index.js | Loading 7 events. -2020-04-08T14:55:23 | info | mongoose.js | Connected to the database. -2020-04-08T14:55:26 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-08T14:55:30 | log | message.js | Command ran: ship -2020-04-08T14:55:47 | info | index.js | Loading 7 events. -2020-04-08T14:55:47 | info | index.js | Loading 5 commands. -2020-04-08T14:55:47 | info | mongoose.js | Connected to the database. -2020-04-08T14:55:49 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-08T14:55:51 | log | message.js | Command ran: ship -2020-04-08T14:56:00 | info | index.js | Loading 5 commands. -2020-04-08T14:56:00 | info | index.js | Loading 7 events. -2020-04-08T14:56:00 | info | mongoose.js | Connected to the database. -2020-04-08T14:56:02 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-08T14:56:04 | log | message.js | Command ran: ship -2020-04-08T14:56:08 | log | message.js | Command ran: ship -2020-04-08T14:56:16 | info | index.js | Loading 5 commands. -2020-04-08T14:56:16 | info | index.js | Loading 7 events. -2020-04-08T14:56:16 | info | mongoose.js | Connected to the database. -2020-04-08T14:56:19 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-08T14:56:31 | info | index.js | Loading 5 commands. -2020-04-08T14:56:31 | info | index.js | Loading 7 events. -2020-04-08T14:56:31 | info | mongoose.js | Connected to the database. -2020-04-08T14:56:34 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-08T14:56:35 | log | message.js | Command ran: ship -2020-04-08T14:57:00 | info | index.js | Loading 5 commands. -2020-04-08T14:57:00 | info | index.js | Loading 7 events. -2020-04-08T14:57:00 | info | mongoose.js | Connected to the database. -2020-04-08T14:57:02 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-08T14:57:03 | log | message.js | Command ran: ship -2020-04-08T14:57:24 | info | index.js | Loading 5 commands. -2020-04-08T14:57:24 | info | index.js | Loading 7 events. -2020-04-08T14:57:24 | info | mongoose.js | Connected to the database. -2020-04-08T14:57:26 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-08T14:57:27 | log | message.js | Command ran: ship -2020-04-08T14:57:35 | info | index.js | Loading 5 commands. -2020-04-08T14:57:35 | info | index.js | Loading 7 events. -2020-04-08T14:57:35 | info | mongoose.js | Connected to the database. -2020-04-08T14:57:37 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-08T14:57:39 | log | message.js | Command ran: ship -2020-04-08T15:00:56 | log | message.js | Command ran: help -2020-04-08T15:01:25 | log | message.js | Command ran: help -2020-04-08T15:28:24 | log | message.js | Command ran: help -2020-04-08T16:21:07 | log | message.js | Command ran: ship -2020-04-08T16:22:30 | log | message.js | Command ran: ship -2020-04-08T16:32:55 | log | message.js | Command ran: help -2020-04-08T16:33:00 | log | message.js | Command ran: help -2020-04-08T16:34:45 | info | index.js | Loading 5 commands. -2020-04-08T16:34:45 | info | index.js | Loading 7 events. -2020-04-08T16:34:45 | info | mongoose.js | Connected to the database. -2020-04-08T16:34:47 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-08T16:34:49 | log | message.js | Command ran: help -2020-04-08T16:34:52 | log | message.js | Command ran: help -2020-04-08T16:34:52 | error | _functions.js | Unhandled rejection: TypeError: Cannot read property 'length' of undefined -2020-04-08T16:35:18 | log | message.js | Command ran: eval -2020-04-08T16:35:51 | log | message.js | Command ran: help -2020-04-08T16:35:51 | error | _functions.js | Unhandled rejection: TypeError: Cannot read property 'length' of undefined -2020-04-08T16:36:00 | log | message.js | Command ran: help -2020-04-08T16:36:52 | info | index.js | Loading 5 commands. -2020-04-08T16:36:52 | info | index.js | Loading 7 events. -2020-04-08T16:36:52 | info | mongoose.js | Connected to the database. -2020-04-08T16:36:58 | info | index.js | Loading 5 commands. -2020-04-08T16:36:58 | info | index.js | Loading 7 events. -2020-04-08T16:36:58 | info | mongoose.js | Connected to the database. -2020-04-08T16:37:00 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-08T16:37:05 | log | message.js | Command ran: help -2020-04-08T16:37:05 | error | _functions.js | Unhandled rejection: RangeError [EMBED_FIELD_VALUE]: MessageEmbed field values may not be empty. -2020-04-08T16:40:22 | error | _functions.js | Unhandled rejection: RangeError [EMBED_FIELD_VALUE]: MessageEmbed field values may not be empty. -2020-04-08T16:39:01 | log | message.js | Command ran: help -2020-04-08T16:40:22 | log | message.js | Command ran: help -2020-04-08T16:40:22 | error | _functions.js | Unhandled rejection: RangeError [EMBED_FIELD_VALUE]: MessageEmbed field values may not be empty. -2020-04-08T16:40:23 | info | index.js | Loading 5 commands. -2020-04-08T16:40:23 | info | index.js | Loading 7 events. -2020-04-08T16:40:23 | info | mongoose.js | Connected to the database. -2020-04-08T16:40:25 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-08T16:40:28 | log | message.js | Command ran: help -2020-04-08T16:42:03 | info | index.js | Loading 5 commands. -2020-04-08T16:42:03 | info | index.js | Loading 7 events. -2020-04-08T16:42:03 | info | mongoose.js | Connected to the database. -2020-04-08T16:42:05 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-08T16:42:06 | log | message.js | Command ran: help -2020-04-08T16:42:46 | info | index.js | Loading 5 commands. -2020-04-08T16:42:46 | info | index.js | Loading 7 events. -2020-04-08T16:42:46 | info | mongoose.js | Connected to the database. -2020-04-08T16:42:48 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-08T16:42:50 | log | message.js | Command ran: help -2020-04-08T16:44:42 | info | index.js | Loading 5 commands. -2020-04-08T16:44:42 | info | index.js | Loading 7 events. -2020-04-08T16:44:42 | info | mongoose.js | Connected to the database. -2020-04-08T16:44:44 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-08T16:48:03 | info | index.js | Loading 5 commands. -2020-04-08T16:48:03 | info | index.js | Loading 7 events. -2020-04-08T16:48:03 | info | mongoose.js | Connected to the database. -2020-04-08T16:48:07 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-08T16:48:07 | log | message.js | Command ran: help -2020-04-08T16:48:38 | info | index.js | Loading 5 commands. -2020-04-08T16:48:38 | info | index.js | Loading 7 events. -2020-04-08T16:48:38 | info | mongoose.js | Connected to the database. -2020-04-08T16:48:40 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-08T16:48:43 | log | message.js | Command ran: help -2020-04-08T16:48:54 | info | index.js | Loading 5 commands. -2020-04-08T16:48:54 | info | index.js | Loading 7 events. -2020-04-08T16:48:54 | info | mongoose.js | Connected to the database. -2020-04-08T16:48:56 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-08T16:48:59 | info | index.js | Loading 5 commands. -2020-04-08T16:48:59 | info | index.js | Loading 7 events. -2020-04-08T16:48:59 | info | mongoose.js | Connected to the database. -2020-04-08T16:49:01 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-08T16:49:04 | log | message.js | Command ran: help -2020-04-08T16:49:11 | info | index.js | Loading 5 commands. -2020-04-08T16:49:11 | info | index.js | Loading 7 events. -2020-04-08T16:49:11 | info | mongoose.js | Connected to the database. -2020-04-08T16:49:13 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-08T16:50:20 | info | index.js | Loading 7 events. -2020-04-08T16:50:20 | info | index.js | Loading 5 commands. -2020-04-08T16:50:20 | error | index.js | Failed to load help.js: SyntaxError: missing ) after argument list -2020-04-08T16:50:20 | info | mongoose.js | Connected to the database. -2020-04-08T16:50:23 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-08T16:50:31 | info | index.js | Loading 5 commands. -2020-04-08T16:50:31 | info | index.js | Loading 7 events. -2020-04-08T16:50:31 | info | mongoose.js | Connected to the database. -2020-04-08T16:50:33 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-08T16:50:34 | log | message.js | Command ran: help -2020-04-08T16:51:51 | log | message.js | Command ran: help -2020-04-08T16:52:21 | info | index.js | Loading 5 commands. -2020-04-08T16:52:21 | info | index.js | Loading 7 events. -2020-04-08T16:52:21 | info | mongoose.js | Connected to the database. -2020-04-08T16:52:25 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-08T16:52:26 | log | message.js | Command ran: help -2020-04-08T16:59:20 | info | index.js | Loading 5 commands. -2020-04-08T16:59:20 | info | index.js | Loading 7 events. -2020-04-08T16:59:20 | info | mongoose.js | Connected to the database. -2020-04-08T16:59:23 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-08T16:59:24 | log | message.js | Command ran: help -2020-04-08T17:00:14 | info | index.js | Loading 5 commands. -2020-04-08T17:00:14 | info | index.js | Loading 7 events. -2020-04-08T17:00:14 | info | mongoose.js | Connected to the database. -2020-04-08T17:00:16 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-08T17:00:16 | log | message.js | Command ran: help -2020-04-08T17:01:24 | info | index.js | Loading 5 commands. -2020-04-08T17:01:24 | info | index.js | Loading 7 events. -2020-04-08T17:01:24 | info | mongoose.js | Connected to the database. -2020-04-08T17:01:26 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-08T17:01:31 | log | message.js | Command ran: help -2020-04-08T17:05:01 | info | index.js | Loading 5 commands. -2020-04-08T17:05:01 | info | index.js | Loading 7 events. -2020-04-08T17:05:01 | info | mongoose.js | Connected to the database. -2020-04-08T17:05:03 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-08T17:05:05 | log | message.js | Command ran: help -2020-04-08T17:13:28 | info | index.js | Loading 5 commands. -2020-04-08T17:13:28 | error | index.js | Failed to load help.js: SyntaxError: missing ) after argument list -2020-04-08T17:13:28 | info | index.js | Loading 7 events. -2020-04-08T17:13:28 | info | mongoose.js | Connected to the database. -2020-04-08T17:13:30 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-08T17:14:21 | info | index.js | Loading 5 commands. -2020-04-08T17:14:21 | info | index.js | Loading 7 events. -2020-04-08T17:14:21 | info | mongoose.js | Connected to the database. -2020-04-08T17:14:24 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-08T17:14:40 | info | index.js | Loading 5 commands. -2020-04-08T17:14:40 | info | index.js | Loading 7 events. -2020-04-08T17:14:40 | info | mongoose.js | Connected to the database. -2020-04-08T17:14:42 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-08T17:14:42 | log | message.js | Command ran: help -2020-04-08T17:15:15 | info | index.js | Loading 5 commands. -2020-04-08T17:15:15 | info | index.js | Loading 7 events. -2020-04-08T17:15:15 | info | mongoose.js | Connected to the database. -2020-04-08T17:15:18 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-08T17:15:18 | log | message.js | Command ran: help -2020-04-08T17:21:36 | info | index.js | Loading 5 commands. -2020-04-08T17:21:36 | info | index.js | Loading 7 events. -2020-04-08T17:21:36 | info | mongoose.js | Connected to the database. -2020-04-08T17:21:38 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-08T17:21:43 | log | message.js | Command ran: help -2020-04-08T17:22:33 | info | index.js | Loading 5 commands. -2020-04-08T17:22:33 | info | index.js | Loading 7 events. -2020-04-08T17:22:33 | info | mongoose.js | Connected to the database. -2020-04-08T17:22:36 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-08T17:22:47 | log | message.js | Command ran: help -2020-04-08T17:22:57 | log | message.js | Command ran: help -2020-04-08T17:22:57 | error | _functions.js | Unhandled rejection: TypeError: Cannot read property 'length' of undefined - at Object.exports.run (C:\Users\Emily\Desktop\woomy stuff\woomy\commands\help.js:92:25) - at module.exports (C:\Users\Emily\Desktop\woomy stuff\woomy\events\message.js:103:7) - at processTicksAndRejections (internal/process/task_queues.js:94:5) -2020-04-08T17:23:34 | info | index.js | Loading 5 commands. -2020-04-08T17:23:34 | info | index.js | Loading 7 events. -2020-04-08T17:23:34 | info | mongoose.js | Connected to the database. -2020-04-08T17:23:36 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-08T17:23:38 | info | index.js | Loading 5 commands. -2020-04-08T17:23:38 | info | index.js | Loading 7 events. -2020-04-08T17:23:38 | info | mongoose.js | Connected to the database. -2020-04-08T17:23:42 | info | index.js | Loading 5 commands. -2020-04-08T17:23:42 | info | index.js | Loading 7 events. -2020-04-08T17:23:42 | info | mongoose.js | Connected to the database. -2020-04-08T17:23:45 | info | index.js | Loading 5 commands. -2020-04-08T17:23:45 | info | index.js | Loading 7 events. -2020-04-08T17:23:45 | info | mongoose.js | Connected to the database. -2020-04-08T17:23:55 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-08T17:39:03 | log | message.js | Command ran: help -2020-04-08T17:40:29 | log | message.js | Command ran: help -2020-04-08T17:49:01 | info | index.js | Loading 7 events. -2020-04-08T17:49:01 | info | index.js | Loading 5 commands. -2020-04-08T17:49:01 | info | mongoose.js | Connected to the database. -2020-04-08T17:49:04 | info | index.js | Loading 5 commands. -2020-04-08T17:49:04 | info | index.js | Loading 7 events. -2020-04-08T17:49:05 | info | mongoose.js | Connected to the database. -2020-04-08T17:49:07 | info | index.js | Loading 5 commands. -2020-04-08T17:49:07 | info | index.js | Loading 7 events. -2020-04-08T17:49:08 | info | index.js | Loading 5 commands. -2020-04-08T17:49:08 | info | index.js | Loading 7 events. -2020-04-08T17:49:08 | info | mongoose.js | Connected to the database. -2020-04-08T17:49:10 | info | index.js | Loading 5 commands. -2020-04-08T17:49:10 | info | index.js | Loading 7 events. -2020-04-08T17:49:10 | info | mongoose.js | Connected to the database. -2020-04-08T17:49:12 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-08T17:56:05 | log | message.js | Command ran: help -2020-04-08T17:58:34 | log | message.js | Command ran: help -2020-04-08T17:59:37 | log | message.js | Command ran: help -2020-04-08T17:59:41 | log | message.js | Command ran: help -2020-04-08T18:00:33 | log | message.js | Command ran: ship -2020-04-08T19:28:29 | info | index.js | Loading 5 commands. -2020-04-08T19:28:29 | info | index.js | Loading 7 events. -2020-04-08T19:28:29 | info | mongoose.js | Connected to the database. -2020-04-08T19:28:31 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-08T19:28:36 | info | index.js | Loading 5 commands. -2020-04-08T19:28:36 | info | index.js | Loading 7 events. -2020-04-08T19:28:36 | info | mongoose.js | Connected to the database. -2020-04-08T19:28:37 | info | index.js | Loading 5 commands. -2020-04-08T19:28:37 | info | index.js | Loading 7 events. -2020-04-08T19:28:37 | info | mongoose.js | Connected to the database. -2020-04-08T19:28:40 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-08T19:28:40 | log | message.js | Command ran: help -2020-04-08T19:29:04 | info | index.js | Loading 5 commands. -2020-04-08T19:29:04 | info | index.js | Loading 7 events. -2020-04-08T19:29:04 | info | mongoose.js | Connected to the database. -2020-04-08T19:29:06 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-08T19:29:14 | log | message.js | Command ran: help -2020-04-08T19:29:24 | info | index.js | Loading 5 commands. -2020-04-08T19:29:24 | info | index.js | Loading 7 events. -2020-04-08T19:29:24 | info | mongoose.js | Connected to the database. -2020-04-08T19:29:26 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-08T19:29:28 | log | message.js | Command ran: help -2020-04-08T19:29:41 | info | index.js | Loading 5 commands. -2020-04-08T19:29:41 | info | index.js | Loading 7 events. -2020-04-08T19:29:41 | info | mongoose.js | Connected to the database. -2020-04-08T19:29:43 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-08T19:30:12 | info | index.js | Loading 5 commands. -2020-04-08T19:30:12 | info | index.js | Loading 7 events. -2020-04-08T19:30:12 | info | mongoose.js | Connected to the database. -2020-04-08T19:30:15 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-08T22:26:56 | info | index.js | Loading 5 commands. -2020-04-08T22:26:56 | info | index.js | Loading 7 events. -2020-04-08T22:26:56 | info | mongoose.js | Connected to the database. -2020-04-08T22:26:59 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-08T22:39:52 | log | message.js | Command ran: help -2020-04-08T22:40:35 | log | message.js | Command ran: help -2020-04-08T22:40:46 | log | message.js | Command ran: help -2020-04-08T22:40:52 | log | message.js | Command ran: help -2020-04-08T22:44:22 | info | index.js | Loading 5 commands. -2020-04-08T22:44:22 | info | index.js | Loading 7 events. -2020-04-08T22:44:23 | info | mongoose.js | Connected to the database. -2020-04-08T22:44:26 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-08T22:44:32 | log | message.js | Command ran: help -2020-04-08T22:44:37 | log | message.js | Command ran: help -2020-04-08T22:44:43 | log | message.js | Command ran: help -2020-04-08T22:49:00 | info | index.js | Loading 5 commands. -2020-04-08T22:49:00 | info | index.js | Loading 7 events. -2020-04-08T22:49:00 | info | mongoose.js | Connected to the database. -2020-04-08T22:49:03 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-08T22:49:03 | log | message.js | Command ran: help -2020-04-08T23:01:27 | info | index.js | Loading 5 commands. -2020-04-08T23:01:27 | info | index.js | Loading 7 events. -2020-04-08T23:01:27 | info | mongoose.js | Connected to the database. -2020-04-08T23:01:30 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-08T23:10:20 | info | index.js | Loading 5 commands. -2020-04-08T23:10:20 | info | index.js | Loading 7 events. -2020-04-08T23:10:20 | info | mongoose.js | Connected to the database. -2020-04-08T23:10:23 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-08T23:10:30 | log | message.js | Command ran: help -2020-04-08T23:10:44 | log | message.js | Command ran: help -2020-04-08T23:10:59 | info | index.js | Loading 5 commands. -2020-04-08T23:11:00 | info | index.js | Loading 7 events. -2020-04-08T23:11:00 | info | mongoose.js | Connected to the database. -2020-04-08T23:11:02 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-08T23:11:07 | log | message.js | Command ran: help -2020-04-08T23:13:14 | log | message.js | Command ran: help -2020-04-08T23:13:28 | info | index.js | Loading 5 commands. -2020-04-08T23:13:28 | info | index.js | Loading 7 events. -2020-04-08T23:13:28 | info | mongoose.js | Connected to the database. -2020-04-08T23:13:31 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-08T23:13:40 | info | index.js | Loading 5 commands. -2020-04-08T23:13:40 | info | index.js | Loading 7 events. -2020-04-08T23:13:40 | info | mongoose.js | Connected to the database. -2020-04-08T23:13:42 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-08T23:13:42 | log | message.js | Command ran: help -2020-04-08T23:13:46 | log | message.js | Command ran: help -2020-04-08T23:14:01 | info | index.js | Loading 5 commands. -2020-04-08T23:14:01 | info | index.js | Loading 7 events. -2020-04-08T23:14:02 | info | mongoose.js | Connected to the database. -2020-04-08T23:14:04 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-08T23:14:06 | log | message.js | Command ran: help -2020-04-08T23:14:39 | log | message.js | Command ran: help -2020-04-08T23:26:22 | info | index.js | Loading 5 commands. -2020-04-08T23:26:22 | info | index.js | Loading 7 events. -2020-04-08T23:26:22 | info | mongoose.js | Connected to the database. -2020-04-08T23:26:25 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-08T23:27:27 | info | index.js | Loading 5 commands. -2020-04-08T23:27:27 | info | index.js | Loading 7 events. -2020-04-08T23:27:27 | info | mongoose.js | Connected to the database. -2020-04-08T23:27:29 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-08T23:27:48 | log | message.js | Command ran: help -2020-04-08T23:28:53 | info | index.js | Loading 5 commands. -2020-04-08T23:28:53 | info | index.js | Loading 7 events. -2020-04-08T23:28:53 | info | mongoose.js | Connected to the database. -2020-04-08T23:28:56 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-08T23:28:56 | log | message.js | Command ran: help -2020-04-08T23:29:12 | info | index.js | Loading 5 commands. -2020-04-08T23:29:12 | info | index.js | Loading 7 events. -2020-04-08T23:29:12 | info | mongoose.js | Connected to the database. -2020-04-08T23:29:14 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-08T23:29:34 | info | index.js | Loading 5 commands. -2020-04-08T23:29:34 | info | index.js | Loading 7 events. -2020-04-08T23:29:34 | info | mongoose.js | Connected to the database. -2020-04-08T23:29:37 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-08T23:29:37 | log | message.js | Command ran: help -2020-04-08T23:30:14 | info | index.js | Loading 5 commands. -2020-04-08T23:30:14 | info | index.js | Loading 7 events. -2020-04-08T23:30:14 | info | mongoose.js | Connected to the database. -2020-04-08T23:30:16 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-08T23:30:18 | log | message.js | Command ran: help -2020-04-08T23:30:32 | info | index.js | Loading 5 commands. -2020-04-08T23:30:32 | info | index.js | Loading 7 events. -2020-04-08T23:30:32 | info | mongoose.js | Connected to the database. -2020-04-08T23:30:34 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-08T23:30:38 | log | message.js | Command ran: help -2020-04-08T23:34:18 | info | index.js | Loading 5 commands. -2020-04-08T23:34:18 | info | index.js | Loading 7 events. -2020-04-08T23:34:18 | info | mongoose.js | Connected to the database. -2020-04-08T23:34:21 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-08T23:34:23 | log | message.js | Command ran: help -2020-04-08T23:34:30 | log | message.js | Command ran: help -2020-04-08T23:35:00 | log | message.js | Command ran: help -2020-04-08T23:35:24 | info | index.js | Loading 5 commands. -2020-04-08T23:35:24 | info | index.js | Loading 7 events. -2020-04-08T23:35:24 | info | mongoose.js | Connected to the database. -2020-04-08T23:35:26 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-08T23:35:38 | info | index.js | Loading 5 commands. -2020-04-08T23:35:38 | info | index.js | Loading 7 events. -2020-04-08T23:35:38 | info | mongoose.js | Connected to the database. -2020-04-08T23:35:41 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-08T23:35:41 | log | message.js | Command ran: help -2020-04-08T23:39:05 | info | index.js | Loading 5 commands. -2020-04-08T23:39:05 | info | index.js | Loading 7 events. -2020-04-08T23:39:05 | info | mongoose.js | Connected to the database. -2020-04-08T23:39:07 | ready | ready.js | Connected to Discord as WoomyDev#4547 -2020-04-08T23:39:15 | log | message.js | Command ran: help -2020-04-09T00:06:52 | info | index.js | Loading 5 commands. -2020-04-09T00:06:52 | info | index.js | Loading 7 events. -2020-04-09T00:06:53 | info | mongoose.js | Connected to the database. -2020-04-09T00:06:56 | ready | ready.js | Connected to Discord as WoomyDev#4547 From cba41dfab4ca4b57ed8726dff2d3b852efc37d5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Hor=C3=A1=C4=8Dek?= Date: Wed, 8 Apr 2020 21:53:29 +0200 Subject: [PATCH 053/156] add log to gitignore --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 0d63826..90288e3 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,5 @@ .env *config.js node_modules -data/enmap* \ No newline at end of file +data/enmap* +file.log \ No newline at end of file From 33821715f2f312e82ea87ccf12709490da4578a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Hor=C3=A1=C4=8Dek?= Date: Thu, 9 Apr 2020 09:05:44 +0200 Subject: [PATCH 054/156] fix support --- commands/support.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/commands/support.js b/commands/support.js index 7042430..4c24c1b 100644 --- a/commands/support.js +++ b/commands/support.js @@ -9,10 +9,10 @@ exports.conf = { exports.help = { name: 'support', category: 'Utility', - description: "Sends a link to " + client.config.botName + "'s support/development server.", + description: "Sends a link to my support/development server.", usage: 'support' }; -exports.run = async (client, message, args) =>{ +exports.run = async (client, message, args, level, data) =>{ message.channel.send('Use this link to join my support server: https://discord.gg/' + client.config.support.id); }; \ No newline at end of file From 019b8a03e4054f559cac23ce73fa119442075732 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Hor=C3=A1=C4=8Dek?= Date: Thu, 9 Apr 2020 09:06:12 +0200 Subject: [PATCH 055/156] use strict + login error handling --- index.js | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/index.js b/index.js index 353a155..a78b781 100644 --- a/index.js +++ b/index.js @@ -1,6 +1,8 @@ // Woomy version 2 // Copyright 2020 mudkipscience +'use strict' + // Check node.js version if (Number(process.version.slice(1).split('.')[0]) < 12) { console.log('NodeJS 12.0.0 or higher is required. Please update NodeJS on your system.') @@ -107,10 +109,16 @@ const init = async () => { await client.db.init(client) // Login to Discord + function failedToLogin(err) { + client.logger.error('Failed to login: ' + err); + + process.exit(0); + }; + if (client.devmode !== true) { - client.login(client.config.token) + client.login(client.config.token).catch(failedToLogin) } else { - client.login(client.config.token_dev) + client.login(client.config.token_dev).catch(failedToLogin) } } From 1b013581ded6119743f4dca50d2727fa4272b2f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Hor=C3=A1=C4=8Dek?= Date: Thu, 9 Apr 2020 09:54:18 +0200 Subject: [PATCH 056/156] music --- commands/play.js | 20 ++++++++++ helpers/music.js | 97 +++++++++++++++++++++++++++++++++++++++++++++++ package-lock.json | 6 +-- 3 files changed, 120 insertions(+), 3 deletions(-) create mode 100644 commands/play.js diff --git a/commands/play.js b/commands/play.js new file mode 100644 index 0000000..a091860 --- /dev/null +++ b/commands/play.js @@ -0,0 +1,20 @@ +exports.conf = { + enabled: true, + guildOnly: false, + aliases: [], + permLevel: 'User', + requiredPerms: [], + cooldown: 2000 +} + +exports.help = { + name: 'play', + category: 'Music', + description: 'Plays or adds to queue requested music.', + usage: 'play [query]', + params: '[query] - A query to find video by or a link to the video.' +} + +exports.run = async (client, message, args, level, data) => { + client.music.play(message, args[0]); +} \ No newline at end of file diff --git a/helpers/music.js b/helpers/music.js index 0d40e90..510e0be 100644 --- a/helpers/music.js +++ b/helpers/music.js @@ -5,7 +5,12 @@ const getYoutubeId = require('get-youtube-id') const fetch = require('node-fetch') */ +const ytdl = require('ytdl-core-discord'); +const fetch = require('node-fetch'); + module.exports = client => { + client.music = {guilds: {}}; + // MUSIC - TIMESTAMP client.createTimestamp = function (duration) { var hrs = ~~(duration / 60 / 60) @@ -31,4 +36,96 @@ module.exports = client => { var time = hrs + min + ':' + sec return time } + + client.music.getGuild = function(id) { + let guild = client.music.guilds[id]; + + if(!guild) { + guild = {}; + + guild.dispatcher = null; + guild.playing = false; + guild.queue = []; + + client.music.guilds[id] = guild; + }; + + return guild; + }; + + client.music.isYouTubeLink = function(query) { + return query.startsWith('https://youtube.com/') || query.startsWith('http://youtube.com/') || query.startsWith('https://youtu.be/') || query.startswith('http://youtu.be/') || query.startsWith('https://m.youtube.com/') || query.startsWith('http://m.youtube.com/') || query.startsWith('https://www.youtube.com/') || query.startsWith('http://www.youtube.com/'); + }; + + client.music.getLinkFromID = function(id) { + return 'https://www.youtube.com/watch?v=' + id; + }; + + client.music.getVideoByQuery = async function(query) { + let isLink = client.music.isYouTubeLink(query); + + let response; + + if(isLink) { + response = await fetch('https://www.googleapis.com/youtube/v3/search?key=' + client.config.keys.yt + '&part=id,snippet&maxResults=1&id=' + id); + } else { + response = await fetch('https://www.googleapis.com/youtube/v3/search?key=' + client.config.keys.yt + '&part=id,snippet&maxResults=1&q=' + encodeURIComponent(query)); + }; + + let json = await response.json(); + + let parsed = JSON.parse(json); + + if(parsed.items) { + let video = parsed.items[0]; + + if(video) { + return video; + } else { + return false; + }; + } else { + return false; + }; + }; + + client.music.play = async function(message, query) { + let guild = client.music.getGuild(message.guild.id); + + if(!message.member.voice.channel && !guild.voiceChannel) { + return message.member.reply('you are not in a voice channel!'); + } + + let vc = message.member.voice.channel; + + let video = client.music.getVideoByQuery(query); + + if(video) { + // Fix the bot if somehow broken + // music "playing", nothing in queue + if((guild.playing || guild.dispatcher) && guild.queue.length == 0) { + guild.playing = false; + guild.dispatcher = null; + // music not playing, something is in queue + } else if(!guild.playing && !guild.dispatcher && guild.queue.length > 0) { + guild.queue = []; + }; + + // Add video to queue + guild.queue.push({video: video, requestedBy: message.member.id}); + + // Figure out if the bot should add it to queue or play it right now + if(guild.playing) { + + } else { + guild.playing = true; + + let connection = await vc.join(); + guild.dispatcher = connection.play(await ytdl(client.music.getLinkFromID(guild.queue[0].id.videoId)), {type: 'opus'}); + guild.dispatcher.setVolume(0.5); + }; + } else { + return message.member.reply('failed to find the video!'); + }; + }; } diff --git a/package-lock.json b/package-lock.json index 8447144..0ae0fc1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -276,9 +276,9 @@ "integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==" }, "@types/node": { - "version": "13.9.8", - "resolved": "https://registry.npmjs.org/@types/node/-/node-13.9.8.tgz", - "integrity": "sha512-1WgO8hsyHynlx7nhP1kr0OFzsgKz5XDQL+Lfc3b1Q3qIln/n8cKD4m09NJ0+P1Rq7Zgnc7N0+SsMnoD1rEb0kA==" + "version": "13.11.1", + "resolved": "https://registry.npmjs.org/@types/node/-/node-13.11.1.tgz", + "integrity": "sha512-eWQGP3qtxwL8FGneRrC5DwrJLGN4/dH1clNTuLfN81HCrxVtxRjygDTUoZJ5ASlDEeo0ppYFQjQIlXhtXpOn6g==" }, "abort-controller": { "version": "3.0.0", From 956f4132c704c912bd8db4bf2ff9561f73a8773a Mon Sep 17 00:00:00 2001 From: mudkipscience Date: Fri, 10 Apr 2020 12:57:04 +1000 Subject: [PATCH 057/156] Added pride and stuff --- commands/help.js | 9 ++++++--- commands/pride.js | 51 +++++++++++++++++++++++++++++++++++++++++++++++ index.js | 6 +++--- 3 files changed, 60 insertions(+), 6 deletions(-) create mode 100644 commands/pride.js diff --git a/commands/help.js b/commands/help.js index 3805e7e..f32dc9e 100644 --- a/commands/help.js +++ b/commands/help.js @@ -60,13 +60,13 @@ exports.run = (client, message, args, level, data) => { return message.channel.send('Command/alias doesn\'t exist') } - let desc = '' + let aliases if (cmd.conf.aliases.length > 0) { - desc += `*(Aliases: ${cmd.conf.aliases.join(', ')})*\n\n` + aliases = '`' + cmd.conf.aliases.join('`, `') + '`' } - desc += cmd.help.description + `\n\n**You need the \`${cmd.conf.permLevel}\` rank to run this command! This command has a cooldown of \`${cmd.conf.cooldown / 1000}\` seconds per user.**` + const desc = cmd.help.description + `\n\n**You need the \`${cmd.conf.permLevel}\` rank to run this command! This command has a cooldown of \`${cmd.conf.cooldown / 1000}\` seconds per user.**` embed.setTitle(cmd.help.category.toLowerCase() + ':' + cmd.help.name) embed.setDescription(desc) @@ -74,6 +74,9 @@ exports.run = (client, message, args, level, data) => { if (cmd.help.examples.length > 0) { embed.addField('**Examples**', cmd.help.examples) } + if (aliases) { + embed.addField('**Aliases**', aliases) + } embed.setFooter('< > = optional, [ ] = required. Don\'t include the brackets in the command itself!') message.channel.send(embed) } diff --git a/commands/pride.js b/commands/pride.js new file mode 100644 index 0000000..e4a6220 --- /dev/null +++ b/commands/pride.js @@ -0,0 +1,51 @@ +const url = 'https://demirramon.com/gen/pride.png' +const Discord = require('discord.js') +exports.run = (client, message, args) => { + const flag = args[0].toLowerCase() + if (!flag) { + return message.channel.send( + `<:error:466995152976871434> No message provided. Usage: \`${client.commands.get('pride').help.usage}\`` + ) + } + + const available = ['lesbian', 'gay', 'bisexual', 'pansexual', 'trans', 'asexual', 'aromantic', 'ally'] + + if (!available.includes(flag)) { + return message.channel.send(`This flag isn't available. Available flags: \`${available.join('`, `')}\``) + } + + let gradient = 'false' + if (message.flags.includes('g')) { + gradient = 'true' + } + + message.channel.startTyping() + + const params = `image=${message.author.avatarURL({ format: 'png', size: 2048 })}&flag=${flag}&full=true&gradient=${gradient}&background=false&fit=true&v=2019-08-07` + + try { + message.channel.stopTyping() + message.channel.send({ files: [new Discord.MessageAttachment(url + '?' + params)] }) + } catch (err) { + message.channel.stopTyping() + message.channel.send(`<:error:466995152976871434> Error when generating image: \`${err}\``) + } +} + +exports.conf = { + enabled: true, + guildOnly: false, + aliases: [], + permLevel: 'User', + requiredPerms: ['ATTACH_FILES'], + cooldown: 20000 +} + +exports.help = { + name: 'pride', + category: 'Fun', + description: 'Adds a pride flag ring to your avatar. Available flags are lesbian, gay, bisexual, pansexual, trans, asexual, aromantic and ally. Generator created by [Demirramon.](https://demirramon.com/)', + usage: '`pride [flag]` - Adds a pride flag overlay to your avatar.\n`pride [flag] -g` - Adds a pride flag gradient on your avatar.', + flags: '`-g` - Makes the overlay a gradient.', + examples: '`pride trans`\n`pride lesbian -g`' +} diff --git a/index.js b/index.js index a78b781..9b462bb 100644 --- a/index.js +++ b/index.js @@ -109,10 +109,10 @@ const init = async () => { await client.db.init(client) // Login to Discord - function failedToLogin(err) { - client.logger.error('Failed to login: ' + err); + function failedToLogin (err) { + client.logger.error('Failed to login: ' + err) - process.exit(0); + process.exit(0) }; if (client.devmode !== true) { From 2e85c85d3c6d6b10cc35ab6664e4593d2266f915 Mon Sep 17 00:00:00 2001 From: mudkipscience Date: Fri, 10 Apr 2020 19:29:08 +1000 Subject: [PATCH 058/156] idk --- commands/pride.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/commands/pride.js b/commands/pride.js index e4a6220..21d2232 100644 --- a/commands/pride.js +++ b/commands/pride.js @@ -35,7 +35,7 @@ exports.run = (client, message, args) => { exports.conf = { enabled: true, guildOnly: false, - aliases: [], + aliases: ['flag'], permLevel: 'User', requiredPerms: ['ATTACH_FILES'], cooldown: 20000 @@ -45,7 +45,7 @@ exports.help = { name: 'pride', category: 'Fun', description: 'Adds a pride flag ring to your avatar. Available flags are lesbian, gay, bisexual, pansexual, trans, asexual, aromantic and ally. Generator created by [Demirramon.](https://demirramon.com/)', - usage: '`pride [flag]` - Adds a pride flag overlay to your avatar.\n`pride [flag] -g` - Adds a pride flag gradient on your avatar.', flags: '`-g` - Makes the overlay a gradient.', + usage: '`pride [flag]` - Adds a pride flag overlay to your avatar.\n`pride [flag] -g` - Adds a pride flag gradient on your avatar.', examples: '`pride trans`\n`pride lesbian -g`' } From ba0448c9058d4e30307bd1187a91a739d327b91d Mon Sep 17 00:00:00 2001 From: mudkipscience Date: Sat, 11 Apr 2020 19:30:51 +1000 Subject: [PATCH 059/156] Did lots of things --- commands/avatar.js | 39 ------------------------------- commands/emoji.js | 2 +- commands/eval.js | 3 ++- commands/help.js | 54 +++++++++++++++++++++++-------------------- commands/invite.js | 20 ++++++++++++++++ commands/level.js | 2 +- commands/ping.js | 2 +- commands/pride.js | 47 ++++++++++++++++++------------------- commands/ship.js | 15 ++++++++---- commands/support.js | 30 +++++++++++++----------- helpers/_functions.js | 13 +++++++++++ 11 files changed, 115 insertions(+), 112 deletions(-) delete mode 100644 commands/avatar.js create mode 100644 commands/invite.js diff --git a/commands/avatar.js b/commands/avatar.js deleted file mode 100644 index 6288ca5..0000000 --- a/commands/avatar.js +++ /dev/null @@ -1,39 +0,0 @@ -exports.conf = { - enabled: true, - guildOnly: false, - aliases: [], - permLevel: 'User', - requiredPerms: ['EMBED_LINKS'] -}; - -exports.help = { - name: 'avatar', - category: 'Utility', - description: 'Gives you the specified users avatar.', - usage: 'avatar ', - params: '' -}; - -exports.run = (client, message, args) => { - let user = message.mentions.users.first(); - let users; - if (!args[0] || !message.guild) { - user = message.author; - }; - - if (!user && message.guild) { - users = client.searchForMembers(message.guild, args[0]); - if (users.length > 1) { - return message.channel.send( - '<:error:466995152976871434> Found multiple users, please be more specific or mention the user instead.' - ); - } else if (users.length == 0) { - return message.channel.send( - "<:error:466995152976871434> That user doesn't seem to exist, try again!" - ); - }; - user = users[0]; - user = user.user; - } - message.channel.send(`**${user.tag}'s** avatar is: ${user.avatarURL({format: 'png', dynamic: true, size: 2048})}`); -}; \ No newline at end of file diff --git a/commands/emoji.js b/commands/emoji.js index b95bbea..b42bc56 100644 --- a/commands/emoji.js +++ b/commands/emoji.js @@ -11,7 +11,7 @@ exports.help = { category: 'Utility', description: 'Enlarges and links an custom emoji', usage: 'emoji [emoji]', - params: '`[emoji] - Discord emoji you want to enlarge.' + params: '`[emoji] - Custom emoji you want to enlarge.' }; exports.run = async (client, message, args) => { diff --git a/commands/eval.js b/commands/eval.js index b3efc82..e7f6684 100644 --- a/commands/eval.js +++ b/commands/eval.js @@ -44,6 +44,7 @@ exports.run = async (client, message, args, level, data) => { return } - message.channel.send(`\`ERROR\` \`\`\`xl\n${await errclean}\n\`\`\``) + message.author.send(`\`ERROR\` \`\`\`xl\n${await errclean}\n\`\`\``) + message.react('⚠️') } } diff --git a/commands/help.js b/commands/help.js index f32dc9e..0231028 100644 --- a/commands/help.js +++ b/commands/help.js @@ -1,7 +1,7 @@ exports.conf = { enabled: true, guildOnly: false, - aliases: ['commands', 'cmds', 'halp'], + aliases: ['commands', 'cmds'], permLevel: 'User', requiredPerms: ['EMBED_LINKS'], cooldown: 2000 @@ -9,10 +9,10 @@ exports.conf = { exports.help = { name: 'help', - category: 'General', - description: 'Sends you a list of Woomy\'s commands.', - usage: '`help` - Lists all commands.\n`help ` - Receive more information on a command.', - examples: '`help`\n`help roleinfo`' + category: 'Bot', + description: 'Lists all commands Woomy has, what they do, and how to use them.', + usage: '`help` - Lists all commands.\n`help ` - Show detailed information on how to use the specified command.', + parameters: '`command` - The name of the command you want more information on.' } const Discord = require('discord.js') @@ -20,17 +20,21 @@ exports.run = (client, message, args, level, data) => { const embed = new Discord.MessageEmbed() embed.setColor(client.embedColour(message.guild)) - const prefixes = [data.user.prefix] - if (message.guild && data.user.prefix !== data.guild.prefix) { - prefixes.push(data.guild.prefix) - } - prefixes.push('@Woomy') - - const categories = [] - if (!args[0]) { - embed.setTitle('Woomy Commands') - embed.setDescription(`• Prefixes: ${'`' + prefixes.join('`, `') + '`'}\n• Use \`help \` to recieve more information about a command!\n• [Join my support server](https://discord.gg/HCF8mdv)`) + const categories = [] + let uPrefix = '`' + data.user.prefix + '`' + let gPrefix = '`' + data.guild.prefix + '`' + + if (client.config.defaultPrefix === data.user.prefix) { + uPrefix = 'None set, use: `~myprefix' + } + + if (client.config.defaultPrefix === data.guild.prefix) { + gPrefix = 'None set, use: `~prefix`' + } + + embed.setTitle('Woomy Help') + embed.setDescription(`**Prefixes**\n» Default: \`${client.config.defaultPrefix}\`\n» Server: ${gPrefix}\n» Personal: ${uPrefix}\n\n» [Join my discord server](https://discord.gg/HCF8mdv) if you need help!\n» Use \`help \` to recieve more information about a command!`) const commands = client.commands commands.forEach((cmd) => { @@ -44,14 +48,13 @@ exports.run = (client, message, args, level, data) => { categories.sort().forEach((cat) => { const filtered = commands.filter((cmd) => cmd.help.category === cat) - embed.addField(cat, filtered.map((cmd) => '`' + cmd.help.name + '`').join(', ')) + embed.addField('**' + cat + '**', filtered.map((cmd) => '`' + cmd.help.name + '`').join(', '), true) }) if (message.guild && data.guild.customCommands.length > 0) { - embed.addField('Custom', data.guild.customCommands.map((cmd) => '`' + cmd.name + '`').join(' ')) + embed.addField('**Custom**', data.guild.customCommands.map((cmd) => '`' + cmd.name + '`').join(' '), true) } - embed.addField('Invite', '[Invite](https://discordapp.com/oauth2/authorize?client_id=435961704145485835&permissions=8&scope=bot) | [Discord Server](https://discord.gg/HCF8mdv)') return message.channel.send(embed) } else { const command = args.shift().toLowerCase() @@ -60,23 +63,24 @@ exports.run = (client, message, args, level, data) => { return message.channel.send('Command/alias doesn\'t exist') } - let aliases + let aliases = '' if (cmd.conf.aliases.length > 0) { aliases = '`' + cmd.conf.aliases.join('`, `') + '`' } - const desc = cmd.help.description + `\n\n**You need the \`${cmd.conf.permLevel}\` rank to run this command! This command has a cooldown of \`${cmd.conf.cooldown / 1000}\` seconds per user.**` - embed.setTitle(cmd.help.category.toLowerCase() + ':' + cmd.help.name) - embed.setDescription(desc) + embed.setDescription(cmd.help.description) embed.addField('**Usage**', cmd.help.usage) - if (cmd.help.examples.length > 0) { - embed.addField('**Examples**', cmd.help.examples) - } if (aliases) { embed.addField('**Aliases**', aliases) } + if (cmd.help.parameters.length > 0) { + embed.addField('**Parameters**', cmd.help.parameters) + } + embed.addField('**Rank required**', cmd.conf.permLevel, true) + embed.addField('**Server only**', cmd.conf.guildOnly, true) + embed.addField('**Cooldown**', cmd.conf.cooldown / 1000 + ' seconds', true) embed.setFooter('< > = optional, [ ] = required. Don\'t include the brackets in the command itself!') message.channel.send(embed) } diff --git a/commands/invite.js b/commands/invite.js new file mode 100644 index 0000000..2d9b38f --- /dev/null +++ b/commands/invite.js @@ -0,0 +1,20 @@ +exports.conf = { + enabled: true, + guildOnly: false, + aliases: [], + permLevel: 'User', + requiredPerms: [], + cooldown: 2000 +} + +exports.help = { + name: 'invite', + category: 'Bot', + description: 'Sends a link to my support/development server.', + usage: 'invite', + parameters: '' +} + +exports.run = async (client, message, args, level, data) => { + message.channel.send(`Here you go! I hope you enjoy using me ^-^\n`) +} diff --git a/commands/level.js b/commands/level.js index fda1e4e..e0b68a4 100644 --- a/commands/level.js +++ b/commands/level.js @@ -9,7 +9,7 @@ exports.conf = { exports.help = { name: 'level', - category: 'Utility', + category: 'Bot', description: 'Returns your permission level.', usage: 'level', params: '' diff --git a/commands/ping.js b/commands/ping.js index ae1dc3b..6fd6b28 100644 --- a/commands/ping.js +++ b/commands/ping.js @@ -9,7 +9,7 @@ exports.conf = { exports.help = { name: 'ping', - category: 'Utility', + category: 'Bot', description: 'Displays bot latency in miliseconds.', usage: 'ping', params: '' diff --git a/commands/pride.js b/commands/pride.js index 21d2232..78f7a45 100644 --- a/commands/pride.js +++ b/commands/pride.js @@ -1,17 +1,32 @@ +exports.conf = { + enabled: true, + guildOnly: false, + aliases: ['flag'], + permLevel: 'User', + requiredPerms: ['ATTACH_FILES'], + cooldown: 15000 +} + +exports.help = { + name: 'pride', + category: 'Fun', + description: 'Adds a pride flag ring to your avatar. Available flags are lesbian, gay, bisexual, pansexual, trans, asexual, aromantic and ally. Generator created by [Demirramon.](https://demirramon.com/)', + usage: '`pride [flag]` - Adds a pride flag overlay to your avatar.\n`pride -g [flag]` - Adds a pride flag gradient on your avatar.', + parameters: '`flag` - What flag you want to add to your avatar (options listed above)\n`-g` - Add this to the start of the command to turn the flag into a gradient.' +} + const url = 'https://demirramon.com/gen/pride.png' const Discord = require('discord.js') exports.run = (client, message, args) => { - const flag = args[0].toLowerCase() + const flag = args[0] if (!flag) { - return message.channel.send( - `<:error:466995152976871434> No message provided. Usage: \`${client.commands.get('pride').help.usage}\`` - ) + return message.channel.send(client.userError(exports, 'Missing argument, the `flag` argument is required!')) } const available = ['lesbian', 'gay', 'bisexual', 'pansexual', 'trans', 'asexual', 'aromantic', 'ally'] - if (!available.includes(flag)) { - return message.channel.send(`This flag isn't available. Available flags: \`${available.join('`, `')}\``) + if (!available.includes(flag.toLowerCase())) { + return message.channel.send(`This flag isn't available, sorry ;~;\nAvailable flags: \`${available.join('`, `')}\``) } let gradient = 'false' @@ -21,7 +36,7 @@ exports.run = (client, message, args) => { message.channel.startTyping() - const params = `image=${message.author.avatarURL({ format: 'png', size: 2048 })}&flag=${flag}&full=true&gradient=${gradient}&background=false&fit=true&v=2019-08-07` + const params = `image=${message.author.avatarURL({ format: 'png', size: 2048 })}&flag=${flag.toLowerCase()}&full=true&gradient=${gradient}&background=false&fit=true&v=2019-08-07` try { message.channel.stopTyping() @@ -31,21 +46,3 @@ exports.run = (client, message, args) => { message.channel.send(`<:error:466995152976871434> Error when generating image: \`${err}\``) } } - -exports.conf = { - enabled: true, - guildOnly: false, - aliases: ['flag'], - permLevel: 'User', - requiredPerms: ['ATTACH_FILES'], - cooldown: 20000 -} - -exports.help = { - name: 'pride', - category: 'Fun', - description: 'Adds a pride flag ring to your avatar. Available flags are lesbian, gay, bisexual, pansexual, trans, asexual, aromantic and ally. Generator created by [Demirramon.](https://demirramon.com/)', - flags: '`-g` - Makes the overlay a gradient.', - usage: '`pride [flag]` - Adds a pride flag overlay to your avatar.\n`pride [flag] -g` - Adds a pride flag gradient on your avatar.', - examples: '`pride trans`\n`pride lesbian -g`' -} diff --git a/commands/ship.js b/commands/ship.js index ba6693f..9db97cc 100644 --- a/commands/ship.js +++ b/commands/ship.js @@ -4,15 +4,16 @@ exports.conf = { guildOnly: false, aliases: [], permLevel: 'User', - requiredPerms: [] + requiredPerms: [], + cooldown: 2000 } exports.help = { name: 'ship', category: 'Fun', description: 'Ship two people together <3', - usage: 'ship [name/user] [name/user]', - params: '' + usage: 'ship `[name1]` `[name2]`', + parameters: '`name1` The name of the first person you want to ship.\n `name` The name of the second person you want to ship.' } const { MessageEmbed } = require('discord.js') @@ -28,8 +29,12 @@ exports.run = async (client, message, args, level, data) => { '💜' ] - if (args.length < 2) { - return message.channel.send('<:error:466995152976871434> Please include two names/users.') + if (!args[0]) { + return message.channel.send(client.userError(exports, 'Missing argument, the `name1` argument is required!')) + } + + if (!args[1]) { + return message.channel.send(client.userError(exports, 'Missing argument, the `name2` argument is required!')) } const firstName = args[0] diff --git a/commands/support.js b/commands/support.js index 4c24c1b..57cb185 100644 --- a/commands/support.js +++ b/commands/support.js @@ -1,18 +1,20 @@ exports.conf = { - enabled: true, - guildOnly: false, - aliases: [], - permLevel: 'User', - requiredPerms: [] -}; + enabled: true, + guildOnly: false, + aliases: [], + permLevel: 'User', + requiredPerms: [], + cooldown: 2000 +} exports.help = { - name: 'support', - category: 'Utility', - description: "Sends a link to my support/development server.", - usage: 'support' -}; + name: 'support', + category: 'Bot', + description: 'Sends a link to my support/development server.', + usage: 'support', + parameters: '' +} -exports.run = async (client, message, args, level, data) =>{ - message.channel.send('Use this link to join my support server: https://discord.gg/' + client.config.support.id); -}; \ No newline at end of file +exports.run = async (client, message, args, level, data) => { + message.channel.send('Here you go! Hopefully we can help you here :3 https://discord.gg/HCF8mdv') +} diff --git a/helpers/_functions.js b/helpers/_functions.js index 1e48de9..adfc714 100644 --- a/helpers/_functions.js +++ b/helpers/_functions.js @@ -1,3 +1,4 @@ +const { MessageEmbed } = require('discord.js') const mongoose = require('mongoose') const Guild = require('../models/guild') const User = require('../models/user') @@ -131,6 +132,18 @@ module.exports = client => { return false } + // Creates an embed for when commands are used incorrectly + client.userError = (cmd, err) => { + const embed = new MessageEmbed() + embed.setColor('#EF5350') + embed.setTitle(cmd.help.name + ':' + cmd.help.category.toLowerCase()) + embed.setDescription(err) + embed.addField('**Usage**', cmd.help.usage) + embed.addField('**Parameters**', cmd.help.parameters) + embed.setFooter(`Run 'help ${cmd.help.name}' for more information.`) + return embed + } + // Clean up input to remove @everyone, token, etc client.clean = async (client, text) => { if (text && text.constructor.name === 'Promise') { From 2511f6fd871ca39a28d5fd75f9c5c09dda2add7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Hor=C3=A1=C4=8Dek?= Date: Sat, 11 Apr 2020 16:08:41 +0200 Subject: [PATCH 060/156] opus --- package-lock.json | 351 +++++++++++++++++++++++++++++++++++++++++++++- package.json | 1 + 2 files changed, 349 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0ae0fc1..de2e9ef 100644 --- a/package-lock.json +++ b/package-lock.json @@ -254,6 +254,15 @@ "resolved": "https://registry.npmjs.org/@discordjs/collection/-/collection-0.1.5.tgz", "integrity": "sha512-CU1q0UXQUpFNzNB7gufgoisDHP7n+T3tkqTsp3MNUkVJ5+hS3BCvME8uCXAUFlz+6T2FbTCu75A+yQ7HMKqRKw==" }, + "@discordjs/opus": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/@discordjs/opus/-/opus-0.1.0.tgz", + "integrity": "sha512-VWsrsgqSktxOEHx9SFcnOWJhYQOsyzaW3JVN73LDSzKrycEjtRIS+axlm4qeMGx60u6RH1SY15b3pl5G4+Y+gA==", + "requires": { + "node-addon-api": "^2.0.0", + "node-pre-gyp": "^0.14.0" + } + }, "@istanbuljs/load-nyc-config": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.0.0.tgz", @@ -280,6 +289,11 @@ "resolved": "https://registry.npmjs.org/@types/node/-/node-13.11.1.tgz", "integrity": "sha512-eWQGP3qtxwL8FGneRrC5DwrJLGN4/dH1clNTuLfN81HCrxVtxRjygDTUoZJ5ASlDEeo0ppYFQjQIlXhtXpOn6g==" }, + "abbrev": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", + "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==" + }, "abort-controller": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz", @@ -357,11 +371,25 @@ "default-require-extensions": "^3.0.0" } }, + "aproba": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz", + "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==" + }, "archy": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz", "integrity": "sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=" }, + "are-we-there-yet": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz", + "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==", + "requires": { + "delegates": "^1.0.0", + "readable-stream": "^2.0.6" + } + }, "argparse": { "version": "1.0.10", "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", @@ -590,6 +618,11 @@ } } }, + "chownr": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz", + "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==" + }, "clean-stack": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz", @@ -625,6 +658,11 @@ "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=" }, + "code-point-at": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", + "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=" + }, "color-convert": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", @@ -666,6 +704,11 @@ "resolved": "https://registry.npmjs.org/confusing-browser-globals/-/confusing-browser-globals-1.0.9.tgz", "integrity": "sha512-KbS1Y0jMtyPgIxjO7ZzMAuUpAKMt1SzCL9fsrKsX6b0zJPTaT0SiSPmewwVZg9UAO83HVIlEhZF84LIjZ0lmAw==" }, + "console-control-strings": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", + "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=" + }, "contains-path": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/contains-path/-/contains-path-0.1.0.tgz", @@ -752,6 +795,11 @@ "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=" }, + "deep-extend": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz", + "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==" + }, "deep-is": { "version": "0.1.3", "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz", @@ -779,11 +827,21 @@ "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=" }, + "delegates": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", + "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=" + }, "denque": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/denque/-/denque-1.4.1.tgz", "integrity": "sha512-OfzPuSZKGcgr96rf1oODnfjqBFmr1DVoc/TrItj3Ohe0Ah1C5WX5Baquw/9U9KovnQ88EqmJbD66rKYUQYN1tQ==" }, + "detect-libc": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz", + "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=" + }, "discord.js": { "version": "12.1.1", "resolved": "https://registry.npmjs.org/discord.js/-/discord.js-12.1.1.tgz", @@ -1505,6 +1563,14 @@ "resolved": "https://registry.npmjs.org/fromentries/-/fromentries-1.2.0.tgz", "integrity": "sha512-33X7H/wdfO99GdRLLgkjUrD4geAFdq/Uv0kl3HD4da6HDixd2GUg8Mw7dahLCV9r/EARkmtYBB6Tch4EEokFTQ==" }, + "fs-minipass": { + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz", + "integrity": "sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==", + "requires": { + "minipass": "^2.6.0" + } + }, "fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", @@ -1521,6 +1587,54 @@ "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=", "dev": true }, + "gauge": { + "version": "2.7.4", + "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz", + "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=", + "requires": { + "aproba": "^1.0.3", + "console-control-strings": "^1.0.0", + "has-unicode": "^2.0.0", + "object-assign": "^4.1.0", + "signal-exit": "^3.0.0", + "string-width": "^1.0.1", + "strip-ansi": "^3.0.1", + "wide-align": "^1.1.0" + }, + "dependencies": { + "ansi-regex": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" + }, + "is-fullwidth-code-point": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", + "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", + "requires": { + "number-is-nan": "^1.0.0" + } + }, + "string-width": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", + "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", + "requires": { + "code-point-at": "^1.0.0", + "is-fullwidth-code-point": "^1.0.0", + "strip-ansi": "^3.0.0" + } + }, + "strip-ansi": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", + "requires": { + "ansi-regex": "^2.0.0" + } + } + } + }, "gensync": { "version": "1.0.0-beta.1", "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.1.tgz", @@ -1615,6 +1729,11 @@ "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz", "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==" }, + "has-unicode": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", + "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=" + }, "hasha": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/hasha/-/hasha-5.2.0.tgz", @@ -1727,7 +1846,6 @@ "version": "0.4.24", "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", - "dev": true, "requires": { "safer-buffer": ">= 2.1.2 < 3" } @@ -1738,6 +1856,14 @@ "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==", "dev": true }, + "ignore-walk": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.3.tgz", + "integrity": "sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw==", + "requires": { + "minimatch": "^3.0.4" + } + }, "import-fresh": { "version": "3.2.1", "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.1.tgz", @@ -1780,6 +1906,11 @@ "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" }, + "ini": { + "version": "1.3.5", + "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz", + "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==" + }, "inquirer": { "version": "7.1.0", "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.1.0.tgz", @@ -2192,6 +2323,23 @@ "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==" }, + "minipass": { + "version": "2.9.0", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz", + "integrity": "sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==", + "requires": { + "safe-buffer": "^5.1.2", + "yallist": "^3.0.0" + } + }, + "minizlib": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.3.3.tgz", + "integrity": "sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==", + "requires": { + "minipass": "^2.9.0" + } + }, "mkdirp": { "version": "0.5.4", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.4.tgz", @@ -2295,17 +2443,74 @@ "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=", "dev": true }, + "needle": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/needle/-/needle-2.4.1.tgz", + "integrity": "sha512-x/gi6ijr4B7fwl6WYL9FwlCvRQKGlUNvnceho8wxkwXqN8jvVmmmATTmZPRRG7b/yC1eode26C2HO9jl78Du9g==", + "requires": { + "debug": "^3.2.6", + "iconv-lite": "^0.4.4", + "sax": "^1.2.4" + }, + "dependencies": { + "debug": { + "version": "3.2.6", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", + "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", + "requires": { + "ms": "^2.1.1" + } + } + } + }, "nice-try": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz", "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==", "dev": true }, + "node-addon-api": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-2.0.0.tgz", + "integrity": "sha512-ASCL5U13as7HhOExbT6OlWJJUV/lLzL2voOSP1UVehpRD8FbSrSDjfScK/KwAvVTI5AS6r4VwbOMlIqtvRidnA==" + }, "node-fetch": { "version": "2.6.0", "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz", "integrity": "sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==" }, + "node-pre-gyp": { + "version": "0.14.0", + "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz", + "integrity": "sha512-+CvDC7ZttU/sSt9rFjix/P05iS43qHCOOGzcr3Ry99bXG7VX953+vFyEuph/tfqoYu8dttBkE86JSKBO2OzcxA==", + "requires": { + "detect-libc": "^1.0.2", + "mkdirp": "^0.5.1", + "needle": "^2.2.1", + "nopt": "^4.0.1", + "npm-packlist": "^1.1.6", + "npmlog": "^4.0.2", + "rc": "^1.2.7", + "rimraf": "^2.6.1", + "semver": "^5.3.0", + "tar": "^4.4.2" + }, + "dependencies": { + "rimraf": { + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", + "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", + "requires": { + "glob": "^7.1.3" + } + }, + "semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" + } + } + }, "node-preload": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/node-preload/-/node-preload-0.2.1.tgz", @@ -2314,6 +2519,15 @@ "process-on-spawn": "^1.0.0" } }, + "nopt": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz", + "integrity": "sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==", + "requires": { + "abbrev": "1", + "osenv": "^0.1.4" + } + }, "normalize-package-data": { "version": "2.5.0", "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", @@ -2334,6 +2548,40 @@ } } }, + "npm-bundled": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.1.1.tgz", + "integrity": "sha512-gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA==", + "requires": { + "npm-normalize-package-bin": "^1.0.1" + } + }, + "npm-normalize-package-bin": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz", + "integrity": "sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==" + }, + "npm-packlist": { + "version": "1.4.8", + "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.8.tgz", + "integrity": "sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A==", + "requires": { + "ignore-walk": "^3.0.1", + "npm-bundled": "^1.0.1", + "npm-normalize-package-bin": "^1.0.1" + } + }, + "npmlog": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz", + "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==", + "requires": { + "are-we-there-yet": "~1.1.2", + "console-control-strings": "~1.1.0", + "gauge": "~2.7.3", + "set-blocking": "~2.0.0" + } + }, "nth-check": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz", @@ -2342,6 +2590,11 @@ "boolbase": "~1.0.0" } }, + "number-is-nan": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", + "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=" + }, "nyc": { "version": "15.0.0", "resolved": "https://registry.npmjs.org/nyc/-/nyc-15.0.0.tgz", @@ -2382,6 +2635,11 @@ "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz", "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=" }, + "object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" + }, "object-inspect": { "version": "1.7.0", "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.7.0.tgz", @@ -2457,11 +2715,24 @@ "word-wrap": "~1.2.3" } }, + "os-homedir": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", + "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=" + }, "os-tmpdir": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", - "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=", - "dev": true + "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=" + }, + "osenv": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz", + "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==", + "requires": { + "os-homedir": "^1.0.0", + "os-tmpdir": "^1.0.0" + } }, "p-limit": { "version": "2.2.2", @@ -2609,6 +2880,24 @@ "resolved": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz", "integrity": "sha1-E+JtKK1rD/qpExLNO/cI7TUecjM=" }, + "rc": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz", + "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==", + "requires": { + "deep-extend": "^0.6.0", + "ini": "~1.3.0", + "minimist": "^1.2.0", + "strip-json-comments": "~2.0.1" + }, + "dependencies": { + "strip-json-comments": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", + "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=" + } + } + }, "read-pkg": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz", @@ -3221,6 +3510,20 @@ } } }, + "tar": { + "version": "4.4.13", + "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.13.tgz", + "integrity": "sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==", + "requires": { + "chownr": "^1.1.1", + "fs-minipass": "^1.2.5", + "minipass": "^2.8.6", + "minizlib": "^1.2.1", + "mkdirp": "^0.5.0", + "safe-buffer": "^5.1.2", + "yallist": "^3.0.3" + } + }, "test-exclude": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz", @@ -3396,6 +3699,43 @@ "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=" }, + "wide-align": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz", + "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==", + "requires": { + "string-width": "^1.0.2 || 2" + }, + "dependencies": { + "ansi-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", + "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=" + }, + "is-fullwidth-code-point": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=" + }, + "string-width": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", + "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", + "requires": { + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^4.0.0" + } + }, + "strip-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", + "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "requires": { + "ansi-regex": "^3.0.0" + } + } + } + }, "word-wrap": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", @@ -3447,6 +3787,11 @@ "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz", "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==" }, + "yallist": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", + "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==" + }, "yargs": { "version": "15.3.1", "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.3.1.tgz", diff --git a/package.json b/package.json index 6cbb2cd..cfce7a2 100644 --- a/package.json +++ b/package.json @@ -4,6 +4,7 @@ "description": "uwu", "main": "index.js", "dependencies": { + "@discordjs/opus": "^0.1.0", "colors": "^1.4.0", "discord.js": "^12.1.1", "dotenv": "^8.2.0", From b5f7c700503129d9b8340da91e976c9815322ff1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Hor=C3=A1=C4=8Dek?= Date: Sat, 11 Apr 2020 16:09:48 +0200 Subject: [PATCH 061/156] muuusiccc --- commands/play.js | 2 +- helpers/music.js | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/commands/play.js b/commands/play.js index a091860..1d58b03 100644 --- a/commands/play.js +++ b/commands/play.js @@ -17,4 +17,4 @@ exports.help = { exports.run = async (client, message, args, level, data) => { client.music.play(message, args[0]); -} \ No newline at end of file +}; \ No newline at end of file diff --git a/helpers/music.js b/helpers/music.js index 510e0be..c457f53 100644 --- a/helpers/music.js +++ b/helpers/music.js @@ -54,7 +54,7 @@ module.exports = client => { }; client.music.isYouTubeLink = function(query) { - return query.startsWith('https://youtube.com/') || query.startsWith('http://youtube.com/') || query.startsWith('https://youtu.be/') || query.startswith('http://youtu.be/') || query.startsWith('https://m.youtube.com/') || query.startsWith('http://m.youtube.com/') || query.startsWith('https://www.youtube.com/') || query.startsWith('http://www.youtube.com/'); + return query.startsWith('https://youtube.com/') || query.startsWith('http://youtube.com/') || query.startsWith('https://youtu.be/') || query.startsWith('http://youtu.be/') || query.startsWith('https://m.youtube.com/') || query.startsWith('http://m.youtube.com/') || query.startsWith('https://www.youtube.com/') || query.startsWith('http://www.youtube.com/'); }; client.music.getLinkFromID = function(id) { @@ -72,9 +72,7 @@ module.exports = client => { response = await fetch('https://www.googleapis.com/youtube/v3/search?key=' + client.config.keys.yt + '&part=id,snippet&maxResults=1&q=' + encodeURIComponent(query)); }; - let json = await response.json(); - - let parsed = JSON.parse(json); + let parsed = await response.json(); if(parsed.items) { let video = parsed.items[0]; @@ -98,7 +96,7 @@ module.exports = client => { let vc = message.member.voice.channel; - let video = client.music.getVideoByQuery(query); + let video = await client.music.getVideoByQuery(query); if(video) { // Fix the bot if somehow broken @@ -121,7 +119,8 @@ module.exports = client => { guild.playing = true; let connection = await vc.join(); - guild.dispatcher = connection.play(await ytdl(client.music.getLinkFromID(guild.queue[0].id.videoId)), {type: 'opus'}); + + guild.dispatcher = connection.play(await ytdl(client.music.getLinkFromID(guild.queue[0].video.id.videoId)), {type: 'opus'}); guild.dispatcher.setVolume(0.5); }; } else { From 5ae1ede3f3472160548b1bbcbd3dcf542703f0d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Hor=C3=A1=C4=8Dek?= Date: Sat, 11 Apr 2020 16:18:42 +0200 Subject: [PATCH 062/156] search for videos only using youtube api --- helpers/music.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/helpers/music.js b/helpers/music.js index c457f53..977de52 100644 --- a/helpers/music.js +++ b/helpers/music.js @@ -67,9 +67,9 @@ module.exports = client => { let response; if(isLink) { - response = await fetch('https://www.googleapis.com/youtube/v3/search?key=' + client.config.keys.yt + '&part=id,snippet&maxResults=1&id=' + id); + response = await fetch('https://www.googleapis.com/youtube/v3/search?key=' + client.config.keys.yt + '&part=id,snippet&maxResults=1&type=video&id=' + id); } else { - response = await fetch('https://www.googleapis.com/youtube/v3/search?key=' + client.config.keys.yt + '&part=id,snippet&maxResults=1&q=' + encodeURIComponent(query)); + response = await fetch('https://www.googleapis.com/youtube/v3/search?key=' + client.config.keys.yt + '&part=id,snippet&maxResults=1&type=video&q=' + encodeURIComponent(query)); }; let parsed = await response.json(); From 079bcd50a16eb2832707c36dc45ac0d20b2879c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Hor=C3=A1=C4=8Dek?= Date: Sat, 11 Apr 2020 16:30:08 +0200 Subject: [PATCH 063/156] music stuff --- helpers/music.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/helpers/music.js b/helpers/music.js index 977de52..1935a6c 100644 --- a/helpers/music.js +++ b/helpers/music.js @@ -120,8 +120,12 @@ module.exports = client => { let connection = await vc.join(); - guild.dispatcher = connection.play(await ytdl(client.music.getLinkFromID(guild.queue[0].video.id.videoId)), {type: 'opus'}); - guild.dispatcher.setVolume(0.5); + let v = guild.queue[0]; + + guild.dispatcher = connection.play(await ytdl(client.music.getLinkFromID(v.video.id.videoId)), {type: 'opus'}); + guild.dispatcher.setVolume(0.3); + + message.reply('playing **' + v.video.snippet.title + '**'); }; } else { return message.member.reply('failed to find the video!'); From 7340ef1af3e4317b6ed9d98ef78ba872ba778f8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Hor=C3=A1=C4=8Dek?= Date: Sat, 11 Apr 2020 16:31:19 +0200 Subject: [PATCH 064/156] set volume to 25 --- helpers/music.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helpers/music.js b/helpers/music.js index 1935a6c..16fe7c4 100644 --- a/helpers/music.js +++ b/helpers/music.js @@ -123,7 +123,7 @@ module.exports = client => { let v = guild.queue[0]; guild.dispatcher = connection.play(await ytdl(client.music.getLinkFromID(v.video.id.videoId)), {type: 'opus'}); - guild.dispatcher.setVolume(0.3); + guild.dispatcher.setVolume(0.25); message.reply('playing **' + v.video.snippet.title + '**'); }; From 7743bf6ef4b6ec900d8505713c9a198fc3322131 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Hor=C3=A1=C4=8Dek?= Date: Sat, 11 Apr 2020 16:37:45 +0200 Subject: [PATCH 065/156] music stuff again --- commands/play.js | 2 +- helpers/music.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/commands/play.js b/commands/play.js index 1d58b03..0e1be45 100644 --- a/commands/play.js +++ b/commands/play.js @@ -16,5 +16,5 @@ exports.help = { } exports.run = async (client, message, args, level, data) => { - client.music.play(message, args[0]); + await client.music.play(message, args[0]); }; \ No newline at end of file diff --git a/helpers/music.js b/helpers/music.js index 16fe7c4..7c0aadd 100644 --- a/helpers/music.js +++ b/helpers/music.js @@ -114,7 +114,7 @@ module.exports = client => { // Figure out if the bot should add it to queue or play it right now if(guild.playing) { - + message.reply('added **' + video.snippet.title + '** to the queue'); } else { guild.playing = true; From 8b16fba69a3759a00830d5a925d012d493ac667b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Hor=C3=A1=C4=8Dek?= Date: Sat, 11 Apr 2020 16:40:35 +0200 Subject: [PATCH 066/156] guild only play --- commands/play.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/commands/play.js b/commands/play.js index 0e1be45..d03f80d 100644 --- a/commands/play.js +++ b/commands/play.js @@ -1,6 +1,6 @@ exports.conf = { enabled: true, - guildOnly: false, + guildOnly: true, aliases: [], permLevel: 'User', requiredPerms: [], From cfbce016b985df90f5cc7b185d9a3539b20ba44f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Hor=C3=A1=C4=8Dek?= Date: Sat, 11 Apr 2020 16:45:47 +0200 Subject: [PATCH 067/156] volume --- commands/volume.js | 32 ++++++++++++++++++++++++++++++++ helpers/music.js | 8 ++++++++ 2 files changed, 40 insertions(+) create mode 100644 commands/volume.js diff --git a/commands/volume.js b/commands/volume.js new file mode 100644 index 0000000..1ed9893 --- /dev/null +++ b/commands/volume.js @@ -0,0 +1,32 @@ +exports.conf = { + enabled: true, + guildOnly: true, + aliases: [], + permLevel: 'User', + requiredPerms: ['vol'], + cooldown: 2000 +} + +exports.help = { + name: 'volume', + category: 'Music', + description: 'Sets volume of currently playing music. (100% = 25% of the actual volume)', + usage: 'volume [volume]', + params: '[volume] - Target volume from 0-100%' +} + +exports.run = async (client, message, args, level, data) => { + let vol = args[0]; + + if(vol) { + vol = Number(vol); + + vol = vol / 100 * 0.25; + + if(vol <= 1) { + client.music.setVolume(message.guild, vol); + + message.reply('set volume to ' + vol * 100 + '%'); + }; + }; +}; \ No newline at end of file diff --git a/helpers/music.js b/helpers/music.js index 7c0aadd..36d08b5 100644 --- a/helpers/music.js +++ b/helpers/music.js @@ -131,4 +131,12 @@ module.exports = client => { return message.member.reply('failed to find the video!'); }; }; + + client.music.setVolume = function(guild, target) { + let g = client.music.getGuild(guild.id); + + if(g.dispatcher) { + g.dispatcher.setVolume(target); + }; + }; } From aedce9fc342a666a40c02b19b57bb4af59217ee2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Hor=C3=A1=C4=8Dek?= Date: Sat, 11 Apr 2020 16:46:17 +0200 Subject: [PATCH 068/156] youtube link workaround --- helpers/music.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/helpers/music.js b/helpers/music.js index 36d08b5..cf1b800 100644 --- a/helpers/music.js +++ b/helpers/music.js @@ -69,7 +69,8 @@ module.exports = client => { if(isLink) { response = await fetch('https://www.googleapis.com/youtube/v3/search?key=' + client.config.keys.yt + '&part=id,snippet&maxResults=1&type=video&id=' + id); } else { - response = await fetch('https://www.googleapis.com/youtube/v3/search?key=' + client.config.keys.yt + '&part=id,snippet&maxResults=1&type=video&q=' + encodeURIComponent(query)); + // TODO: replace this workaround + response = await fetch('https://www.googleapis.com/youtube/v3/search?key=' + client.config.keys.yt + '&part=id,snippet&maxResults=1&type=video&q=**' + encodeURIComponent(query) + '**'); }; let parsed = await response.json(); From b254495fd3819c06a20682ca3e687837e45fd325 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Hor=C3=A1=C4=8Dek?= Date: Sun, 12 Apr 2020 10:39:41 +0200 Subject: [PATCH 069/156] make 50% volume of video max/default --- commands/volume.js | 2 +- helpers/music.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/commands/volume.js b/commands/volume.js index 1ed9893..94b5d9d 100644 --- a/commands/volume.js +++ b/commands/volume.js @@ -21,7 +21,7 @@ exports.run = async (client, message, args, level, data) => { if(vol) { vol = Number(vol); - vol = vol / 100 * 0.25; + vol = vol / 100 * 0.5; if(vol <= 1) { client.music.setVolume(message.guild, vol); diff --git a/helpers/music.js b/helpers/music.js index cf1b800..3f2df52 100644 --- a/helpers/music.js +++ b/helpers/music.js @@ -124,7 +124,7 @@ module.exports = client => { let v = guild.queue[0]; guild.dispatcher = connection.play(await ytdl(client.music.getLinkFromID(v.video.id.videoId)), {type: 'opus'}); - guild.dispatcher.setVolume(0.25); + guild.dispatcher.setVolume(0.5); message.reply('playing **' + v.video.snippet.title + '**'); }; From 8325891854591e982c3051477b34e62aab7026fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Hor=C3=A1=C4=8Dek?= Date: Sun, 12 Apr 2020 10:47:48 +0200 Subject: [PATCH 070/156] default to 50% user volume --- helpers/music.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helpers/music.js b/helpers/music.js index 3f2df52..cf1b800 100644 --- a/helpers/music.js +++ b/helpers/music.js @@ -124,7 +124,7 @@ module.exports = client => { let v = guild.queue[0]; guild.dispatcher = connection.play(await ytdl(client.music.getLinkFromID(v.video.id.videoId)), {type: 'opus'}); - guild.dispatcher.setVolume(0.5); + guild.dispatcher.setVolume(0.25); message.reply('playing **' + v.video.snippet.title + '**'); }; From 89dc88d7860489b525a617fd396780884d7aec36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Hor=C3=A1=C4=8Dek?= Date: Sun, 12 Apr 2020 10:48:47 +0200 Subject: [PATCH 071/156] fix music being skipped while playing --- helpers/music.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helpers/music.js b/helpers/music.js index cf1b800..a3598d8 100644 --- a/helpers/music.js +++ b/helpers/music.js @@ -123,7 +123,7 @@ module.exports = client => { let v = guild.queue[0]; - guild.dispatcher = connection.play(await ytdl(client.music.getLinkFromID(v.video.id.videoId)), {type: 'opus'}); + guild.dispatcher = connection.play(await ytdl(client.music.getLinkFromID(v.video.id.videoId), {highWaterMark: 1024 * 1024 * 32}), {type: 'opus'}); guild.dispatcher.setVolume(0.25); message.reply('playing **' + v.video.snippet.title + '**'); From d85a10c7d06260ba619b8bf3e690a3ff1961f7b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Hor=C3=A1=C4=8Dek?= Date: Sun, 12 Apr 2020 11:07:01 +0200 Subject: [PATCH 072/156] queue --- helpers/music.js | 56 +++++++++++++++++++++++++++++++++--------------- 1 file changed, 39 insertions(+), 17 deletions(-) diff --git a/helpers/music.js b/helpers/music.js index a3598d8..cd5cf6b 100644 --- a/helpers/music.js +++ b/helpers/music.js @@ -88,37 +88,45 @@ module.exports = client => { }; }; - client.music.play = async function(message, query) { + client.music.play = async function(message, query, ignoreQueue) { let guild = client.music.getGuild(message.guild.id); if(!message.member.voice.channel && !guild.voiceChannel) { - return message.member.reply('you are not in a voice channel!'); + return message.reply('you are not in a voice channel!'); } let vc = message.member.voice.channel; - let video = await client.music.getVideoByQuery(query); + let video; + + if(!ignoreQueue) { + video = await client.music.getVideoByQuery(query); + }; - if(video) { - // Fix the bot if somehow broken - // music "playing", nothing in queue - if((guild.playing || guild.dispatcher) && guild.queue.length == 0) { - guild.playing = false; - guild.dispatcher = null; - // music not playing, something is in queue - } else if(!guild.playing && !guild.dispatcher && guild.queue.length > 0) { - guild.queue = []; + if(video || ignoreQueue) { + if(!ignoreQueue) { + // Fix the bot if somehow broken + // music "playing", nothing in queue + if((guild.playing || guild.dispatcher) && guild.queue.length == 0) { + guild.playing = false; + guild.dispatcher = null; + // music not playing, something is in queue + } else if(!guild.playing && !guild.dispatcher && guild.queue.length > 0) { + guild.queue = []; + }; + + // Add video to queue + guild.queue.push({video: video, requestedBy: message.member.id}); }; - // Add video to queue - guild.queue.push({video: video, requestedBy: message.member.id}); - // Figure out if the bot should add it to queue or play it right now if(guild.playing) { message.reply('added **' + video.snippet.title + '** to the queue'); } else { guild.playing = true; + guild.voiceChannel = vc; + let connection = await vc.join(); let v = guild.queue[0]; @@ -126,10 +134,24 @@ module.exports = client => { guild.dispatcher = connection.play(await ytdl(client.music.getLinkFromID(v.video.id.videoId), {highWaterMark: 1024 * 1024 * 32}), {type: 'opus'}); guild.dispatcher.setVolume(0.25); - message.reply('playing **' + v.video.snippet.title + '**'); + message.channel.send('Playing **' + v.video.snippet.title + '**'); + + // play next in queue on end + guild.dispatcher.once('finish', () => { + guild.queue.shift(); + guild.playing = false; + + if(guild.queue.length > 0) { + client.music.play(message, null, true); + } else { + guild.dispatcher = null; + + connection.leave(); + }; + }); }; } else { - return message.member.reply('failed to find the video!'); + return message.reply('failed to find the video!'); }; }; From bfde321b3efbc0003bd6a0c0f8d7dda04b36eed9 Mon Sep 17 00:00:00 2001 From: mudkipscience Date: Sun, 12 Apr 2020 19:15:31 +1000 Subject: [PATCH 073/156] Finally decided on a help command I like --- changelog.txt | 8 ++++- commands/emoji.js | 77 ++++++++++++++++++++++------------------------ commands/eval.js | 4 +-- commands/help.js | 50 ++++++++++++++++++------------ commands/level.js | 2 +- commands/ping.js | 4 +-- commands/play.js | 2 +- commands/pride.js | 2 +- commands/volume.js | 2 +- events/message.js | 9 +++++- 10 files changed, 90 insertions(+), 70 deletions(-) diff --git a/changelog.txt b/changelog.txt index 865f355..59c5536 100644 --- a/changelog.txt +++ b/changelog.txt @@ -4,4 +4,10 @@ Woomy 2.0: - Logger now logs which file a log came from - Functions file has been separated into multiple helpers - Added systemNotice feature, stops Woomy from outputting permission errors and stuff -- New ping command \ No newline at end of file +- New ping command +- help command overhauled +- added `pride` command +- eval now dm's errors to the user who ran the command +- ship command overhauled +- added volume command +- usage errors are now shown in an embed \ No newline at end of file diff --git a/commands/emoji.js b/commands/emoji.js index b42bc56..1bdf275 100644 --- a/commands/emoji.js +++ b/commands/emoji.js @@ -1,44 +1,41 @@ exports.conf = { - enabled: true, - guildOnly: false, - aliases: [], - permLevel: 'User', - requiredPerms: [] - }; - + enabled: true, + guildOnly: false, + aliases: ['enlarge'], + permLevel: 'User', + requiredPerms: [] +} + exports.help = { - name: 'emoji', - category: 'Utility', - description: 'Enlarges and links an custom emoji', - usage: 'emoji [emoji]', - params: '`[emoji] - Custom emoji you want to enlarge.' -}; + name: 'emoji', + category: 'Utility', + description: 'Enlarges a custom emoji.', + usage: 'emoji [emoji]', + parameters: '`[emoji] - Custom emoji you want to enlarge' +} exports.run = async (client, message, args) => { - if(!args[0]) { - return message.channel.send(`You need to specify a custom emoji. Usage: \`${client.commands.get(`emoji`).help.usage}\``) - }; - - var ID; - var format = '.png' - var string = args[0].replace(/\D/g,''); - - if(args[0].charAt(1) == 'a' && args[0].charAt(2) == ':') { - format = '.gif' - }; - - if(string.length > 18) { - ID = string.slice(string.length - 18); - } else { - ID = string; - }; - - if(!ID) { - return message.channel.send(`<:error:466995152976871434> Invalid emoji. This command only works with custom emojis.`) - }; - - - - message.channel.send('https://cdn.discordapp.com/emojis/' + ID + format) -}; - \ No newline at end of file + if (!args[0]) { + return message.channel.send(client.userError(exports, 'Missing argument, the `emoji` argument is required!')) + }; + + var ID + var format = '.png' + var string = args[0].replace(/\D/g, '') + + if (args[0].charAt(1) === 'a' && args[0].charAt(2) === ':') { + format = '.gif' + }; + + if (string.length > 18) { + ID = string.slice(string.length - 18) + } else { + ID = string + }; + + if (!ID) { + return message.channel.send('<:error:466995152976871434> This command only works with custom emojis, sorry ;~;') + } + + message.channel.send('https://cdn.discordapp.com/emojis/' + ID + format) +} diff --git a/commands/eval.js b/commands/eval.js index e7f6684..3fa78c5 100644 --- a/commands/eval.js +++ b/commands/eval.js @@ -10,10 +10,10 @@ exports.conf = { exports.help = { name: 'eval', - category: 'Owner', + category: 'Developer', description: 'Evaluates arbitrary javascript.', usage: 'eval [code]', - params: '`[code] - Javascript code you want to execute.' + parameters: '`[code] - Javascript code you want to execute.' } exports.run = async (client, message, args, level, data) => { diff --git a/commands/help.js b/commands/help.js index 0231028..b317d7d 100644 --- a/commands/help.js +++ b/commands/help.js @@ -11,7 +11,7 @@ exports.help = { name: 'help', category: 'Bot', description: 'Lists all commands Woomy has, what they do, and how to use them.', - usage: '`help` - Lists all commands.\n`help ` - Show detailed information on how to use the specified command.', + usage: '`help` - Shows the embed that provides info on how to use woomy. `help all` - Lists all commands.\n`help ` - Show detailed information on how to use the specified command.', parameters: '`command` - The name of the command you want more information on.' } @@ -20,8 +20,19 @@ exports.run = (client, message, args, level, data) => { const embed = new Discord.MessageEmbed() embed.setColor(client.embedColour(message.guild)) + const commands = client.commands + const categories = [] + + commands.forEach((cmd) => { + if (!categories.includes(cmd.help.category)) { + if (cmd.help.category === 'Developer' && !client.config.devs.includes('message.author.id')) { + return + } + categories.push(cmd.help.category) + } + }) + if (!args[0]) { - const categories = [] let uPrefix = '`' + data.user.prefix + '`' let gPrefix = '`' + data.guild.prefix + '`' @@ -33,32 +44,31 @@ exports.run = (client, message, args, level, data) => { gPrefix = 'None set, use: `~prefix`' } - embed.setTitle('Woomy Help') - embed.setDescription(`**Prefixes**\n» Default: \`${client.config.defaultPrefix}\`\n» Server: ${gPrefix}\n» Personal: ${uPrefix}\n\n» [Join my discord server](https://discord.gg/HCF8mdv) if you need help!\n» Use \`help \` to recieve more information about a command!`) - const commands = client.commands - - commands.forEach((cmd) => { - if (!categories.includes(cmd.help.category)) { - if (cmd.help.category === 'Developer' && !client.config.devs.includes('message.author.id')) { - return - } - categories.push(cmd.help.category) - } - }) + embed.setTitle('Help & Commands') + embed.setDescription('') + if (client.version.news.length > 0) { + embed.addField('**News**', client.version.news) + } + embed.addField('**Prefixes**', `Default Prefix: \`${client.config.defaultPrefix}\`\nServer Prefix: ${gPrefix}\nUser Prefix: ${uPrefix}`) + embed.addField('**Command Syntax**', 'For arguments in commands:\n» Arguments in `[]` brackets are required.\n» Arguments in `<>` brackets are optional.\n» Arguments prefixed with `-` are flags, and are placed at the start of the command (`avatar -jpg mudkipscience`)') + embed.addField('**Commands**', `Use \`${message.prefix}help all\` to view all commands, or \`${message.prefix}help \` for more information on a specific command.\n\n[Bot Invite](https://discordapp.com/oauth2/authorize?client_id=${client.user.id}&permissions=2134240503&scope=bot) | [Discord Server](https://discord.gg/HCF8mdv) | [GitHub](https://github.com/mudkipscience/woomy) | [Vote for me!](https://top.gg/bot/435961704145485835/vote)`) + return message.channel.send(embed) + } else if (args[0] === 'all') { + embed.setTitle('Commands') categories.sort().forEach((cat) => { const filtered = commands.filter((cmd) => cmd.help.category === cat) - embed.addField('**' + cat + '**', filtered.map((cmd) => '`' + cmd.help.name + '`').join(', '), true) + embed.addField('**' + cat + '**', filtered.map((cmd) => '`' + cmd.help.name + '`').join(', ')) }) if (message.guild && data.guild.customCommands.length > 0) { - embed.addField('**Custom**', data.guild.customCommands.map((cmd) => '`' + cmd.name + '`').join(' '), true) + embed.addField('**Custom**', data.guild.customCommands.map((cmd) => '`' + cmd.name + '`').join(' ')) } return message.channel.send(embed) } else { const command = args.shift().toLowerCase() - const cmd = client.commands.get(command) || client.commands.get(client.aliases.get(command)) + const cmd = commands.get(command) || commands.get(client.aliases.get(command)) if (!cmd) { return message.channel.send('Command/alias doesn\'t exist') } @@ -72,12 +82,12 @@ exports.run = (client, message, args, level, data) => { embed.setTitle(cmd.help.category.toLowerCase() + ':' + cmd.help.name) embed.setDescription(cmd.help.description) embed.addField('**Usage**', cmd.help.usage) - if (aliases) { - embed.addField('**Aliases**', aliases) - } if (cmd.help.parameters.length > 0) { embed.addField('**Parameters**', cmd.help.parameters) } + if (aliases) { + embed.addField('**Aliases**', aliases) + } embed.addField('**Rank required**', cmd.conf.permLevel, true) embed.addField('**Server only**', cmd.conf.guildOnly, true) embed.addField('**Cooldown**', cmd.conf.cooldown / 1000 + ' seconds', true) diff --git a/commands/level.js b/commands/level.js index e0b68a4..43135b3 100644 --- a/commands/level.js +++ b/commands/level.js @@ -12,7 +12,7 @@ exports.help = { category: 'Bot', description: 'Returns your permission level.', usage: 'level', - params: '' + parameters: '' } exports.run = async (client, message, args, level, data) => { diff --git a/commands/ping.js b/commands/ping.js index 6fd6b28..e316e93 100644 --- a/commands/ping.js +++ b/commands/ping.js @@ -10,9 +10,9 @@ exports.conf = { exports.help = { name: 'ping', category: 'Bot', - description: 'Displays bot latency in miliseconds.', + description: 'Check if bot is dying.', usage: 'ping', - params: '' + parameters: '' } exports.run = async (client, message, args, level, data) => { diff --git a/commands/play.js b/commands/play.js index d03f80d..b96db38 100644 --- a/commands/play.js +++ b/commands/play.js @@ -12,7 +12,7 @@ exports.help = { category: 'Music', description: 'Plays or adds to queue requested music.', usage: 'play [query]', - params: '[query] - A query to find video by or a link to the video.' + parameters: '[query] - A query to find video by or a link to the video.' } exports.run = async (client, message, args, level, data) => { diff --git a/commands/pride.js b/commands/pride.js index 78f7a45..606afaa 100644 --- a/commands/pride.js +++ b/commands/pride.js @@ -1,7 +1,7 @@ exports.conf = { enabled: true, guildOnly: false, - aliases: ['flag'], + aliases: [], permLevel: 'User', requiredPerms: ['ATTACH_FILES'], cooldown: 15000 diff --git a/commands/volume.js b/commands/volume.js index 1ed9893..a91e361 100644 --- a/commands/volume.js +++ b/commands/volume.js @@ -12,7 +12,7 @@ exports.help = { category: 'Music', description: 'Sets volume of currently playing music. (100% = 25% of the actual volume)', usage: 'volume [volume]', - params: '[volume] - Target volume from 0-100%' + parameters: '[volume] - Target volume from 0-100%' } exports.run = async (client, message, args, level, data) => { diff --git a/events/message.js b/events/message.js index 50f299a..2375cb1 100644 --- a/events/message.js +++ b/events/message.js @@ -10,7 +10,7 @@ module.exports = async (client, message) => { if (message.guild) { if (!message.channel.permissionsFor(client.user).has('SEND_MESSAGES')) { try { - return message.author.send(`I don't have permission to speak in **#${message.channel.name}**, Please ask a moderator to give me the send messages permission!`) + return message.author.send(`I don't have permission to speak in \`#${message.channel.name}\`, Please ask a moderator to give me the send messages permission!`) } catch (err) {} } data.guild = await client.findOrCreateGuild(message.guild) @@ -27,6 +27,13 @@ module.exports = async (client, message) => { if (message.content.indexOf(prefix) !== 0) return + console.log(prefix) + if (prefix === `<@${client.user.id}> ` || prefix === `<@!${client.user.id}> `) { + message.prefix = '@Woomy ' + } else { + message.prefix = prefix + } + const args = message.content.slice(prefix.length).trim().split(/ +/g) const command = args.shift().toLowerCase() From fe5a9ccdc2f3086c9995e1a0c493afb515e2064a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Hor=C3=A1=C4=8Dek?= Date: Sun, 12 Apr 2020 11:21:38 +0200 Subject: [PATCH 074/156] add joinArguments conf --- commands/play.js | 3 ++- events/message.js | 11 ++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/commands/play.js b/commands/play.js index b96db38..e2b33d9 100644 --- a/commands/play.js +++ b/commands/play.js @@ -4,7 +4,8 @@ exports.conf = { aliases: [], permLevel: 'User', requiredPerms: [], - cooldown: 2000 + cooldown: 2000, + joinArguments: 1 } exports.help = { diff --git a/events/message.js b/events/message.js index 2375cb1..1c6da3c 100644 --- a/events/message.js +++ b/events/message.js @@ -106,6 +106,15 @@ module.exports = async (client, message) => { message.flags.push(args.shift().slice(1)) } + let argsPossiblyJoined = args; + + if(cmd.conf.joinArguments) { + if(args.length > cmd.conf.joinArguments && args.length > 1) + { + argsPossiblyJoined[argsLength - 1] = args.slice(argsLength - 1).join(' '); + } + }; + client.logger.log(`Command ran: ${cmd.help.name}`) - cmd.run(client, message, args, level, data) + cmd.run(client, message, argsPossiblyJoined, level, data) } From 8e850b1adf8b444d7ba84e87cbfa9907b81be72d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Hor=C3=A1=C4=8Dek?= Date: Sun, 12 Apr 2020 11:22:28 +0200 Subject: [PATCH 075/156] fix joinArguments conf --- events/message.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/events/message.js b/events/message.js index 1c6da3c..13a46c2 100644 --- a/events/message.js +++ b/events/message.js @@ -111,7 +111,7 @@ module.exports = async (client, message) => { if(cmd.conf.joinArguments) { if(args.length > cmd.conf.joinArguments && args.length > 1) { - argsPossiblyJoined[argsLength - 1] = args.slice(argsLength - 1).join(' '); + argsPossiblyJoined[cmd.conf.joinArguments - 1] = args.slice(cmd.conf.joinArguments - 1).join(' '); } }; From 0de96409a0a130a880baf2f23fc7c9b2d3488984 Mon Sep 17 00:00:00 2001 From: mudkipscience Date: Sun, 12 Apr 2020 19:24:14 +1000 Subject: [PATCH 076/156] i fucking hate family time --- commands/emoji.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/commands/emoji.js b/commands/emoji.js index 1bdf275..cfe7f32 100644 --- a/commands/emoji.js +++ b/commands/emoji.js @@ -9,7 +9,7 @@ exports.conf = { exports.help = { name: 'emoji', category: 'Utility', - description: 'Enlarges a custom emoji.', + description: 'Enlarges a custom emoji (cannot be used to enlarge normal emojis)', usage: 'emoji [emoji]', parameters: '`[emoji] - Custom emoji you want to enlarge' } From 818a923a37f0e08344aa2025d56b72b643eec2d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Hor=C3=A1=C4=8Dek?= Date: Sun, 12 Apr 2020 11:24:58 +0200 Subject: [PATCH 077/156] forceskip --- commands/forceskip.js | 22 ++++++++++++++++++++++ helpers/music.js | 8 ++++++++ 2 files changed, 30 insertions(+) create mode 100644 commands/forceskip.js diff --git a/commands/forceskip.js b/commands/forceskip.js new file mode 100644 index 0000000..d79a431 --- /dev/null +++ b/commands/forceskip.js @@ -0,0 +1,22 @@ +exports.conf = { + enabled: true, + guildOnly: true, + aliases: [], + permLevel: 'Moderator', + requiredPerms: [], + cooldown: 2000 +} + +exports.help = { + name: 'forceskip', + category: 'Music', + description: 'Force skips currently playing song.', + usage: 'forceskip', + params: '' +} + +exports.run = async (client, message, args, level, data) => { + client.music.skip(message.guild, 'forceskip'); + + message.reply('skipped currently playing music'); +}; \ No newline at end of file diff --git a/helpers/music.js b/helpers/music.js index cd5cf6b..3077b6a 100644 --- a/helpers/music.js +++ b/helpers/music.js @@ -162,4 +162,12 @@ module.exports = client => { g.dispatcher.setVolume(target); }; }; + + client.music.skip = function(guild, reason) { + let g = client.music.getGuild(guild.id); + + if(g.dispatcher) { + g.dispatcher.end(reason); + }; + }; } From e270ddeaa0eee38e8c29b3eb378c045c13097dba Mon Sep 17 00:00:00 2001 From: TheCakeChicken Date: Sun, 12 Apr 2020 10:28:31 +0100 Subject: [PATCH 078/156] sentry --- configTemplate.js | 3 +- index.js | 4 ++ package-lock.json | 113 +++++++++++++++++++++++++++++++++++++++++++++- package.json | 1 + 4 files changed, 118 insertions(+), 3 deletions(-) diff --git a/configTemplate.js b/configTemplate.js index 3489f17..34b3f43 100644 --- a/configTemplate.js +++ b/configTemplate.js @@ -9,7 +9,8 @@ const config = { // API keys that are required for some features/commands keys: { dbl: '', // top.gg key - yt: '' // youtube API key + yt: '', // youtube API key + sentry: '' // sentry.io dsn }, // Users added to this embed get access to developer-level commands diff --git a/index.js b/index.js index 9b462bb..6ffb105 100644 --- a/index.js +++ b/index.js @@ -15,6 +15,7 @@ const client = new Discord.Client({ disabledEvents: ['TYPING_START'] }) const fs = require('fs') const colors = require('colors') const isDocker = require('is-docker') +const sentry = require('@sentry/node') // Helpers client.config = require('./config') @@ -57,6 +58,9 @@ client.aliases = new Discord.Collection() // Main initialisation function const init = async () => { + // initialise sentry + if (client.config.keys.sentry != '') sentry.init({dsn: client.config.keys.sentry}) + // Command handler fs.readdir('./commands', (err, files) => { if (err) { diff --git a/package-lock.json b/package-lock.json index de2e9ef..d7a8394 100644 --- a/package-lock.json +++ b/package-lock.json @@ -279,6 +279,92 @@ "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.2.tgz", "integrity": "sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw==" }, + "@sentry/apm": { + "version": "5.15.4", + "resolved": "https://registry.npmjs.org/@sentry/apm/-/apm-5.15.4.tgz", + "integrity": "sha512-gcW225Jls1ShyBXMWN6zZyuVJwBOIQ63sI+URI2NSFsdpBpdpZ8yennIm+oMlSfb25Nzt9SId7TRSjPhlSbTZQ==", + "requires": { + "@sentry/browser": "5.15.4", + "@sentry/hub": "5.15.4", + "@sentry/minimal": "5.15.4", + "@sentry/types": "5.15.4", + "@sentry/utils": "5.15.4", + "tslib": "^1.9.3" + } + }, + "@sentry/browser": { + "version": "5.15.4", + "resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-5.15.4.tgz", + "integrity": "sha512-l/auT1HtZM3KxjCGQHYO/K51ygnlcuOrM+7Ga8gUUbU9ZXDYw6jRi0+Af9aqXKmdDw1naNxr7OCSy6NBrLWVZw==", + "requires": { + "@sentry/core": "5.15.4", + "@sentry/types": "5.15.4", + "@sentry/utils": "5.15.4", + "tslib": "^1.9.3" + } + }, + "@sentry/core": { + "version": "5.15.4", + "resolved": "https://registry.npmjs.org/@sentry/core/-/core-5.15.4.tgz", + "integrity": "sha512-9KP4NM4SqfV5NixpvAymC7Nvp36Zj4dU2fowmxiq7OIbzTxGXDhwuN/t0Uh8xiqlkpkQqSECZ1OjSFXrBldetQ==", + "requires": { + "@sentry/hub": "5.15.4", + "@sentry/minimal": "5.15.4", + "@sentry/types": "5.15.4", + "@sentry/utils": "5.15.4", + "tslib": "^1.9.3" + } + }, + "@sentry/hub": { + "version": "5.15.4", + "resolved": "https://registry.npmjs.org/@sentry/hub/-/hub-5.15.4.tgz", + "integrity": "sha512-1XJ1SVqadkbUT4zLS0TVIVl99si7oHizLmghR8LMFl5wOkGEgehHSoOydQkIAX2C7sJmaF5TZ47ORBHgkqclUg==", + "requires": { + "@sentry/types": "5.15.4", + "@sentry/utils": "5.15.4", + "tslib": "^1.9.3" + } + }, + "@sentry/minimal": { + "version": "5.15.4", + "resolved": "https://registry.npmjs.org/@sentry/minimal/-/minimal-5.15.4.tgz", + "integrity": "sha512-GL4GZ3drS9ge+wmxkHBAMEwulaE7DMvAEfKQPDAjg2p3MfcCMhAYfuY4jJByAC9rg9OwBGGehz7UmhWMFjE0tw==", + "requires": { + "@sentry/hub": "5.15.4", + "@sentry/types": "5.15.4", + "tslib": "^1.9.3" + } + }, + "@sentry/node": { + "version": "5.15.4", + "resolved": "https://registry.npmjs.org/@sentry/node/-/node-5.15.4.tgz", + "integrity": "sha512-OfdhNEvOJZ55ZkCUcVgctjaZkOw7rmLzO5VyDTSgevA4uLsPaTNXSAeK2GSQBXc5J0KdRpNz4sSIyuxOS4Z7Vg==", + "requires": { + "@sentry/apm": "5.15.4", + "@sentry/core": "5.15.4", + "@sentry/hub": "5.15.4", + "@sentry/types": "5.15.4", + "@sentry/utils": "5.15.4", + "cookie": "^0.3.1", + "https-proxy-agent": "^4.0.0", + "lru_map": "^0.3.3", + "tslib": "^1.9.3" + } + }, + "@sentry/types": { + "version": "5.15.4", + "resolved": "https://registry.npmjs.org/@sentry/types/-/types-5.15.4.tgz", + "integrity": "sha512-quPHPpeAuwID48HLPmqBiyXE3xEiZLZ5D3CEbU3c3YuvvAg8qmfOOTI6z4Z3Eedi7flvYpnx3n7N3dXIEz30Eg==" + }, + "@sentry/utils": { + "version": "5.15.4", + "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-5.15.4.tgz", + "integrity": "sha512-lO8SLBjrUDGADl0LOkd55R5oL510d/1SaI08/IBHZCxCUwI4TiYo5EPECq8mrj3XGfgCyq9osw33bymRlIDuSQ==", + "requires": { + "@sentry/types": "5.15.4", + "tslib": "^1.9.3" + } + }, "@types/color-name": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz", @@ -314,6 +400,11 @@ "integrity": "sha512-HiUX/+K2YpkpJ+SzBffkM/AQ2YE03S0U1kjTLVpoJdhZMOWy8qvXVN9JdLqv2QsaQ6MPYQIuNmwD8zOiYUofLQ==", "dev": true }, + "agent-base": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-5.1.1.tgz", + "integrity": "sha512-TMeqbNl2fMW0nMjTEPOwe3J/PRFP4vqeoNuQMG0HlMrtm5QxKqdvAkZ1pRBQ/ulIyDD5Yq0nJ7YbdD8ey0TO3g==" + }, "aggregate-error": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.0.1.tgz", @@ -723,6 +814,11 @@ "safe-buffer": "~5.1.1" } }, + "cookie": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz", + "integrity": "sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=" + }, "core-util-is": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", @@ -1842,6 +1938,15 @@ "sshpk": "^1.7.0" } }, + "https-proxy-agent": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-4.0.0.tgz", + "integrity": "sha512-zoDhWrkR3of1l9QAL8/scJZyLu8j/gBkcwcaQOZh7Gyh/+uJQzGVETdgT30akuwkpL8HTRfssqI3BZuV18teDg==", + "requires": { + "agent-base": "5", + "debug": "4" + } + }, "iconv-lite": { "version": "0.4.24", "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", @@ -2263,6 +2368,11 @@ "resolved": "https://registry.npmjs.org/lodash.isfunction/-/lodash.isfunction-3.0.9.tgz", "integrity": "sha512-AirXNj15uRIMMPihnkInB4i3NHeb4iBtNg9WRWuK2o31S+ePwwNmDPaTL3o7dTJ+VXNZim7rFs4rxN4YU1oUJw==" }, + "lru_map": { + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/lru_map/-/lru_map-0.3.3.tgz", + "integrity": "sha1-tcg1G5Rky9dQM1p5ZQoOwOVhGN0=" + }, "m3u8stream": { "version": "0.6.5", "resolved": "https://registry.npmjs.org/m3u8stream/-/m3u8stream-0.6.5.tgz", @@ -3588,8 +3698,7 @@ "tslib": { "version": "1.11.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.11.1.tgz", - "integrity": "sha512-aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA==", - "dev": true + "integrity": "sha512-aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA==" }, "tunnel-agent": { "version": "0.6.0", diff --git a/package.json b/package.json index cfce7a2..a5cdbe8 100644 --- a/package.json +++ b/package.json @@ -5,6 +5,7 @@ "main": "index.js", "dependencies": { "@discordjs/opus": "^0.1.0", + "@sentry/node": "^5.15.4", "colors": "^1.4.0", "discord.js": "^12.1.1", "dotenv": "^8.2.0", From cc1d4bebb8d7d1f6afc4587acaab03165a5b4424 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Hor=C3=A1=C4=8Dek?= Date: Sun, 12 Apr 2020 11:31:52 +0200 Subject: [PATCH 079/156] change volume to moderator --- commands/volume.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/commands/volume.js b/commands/volume.js index c0f8d47..5b4748a 100644 --- a/commands/volume.js +++ b/commands/volume.js @@ -2,7 +2,7 @@ exports.conf = { enabled: true, guildOnly: true, aliases: [], - permLevel: 'User', + permLevel: 'Moderator', requiredPerms: ['vol'], cooldown: 2000 } From bc612533486d8fd07acfc7526a07fd4f0b74a01a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Hor=C3=A1=C4=8Dek?= Date: Sun, 12 Apr 2020 11:31:58 +0200 Subject: [PATCH 080/156] change leave to disconnect --- helpers/music.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helpers/music.js b/helpers/music.js index 3077b6a..34abb3d 100644 --- a/helpers/music.js +++ b/helpers/music.js @@ -146,7 +146,7 @@ module.exports = client => { } else { guild.dispatcher = null; - connection.leave(); + connection.disconnect(); }; }); }; From 217e8a07e24bf17e57ddbff61d7e2f64113f17a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Hor=C3=A1=C4=8Dek?= Date: Sun, 12 Apr 2020 11:33:14 +0200 Subject: [PATCH 081/156] remove youtube-info --- package-lock.json | 546 ---------------------------------------------- package.json | 1 - 2 files changed, 547 deletions(-) diff --git a/package-lock.json b/package-lock.json index d7a8394..50a282c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -414,15 +414,6 @@ "indent-string": "^4.0.0" } }, - "ajv": { - "version": "4.11.8", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz", - "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=", - "requires": { - "co": "^4.6.0", - "json-stable-stringify": "^1.0.1" - } - }, "ansi-escapes": { "version": "4.3.1", "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz", @@ -510,19 +501,6 @@ "es-abstract": "^1.17.0-next.1" } }, - "asn1": { - "version": "0.2.4", - "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz", - "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==", - "requires": { - "safer-buffer": "~2.1.0" - } - }, - "assert-plus": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz", - "integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ=" - }, "astral-regex": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz", @@ -534,36 +512,11 @@ "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=" }, - "aws-sign2": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz", - "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8=" - }, - "aws4": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.9.1.tgz", - "integrity": "sha512-wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug==" - }, "balanced-match": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=" }, - "bcrypt-pbkdf": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz", - "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=", - "requires": { - "tweetnacl": "^0.14.3" - }, - "dependencies": { - "tweetnacl": { - "version": "0.14.5", - "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", - "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=" - } - } - }, "bl": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/bl/-/bl-2.2.0.tgz", @@ -573,24 +526,6 @@ "safe-buffer": "^5.1.1" } }, - "bluebird": { - "version": "3.7.2", - "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", - "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==" - }, - "boolbase": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz", - "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=" - }, - "boom": { - "version": "2.10.1", - "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz", - "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=", - "requires": { - "hoek": "2.x.x" - } - }, "brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", @@ -627,11 +562,6 @@ "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==" }, - "caseless": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", - "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=" - }, "chalk": { "version": "2.4.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", @@ -690,25 +620,6 @@ "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==", "dev": true }, - "cheerio": { - "version": "0.19.0", - "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-0.19.0.tgz", - "integrity": "sha1-dy5wFfLuKZZQltcepBdbdas1SSU=", - "requires": { - "css-select": "~1.0.0", - "dom-serializer": "~0.1.0", - "entities": "~1.1.1", - "htmlparser2": "~3.8.1", - "lodash": "^3.2.0" - }, - "dependencies": { - "lodash": { - "version": "3.10.1", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz", - "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=" - } - } - }, "chownr": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz", @@ -744,11 +655,6 @@ "wrap-ansi": "^6.2.0" } }, - "co": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", - "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=" - }, "code-point-at": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", @@ -834,45 +740,6 @@ "which": "^2.0.1" } }, - "cryptiles": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz", - "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=", - "requires": { - "boom": "2.x.x" - } - }, - "css-select": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.0.0.tgz", - "integrity": "sha1-sRIcpRhI3SZOIkTQWM7iVN7rRLA=", - "requires": { - "boolbase": "~1.0.0", - "css-what": "1.0", - "domutils": "1.4", - "nth-check": "~1.0.0" - } - }, - "css-what": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/css-what/-/css-what-1.0.0.tgz", - "integrity": "sha1-18wt9FGAZm+Z0rFEYmOUaeAPc2w=" - }, - "dashdash": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", - "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", - "requires": { - "assert-plus": "^1.0.0" - }, - "dependencies": { - "assert-plus": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", - "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=" - } - } - }, "dateformat": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-3.0.3.tgz", @@ -962,60 +829,16 @@ "esutils": "^2.0.2" } }, - "dom-serializer": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.1.tgz", - "integrity": "sha512-l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA==", - "requires": { - "domelementtype": "^1.3.0", - "entities": "^1.1.1" - } - }, - "domelementtype": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz", - "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==" - }, - "domhandler": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.3.0.tgz", - "integrity": "sha1-LeWaCCLVAn+r/28DLCsloqir5zg=", - "requires": { - "domelementtype": "1" - } - }, - "domutils": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.4.3.tgz", - "integrity": "sha1-CGVRN5bGswYDGFDhdVFrr4C3Km8=", - "requires": { - "domelementtype": "1" - } - }, "dotenv": { "version": "8.2.0", "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-8.2.0.tgz", "integrity": "sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw==" }, - "ecc-jsbn": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz", - "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=", - "requires": { - "jsbn": "~0.1.0", - "safer-buffer": "^2.1.0" - } - }, "emoji-regex": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" }, - "entities": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz", - "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==" - }, "error-ex": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", @@ -1526,11 +1349,6 @@ "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz", "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==" }, - "extend": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", - "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==" - }, "external-editor": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz", @@ -1542,11 +1360,6 @@ "tmp": "^0.0.33" } }, - "extsprintf": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", - "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=" - }, "fast-deep-equal": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz", @@ -1639,11 +1452,6 @@ "signal-exit": "^3.0.2" } }, - "forever-agent": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", - "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=" - }, "form-data": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.0.tgz", @@ -1746,21 +1554,6 @@ "resolved": "https://registry.npmjs.org/get-youtube-id/-/get-youtube-id-1.0.1.tgz", "integrity": "sha512-5yidLzoLXbtw82a/Wb7LrajkGn29BM6JuLWeHyNfzOGp1weGyW4+7eMz6cP23+etqj27VlOFtq8fFFDMLq/FXQ==" }, - "getpass": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", - "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", - "requires": { - "assert-plus": "^1.0.0" - }, - "dependencies": { - "assert-plus": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", - "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=" - } - } - }, "glob": { "version": "7.1.6", "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", @@ -1793,20 +1586,6 @@ "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz", "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==" }, - "har-schema": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz", - "integrity": "sha1-0mMTX0MwfALGAq/I/pWXDAFRNp4=" - }, - "har-validator": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz", - "integrity": "sha1-M0gdDxu/9gDdID11gSpqX7oALio=", - "requires": { - "ajv": "^4.9.1", - "har-schema": "^1.0.5" - } - }, "has": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", @@ -1847,22 +1626,6 @@ "node-fetch": "^2.6.0" } }, - "hawk": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz", - "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=", - "requires": { - "boom": "2.x.x", - "cryptiles": "2.x.x", - "hoek": "2.x.x", - "sntp": "1.x.x" - } - }, - "hoek": { - "version": "2.16.3", - "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz", - "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=" - }, "hosted-git-info": { "version": "2.8.8", "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz", @@ -1879,65 +1642,6 @@ "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz", "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==" }, - "htmlparser2": { - "version": "3.8.3", - "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.3.tgz", - "integrity": "sha1-mWwosZFRaovoZQGn15dX5ccMEGg=", - "requires": { - "domelementtype": "1", - "domhandler": "2.3", - "domutils": "1.5", - "entities": "1.0", - "readable-stream": "1.1" - }, - "dependencies": { - "domutils": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz", - "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=", - "requires": { - "dom-serializer": "0", - "domelementtype": "1" - } - }, - "entities": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/entities/-/entities-1.0.0.tgz", - "integrity": "sha1-sph6o4ITR/zeZCsk/fyeT7cSvyY=" - }, - "isarray": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", - "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=" - }, - "readable-stream": { - "version": "1.1.14", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", - "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=", - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.1", - "isarray": "0.0.1", - "string_decoder": "~0.10.x" - } - }, - "string_decoder": { - "version": "0.10.31", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", - "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=" - } - } - }, - "http-signature": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz", - "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=", - "requires": { - "assert-plus": "^0.2.0", - "jsprim": "^1.2.2", - "sshpk": "^1.7.0" - } - }, "https-proxy-agent": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-4.0.0.tgz", @@ -2143,11 +1847,6 @@ "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=" }, - "isstream": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", - "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=" - }, "istanbul-lib-coverage": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz", @@ -2239,46 +1938,23 @@ "esprima": "^4.0.0" } }, - "jsbn": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", - "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=" - }, "jsesc": { "version": "2.5.2", "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==" }, - "json-schema": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz", - "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=" - }, "json-schema-traverse": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", "dev": true }, - "json-stable-stringify": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz", - "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=", - "requires": { - "jsonify": "~0.0.0" - } - }, "json-stable-stringify-without-jsonify": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=", "dev": true }, - "json-stringify-safe": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", - "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=" - }, "json5": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.2.tgz", @@ -2287,29 +1963,6 @@ "minimist": "^1.2.5" } }, - "jsonify": { - "version": "0.0.0", - "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz", - "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=" - }, - "jsprim": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz", - "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=", - "requires": { - "assert-plus": "1.0.0", - "extsprintf": "1.3.0", - "json-schema": "0.2.3", - "verror": "1.10.0" - }, - "dependencies": { - "assert-plus": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", - "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=" - } - } - }, "kareem": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/kareem/-/kareem-2.3.1.tgz", @@ -2363,11 +2016,6 @@ "resolved": "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz", "integrity": "sha1-+wMJF/hqMTTlvJvsDWngAT3f7bI=" }, - "lodash.isfunction": { - "version": "3.0.9", - "resolved": "https://registry.npmjs.org/lodash.isfunction/-/lodash.isfunction-3.0.9.tgz", - "integrity": "sha512-AirXNj15uRIMMPihnkInB4i3NHeb4iBtNg9WRWuK2o31S+ePwwNmDPaTL3o7dTJ+VXNZim7rFs4rxN4YU1oUJw==" - }, "lru_map": { "version": "0.3.3", "resolved": "https://registry.npmjs.org/lru_map/-/lru_map-0.3.3.tgz", @@ -2692,14 +2340,6 @@ "set-blocking": "~2.0.0" } }, - "nth-check": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz", - "integrity": "sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==", - "requires": { - "boolbase": "~1.0.0" - } - }, "number-is-nan": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", @@ -2740,11 +2380,6 @@ "yargs": "^15.0.2" } }, - "oauth-sign": { - "version": "0.8.2", - "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz", - "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=" - }, "object-assign": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", @@ -2931,11 +2566,6 @@ "pify": "^2.0.0" } }, - "performance-now": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz", - "integrity": "sha1-M+8wxcd9TqIcWlOGnZG1bY8lVeU=" - }, "pify": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", @@ -2980,16 +2610,6 @@ "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==", "dev": true }, - "punycode": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", - "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=" - }, - "qs": { - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz", - "integrity": "sha1-E+JtKK1rD/qpExLNO/cI7TUecjM=" - }, "rc": { "version": "1.2.8", "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz", @@ -3113,66 +2733,6 @@ "es6-error": "^4.0.1" } }, - "request": { - "version": "2.81.0", - "resolved": "https://registry.npmjs.org/request/-/request-2.81.0.tgz", - "integrity": "sha1-xpKJRqDgbF+Nb4qTM0af/aRimKA=", - "requires": { - "aws-sign2": "~0.6.0", - "aws4": "^1.2.1", - "caseless": "~0.12.0", - "combined-stream": "~1.0.5", - "extend": "~3.0.0", - "forever-agent": "~0.6.1", - "form-data": "~2.1.1", - "har-validator": "~4.2.1", - "hawk": "~3.1.3", - "http-signature": "~1.1.0", - "is-typedarray": "~1.0.0", - "isstream": "~0.1.2", - "json-stringify-safe": "~5.0.1", - "mime-types": "~2.1.7", - "oauth-sign": "~0.8.1", - "performance-now": "^0.2.0", - "qs": "~6.4.0", - "safe-buffer": "^5.0.1", - "stringstream": "~0.0.4", - "tough-cookie": "~2.3.0", - "tunnel-agent": "^0.6.0", - "uuid": "^3.0.0" - }, - "dependencies": { - "form-data": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz", - "integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=", - "requires": { - "asynckit": "^0.4.0", - "combined-stream": "^1.0.5", - "mime-types": "^2.1.12" - } - } - } - }, - "request-promise": { - "version": "4.2.5", - "resolved": "https://registry.npmjs.org/request-promise/-/request-promise-4.2.5.tgz", - "integrity": "sha512-ZgnepCykFdmpq86fKGwqntyTiUrHycALuGggpyCZwMvGaZWgxW6yagT0FHkgo5LzYvOaCNvxYwWYIjevSH1EDg==", - "requires": { - "bluebird": "^3.5.0", - "request-promise-core": "1.1.3", - "stealthy-require": "^1.1.1", - "tough-cookie": "^2.3.3" - } - }, - "request-promise-core": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.3.tgz", - "integrity": "sha512-QIs2+ArIGQVp5ZYbWD5ZLCY29D5CfWizP8eWnm8FoGD1TX61veauETVQbrV60662V0oFBkrDOuaBI8XgtuyYAQ==", - "requires": { - "lodash": "^4.17.15" - } - }, "require-directory": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", @@ -3363,14 +2923,6 @@ "resolved": "https://registry.npmjs.org/sliced/-/sliced-1.0.1.tgz", "integrity": "sha1-CzpmK10Ewxd7GSa+qCsD+Dei70E=" }, - "sntp": { - "version": "1.0.9", - "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz", - "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=", - "requires": { - "hoek": "2.x.x" - } - }, "source-map": { "version": "0.5.7", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", @@ -3435,39 +2987,6 @@ "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=" }, - "sshpk": { - "version": "1.16.1", - "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz", - "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==", - "requires": { - "asn1": "~0.2.3", - "assert-plus": "^1.0.0", - "bcrypt-pbkdf": "^1.0.0", - "dashdash": "^1.12.0", - "ecc-jsbn": "~0.1.1", - "getpass": "^0.1.1", - "jsbn": "~0.1.0", - "safer-buffer": "^2.0.2", - "tweetnacl": "~0.14.0" - }, - "dependencies": { - "assert-plus": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", - "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=" - }, - "tweetnacl": { - "version": "0.14.5", - "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", - "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=" - } - } - }, - "stealthy-require": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz", - "integrity": "sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=" - }, "string-width": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz", @@ -3524,11 +3043,6 @@ "safe-buffer": "~5.1.0" } }, - "stringstream": { - "version": "0.0.6", - "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.6.tgz", - "integrity": "sha512-87GEBAkegbBcweToUrdzf3eLhWNg06FJTebl4BVJz/JgWy8CvEr9dRtX5qWphiynMSQlxxi+QqN0z5T32SLlhA==" - }, "strip-ansi": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", @@ -3675,14 +3189,6 @@ "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=" }, - "tough-cookie": { - "version": "2.3.4", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz", - "integrity": "sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==", - "requires": { - "punycode": "^1.4.1" - } - }, "tracer": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/tracer/-/tracer-1.0.2.tgz", @@ -3700,14 +3206,6 @@ "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.11.1.tgz", "integrity": "sha512-aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA==" }, - "tunnel-agent": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", - "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", - "requires": { - "safe-buffer": "^5.0.1" - } - }, "tweetnacl": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-1.0.3.tgz", @@ -3778,23 +3276,6 @@ "spdx-expression-parse": "^3.0.0" } }, - "verror": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", - "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", - "requires": { - "assert-plus": "^1.0.0", - "core-util-is": "1.0.2", - "extsprintf": "^1.2.0" - }, - "dependencies": { - "assert-plus": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", - "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=" - } - } - }, "which": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", @@ -3928,33 +3409,6 @@ "decamelize": "^1.2.0" } }, - "youtube-info": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/youtube-info/-/youtube-info-1.3.2.tgz", - "integrity": "sha512-LnBZxCuCof0bwFNtLSxklLYgaU1XR8OK+cGieWyPS10rn3P0TMHdIikRpO/W/duE9SR9JfzOk8ThgwDgx0B3Vw==", - "requires": { - "cheerio": "^0.19.0", - "debug": "^2.2.0", - "lodash.isfunction": "^3.0.6", - "request": "2.81.0", - "request-promise": "^4.2.2" - }, - "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "requires": { - "ms": "2.0.0" - } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" - } - } - }, "ytdl-core": { "version": "1.0.9", "resolved": "https://registry.npmjs.org/ytdl-core/-/ytdl-core-1.0.9.tgz", diff --git a/package.json b/package.json index a5cdbe8..9d9e7ee 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,6 @@ "node-fetch": "^2.6.0", "prism-media": "^1.2.1", "tracer": "^1.0.2", - "youtube-info": "^1.3.2", "ytdl-core-discord": "^1.1.0" }, "devDependencies": { From a067c957c1a6fc920dd9f7d4d382eb395b2a78fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Hor=C3=A1=C4=8Dek?= Date: Sun, 12 Apr 2020 11:33:56 +0200 Subject: [PATCH 082/156] remove comments from music --- helpers/music.js | 7 ------- 1 file changed, 7 deletions(-) diff --git a/helpers/music.js b/helpers/music.js index 34abb3d..1b25306 100644 --- a/helpers/music.js +++ b/helpers/music.js @@ -1,10 +1,3 @@ -/* -const ytdl = require('ytdl-core-discord') -const youtubeInfo = require('youtube-info') -const getYoutubeId = require('get-youtube-id') -const fetch = require('node-fetch') -*/ - const ytdl = require('ytdl-core-discord'); const fetch = require('node-fetch'); From 9fd2c873ca2bd365ba128d3e6c52b05590131035 Mon Sep 17 00:00:00 2001 From: mudkipscience Date: Mon, 13 Apr 2020 14:28:53 +1000 Subject: [PATCH 083/156] fix code format --- commands/play.js | 9 +- commands/volume.js | 24 ++--- events/message.js | 11 +-- helpers/music.js | 216 ++++++++++++++++++++++----------------------- index.js | 20 +++-- 5 files changed, 136 insertions(+), 144 deletions(-) diff --git a/commands/play.js b/commands/play.js index e2b33d9..a294716 100644 --- a/commands/play.js +++ b/commands/play.js @@ -4,8 +4,7 @@ exports.conf = { aliases: [], permLevel: 'User', requiredPerms: [], - cooldown: 2000, - joinArguments: 1 + cooldown: 2000 } exports.help = { @@ -16,6 +15,6 @@ exports.help = { parameters: '[query] - A query to find video by or a link to the video.' } -exports.run = async (client, message, args, level, data) => { - await client.music.play(message, args[0]); -}; \ No newline at end of file +exports.run = async (client, message, [...args], level, data) => { + await client.music.play(message, args) +} diff --git a/commands/volume.js b/commands/volume.js index 5b4748a..8a02f74 100644 --- a/commands/volume.js +++ b/commands/volume.js @@ -1,9 +1,9 @@ exports.conf = { enabled: true, guildOnly: true, - aliases: [], + aliases: ['vol'], permLevel: 'Moderator', - requiredPerms: ['vol'], + requiredPerms: [], cooldown: 2000 } @@ -16,17 +16,17 @@ exports.help = { } exports.run = async (client, message, args, level, data) => { - let vol = args[0]; + let vol = args[0] - if(vol) { - vol = Number(vol); + if (vol) { + vol = Number(vol) - vol = vol / 100 * 0.5; + vol = vol / 100 * 0.5 - if(vol <= 1) { - client.music.setVolume(message.guild, vol); + if (vol <= 1) { + client.music.setVolume(message.guild, vol) - message.reply('set volume to ' + vol * 100 + '%'); - }; - }; -}; \ No newline at end of file + message.reply('set volume to ' + vol * 100 + '%') + } + } +} diff --git a/events/message.js b/events/message.js index 13a46c2..2375cb1 100644 --- a/events/message.js +++ b/events/message.js @@ -106,15 +106,6 @@ module.exports = async (client, message) => { message.flags.push(args.shift().slice(1)) } - let argsPossiblyJoined = args; - - if(cmd.conf.joinArguments) { - if(args.length > cmd.conf.joinArguments && args.length > 1) - { - argsPossiblyJoined[cmd.conf.joinArguments - 1] = args.slice(cmd.conf.joinArguments - 1).join(' '); - } - }; - client.logger.log(`Command ran: ${cmd.help.name}`) - cmd.run(client, message, argsPossiblyJoined, level, data) + cmd.run(client, message, args, level, data) } diff --git a/helpers/music.js b/helpers/music.js index 1b25306..732e0b7 100644 --- a/helpers/music.js +++ b/helpers/music.js @@ -1,8 +1,8 @@ -const ytdl = require('ytdl-core-discord'); -const fetch = require('node-fetch'); +const ytdl = require('ytdl-core-discord') +const fetch = require('node-fetch') module.exports = client => { - client.music = {guilds: {}}; + client.music = { guilds: {} } // MUSIC - TIMESTAMP client.createTimestamp = function (duration) { @@ -30,137 +30,137 @@ module.exports = client => { return time } - client.music.getGuild = function(id) { - let guild = client.music.guilds[id]; + client.music.getGuild = function (id) { + let guild = client.music.guilds[id] - if(!guild) { - guild = {}; + if (!guild) { + guild = {} - guild.dispatcher = null; - guild.playing = false; - guild.queue = []; + guild.dispatcher = null + guild.playing = false + guild.queue = [] - client.music.guilds[id] = guild; - }; - - return guild; - }; - - client.music.isYouTubeLink = function(query) { - return query.startsWith('https://youtube.com/') || query.startsWith('http://youtube.com/') || query.startsWith('https://youtu.be/') || query.startsWith('http://youtu.be/') || query.startsWith('https://m.youtube.com/') || query.startsWith('http://m.youtube.com/') || query.startsWith('https://www.youtube.com/') || query.startsWith('http://www.youtube.com/'); - }; - - client.music.getLinkFromID = function(id) { - return 'https://www.youtube.com/watch?v=' + id; - }; - - client.music.getVideoByQuery = async function(query) { - let isLink = client.music.isYouTubeLink(query); - - let response; - - if(isLink) { - response = await fetch('https://www.googleapis.com/youtube/v3/search?key=' + client.config.keys.yt + '&part=id,snippet&maxResults=1&type=video&id=' + id); - } else { - // TODO: replace this workaround - response = await fetch('https://www.googleapis.com/youtube/v3/search?key=' + client.config.keys.yt + '&part=id,snippet&maxResults=1&type=video&q=**' + encodeURIComponent(query) + '**'); - }; - - let parsed = await response.json(); - - if(parsed.items) { - let video = parsed.items[0]; - - if(video) { - return video; - } else { - return false; - }; - } else { - return false; - }; - }; - - client.music.play = async function(message, query, ignoreQueue) { - let guild = client.music.getGuild(message.guild.id); - - if(!message.member.voice.channel && !guild.voiceChannel) { - return message.reply('you are not in a voice channel!'); + client.music.guilds[id] = guild } - let vc = message.member.voice.channel; + return guild + } - let video; - - if(!ignoreQueue) { - video = await client.music.getVideoByQuery(query); - }; + client.music.isYouTubeLink = function (query) { + return query.startsWith('https://youtube.com/') || query.startsWith('http://youtube.com/') || query.startsWith('https://youtu.be/') || query.startsWith('http://youtu.be/') || query.startsWith('https://m.youtube.com/') || query.startsWith('http://m.youtube.com/') || query.startsWith('https://www.youtube.com/') || query.startsWith('http://www.youtube.com/') + } - if(video || ignoreQueue) { - if(!ignoreQueue) { - // Fix the bot if somehow broken + client.music.getLinkFromID = function (id) { + return 'https://www.youtube.com/watch?v=' + id + } + + client.music.getVideoByQuery = async function (query) { + const isLink = client.music.isYouTubeLink(query) + + let response + + if (isLink) { + response = await fetch('https://www.googleapis.com/youtube/v3/search?key=' + client.config.keys.yt + '&part=id,snippet&maxResults=1&type=video&id=' + id) + } else { + // TODO: replace this workaround + response = await fetch('https://www.googleapis.com/youtube/v3/search?key=' + client.config.keys.yt + '&part=id,snippet&maxResults=1&type=video&q=**' + encodeURIComponent(query) + '**') + } + + const parsed = await response.json() + + if (parsed.items) { + const video = parsed.items[0] + + if (video) { + return video + } else { + return false + } + } else { + return false + } + } + + client.music.play = async function (message, query, ignoreQueue) { + const guild = client.music.getGuild(message.guild.id) + + if (!message.member.voice.channel && !guild.voiceChannel) { + return message.reply('you are not in a voice channel!') + } + + const vc = message.member.voice.channel + + let video + + if (!ignoreQueue) { + video = await client.music.getVideoByQuery(query) + } + + if (video || ignoreQueue) { + if (!ignoreQueue) { + // Fix the bot if somehow broken // music "playing", nothing in queue - if((guild.playing || guild.dispatcher) && guild.queue.length == 0) { - guild.playing = false; - guild.dispatcher = null; + if ((guild.playing || guild.dispatcher) && guild.queue.length === 0) { + guild.playing = false + guild.dispatcher = null // music not playing, something is in queue - } else if(!guild.playing && !guild.dispatcher && guild.queue.length > 0) { - guild.queue = []; - }; + } else if (!guild.playing && !guild.dispatcher && guild.queue.length > 0) { + guild.queue = [] + } // Add video to queue - guild.queue.push({video: video, requestedBy: message.member.id}); - }; + guild.queue.push({ video: video, requestedBy: message.member.id }) + } - // Figure out if the bot should add it to queue or play it right now - if(guild.playing) { - message.reply('added **' + video.snippet.title + '** to the queue'); + // Figure out if the bot should add it to queue or play it right now + if (guild.playing) { + message.reply('added **' + video.snippet.title + '** to the queue') } else { - guild.playing = true; + guild.playing = true - guild.voiceChannel = vc; + guild.voiceChannel = vc - let connection = await vc.join(); - - let v = guild.queue[0]; + const connection = await vc.join() - guild.dispatcher = connection.play(await ytdl(client.music.getLinkFromID(v.video.id.videoId), {highWaterMark: 1024 * 1024 * 32}), {type: 'opus'}); - guild.dispatcher.setVolume(0.25); + const v = guild.queue[0] - message.channel.send('Playing **' + v.video.snippet.title + '**'); + guild.dispatcher = connection.play(await ytdl(client.music.getLinkFromID(v.video.id.videoId), { highWaterMark: 1024 * 1024 * 32 }), { type: 'opus' }) + guild.dispatcher.setVolume(0.25) + + message.channel.send('Playing **' + v.video.snippet.title + '**') // play next in queue on end guild.dispatcher.once('finish', () => { - guild.queue.shift(); - guild.playing = false; + guild.queue.shift() + guild.playing = false - if(guild.queue.length > 0) { - client.music.play(message, null, true); + if (guild.queue.length > 0) { + client.music.play(message, null, true) } else { - guild.dispatcher = null; + guild.dispatcher = null - connection.disconnect(); - }; - }); - }; + connection.disconnect() + } + }) + } } else { - return message.reply('failed to find the video!'); - }; - }; + return message.reply('failed to find the video!') + } + } - client.music.setVolume = function(guild, target) { - let g = client.music.getGuild(guild.id); + client.music.setVolume = function (guild, target) { + const g = client.music.getGuild(guild.id) - if(g.dispatcher) { - g.dispatcher.setVolume(target); - }; - }; + if (g.dispatcher) { + g.dispatcher.setVolume(target) + } + } - client.music.skip = function(guild, reason) { - let g = client.music.getGuild(guild.id); + client.music.skip = function (guild, reason) { + const g = client.music.getGuild(guild.id) - if(g.dispatcher) { - g.dispatcher.end(reason); - }; - }; + if (g.dispatcher) { + g.dispatcher.end(reason) + } + } } diff --git a/index.js b/index.js index 6ffb105..d553213 100644 --- a/index.js +++ b/index.js @@ -50,6 +50,14 @@ client.logger = require('tracer').colorConsole({ filters: [colors.white] }) +// Check if Woomy is running inside a Docker container +if (isDocker() === true) { + client.devmode = true + client.logger.warn('Running in development mode.') +} else { + client.devmode = false +} + // Create caches for permissions, commands, cooldowns and aliases client.levelCache = {} client.commands = new Discord.Collection() @@ -59,7 +67,9 @@ client.aliases = new Discord.Collection() // Main initialisation function const init = async () => { // initialise sentry - if (client.config.keys.sentry != '') sentry.init({dsn: client.config.keys.sentry}) + if (client.config.keys.sentry !== '' && client.devmode === false) { + sentry.init({ dsn: client.config.keys.sentry }) + } // Command handler fs.readdir('./commands', (err, files) => { @@ -101,14 +111,6 @@ const init = async () => { client.levelCache[thisLevel.name] = thisLevel.level } - // Check if Woomy is running inside a Docker container - if (isDocker() === true) { - client.devmode = true - client.logger.warn('Running in development mode.') - } else { - client.devmode = false - } - // Initialise DB await client.db.init(client) From b36a746bb4f75c4928067f57b89afcdae91e8753 Mon Sep 17 00:00:00 2001 From: mudkipscience Date: Mon, 13 Apr 2020 19:29:47 +1000 Subject: [PATCH 084/156] Added some stuff, changed how usererrs are called --- commands/8ball.js | 33 +++++++++++++++++++++++++++++++++ commands/emoji.js | 2 +- commands/help.js | 14 +++++++++----- commands/myprefix.js | 34 ++++++++++++++++++++++++++++++++++ commands/prefix.js | 34 ++++++++++++++++++++++++++++++++++ commands/pride.js | 2 +- events/message.js | 29 +++++++++++++++++++++-------- helpers/_functions.js | 22 ++++++++++++++++------ 8 files changed, 149 insertions(+), 21 deletions(-) create mode 100644 commands/8ball.js create mode 100644 commands/myprefix.js create mode 100644 commands/prefix.js diff --git a/commands/8ball.js b/commands/8ball.js new file mode 100644 index 0000000..7ed2b35 --- /dev/null +++ b/commands/8ball.js @@ -0,0 +1,33 @@ +exports.conf = { + enabled: true, + guildOnly: false, + aliases: [], + permLevel: 'User', + requiredPerms: [], + cooldown: 2000 +} + +exports.help = { + name: '8ball', + category: 'Fun', + description: 'Retrieves an answer to your question from the almighty 8ball.', + usage: '`8ball [question]` - Retrieves an answer from 8ball based on the question or sentence provided.', + parameters: '`question` - the question you want to ask' +} + +exports.run = async (client, message, args, level, data) => { + + // Finish later + const responses = [ + 'No darndested clue.', + '¯\\_(ツ)_/¯', + 'Stupid question. You should be ashamed of yourself for even asking.', + 'Yes!', + 'Not in your wildest dreams!', + 'No chance.', + 'Never.', + 'Possibly.', + 'There\'s a high chance.', + 'I\'d rather not say.' + ] +} diff --git a/commands/emoji.js b/commands/emoji.js index cfe7f32..55306f3 100644 --- a/commands/emoji.js +++ b/commands/emoji.js @@ -16,7 +16,7 @@ exports.help = { exports.run = async (client, message, args) => { if (!args[0]) { - return message.channel.send(client.userError(exports, 'Missing argument, the `emoji` argument is required!')) + return client.userError(message, exports, 'Missing argument, the `emoji` argument is required!') }; var ID diff --git a/commands/help.js b/commands/help.js index b317d7d..5bf42d1 100644 --- a/commands/help.js +++ b/commands/help.js @@ -34,14 +34,18 @@ exports.run = (client, message, args, level, data) => { if (!args[0]) { let uPrefix = '`' + data.user.prefix + '`' - let gPrefix = '`' + data.guild.prefix + '`' + let gPrefix = '' if (client.config.defaultPrefix === data.user.prefix) { uPrefix = 'None set, use: `~myprefix' } - if (client.config.defaultPrefix === data.guild.prefix) { - gPrefix = 'None set, use: `~prefix`' + if (message.guild) { + gPrefix = 'Server Prefix: `' + data.guild.prefix + '`' + + if (client.config.defaultPrefix === data.guild.prefix) { + gPrefix = 'Server Prefix: None set, use: `~prefix`' + } } embed.setTitle('Help & Commands') @@ -49,7 +53,7 @@ exports.run = (client, message, args, level, data) => { if (client.version.news.length > 0) { embed.addField('**News**', client.version.news) } - embed.addField('**Prefixes**', `Default Prefix: \`${client.config.defaultPrefix}\`\nServer Prefix: ${gPrefix}\nUser Prefix: ${uPrefix}`) + embed.addField('**Prefixes**', `Default Prefix: \`${client.config.defaultPrefix}\`\nUser Prefix: ${uPrefix}\nServer Prefix: ${gPrefix}`) embed.addField('**Command Syntax**', 'For arguments in commands:\n» Arguments in `[]` brackets are required.\n» Arguments in `<>` brackets are optional.\n» Arguments prefixed with `-` are flags, and are placed at the start of the command (`avatar -jpg mudkipscience`)') embed.addField('**Commands**', `Use \`${message.prefix}help all\` to view all commands, or \`${message.prefix}help \` for more information on a specific command.\n\n[Bot Invite](https://discordapp.com/oauth2/authorize?client_id=${client.user.id}&permissions=2134240503&scope=bot) | [Discord Server](https://discord.gg/HCF8mdv) | [GitHub](https://github.com/mudkipscience/woomy) | [Vote for me!](https://top.gg/bot/435961704145485835/vote)`) @@ -79,7 +83,7 @@ exports.run = (client, message, args, level, data) => { aliases = '`' + cmd.conf.aliases.join('`, `') + '`' } - embed.setTitle(cmd.help.category.toLowerCase() + ':' + cmd.help.name) + embed.setTitle(`${cmd.help.category} -> ${cmd.help.name}`) embed.setDescription(cmd.help.description) embed.addField('**Usage**', cmd.help.usage) if (cmd.help.parameters.length > 0) { diff --git a/commands/myprefix.js b/commands/myprefix.js new file mode 100644 index 0000000..f54cc7b --- /dev/null +++ b/commands/myprefix.js @@ -0,0 +1,34 @@ +exports.conf = { + enabled: true, + guildOnly: false, + aliases: [], + permLevel: 'User', + requiredPerms: [], + cooldown: 2000 // miliseconds +} + +exports.help = { + name: 'myprefix', + category: 'Settings', + description: 'Shows or changes the prefix Woomy uses for you.', + usage: '`myprefix` ', + parameters: '' +} + +exports.run = async (client, message, args, level, data) => { + const prefix = args.join(' ') + + if (!prefix) { + return message.channel.send(`Your current prefix is: \`${data.user.prefix}\``) + } + + if (prefix.toLowerCase() === 'reset') { + await client.updateUser(message.author, { prefix: client.config.defaultPrefix }) + + return message.channel.send('Your prefix has been reset.') + } + + await client.updateUser(message.author, { prefix: prefix }) + + message.channel.send(`Your prefix has been updated: \`${prefix}\``) +} diff --git a/commands/prefix.js b/commands/prefix.js new file mode 100644 index 0000000..10a1549 --- /dev/null +++ b/commands/prefix.js @@ -0,0 +1,34 @@ +exports.conf = { + enabled: true, + guildOnly: false, + aliases: [], + permLevel: 'User', + requiredPerms: [], + cooldown: 2000 // miliseconds +} + +exports.help = { + name: 'prefix', + category: 'Settings', + description: 'Shows or changes the prefix Woomy uses for this server.', + usage: 'prefix ', + params: '' +} + +exports.run = async (client, message, args, level, data) => { + const prefix = args.join(' ') + + if (!prefix) { + return message.channel.send(`Current server prefix: \`${data.guild.prefix}\``) + } + + if (prefix.toLowerCase() === 'reset') { + await client.updateGuild(message.guild, { prefix: client.config.defaultPrefix }) + + return message.channel.send('Server prefix has been reset.') + } + + await client.updateGuild(message.guild, { prefix: prefix }) + + message.channel.send(`The server prefix has been updated: \`${prefix}\``) +} diff --git a/commands/pride.js b/commands/pride.js index 606afaa..0343596 100644 --- a/commands/pride.js +++ b/commands/pride.js @@ -20,7 +20,7 @@ const Discord = require('discord.js') exports.run = (client, message, args) => { const flag = args[0] if (!flag) { - return message.channel.send(client.userError(exports, 'Missing argument, the `flag` argument is required!')) + return client.userError(message, exports, 'Missing argument, the `flag` argument is required!') } const available = ['lesbian', 'gay', 'bisexual', 'pansexual', 'trans', 'asexual', 'aromantic', 'ally'] diff --git a/events/message.js b/events/message.js index 2375cb1..097eae6 100644 --- a/events/message.js +++ b/events/message.js @@ -8,11 +8,6 @@ module.exports = async (client, message) => { const prefixes = [data.user.prefix] if (message.guild) { - if (!message.channel.permissionsFor(client.user).has('SEND_MESSAGES')) { - try { - return message.author.send(`I don't have permission to speak in \`#${message.channel.name}\`, Please ask a moderator to give me the send messages permission!`) - } catch (err) {} - } data.guild = await client.findOrCreateGuild(message.guild) prefixes.push(data.guild.prefix) } @@ -27,7 +22,6 @@ module.exports = async (client, message) => { if (message.content.indexOf(prefix) !== 0) return - console.log(prefix) if (prefix === `<@${client.user.id}> ` || prefix === `<@!${client.user.id}> `) { message.prefix = '@Woomy ' } else { @@ -44,6 +38,26 @@ module.exports = async (client, message) => { const cmd = client.commands.get(command) || client.commands.get(client.aliases.get(command)) if (!cmd) return + if (message.guild) { + if (!message.channel.permissionsFor(client.user).has('SEND_MESSAGES')) { + try { + return message.author.send(`I don't have permission to speak in \`#${message.channel.name}\`, Please ask a moderator to give me the send messages permission!`) + } catch (err) {} + } + + if (data.guild.disabledCommands.includes(cmd.help.name)) { + if (data.guild.systemNotice.enabled === true) { + return message.channel.send('This command has been disabled in this server.') + } + } + + if (data.guild.disabledCategories.includes(cmd.help.category)) { + if (data.guild.systemNotice.enabled === true) { + return message.channel.send('This category has been disabled in this server.') + } + } + } + if (!cmd.conf.enabled) { if (data.guild.systemNotice.enabled === true) { return message.channel.send('This command has been disabled by my developers.') @@ -53,7 +67,7 @@ module.exports = async (client, message) => { } if (cmd && !message.guild && cmd.conf.guildOnly) { - return message.channel.send('This command is unavailable via private message. Please run this command in a guild.') + return message.channel.send('This command is unavailable in direct messages! Please run this command in a server.') } if (message.guild) { @@ -100,7 +114,6 @@ module.exports = async (client, message) => { message.author.permLevel = level - // Might use this message.flags = [] while (args[0] && args[0][0] === '-') { message.flags.push(args.shift().slice(1)) diff --git a/helpers/_functions.js b/helpers/_functions.js index adfc714..ca8e72b 100644 --- a/helpers/_functions.js +++ b/helpers/_functions.js @@ -35,7 +35,7 @@ module.exports = client => { // Update guild settings client.updateGuild = async (guild, settings) => { - let data = await client.getGuild(guild) + let data = await client.findOrCreateGuild(guild) if (typeof data !== 'object') data = {} for (const key in settings) { @@ -49,7 +49,7 @@ module.exports = client => { // Delete guild settings client.deleteGuild = async (guild) => { - const data = await client.getGuild(guild) + const data = await client.findOrCreateGuild(guild) if (data) { data.deleteOne({ guildID: guild.id }) } @@ -69,7 +69,7 @@ module.exports = client => { // Update user settings client.updateUser = async (user, settings) => { - let data = await client.getUser(user) + let data = await client.findOrCreateUser(user) if (typeof data !== 'object') data = {} for (const key in settings) { @@ -83,7 +83,7 @@ module.exports = client => { // Delete user settings client.deleteUser = async (user) => { - const data = await client.getUser(user) + const data = await client.findOrCreateUser(user) if (data) { data.deleteOne({ userID: user.id }) } @@ -133,7 +133,7 @@ module.exports = client => { } // Creates an embed for when commands are used incorrectly - client.userError = (cmd, err) => { + client.userError = (msg, cmd, err) => { const embed = new MessageEmbed() embed.setColor('#EF5350') embed.setTitle(cmd.help.name + ':' + cmd.help.category.toLowerCase()) @@ -141,7 +141,9 @@ module.exports = client => { embed.addField('**Usage**', cmd.help.usage) embed.addField('**Parameters**', cmd.help.parameters) embed.setFooter(`Run 'help ${cmd.help.name}' for more information.`) - return embed + msg.channel.send(embed).then(msg => { + msg.delete({ timeout: 60000 }) + }) } // Clean up input to remove @everyone, token, etc @@ -185,6 +187,14 @@ module.exports = client => { } } + // Capitalises the first letter of every word in a string + // eslint-disable-next-line no-extend-native + Object.defineProperty(String.prototype, 'toProperCase', { + value: function () { + return this.replace(/([^\W_]+[^\s-]*) */g, (txt) => txt.charAt(0).toUpperCase() + txt.substr(1).toLowerCase()) + } + }) + // Returns a random int between min and max client.intBetween = function (min, max) { return Math.floor((Math.random() * (max - min)) + min) From dad836e6302ff37c6c88cd2c539bb208a5beac64 Mon Sep 17 00:00:00 2001 From: mudkipscience Date: Tue, 14 Apr 2020 15:28:25 +1000 Subject: [PATCH 085/156] (WIP) fredboat style selection menu for music --- commands/forceskip.js | 2 +- commands/play.js | 4 ++-- helpers/music.js | 55 +++++++++++++++++++++++++++++++++++-------- 3 files changed, 48 insertions(+), 13 deletions(-) diff --git a/commands/forceskip.js b/commands/forceskip.js index d79a431..7a72b8f 100644 --- a/commands/forceskip.js +++ b/commands/forceskip.js @@ -2,7 +2,7 @@ exports.conf = { enabled: true, guildOnly: true, aliases: [], - permLevel: 'Moderator', + permLevel: 'User', requiredPerms: [], cooldown: 2000 } diff --git a/commands/play.js b/commands/play.js index a294716..2fe5497 100644 --- a/commands/play.js +++ b/commands/play.js @@ -15,6 +15,6 @@ exports.help = { parameters: '[query] - A query to find video by or a link to the video.' } -exports.run = async (client, message, [...args], level, data) => { - await client.music.play(message, args) +exports.run = async (client, message, args, level, data) => { + await client.music.play(message, args.join(' ')) } diff --git a/helpers/music.js b/helpers/music.js index 732e0b7..11ef0dd 100644 --- a/helpers/music.js +++ b/helpers/music.js @@ -1,5 +1,6 @@ const ytdl = require('ytdl-core-discord') const fetch = require('node-fetch') +const { MessageEmbed } = require('discord.js') module.exports = client => { client.music = { guilds: {} } @@ -63,16 +64,16 @@ module.exports = client => { response = await fetch('https://www.googleapis.com/youtube/v3/search?key=' + client.config.keys.yt + '&part=id,snippet&maxResults=1&type=video&id=' + id) } else { // TODO: replace this workaround - response = await fetch('https://www.googleapis.com/youtube/v3/search?key=' + client.config.keys.yt + '&part=id,snippet&maxResults=1&type=video&q=**' + encodeURIComponent(query) + '**') + response = await fetch('https://invidio.us/api/v1/search?q=' + encodeURIComponent(query) + '**') } const parsed = await response.json() - if (parsed.items) { - const video = parsed.items[0] + if (parsed[0]) { + const videos = parsed - if (video) { - return video + if (videos) { + return videos } else { return false } @@ -91,12 +92,13 @@ module.exports = client => { const vc = message.member.voice.channel let video + let videos if (!ignoreQueue) { - video = await client.music.getVideoByQuery(query) + videos = await client.music.getVideoByQuery(query) } - if (video || ignoreQueue) { + if (videos || ignoreQueue) { if (!ignoreQueue) { // Fix the bot if somehow broken // music "playing", nothing in queue @@ -108,13 +110,44 @@ module.exports = client => { guild.queue = [] } + if (videos[1]) { + let output = '' + let i = 0 + for (i = 0; i < 5; i++) { + if (!videos[i]) break + output += `\`${i + 1}:\` **[${videos[i].title}](https://www.youtube.com/watch?v=${videos[i].videoId})** \`[${client.createTimestamp(videos[i].lengthSeconds)}]\`\n` + } + + const embed = new MessageEmbed() + embed.setTitle('Please reply with a number `1-' + i + '` to select which song you want to add to the queue.') + embed.setColor(client.embedColour(message.guild)) + embed.setDescription(output) + const selection = await client.awaitReply(message, embed) + + for (i = 0; i < 4; i++) { + if ([`${i + 1}`].includes(selection)) { + if (!videos[i]) { + return message.channel.send('Invalid selection') + } + + video = videos[i] + + break + } + } + } + + if (!video) { + video = videos[0] + } + // Add video to queue guild.queue.push({ video: video, requestedBy: message.member.id }) } // Figure out if the bot should add it to queue or play it right now if (guild.playing) { - message.reply('added **' + video.snippet.title + '** to the queue') + message.reply('added **' + video.title + '** to the queue') } else { guild.playing = true @@ -124,10 +157,12 @@ module.exports = client => { const v = guild.queue[0] - guild.dispatcher = connection.play(await ytdl(client.music.getLinkFromID(v.video.id.videoId), { highWaterMark: 1024 * 1024 * 32 }), { type: 'opus' }) + console.log(v.video) + + guild.dispatcher = connection.play(await ytdl(client.music.getLinkFromID(v.video.videoId), { highWaterMark: 1024 * 1024 * 32 }), { type: 'opus' }) guild.dispatcher.setVolume(0.25) - message.channel.send('Playing **' + v.video.snippet.title + '**') + message.channel.send('Playing **' + v.video.title + '**') // play next in queue on end guild.dispatcher.once('finish', () => { From e146a324e9343c9332a85c2e29ec000d59067f77 Mon Sep 17 00:00:00 2001 From: mudkipscience Date: Tue, 14 Apr 2020 16:06:09 +1000 Subject: [PATCH 086/156] delete data folder --- data/PLACEHOLDER | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 data/PLACEHOLDER diff --git a/data/PLACEHOLDER b/data/PLACEHOLDER deleted file mode 100644 index e69de29..0000000 From 5dfbbb8e531af0585baac6ecf6966823261c744b Mon Sep 17 00:00:00 2001 From: mudkipscience Date: Tue, 14 Apr 2020 16:16:38 +1000 Subject: [PATCH 087/156] update dependencies --- package-lock.json | 236 +++++++++++++++++++++++----------------------- package.json | 9 +- 2 files changed, 122 insertions(+), 123 deletions(-) diff --git a/package-lock.json b/package-lock.json index 50a282c..e8a32b8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -43,24 +43,24 @@ } }, "@babel/generator": { - "version": "7.9.4", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.9.4.tgz", - "integrity": "sha512-rjP8ahaDy/ouhrvCoU1E5mqaitWrxwuNGU+dy1EpaoK48jZay4MdkskKGIMHLZNewg8sAsqpGSREJwP0zH3YQA==", + "version": "7.9.5", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.9.5.tgz", + "integrity": "sha512-GbNIxVB3ZJe3tLeDm1HSn2AhuD/mVcyLDpgtLXa5tplmWrJdF/elxB56XNqCuD6szyNkDi6wuoKXln3QeBmCHQ==", "requires": { - "@babel/types": "^7.9.0", + "@babel/types": "^7.9.5", "jsesc": "^2.5.1", "lodash": "^4.17.13", "source-map": "^0.5.0" } }, "@babel/helper-function-name": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.8.3.tgz", - "integrity": "sha512-BCxgX1BC2hD/oBlIFUgOCQDOPV8nSINxCwM3o93xP4P9Fq6aV5sgv2cOOITDMtCfQ+3PvHp3l689XZvAM9QyOA==", + "version": "7.9.5", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.9.5.tgz", + "integrity": "sha512-JVcQZeXM59Cd1qanDUxv9fgJpt3NeKUaqBqUEvfmQ+BCOKq2xUgaWZW2hr0dkbyJgezYuplEoh5knmrnS68efw==", "requires": { "@babel/helper-get-function-arity": "^7.8.3", "@babel/template": "^7.8.3", - "@babel/types": "^7.8.3" + "@babel/types": "^7.9.5" } }, "@babel/helper-get-function-arity": { @@ -224,29 +224,36 @@ } }, "@babel/traverse": { - "version": "7.9.0", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.0.tgz", - "integrity": "sha512-jAZQj0+kn4WTHO5dUZkZKhbFrqZE7K5LAQ5JysMnmvGij+wOdr+8lWqPeW0BcF4wFwrEXXtdGO7wcV6YPJcf3w==", + "version": "7.9.5", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.5.tgz", + "integrity": "sha512-c4gH3jsvSuGUezlP6rzSJ6jf8fYjLj3hsMZRx/nX0h+fmHN0w+ekubRrHPqnMec0meycA2nwCsJ7dC8IPem2FQ==", "requires": { "@babel/code-frame": "^7.8.3", - "@babel/generator": "^7.9.0", - "@babel/helper-function-name": "^7.8.3", + "@babel/generator": "^7.9.5", + "@babel/helper-function-name": "^7.9.5", "@babel/helper-split-export-declaration": "^7.8.3", "@babel/parser": "^7.9.0", - "@babel/types": "^7.9.0", + "@babel/types": "^7.9.5", "debug": "^4.1.0", "globals": "^11.1.0", "lodash": "^4.17.13" } }, "@babel/types": { - "version": "7.9.0", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.0.tgz", - "integrity": "sha512-BS9JKfXkzzJl8RluW4JGknzpiUV7ZrvTayM6yfqLTVBEnFtyowVIOu6rqxRd5cVO6yGoWf4T8u8dgK9oB+GCng==", + "version": "7.9.5", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.5.tgz", + "integrity": "sha512-XjnvNqenk818r5zMaba+sLQjnbda31UfUURv3ei0qPQw4u+j2jMyJ5b11y8ZHYTRSI3NnInQkkkRT4fLqqPdHg==", "requires": { - "@babel/helper-validator-identifier": "^7.9.0", + "@babel/helper-validator-identifier": "^7.9.5", "lodash": "^4.17.13", "to-fast-properties": "^2.0.0" + }, + "dependencies": { + "@babel/helper-validator-identifier": { + "version": "7.9.5", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.5.tgz", + "integrity": "sha512-/8arLKUFq882w4tWGj9JYzRpAlZgiWUJ+dtteNTDqrRBz9Iguck9Rn3ykuBDoUwh2TO4tSAJlrxDUOXWklJe4g==" + } } }, "@discordjs/collection": { @@ -272,6 +279,13 @@ "find-up": "^4.1.0", "js-yaml": "^3.13.1", "resolve-from": "^5.0.0" + }, + "dependencies": { + "resolve-from": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", + "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==" + } } }, "@istanbuljs/schema": { @@ -526,6 +540,11 @@ "safe-buffer": "^5.1.1" } }, + "bluebird": { + "version": "3.5.1", + "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz", + "integrity": "sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA==" + }, "brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", @@ -696,11 +715,6 @@ "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" }, - "confusing-browser-globals": { - "version": "1.0.9", - "resolved": "https://registry.npmjs.org/confusing-browser-globals/-/confusing-browser-globals-1.0.9.tgz", - "integrity": "sha512-KbS1Y0jMtyPgIxjO7ZzMAuUpAKMt1SzCL9fsrKsX6b0zJPTaT0SiSPmewwVZg9UAO83HVIlEhZF84LIjZ0lmAw==" - }, "console-control-strings": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", @@ -731,9 +745,9 @@ "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" }, "cross-spawn": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.1.tgz", - "integrity": "sha512-u7v4o84SwFpD32Z8IIcPZ6z1/ie24O6RU3RbtL5Y316l3KuHVPx9ItBgWQ6VlfAFnRnTtMUrsQ9MUUTuEZjogg==", + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.2.tgz", + "integrity": "sha512-PD6G8QG3S4FK/XCGFbEQrDqO2AnMMsy0meR7lerlIOHAAbkuavGU/pOqprrlvfTNjvowivTeBsjebAL0NSoMxw==", "requires": { "path-key": "^3.1.0", "shebang-command": "^2.0.0", @@ -781,6 +795,7 @@ "version": "1.1.3", "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz", "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==", + "dev": true, "requires": { "object-keys": "^1.0.12" } @@ -829,11 +844,6 @@ "esutils": "^2.0.2" } }, - "dotenv": { - "version": "8.2.0", - "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-8.2.0.tgz", - "integrity": "sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw==" - }, "emoji-regex": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", @@ -852,6 +862,7 @@ "version": "1.17.5", "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.5.tgz", "integrity": "sha512-BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg==", + "dev": true, "requires": { "es-to-primitive": "^1.2.1", "function-bind": "^1.1.1", @@ -870,6 +881,7 @@ "version": "1.2.1", "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==", + "dev": true, "requires": { "is-callable": "^1.1.4", "is-date-object": "^1.0.1", @@ -1020,16 +1032,6 @@ } } }, - "eslint-config-airbnb-base": { - "version": "14.1.0", - "resolved": "https://registry.npmjs.org/eslint-config-airbnb-base/-/eslint-config-airbnb-base-14.1.0.tgz", - "integrity": "sha512-+XCcfGyCnbzOnktDVhwsCAx+9DmrzEmuwxyHUJpw+kqBVT744OUBrB09khgFKlK1lshVww6qXGsYPZpavoNjJw==", - "requires": { - "confusing-browser-globals": "^1.0.9", - "object.assign": "^4.1.0", - "object.entries": "^1.1.1" - } - }, "eslint-config-standard": { "version": "14.1.1", "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-14.1.1.tgz", @@ -1483,7 +1485,8 @@ "function-bind": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" + "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", + "dev": true }, "functional-red-black-tree": { "version": "1.0.1", @@ -1549,11 +1552,6 @@ "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==" }, - "get-youtube-id": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/get-youtube-id/-/get-youtube-id-1.0.1.tgz", - "integrity": "sha512-5yidLzoLXbtw82a/Wb7LrajkGn29BM6JuLWeHyNfzOGp1weGyW4+7eMz6cP23+etqj27VlOFtq8fFFDMLq/FXQ==" - }, "glob": { "version": "7.1.6", "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", @@ -1590,6 +1588,7 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", + "dev": true, "requires": { "function-bind": "^1.1.1" } @@ -1602,7 +1601,8 @@ "has-symbols": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz", - "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==" + "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==", + "dev": true }, "has-unicode": { "version": "2.0.1", @@ -1633,9 +1633,9 @@ "dev": true }, "html-entities": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.2.1.tgz", - "integrity": "sha1-DfKTUfByEWNRXfueVUPl9u7VFi8=" + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.3.1.tgz", + "integrity": "sha512-rhE/4Z3hIhzHAUKbW8jVcCyuT5oJCXXqhN/6mXXVCpzTmvJnoH2HL/bt3EZ6p55jbFJBeAe1ZNpL5BugLujxNA==" }, "html-escaper": { "version": "2.0.2", @@ -1762,12 +1762,14 @@ "is-callable": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.5.tgz", - "integrity": "sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q==" + "integrity": "sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q==", + "dev": true }, "is-date-object": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz", - "integrity": "sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==" + "integrity": "sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==", + "dev": true }, "is-docker": { "version": "2.0.0", @@ -1804,6 +1806,7 @@ "version": "1.0.5", "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz", "integrity": "sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ==", + "dev": true, "requires": { "has": "^1.0.3" } @@ -1823,6 +1826,7 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz", "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==", + "dev": true, "requires": { "has-symbols": "^1.0.1" } @@ -1916,9 +1920,9 @@ } }, "istanbul-reports": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.0.1.tgz", - "integrity": "sha512-Vm9xwCiQ8t2cNNnckyeAV0UdxKpcQUz4nMxsBvIu8n2kmPSiyb5uaF/8LpmKr+yqL/MdOXaX2Nmdo4Qyxium9Q==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.0.2.tgz", + "integrity": "sha512-9tZvz7AiR3PEDNGiV9vIouQ/EAcqMXFmkcA1CDFTwOB98OZVDL0PH9glHotf5Ugp6GCOTypfzGWI/OqjWNCRUw==", "requires": { "html-escaper": "^2.0.0", "istanbul-lib-report": "^3.0.0" @@ -1956,9 +1960,9 @@ "dev": true }, "json5": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.2.tgz", - "integrity": "sha512-MoUOQ4WdiN3yxhm7NEVJSJrieAo5hNSLQ5sj05OTRHPL9HOBy8u4Bu88jsC1jvqAdN+E1bJmsUcZH+1HQxliqQ==", + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.3.tgz", + "integrity": "sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==", "requires": { "minimist": "^1.2.5" } @@ -2125,15 +2129,15 @@ } }, "mongoose": { - "version": "5.9.7", - "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-5.9.7.tgz", - "integrity": "sha512-WJOBh9WMvivqBK8my9HFtSzSySKdUxJPNGAwswEakAasWUcPXJl3yHMtZ4ngGnKbwTT9KnAr75xamlt/PouR9w==", + "version": "5.9.9", + "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-5.9.9.tgz", + "integrity": "sha512-pLkIkM7XQwfbQ+xK1l57Zv0DYPH190/I6Cv5+PbJGfAU0HvX0atMlp+vly8zcjNTEvTkVM80qA5eBYBvZyLYXw==", "requires": { "bson": "~1.1.1", "kareem": "2.3.1", "mongodb": "3.5.5", "mongoose-legacy-pluralize": "1.0.2", - "mpath": "0.6.0", + "mpath": "0.7.0", "mquery": "3.2.2", "ms": "2.1.2", "regexp-clone": "1.0.0", @@ -2148,9 +2152,9 @@ "integrity": "sha512-Yo/7qQU4/EyIS8YDFSeenIvXxZN+ld7YdV9LqFVQJzTLye8unujAWPZ4NWKfFA+RNjh+wvTWKY9Z3E5XM6ZZiQ==" }, "mpath": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/mpath/-/mpath-0.6.0.tgz", - "integrity": "sha512-i75qh79MJ5Xo/sbhxrDrPSEG0H/mr1kcZXJ8dH6URU5jD/knFxCVqVC/gVSW7GIXL/9hHWlT9haLbCXWOll3qw==" + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/mpath/-/mpath-0.7.0.tgz", + "integrity": "sha512-Aiq04hILxhz1L+f7sjGyn7IxYzWm1zLNNXcfhDtx04kZ2Gk7uvFdgZ8ts1cWa/6d0TQmag2yR8zSGZUmp0tFNg==" }, "mquery": { "version": "3.2.2", @@ -2164,11 +2168,6 @@ "sliced": "1.0.1" }, "dependencies": { - "bluebird": { - "version": "3.5.1", - "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz", - "integrity": "sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA==" - }, "debug": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", @@ -2346,9 +2345,9 @@ "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=" }, "nyc": { - "version": "15.0.0", - "resolved": "https://registry.npmjs.org/nyc/-/nyc-15.0.0.tgz", - "integrity": "sha512-qcLBlNCKMDVuKb7d1fpxjPR8sHeMVX0CHarXAVzrVWoFrigCkYR8xcrjfXSPi5HXM7EU78L6ywO7w1c5rZNCNg==", + "version": "15.0.1", + "resolved": "https://registry.npmjs.org/nyc/-/nyc-15.0.1.tgz", + "integrity": "sha512-n0MBXYBYRqa67IVt62qW1r/d9UH/Qtr7SF1w/nQLJ9KxvWF6b2xCHImRAixHN9tnMMYHC2P14uo6KddNGwMgGg==", "requires": { "@istanbuljs/load-nyc-config": "^1.0.0", "@istanbuljs/schema": "^0.1.2", @@ -2365,10 +2364,9 @@ "istanbul-lib-processinfo": "^2.0.2", "istanbul-lib-report": "^3.0.0", "istanbul-lib-source-maps": "^4.0.0", - "istanbul-reports": "^3.0.0", - "js-yaml": "^3.13.1", + "istanbul-reports": "^3.0.2", "make-dir": "^3.0.0", - "node-preload": "^0.2.0", + "node-preload": "^0.2.1", "p-map": "^3.0.0", "process-on-spawn": "^1.0.0", "resolve-from": "^5.0.0", @@ -2376,8 +2374,14 @@ "signal-exit": "^3.0.2", "spawn-wrap": "^2.0.0", "test-exclude": "^6.0.0", - "uuid": "^3.3.3", "yargs": "^15.0.2" + }, + "dependencies": { + "resolve-from": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", + "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==" + } } }, "object-assign": { @@ -2388,17 +2392,20 @@ "object-inspect": { "version": "1.7.0", "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.7.0.tgz", - "integrity": "sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw==" + "integrity": "sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw==", + "dev": true }, "object-keys": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", - "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==" + "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", + "dev": true }, "object.assign": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz", "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==", + "dev": true, "requires": { "define-properties": "^1.1.2", "function-bind": "^1.1.1", @@ -2406,17 +2413,6 @@ "object-keys": "^1.0.11" } }, - "object.entries": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.1.tgz", - "integrity": "sha512-ilqR7BgdyZetJutmDPfXCDffGa0/Yzl2ivVNpbx/g4UeWrCdRnFDUBrKJGLhGieRHDATnyZXWBeCb29k9CJysQ==", - "requires": { - "define-properties": "^1.1.3", - "es-abstract": "^1.17.0-next.1", - "function-bind": "^1.1.1", - "has": "^1.0.3" - } - }, "object.values": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.1.tgz", @@ -2480,9 +2476,9 @@ } }, "p-limit": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.2.tgz", - "integrity": "sha512-WGR+xHecKTr7EbUEhyLSh5Dube9JtdiG78ufaeLxTgpudf/20KqyMioIUZJAezlTIi6evxuoUs9YXc11cU+yzQ==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", "requires": { "p-try": "^2.0.0" } @@ -2752,11 +2748,6 @@ "semver": "^5.1.0" }, "dependencies": { - "resolve-from": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-2.0.0.tgz", - "integrity": "sha1-lICrIOlP+h2egKgEx+oUdhGWa1c=" - }, "semver": { "version": "5.7.1", "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", @@ -2773,9 +2764,9 @@ } }, "resolve-from": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", - "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==" + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-2.0.0.tgz", + "integrity": "sha1-lICrIOlP+h2egKgEx+oUdhGWa1c=" }, "restore-cursor": { "version": "3.1.0", @@ -3001,6 +2992,7 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.0.tgz", "integrity": "sha512-EEJnGqa/xNfIg05SxiPSqRS7S9qwDhYts1TSLR1BQfYUfPe1stofgGKvwERK9+9yf+PpfBMlpBaCHucXGPQfUA==", + "dev": true, "requires": { "define-properties": "^1.1.3", "es-abstract": "^1.17.5" @@ -3010,6 +3002,7 @@ "version": "2.1.2", "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz", "integrity": "sha512-gCA0tza1JBvqr3bfAIFJGqfdRTyPae82+KTnm3coDXkZN9wnuW3HjGgN386D7hfv5CHQYCI022/rJPVlqXyHSw==", + "dev": true, "requires": { "define-properties": "^1.1.3", "es-abstract": "^1.17.5", @@ -3020,6 +3013,7 @@ "version": "2.1.2", "resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.2.tgz", "integrity": "sha512-ZNRQ7sY3KroTaYjRS6EbNiiHrOkjihL9aQE/8gfQ4DtAC/aEBRHFJa44OmoWxGGqXuJlfKkZW4WcXErGr+9ZFg==", + "dev": true, "requires": { "define-properties": "^1.1.3", "es-abstract": "^1.17.5", @@ -3030,6 +3024,7 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.0.tgz", "integrity": "sha512-iCP8g01NFYiiBOnwG1Xc3WZLyoo+RuBymwIlWncShXDDJYWN6DbnM3odslBJdgCdRlq94B5s63NWAZlcn2CS4w==", + "dev": true, "requires": { "define-properties": "^1.1.3", "es-abstract": "^1.17.5" @@ -3190,15 +3185,22 @@ "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=" }, "tracer": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/tracer/-/tracer-1.0.2.tgz", - "integrity": "sha512-ukzih7M8odyOW97hKIj0pXZs8k4lCAiW4jBO6oUtZXx7RTMzrsoAMP/YHILYAu9BtjPL7GV7YJAlxeZ6GNx7YQ==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/tracer/-/tracer-1.0.3.tgz", + "integrity": "sha512-cP1wzE0eCzDrp6wMGG9Cg927qBPY18rPVMJ0BEjifHn5xVb7fbQDT5zjwItAyebUgF8hGY1N4VyI3hArGjffww==", "requires": { "colors": "1.4.0", "dateformat": "3.0.3", - "mkdirp": "^0.5.1", - "nyc": "^15.0.0", + "mkdirp": "^1.0.4", + "nyc": "^15.0.1", "tinytim": "0.1.1" + }, + "dependencies": { + "mkdirp": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", + "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==" + } } }, "tslib": { @@ -3410,24 +3412,24 @@ } }, "ytdl-core": { - "version": "1.0.9", - "resolved": "https://registry.npmjs.org/ytdl-core/-/ytdl-core-1.0.9.tgz", - "integrity": "sha512-HhFeLfjXU34h0FNHmSkSpKygdaYijSt8VNsC770VYBRFb+dyUKcm11cIKxu2MUSwT9znISZ0k1wFdaV/N5VW+Q==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/ytdl-core/-/ytdl-core-2.0.1.tgz", + "integrity": "sha512-PZBcVzQpkBxi9OQh9I4QIrYNmkbM/zh4QJQuxE8I6RojLUVYkkps5iLYquE3H+pwmBXtEXQMDJfVRajgdiz+iA==", "requires": { "html-entities": "^1.1.3", "m3u8stream": "^0.6.3", - "miniget": "^1.6.0", + "miniget": "^1.7.0", "sax": "^1.1.3" } }, "ytdl-core-discord": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/ytdl-core-discord/-/ytdl-core-discord-1.1.0.tgz", - "integrity": "sha512-uiaZWa9UG+he1F9p7Si9H6Tieyxd9dEhLi4958mHuebudQSEEPaaJHUEbFikcpB++5ogzynVOcvdeC+LFJGgEw==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/ytdl-core-discord/-/ytdl-core-discord-1.2.0.tgz", + "integrity": "sha512-BTE0eslSZzovThOAXbT9KZjsh2spu9y0nl9ZNrGNn4rLip8xocmYpDUEN8X03tTcGUybpzyN8J7wwM2/gNLRiA==", "requires": { - "@types/node": "^13.5.3", - "prism-media": "^1.0.1", - "ytdl-core": "^1.0.3" + "@types/node": "^13.11.1", + "prism-media": "^1.2.1", + "ytdl-core": "^2.0.1" } } } diff --git a/package.json b/package.json index 9d9e7ee..1782ee8 100644 --- a/package.json +++ b/package.json @@ -8,17 +8,14 @@ "@sentry/node": "^5.15.4", "colors": "^1.4.0", "discord.js": "^12.1.1", - "dotenv": "^8.2.0", - "eslint-config-airbnb-base": "^14.1.0", - "get-youtube-id": "^1.0.1", "hastebin-gen": "^2.0.5", "is-docker": "^2.0.0", "moment": "^2.24.0", - "mongoose": "^5.9.7", + "mongoose": "^5.9.9", "node-fetch": "^2.6.0", "prism-media": "^1.2.1", - "tracer": "^1.0.2", - "ytdl-core-discord": "^1.1.0" + "tracer": "^1.0.3", + "ytdl-core-discord": "^1.2.0" }, "devDependencies": { "eslint": "^6.8.0", From 6748f1fb0353d8b78340dfdbca9fc8b05990a573 Mon Sep 17 00:00:00 2001 From: mudkipscience Date: Tue, 14 Apr 2020 19:44:02 +1000 Subject: [PATCH 088/156] playing from links *kinda* works now --- helpers/music.js | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/helpers/music.js b/helpers/music.js index 11ef0dd..33a8c0c 100644 --- a/helpers/music.js +++ b/helpers/music.js @@ -47,21 +47,16 @@ module.exports = client => { return guild } - client.music.isYouTubeLink = function (query) { - return query.startsWith('https://youtube.com/') || query.startsWith('http://youtube.com/') || query.startsWith('https://youtu.be/') || query.startsWith('http://youtu.be/') || query.startsWith('https://m.youtube.com/') || query.startsWith('http://m.youtube.com/') || query.startsWith('https://www.youtube.com/') || query.startsWith('http://www.youtube.com/') - } - client.music.getLinkFromID = function (id) { return 'https://www.youtube.com/watch?v=' + id } client.music.getVideoByQuery = async function (query) { - const isLink = client.music.isYouTubeLink(query) - let response - if (isLink) { - response = await fetch('https://www.googleapis.com/youtube/v3/search?key=' + client.config.keys.yt + '&part=id,snippet&maxResults=1&type=video&id=' + id) + if (ytdl.validateURL(query)) { + const id = await await ytdl.getURLVideoID(query) + response = await fetch('https://invidio.us/api/v1/videos/' + id) } else { // TODO: replace this workaround response = await fetch('https://invidio.us/api/v1/search?q=' + encodeURIComponent(query) + '**') @@ -69,7 +64,7 @@ module.exports = client => { const parsed = await response.json() - if (parsed[0]) { + if (parsed) { const videos = parsed if (videos) { @@ -137,8 +132,10 @@ module.exports = client => { } } - if (!video) { + if (!video && videos[0]) { video = videos[0] + } else { + video = videos } // Add video to queue From 4eca40d2de4091025eb216bc202b649f9dc69d92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Hor=C3=A1=C4=8Dek?= Date: Tue, 14 Apr 2020 15:11:35 +0200 Subject: [PATCH 089/156] fix music --- helpers/music.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/helpers/music.js b/helpers/music.js index 33a8c0c..e5e562a 100644 --- a/helpers/music.js +++ b/helpers/music.js @@ -132,9 +132,11 @@ module.exports = client => { } } + + if (!video && videos[0]) { video = videos[0] - } else { + } else if(!video) { video = videos } @@ -153,9 +155,7 @@ module.exports = client => { const connection = await vc.join() const v = guild.queue[0] - - console.log(v.video) - + guild.dispatcher = connection.play(await ytdl(client.music.getLinkFromID(v.video.videoId), { highWaterMark: 1024 * 1024 * 32 }), { type: 'opus' }) guild.dispatcher.setVolume(0.25) From bb5b7edbb4c0c8786252f59064b76fee267a7921 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Hor=C3=A1=C4=8Dek?= Date: Tue, 14 Apr 2020 15:13:00 +0200 Subject: [PATCH 090/156] remove blank lines --- helpers/music.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/helpers/music.js b/helpers/music.js index e5e562a..d5cbd57 100644 --- a/helpers/music.js +++ b/helpers/music.js @@ -131,9 +131,7 @@ module.exports = client => { } } } - - - + if (!video && videos[0]) { video = videos[0] } else if(!video) { @@ -155,7 +153,7 @@ module.exports = client => { const connection = await vc.join() const v = guild.queue[0] - + guild.dispatcher = connection.play(await ytdl(client.music.getLinkFromID(v.video.videoId), { highWaterMark: 1024 * 1024 * 32 }), { type: 'opus' }) guild.dispatcher.setVolume(0.25) From 6487f20b70da5676f564b2a76929f1f898310899 Mon Sep 17 00:00:00 2001 From: mudkipscience Date: Wed, 15 Apr 2020 15:43:31 +1000 Subject: [PATCH 091/156] google blocked my IP lmao --- helpers/music.js | 44 +++++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/helpers/music.js b/helpers/music.js index d5cbd57..ec83e29 100644 --- a/helpers/music.js +++ b/helpers/music.js @@ -51,18 +51,18 @@ module.exports = client => { return 'https://www.youtube.com/watch?v=' + id } - client.music.getVideoByQuery = async function (query) { - let response + client.music.getVideoByQuery = async query => { + let resp - if (ytdl.validateURL(query)) { - const id = await await ytdl.getURLVideoID(query) - response = await fetch('https://invidio.us/api/v1/videos/' + id) - } else { - // TODO: replace this workaround - response = await fetch('https://invidio.us/api/v1/search?q=' + encodeURIComponent(query) + '**') + try { + const id = await ytdl.getURLVideoID(query) + resp = await fetch('https://invidio.us/api/v1/videos/' + id) + console.log(resp) + } catch (err) { + resp = await fetch('https://invidio.us/api/v1/search?q=' + encodeURIComponent(query)) } - const parsed = await response.json() + const parsed = await resp.json() if (parsed) { const videos = parsed @@ -91,6 +91,13 @@ module.exports = client => { if (!ignoreQueue) { videos = await client.music.getVideoByQuery(query) + if (!videos[1]) { + if (!videos[0]) { + video = videos + } else { + video = videos[0] + } + } } if (videos || ignoreQueue) { @@ -105,7 +112,7 @@ module.exports = client => { guild.queue = [] } - if (videos[1]) { + if (!video) { let output = '' let i = 0 for (i = 0; i < 5; i++) { @@ -118,26 +125,21 @@ module.exports = client => { embed.setColor(client.embedColour(message.guild)) embed.setDescription(output) const selection = await client.awaitReply(message, embed) + console.log(selection) - for (i = 0; i < 4; i++) { - if ([`${i + 1}`].includes(selection)) { - if (!videos[i]) { - return message.channel.send('Invalid selection') - } + switch (selection) { - video = videos[i] - - break - } } } - + if (!video && videos[0]) { video = videos[0] - } else if(!video) { + } else if (!video) { video = videos } + console.log(video) + // Add video to queue guild.queue.push({ video: video, requestedBy: message.member.id }) } From 82c86fa9b2aa7dfeae7b47e568ba03e85901c0ea Mon Sep 17 00:00:00 2001 From: mudkipscience Date: Fri, 17 Apr 2020 17:06:48 +1000 Subject: [PATCH 092/156] ship no longer breaks for numbers higher than 98 --- commands/ship.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/commands/ship.js b/commands/ship.js index 9db97cc..ee91729 100644 --- a/commands/ship.js +++ b/commands/ship.js @@ -57,7 +57,7 @@ exports.run = async (client, message, args, level, data) => { under += 10 } - if (rating > 99) { + if (rating >= 99) { meter.splice(9, 0, hearts.random()) } From 9b58684c16b0b9cf55f82866f39cc157c52108b2 Mon Sep 17 00:00:00 2001 From: mudkipscience Date: Sat, 18 Apr 2020 17:30:23 +1000 Subject: [PATCH 093/156] update dependencies --- package-lock.json | 1085 +++++++++++---------------------------------- package.json | 6 +- 2 files changed, 270 insertions(+), 821 deletions(-) diff --git a/package-lock.json b/package-lock.json index e8a32b8..6454800 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,154 +8,22 @@ "version": "7.8.3", "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz", "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==", + "dev": true, "requires": { "@babel/highlight": "^7.8.3" } }, - "@babel/core": { - "version": "7.9.0", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.9.0.tgz", - "integrity": "sha512-kWc7L0fw1xwvI0zi8OKVBuxRVefwGOrKSQMvrQ3dW+bIIavBY3/NpXmpjMy7bQnLgwgzWQZ8TlM57YHpHNHz4w==", - "requires": { - "@babel/code-frame": "^7.8.3", - "@babel/generator": "^7.9.0", - "@babel/helper-module-transforms": "^7.9.0", - "@babel/helpers": "^7.9.0", - "@babel/parser": "^7.9.0", - "@babel/template": "^7.8.6", - "@babel/traverse": "^7.9.0", - "@babel/types": "^7.9.0", - "convert-source-map": "^1.7.0", - "debug": "^4.1.0", - "gensync": "^1.0.0-beta.1", - "json5": "^2.1.2", - "lodash": "^4.17.13", - "resolve": "^1.3.2", - "semver": "^5.4.1", - "source-map": "^0.5.0" - }, - "dependencies": { - "semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" - } - } - }, - "@babel/generator": { - "version": "7.9.5", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.9.5.tgz", - "integrity": "sha512-GbNIxVB3ZJe3tLeDm1HSn2AhuD/mVcyLDpgtLXa5tplmWrJdF/elxB56XNqCuD6szyNkDi6wuoKXln3QeBmCHQ==", - "requires": { - "@babel/types": "^7.9.5", - "jsesc": "^2.5.1", - "lodash": "^4.17.13", - "source-map": "^0.5.0" - } - }, - "@babel/helper-function-name": { - "version": "7.9.5", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.9.5.tgz", - "integrity": "sha512-JVcQZeXM59Cd1qanDUxv9fgJpt3NeKUaqBqUEvfmQ+BCOKq2xUgaWZW2hr0dkbyJgezYuplEoh5knmrnS68efw==", - "requires": { - "@babel/helper-get-function-arity": "^7.8.3", - "@babel/template": "^7.8.3", - "@babel/types": "^7.9.5" - } - }, - "@babel/helper-get-function-arity": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz", - "integrity": "sha512-FVDR+Gd9iLjUMY1fzE2SR0IuaJToR4RkCDARVfsBBPSP53GEqSFjD8gNyxg246VUyc/ALRxFaAK8rVG7UT7xRA==", - "requires": { - "@babel/types": "^7.8.3" - } - }, - "@babel/helper-member-expression-to-functions": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.8.3.tgz", - "integrity": "sha512-fO4Egq88utkQFjbPrSHGmGLFqmrshs11d46WI+WZDESt7Wu7wN2G2Iu+NMMZJFDOVRHAMIkB5SNh30NtwCA7RA==", - "requires": { - "@babel/types": "^7.8.3" - } - }, - "@babel/helper-module-imports": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.8.3.tgz", - "integrity": "sha512-R0Bx3jippsbAEtzkpZ/6FIiuzOURPcMjHp+Z6xPe6DtApDJx+w7UYyOLanZqO8+wKR9G10s/FmHXvxaMd9s6Kg==", - "requires": { - "@babel/types": "^7.8.3" - } - }, - "@babel/helper-module-transforms": { - "version": "7.9.0", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.9.0.tgz", - "integrity": "sha512-0FvKyu0gpPfIQ8EkxlrAydOWROdHpBmiCiRwLkUiBGhCUPRRbVD2/tm3sFr/c/GWFrQ/ffutGUAnx7V0FzT2wA==", - "requires": { - "@babel/helper-module-imports": "^7.8.3", - "@babel/helper-replace-supers": "^7.8.6", - "@babel/helper-simple-access": "^7.8.3", - "@babel/helper-split-export-declaration": "^7.8.3", - "@babel/template": "^7.8.6", - "@babel/types": "^7.9.0", - "lodash": "^4.17.13" - } - }, - "@babel/helper-optimise-call-expression": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.8.3.tgz", - "integrity": "sha512-Kag20n86cbO2AvHca6EJsvqAd82gc6VMGule4HwebwMlwkpXuVqrNRj6CkCV2sKxgi9MyAUnZVnZ6lJ1/vKhHQ==", - "requires": { - "@babel/types": "^7.8.3" - } - }, - "@babel/helper-replace-supers": { - "version": "7.8.6", - "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.8.6.tgz", - "integrity": "sha512-PeMArdA4Sv/Wf4zXwBKPqVj7n9UF/xg6slNRtZW84FM7JpE1CbG8B612FyM4cxrf4fMAMGO0kR7voy1ForHHFA==", - "requires": { - "@babel/helper-member-expression-to-functions": "^7.8.3", - "@babel/helper-optimise-call-expression": "^7.8.3", - "@babel/traverse": "^7.8.6", - "@babel/types": "^7.8.6" - } - }, - "@babel/helper-simple-access": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.8.3.tgz", - "integrity": "sha512-VNGUDjx5cCWg4vvCTR8qQ7YJYZ+HBjxOgXEl7ounz+4Sn7+LMD3CFrCTEU6/qXKbA2nKg21CwhhBzO0RpRbdCw==", - "requires": { - "@babel/template": "^7.8.3", - "@babel/types": "^7.8.3" - } - }, - "@babel/helper-split-export-declaration": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz", - "integrity": "sha512-3x3yOeyBhW851hroze7ElzdkeRXQYQbFIb7gLK1WQYsw2GWDay5gAJNw1sWJ0VFP6z5J1whqeXH/WCdCjZv6dA==", - "requires": { - "@babel/types": "^7.8.3" - } - }, "@babel/helper-validator-identifier": { "version": "7.9.0", "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.0.tgz", - "integrity": "sha512-6G8bQKjOh+of4PV/ThDm/rRqlU7+IGoJuofpagU5GlEl29Vv0RGqqt86ZGRV8ZuSOY3o+8yXl5y782SMcG7SHw==" - }, - "@babel/helpers": { - "version": "7.9.2", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.9.2.tgz", - "integrity": "sha512-JwLvzlXVPjO8eU9c/wF9/zOIN7X6h8DYf7mG4CiFRZRvZNKEF5dQ3H3V+ASkHoIB3mWhatgl5ONhyqHRI6MppA==", - "requires": { - "@babel/template": "^7.8.3", - "@babel/traverse": "^7.9.0", - "@babel/types": "^7.9.0" - } + "integrity": "sha512-6G8bQKjOh+of4PV/ThDm/rRqlU7+IGoJuofpagU5GlEl29Vv0RGqqt86ZGRV8ZuSOY3o+8yXl5y782SMcG7SHw==", + "dev": true }, "@babel/highlight": { "version": "7.9.0", "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz", "integrity": "sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==", + "dev": true, "requires": { "@babel/helper-validator-identifier": "^7.9.0", "chalk": "^2.0.0", @@ -166,6 +34,7 @@ "version": "3.2.1", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, "requires": { "color-convert": "^1.9.0" } @@ -174,6 +43,7 @@ "version": "2.4.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "dev": true, "requires": { "ansi-styles": "^3.2.1", "escape-string-regexp": "^1.0.5", @@ -184,6 +54,7 @@ "version": "1.9.3", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", + "dev": true, "requires": { "color-name": "1.1.3" } @@ -191,76 +62,41 @@ "color-name": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=" + "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", + "dev": true }, "has-flag": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=" + "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", + "dev": true }, "supports-color": { "version": "5.5.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "dev": true, "requires": { "has-flag": "^3.0.0" } } } }, - "@babel/parser": { - "version": "7.9.4", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.9.4.tgz", - "integrity": "sha512-bC49otXX6N0/VYhgOMh4gnP26E9xnDZK3TmbNpxYzzz9BQLBosQwfyOe9/cXUU3txYhTzLCbcqd5c8y/OmCjHA==" - }, - "@babel/template": { - "version": "7.8.6", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.8.6.tgz", - "integrity": "sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg==", - "requires": { - "@babel/code-frame": "^7.8.3", - "@babel/parser": "^7.8.6", - "@babel/types": "^7.8.6" - } - }, - "@babel/traverse": { - "version": "7.9.5", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.5.tgz", - "integrity": "sha512-c4gH3jsvSuGUezlP6rzSJ6jf8fYjLj3hsMZRx/nX0h+fmHN0w+ekubRrHPqnMec0meycA2nwCsJ7dC8IPem2FQ==", - "requires": { - "@babel/code-frame": "^7.8.3", - "@babel/generator": "^7.9.5", - "@babel/helper-function-name": "^7.9.5", - "@babel/helper-split-export-declaration": "^7.8.3", - "@babel/parser": "^7.9.0", - "@babel/types": "^7.9.5", - "debug": "^4.1.0", - "globals": "^11.1.0", - "lodash": "^4.17.13" - } - }, - "@babel/types": { - "version": "7.9.5", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.5.tgz", - "integrity": "sha512-XjnvNqenk818r5zMaba+sLQjnbda31UfUURv3ei0qPQw4u+j2jMyJ5b11y8ZHYTRSI3NnInQkkkRT4fLqqPdHg==", - "requires": { - "@babel/helper-validator-identifier": "^7.9.5", - "lodash": "^4.17.13", - "to-fast-properties": "^2.0.0" - }, - "dependencies": { - "@babel/helper-validator-identifier": { - "version": "7.9.5", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.5.tgz", - "integrity": "sha512-/8arLKUFq882w4tWGj9JYzRpAlZgiWUJ+dtteNTDqrRBz9Iguck9Rn3ykuBDoUwh2TO4tSAJlrxDUOXWklJe4g==" - } - } - }, "@discordjs/collection": { "version": "0.1.5", "resolved": "https://registry.npmjs.org/@discordjs/collection/-/collection-0.1.5.tgz", "integrity": "sha512-CU1q0UXQUpFNzNB7gufgoisDHP7n+T3tkqTsp3MNUkVJ5+hS3BCvME8uCXAUFlz+6T2FbTCu75A+yQ7HMKqRKw==" }, + "@discordjs/form-data": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/@discordjs/form-data/-/form-data-3.0.1.tgz", + "integrity": "sha512-ZfFsbgEXW71Rw/6EtBdrP5VxBJy4dthyC0tpQKGKmYFImlmmrykO14Za+BiIVduwjte0jXEBlhSKf0MWbFp9Eg==", + "requires": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "mime-types": "^2.1.12" + } + }, "@discordjs/opus": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/@discordjs/opus/-/opus-0.1.0.tgz", @@ -270,29 +106,6 @@ "node-pre-gyp": "^0.14.0" } }, - "@istanbuljs/load-nyc-config": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.0.0.tgz", - "integrity": "sha512-ZR0rq/f/E4f4XcgnDvtMWXCUJpi8eO0rssVhmztsZqLIEFA9UUP9zmpE0VxlM+kv/E1ul2I876Fwil2ayptDVg==", - "requires": { - "camelcase": "^5.3.1", - "find-up": "^4.1.0", - "js-yaml": "^3.13.1", - "resolve-from": "^5.0.0" - }, - "dependencies": { - "resolve-from": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", - "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==" - } - } - }, - "@istanbuljs/schema": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.2.tgz", - "integrity": "sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw==" - }, "@sentry/apm": { "version": "5.15.4", "resolved": "https://registry.npmjs.org/@sentry/apm/-/apm-5.15.4.tgz", @@ -382,7 +195,8 @@ "@types/color-name": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz", - "integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==" + "integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==", + "dev": true }, "@types/node": { "version": "13.11.1", @@ -419,15 +233,6 @@ "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-5.1.1.tgz", "integrity": "sha512-TMeqbNl2fMW0nMjTEPOwe3J/PRFP4vqeoNuQMG0HlMrtm5QxKqdvAkZ1pRBQ/ulIyDD5Yq0nJ7YbdD8ey0TO3g==" }, - "aggregate-error": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.0.1.tgz", - "integrity": "sha512-quoaXsZ9/BLNae5yiNoUz+Nhkwz83GhWwtYFglcjEQB2NDHCIpApbqXxIFnm4Pq/Nvhrsq5sYJFyohrrxnTGAA==", - "requires": { - "clean-stack": "^2.0.0", - "indent-string": "^4.0.0" - } - }, "ansi-escapes": { "version": "4.3.1", "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz", @@ -448,35 +253,24 @@ "ansi-regex": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", - "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==" + "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", + "dev": true }, "ansi-styles": { "version": "4.2.1", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", + "dev": true, "requires": { "@types/color-name": "^1.1.1", "color-convert": "^2.0.1" } }, - "append-transform": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/append-transform/-/append-transform-2.0.0.tgz", - "integrity": "sha512-7yeyCEurROLQJFv5Xj4lEGTy0borxepjFv1g22oAdqFu//SrAlDl1O1Nxx15SH1RoliUml6p8dwJW9jvZughhg==", - "requires": { - "default-require-extensions": "^3.0.0" - } - }, "aproba": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz", "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==" }, - "archy": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz", - "integrity": "sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=" - }, "are-we-there-yet": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz", @@ -490,6 +284,7 @@ "version": "1.0.10", "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", + "dev": true, "requires": { "sprintf-js": "~1.0.2" } @@ -521,6 +316,14 @@ "integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==", "dev": true }, + "async": { + "version": "2.6.3", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz", + "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==", + "requires": { + "lodash": "^4.17.14" + } + }, "asynckit": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", @@ -559,28 +362,12 @@ "resolved": "https://registry.npmjs.org/bson/-/bson-1.1.4.tgz", "integrity": "sha512-S/yKGU1syOMzO86+dGpg2qGoDL0zvzcb262G+gqEy6TgP6rt6z6qxSFX/8X6vLC91P7G7C3nLs0+bvDzmvBA3Q==" }, - "caching-transform": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/caching-transform/-/caching-transform-4.0.0.tgz", - "integrity": "sha512-kpqOvwXnjjN44D89K5ccQC+RUrsy7jB/XLlRrx0D7/2HNcTPqzsb6XgYoErwko6QsV184CA2YgS1fxDiiDZMWA==", - "requires": { - "hasha": "^5.0.0", - "make-dir": "^3.0.0", - "package-hash": "^4.0.0", - "write-file-atomic": "^3.0.0" - } - }, "callsites": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", "dev": true }, - "camelcase": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", - "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==" - }, "chalk": { "version": "2.4.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", @@ -644,11 +431,6 @@ "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz", "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==" }, - "clean-stack": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz", - "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==" - }, "cli-cursor": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz", @@ -664,25 +446,40 @@ "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=", "dev": true }, - "cliui": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz", - "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==", - "requires": { - "string-width": "^4.2.0", - "strip-ansi": "^6.0.0", - "wrap-ansi": "^6.2.0" - } - }, "code-point-at": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=" }, + "color": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/color/-/color-3.0.0.tgz", + "integrity": "sha512-jCpd5+s0s0t7p3pHQKpnJ0TpQKKdleP71LWcA0aqiljpiuAkOSUFN/dyH8ZwF0hRmFlrIuRhufds1QyEP9EB+w==", + "requires": { + "color-convert": "^1.9.1", + "color-string": "^1.5.2" + }, + "dependencies": { + "color-convert": { + "version": "1.9.3", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", + "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", + "requires": { + "color-name": "1.1.3" + } + }, + "color-name": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", + "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=" + } + } + }, "color-convert": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, "requires": { "color-name": "~1.1.4" } @@ -692,11 +489,34 @@ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" }, + "color-string": { + "version": "1.5.3", + "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.5.3.tgz", + "integrity": "sha512-dC2C5qeWoYkxki5UAXapdjqO672AM4vZuPGRQfO8b5HKuKGBbKWpITyDYN7TOFKvRW7kOgAn3746clDBMDJyQw==", + "requires": { + "color-name": "^1.0.0", + "simple-swizzle": "^0.2.2" + } + }, + "colornames": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/colornames/-/colornames-1.1.1.tgz", + "integrity": "sha1-+IiQMGhcfE/54qVZ9Qd+t2qBb5Y=" + }, "colors": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz", "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==" }, + "colorspace": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/colorspace/-/colorspace-1.1.2.tgz", + "integrity": "sha512-vt+OoIP2d76xLhjwbBaucYlNSpPsrJWPlBTtwCpQKIu6/CSMutyzX93O/Do0qzpH3YoHEes8YEFXyZ797rEhzQ==", + "requires": { + "color": "3.0.x", + "text-hex": "1.0.x" + } + }, "combined-stream": { "version": "1.0.8", "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", @@ -705,11 +525,6 @@ "delayed-stream": "~1.0.0" } }, - "commondir": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz", - "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=" - }, "concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", @@ -726,14 +541,6 @@ "integrity": "sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo=", "dev": true }, - "convert-source-map": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz", - "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==", - "requires": { - "safe-buffer": "~5.1.1" - } - }, "cookie": { "version": "0.3.1", "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz", @@ -744,21 +551,6 @@ "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" }, - "cross-spawn": { - "version": "7.0.2", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.2.tgz", - "integrity": "sha512-PD6G8QG3S4FK/XCGFbEQrDqO2AnMMsy0meR7lerlIOHAAbkuavGU/pOqprrlvfTNjvowivTeBsjebAL0NSoMxw==", - "requires": { - "path-key": "^3.1.0", - "shebang-command": "^2.0.0", - "which": "^2.0.1" - } - }, - "dateformat": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-3.0.3.tgz", - "integrity": "sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==" - }, "debug": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", @@ -767,11 +559,6 @@ "ms": "^2.1.1" } }, - "decamelize": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", - "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=" - }, "deep-extend": { "version": "0.6.0", "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz", @@ -783,14 +570,6 @@ "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=", "dev": true }, - "default-require-extensions": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/default-require-extensions/-/default-require-extensions-3.0.0.tgz", - "integrity": "sha512-ek6DpXq/SCpvjhpFsLFRVtIxJCRw6fUR42lYMVZuUMK7n8eMz4Uh5clckdBjEpLhn/gEBZo7hDJnJcwdKLKQjg==", - "requires": { - "strip-bom": "^4.0.0" - } - }, "define-properties": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz", @@ -820,14 +599,24 @@ "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz", "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=" }, + "diagnostics": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/diagnostics/-/diagnostics-1.1.1.tgz", + "integrity": "sha512-8wn1PmdunLJ9Tqbx+Fx/ZEuHfJf4NKSN2ZBj7SJC/OWRWha843+WsTjqMe1B5E3p28jqBlp+mJ2fPVxPyNgYKQ==", + "requires": { + "colorspace": "1.1.x", + "enabled": "1.0.x", + "kuler": "1.0.x" + } + }, "discord.js": { - "version": "12.1.1", - "resolved": "https://registry.npmjs.org/discord.js/-/discord.js-12.1.1.tgz", - "integrity": "sha512-Y6+QfAUZkb9cy27cfNqUigAgYVSKTw9jPF3mN4UDMih3Em3VQ0WjGBdX1UbE8CwFkLOu5XWQSNPdsoStTR8c2Q==", + "version": "12.2.0", + "resolved": "https://registry.npmjs.org/discord.js/-/discord.js-12.2.0.tgz", + "integrity": "sha512-Ueb/0SOsxXyqwvwFYFe0msMrGqH1OMqpp2Dpbplnlr4MzcRrFWwsBM9gKNZXPVBHWUKiQkwU8AihXBXIvTTSvg==", "requires": { "@discordjs/collection": "^0.1.5", + "@discordjs/form-data": "^3.0.1", "abort-controller": "^3.0.0", - "form-data": "^3.0.0", "node-fetch": "^2.6.0", "prism-media": "^1.2.0", "setimmediate": "^1.0.5", @@ -847,7 +636,21 @@ "emoji-regex": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true + }, + "enabled": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/enabled/-/enabled-1.0.2.tgz", + "integrity": "sha1-ll9lE9LC0cX0ZStkouM5ZGf8L5M=", + "requires": { + "env-variable": "0.0.x" + } + }, + "env-variable": { + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/env-variable/-/env-variable-0.0.6.tgz", + "integrity": "sha512-bHz59NlBbtS0NhftmR8+ExBEekE7br0e01jw+kk0NDro7TtZzBYZ5ScGPs3OmwnpyfHTHOtr1Y6uedCdrIldtg==" }, "error-ex": { "version": "1.3.2", @@ -888,15 +691,11 @@ "is-symbol": "^1.0.2" } }, - "es6-error": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz", - "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==" - }, "escape-string-regexp": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=" + "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", + "dev": true }, "eslint": { "version": "6.8.0", @@ -1306,7 +1105,8 @@ "esprima": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", - "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==" + "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", + "dev": true }, "esquery": { "version": "1.2.0", @@ -1380,6 +1180,16 @@ "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=", "dev": true }, + "fast-safe-stringify": { + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.0.7.tgz", + "integrity": "sha512-Utm6CdzT+6xsDk2m8S6uL8VHxNwI6Jub+e9NYTcAms28T84pTa25GJQV9j0CY0N1rM8hK4x6grpF2BQf+2qwVA==" + }, + "fecha": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/fecha/-/fecha-2.3.3.tgz", + "integrity": "sha512-lUGBnIamTAwk4znq5BcqsDaxSmZ9nDVJaij6NvRt/Tg4R69gERA+otPKbS86ROw9nxVMw2/mp1fnaiWqbs6Sdg==" + }, "figures": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz", @@ -1398,23 +1208,12 @@ "flat-cache": "^2.0.1" } }, - "find-cache-dir": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.1.tgz", - "integrity": "sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ==", + "file-stream-rotator": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/file-stream-rotator/-/file-stream-rotator-0.5.7.tgz", + "integrity": "sha512-VYb3HZ/GiAGUCrfeakO8Mp54YGswNUHvL7P09WQcXAJNSj3iQ5QraYSp3cIn1MUyw6uzfgN/EFOarCNa4JvUHQ==", "requires": { - "commondir": "^1.0.1", - "make-dir": "^3.0.2", - "pkg-dir": "^4.1.0" - } - }, - "find-up": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", - "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", - "requires": { - "locate-path": "^5.0.0", - "path-exists": "^4.0.0" + "moment": "^2.11.2" } }, "flat-cache": { @@ -1445,30 +1244,6 @@ "integrity": "sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==", "dev": true }, - "foreground-child": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-2.0.0.tgz", - "integrity": "sha512-dCIq9FpEcyQyXKCkyzmlPTFNgrCzPudOe+mhvJU5zAtlBnGVy2yKxtfsxK2tQBThwq225jcvBjpw1Gr40uzZCA==", - "requires": { - "cross-spawn": "^7.0.0", - "signal-exit": "^3.0.2" - } - }, - "form-data": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.0.tgz", - "integrity": "sha512-CKMFDglpbMi6PyN+brwB9Q/GOw0eAnsrEZDgcsH5Krhz5Od/haKHAX0NmQfha2zPPz0JpWzA7GJHGSnvCRLWsg==", - "requires": { - "asynckit": "^0.4.0", - "combined-stream": "^1.0.8", - "mime-types": "^2.1.12" - } - }, - "fromentries": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/fromentries/-/fromentries-1.2.0.tgz", - "integrity": "sha512-33X7H/wdfO99GdRLLgkjUrD4geAFdq/Uv0kl3HD4da6HDixd2GUg8Mw7dahLCV9r/EARkmtYBB6Tch4EEokFTQ==" - }, "fs-minipass": { "version": "1.2.7", "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz", @@ -1542,16 +1317,6 @@ } } }, - "gensync": { - "version": "1.0.0-beta.1", - "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.1.tgz", - "integrity": "sha512-r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg==" - }, - "get-caller-file": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", - "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==" - }, "glob": { "version": "7.1.6", "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", @@ -1574,15 +1339,11 @@ "is-glob": "^4.0.1" } }, - "globals": { - "version": "11.12.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", - "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==" - }, "graceful-fs": { "version": "4.2.3", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz", - "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==" + "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==", + "dev": true }, "has": { "version": "1.0.3", @@ -1596,7 +1357,8 @@ "has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true }, "has-symbols": { "version": "1.0.1", @@ -1609,15 +1371,6 @@ "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=" }, - "hasha": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/hasha/-/hasha-5.2.0.tgz", - "integrity": "sha512-2W+jKdQbAdSIrggA8Q35Br8qKadTrqCTC8+XZvBWepKDK6m9XkX6Iz1a2yh2KP01kzAR/dpuMeUnocoLYDcskw==", - "requires": { - "is-stream": "^2.0.0", - "type-fest": "^0.8.0" - } - }, "hastebin-gen": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/hastebin-gen/-/hastebin-gen-2.0.5.tgz", @@ -1637,11 +1390,6 @@ "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.3.1.tgz", "integrity": "sha512-rhE/4Z3hIhzHAUKbW8jVcCyuT5oJCXXqhN/6mXXVCpzTmvJnoH2HL/bt3EZ6p55jbFJBeAe1ZNpL5BugLujxNA==" }, - "html-escaper": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz", - "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==" - }, "https-proxy-agent": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-4.0.0.tgz", @@ -1694,12 +1442,8 @@ "imurmurhash": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", - "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=" - }, - "indent-string": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", - "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==" + "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=", + "dev": true }, "inflight": { "version": "1.0.6", @@ -1785,7 +1529,8 @@ "is-fullwidth-code-point": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==" + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true }, "is-glob": { "version": "4.0.1", @@ -1811,11 +1556,6 @@ "has": "^1.0.3" } }, - "is-stream": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz", - "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==" - }, "is-string": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.5.tgz", @@ -1831,16 +1571,6 @@ "has-symbols": "^1.0.1" } }, - "is-typedarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", - "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=" - }, - "is-windows": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz", - "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==" - }, "isarray": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", @@ -1849,104 +1579,25 @@ "isexe": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=" - }, - "istanbul-lib-coverage": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz", - "integrity": "sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg==" - }, - "istanbul-lib-hook": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/istanbul-lib-hook/-/istanbul-lib-hook-3.0.0.tgz", - "integrity": "sha512-Pt/uge1Q9s+5VAZ+pCo16TYMWPBIl+oaNIjgLQxcX0itS6ueeaA+pEfThZpH8WxhFgCiEb8sAJY6MdUKgiIWaQ==", - "requires": { - "append-transform": "^2.0.0" - } - }, - "istanbul-lib-instrument": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.1.tgz", - "integrity": "sha512-imIchxnodll7pvQBYOqUu88EufLCU56LMeFPZZM/fJZ1irYcYdqroaV+ACK1Ila8ls09iEYArp+nqyC6lW1Vfg==", - "requires": { - "@babel/core": "^7.7.5", - "@babel/parser": "^7.7.5", - "@babel/template": "^7.7.4", - "@babel/traverse": "^7.7.4", - "@istanbuljs/schema": "^0.1.2", - "istanbul-lib-coverage": "^3.0.0", - "semver": "^6.3.0" - } - }, - "istanbul-lib-processinfo": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/istanbul-lib-processinfo/-/istanbul-lib-processinfo-2.0.2.tgz", - "integrity": "sha512-kOwpa7z9hme+IBPZMzQ5vdQj8srYgAtaRqeI48NGmAQ+/5yKiHLV0QbYqQpxsdEF0+w14SoB8YbnHKcXE2KnYw==", - "requires": { - "archy": "^1.0.0", - "cross-spawn": "^7.0.0", - "istanbul-lib-coverage": "^3.0.0-alpha.1", - "make-dir": "^3.0.0", - "p-map": "^3.0.0", - "rimraf": "^3.0.0", - "uuid": "^3.3.3" - } - }, - "istanbul-lib-report": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz", - "integrity": "sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==", - "requires": { - "istanbul-lib-coverage": "^3.0.0", - "make-dir": "^3.0.0", - "supports-color": "^7.1.0" - } - }, - "istanbul-lib-source-maps": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.0.tgz", - "integrity": "sha512-c16LpFRkR8vQXyHZ5nLpY35JZtzj1PQY1iZmesUbf1FZHbIupcWfjgOXBY9YHkLEQ6puz1u4Dgj6qmU/DisrZg==", - "requires": { - "debug": "^4.1.1", - "istanbul-lib-coverage": "^3.0.0", - "source-map": "^0.6.1" - }, - "dependencies": { - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" - } - } - }, - "istanbul-reports": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.0.2.tgz", - "integrity": "sha512-9tZvz7AiR3PEDNGiV9vIouQ/EAcqMXFmkcA1CDFTwOB98OZVDL0PH9glHotf5Ugp6GCOTypfzGWI/OqjWNCRUw==", - "requires": { - "html-escaper": "^2.0.0", - "istanbul-lib-report": "^3.0.0" - } + "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", + "dev": true }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", - "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==" + "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", + "dev": true }, "js-yaml": { "version": "3.13.1", "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz", "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==", + "dev": true, "requires": { "argparse": "^1.0.7", "esprima": "^4.0.0" } }, - "jsesc": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", - "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==" - }, "json-schema-traverse": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", @@ -1959,19 +1610,19 @@ "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=", "dev": true }, - "json5": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.3.tgz", - "integrity": "sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==", - "requires": { - "minimist": "^1.2.5" - } - }, "kareem": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/kareem/-/kareem-2.3.1.tgz", "integrity": "sha512-l3hLhffs9zqoDe8zjmb/mAN4B8VT3L56EUvKNqLFVs9YlFA+zx7ke1DO8STAdDyYNkeSo1nKmjuvQeI12So8Xw==" }, + "kuler": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/kuler/-/kuler-1.0.1.tgz", + "integrity": "sha512-J9nVUucG1p/skKul6DU3PUZrhs0LPulNaeUOox0IyXDi8S4CztTHs1gQphhuZmzXG7VOQSf6NJfKuzteQLv9gQ==", + "requires": { + "colornames": "^1.1.1" + } + }, "levn": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", @@ -2002,23 +1653,22 @@ } } }, - "locate-path": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", - "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", - "requires": { - "p-locate": "^4.1.0" - } - }, "lodash": { "version": "4.17.15", "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz", "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==" }, - "lodash.flattendeep": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz", - "integrity": "sha1-+wMJF/hqMTTlvJvsDWngAT3f7bI=" + "logform": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/logform/-/logform-2.1.2.tgz", + "integrity": "sha512-+lZh4OpERDBLqjiwDLpAWNQu6KMjnlXH2ByZwCuSqVPJletw0kTWJf5CgSNAUKn1KUkv3m2cUz/LK8zyEy7wzQ==", + "requires": { + "colors": "^1.2.1", + "fast-safe-stringify": "^2.0.4", + "fecha": "^2.3.3", + "ms": "^2.1.1", + "triple-beam": "^1.3.0" + } }, "lru_map": { "version": "0.3.3", @@ -2034,14 +1684,6 @@ "sax": "^1.2.4" } }, - "make-dir": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.0.2.tgz", - "integrity": "sha512-rYKABKutXa6vXTXhoV18cBE7PaewPXHe/Bdq4v+ZLMhxbWApkFFplT0LcbMW+6BbjnQXzZ/sAvSE/JdguApG5w==", - "requires": { - "semver": "^6.0.0" - } - }, "memory-pager": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/memory-pager/-/memory-pager-1.5.0.tgz", @@ -2268,14 +1910,6 @@ } } }, - "node-preload": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/node-preload/-/node-preload-0.2.1.tgz", - "integrity": "sha512-RM5oyBy45cLEoHqCeh+MNuFAxO0vTFBLskvQbOKnEE7YTTSN4tbN8QWDIPQ6L+WvKsB/qLEGpYe2ZZ9d4W9OIQ==", - "requires": { - "process-on-spawn": "^1.0.0" - } - }, "nopt": { "version": "4.0.3", "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz", @@ -2344,51 +1978,16 @@ "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=" }, - "nyc": { - "version": "15.0.1", - "resolved": "https://registry.npmjs.org/nyc/-/nyc-15.0.1.tgz", - "integrity": "sha512-n0MBXYBYRqa67IVt62qW1r/d9UH/Qtr7SF1w/nQLJ9KxvWF6b2xCHImRAixHN9tnMMYHC2P14uo6KddNGwMgGg==", - "requires": { - "@istanbuljs/load-nyc-config": "^1.0.0", - "@istanbuljs/schema": "^0.1.2", - "caching-transform": "^4.0.0", - "convert-source-map": "^1.7.0", - "decamelize": "^1.2.0", - "find-cache-dir": "^3.2.0", - "find-up": "^4.1.0", - "foreground-child": "^2.0.0", - "glob": "^7.1.6", - "istanbul-lib-coverage": "^3.0.0", - "istanbul-lib-hook": "^3.0.0", - "istanbul-lib-instrument": "^4.0.0", - "istanbul-lib-processinfo": "^2.0.2", - "istanbul-lib-report": "^3.0.0", - "istanbul-lib-source-maps": "^4.0.0", - "istanbul-reports": "^3.0.2", - "make-dir": "^3.0.0", - "node-preload": "^0.2.1", - "p-map": "^3.0.0", - "process-on-spawn": "^1.0.0", - "resolve-from": "^5.0.0", - "rimraf": "^3.0.0", - "signal-exit": "^3.0.2", - "spawn-wrap": "^2.0.0", - "test-exclude": "^6.0.0", - "yargs": "^15.0.2" - }, - "dependencies": { - "resolve-from": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", - "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==" - } - } - }, "object-assign": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" }, + "object-hash": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-2.0.3.tgz", + "integrity": "sha512-JPKn0GMu+Fa3zt3Bmr66JhokJU5BaNBIh4ZeTlaCBzrBsOeXzwcKKAK1tbLiPKgvwmPXsDvvLHoWh5Bm7ofIYg==" + }, "object-inspect": { "version": "1.7.0", "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.7.0.tgz", @@ -2433,6 +2032,11 @@ "wrappy": "1" } }, + "one-time": { + "version": "0.0.4", + "resolved": "https://registry.npmjs.org/one-time/-/one-time-0.0.4.tgz", + "integrity": "sha1-+M33eISCb+Tf+T46nMN7HkSAdC4=" + }, "onetime": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.0.tgz", @@ -2475,46 +2079,6 @@ "os-tmpdir": "^1.0.0" } }, - "p-limit": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", - "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", - "requires": { - "p-try": "^2.0.0" - } - }, - "p-locate": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", - "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", - "requires": { - "p-limit": "^2.2.0" - } - }, - "p-map": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/p-map/-/p-map-3.0.0.tgz", - "integrity": "sha512-d3qXVTF/s+W+CdJ5A29wywV2n8CQQYahlgz2bFiA+4eVNJbHJodPZ+/gXwPGh0bOqA+j8S+6+ckmvLGPk1QpxQ==", - "requires": { - "aggregate-error": "^3.0.0" - } - }, - "p-try": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", - "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==" - }, - "package-hash": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/package-hash/-/package-hash-4.0.0.tgz", - "integrity": "sha512-whdkPIooSu/bASggZ96BWVvZTRMOFxnyUG5PnTSGKoJE2gd5mbVNmR2Nj20QFzxYYgAXpoqC+AiXzl+UMRh7zQ==", - "requires": { - "graceful-fs": "^4.1.15", - "hasha": "^5.0.0", - "lodash.flattendeep": "^4.4.0", - "release-zalgo": "^1.0.0" - } - }, "parent-module": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", @@ -2533,25 +2097,16 @@ "error-ex": "^1.2.0" } }, - "path-exists": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", - "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==" - }, "path-is-absolute": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=" }, - "path-key": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", - "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==" - }, "path-parse": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz", - "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==" + "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==", + "dev": true }, "path-type": { "version": "2.0.0", @@ -2568,14 +2123,6 @@ "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", "dev": true }, - "pkg-dir": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", - "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", - "requires": { - "find-up": "^4.0.0" - } - }, "prelude-ls": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz", @@ -2592,14 +2139,6 @@ "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==" }, - "process-on-spawn": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/process-on-spawn/-/process-on-spawn-1.0.0.tgz", - "integrity": "sha512-1WsPDsUSMmZH5LeMLegqkPDrsGgsWwk1Exipy2hvB0o/F0ASzbpIctSCcZIK1ykJvtTJULEH+20WOFjMvGnCTg==", - "requires": { - "fromentries": "^1.2.0" - } - }, "progress": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz", @@ -2721,24 +2260,6 @@ "integrity": "sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==", "dev": true }, - "release-zalgo": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/release-zalgo/-/release-zalgo-1.0.0.tgz", - "integrity": "sha1-CXALflB0Mpc5Mw5TXFqQ+2eFFzA=", - "requires": { - "es6-error": "^4.0.1" - } - }, - "require-directory": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", - "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=" - }, - "require-main-filename": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz", - "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==" - }, "require_optional": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/require_optional/-/require_optional-1.0.1.tgz", @@ -2759,6 +2280,7 @@ "version": "1.15.1", "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.15.1.tgz", "integrity": "sha512-84oo6ZTtoTUpjgNEr5SJyzQhzL72gaRodsSfyxC/AXRvwu0Yse9H8eF9IpGo7b8YetZhlI6v7ZQ6bKBFV/6S7w==", + "dev": true, "requires": { "path-parse": "^1.0.6" } @@ -2778,14 +2300,6 @@ "signal-exit": "^3.0.2" } }, - "rimraf": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", - "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", - "requires": { - "glob": "^7.1.3" - } - }, "run-async": { "version": "2.4.0", "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.0.tgz", @@ -2831,7 +2345,8 @@ "semver": { "version": "6.3.0", "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "dev": true }, "set-blocking": { "version": "2.0.0", @@ -2843,19 +2358,6 @@ "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz", "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=" }, - "shebang-command": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", - "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", - "requires": { - "shebang-regex": "^3.0.0" - } - }, - "shebang-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", - "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==" - }, "sift": { "version": "7.0.1", "resolved": "https://registry.npmjs.org/sift/-/sift-7.0.1.tgz", @@ -2866,6 +2368,21 @@ "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz", "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==" }, + "simple-swizzle": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz", + "integrity": "sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo=", + "requires": { + "is-arrayish": "^0.3.1" + }, + "dependencies": { + "is-arrayish": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz", + "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==" + } + } + }, "slice-ansi": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz", @@ -2914,11 +2431,6 @@ "resolved": "https://registry.npmjs.org/sliced/-/sliced-1.0.1.tgz", "integrity": "sha1-CzpmK10Ewxd7GSa+qCsD+Dei70E=" }, - "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=" - }, "sparse-bitfield": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/sparse-bitfield/-/sparse-bitfield-3.0.3.tgz", @@ -2928,19 +2440,6 @@ "memory-pager": "^1.0.2" } }, - "spawn-wrap": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/spawn-wrap/-/spawn-wrap-2.0.0.tgz", - "integrity": "sha512-EeajNjfN9zMnULLwhZZQU3GWBoFNkbngTUPfaawT4RkMiviTxcX0qfhVbGey39mfctfDHkWtuecgQ8NJcyQWHg==", - "requires": { - "foreground-child": "^2.0.0", - "is-windows": "^1.0.2", - "make-dir": "^3.0.0", - "rimraf": "^3.0.0", - "signal-exit": "^3.0.2", - "which": "^2.0.1" - } - }, "spdx-correct": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz", @@ -2976,12 +2475,19 @@ "sprintf-js": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", - "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=" + "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", + "dev": true + }, + "stack-trace": { + "version": "0.0.10", + "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz", + "integrity": "sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=" }, "string-width": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz", "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==", + "dev": true, "requires": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", @@ -3042,15 +2548,11 @@ "version": "6.0.0", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", + "dev": true, "requires": { "ansi-regex": "^5.0.0" } }, - "strip-bom": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz", - "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==" - }, "strip-json-comments": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.0.1.tgz", @@ -3061,6 +2563,7 @@ "version": "7.1.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", + "dev": true, "requires": { "has-flag": "^4.0.0" } @@ -3143,15 +2646,10 @@ "yallist": "^3.0.3" } }, - "test-exclude": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz", - "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==", - "requires": { - "@istanbuljs/schema": "^0.1.2", - "glob": "^7.1.4", - "minimatch": "^3.0.4" - } + "text-hex": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/text-hex/-/text-hex-1.0.0.tgz", + "integrity": "sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg==" }, "text-table": { "version": "0.2.0", @@ -3165,11 +2663,6 @@ "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=", "dev": true }, - "tinytim": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/tinytim/-/tinytim-0.1.1.tgz", - "integrity": "sha1-yWih5VWa2VUyJO92J7qzTjyu+Kg=" - }, "tmp": { "version": "0.0.33", "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", @@ -3179,29 +2672,10 @@ "os-tmpdir": "~1.0.2" } }, - "to-fast-properties": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", - "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=" - }, - "tracer": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/tracer/-/tracer-1.0.3.tgz", - "integrity": "sha512-cP1wzE0eCzDrp6wMGG9Cg927qBPY18rPVMJ0BEjifHn5xVb7fbQDT5zjwItAyebUgF8hGY1N4VyI3hArGjffww==", - "requires": { - "colors": "1.4.0", - "dateformat": "3.0.3", - "mkdirp": "^1.0.4", - "nyc": "^15.0.1", - "tinytim": "0.1.1" - }, - "dependencies": { - "mkdirp": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", - "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==" - } - } + "triple-beam": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/triple-beam/-/triple-beam-1.3.0.tgz", + "integrity": "sha512-XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw==" }, "tslib": { "version": "1.11.1", @@ -3225,15 +2699,8 @@ "type-fest": { "version": "0.8.1", "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz", - "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==" - }, - "typedarray-to-buffer": { - "version": "3.1.5", - "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz", - "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==", - "requires": { - "is-typedarray": "^1.0.0" - } + "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==", + "dev": true }, "uri-js": { "version": "4.2.2", @@ -3257,11 +2724,6 @@ "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" }, - "uuid": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", - "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==" - }, "v8-compile-cache": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.1.0.tgz", @@ -3278,19 +2740,6 @@ "spdx-expression-parse": "^3.0.0" } }, - "which": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", - "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", - "requires": { - "isexe": "^2.0.0" - } - }, - "which-module": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", - "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=" - }, "wide-align": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz", @@ -3328,22 +2777,65 @@ } } }, + "winston": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/winston/-/winston-3.2.1.tgz", + "integrity": "sha512-zU6vgnS9dAWCEKg/QYigd6cgMVVNwyTzKs81XZtTFuRwJOcDdBg7AU0mXVyNbs7O5RH2zdv+BdNZUlx7mXPuOw==", + "requires": { + "async": "^2.6.1", + "diagnostics": "^1.1.1", + "is-stream": "^1.1.0", + "logform": "^2.1.1", + "one-time": "0.0.4", + "readable-stream": "^3.1.1", + "stack-trace": "0.0.x", + "triple-beam": "^1.3.0", + "winston-transport": "^4.3.0" + }, + "dependencies": { + "is-stream": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", + "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=" + }, + "readable-stream": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", + "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", + "requires": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + } + } + } + }, + "winston-daily-rotate-file": { + "version": "4.4.2", + "resolved": "https://registry.npmjs.org/winston-daily-rotate-file/-/winston-daily-rotate-file-4.4.2.tgz", + "integrity": "sha512-pVOUJKxN+Kn6LnOJZ4tTwdV5+N+fCkiRAb3bVnzcPtOj1ScxGNC3DyUhHuAHssBtMl5s45/aUcSUtApH+69V5A==", + "requires": { + "file-stream-rotator": "^0.5.7", + "object-hash": "^2.0.1", + "triple-beam": "^1.3.0", + "winston-transport": "^4.2.0" + } + }, + "winston-transport": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/winston-transport/-/winston-transport-4.3.0.tgz", + "integrity": "sha512-B2wPuwUi3vhzn/51Uukcao4dIduEiPOcOt9HJ3QeaXgkJ5Z7UwpBzxS4ZGNHtrxrUvTwemsQiSys0ihOf8Mp1A==", + "requires": { + "readable-stream": "^2.3.6", + "triple-beam": "^1.2.0" + } + }, "word-wrap": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==", "dev": true }, - "wrap-ansi": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", - "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==", - "requires": { - "ansi-styles": "^4.0.0", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0" - } - }, "wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", @@ -3358,59 +2850,16 @@ "mkdirp": "^0.5.1" } }, - "write-file-atomic": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz", - "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==", - "requires": { - "imurmurhash": "^0.1.4", - "is-typedarray": "^1.0.0", - "signal-exit": "^3.0.2", - "typedarray-to-buffer": "^3.1.5" - } - }, "ws": { "version": "7.2.3", "resolved": "https://registry.npmjs.org/ws/-/ws-7.2.3.tgz", "integrity": "sha512-HTDl9G9hbkNDk98naoR/cHDws7+EyYMOdL1BmjsZXRUjf7d+MficC4B7HLUPlSiho0vg+CWKrGIt/VJBd1xunQ==" }, - "y18n": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz", - "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==" - }, "yallist": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==" }, - "yargs": { - "version": "15.3.1", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.3.1.tgz", - "integrity": "sha512-92O1HWEjw27sBfgmXiixJWT5hRBp2eobqXicLtPBIDBhYB+1HpwZlXmbW2luivBJHBzki+7VyCLRtAkScbTBQA==", - "requires": { - "cliui": "^6.0.0", - "decamelize": "^1.2.0", - "find-up": "^4.1.0", - "get-caller-file": "^2.0.1", - "require-directory": "^2.1.1", - "require-main-filename": "^2.0.0", - "set-blocking": "^2.0.0", - "string-width": "^4.2.0", - "which-module": "^2.0.0", - "y18n": "^4.0.0", - "yargs-parser": "^18.1.1" - } - }, - "yargs-parser": { - "version": "18.1.2", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.2.tgz", - "integrity": "sha512-hlIPNR3IzC1YuL1c2UwwDKpXlNFBqD1Fswwh1khz5+d8Cq/8yc/Mn0i+rQXduu8hcrFKvO7Eryk+09NecTQAAQ==", - "requires": { - "camelcase": "^5.0.0", - "decamelize": "^1.2.0" - } - }, "ytdl-core": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/ytdl-core/-/ytdl-core-2.0.1.tgz", diff --git a/package.json b/package.json index 1782ee8..e7b3442 100644 --- a/package.json +++ b/package.json @@ -6,15 +6,15 @@ "dependencies": { "@discordjs/opus": "^0.1.0", "@sentry/node": "^5.15.4", - "colors": "^1.4.0", - "discord.js": "^12.1.1", + "discord.js": "^12.2.0", "hastebin-gen": "^2.0.5", "is-docker": "^2.0.0", "moment": "^2.24.0", "mongoose": "^5.9.9", "node-fetch": "^2.6.0", "prism-media": "^1.2.1", - "tracer": "^1.0.3", + "winston": "^3.2.1", + "winston-daily-rotate-file": "^4.4.2", "ytdl-core-discord": "^1.2.0" }, "devDependencies": { From 2958652eff8515199bad34ff6883cb4db4baac41 Mon Sep 17 00:00:00 2001 From: mudkipscience Date: Sat, 18 Apr 2020 17:30:59 +1000 Subject: [PATCH 094/156] rename helpers utils --- {helpers => utils}/_functions.js | 0 {helpers => utils}/botlists.js | 0 {helpers => utils}/mongoose.js | 0 {helpers => utils}/music.js | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename {helpers => utils}/_functions.js (100%) rename {helpers => utils}/botlists.js (100%) rename {helpers => utils}/mongoose.js (100%) rename {helpers => utils}/music.js (100%) diff --git a/helpers/_functions.js b/utils/_functions.js similarity index 100% rename from helpers/_functions.js rename to utils/_functions.js diff --git a/helpers/botlists.js b/utils/botlists.js similarity index 100% rename from helpers/botlists.js rename to utils/botlists.js diff --git a/helpers/mongoose.js b/utils/mongoose.js similarity index 100% rename from helpers/mongoose.js rename to utils/mongoose.js diff --git a/helpers/music.js b/utils/music.js similarity index 100% rename from helpers/music.js rename to utils/music.js From 293d473a7848e1f1b46faec42a104775385e4549 Mon Sep 17 00:00:00 2001 From: mudkipscience Date: Sat, 18 Apr 2020 17:31:17 +1000 Subject: [PATCH 095/156] move from tracer to winston for logging --- index.js | 42 +++++++------------------------- utils/logger.js | 65 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 74 insertions(+), 33 deletions(-) create mode 100644 utils/logger.js diff --git a/index.js b/index.js index d553213..fe34df7 100644 --- a/index.js +++ b/index.js @@ -11,44 +11,20 @@ if (Number(process.version.slice(1).split('.')[0]) < 12) { // Libraries const Discord = require('discord.js') -const client = new Discord.Client({ disabledEvents: ['TYPING_START'] }) const fs = require('fs') -const colors = require('colors') const isDocker = require('is-docker') const sentry = require('@sentry/node') -// Helpers +// Create bot client instance +const client = new Discord.Client({ disabledEvents: ['TYPING_START'] }) + +// Load all our useful utilities client.config = require('./config') client.version = require('./version.json') -client.db = require('./helpers/mongoose') -require('./helpers/_functions')(client) -require('./helpers/music')(client) - -// Initialise logger -client.logger = require('tracer').colorConsole({ - transport: function (data) { - console.log(data.output) - fs.appendFile('./file.log', data.rawoutput + '\n', err => { - if (err) throw err - }) - }, - - format: [ - '{{timestamp}} | {{title}} | {{file}} | {{message}}', - { - debug: `{{timestamp}} | ${'{{title}}'.magenta} | {{file}} | {{message}}`, - log: `{{timestamp}} | ${'{{title}}'.white} | {{file}} | {{message}}`, - info: `{{timestamp}} | ${'{{title}}'.cyan} | {{file}} | {{message}}`, - ready: `{{timestamp}} | ${'{{title}}'.green} | {{file}} | {{message}}`, - warn: `{{timestamp}} | ${'{{title}}'.yellow} | {{file}} | {{message}}`, - error: `{{timestamp}} | ${'{{title}}'.red} | {{file}} | {{message}}`, - fatal: `{{timestamp}} | ${'{{title}}'.red.bold} | {{file}} | {{message}}` - } - ], - dateformat: 'yyyy-mm-dd"T"HH:MM:ss', - methods: ['log', 'debug', 'info', 'ready', 'warn', 'error', 'fatal'], - filters: [colors.white] -}) +client.db = require('./utils/mongoose') +client.logger = require('./utils/logger') +require('./utils/_functions')(client) +require('./utils/music')(client) // Check if Woomy is running inside a Docker container if (isDocker() === true) { @@ -116,7 +92,7 @@ const init = async () => { // Login to Discord function failedToLogin (err) { - client.logger.error('Failed to login: ' + err) + client.logger.error('Couldn\'t login: ' + err) process.exit(0) }; diff --git a/utils/logger.js b/utils/logger.js new file mode 100644 index 0000000..29c9692 --- /dev/null +++ b/utils/logger.js @@ -0,0 +1,65 @@ +'use strict' + +const { createLogger, format, transports, addColors } = require('winston') +require('winston-daily-rotate-file') +const fs = require('fs') + +if (!fs.existsSync('logs')) { + fs.mkdirSync('logs') +} + +const dailyRotateFileTransport = new transports.DailyRotateFile({ + filename: 'logs/%DATE%.log', + datePattern: 'YYYY-MM-DD' +}) + +const customLevels = { + levels: { + fatal: 0, + error: 1, + warn: 2, + ready: 3, + info: 4, + cmd: 5, + debug: 6 + }, + + colors: { + fatal: 'bold red', + error: 'red', + warn: 'yellow', + ready: 'green', + info: 'cyan', + cmd: 'white', + debug: 'magenta' + } +} + +const logger = createLogger({ + level: 'info', + levels: customLevels.levels, + format: format.combine( + format.timestamp({ + format: 'YYYY-MM-DD HH:mm:ss' + }), + format.printf(info => `${info.timestamp} ${info.level}: ${info.message}`) + ), + + transports: [ + new transports.Console({ + level: 'info', + format: format.combine( + format.colorize(), + format.printf( + info => `${info.timestamp} ${info.level}: ${info.message}` + ) + ) + }), + + dailyRotateFileTransport + ] +}) + +addColors(customLevels.colors) + +module.exports = logger From bb2239bda1094e9e980af4c255efd6c85b1bca70 Mon Sep 17 00:00:00 2001 From: mudkipscience Date: Sat, 18 Apr 2020 17:31:33 +1000 Subject: [PATCH 096/156] update .gitignore --- .gitignore | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 90288e3..def5610 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,4 @@ .vscode -.env *config.js node_modules -data/enmap* -file.log \ No newline at end of file +logs \ No newline at end of file From 33f76c959abbca49f4a7e5c67d5479042140806a Mon Sep 17 00:00:00 2001 From: mudkipscience Date: Sat, 18 Apr 2020 17:52:42 +1000 Subject: [PATCH 097/156] resorted _functions --- utils/_functions.js | 276 ++++++++++++++++++++++---------------------- 1 file changed, 139 insertions(+), 137 deletions(-) diff --git a/utils/_functions.js b/utils/_functions.js index ca8e72b..1561679 100644 --- a/utils/_functions.js +++ b/utils/_functions.js @@ -1,137 +1,11 @@ +// Functions in this file are bound to the client object, and available basically anywhere. + const { MessageEmbed } = require('discord.js') const mongoose = require('mongoose') const Guild = require('../models/guild') const User = require('../models/user') module.exports = client => { - // Permission level function - client.permlevel = (message, settings) => { - let permlvl = 0 - - const permOrder = client.config.permLevels.slice(0).sort((p, c) => p.level < c.level ? 1 : -1) - - while (permOrder.length) { - const currentLevel = permOrder.shift() - if (message.guild && currentLevel.guildOnly) continue - if (currentLevel.check(message, settings)) { - permlvl = currentLevel.level - break - } - } - return permlvl - } - - // Get guild settings - client.findOrCreateGuild = async (guild) => { - const data = await Guild.findOne({ guildID: guild.id }) - if (data) { - return data - } else { - const merged = Object.assign({ _id: mongoose.Types.ObjectId() }, { guildID: guild.id }) - const newGuild = await new Guild(merged) - return newGuild.save() - } - } - - // Update guild settings - client.updateGuild = async (guild, settings) => { - let data = await client.findOrCreateGuild(guild) - - if (typeof data !== 'object') data = {} - for (const key in settings) { - if (data[key] !== settings[key]) { - data[key] = settings[key] - } else return - } - - return data.updateOne(settings) - } - - // Delete guild settings - client.deleteGuild = async (guild) => { - const data = await client.findOrCreateGuild(guild) - if (data) { - data.deleteOne({ guildID: guild.id }) - } - } - - // Get user settings - client.findOrCreateUser = async (user) => { - const data = await User.findOne({ userID: user.id }) - if (data) { - return data - } else { - const merged = Object.assign({ _id: mongoose.Types.ObjectId() }, { userID: user.id }) - const newUser = await new User(merged) - return newUser.save() - } - } - - // Update user settings - client.updateUser = async (user, settings) => { - let data = await client.findOrCreateUser(user) - - if (typeof data !== 'object') data = {} - for (const key in settings) { - if (data[key] !== settings[key]) { - data[key] = settings[key] - } else return - } - - return data.updateOne(settings) - } - - // Delete user settings - client.deleteUser = async (user) => { - const data = await client.findOrCreateUser(user) - if (data) { - data.deleteOne({ userID: user.id }) - } - } - - // Loads commands - client.loadCommand = (commandName) => { - try { - const props = require(`../commands/${commandName}`) - if (props.init) { - props.init(client) - } - client.commands.set(props.help.name, props) - // So commands can each have their own cooldown time - client.cooldown.set(props.help.name, new Map()) - props.conf.aliases.forEach(alias => { - client.aliases.set(alias, props.help.name) - }) - return false - } catch (e) { - return `Failed to load ${commandName}: ${e}` - } - } - - // Command unloader - client.unloadCommand = async (commandName) => { - let command - if (client.commands.has(commandName)) { - command = client.commands.get(commandName) - } else if (client.aliases.has(commandName)) { - command = client.commands.get(client.aliases.get(commandName)) - } - if (!command) return `The command \`${commandName}\` doesn't seem to exist, nor is it an alias. Try again!` - - if (command.shutdown) { - await command.shutdown(client) - } - const mod = require.cache[require.resolve(`../commands/${command.help.name}`)] - delete require.cache[require.resolve(`../commands/${command.help.name}.js`)] - for (let i = 0; i < mod.parent.children.length; i++) { - if (mod.parent.children[i] === mod) { - mod.parent.children.splice(i, 1) - break - } - } - return false - } - // Creates an embed for when commands are used incorrectly client.userError = (msg, cmd, err) => { const embed = new MessageEmbed() @@ -146,6 +20,15 @@ module.exports = client => { }) } + // Embed colour function + client.embedColour = function (guild) { + if (!guild || guild.member(client.user).displayHexColor === '#000000') { + return ['#ff9d68', '#ff97cb', '#d789ff', '#74FFFF'].random() + } else { + return guild.member(client.user).displayHexColor + } + } + // Clean up input to remove @everyone, token, etc client.clean = async (client, text) => { if (text && text.constructor.name === 'Promise') { @@ -178,15 +61,6 @@ module.exports = client => { } } - // Embed colour function - client.embedColour = function (guild) { - if (!guild || guild.member(client.user).displayHexColor === '#000000') { - return ['#ff9d68', '#ff97cb', '#d789ff', '#74FFFF'].random() - } else { - return guild.member(client.user).displayHexColor - } - } - // Capitalises the first letter of every word in a string // eslint-disable-next-line no-extend-native Object.defineProperty(String.prototype, 'toProperCase', { @@ -273,6 +147,134 @@ module.exports = client => { return role } + // Loads commands + client.loadCommand = (commandName) => { + try { + const props = require(`../commands/${commandName}`) + if (props.init) { + props.init(client) + } + client.commands.set(props.help.name, props) + // So commands can each have their own cooldown time + client.cooldown.set(props.help.name, new Map()) + props.conf.aliases.forEach(alias => { + client.aliases.set(alias, props.help.name) + }) + return false + } catch (e) { + return `Failed to load ${commandName}: ${e}` + } + } + + // Permission level function + client.permlevel = (message, settings) => { + let permlvl = 0 + + const permOrder = client.config.permLevels.slice(0).sort((p, c) => p.level < c.level ? 1 : -1) + + while (permOrder.length) { + const currentLevel = permOrder.shift() + if (message.guild && currentLevel.guildOnly) continue + if (currentLevel.check(message, settings)) { + permlvl = currentLevel.level + break + } + } + return permlvl + } + + // Get guild settings + client.findOrCreateGuild = async (guild) => { + const data = await Guild.findOne({ guildID: guild.id }) + if (data) { + return data + } else { + const merged = Object.assign({ _id: mongoose.Types.ObjectId() }, { guildID: guild.id }) + const newGuild = await new Guild(merged) + return newGuild.save() + } + } + + // Update guild settings + client.updateGuild = async (guild, settings) => { + let data = await client.findOrCreateGuild(guild) + + if (typeof data !== 'object') data = {} + for (const key in settings) { + if (data[key] !== settings[key]) { + data[key] = settings[key] + } else return + } + + return data.updateOne(settings) + } + + // Delete guild settings + client.deleteGuild = async (guild) => { + const data = await client.findOrCreateGuild(guild) + if (data) { + data.deleteOne({ guildID: guild.id }) + } + } + + // Get user settings + client.findOrCreateUser = async (user) => { + const data = await User.findOne({ userID: user.id }) + if (data) { + return data + } else { + const merged = Object.assign({ _id: mongoose.Types.ObjectId() }, { userID: user.id }) + const newUser = await new User(merged) + return newUser.save() + } + } + + // Update user settings + client.updateUser = async (user, settings) => { + let data = await client.findOrCreateUser(user) + + if (typeof data !== 'object') data = {} + for (const key in settings) { + if (data[key] !== settings[key]) { + data[key] = settings[key] + } else return + } + + return data.updateOne(settings) + } + + // Delete user settings + client.deleteUser = async (user) => { + const data = await client.findOrCreateUser(user) + if (data) { + data.deleteOne({ userID: user.id }) + } + } + + // Command unloader + client.unloadCommand = async (commandName) => { + let command + if (client.commands.has(commandName)) { + command = client.commands.get(commandName) + } else if (client.aliases.has(commandName)) { + command = client.commands.get(client.aliases.get(commandName)) + } + if (!command) return `The command \`${commandName}\` doesn't seem to exist, nor is it an alias. Try again!` + + if (command.shutdown) { + await command.shutdown(client) + } + const mod = require.cache[require.resolve(`../commands/${command.help.name}`)] + delete require.cache[require.resolve(`../commands/${command.help.name}.js`)] + for (let i = 0; i < mod.parent.children.length; i++) { + if (mod.parent.children[i] === mod) { + mod.parent.children.splice(i, 1) + break + } + } + return false + } + // Both of these functions catch errors and log them (maybe we could use sentry?) process.on('uncaughtException', (err) => { const errorMsg = err.stack.replace(new RegExp(`${__dirname}/`, 'g'), './') From 047b0be769cc6bba602ed803f7de340ea7c8bbc3 Mon Sep 17 00:00:00 2001 From: mudkipscience Date: Sat, 18 Apr 2020 17:54:01 +1000 Subject: [PATCH 098/156] disable sentry for now --- index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.js b/index.js index fe34df7..a4bf426 100644 --- a/index.js +++ b/index.js @@ -44,7 +44,7 @@ client.aliases = new Discord.Collection() const init = async () => { // initialise sentry if (client.config.keys.sentry !== '' && client.devmode === false) { - sentry.init({ dsn: client.config.keys.sentry }) + // sentry.init({ dsn: client.config.keys.sentry }) } // Command handler From dc279467d584de8185e5c0f1eff69cb0b63cf72a Mon Sep 17 00:00:00 2001 From: mudkipscience Date: Sun, 19 Apr 2020 00:14:11 +1000 Subject: [PATCH 099/156] winston was borked --- index.js | 9 ++++-- utils/logger.js | 77 ++++++++++++------------------------------------- 2 files changed, 24 insertions(+), 62 deletions(-) diff --git a/index.js b/index.js index a4bf426..c05f5c9 100644 --- a/index.js +++ b/index.js @@ -3,6 +3,9 @@ 'use strict' +// remove this after we uncomment sentry +/* eslint-disable no-unused-vars */ + // Check node.js version if (Number(process.version.slice(1).split('.')[0]) < 12) { console.log('NodeJS 12.0.0 or higher is required. Please update NodeJS on your system.') @@ -58,9 +61,9 @@ const init = async () => { if (!file.endsWith('.js')) { return } - const response = client.loadCommand(file) - if (response) { - client.logger.error(response) + const res = client.loadCommand(file) + if (res) { + client.logger.error(res) } }) }) diff --git a/utils/logger.js b/utils/logger.js index 29c9692..047abc6 100644 --- a/utils/logger.js +++ b/utils/logger.js @@ -1,65 +1,24 @@ 'use strict' -const { createLogger, format, transports, addColors } = require('winston') -require('winston-daily-rotate-file') -const fs = require('fs') +const { colorConsole } = require('tracer') +const colors = require('colors') -if (!fs.existsSync('logs')) { - fs.mkdirSync('logs') -} - -const dailyRotateFileTransport = new transports.DailyRotateFile({ - filename: 'logs/%DATE%.log', - datePattern: 'YYYY-MM-DD' +const logger = colorConsole({ + format: [ + '{{timestamp}} | {{title}} | {{file}} | {{message}}', + { + debug: `{{timestamp}} | ${'{{title}}'.magenta} | {{file}} | {{message}}`, + cmd: `{{timestamp}} | ${'{{title}}'.white} | {{file}} | {{message}}`, + info: `{{timestamp}} | ${'{{title}}'.cyan} | {{file}} | {{message}}`, + ready: `{{timestamp}} | ${'{{title}}'.green} | {{file}} | {{message}}`, + warn: `{{timestamp}} | ${'{{title}}'.yellow} | {{file}} | {{message}}`, + error: `{{timestamp}} | ${'{{title}}'.red} | {{file}} | {{message}}`, + fatal: `{{timestamp}} | ${'{{title}}'.red.bold} | {{file}} | {{message}}` + } + ], + dateformat: 'yyyy-mm-dd"T"HH:MM:ss', + methods: ['cmd', 'debug', 'info', 'ready', 'warn', 'error', 'fatal'], + filters: [colors.white] }) -const customLevels = { - levels: { - fatal: 0, - error: 1, - warn: 2, - ready: 3, - info: 4, - cmd: 5, - debug: 6 - }, - - colors: { - fatal: 'bold red', - error: 'red', - warn: 'yellow', - ready: 'green', - info: 'cyan', - cmd: 'white', - debug: 'magenta' - } -} - -const logger = createLogger({ - level: 'info', - levels: customLevels.levels, - format: format.combine( - format.timestamp({ - format: 'YYYY-MM-DD HH:mm:ss' - }), - format.printf(info => `${info.timestamp} ${info.level}: ${info.message}`) - ), - - transports: [ - new transports.Console({ - level: 'info', - format: format.combine( - format.colorize(), - format.printf( - info => `${info.timestamp} ${info.level}: ${info.message}` - ) - ) - }), - - dailyRotateFileTransport - ] -}) - -addColors(customLevels.colors) - module.exports = logger From 3ab6dbfea967099879cfb694c83cfb39a026ad90 Mon Sep 17 00:00:00 2001 From: mudkipscience Date: Sun, 19 Apr 2020 00:14:23 +1000 Subject: [PATCH 100/156] update deps --- package-lock.json | 1057 ++++++++++++++++++++++++++++++++++----------- package.json | 4 +- 2 files changed, 806 insertions(+), 255 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6454800..b01e384 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,22 +8,154 @@ "version": "7.8.3", "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz", "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==", - "dev": true, "requires": { "@babel/highlight": "^7.8.3" } }, + "@babel/core": { + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.9.0.tgz", + "integrity": "sha512-kWc7L0fw1xwvI0zi8OKVBuxRVefwGOrKSQMvrQ3dW+bIIavBY3/NpXmpjMy7bQnLgwgzWQZ8TlM57YHpHNHz4w==", + "requires": { + "@babel/code-frame": "^7.8.3", + "@babel/generator": "^7.9.0", + "@babel/helper-module-transforms": "^7.9.0", + "@babel/helpers": "^7.9.0", + "@babel/parser": "^7.9.0", + "@babel/template": "^7.8.6", + "@babel/traverse": "^7.9.0", + "@babel/types": "^7.9.0", + "convert-source-map": "^1.7.0", + "debug": "^4.1.0", + "gensync": "^1.0.0-beta.1", + "json5": "^2.1.2", + "lodash": "^4.17.13", + "resolve": "^1.3.2", + "semver": "^5.4.1", + "source-map": "^0.5.0" + }, + "dependencies": { + "semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" + } + } + }, + "@babel/generator": { + "version": "7.9.5", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.9.5.tgz", + "integrity": "sha512-GbNIxVB3ZJe3tLeDm1HSn2AhuD/mVcyLDpgtLXa5tplmWrJdF/elxB56XNqCuD6szyNkDi6wuoKXln3QeBmCHQ==", + "requires": { + "@babel/types": "^7.9.5", + "jsesc": "^2.5.1", + "lodash": "^4.17.13", + "source-map": "^0.5.0" + } + }, + "@babel/helper-function-name": { + "version": "7.9.5", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.9.5.tgz", + "integrity": "sha512-JVcQZeXM59Cd1qanDUxv9fgJpt3NeKUaqBqUEvfmQ+BCOKq2xUgaWZW2hr0dkbyJgezYuplEoh5knmrnS68efw==", + "requires": { + "@babel/helper-get-function-arity": "^7.8.3", + "@babel/template": "^7.8.3", + "@babel/types": "^7.9.5" + } + }, + "@babel/helper-get-function-arity": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz", + "integrity": "sha512-FVDR+Gd9iLjUMY1fzE2SR0IuaJToR4RkCDARVfsBBPSP53GEqSFjD8gNyxg246VUyc/ALRxFaAK8rVG7UT7xRA==", + "requires": { + "@babel/types": "^7.8.3" + } + }, + "@babel/helper-member-expression-to-functions": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.8.3.tgz", + "integrity": "sha512-fO4Egq88utkQFjbPrSHGmGLFqmrshs11d46WI+WZDESt7Wu7wN2G2Iu+NMMZJFDOVRHAMIkB5SNh30NtwCA7RA==", + "requires": { + "@babel/types": "^7.8.3" + } + }, + "@babel/helper-module-imports": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.8.3.tgz", + "integrity": "sha512-R0Bx3jippsbAEtzkpZ/6FIiuzOURPcMjHp+Z6xPe6DtApDJx+w7UYyOLanZqO8+wKR9G10s/FmHXvxaMd9s6Kg==", + "requires": { + "@babel/types": "^7.8.3" + } + }, + "@babel/helper-module-transforms": { + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.9.0.tgz", + "integrity": "sha512-0FvKyu0gpPfIQ8EkxlrAydOWROdHpBmiCiRwLkUiBGhCUPRRbVD2/tm3sFr/c/GWFrQ/ffutGUAnx7V0FzT2wA==", + "requires": { + "@babel/helper-module-imports": "^7.8.3", + "@babel/helper-replace-supers": "^7.8.6", + "@babel/helper-simple-access": "^7.8.3", + "@babel/helper-split-export-declaration": "^7.8.3", + "@babel/template": "^7.8.6", + "@babel/types": "^7.9.0", + "lodash": "^4.17.13" + } + }, + "@babel/helper-optimise-call-expression": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.8.3.tgz", + "integrity": "sha512-Kag20n86cbO2AvHca6EJsvqAd82gc6VMGule4HwebwMlwkpXuVqrNRj6CkCV2sKxgi9MyAUnZVnZ6lJ1/vKhHQ==", + "requires": { + "@babel/types": "^7.8.3" + } + }, + "@babel/helper-replace-supers": { + "version": "7.8.6", + "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.8.6.tgz", + "integrity": "sha512-PeMArdA4Sv/Wf4zXwBKPqVj7n9UF/xg6slNRtZW84FM7JpE1CbG8B612FyM4cxrf4fMAMGO0kR7voy1ForHHFA==", + "requires": { + "@babel/helper-member-expression-to-functions": "^7.8.3", + "@babel/helper-optimise-call-expression": "^7.8.3", + "@babel/traverse": "^7.8.6", + "@babel/types": "^7.8.6" + } + }, + "@babel/helper-simple-access": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.8.3.tgz", + "integrity": "sha512-VNGUDjx5cCWg4vvCTR8qQ7YJYZ+HBjxOgXEl7ounz+4Sn7+LMD3CFrCTEU6/qXKbA2nKg21CwhhBzO0RpRbdCw==", + "requires": { + "@babel/template": "^7.8.3", + "@babel/types": "^7.8.3" + } + }, + "@babel/helper-split-export-declaration": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz", + "integrity": "sha512-3x3yOeyBhW851hroze7ElzdkeRXQYQbFIb7gLK1WQYsw2GWDay5gAJNw1sWJ0VFP6z5J1whqeXH/WCdCjZv6dA==", + "requires": { + "@babel/types": "^7.8.3" + } + }, "@babel/helper-validator-identifier": { "version": "7.9.0", "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.0.tgz", - "integrity": "sha512-6G8bQKjOh+of4PV/ThDm/rRqlU7+IGoJuofpagU5GlEl29Vv0RGqqt86ZGRV8ZuSOY3o+8yXl5y782SMcG7SHw==", - "dev": true + "integrity": "sha512-6G8bQKjOh+of4PV/ThDm/rRqlU7+IGoJuofpagU5GlEl29Vv0RGqqt86ZGRV8ZuSOY3o+8yXl5y782SMcG7SHw==" + }, + "@babel/helpers": { + "version": "7.9.2", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.9.2.tgz", + "integrity": "sha512-JwLvzlXVPjO8eU9c/wF9/zOIN7X6h8DYf7mG4CiFRZRvZNKEF5dQ3H3V+ASkHoIB3mWhatgl5ONhyqHRI6MppA==", + "requires": { + "@babel/template": "^7.8.3", + "@babel/traverse": "^7.9.0", + "@babel/types": "^7.9.0" + } }, "@babel/highlight": { "version": "7.9.0", "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz", "integrity": "sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==", - "dev": true, "requires": { "@babel/helper-validator-identifier": "^7.9.0", "chalk": "^2.0.0", @@ -34,7 +166,6 @@ "version": "3.2.1", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, "requires": { "color-convert": "^1.9.0" } @@ -43,7 +174,6 @@ "version": "2.4.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, "requires": { "ansi-styles": "^3.2.1", "escape-string-regexp": "^1.0.5", @@ -54,7 +184,6 @@ "version": "1.9.3", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dev": true, "requires": { "color-name": "1.1.3" } @@ -62,26 +191,71 @@ "color-name": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", - "dev": true + "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=" }, "has-flag": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", - "dev": true + "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=" }, "supports-color": { "version": "5.5.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, "requires": { "has-flag": "^3.0.0" } } } }, + "@babel/parser": { + "version": "7.9.4", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.9.4.tgz", + "integrity": "sha512-bC49otXX6N0/VYhgOMh4gnP26E9xnDZK3TmbNpxYzzz9BQLBosQwfyOe9/cXUU3txYhTzLCbcqd5c8y/OmCjHA==" + }, + "@babel/template": { + "version": "7.8.6", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.8.6.tgz", + "integrity": "sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg==", + "requires": { + "@babel/code-frame": "^7.8.3", + "@babel/parser": "^7.8.6", + "@babel/types": "^7.8.6" + } + }, + "@babel/traverse": { + "version": "7.9.5", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.5.tgz", + "integrity": "sha512-c4gH3jsvSuGUezlP6rzSJ6jf8fYjLj3hsMZRx/nX0h+fmHN0w+ekubRrHPqnMec0meycA2nwCsJ7dC8IPem2FQ==", + "requires": { + "@babel/code-frame": "^7.8.3", + "@babel/generator": "^7.9.5", + "@babel/helper-function-name": "^7.9.5", + "@babel/helper-split-export-declaration": "^7.8.3", + "@babel/parser": "^7.9.0", + "@babel/types": "^7.9.5", + "debug": "^4.1.0", + "globals": "^11.1.0", + "lodash": "^4.17.13" + } + }, + "@babel/types": { + "version": "7.9.5", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.5.tgz", + "integrity": "sha512-XjnvNqenk818r5zMaba+sLQjnbda31UfUURv3ei0qPQw4u+j2jMyJ5b11y8ZHYTRSI3NnInQkkkRT4fLqqPdHg==", + "requires": { + "@babel/helper-validator-identifier": "^7.9.5", + "lodash": "^4.17.13", + "to-fast-properties": "^2.0.0" + }, + "dependencies": { + "@babel/helper-validator-identifier": { + "version": "7.9.5", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.5.tgz", + "integrity": "sha512-/8arLKUFq882w4tWGj9JYzRpAlZgiWUJ+dtteNTDqrRBz9Iguck9Rn3ykuBDoUwh2TO4tSAJlrxDUOXWklJe4g==" + } + } + }, "@discordjs/collection": { "version": "0.1.5", "resolved": "https://registry.npmjs.org/@discordjs/collection/-/collection-0.1.5.tgz", @@ -106,6 +280,29 @@ "node-pre-gyp": "^0.14.0" } }, + "@istanbuljs/load-nyc-config": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.0.0.tgz", + "integrity": "sha512-ZR0rq/f/E4f4XcgnDvtMWXCUJpi8eO0rssVhmztsZqLIEFA9UUP9zmpE0VxlM+kv/E1ul2I876Fwil2ayptDVg==", + "requires": { + "camelcase": "^5.3.1", + "find-up": "^4.1.0", + "js-yaml": "^3.13.1", + "resolve-from": "^5.0.0" + }, + "dependencies": { + "resolve-from": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", + "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==" + } + } + }, + "@istanbuljs/schema": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.2.tgz", + "integrity": "sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw==" + }, "@sentry/apm": { "version": "5.15.4", "resolved": "https://registry.npmjs.org/@sentry/apm/-/apm-5.15.4.tgz", @@ -195,8 +392,7 @@ "@types/color-name": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz", - "integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==", - "dev": true + "integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==" }, "@types/node": { "version": "13.11.1", @@ -233,6 +429,15 @@ "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-5.1.1.tgz", "integrity": "sha512-TMeqbNl2fMW0nMjTEPOwe3J/PRFP4vqeoNuQMG0HlMrtm5QxKqdvAkZ1pRBQ/ulIyDD5Yq0nJ7YbdD8ey0TO3g==" }, + "aggregate-error": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.0.1.tgz", + "integrity": "sha512-quoaXsZ9/BLNae5yiNoUz+Nhkwz83GhWwtYFglcjEQB2NDHCIpApbqXxIFnm4Pq/Nvhrsq5sYJFyohrrxnTGAA==", + "requires": { + "clean-stack": "^2.0.0", + "indent-string": "^4.0.0" + } + }, "ansi-escapes": { "version": "4.3.1", "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz", @@ -253,24 +458,35 @@ "ansi-regex": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", - "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", - "dev": true + "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==" }, "ansi-styles": { "version": "4.2.1", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", - "dev": true, "requires": { "@types/color-name": "^1.1.1", "color-convert": "^2.0.1" } }, + "append-transform": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/append-transform/-/append-transform-2.0.0.tgz", + "integrity": "sha512-7yeyCEurROLQJFv5Xj4lEGTy0borxepjFv1g22oAdqFu//SrAlDl1O1Nxx15SH1RoliUml6p8dwJW9jvZughhg==", + "requires": { + "default-require-extensions": "^3.0.0" + } + }, "aproba": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz", "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==" }, + "archy": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz", + "integrity": "sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=" + }, "are-we-there-yet": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz", @@ -284,7 +500,6 @@ "version": "1.0.10", "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", - "dev": true, "requires": { "sprintf-js": "~1.0.2" } @@ -316,14 +531,6 @@ "integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==", "dev": true }, - "async": { - "version": "2.6.3", - "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz", - "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==", - "requires": { - "lodash": "^4.17.14" - } - }, "asynckit": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", @@ -362,12 +569,28 @@ "resolved": "https://registry.npmjs.org/bson/-/bson-1.1.4.tgz", "integrity": "sha512-S/yKGU1syOMzO86+dGpg2qGoDL0zvzcb262G+gqEy6TgP6rt6z6qxSFX/8X6vLC91P7G7C3nLs0+bvDzmvBA3Q==" }, + "caching-transform": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/caching-transform/-/caching-transform-4.0.0.tgz", + "integrity": "sha512-kpqOvwXnjjN44D89K5ccQC+RUrsy7jB/XLlRrx0D7/2HNcTPqzsb6XgYoErwko6QsV184CA2YgS1fxDiiDZMWA==", + "requires": { + "hasha": "^5.0.0", + "make-dir": "^3.0.0", + "package-hash": "^4.0.0", + "write-file-atomic": "^3.0.0" + } + }, "callsites": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", "dev": true }, + "camelcase": { + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", + "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==" + }, "chalk": { "version": "2.4.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", @@ -431,6 +654,11 @@ "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz", "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==" }, + "clean-stack": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz", + "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==" + }, "cli-cursor": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz", @@ -446,40 +674,25 @@ "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=", "dev": true }, + "cliui": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz", + "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==", + "requires": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.0", + "wrap-ansi": "^6.2.0" + } + }, "code-point-at": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=" }, - "color": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/color/-/color-3.0.0.tgz", - "integrity": "sha512-jCpd5+s0s0t7p3pHQKpnJ0TpQKKdleP71LWcA0aqiljpiuAkOSUFN/dyH8ZwF0hRmFlrIuRhufds1QyEP9EB+w==", - "requires": { - "color-convert": "^1.9.1", - "color-string": "^1.5.2" - }, - "dependencies": { - "color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "requires": { - "color-name": "1.1.3" - } - }, - "color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=" - } - } - }, "color-convert": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, "requires": { "color-name": "~1.1.4" } @@ -489,34 +702,11 @@ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" }, - "color-string": { - "version": "1.5.3", - "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.5.3.tgz", - "integrity": "sha512-dC2C5qeWoYkxki5UAXapdjqO672AM4vZuPGRQfO8b5HKuKGBbKWpITyDYN7TOFKvRW7kOgAn3746clDBMDJyQw==", - "requires": { - "color-name": "^1.0.0", - "simple-swizzle": "^0.2.2" - } - }, - "colornames": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/colornames/-/colornames-1.1.1.tgz", - "integrity": "sha1-+IiQMGhcfE/54qVZ9Qd+t2qBb5Y=" - }, "colors": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz", "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==" }, - "colorspace": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/colorspace/-/colorspace-1.1.2.tgz", - "integrity": "sha512-vt+OoIP2d76xLhjwbBaucYlNSpPsrJWPlBTtwCpQKIu6/CSMutyzX93O/Do0qzpH3YoHEes8YEFXyZ797rEhzQ==", - "requires": { - "color": "3.0.x", - "text-hex": "1.0.x" - } - }, "combined-stream": { "version": "1.0.8", "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", @@ -525,6 +715,11 @@ "delayed-stream": "~1.0.0" } }, + "commondir": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz", + "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=" + }, "concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", @@ -541,6 +736,14 @@ "integrity": "sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo=", "dev": true }, + "convert-source-map": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz", + "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==", + "requires": { + "safe-buffer": "~5.1.1" + } + }, "cookie": { "version": "0.3.1", "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz", @@ -551,6 +754,21 @@ "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" }, + "cross-spawn": { + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.2.tgz", + "integrity": "sha512-PD6G8QG3S4FK/XCGFbEQrDqO2AnMMsy0meR7lerlIOHAAbkuavGU/pOqprrlvfTNjvowivTeBsjebAL0NSoMxw==", + "requires": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + } + }, + "dateformat": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-3.0.3.tgz", + "integrity": "sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==" + }, "debug": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", @@ -559,6 +777,11 @@ "ms": "^2.1.1" } }, + "decamelize": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", + "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=" + }, "deep-extend": { "version": "0.6.0", "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz", @@ -570,6 +793,14 @@ "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=", "dev": true }, + "default-require-extensions": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/default-require-extensions/-/default-require-extensions-3.0.0.tgz", + "integrity": "sha512-ek6DpXq/SCpvjhpFsLFRVtIxJCRw6fUR42lYMVZuUMK7n8eMz4Uh5clckdBjEpLhn/gEBZo7hDJnJcwdKLKQjg==", + "requires": { + "strip-bom": "^4.0.0" + } + }, "define-properties": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz", @@ -599,16 +830,6 @@ "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz", "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=" }, - "diagnostics": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/diagnostics/-/diagnostics-1.1.1.tgz", - "integrity": "sha512-8wn1PmdunLJ9Tqbx+Fx/ZEuHfJf4NKSN2ZBj7SJC/OWRWha843+WsTjqMe1B5E3p28jqBlp+mJ2fPVxPyNgYKQ==", - "requires": { - "colorspace": "1.1.x", - "enabled": "1.0.x", - "kuler": "1.0.x" - } - }, "discord.js": { "version": "12.2.0", "resolved": "https://registry.npmjs.org/discord.js/-/discord.js-12.2.0.tgz", @@ -636,21 +857,7 @@ "emoji-regex": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true - }, - "enabled": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/enabled/-/enabled-1.0.2.tgz", - "integrity": "sha1-ll9lE9LC0cX0ZStkouM5ZGf8L5M=", - "requires": { - "env-variable": "0.0.x" - } - }, - "env-variable": { - "version": "0.0.6", - "resolved": "https://registry.npmjs.org/env-variable/-/env-variable-0.0.6.tgz", - "integrity": "sha512-bHz59NlBbtS0NhftmR8+ExBEekE7br0e01jw+kk0NDro7TtZzBYZ5ScGPs3OmwnpyfHTHOtr1Y6uedCdrIldtg==" + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" }, "error-ex": { "version": "1.3.2", @@ -691,11 +898,15 @@ "is-symbol": "^1.0.2" } }, + "es6-error": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz", + "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==" + }, "escape-string-regexp": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", - "dev": true + "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=" }, "eslint": { "version": "6.8.0", @@ -1105,8 +1316,7 @@ "esprima": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", - "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", - "dev": true + "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==" }, "esquery": { "version": "1.2.0", @@ -1180,16 +1390,6 @@ "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=", "dev": true }, - "fast-safe-stringify": { - "version": "2.0.7", - "resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.0.7.tgz", - "integrity": "sha512-Utm6CdzT+6xsDk2m8S6uL8VHxNwI6Jub+e9NYTcAms28T84pTa25GJQV9j0CY0N1rM8hK4x6grpF2BQf+2qwVA==" - }, - "fecha": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/fecha/-/fecha-2.3.3.tgz", - "integrity": "sha512-lUGBnIamTAwk4znq5BcqsDaxSmZ9nDVJaij6NvRt/Tg4R69gERA+otPKbS86ROw9nxVMw2/mp1fnaiWqbs6Sdg==" - }, "figures": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz", @@ -1208,12 +1408,23 @@ "flat-cache": "^2.0.1" } }, - "file-stream-rotator": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/file-stream-rotator/-/file-stream-rotator-0.5.7.tgz", - "integrity": "sha512-VYb3HZ/GiAGUCrfeakO8Mp54YGswNUHvL7P09WQcXAJNSj3iQ5QraYSp3cIn1MUyw6uzfgN/EFOarCNa4JvUHQ==", + "find-cache-dir": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.1.tgz", + "integrity": "sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ==", "requires": { - "moment": "^2.11.2" + "commondir": "^1.0.1", + "make-dir": "^3.0.2", + "pkg-dir": "^4.1.0" + } + }, + "find-up": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "requires": { + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" } }, "flat-cache": { @@ -1244,6 +1455,20 @@ "integrity": "sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==", "dev": true }, + "foreground-child": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-2.0.0.tgz", + "integrity": "sha512-dCIq9FpEcyQyXKCkyzmlPTFNgrCzPudOe+mhvJU5zAtlBnGVy2yKxtfsxK2tQBThwq225jcvBjpw1Gr40uzZCA==", + "requires": { + "cross-spawn": "^7.0.0", + "signal-exit": "^3.0.2" + } + }, + "fromentries": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/fromentries/-/fromentries-1.2.0.tgz", + "integrity": "sha512-33X7H/wdfO99GdRLLgkjUrD4geAFdq/Uv0kl3HD4da6HDixd2GUg8Mw7dahLCV9r/EARkmtYBB6Tch4EEokFTQ==" + }, "fs-minipass": { "version": "1.2.7", "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz", @@ -1317,6 +1542,16 @@ } } }, + "gensync": { + "version": "1.0.0-beta.1", + "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.1.tgz", + "integrity": "sha512-r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg==" + }, + "get-caller-file": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", + "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==" + }, "glob": { "version": "7.1.6", "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", @@ -1339,11 +1574,15 @@ "is-glob": "^4.0.1" } }, + "globals": { + "version": "11.12.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", + "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==" + }, "graceful-fs": { "version": "4.2.3", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz", - "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==", - "dev": true + "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==" }, "has": { "version": "1.0.3", @@ -1357,8 +1596,7 @@ "has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" }, "has-symbols": { "version": "1.0.1", @@ -1371,6 +1609,15 @@ "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=" }, + "hasha": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/hasha/-/hasha-5.2.0.tgz", + "integrity": "sha512-2W+jKdQbAdSIrggA8Q35Br8qKadTrqCTC8+XZvBWepKDK6m9XkX6Iz1a2yh2KP01kzAR/dpuMeUnocoLYDcskw==", + "requires": { + "is-stream": "^2.0.0", + "type-fest": "^0.8.0" + } + }, "hastebin-gen": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/hastebin-gen/-/hastebin-gen-2.0.5.tgz", @@ -1390,6 +1637,11 @@ "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.3.1.tgz", "integrity": "sha512-rhE/4Z3hIhzHAUKbW8jVcCyuT5oJCXXqhN/6mXXVCpzTmvJnoH2HL/bt3EZ6p55jbFJBeAe1ZNpL5BugLujxNA==" }, + "html-escaper": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz", + "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==" + }, "https-proxy-agent": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-4.0.0.tgz", @@ -1442,8 +1694,12 @@ "imurmurhash": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", - "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=", - "dev": true + "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=" + }, + "indent-string": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", + "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==" }, "inflight": { "version": "1.0.6", @@ -1529,8 +1785,7 @@ "is-fullwidth-code-point": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "dev": true + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==" }, "is-glob": { "version": "4.0.1", @@ -1556,6 +1811,11 @@ "has": "^1.0.3" } }, + "is-stream": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz", + "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==" + }, "is-string": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.5.tgz", @@ -1571,6 +1831,16 @@ "has-symbols": "^1.0.1" } }, + "is-typedarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", + "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=" + }, + "is-windows": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz", + "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==" + }, "isarray": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", @@ -1579,25 +1849,104 @@ "isexe": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", - "dev": true + "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=" + }, + "istanbul-lib-coverage": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz", + "integrity": "sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg==" + }, + "istanbul-lib-hook": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/istanbul-lib-hook/-/istanbul-lib-hook-3.0.0.tgz", + "integrity": "sha512-Pt/uge1Q9s+5VAZ+pCo16TYMWPBIl+oaNIjgLQxcX0itS6ueeaA+pEfThZpH8WxhFgCiEb8sAJY6MdUKgiIWaQ==", + "requires": { + "append-transform": "^2.0.0" + } + }, + "istanbul-lib-instrument": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.1.tgz", + "integrity": "sha512-imIchxnodll7pvQBYOqUu88EufLCU56LMeFPZZM/fJZ1irYcYdqroaV+ACK1Ila8ls09iEYArp+nqyC6lW1Vfg==", + "requires": { + "@babel/core": "^7.7.5", + "@babel/parser": "^7.7.5", + "@babel/template": "^7.7.4", + "@babel/traverse": "^7.7.4", + "@istanbuljs/schema": "^0.1.2", + "istanbul-lib-coverage": "^3.0.0", + "semver": "^6.3.0" + } + }, + "istanbul-lib-processinfo": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/istanbul-lib-processinfo/-/istanbul-lib-processinfo-2.0.2.tgz", + "integrity": "sha512-kOwpa7z9hme+IBPZMzQ5vdQj8srYgAtaRqeI48NGmAQ+/5yKiHLV0QbYqQpxsdEF0+w14SoB8YbnHKcXE2KnYw==", + "requires": { + "archy": "^1.0.0", + "cross-spawn": "^7.0.0", + "istanbul-lib-coverage": "^3.0.0-alpha.1", + "make-dir": "^3.0.0", + "p-map": "^3.0.0", + "rimraf": "^3.0.0", + "uuid": "^3.3.3" + } + }, + "istanbul-lib-report": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz", + "integrity": "sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==", + "requires": { + "istanbul-lib-coverage": "^3.0.0", + "make-dir": "^3.0.0", + "supports-color": "^7.1.0" + } + }, + "istanbul-lib-source-maps": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.0.tgz", + "integrity": "sha512-c16LpFRkR8vQXyHZ5nLpY35JZtzj1PQY1iZmesUbf1FZHbIupcWfjgOXBY9YHkLEQ6puz1u4Dgj6qmU/DisrZg==", + "requires": { + "debug": "^4.1.1", + "istanbul-lib-coverage": "^3.0.0", + "source-map": "^0.6.1" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" + } + } + }, + "istanbul-reports": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.0.2.tgz", + "integrity": "sha512-9tZvz7AiR3PEDNGiV9vIouQ/EAcqMXFmkcA1CDFTwOB98OZVDL0PH9glHotf5Ugp6GCOTypfzGWI/OqjWNCRUw==", + "requires": { + "html-escaper": "^2.0.0", + "istanbul-lib-report": "^3.0.0" + } }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", - "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", - "dev": true + "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==" }, "js-yaml": { "version": "3.13.1", "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz", "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==", - "dev": true, "requires": { "argparse": "^1.0.7", "esprima": "^4.0.0" } }, + "jsesc": { + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", + "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==" + }, "json-schema-traverse": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", @@ -1610,19 +1959,19 @@ "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=", "dev": true }, + "json5": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.3.tgz", + "integrity": "sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==", + "requires": { + "minimist": "^1.2.5" + } + }, "kareem": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/kareem/-/kareem-2.3.1.tgz", "integrity": "sha512-l3hLhffs9zqoDe8zjmb/mAN4B8VT3L56EUvKNqLFVs9YlFA+zx7ke1DO8STAdDyYNkeSo1nKmjuvQeI12So8Xw==" }, - "kuler": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/kuler/-/kuler-1.0.1.tgz", - "integrity": "sha512-J9nVUucG1p/skKul6DU3PUZrhs0LPulNaeUOox0IyXDi8S4CztTHs1gQphhuZmzXG7VOQSf6NJfKuzteQLv9gQ==", - "requires": { - "colornames": "^1.1.1" - } - }, "levn": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", @@ -1653,22 +2002,23 @@ } } }, + "locate-path": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "requires": { + "p-locate": "^4.1.0" + } + }, "lodash": { "version": "4.17.15", "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz", "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==" }, - "logform": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/logform/-/logform-2.1.2.tgz", - "integrity": "sha512-+lZh4OpERDBLqjiwDLpAWNQu6KMjnlXH2ByZwCuSqVPJletw0kTWJf5CgSNAUKn1KUkv3m2cUz/LK8zyEy7wzQ==", - "requires": { - "colors": "^1.2.1", - "fast-safe-stringify": "^2.0.4", - "fecha": "^2.3.3", - "ms": "^2.1.1", - "triple-beam": "^1.3.0" - } + "lodash.flattendeep": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz", + "integrity": "sha1-+wMJF/hqMTTlvJvsDWngAT3f7bI=" }, "lru_map": { "version": "0.3.3", @@ -1684,6 +2034,14 @@ "sax": "^1.2.4" } }, + "make-dir": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.0.2.tgz", + "integrity": "sha512-rYKABKutXa6vXTXhoV18cBE7PaewPXHe/Bdq4v+ZLMhxbWApkFFplT0LcbMW+6BbjnQXzZ/sAvSE/JdguApG5w==", + "requires": { + "semver": "^6.0.0" + } + }, "memory-pager": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/memory-pager/-/memory-pager-1.5.0.tgz", @@ -1910,6 +2268,14 @@ } } }, + "node-preload": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/node-preload/-/node-preload-0.2.1.tgz", + "integrity": "sha512-RM5oyBy45cLEoHqCeh+MNuFAxO0vTFBLskvQbOKnEE7YTTSN4tbN8QWDIPQ6L+WvKsB/qLEGpYe2ZZ9d4W9OIQ==", + "requires": { + "process-on-spawn": "^1.0.0" + } + }, "nopt": { "version": "4.0.3", "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz", @@ -1978,16 +2344,51 @@ "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=" }, + "nyc": { + "version": "15.0.1", + "resolved": "https://registry.npmjs.org/nyc/-/nyc-15.0.1.tgz", + "integrity": "sha512-n0MBXYBYRqa67IVt62qW1r/d9UH/Qtr7SF1w/nQLJ9KxvWF6b2xCHImRAixHN9tnMMYHC2P14uo6KddNGwMgGg==", + "requires": { + "@istanbuljs/load-nyc-config": "^1.0.0", + "@istanbuljs/schema": "^0.1.2", + "caching-transform": "^4.0.0", + "convert-source-map": "^1.7.0", + "decamelize": "^1.2.0", + "find-cache-dir": "^3.2.0", + "find-up": "^4.1.0", + "foreground-child": "^2.0.0", + "glob": "^7.1.6", + "istanbul-lib-coverage": "^3.0.0", + "istanbul-lib-hook": "^3.0.0", + "istanbul-lib-instrument": "^4.0.0", + "istanbul-lib-processinfo": "^2.0.2", + "istanbul-lib-report": "^3.0.0", + "istanbul-lib-source-maps": "^4.0.0", + "istanbul-reports": "^3.0.2", + "make-dir": "^3.0.0", + "node-preload": "^0.2.1", + "p-map": "^3.0.0", + "process-on-spawn": "^1.0.0", + "resolve-from": "^5.0.0", + "rimraf": "^3.0.0", + "signal-exit": "^3.0.2", + "spawn-wrap": "^2.0.0", + "test-exclude": "^6.0.0", + "yargs": "^15.0.2" + }, + "dependencies": { + "resolve-from": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", + "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==" + } + } + }, "object-assign": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" }, - "object-hash": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-2.0.3.tgz", - "integrity": "sha512-JPKn0GMu+Fa3zt3Bmr66JhokJU5BaNBIh4ZeTlaCBzrBsOeXzwcKKAK1tbLiPKgvwmPXsDvvLHoWh5Bm7ofIYg==" - }, "object-inspect": { "version": "1.7.0", "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.7.0.tgz", @@ -2032,11 +2433,6 @@ "wrappy": "1" } }, - "one-time": { - "version": "0.0.4", - "resolved": "https://registry.npmjs.org/one-time/-/one-time-0.0.4.tgz", - "integrity": "sha1-+M33eISCb+Tf+T46nMN7HkSAdC4=" - }, "onetime": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.0.tgz", @@ -2079,6 +2475,46 @@ "os-tmpdir": "^1.0.0" } }, + "p-limit": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "requires": { + "p-try": "^2.0.0" + } + }, + "p-locate": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "requires": { + "p-limit": "^2.2.0" + } + }, + "p-map": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/p-map/-/p-map-3.0.0.tgz", + "integrity": "sha512-d3qXVTF/s+W+CdJ5A29wywV2n8CQQYahlgz2bFiA+4eVNJbHJodPZ+/gXwPGh0bOqA+j8S+6+ckmvLGPk1QpxQ==", + "requires": { + "aggregate-error": "^3.0.0" + } + }, + "p-try": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", + "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==" + }, + "package-hash": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/package-hash/-/package-hash-4.0.0.tgz", + "integrity": "sha512-whdkPIooSu/bASggZ96BWVvZTRMOFxnyUG5PnTSGKoJE2gd5mbVNmR2Nj20QFzxYYgAXpoqC+AiXzl+UMRh7zQ==", + "requires": { + "graceful-fs": "^4.1.15", + "hasha": "^5.0.0", + "lodash.flattendeep": "^4.4.0", + "release-zalgo": "^1.0.0" + } + }, "parent-module": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", @@ -2097,16 +2533,25 @@ "error-ex": "^1.2.0" } }, + "path-exists": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==" + }, "path-is-absolute": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=" }, + "path-key": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==" + }, "path-parse": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz", - "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==", - "dev": true + "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==" }, "path-type": { "version": "2.0.0", @@ -2123,6 +2568,14 @@ "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", "dev": true }, + "pkg-dir": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", + "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", + "requires": { + "find-up": "^4.0.0" + } + }, "prelude-ls": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz", @@ -2139,6 +2592,14 @@ "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==" }, + "process-on-spawn": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/process-on-spawn/-/process-on-spawn-1.0.0.tgz", + "integrity": "sha512-1WsPDsUSMmZH5LeMLegqkPDrsGgsWwk1Exipy2hvB0o/F0ASzbpIctSCcZIK1ykJvtTJULEH+20WOFjMvGnCTg==", + "requires": { + "fromentries": "^1.2.0" + } + }, "progress": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz", @@ -2260,6 +2721,24 @@ "integrity": "sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==", "dev": true }, + "release-zalgo": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/release-zalgo/-/release-zalgo-1.0.0.tgz", + "integrity": "sha1-CXALflB0Mpc5Mw5TXFqQ+2eFFzA=", + "requires": { + "es6-error": "^4.0.1" + } + }, + "require-directory": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", + "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=" + }, + "require-main-filename": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz", + "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==" + }, "require_optional": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/require_optional/-/require_optional-1.0.1.tgz", @@ -2280,7 +2759,6 @@ "version": "1.15.1", "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.15.1.tgz", "integrity": "sha512-84oo6ZTtoTUpjgNEr5SJyzQhzL72gaRodsSfyxC/AXRvwu0Yse9H8eF9IpGo7b8YetZhlI6v7ZQ6bKBFV/6S7w==", - "dev": true, "requires": { "path-parse": "^1.0.6" } @@ -2300,6 +2778,14 @@ "signal-exit": "^3.0.2" } }, + "rimraf": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", + "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "requires": { + "glob": "^7.1.3" + } + }, "run-async": { "version": "2.4.0", "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.0.tgz", @@ -2345,8 +2831,7 @@ "semver": { "version": "6.3.0", "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" }, "set-blocking": { "version": "2.0.0", @@ -2358,6 +2843,19 @@ "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz", "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=" }, + "shebang-command": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "requires": { + "shebang-regex": "^3.0.0" + } + }, + "shebang-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==" + }, "sift": { "version": "7.0.1", "resolved": "https://registry.npmjs.org/sift/-/sift-7.0.1.tgz", @@ -2368,21 +2866,6 @@ "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz", "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==" }, - "simple-swizzle": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz", - "integrity": "sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo=", - "requires": { - "is-arrayish": "^0.3.1" - }, - "dependencies": { - "is-arrayish": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz", - "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==" - } - } - }, "slice-ansi": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz", @@ -2431,6 +2914,11 @@ "resolved": "https://registry.npmjs.org/sliced/-/sliced-1.0.1.tgz", "integrity": "sha1-CzpmK10Ewxd7GSa+qCsD+Dei70E=" }, + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=" + }, "sparse-bitfield": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/sparse-bitfield/-/sparse-bitfield-3.0.3.tgz", @@ -2440,6 +2928,19 @@ "memory-pager": "^1.0.2" } }, + "spawn-wrap": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/spawn-wrap/-/spawn-wrap-2.0.0.tgz", + "integrity": "sha512-EeajNjfN9zMnULLwhZZQU3GWBoFNkbngTUPfaawT4RkMiviTxcX0qfhVbGey39mfctfDHkWtuecgQ8NJcyQWHg==", + "requires": { + "foreground-child": "^2.0.0", + "is-windows": "^1.0.2", + "make-dir": "^3.0.0", + "rimraf": "^3.0.0", + "signal-exit": "^3.0.2", + "which": "^2.0.1" + } + }, "spdx-correct": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz", @@ -2475,19 +2976,12 @@ "sprintf-js": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", - "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", - "dev": true - }, - "stack-trace": { - "version": "0.0.10", - "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz", - "integrity": "sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=" + "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=" }, "string-width": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz", "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==", - "dev": true, "requires": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", @@ -2548,11 +3042,15 @@ "version": "6.0.0", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", - "dev": true, "requires": { "ansi-regex": "^5.0.0" } }, + "strip-bom": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz", + "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==" + }, "strip-json-comments": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.0.1.tgz", @@ -2563,7 +3061,6 @@ "version": "7.1.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", - "dev": true, "requires": { "has-flag": "^4.0.0" } @@ -2646,10 +3143,15 @@ "yallist": "^3.0.3" } }, - "text-hex": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/text-hex/-/text-hex-1.0.0.tgz", - "integrity": "sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg==" + "test-exclude": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz", + "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==", + "requires": { + "@istanbuljs/schema": "^0.1.2", + "glob": "^7.1.4", + "minimatch": "^3.0.4" + } }, "text-table": { "version": "0.2.0", @@ -2663,6 +3165,11 @@ "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=", "dev": true }, + "tinytim": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/tinytim/-/tinytim-0.1.1.tgz", + "integrity": "sha1-yWih5VWa2VUyJO92J7qzTjyu+Kg=" + }, "tmp": { "version": "0.0.33", "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", @@ -2672,10 +3179,29 @@ "os-tmpdir": "~1.0.2" } }, - "triple-beam": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/triple-beam/-/triple-beam-1.3.0.tgz", - "integrity": "sha512-XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw==" + "to-fast-properties": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", + "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=" + }, + "tracer": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/tracer/-/tracer-1.0.3.tgz", + "integrity": "sha512-cP1wzE0eCzDrp6wMGG9Cg927qBPY18rPVMJ0BEjifHn5xVb7fbQDT5zjwItAyebUgF8hGY1N4VyI3hArGjffww==", + "requires": { + "colors": "1.4.0", + "dateformat": "3.0.3", + "mkdirp": "^1.0.4", + "nyc": "^15.0.1", + "tinytim": "0.1.1" + }, + "dependencies": { + "mkdirp": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", + "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==" + } + } }, "tslib": { "version": "1.11.1", @@ -2699,8 +3225,15 @@ "type-fest": { "version": "0.8.1", "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz", - "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==", - "dev": true + "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==" + }, + "typedarray-to-buffer": { + "version": "3.1.5", + "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz", + "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==", + "requires": { + "is-typedarray": "^1.0.0" + } }, "uri-js": { "version": "4.2.2", @@ -2724,6 +3257,11 @@ "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" }, + "uuid": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", + "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==" + }, "v8-compile-cache": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.1.0.tgz", @@ -2740,6 +3278,19 @@ "spdx-expression-parse": "^3.0.0" } }, + "which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "requires": { + "isexe": "^2.0.0" + } + }, + "which-module": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", + "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=" + }, "wide-align": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz", @@ -2777,65 +3328,22 @@ } } }, - "winston": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/winston/-/winston-3.2.1.tgz", - "integrity": "sha512-zU6vgnS9dAWCEKg/QYigd6cgMVVNwyTzKs81XZtTFuRwJOcDdBg7AU0mXVyNbs7O5RH2zdv+BdNZUlx7mXPuOw==", - "requires": { - "async": "^2.6.1", - "diagnostics": "^1.1.1", - "is-stream": "^1.1.0", - "logform": "^2.1.1", - "one-time": "0.0.4", - "readable-stream": "^3.1.1", - "stack-trace": "0.0.x", - "triple-beam": "^1.3.0", - "winston-transport": "^4.3.0" - }, - "dependencies": { - "is-stream": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", - "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=" - }, - "readable-stream": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", - "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", - "requires": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - } - } - } - }, - "winston-daily-rotate-file": { - "version": "4.4.2", - "resolved": "https://registry.npmjs.org/winston-daily-rotate-file/-/winston-daily-rotate-file-4.4.2.tgz", - "integrity": "sha512-pVOUJKxN+Kn6LnOJZ4tTwdV5+N+fCkiRAb3bVnzcPtOj1ScxGNC3DyUhHuAHssBtMl5s45/aUcSUtApH+69V5A==", - "requires": { - "file-stream-rotator": "^0.5.7", - "object-hash": "^2.0.1", - "triple-beam": "^1.3.0", - "winston-transport": "^4.2.0" - } - }, - "winston-transport": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/winston-transport/-/winston-transport-4.3.0.tgz", - "integrity": "sha512-B2wPuwUi3vhzn/51Uukcao4dIduEiPOcOt9HJ3QeaXgkJ5Z7UwpBzxS4ZGNHtrxrUvTwemsQiSys0ihOf8Mp1A==", - "requires": { - "readable-stream": "^2.3.6", - "triple-beam": "^1.2.0" - } - }, "word-wrap": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==", "dev": true }, + "wrap-ansi": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", + "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==", + "requires": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + } + }, "wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", @@ -2850,16 +3358,59 @@ "mkdirp": "^0.5.1" } }, + "write-file-atomic": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz", + "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==", + "requires": { + "imurmurhash": "^0.1.4", + "is-typedarray": "^1.0.0", + "signal-exit": "^3.0.2", + "typedarray-to-buffer": "^3.1.5" + } + }, "ws": { "version": "7.2.3", "resolved": "https://registry.npmjs.org/ws/-/ws-7.2.3.tgz", "integrity": "sha512-HTDl9G9hbkNDk98naoR/cHDws7+EyYMOdL1BmjsZXRUjf7d+MficC4B7HLUPlSiho0vg+CWKrGIt/VJBd1xunQ==" }, + "y18n": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz", + "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==" + }, "yallist": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==" }, + "yargs": { + "version": "15.3.1", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.3.1.tgz", + "integrity": "sha512-92O1HWEjw27sBfgmXiixJWT5hRBp2eobqXicLtPBIDBhYB+1HpwZlXmbW2luivBJHBzki+7VyCLRtAkScbTBQA==", + "requires": { + "cliui": "^6.0.0", + "decamelize": "^1.2.0", + "find-up": "^4.1.0", + "get-caller-file": "^2.0.1", + "require-directory": "^2.1.1", + "require-main-filename": "^2.0.0", + "set-blocking": "^2.0.0", + "string-width": "^4.2.0", + "which-module": "^2.0.0", + "y18n": "^4.0.0", + "yargs-parser": "^18.1.1" + } + }, + "yargs-parser": { + "version": "18.1.3", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz", + "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==", + "requires": { + "camelcase": "^5.0.0", + "decamelize": "^1.2.0" + } + }, "ytdl-core": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/ytdl-core/-/ytdl-core-2.0.1.tgz", diff --git a/package.json b/package.json index e7b3442..b31d1e8 100644 --- a/package.json +++ b/package.json @@ -6,6 +6,7 @@ "dependencies": { "@discordjs/opus": "^0.1.0", "@sentry/node": "^5.15.4", + "colors": "^1.4.0", "discord.js": "^12.2.0", "hastebin-gen": "^2.0.5", "is-docker": "^2.0.0", @@ -13,8 +14,7 @@ "mongoose": "^5.9.9", "node-fetch": "^2.6.0", "prism-media": "^1.2.1", - "winston": "^3.2.1", - "winston-daily-rotate-file": "^4.4.2", + "tracer": "^1.0.3", "ytdl-core-discord": "^1.2.0" }, "devDependencies": { From 31ce5b28b2ad4b2aafce6ac5c259cffba9ff213c Mon Sep 17 00:00:00 2001 From: mudkipscience Date: Sun, 19 Apr 2020 00:14:37 +1000 Subject: [PATCH 101/156] sans undertale --- .gitignore | 3 +-- events/message.js | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index def5610..a48438c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ .vscode *config.js -node_modules -logs \ No newline at end of file +node_modules \ No newline at end of file diff --git a/events/message.js b/events/message.js index 097eae6..8f225f9 100644 --- a/events/message.js +++ b/events/message.js @@ -118,7 +118,7 @@ module.exports = async (client, message) => { while (args[0] && args[0][0] === '-') { message.flags.push(args.shift().slice(1)) } + client.logger.cmd(`Command ran: ${cmd.help.name}`) - client.logger.log(`Command ran: ${cmd.help.name}`) cmd.run(client, message, args, level, data) } From 9bd67779ec2e3cca58fe57610924000ebf1b5d86 Mon Sep 17 00:00:00 2001 From: mudkipscience Date: Sun, 19 Apr 2020 00:14:54 +1000 Subject: [PATCH 102/156] switched to a faster invidious instance --- utils/music.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/music.js b/utils/music.js index ec83e29..7505328 100644 --- a/utils/music.js +++ b/utils/music.js @@ -56,10 +56,10 @@ module.exports = client => { try { const id = await ytdl.getURLVideoID(query) - resp = await fetch('https://invidio.us/api/v1/videos/' + id) + resp = await fetch('https://invidious.snopyta.org/api/v1/videos/' + id) console.log(resp) } catch (err) { - resp = await fetch('https://invidio.us/api/v1/search?q=' + encodeURIComponent(query)) + resp = await fetch('https://invidious.snopyta.org/api/v1/search?q=' + encodeURIComponent(query)) } const parsed = await resp.json() From abab09546cee851f9c043d32ce74f01c359153f4 Mon Sep 17 00:00:00 2001 From: mudkipscience Date: Sun, 19 Apr 2020 00:23:50 +1000 Subject: [PATCH 103/156] removed fatal level --- index.js | 4 ++-- utils/_functions.js | 2 +- utils/logger.js | 5 ++--- utils/mongoose.js | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/index.js b/index.js index c05f5c9..45d4e76 100644 --- a/index.js +++ b/index.js @@ -53,7 +53,7 @@ const init = async () => { // Command handler fs.readdir('./commands', (err, files) => { if (err) { - client.logger.fatal('Failed to get files in commands directory: ' + err) + client.logger.error('Failed to get files in commands directory: ' + err) process.exit() } client.logger.info(`Loading ${files.length} commands.`) @@ -71,7 +71,7 @@ const init = async () => { // Event handler fs.readdir('./events', (err, files) => { if (err) { - client.logger.fatal('Failed to get files in events directory: ' + err) + client.logger.error('Failed to get files in events directory: ' + err) process.exit() } client.logger.info(`Loading ${files.length} events.`) diff --git a/utils/_functions.js b/utils/_functions.js index 1561679..eb569b9 100644 --- a/utils/_functions.js +++ b/utils/_functions.js @@ -278,7 +278,7 @@ module.exports = client => { // Both of these functions catch errors and log them (maybe we could use sentry?) process.on('uncaughtException', (err) => { const errorMsg = err.stack.replace(new RegExp(`${__dirname}/`, 'g'), './') - client.logger.fatal(`Uncaught Exception: ${errorMsg}`) + client.logger.error(`Uncaught Exception: ${errorMsg}`) process.exit(1) }) diff --git a/utils/logger.js b/utils/logger.js index 047abc6..a220e45 100644 --- a/utils/logger.js +++ b/utils/logger.js @@ -12,12 +12,11 @@ const logger = colorConsole({ info: `{{timestamp}} | ${'{{title}}'.cyan} | {{file}} | {{message}}`, ready: `{{timestamp}} | ${'{{title}}'.green} | {{file}} | {{message}}`, warn: `{{timestamp}} | ${'{{title}}'.yellow} | {{file}} | {{message}}`, - error: `{{timestamp}} | ${'{{title}}'.red} | {{file}} | {{message}}`, - fatal: `{{timestamp}} | ${'{{title}}'.red.bold} | {{file}} | {{message}}` + error: `{{timestamp}} | ${'{{title}}'.red} | {{file}} | {{message}}` } ], dateformat: 'yyyy-mm-dd"T"HH:MM:ss', - methods: ['cmd', 'debug', 'info', 'ready', 'warn', 'error', 'fatal'], + methods: ['cmd', 'debug', 'info', 'ready', 'warn', 'error'], filters: [colors.white] }) diff --git a/utils/mongoose.js b/utils/mongoose.js index af45541..6db6564 100644 --- a/utils/mongoose.js +++ b/utils/mongoose.js @@ -14,7 +14,7 @@ module.exports = { mongoose.set('useFindAndModify', false) mongoose.Promise = global.Promise } catch (err) { - client.logger.fatal(`Could not connect to the database:\n ${err.stack}`) + client.logger.error(`Could not connect to the database:\n ${err.stack}`) } mongoose.connection.on('connected', () => { From 1760fbcda11c5b72865d7040a8ae198d503cc452 Mon Sep 17 00:00:00 2001 From: mudkipscience Date: Sun, 19 Apr 2020 17:08:37 +1000 Subject: [PATCH 104/156] music is fixed, it just needs polish now ^^ --- index.js | 3 +-- utils/music.js | 42 ++++++++++++++++++++++++++++++++++++------ 2 files changed, 37 insertions(+), 8 deletions(-) diff --git a/index.js b/index.js index 45d4e76..6d07248 100644 --- a/index.js +++ b/index.js @@ -96,9 +96,8 @@ const init = async () => { // Login to Discord function failedToLogin (err) { client.logger.error('Couldn\'t login: ' + err) - process.exit(0) - }; + } if (client.devmode !== true) { client.login(client.config.token).catch(failedToLogin) diff --git a/utils/music.js b/utils/music.js index 7505328..9257e46 100644 --- a/utils/music.js +++ b/utils/music.js @@ -57,7 +57,6 @@ module.exports = client => { try { const id = await ytdl.getURLVideoID(query) resp = await fetch('https://invidious.snopyta.org/api/v1/videos/' + id) - console.log(resp) } catch (err) { resp = await fetch('https://invidious.snopyta.org/api/v1/search?q=' + encodeURIComponent(query)) } @@ -124,11 +123,44 @@ module.exports = client => { embed.setTitle('Please reply with a number `1-' + i + '` to select which song you want to add to the queue.') embed.setColor(client.embedColour(message.guild)) embed.setDescription(output) - const selection = await client.awaitReply(message, embed) - console.log(selection) + + let selection = await client.awaitReply(message, embed) + selection = Number(selection) switch (selection) { - + case 1: + video = videos[0] + break + case 2: + if (videos[1]) { + video = videos[1] + } else { + return message.channel.send('Invalid choice.') + } + break + case 3: + if (videos[2]) { + video = videos[2] + } else { + return message.channel.send('Invalid choice.') + } + break + case 4: + if (videos[3]) { + video = videos[3] + } else { + return message.channel.send('Invalid choice.') + } + break + case 5: + if (videos[4]) { + video = videos[4] + } else { + return message.channel.send('Invalid choice.') + } + break + default: + return message.channel.send('Invalid choice.') } } @@ -138,8 +170,6 @@ module.exports = client => { video = videos } - console.log(video) - // Add video to queue guild.queue.push({ video: video, requestedBy: message.member.id }) } From 5440ae0daa53ed4d37150bf49c548949193fd2ee Mon Sep 17 00:00:00 2001 From: mudkipscience Date: Sun, 19 Apr 2020 17:24:31 +1000 Subject: [PATCH 105/156] got rid of my shitty timestamp generator --- utils/music.js | 28 ++++++---------------------- 1 file changed, 6 insertions(+), 22 deletions(-) diff --git a/utils/music.js b/utils/music.js index 9257e46..42af6ad 100644 --- a/utils/music.js +++ b/utils/music.js @@ -1,34 +1,18 @@ const ytdl = require('ytdl-core-discord') const fetch = require('node-fetch') const { MessageEmbed } = require('discord.js') +const { utc } = require('moment') module.exports = client => { client.music = { guilds: {} } // MUSIC - TIMESTAMP - client.createTimestamp = function (duration) { - var hrs = ~~(duration / 60 / 60) - var min = ~~(duration / 60) % 60 - var sec = ~~(duration - min * 60) - - if (String(hrs).length < 2) { - hrs = '0' + String(hrs) + ':' + client.createTimestamp = function (s) { + if (s >= 3600) { + return utc(s * 1000).format('HH:mm:ss') + } else { + return utc(s * 1000).format('mm:ss') } - - if (String(min).length < 2) { - min = '0' + String(min) - } - - if (String(sec).length < 2) { - sec = '0' + String(sec) - } - - if (hrs === '00:') { - hrs = '' - } - - var time = hrs + min + ':' + sec - return time } client.music.getGuild = function (id) { From 93926545ae36dd4f90e5a341721dc5520631f0ce Mon Sep 17 00:00:00 2001 From: mudkipscience Date: Sun, 19 Apr 2020 18:56:12 +1000 Subject: [PATCH 106/156] a --- utils/music.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/utils/music.js b/utils/music.js index 42af6ad..a15b58b 100644 --- a/utils/music.js +++ b/utils/music.js @@ -6,7 +6,6 @@ const { utc } = require('moment') module.exports = client => { client.music = { guilds: {} } - // MUSIC - TIMESTAMP client.createTimestamp = function (s) { if (s >= 3600) { return utc(s * 1000).format('HH:mm:ss') @@ -64,7 +63,7 @@ module.exports = client => { const guild = client.music.getGuild(message.guild.id) if (!message.member.voice.channel && !guild.voiceChannel) { - return message.reply('you are not in a voice channel!') + return message.reply('You have to be connected to a voice channel to use this command!') } const vc = message.member.voice.channel From 4ff85905ffb74cf255e18ddbdd009296274b6f5e Mon Sep 17 00:00:00 2001 From: mudkipscience Date: Sun, 19 Apr 2020 20:10:52 +1000 Subject: [PATCH 107/156] changed music up --- commands/forceskip.js | 7 +- commands/play.js | 3 +- commands/volume.js | 3 +- index.js | 1 - utils/music.js | 380 +++++++++++++++++++++--------------------- 5 files changed, 197 insertions(+), 197 deletions(-) diff --git a/commands/forceskip.js b/commands/forceskip.js index 7a72b8f..8c604b2 100644 --- a/commands/forceskip.js +++ b/commands/forceskip.js @@ -15,8 +15,9 @@ exports.help = { params: '' } +const { skip } = require('../utils/music') exports.run = async (client, message, args, level, data) => { - client.music.skip(message.guild, 'forceskip'); + skip(message.guild, 'forceskip') - message.reply('skipped currently playing music'); -}; \ No newline at end of file + message.reply('skipped currently playing music') +} diff --git a/commands/play.js b/commands/play.js index 2fe5497..0e640c3 100644 --- a/commands/play.js +++ b/commands/play.js @@ -15,6 +15,7 @@ exports.help = { parameters: '[query] - A query to find video by or a link to the video.' } +const { play } = require('../utils/music') exports.run = async (client, message, args, level, data) => { - await client.music.play(message, args.join(' ')) + await play(client, message, args.join(' ')) } diff --git a/commands/volume.js b/commands/volume.js index 8a02f74..d191d13 100644 --- a/commands/volume.js +++ b/commands/volume.js @@ -15,6 +15,7 @@ exports.help = { parameters: '[volume] - Target volume from 0-100%' } +const { setVolume } = require('../utils/music') exports.run = async (client, message, args, level, data) => { let vol = args[0] @@ -24,7 +25,7 @@ exports.run = async (client, message, args, level, data) => { vol = vol / 100 * 0.5 if (vol <= 1) { - client.music.setVolume(message.guild, vol) + setVolume(message.guild, vol) message.reply('set volume to ' + vol * 100 + '%') } diff --git a/index.js b/index.js index 6d07248..53871db 100644 --- a/index.js +++ b/index.js @@ -27,7 +27,6 @@ client.version = require('./version.json') client.db = require('./utils/mongoose') client.logger = require('./utils/logger') require('./utils/_functions')(client) -require('./utils/music')(client) // Check if Woomy is running inside a Docker container if (isDocker() === true) { diff --git a/utils/music.js b/utils/music.js index a15b58b..078661e 100644 --- a/utils/music.js +++ b/utils/music.js @@ -3,209 +3,207 @@ const fetch = require('node-fetch') const { MessageEmbed } = require('discord.js') const { utc } = require('moment') -module.exports = client => { - client.music = { guilds: {} } +exports.queue = {} - client.createTimestamp = function (s) { - if (s >= 3600) { - return utc(s * 1000).format('HH:mm:ss') - } else { - return utc(s * 1000).format('mm:ss') - } +exports.createTimestamp = function (s) { + if (s >= 3600) { + return utc(s * 1000).format('HH:mm:ss') + } else { + return utc(s * 1000).format('mm:ss') + } +} + +exports.getGuild = function (id) { + let guild = exports.queue[id] + + if (!guild) { + guild = {} + + guild.dispatcher = null + guild.playing = false + guild.queue = [] + + exports.queue[id] = guild } - client.music.getGuild = function (id) { - let guild = client.music.guilds[id] + return guild +} - if (!guild) { - guild = {} +exports.getLinkFromID = function (id) { + return 'https://www.youtube.com/watch?v=' + id +} - guild.dispatcher = null - guild.playing = false - guild.queue = [] +exports.getVideoByQuery = async query => { + let res - client.music.guilds[id] = guild - } - - return guild + try { + const id = await ytdl.getURLVideoID(query) + res = await fetch('https://invidious.snopyta.org/api/v1/videos/' + id) + } catch (err) { + res = await fetch('https://invidious.snopyta.org/api/v1/search?q=' + encodeURIComponent(query)) } - client.music.getLinkFromID = function (id) { - return 'https://www.youtube.com/watch?v=' + id - } + const parsed = await res.json() - client.music.getVideoByQuery = async query => { - let resp + if (parsed) { + const videos = parsed - try { - const id = await ytdl.getURLVideoID(query) - resp = await fetch('https://invidious.snopyta.org/api/v1/videos/' + id) - } catch (err) { - resp = await fetch('https://invidious.snopyta.org/api/v1/search?q=' + encodeURIComponent(query)) - } - - const parsed = await resp.json() - - if (parsed) { - const videos = parsed - - if (videos) { - return videos - } else { - return false - } + if (videos) { + return videos } else { return false } - } - - client.music.play = async function (message, query, ignoreQueue) { - const guild = client.music.getGuild(message.guild.id) - - if (!message.member.voice.channel && !guild.voiceChannel) { - return message.reply('You have to be connected to a voice channel to use this command!') - } - - const vc = message.member.voice.channel - - let video - let videos - - if (!ignoreQueue) { - videos = await client.music.getVideoByQuery(query) - if (!videos[1]) { - if (!videos[0]) { - video = videos - } else { - video = videos[0] - } - } - } - - if (videos || ignoreQueue) { - if (!ignoreQueue) { - // Fix the bot if somehow broken - // music "playing", nothing in queue - if ((guild.playing || guild.dispatcher) && guild.queue.length === 0) { - guild.playing = false - guild.dispatcher = null - // music not playing, something is in queue - } else if (!guild.playing && !guild.dispatcher && guild.queue.length > 0) { - guild.queue = [] - } - - if (!video) { - let output = '' - let i = 0 - for (i = 0; i < 5; i++) { - if (!videos[i]) break - output += `\`${i + 1}:\` **[${videos[i].title}](https://www.youtube.com/watch?v=${videos[i].videoId})** \`[${client.createTimestamp(videos[i].lengthSeconds)}]\`\n` - } - - const embed = new MessageEmbed() - embed.setTitle('Please reply with a number `1-' + i + '` to select which song you want to add to the queue.') - embed.setColor(client.embedColour(message.guild)) - embed.setDescription(output) - - let selection = await client.awaitReply(message, embed) - selection = Number(selection) - - switch (selection) { - case 1: - video = videos[0] - break - case 2: - if (videos[1]) { - video = videos[1] - } else { - return message.channel.send('Invalid choice.') - } - break - case 3: - if (videos[2]) { - video = videos[2] - } else { - return message.channel.send('Invalid choice.') - } - break - case 4: - if (videos[3]) { - video = videos[3] - } else { - return message.channel.send('Invalid choice.') - } - break - case 5: - if (videos[4]) { - video = videos[4] - } else { - return message.channel.send('Invalid choice.') - } - break - default: - return message.channel.send('Invalid choice.') - } - } - - if (!video && videos[0]) { - video = videos[0] - } else if (!video) { - video = videos - } - - // Add video to queue - guild.queue.push({ video: video, requestedBy: message.member.id }) - } - - // Figure out if the bot should add it to queue or play it right now - if (guild.playing) { - message.reply('added **' + video.title + '** to the queue') - } else { - guild.playing = true - - guild.voiceChannel = vc - - const connection = await vc.join() - - const v = guild.queue[0] - - guild.dispatcher = connection.play(await ytdl(client.music.getLinkFromID(v.video.videoId), { highWaterMark: 1024 * 1024 * 32 }), { type: 'opus' }) - guild.dispatcher.setVolume(0.25) - - message.channel.send('Playing **' + v.video.title + '**') - - // play next in queue on end - guild.dispatcher.once('finish', () => { - guild.queue.shift() - guild.playing = false - - if (guild.queue.length > 0) { - client.music.play(message, null, true) - } else { - guild.dispatcher = null - - connection.disconnect() - } - }) - } - } else { - return message.reply('failed to find the video!') - } - } - - client.music.setVolume = function (guild, target) { - const g = client.music.getGuild(guild.id) - - if (g.dispatcher) { - g.dispatcher.setVolume(target) - } - } - - client.music.skip = function (guild, reason) { - const g = client.music.getGuild(guild.id) - - if (g.dispatcher) { - g.dispatcher.end(reason) - } + } else { + return false + } +} + +exports.play = async function (client, message, query, ignoreQueue) { + const guild = exports.getGuild(message.guild.id) + + if (!message.member.voice.channel && !guild.voiceChannel) { + return message.reply('You have to be connected to a voice channel to use this command!') + } + + const vc = message.member.voice.channel + + let video + let videos + + if (!ignoreQueue) { + videos = await exports.getVideoByQuery(query) + if (!videos[1]) { + if (!videos[0]) { + video = videos + } else { + video = videos[0] + } + } + } + + if (videos || ignoreQueue) { + if (!ignoreQueue) { + // Fix the bot if somehow broken + // music "playing", nothing in queue + if ((guild.playing || guild.dispatcher) && guild.queue.length === 0) { + guild.playing = false + guild.dispatcher = null + // music not playing, something is in queue + } else if (!guild.playing && !guild.dispatcher && guild.queue.length > 0) { + guild.queue = [] + } + + if (!video) { + let output = '' + let i = 0 + for (i = 0; i < 5; i++) { + if (!videos[i]) break + output += `\`${i + 1}:\` **[${videos[i].title}](https://www.youtube.com/watch?v=${videos[i].videoId})** \`[${exports.createTimestamp(videos[i].lengthSeconds)}]\`\n` + } + + const embed = new MessageEmbed() + embed.setTitle('Please reply with a number `1-' + i + '` to select which song you want to add to the queue.') + embed.setColor(client.embedColour(message.guild)) + embed.setDescription(output) + + let selection = await client.awaitReply(message, embed) + selection = Number(selection) + + switch (selection) { + case 1: + video = videos[0] + break + case 2: + if (videos[1]) { + video = videos[1] + } else { + return message.channel.send('Invalid choice.') + } + break + case 3: + if (videos[2]) { + video = videos[2] + } else { + return message.channel.send('Invalid choice.') + } + break + case 4: + if (videos[3]) { + video = videos[3] + } else { + return message.channel.send('Invalid choice.') + } + break + case 5: + if (videos[4]) { + video = videos[4] + } else { + return message.channel.send('Invalid choice.') + } + break + default: + return message.channel.send('Invalid choice.') + } + } + + if (!video && videos[0]) { + video = videos[0] + } else if (!video) { + video = videos + } + + // Add video to queue + guild.queue.push({ video: video, requestedBy: message.member.id }) + } + + // Figure out if the bot should add it to queue or play it right now + if (guild.playing) { + message.reply('added **' + video.title + '** to the queue') + } else { + guild.playing = true + + guild.voiceChannel = vc + + const connection = await vc.join() + + const v = guild.queue[0] + + guild.dispatcher = connection.play(await ytdl(exports.getLinkFromID(v.video.videoId), { highWaterMark: 1024 * 1024 * 32 }), { type: 'opus' }) + guild.dispatcher.setVolume(0.25) + + message.channel.send('Playing **' + v.video.title + '**') + + // play next in queue on end + guild.dispatcher.once('finish', () => { + guild.queue.shift() + guild.playing = false + + if (guild.queue.length > 0) { + exports.play(message, null, true) + } else { + guild.dispatcher = null + + connection.disconnect() + } + }) + } + } else { + return message.reply('failed to find the video!') + } +} + +exports.setVolume = function (guild, target) { + const g = exports.getGuild(guild.id) + + if (g.dispatcher) { + g.dispatcher.setVolume(target) + } +} + +exports.skip = function (guild, reason) { + const g = exports.getGuild(guild.id) + + if (g.dispatcher) { + g.dispatcher.end(reason) } } From 885bc6ccc0049eed52b53660d0935785825d0deb Mon Sep 17 00:00:00 2001 From: amber <57233174+purpleempress@users.noreply.github.com> Date: Sun, 19 Apr 2020 13:20:34 +0000 Subject: [PATCH 108/156] Update LICENSE to AGPL --- LICENSE | 143 ++++++++++++++++++++++++++------------------------------ 1 file changed, 65 insertions(+), 78 deletions(-) diff --git a/LICENSE b/LICENSE index 94a9ed0..dbbe355 100644 --- a/LICENSE +++ b/LICENSE @@ -1,5 +1,5 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 Copyright (C) 2007 Free Software Foundation, Inc. Everyone is permitted to copy and distribute verbatim copies @@ -7,17 +7,15 @@ Preamble - The GNU General Public License is a free, copyleft license for -software and other kinds of works. + The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. The licenses for most software and other practical works are designed to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to +our General Public Licenses are intended to guarantee your freedom to share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. +software for all its users. When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you @@ -26,44 +24,34 @@ them if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs, and that you know you can do these things. - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. + A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. + The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. + An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. The precise terms and conditions for copying, distribution and modification follow. @@ -72,7 +60,7 @@ modification follow. 0. Definitions. - "This License" refers to version 3 of the GNU General Public License. + "This License" refers to version 3 of the GNU Affero General Public License. "Copyright" also means copyright-like laws that apply to other kinds of works, such as semiconductor masks. @@ -549,35 +537,45 @@ to collect a royalty for further conveying from those to whom you convey the Program, the only way you could satisfy both those terms and this License would be to refrain entirely from conveying the Program. - 13. Use with the GNU Affero General Public License. + 13. Remote Network Interaction; Use with the GNU General Public License. + + Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. Notwithstanding any other provision of this License, you have permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single +under version 3 of the GNU General Public License into a single combined work, and to convey the resulting work. The terms of this License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. +but the work with which it is combined will remain governed by version +3 of the GNU General Public License. 14. Revised Versions of this License. The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to +the GNU Affero General Public License from time to time. Such new versions +will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General +Program specifies that a certain numbered version of the GNU Affero General Public License "or any later version" applies to it, you have the option of following the terms and conditions either of that numbered version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published +GNU Affero General Public License, you may choose any version ever published by the Free Software Foundation. If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's +versions of the GNU Affero General Public License can be used, that proxy's public statement of acceptance of a version permanently authorizes you to choose that version for the Program. @@ -635,40 +633,29 @@ the "copyright" line and a pointer to where the full notice is found. Copyright (C) This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or + it under the terms of the GNU Affero General Public License as published + by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + GNU Affero General Public License for more details. - You should have received a copy of the GNU General Public License + You should have received a copy of the GNU Affero General Public License along with this program. If not, see . Also add information on how to contact you by electronic and paper mail. - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Copyright (C) - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". + If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. You should also get your employer (if you work as a programmer) or school, if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see +For more information on this, and how to apply and follow the GNU AGPL, see . - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. From 39aa33d669a1778e13608c130a511ff7d06d1837 Mon Sep 17 00:00:00 2001 From: amber Date: Sun, 19 Apr 2020 16:54:43 +0100 Subject: [PATCH 109/156] remove unused yt api key field from config --- configTemplate.js | 1 - 1 file changed, 1 deletion(-) diff --git a/configTemplate.js b/configTemplate.js index 34b3f43..a165989 100644 --- a/configTemplate.js +++ b/configTemplate.js @@ -9,7 +9,6 @@ const config = { // API keys that are required for some features/commands keys: { dbl: '', // top.gg key - yt: '', // youtube API key sentry: '' // sentry.io dsn }, From dd04b04500a3e5262c25bf64990482f9b9ee74d8 Mon Sep 17 00:00:00 2001 From: amber Date: Sun, 19 Apr 2020 18:17:37 +0100 Subject: [PATCH 110/156] don't hardcode invidious url, add default to configtemplate --- configTemplate.js | 5 +++++ utils/music.js | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/configTemplate.js b/configTemplate.js index a165989..ed6b127 100644 --- a/configTemplate.js +++ b/configTemplate.js @@ -12,6 +12,11 @@ const config = { sentry: '' // sentry.io dsn }, + // Configurable API endpoints + endpoints: { + invidious: "https://invidious.snopyta.org/api/" + }, + // Users added to this embed get access to developer-level commands devs: [''], diff --git a/utils/music.js b/utils/music.js index 078661e..b1b6b8d 100644 --- a/utils/music.js +++ b/utils/music.js @@ -33,14 +33,14 @@ exports.getLinkFromID = function (id) { return 'https://www.youtube.com/watch?v=' + id } -exports.getVideoByQuery = async query => { +exports.getVideoByQuery = async function (client, query) { let res try { const id = await ytdl.getURLVideoID(query) - res = await fetch('https://invidious.snopyta.org/api/v1/videos/' + id) + res = await fetch(`${client.config.endpoints.invidious}v1/videos/${id}`) } catch (err) { - res = await fetch('https://invidious.snopyta.org/api/v1/search?q=' + encodeURIComponent(query)) + res = await fetch(`${client.config.endpoints.invidious}v1/search?q=${encodeURIComponent(query)}`) } const parsed = await res.json() @@ -71,7 +71,7 @@ exports.play = async function (client, message, query, ignoreQueue) { let videos if (!ignoreQueue) { - videos = await exports.getVideoByQuery(query) + videos = await exports.getVideoByQuery(client, query) if (!videos[1]) { if (!videos[0]) { video = videos From f9be263203f62800c25b20735bfdbc32fe4e28b5 Mon Sep 17 00:00:00 2001 From: amber Date: Sun, 19 Apr 2020 18:35:09 +0100 Subject: [PATCH 111/156] devmode update --- index.js | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/index.js b/index.js index 53871db..ec797e4 100644 --- a/index.js +++ b/index.js @@ -28,12 +28,18 @@ client.db = require('./utils/mongoose') client.logger = require('./utils/logger') require('./utils/_functions')(client) -// Check if Woomy is running inside a Docker container -if (isDocker() === true) { - client.devmode = true +if (typeof client.config.devmode !== 'undefined') { //Check if devmode is explicitly overridden + client.devmode = client.config.devmode; +} else { //Check if Woomy is running inside a Docker + if (isDocker() === false) { + client.devmode = true + } else { + client.devmode = false + } +} + +if (client.devmode) { client.logger.warn('Running in development mode.') -} else { - client.devmode = false } // Create caches for permissions, commands, cooldowns and aliases @@ -101,7 +107,7 @@ const init = async () => { if (client.devmode !== true) { client.login(client.config.token).catch(failedToLogin) } else { - client.login(client.config.token_dev).catch(failedToLogin) + client.login(client.config.devtoken).catch(failedToLogin) } } From bd00d0a05c36ecffb7d4ea98813038815232a005 Mon Sep 17 00:00:00 2001 From: mudkipscience Date: Mon, 20 Apr 2020 12:09:46 +1000 Subject: [PATCH 112/156] working on a new readme --- README.md | 46 ++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 42 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 8b09475..ac6622a 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,42 @@ -# woomy-next -Rewrite of Woomy's codebase, because I'm getting really sick of working on shitty two year-old code. If you aren't a developer, please switch back to the master branch! -# notes for devs -- please install ESLint and use the included .eslintrc.js file to have properly formatted code when you're writing Woomy \ No newline at end of file +Woomy +================ + +shields go here + +### A feature-rich and configurable Discord bot for music, moderation, currency and more! + +**Links** +* [Official bot invite](https://discordapp.com/oauth2/authorize?client_id=435961704145485835&permissions=2134240503&scope=bot) +* [For updates and support join my Discord server!](https://discord.gg/HCF8mdv) + +# Getting Started + +# Contributors + +Thanks to the following people who have contributed to Woomy: + +* [@mudkipscience](https://github.com/mudkipscience/) - Creator and primary developer of Womy +* [@FLGX](https://github.com/FLGX06/) - Developer, basically wrote the entirety of the music commands and lots of other cool stuff +* [@TheCakeChicken](https://github.com/TheCakeChicken/) - Developer + +And a few other people as well. Check out the [Contributors](https://github.com/mudkipscience/woomy/graphs/contributors) tab! + +# Legal stuff + +## Using our code +If you wish to use our code in your project, please credit us! We don't mind you using Woomy's code (it is open source for a reason :P) as long as you dont blatantly copy it and/or refrain from crediting us. + +## License + +Copyright (C) 2018-2020 **Emily J. / mudkipscience** + +>This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License +>as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. +> +>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; +>without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +> +>See the GNU Affero General Public License for more details. +>You should have received a copy of the GNU Affero General Public License along with this program. If not, see http://www.gnu.org/licenses/ + +The full license can be found in the root of this repository. From de895af2a912c307aa9ee88d9ec9c767307fcec6 Mon Sep 17 00:00:00 2001 From: mudkipscience Date: Mon, 20 Apr 2020 12:11:26 +1000 Subject: [PATCH 113/156] bernie sander --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index ac6622a..33f937f 100644 --- a/README.md +++ b/README.md @@ -3,9 +3,9 @@ Woomy shields go here -### A feature-rich and configurable Discord bot for music, moderation, currency and more! +## A feature-rich and configurable Discord bot for music, moderation, currency and more! -**Links** +### Links * [Official bot invite](https://discordapp.com/oauth2/authorize?client_id=435961704145485835&permissions=2134240503&scope=bot) * [For updates and support join my Discord server!](https://discord.gg/HCF8mdv) From 333c6299dd7d0fbb40ad9c7ad61002824e3afd61 Mon Sep 17 00:00:00 2001 From: mudkipscience Date: Mon, 20 Apr 2020 12:35:17 +1000 Subject: [PATCH 114/156] b --- README.md | 31 +++++++++++-------------------- 1 file changed, 11 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md index 33f937f..a996bc8 100644 --- a/README.md +++ b/README.md @@ -1,17 +1,17 @@ -Woomy -================ - -shields go here +# Woomy +![GitHub repo size](https://img.shields.io/github/repo-size/mudkipscience/woomy) ## A feature-rich and configurable Discord bot for music, moderation, currency and more! -### Links +**Links** * [Official bot invite](https://discordapp.com/oauth2/authorize?client_id=435961704145485835&permissions=2134240503&scope=bot) * [For updates and support join my Discord server!](https://discord.gg/HCF8mdv) -# Getting Started +## Using Woomy -# Contributors +The easiest and recommended way to use Woomy is to invite the official version to your server, which is hosted 24/7 and gets the newest updates as soon as they come out. The invite can be found above, under links. You can also self-host, but no support will be provided to you if you decide to do this. + +## Contributors Thanks to the following people who have contributed to Woomy: @@ -21,22 +21,13 @@ Thanks to the following people who have contributed to Woomy: And a few other people as well. Check out the [Contributors](https://github.com/mudkipscience/woomy/graphs/contributors) tab! -# Legal stuff +## Legal stuff -## Using our code +### Using our code If you wish to use our code in your project, please credit us! We don't mind you using Woomy's code (it is open source for a reason :P) as long as you dont blatantly copy it and/or refrain from crediting us. -## License +### License Copyright (C) 2018-2020 **Emily J. / mudkipscience** ->This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License ->as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. -> ->This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; ->without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -> ->See the GNU Affero General Public License for more details. ->You should have received a copy of the GNU Affero General Public License along with this program. If not, see http://www.gnu.org/licenses/ - -The full license can be found in the root of this repository. +Copyrights licensed under the GNU AGPLv3 License, see the accompanying LICENSE file for details. \ No newline at end of file From adb222c1546b91bc26a83a03640a45635a795345 Mon Sep 17 00:00:00 2001 From: mudkipscience Date: Mon, 20 Apr 2020 12:45:50 +1000 Subject: [PATCH 115/156] added badges --- README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index a996bc8..628d8bc 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,8 @@ # Woomy -![GitHub repo size](https://img.shields.io/github/repo-size/mudkipscience/woomy) +![Status](https://top.gg/api/widget/status/435961704145485835.svg) +![Servers](https://top.gg/api/widget/servers/435961704145485835.svg?noavatar=true) +![Discord](https://img.shields.io/discord/410990517841690625) +![License](https://img.shields.io/github/license/mudkipscience/woomy) ## A feature-rich and configurable Discord bot for music, moderation, currency and more! From 3e8c73f90a0c2e1ae33bd92038a274731c6cc9fd Mon Sep 17 00:00:00 2001 From: mudkipscience Date: Mon, 20 Apr 2020 12:47:56 +1000 Subject: [PATCH 116/156] add avatar --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 628d8bc..4258f95 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,8 @@ # Woomy ![Status](https://top.gg/api/widget/status/435961704145485835.svg) -![Servers](https://top.gg/api/widget/servers/435961704145485835.svg?noavatar=true) +![Servers](https://top.gg/api/widget/servers/435961704145485835.svg) ![Discord](https://img.shields.io/discord/410990517841690625) +![Version](https://img.shields.io/github/package-json/v/mudkipscience/woomy) ![License](https://img.shields.io/github/license/mudkipscience/woomy) ## A feature-rich and configurable Discord bot for music, moderation, currency and more! From f04f6c842f39215ef81c95396874a17a84f20e47 Mon Sep 17 00:00:00 2001 From: mudkipscience Date: Mon, 20 Apr 2020 13:02:10 +1000 Subject: [PATCH 117/156] please stop stealing my code --- README.md | 2 +- commands/8ball.js | 2 ++ commands/emoji.js | 2 ++ commands/eval.js | 2 ++ commands/forceskip.js | 2 ++ commands/help.js | 2 ++ commands/invite.js | 2 ++ commands/level.js | 2 ++ commands/myprefix.js | 2 ++ commands/ping.js | 2 ++ commands/play.js | 2 ++ commands/prefix.js | 2 ++ commands/pride.js | 2 ++ commands/ship.js | 2 ++ commands/support.js | 2 ++ commands/volume.js | 2 ++ events/disconnect.js | 2 ++ events/error.js | 2 ++ events/guildCreate.js | 2 ++ events/guildDelete.js | 2 ++ events/message.js | 2 ++ events/ready.js | 2 ++ events/reconnecting.js | 2 ++ index.js | 13 ++++++++----- utils/_functions.js | 4 ++++ utils/botlists.js | 2 ++ utils/logger.js | 2 ++ utils/mongoose.js | 2 ++ utils/music.js | 2 ++ 29 files changed, 65 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 4258f95..aaf00b8 100644 --- a/README.md +++ b/README.md @@ -32,6 +32,6 @@ If you wish to use our code in your project, please credit us! We don't mind you ### License -Copyright (C) 2018-2020 **Emily J. / mudkipscience** +Copyright (C) 2018-2020 Emily J. / mudkipscience Copyrights licensed under the GNU AGPLv3 License, see the accompanying LICENSE file for details. \ No newline at end of file diff --git a/commands/8ball.js b/commands/8ball.js index 7ed2b35..467df90 100644 --- a/commands/8ball.js +++ b/commands/8ball.js @@ -1,3 +1,5 @@ +// Copyright 2020 Emily J. / mudkipscience. Subject to the AGPLv3 license. + exports.conf = { enabled: true, guildOnly: false, diff --git a/commands/emoji.js b/commands/emoji.js index 55306f3..7d861b2 100644 --- a/commands/emoji.js +++ b/commands/emoji.js @@ -1,3 +1,5 @@ +// Copyright 2020 Emily J. / mudkipscience. Subject to the AGPLv3 license. + exports.conf = { enabled: true, guildOnly: false, diff --git a/commands/eval.js b/commands/eval.js index 3fa78c5..768678c 100644 --- a/commands/eval.js +++ b/commands/eval.js @@ -1,3 +1,5 @@ +// Copyright 2020 Emily J. / mudkipscience. Subject to the AGPLv3 license. + /* eslint-disable no-eval */ exports.conf = { diff --git a/commands/forceskip.js b/commands/forceskip.js index 8c604b2..33e1715 100644 --- a/commands/forceskip.js +++ b/commands/forceskip.js @@ -1,3 +1,5 @@ +// Copyright 2020 Emily J. / mudkipscience. Subject to the AGPLv3 license. + exports.conf = { enabled: true, guildOnly: true, diff --git a/commands/help.js b/commands/help.js index 5bf42d1..efc11ac 100644 --- a/commands/help.js +++ b/commands/help.js @@ -1,3 +1,5 @@ +// Copyright 2020 Emily J. / mudkipscience. Subject to the AGPLv3 license. + exports.conf = { enabled: true, guildOnly: false, diff --git a/commands/invite.js b/commands/invite.js index 2d9b38f..fa11e74 100644 --- a/commands/invite.js +++ b/commands/invite.js @@ -1,3 +1,5 @@ +// Copyright 2020 Emily J. / mudkipscience. Subject to the AGPLv3 license. + exports.conf = { enabled: true, guildOnly: false, diff --git a/commands/level.js b/commands/level.js index 43135b3..6d19421 100644 --- a/commands/level.js +++ b/commands/level.js @@ -1,3 +1,5 @@ +// Copyright 2020 Emily J. / mudkipscience. Subject to the AGPLv3 license. + exports.conf = { enabled: true, guildOnly: false, diff --git a/commands/myprefix.js b/commands/myprefix.js index f54cc7b..7b8b390 100644 --- a/commands/myprefix.js +++ b/commands/myprefix.js @@ -1,3 +1,5 @@ +// Copyright 2020 Emily J. / mudkipscience. Subject to the AGPLv3 license. + exports.conf = { enabled: true, guildOnly: false, diff --git a/commands/ping.js b/commands/ping.js index e316e93..ee6967d 100644 --- a/commands/ping.js +++ b/commands/ping.js @@ -1,3 +1,5 @@ +// Copyright 2020 Emily J. / mudkipscience. Subject to the AGPLv3 license. + exports.conf = { enabled: true, guildOnly: false, diff --git a/commands/play.js b/commands/play.js index 0e640c3..56a6ba5 100644 --- a/commands/play.js +++ b/commands/play.js @@ -1,3 +1,5 @@ +// Copyright 2020 Emily J. / mudkipscience. Subject to the AGPLv3 license. + exports.conf = { enabled: true, guildOnly: true, diff --git a/commands/prefix.js b/commands/prefix.js index 10a1549..0c1da72 100644 --- a/commands/prefix.js +++ b/commands/prefix.js @@ -1,3 +1,5 @@ +// Copyright 2020 Emily J. / mudkipscience. Subject to the AGPLv3 license. + exports.conf = { enabled: true, guildOnly: false, diff --git a/commands/pride.js b/commands/pride.js index 0343596..9e05bfb 100644 --- a/commands/pride.js +++ b/commands/pride.js @@ -1,3 +1,5 @@ +// Copyright 2020 Emily J. / mudkipscience. Subject to the AGPLv3 license. + exports.conf = { enabled: true, guildOnly: false, diff --git a/commands/ship.js b/commands/ship.js index ee91729..0b35eaf 100644 --- a/commands/ship.js +++ b/commands/ship.js @@ -1,4 +1,6 @@ +// Copyright 2020 Emily J. / mudkipscience. Subject to the AGPLv3 license. + exports.conf = { enabled: true, guildOnly: false, diff --git a/commands/support.js b/commands/support.js index 57cb185..5db5378 100644 --- a/commands/support.js +++ b/commands/support.js @@ -1,3 +1,5 @@ +// Copyright 2020 Emily J. / mudkipscience. Subject to the AGPLv3 license. + exports.conf = { enabled: true, guildOnly: false, diff --git a/commands/volume.js b/commands/volume.js index d191d13..de93d23 100644 --- a/commands/volume.js +++ b/commands/volume.js @@ -1,3 +1,5 @@ +// Copyright 2020 Emily J. / mudkipscience. Subject to the AGPLv3 license. + exports.conf = { enabled: true, guildOnly: true, diff --git a/events/disconnect.js b/events/disconnect.js index 0e44cc0..2db41ac 100644 --- a/events/disconnect.js +++ b/events/disconnect.js @@ -1,3 +1,5 @@ +// Copyright 2020 Emily J. / mudkipscience. Subject to the AGPLv3 license. + module.exports = (client) => { client.logger.warn('Lost connection to Discord.') } diff --git a/events/error.js b/events/error.js index f1e3615..1ae89ce 100644 --- a/events/error.js +++ b/events/error.js @@ -1,3 +1,5 @@ +// Copyright 2020 Emily J. / mudkipscience. Subject to the AGPLv3 license. + module.exports = async (client, error) => { client.logger.error(JSON.stringify(error.stack)) } diff --git a/events/guildCreate.js b/events/guildCreate.js index 3eb2e46..71103f4 100644 --- a/events/guildCreate.js +++ b/events/guildCreate.js @@ -1,3 +1,5 @@ +// Copyright 2020 Emily J. / mudkipscience. Subject to the AGPLv3 license. + const Discord = require('discord.js') module.exports = async (client, guild) => { client.logger.info('Guild joined.') diff --git a/events/guildDelete.js b/events/guildDelete.js index 80bfa91..fa156fb 100644 --- a/events/guildDelete.js +++ b/events/guildDelete.js @@ -1,3 +1,5 @@ +// Copyright 2020 Emily J. / mudkipscience. Subject to the AGPLv3 license. + const Discord = require('discord.js') module.exports = async (client, guild) => { if (!guild.available) return diff --git a/events/message.js b/events/message.js index 8f225f9..261c0d8 100644 --- a/events/message.js +++ b/events/message.js @@ -1,3 +1,5 @@ +// Copyright 2020 Emily J. / mudkipscience. Subject to the AGPLv3 license. + module.exports = async (client, message) => { if (message.author.bot) return diff --git a/events/ready.js b/events/ready.js index 8ff65ac..3deb18e 100644 --- a/events/ready.js +++ b/events/ready.js @@ -1,3 +1,5 @@ +// Copyright 2020 Emily J. / mudkipscience. Subject to the AGPLv3 license. + const moment = require('moment') module.exports = (client) => { const timestamp = moment().format('YYYY-MM-DD HH:mm:ss') diff --git a/events/reconnecting.js b/events/reconnecting.js index 7178034..ef1f10a 100644 --- a/events/reconnecting.js +++ b/events/reconnecting.js @@ -1,3 +1,5 @@ +// Copyright 2020 Emily J. / mudkipscience. Subject to the AGPLv3 license. + module.exports = (client) => { client.logger.info('Reconnecting to Discord...') } diff --git a/index.js b/index.js index ec797e4..687ede4 100644 --- a/index.js +++ b/index.js @@ -1,5 +1,8 @@ -// Woomy version 2 -// Copyright 2020 mudkipscience +/* Copyright 2020 Emily J. / mudkipscience. Subject to the AGPLv3 license. + * You will find this message at the start of every file in woomy. Please + * keep in mind that I didn't do all the work, I just don't think the other + * developers would be comfortable providing their names :P + */ 'use strict' @@ -28,9 +31,9 @@ client.db = require('./utils/mongoose') client.logger = require('./utils/logger') require('./utils/_functions')(client) -if (typeof client.config.devmode !== 'undefined') { //Check if devmode is explicitly overridden - client.devmode = client.config.devmode; -} else { //Check if Woomy is running inside a Docker +if (typeof client.config.devmode !== 'undefined') { // Check if devmode is explicitly overridden + client.devmode = client.config.devmode +} else { // Check if Woomy is running inside a Docker if (isDocker() === false) { client.devmode = true } else { diff --git a/utils/_functions.js b/utils/_functions.js index eb569b9..bd2a9d4 100644 --- a/utils/_functions.js +++ b/utils/_functions.js @@ -1,3 +1,7 @@ +/* Copyright 2020 Emily J. / mudkipscience. Subject to the AGPLv3 license. + * Some code found in this file has been taken from Guidebot, which is licensed under the MIT license. + */ + // Functions in this file are bound to the client object, and available basically anywhere. const { MessageEmbed } = require('discord.js') diff --git a/utils/botlists.js b/utils/botlists.js index 54307d6..92d6ac9 100644 --- a/utils/botlists.js +++ b/utils/botlists.js @@ -1,3 +1,5 @@ +// Copyright 2020 Emily J. / mudkipscience. Subject to the AGPLv3 license. + module.exports = client => { } diff --git a/utils/logger.js b/utils/logger.js index a220e45..c159ca0 100644 --- a/utils/logger.js +++ b/utils/logger.js @@ -1,3 +1,5 @@ +// Copyright 2020 Emily J. / mudkipscience. Subject to the AGPLv3 license. + 'use strict' const { colorConsole } = require('tracer') diff --git a/utils/mongoose.js b/utils/mongoose.js index 6db6564..08bdfce 100644 --- a/utils/mongoose.js +++ b/utils/mongoose.js @@ -1,3 +1,5 @@ +// Copyright 2020 Emily J. / mudkipscience. Subject to the AGPLv3 license. + const mongoose = require('mongoose') module.exports = { diff --git a/utils/music.js b/utils/music.js index b1b6b8d..ad8d1a5 100644 --- a/utils/music.js +++ b/utils/music.js @@ -1,3 +1,5 @@ +// Copyright 2020 Emily J. / mudkipscience. Subject to the AGPLv3 license. + const ytdl = require('ytdl-core-discord') const fetch = require('node-fetch') const { MessageEmbed } = require('discord.js') From eeea371762e079fa16930f606fec88cf244152bf Mon Sep 17 00:00:00 2001 From: mudkipscience Date: Mon, 20 Apr 2020 14:52:50 +1000 Subject: [PATCH 118/156] updated copyright notices --- commands/8ball.js | 2 +- commands/emoji.js | 2 +- commands/eval.js | 2 +- commands/forceskip.js | 2 +- commands/help.js | 2 +- commands/invite.js | 2 +- commands/level.js | 2 +- commands/myprefix.js | 2 +- commands/ping.js | 2 +- commands/play.js | 2 +- commands/prefix.js | 2 +- commands/pride.js | 2 +- commands/ship.js | 2 +- commands/support.js | 2 +- commands/volume.js | 2 +- events/disconnect.js | 2 +- events/error.js | 2 +- events/guildCreate.js | 2 +- events/guildDelete.js | 2 +- events/message.js | 2 +- events/ready.js | 2 +- events/reconnecting.js | 2 +- index.js | 6 +----- utils/_functions.js | 2 +- utils/botlists.js | 2 +- utils/logger.js | 2 +- utils/mongoose.js | 2 +- utils/music.js | 2 +- 28 files changed, 28 insertions(+), 32 deletions(-) diff --git a/commands/8ball.js b/commands/8ball.js index 467df90..869c627 100644 --- a/commands/8ball.js +++ b/commands/8ball.js @@ -1,4 +1,4 @@ -// Copyright 2020 Emily J. / mudkipscience. Subject to the AGPLv3 license. +// Copyright 2020 Emily J. / mudkipscience and contributors. Subject to the AGPLv3 license. exports.conf = { enabled: true, diff --git a/commands/emoji.js b/commands/emoji.js index 7d861b2..42e0d46 100644 --- a/commands/emoji.js +++ b/commands/emoji.js @@ -1,4 +1,4 @@ -// Copyright 2020 Emily J. / mudkipscience. Subject to the AGPLv3 license. +// Copyright 2020 Emily J. / mudkipscience and contributors. Subject to the AGPLv3 license. exports.conf = { enabled: true, diff --git a/commands/eval.js b/commands/eval.js index 768678c..4e22f1a 100644 --- a/commands/eval.js +++ b/commands/eval.js @@ -1,4 +1,4 @@ -// Copyright 2020 Emily J. / mudkipscience. Subject to the AGPLv3 license. +// Copyright 2020 Emily J. / mudkipscience and contributors. Subject to the AGPLv3 license. /* eslint-disable no-eval */ diff --git a/commands/forceskip.js b/commands/forceskip.js index 33e1715..5845870 100644 --- a/commands/forceskip.js +++ b/commands/forceskip.js @@ -1,4 +1,4 @@ -// Copyright 2020 Emily J. / mudkipscience. Subject to the AGPLv3 license. +// Copyright 2020 Emily J. / mudkipscience and contributors. Subject to the AGPLv3 license. exports.conf = { enabled: true, diff --git a/commands/help.js b/commands/help.js index efc11ac..bd7cabd 100644 --- a/commands/help.js +++ b/commands/help.js @@ -1,4 +1,4 @@ -// Copyright 2020 Emily J. / mudkipscience. Subject to the AGPLv3 license. +// Copyright 2020 Emily J. / mudkipscience and contributors. Subject to the AGPLv3 license. exports.conf = { enabled: true, diff --git a/commands/invite.js b/commands/invite.js index fa11e74..87fe22b 100644 --- a/commands/invite.js +++ b/commands/invite.js @@ -1,4 +1,4 @@ -// Copyright 2020 Emily J. / mudkipscience. Subject to the AGPLv3 license. +// Copyright 2020 Emily J. / mudkipscience and contributors. Subject to the AGPLv3 license. exports.conf = { enabled: true, diff --git a/commands/level.js b/commands/level.js index 6d19421..ca11482 100644 --- a/commands/level.js +++ b/commands/level.js @@ -1,4 +1,4 @@ -// Copyright 2020 Emily J. / mudkipscience. Subject to the AGPLv3 license. +// Copyright 2020 Emily J. / mudkipscience and contributors. Subject to the AGPLv3 license. exports.conf = { enabled: true, diff --git a/commands/myprefix.js b/commands/myprefix.js index 7b8b390..b0b5a4a 100644 --- a/commands/myprefix.js +++ b/commands/myprefix.js @@ -1,4 +1,4 @@ -// Copyright 2020 Emily J. / mudkipscience. Subject to the AGPLv3 license. +// Copyright 2020 Emily J. / mudkipscience and contributors. Subject to the AGPLv3 license. exports.conf = { enabled: true, diff --git a/commands/ping.js b/commands/ping.js index ee6967d..451b017 100644 --- a/commands/ping.js +++ b/commands/ping.js @@ -1,4 +1,4 @@ -// Copyright 2020 Emily J. / mudkipscience. Subject to the AGPLv3 license. +// Copyright 2020 Emily J. / mudkipscience and contributors. Subject to the AGPLv3 license. exports.conf = { enabled: true, diff --git a/commands/play.js b/commands/play.js index 56a6ba5..c3ac80e 100644 --- a/commands/play.js +++ b/commands/play.js @@ -1,4 +1,4 @@ -// Copyright 2020 Emily J. / mudkipscience. Subject to the AGPLv3 license. +// Copyright 2020 Emily J. / mudkipscience and contributors. Subject to the AGPLv3 license. exports.conf = { enabled: true, diff --git a/commands/prefix.js b/commands/prefix.js index 0c1da72..270552d 100644 --- a/commands/prefix.js +++ b/commands/prefix.js @@ -1,4 +1,4 @@ -// Copyright 2020 Emily J. / mudkipscience. Subject to the AGPLv3 license. +// Copyright 2020 Emily J. / mudkipscience and contributors. Subject to the AGPLv3 license. exports.conf = { enabled: true, diff --git a/commands/pride.js b/commands/pride.js index 9e05bfb..5178a90 100644 --- a/commands/pride.js +++ b/commands/pride.js @@ -1,4 +1,4 @@ -// Copyright 2020 Emily J. / mudkipscience. Subject to the AGPLv3 license. +// Copyright 2020 Emily J. / mudkipscience and contributors. Subject to the AGPLv3 license. exports.conf = { enabled: true, diff --git a/commands/ship.js b/commands/ship.js index 0b35eaf..e156e6c 100644 --- a/commands/ship.js +++ b/commands/ship.js @@ -1,5 +1,5 @@ -// Copyright 2020 Emily J. / mudkipscience. Subject to the AGPLv3 license. +// Copyright 2020 Emily J. / mudkipscience and contributors. Subject to the AGPLv3 license. exports.conf = { enabled: true, diff --git a/commands/support.js b/commands/support.js index 5db5378..b696986 100644 --- a/commands/support.js +++ b/commands/support.js @@ -1,4 +1,4 @@ -// Copyright 2020 Emily J. / mudkipscience. Subject to the AGPLv3 license. +// Copyright 2020 Emily J. / mudkipscience and contributors. Subject to the AGPLv3 license. exports.conf = { enabled: true, diff --git a/commands/volume.js b/commands/volume.js index de93d23..67ef589 100644 --- a/commands/volume.js +++ b/commands/volume.js @@ -1,4 +1,4 @@ -// Copyright 2020 Emily J. / mudkipscience. Subject to the AGPLv3 license. +// Copyright 2020 Emily J. / mudkipscience and contributors. Subject to the AGPLv3 license. exports.conf = { enabled: true, diff --git a/events/disconnect.js b/events/disconnect.js index 2db41ac..ca34fed 100644 --- a/events/disconnect.js +++ b/events/disconnect.js @@ -1,4 +1,4 @@ -// Copyright 2020 Emily J. / mudkipscience. Subject to the AGPLv3 license. +// Copyright 2020 Emily J. / mudkipscience and contributors. Subject to the AGPLv3 license. module.exports = (client) => { client.logger.warn('Lost connection to Discord.') diff --git a/events/error.js b/events/error.js index 1ae89ce..884dd55 100644 --- a/events/error.js +++ b/events/error.js @@ -1,4 +1,4 @@ -// Copyright 2020 Emily J. / mudkipscience. Subject to the AGPLv3 license. +// Copyright 2020 Emily J. / mudkipscience and contributors. Subject to the AGPLv3 license. module.exports = async (client, error) => { client.logger.error(JSON.stringify(error.stack)) diff --git a/events/guildCreate.js b/events/guildCreate.js index 71103f4..822489c 100644 --- a/events/guildCreate.js +++ b/events/guildCreate.js @@ -1,4 +1,4 @@ -// Copyright 2020 Emily J. / mudkipscience. Subject to the AGPLv3 license. +// Copyright 2020 Emily J. / mudkipscience and contributors. Subject to the AGPLv3 license. const Discord = require('discord.js') module.exports = async (client, guild) => { diff --git a/events/guildDelete.js b/events/guildDelete.js index fa156fb..18a3539 100644 --- a/events/guildDelete.js +++ b/events/guildDelete.js @@ -1,4 +1,4 @@ -// Copyright 2020 Emily J. / mudkipscience. Subject to the AGPLv3 license. +// Copyright 2020 Emily J. / mudkipscience and contributors. Subject to the AGPLv3 license. const Discord = require('discord.js') module.exports = async (client, guild) => { diff --git a/events/message.js b/events/message.js index 261c0d8..6a26bee 100644 --- a/events/message.js +++ b/events/message.js @@ -1,4 +1,4 @@ -// Copyright 2020 Emily J. / mudkipscience. Subject to the AGPLv3 license. +// Copyright 2020 Emily J. / mudkipscience and contributors. Subject to the AGPLv3 license. module.exports = async (client, message) => { if (message.author.bot) return diff --git a/events/ready.js b/events/ready.js index 3deb18e..0a3bc3a 100644 --- a/events/ready.js +++ b/events/ready.js @@ -1,4 +1,4 @@ -// Copyright 2020 Emily J. / mudkipscience. Subject to the AGPLv3 license. +// Copyright 2020 Emily J. / mudkipscience and contributors. Subject to the AGPLv3 license. const moment = require('moment') module.exports = (client) => { diff --git a/events/reconnecting.js b/events/reconnecting.js index ef1f10a..768e0c8 100644 --- a/events/reconnecting.js +++ b/events/reconnecting.js @@ -1,4 +1,4 @@ -// Copyright 2020 Emily J. / mudkipscience. Subject to the AGPLv3 license. +// Copyright 2020 Emily J. / mudkipscience and contributors. Subject to the AGPLv3 license. module.exports = (client) => { client.logger.info('Reconnecting to Discord...') diff --git a/index.js b/index.js index 687ede4..73cb202 100644 --- a/index.js +++ b/index.js @@ -1,8 +1,4 @@ -/* Copyright 2020 Emily J. / mudkipscience. Subject to the AGPLv3 license. - * You will find this message at the start of every file in woomy. Please - * keep in mind that I didn't do all the work, I just don't think the other - * developers would be comfortable providing their names :P - */ +// Copyright 2020 Emily J. / mudkipscience and contributors. Subject to the AGPLv3 license. 'use strict' diff --git a/utils/_functions.js b/utils/_functions.js index bd2a9d4..519d2a7 100644 --- a/utils/_functions.js +++ b/utils/_functions.js @@ -1,4 +1,4 @@ -/* Copyright 2020 Emily J. / mudkipscience. Subject to the AGPLv3 license. +/* Copyright 2020 Emily J. / mudkipscience and contributors. Subject to the AGPLv3 license. * Some code found in this file has been taken from Guidebot, which is licensed under the MIT license. */ diff --git a/utils/botlists.js b/utils/botlists.js index 92d6ac9..b584297 100644 --- a/utils/botlists.js +++ b/utils/botlists.js @@ -1,4 +1,4 @@ -// Copyright 2020 Emily J. / mudkipscience. Subject to the AGPLv3 license. +// Copyright 2020 Emily J. / mudkipscience and contributors. Subject to the AGPLv3 license. module.exports = client => { diff --git a/utils/logger.js b/utils/logger.js index c159ca0..d00045e 100644 --- a/utils/logger.js +++ b/utils/logger.js @@ -1,4 +1,4 @@ -// Copyright 2020 Emily J. / mudkipscience. Subject to the AGPLv3 license. +// Copyright 2020 Emily J. / mudkipscience and contributors. Subject to the AGPLv3 license. 'use strict' diff --git a/utils/mongoose.js b/utils/mongoose.js index 08bdfce..186779e 100644 --- a/utils/mongoose.js +++ b/utils/mongoose.js @@ -1,4 +1,4 @@ -// Copyright 2020 Emily J. / mudkipscience. Subject to the AGPLv3 license. +// Copyright 2020 Emily J. / mudkipscience and contributors. Subject to the AGPLv3 license. const mongoose = require('mongoose') diff --git a/utils/music.js b/utils/music.js index ad8d1a5..825334b 100644 --- a/utils/music.js +++ b/utils/music.js @@ -1,4 +1,4 @@ -// Copyright 2020 Emily J. / mudkipscience. Subject to the AGPLv3 license. +// Copyright 2020 Emily J. / mudkipscience and contributors. Subject to the AGPLv3 license. const ytdl = require('ytdl-core-discord') const fetch = require('node-fetch') From 4d02b3bc7eb883207b0115944554d276a71d93fa Mon Sep 17 00:00:00 2001 From: mudkipscience Date: Mon, 20 Apr 2020 14:53:59 +1000 Subject: [PATCH 119/156] this annoyed me --- utils/_functions.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/utils/_functions.js b/utils/_functions.js index 519d2a7..be9d121 100644 --- a/utils/_functions.js +++ b/utils/_functions.js @@ -1,4 +1,5 @@ -/* Copyright 2020 Emily J. / mudkipscience and contributors. Subject to the AGPLv3 license. +/* + * Copyright 2020 Emily J. / mudkipscience and contributors. Subject to the AGPLv3 license. * Some code found in this file has been taken from Guidebot, which is licensed under the MIT license. */ From 39fa4286143a292ccd45f3071d9da4ab5fe5c0e1 Mon Sep 17 00:00:00 2001 From: mudkipscience Date: Mon, 20 Apr 2020 19:19:32 +1000 Subject: [PATCH 120/156] porting over music commands --- commands/nowplaying.js | 47 +++++++++++ commands/pause.js | 37 +++++++++ commands/queue.js | 178 +++++++++++++++++++++++++++++++++++++++++ commands/resume.js | 37 +++++++++ configTemplate.js | 2 +- utils/music.js | 14 ++-- 6 files changed, 309 insertions(+), 6 deletions(-) create mode 100644 commands/nowplaying.js create mode 100644 commands/pause.js create mode 100644 commands/queue.js create mode 100644 commands/resume.js diff --git a/commands/nowplaying.js b/commands/nowplaying.js new file mode 100644 index 0000000..f07cdfa --- /dev/null +++ b/commands/nowplaying.js @@ -0,0 +1,47 @@ +// Copyright 2020 Emily J. / mudkipscience and contributors. Subject to the AGPLv3 license. + +exports.conf = { + enabled: true, + guildOnly: true, + aliases: ['np'], + permLevel: 'User', + requiredPerms: [], + cooldown: 2000 +} + +exports.help = { + name: 'nowplaying', + category: 'Music', + description: 'Gives details on the song that is currently playing', + usage: 'nowplaying', + parameters: '' +} + +const { getGuild, createTimestamp } = require('../utils/music') +const { MessageEmbed } = require('discord.js') +exports.run = async (client, message, args, level, data) => { + const guild = getGuild(message.guild.id) + + if (guild.queue.length < 1) { + return message.channel.send(client.config.emojis.error + ' Nothing is in the queue!') + } + + const s = guild.queue[0] + const elapsedTime = createTimestamp(guild.dispatcher.streamTime / 1000) + let timestamp = `\`[${createTimestamp(s.video.lengthSeconds)}]\`` + + if (timestamp !== '`[LIVE]`') { + timestamp = `\`[${elapsedTime + '/' + createTimestamp(s.video.lengthSeconds)}]\`` + } + + const embed = new MessageEmbed() + embed.setTitle('Now playing') + embed.setThumbnail(s.video.videoThumbnails[1].url) + embed.setColor(client.embedColour(message.guild)) + embed.setDescription(`**[${s.video.title}](https://www.youtube.com/watch?v=${s.video.videoId})**`) + embed.addField('Channel:', s.video.author, true) + embed.addField('Time:', timestamp, true) + embed.setFooter('Requested by ' + s.requestedBy.tag, s.requestedBy.avatarURL({ format: 'png', dynamic: true, size: 2048 })) + + message.channel.send(embed) +} diff --git a/commands/pause.js b/commands/pause.js new file mode 100644 index 0000000..9b6e8e0 --- /dev/null +++ b/commands/pause.js @@ -0,0 +1,37 @@ +// Copyright 2020 Emily J. / mudkipscience and contributors. Subject to the AGPLv3 license. + +exports.conf = { + enabled: true, + guildOnly: true, + aliases: [], + permLevel: 'User', + requiredPerms: [], + cooldown: 2000 +} + +exports.help = { + name: 'pause', + category: 'Music', + description: 'Pauses the music that is currently playing.', + usage: 'pause', + parameters: '' +} + +const { getGuild } = require('../utils/music') +exports.run = async (client, message, args, level, data) => { + const guild = getGuild(message.guild.id) + + if (guild.paused === true) { + return message.channel.send('The music has already been paused! Run resume to start the music again.') + } + + if (guild.queue.length < 1 || guild.playing === false) { + return message.channel.send('Nothing is playing!') + } + + guild.playing = false + guild.paused = true + guild.dispatcher.pause() + + message.channel.send('Music paused!') +} diff --git a/commands/queue.js b/commands/queue.js new file mode 100644 index 0000000..1471564 --- /dev/null +++ b/commands/queue.js @@ -0,0 +1,178 @@ +// Copyright 2020 Emily J. / mudkipscience and contributors. Subject to the AGPLv3 license. + +'use strict' + +exports.conf = { + enabled: true, + guildOnly: true, + aliases: [], + permLevel: 'User', + requiredPerms: [], + cooldown: 2000 +} + +exports.help = { + name: 'queue', + category: 'Music', + description: 'Lists all songs that have been queued.', + usage: 'queue ', + parameters: '' +} + +const { getGuild, createTimestamp } = require('../utils/music') +const Discord = require('discord.js') +exports.run = (client, message, args) => { + var queue = getGuild(message.guild.id).queue + + if (queue.length < 1) { + return message.channel.send('<:error:466995152976871434> Nothing is playing.') + } + + const lists = [] + + function generateList (start, number) { + let list = '' + let timestamp + + if (start === 1 && queue.length === 1) { + return ['There\'s nothing else waiting to be played!', 1] + } + + if (number === 1 && queue.length + 1 < start) { + return false + } + + const q = queue.slice(start) + + let i = 0 + + for (i = 0; i < q.length; i++) { + const song = q[i] + + timestamp = createTimestamp(song.video.lengthSeconds) + + const aaa = list + `\`${(i + 1) + start - 1}:\` **[${song.video.title}](https://www.youtube.com/watch?v=${song.video.videoId})** added by ${song.requestedBy} \`[${timestamp}]\`\n` + + if (aaa.length > 1024) { + return [list, start + i - 1] + } else { + list = aaa + } + + // totalDuration = totalDuration + song.duration + } + + return [list, start + i + 1] + } + + const songsInQueue = queue.length - 1 + let songsInQueueEnglish = 'song' + + function generatePage (list, page) { + if (!list || list === '') { + return false + } + + var embed = new Discord.MessageEmbed() + embed.setTitle(`Queue for: ${message.guild.name}`) + embed.setColor(client.embedColour(message.guild)) + + var elapsedTime = getGuild(message.guild.id).dispatcher.streamTime / 1000 + var totalDuration = queue[0].video.lengthSeconds - elapsedTime + + let timeRemaining = '' + + for (let i = 1; i < queue.length; i++) { + const b = queue[i] + + if (b.video.lengthSeconds === 0) { + timeRemaining = '∞' + + break + } + + totalDuration += b.video.lengthSeconds + } + + if (timeRemaining === '') { + const queueDuration = createTimestamp(totalDuration) + + timeRemaining = queueDuration + } + + let timestamp = `\`${createTimestamp(queue[0].video.lengthSeconds)}\`` + + if (timestamp !== '`[LIVE]`') { + timestamp = `\`[${createTimestamp(elapsedTime) + '/' + createTimestamp(queue[0].video.lengthSeconds)}]\`` + } + + embed.addField('Now playing:', `**[${queue[0].video.title}](https://www.youtube.com/watch?v=${queue[0].video.videoId})** added by ${queue[0].requestedBy} ${timestamp}`) + + embed.addField('Up next:', list) + + if (songsInQueue > 1 || songsInQueue === 0) { + songsInQueueEnglish = 'songs' + } + + embed.setFooter(`Page ${page}/${lists.length} | ${songsInQueue + ' ' + songsInQueueEnglish} in queue | ${timeRemaining} time remaining`) + + return embed + } + + var myMessage = null + + function displayPage (number) { + const page = generatePage(lists[number - 1], number) + + if (page) { + if (myMessage) { + myMessage.edit(page) + } else { + myMessage = message.channel.send(page) + } + + return true + } else { + return false + } + } + + function aFunction (start) { + // start - index of song, which we should start with + // end - index of song, which we ended with + + const [list, end] = generateList(start, lists.length + 1) + + if (list && list !== '') { + lists.push(list) + + if (queue[end + 1]) { + aFunction(end + 1) + } + } + } + + aFunction(1) + + let page = 1 + + if (args[0]) { + const userPage = Number(args[0]) + + if (userPage) { + page = userPage + } else { + return message.channel.send( + `<:error:466995152976871434> Invalid page. Usage: \`${client.commands.get('queue').help.usage}\`` + ) + } + } + + if (displayPage(page)) { + + } else { + return message.channel.send( + `<:error:466995152976871434> Page ${page} doesn't exist!` + ) + } +} diff --git a/commands/resume.js b/commands/resume.js new file mode 100644 index 0000000..6208e7a --- /dev/null +++ b/commands/resume.js @@ -0,0 +1,37 @@ +// Copyright 2020 Emily J. / mudkipscience and contributors. Subject to the AGPLv3 license. + +exports.conf = { + enabled: true, + guildOnly: true, + aliases: ['unpause'], + permLevel: 'User', + requiredPerms: [], + cooldown: 2000 +} + +exports.help = { + name: 'resume', + category: 'Music', + description: 'Starts music back up if it was paused.', + usage: 'resume', + parameters: '' +} + +const { getGuild } = require('../utils/music') +exports.run = async (client, message, args, level, data) => { + const guild = getGuild(message.guild.id) + + if (guild.paused === false) { + return message.channel.send('The music is already playing, use pause to pause the music first!') + } + + if (guild.queue.length < 1) { + return message.channel.send('Nothing is playing!') + } + + guild.playing = true + guild.paused = false + guild.dispatcher.resume() + + message.channel.send('Music resumed!') +} diff --git a/configTemplate.js b/configTemplate.js index ed6b127..14c8d39 100644 --- a/configTemplate.js +++ b/configTemplate.js @@ -14,7 +14,7 @@ const config = { // Configurable API endpoints endpoints: { - invidious: "https://invidious.snopyta.org/api/" + invidious: 'https://invidious.snopyta.org/api/' }, // Users added to this embed get access to developer-level commands diff --git a/utils/music.js b/utils/music.js index 825334b..756a4e6 100644 --- a/utils/music.js +++ b/utils/music.js @@ -8,7 +8,9 @@ const { utc } = require('moment') exports.queue = {} exports.createTimestamp = function (s) { - if (s >= 3600) { + if (s < 1) { + return 'LIVE' + } else if (s >= 3600) { return utc(s * 1000).format('HH:mm:ss') } else { return utc(s * 1000).format('mm:ss') @@ -21,9 +23,11 @@ exports.getGuild = function (id) { if (!guild) { guild = {} - guild.dispatcher = null - guild.playing = false guild.queue = [] + guild.playing = false + guild.paused = false + guild.dispatcher = null + guild.skippers = [] exports.queue[id] = guild } @@ -155,7 +159,7 @@ exports.play = async function (client, message, query, ignoreQueue) { } // Add video to queue - guild.queue.push({ video: video, requestedBy: message.member.id }) + guild.queue.push({ video: video, requestedBy: message.author }) } // Figure out if the bot should add it to queue or play it right now @@ -181,7 +185,7 @@ exports.play = async function (client, message, query, ignoreQueue) { guild.playing = false if (guild.queue.length > 0) { - exports.play(message, null, true) + exports.play(client, message, null, true) } else { guild.dispatcher = null From cb26ce0989cf68814887da3eb25a1b9e361f2e8c Mon Sep 17 00:00:00 2001 From: mudkipscience Date: Mon, 20 Apr 2020 19:42:47 +1000 Subject: [PATCH 121/156] did stuff but voteskip is broken (line 51) --- commands/{forceskip.js => skip.js} | 6 +-- commands/voteskip.js | 67 ++++++++++++++++++++++++++++++ 2 files changed, 70 insertions(+), 3 deletions(-) rename commands/{forceskip.js => skip.js} (86%) create mode 100644 commands/voteskip.js diff --git a/commands/forceskip.js b/commands/skip.js similarity index 86% rename from commands/forceskip.js rename to commands/skip.js index 5845870..13124b8 100644 --- a/commands/forceskip.js +++ b/commands/skip.js @@ -10,16 +10,16 @@ exports.conf = { } exports.help = { - name: 'forceskip', + name: 'skip', category: 'Music', description: 'Force skips currently playing song.', - usage: 'forceskip', + usage: 'skip', params: '' } const { skip } = require('../utils/music') exports.run = async (client, message, args, level, data) => { - skip(message.guild, 'forceskip') + skip(message.guild, 'skip') message.reply('skipped currently playing music') } diff --git a/commands/voteskip.js b/commands/voteskip.js new file mode 100644 index 0000000..f82d8d3 --- /dev/null +++ b/commands/voteskip.js @@ -0,0 +1,67 @@ +// Copyright 2020 Emily J. / mudkipscience and contributors. Subject to the AGPLv3 license. + +exports.conf = { + enabled: true, + guildOnly: true, + aliases: [], + permLevel: 'User', + requiredPerms: [], + cooldown: 2000 +} + +exports.help = { + name: 'voteskip', + category: 'Music', + description: 'Vote to skip the currently playing song.', + usage: 'voteskip', + params: '' +} + +const { skip, getGuild } = require('../utils/music') +exports.run = (client, message, args, level) => { + const guild = getGuild(message.guild.id) + + if (guild.queue.length < 1 || !guild.playing || !guild.dispatcher) { + return message.channel.send( + '<:error:466995152976871434> Nothing is playing.' + ) + } + + const vc = message.guild.members.cache.get(client.user.id).voiceChannel + + if (vc !== message.member.voiceChannel) { + return message.channel.send( + '<:error:466995152976871434> You need to be in my voice channel to use this command!' + ) + } + + if (guild.queue[0].requestedBy.id === message.author.id) { + skip(message.guild, 'skip') + + message.channel.send( + '<:skip:467216735356059660> Song has been skipped by the user who requested it.' + ) + + return + } + + if (guild.skippers.indexOf(message.author.id) === -1) { + guild.skippers.push(message.author.id) + + if (guild.skippers.length >= Math.ceil(vc.members.filter(member => !member.user.bot).size / 2)) { + skip(message.guild, 'skip') + + message.channel.send( + '<:skip:467216735356059660> Song has been skipped.' + ) + } else { + message.channel.send( + `<:success:466995111885144095> Your vote has been acknowledged! **${guild.skippers.length + '/' + Math.ceil(vc.members.filter(member => !member.user.bot).size / 2)}**` + ) + }; + } else { + message.channel.send( + '<:denied:466995195150336020> You cannot vote twice!' + ) + } +} From b7d2792bfce280a08a6a2341a7021e278f459e7c Mon Sep 17 00:00:00 2001 From: Emily Date: Mon, 20 Apr 2020 09:43:29 +0000 Subject: [PATCH 122/156] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index aaf00b8..be6868a 100644 --- a/README.md +++ b/README.md @@ -32,6 +32,6 @@ If you wish to use our code in your project, please credit us! We don't mind you ### License -Copyright (C) 2018-2020 Emily J. / mudkipscience +Copyright (C) 2018-2020 Emily J. / mudkipscience and contributors. -Copyrights licensed under the GNU AGPLv3 License, see the accompanying LICENSE file for details. \ No newline at end of file +Copyrights licensed under the GNU AGPLv3 License, see the accompanying LICENSE file for details. From 24cfe07310d2e6364a45581e6ac520cc4081dcc1 Mon Sep 17 00:00:00 2001 From: mudkipscience Date: Tue, 21 Apr 2020 17:01:28 +1000 Subject: [PATCH 123/156] fixed voteskip, added autoplay to guild schema --- commands/voteskip.js | 4 ++-- models/guild.js | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/commands/voteskip.js b/commands/voteskip.js index f82d8d3..489ecdb 100644 --- a/commands/voteskip.js +++ b/commands/voteskip.js @@ -27,9 +27,9 @@ exports.run = (client, message, args, level) => { ) } - const vc = message.guild.members.cache.get(client.user.id).voiceChannel + const vc = message.guild.members.cache.get(client.user.id).voice.channel - if (vc !== message.member.voiceChannel) { + if (vc !== message.member.voice.channel) { return message.channel.send( '<:error:466995152976871434> You need to be in my voice channel to use this command!' ) diff --git a/models/guild.js b/models/guild.js index 23ccbb8..1712da2 100644 --- a/models/guild.js +++ b/models/guild.js @@ -38,6 +38,11 @@ module.exports = model('Guild', new Schema({ } }, + autoplay: { + type: Boolean, + default: false + }, + plugins: { type: Object, default: { From 3a8e2a88403e8361666435497816862853eb9c4e Mon Sep 17 00:00:00 2001 From: mudkipscience Date: Tue, 21 Apr 2020 17:04:21 +1000 Subject: [PATCH 124/156] replaced some stuff --- utils/music.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/music.js b/utils/music.js index 756a4e6..b0b938e 100644 --- a/utils/music.js +++ b/utils/music.js @@ -67,7 +67,7 @@ exports.getVideoByQuery = async function (client, query) { exports.play = async function (client, message, query, ignoreQueue) { const guild = exports.getGuild(message.guild.id) - if (!message.member.voice.channel && !guild.voiceChannel) { + if (!message.member.voice.channel && !guild.voice.channel) { return message.reply('You have to be connected to a voice channel to use this command!') } @@ -168,7 +168,7 @@ exports.play = async function (client, message, query, ignoreQueue) { } else { guild.playing = true - guild.voiceChannel = vc + guild.voice.channel = vc const connection = await vc.join() From 5d2e02221b019ec530477b2423586ed827e8de8c Mon Sep 17 00:00:00 2001 From: mudkipscience Date: Tue, 21 Apr 2020 19:14:49 +1000 Subject: [PATCH 125/156] music stuff --- commands/nowplaying.js | 2 +- commands/play.js | 4 ++-- commands/removesong.js | 51 ++++++++++++++++++++++++++++++++++++++++++ commands/shuffle.js | 20 +++++++++++++++++ commands/stop.js | 34 ++++++++++++++++++++++++++++ utils/music.js | 5 +++-- 6 files changed, 111 insertions(+), 5 deletions(-) create mode 100644 commands/removesong.js create mode 100644 commands/shuffle.js create mode 100644 commands/stop.js diff --git a/commands/nowplaying.js b/commands/nowplaying.js index f07cdfa..b3e51b4 100644 --- a/commands/nowplaying.js +++ b/commands/nowplaying.js @@ -5,7 +5,7 @@ exports.conf = { guildOnly: true, aliases: ['np'], permLevel: 'User', - requiredPerms: [], + requiredPerms: ['EMBED_LINKS'], cooldown: 2000 } diff --git a/commands/play.js b/commands/play.js index c3ac80e..346b0f3 100644 --- a/commands/play.js +++ b/commands/play.js @@ -5,8 +5,8 @@ exports.conf = { guildOnly: true, aliases: [], permLevel: 'User', - requiredPerms: [], - cooldown: 2000 + requiredPerms: ['CONNECT', 'SPEAK'], + cooldown: 5000 } exports.help = { diff --git a/commands/removesong.js b/commands/removesong.js new file mode 100644 index 0000000..c1d7daf --- /dev/null +++ b/commands/removesong.js @@ -0,0 +1,51 @@ +// Copyright 2020 Emily J. / mudkipscience and contributors. Subject to the AGPLv3 license. + +exports.conf = { + enabled: true, + guildOnly: true, + aliases: [], + permLevel: 'User', + requiredPerms: [], + cooldown: 2000 +} + +exports.help = { + name: 'removesong', + category: 'Music', + description: 'Removes a song from the queue.', + usage: 'removesong [position]', + parameters: '[position] - The position of the song you want to remove' +} + +const { getGuild } = require('../utils/music') +module.exports.run = (client, message, args, level) => { + var queue = getGuild(message.guild.id).queue + + if (queue.length < 2) { + return message.channel.send('<:error:466995152976871434> Not enough songs are in the queue for this command to work!') + } + + if (!args[0]) { + return message.channel.send(`<:error:466995152976871434> You didn't tell me what song to remove! Usage: \`${client.commands.get('removesong').help.usage}\``) + } + + var input = +args[0] + + if (isNaN(input) === true) { + return message.channel.send('That isn\'t a number! You need to tell me the songs position in the queue (1, 2, etc.)') + } + + if (input >= queue.length) { + return message.channel.send('Invalid (too large)') + } + + if (input < 1) { + return message.channel.send('Invalid (too small)') + } + + var songName = queue[input].video.title + + queue.splice(input, 1) + + message.channel.send(`Removed from queue: **${songName}**`) +} diff --git a/commands/shuffle.js b/commands/shuffle.js new file mode 100644 index 0000000..368586d --- /dev/null +++ b/commands/shuffle.js @@ -0,0 +1,20 @@ +// Copyright 2020 Emily J. / mudkipscience and contributors. Subject to the AGPLv3 license. + +exports.conf = { + enabled: true, + guildOnly: true, + aliases: [], + permLevel: 'User', + requiredPerms: [], + cooldown: 2000 +} + +exports.help = { + name: 'removesong', + category: 'Music', + description: 'Removes a song from the queue.', + usage: 'removesong [position]', + parameters: '[position] - The position of the song you want to remove' +} + +const { getGuild } = require('../utils/music') \ No newline at end of file diff --git a/commands/stop.js b/commands/stop.js new file mode 100644 index 0000000..d82baed --- /dev/null +++ b/commands/stop.js @@ -0,0 +1,34 @@ +// Copyright 2020 Emily J. / mudkipscience and contributors. Subject to the AGPLv3 license. + +exports.conf = { + enabled: true, + guildOnly: true, + aliases: [], + permLevel: 'User', + requiredPerms: [], + cooldown: 2000 +} + +exports.help = { + name: 'stop', + category: 'Music', + description: 'Stops music, clears the queue and disconnects from the voice channel.', + usage: 'stop', + params: '' +} + +const { getGuild } = require('../utils/music') +exports.run = async (client, message) => { + const guild = getGuild(message.guild.id) + + if (guild.queue.length < 1 || !guild.playing || !guild.dispatcher) return message.channel.send('Nothing is playing.') + if (!message.member.voice.channel) return message.channel.send('You need to be in voice channel to use this command!') + + guild.playing = false + guild.paused = false + guild.queue = [] + + guild.dispatcher.end('silent') + + message.channel.send('Playback stopped!') +} diff --git a/utils/music.js b/utils/music.js index b0b938e..9b1244b 100644 --- a/utils/music.js +++ b/utils/music.js @@ -67,7 +67,7 @@ exports.getVideoByQuery = async function (client, query) { exports.play = async function (client, message, query, ignoreQueue) { const guild = exports.getGuild(message.guild.id) - if (!message.member.voice.channel && !guild.voice.channel) { + if (!message.member.voice.channel && !guild.voiceChannel) { return message.reply('You have to be connected to a voice channel to use this command!') } @@ -168,7 +168,8 @@ exports.play = async function (client, message, query, ignoreQueue) { } else { guild.playing = true - guild.voice.channel = vc + guild.voiceChannel = vc + console.log(vc) const connection = await vc.join() From c96829233860c73058d3930a2b08d807381c68b8 Mon Sep 17 00:00:00 2001 From: mudkipscience Date: Wed, 22 Apr 2020 01:05:33 +1000 Subject: [PATCH 126/156] added movesong and shuffle, will improve on them --- commands/movesong.js | 53 ++++++++++++++++++++++++++++++++++++++++++++ commands/shuffle.js | 31 +++++++++++++++++++++----- utils/music.js | 2 +- 3 files changed, 80 insertions(+), 6 deletions(-) create mode 100644 commands/movesong.js diff --git a/commands/movesong.js b/commands/movesong.js new file mode 100644 index 0000000..fe61c21 --- /dev/null +++ b/commands/movesong.js @@ -0,0 +1,53 @@ +// Copyright 2020 Emily J. / mudkipscience and contributors. Subject to the AGPLv3 license. + +exports.conf = { + enabled: true, + guildOnly: true, + aliases: [], + permLevel: 'User', + requiredPerms: [], + cooldown: 2000 +} + +exports.help = { + name: 'movesong', + category: 'Music', + description: 'Moves a song to a new position in the queue.', + usage: 'movesong [current position] [new position]', + parameters: '[current position] - The current position of the song you want to move' +} + +const { getGuild } = require('../utils/music') +module.exports.run = (client, message, args, level) => { + const queue = getGuild(message.guild.id).queue + const oldPosition = +args[0] + const newPosition = +args[1] + const songName = queue[oldPosition].video.title + + if (queue.length < 3) { + return message.channel.send('<:error:466995152976871434> Not enough songs are in the queue for this command to work!') + } + + if (!args[0]) { + return message.channel.send(`<:error:466995152976871434> You didn't tell me what song to move! Usage: \`${client.commands.get('removesong').help.usage}\``) + } + + if (!args[1]) { + return message.channel.send(`<:error:466995152976871434> You didn't tell me what position in the queue you want to move this song to! Usage: \`${client.commands.get('removesong').help.usage}\``) + } + + if (isNaN(oldPosition) === true || isNaN(newPosition) === true) { + return message.channel.send('That isn\'t a number! You need to tell me the songs position in the queue (1, 2, etc.)') + } + + if (newPosition >= queue.length) { + var k = newPosition - queue.length + 1 + while (k--) { + queue.push(undefined) + } + } + + queue.splice(newPosition, 0, queue.splice(oldPosition, 1)[0]) + + message.channel.send(`Moved **${songName}** from position \`${oldPosition}\` to \`${newPosition}\``) +} diff --git a/commands/shuffle.js b/commands/shuffle.js index 368586d..a574933 100644 --- a/commands/shuffle.js +++ b/commands/shuffle.js @@ -10,11 +10,32 @@ exports.conf = { } exports.help = { - name: 'removesong', + name: 'shuffle', category: 'Music', - description: 'Removes a song from the queue.', - usage: 'removesong [position]', - parameters: '[position] - The position of the song you want to remove' + description: 'Mixes up the songs in the queue', + usage: 'shuffle', + parameters: '' } -const { getGuild } = require('../utils/music') \ No newline at end of file +const { getGuild } = require('../utils/music') +module.exports.run = (client, message, args, level) => { + var queue = getGuild(message.guild.id).queue + + if (queue.length < 3) { + return message.channel.send('Not enough songs are in the queue for this command to work!') + } + + let j, x, i + + for (i = queue.length - 1; i > 0; i--) { + if (i > 1) { + console.log(i) + j = Math.floor(Math.random() * (i + 1)) + x = queue[i] + queue[i] = queue[j] + queue[j] = x + } + } + + message.channel.send('Queue shuffled!') +} diff --git a/utils/music.js b/utils/music.js index 9b1244b..c36c5d0 100644 --- a/utils/music.js +++ b/utils/music.js @@ -162,7 +162,7 @@ exports.play = async function (client, message, query, ignoreQueue) { guild.queue.push({ video: video, requestedBy: message.author }) } - // Figure out if the bot should add it to queue or play it right now + // Figure out if the bot should add it to queue or play it right now if (guild.playing) { message.reply('added **' + video.title + '** to the queue') } else { From 6d5d4765288dbcd20cbef89f0b428fb37b5091e8 Mon Sep 17 00:00:00 2001 From: mudkipscience Date: Wed, 22 Apr 2020 14:50:00 +1000 Subject: [PATCH 127/156] music stuff, added reload --- commands/movesong.js | 34 ++++++++++++++++++++++++---------- commands/reload.js | 32 ++++++++++++++++++++++++++++++++ commands/shuffle.js | 15 +++++++-------- utils/music.js | 1 - 4 files changed, 63 insertions(+), 19 deletions(-) create mode 100644 commands/reload.js diff --git a/commands/movesong.js b/commands/movesong.js index fe61c21..363e900 100644 --- a/commands/movesong.js +++ b/commands/movesong.js @@ -20,31 +20,45 @@ exports.help = { const { getGuild } = require('../utils/music') module.exports.run = (client, message, args, level) => { const queue = getGuild(message.guild.id).queue - const oldPosition = +args[0] - const newPosition = +args[1] - const songName = queue[oldPosition].video.title if (queue.length < 3) { return message.channel.send('<:error:466995152976871434> Not enough songs are in the queue for this command to work!') } if (!args[0]) { - return message.channel.send(`<:error:466995152976871434> You didn't tell me what song to move! Usage: \`${client.commands.get('removesong').help.usage}\``) + return client.userError(message, exports, 'Missing argument, the `current position` argument is required!') } if (!args[1]) { - return message.channel.send(`<:error:466995152976871434> You didn't tell me what position in the queue you want to move this song to! Usage: \`${client.commands.get('removesong').help.usage}\``) + return client.userError(message, exports, 'Missing argument, the `new position` argument is required!') } - if (isNaN(oldPosition) === true || isNaN(newPosition) === true) { + const oldPosition = +args[0] + const newPosition = +args[1] + const songName = queue[oldPosition].video.title + + if (isNaN(oldPosition) === true) { return message.channel.send('That isn\'t a number! You need to tell me the songs position in the queue (1, 2, etc.)') } + if (isNaN(newPosition) === true) { + return message.channel.send('That isn\'t a number! You need to tell me the songs position in the queue (1, 2, etc.)') + } + + if (oldPosition < 1) { + return message.channel.send('This number is too low!') + } + + if (newPosition < 1) { + return message.channel.send('This number is too low!') + } + + if (oldPosition >= queue.length) { + return message.channel.send('This number is too high!') + } + if (newPosition >= queue.length) { - var k = newPosition - queue.length + 1 - while (k--) { - queue.push(undefined) - } + return message.channel.send('This number is too high!') } queue.splice(newPosition, 0, queue.splice(oldPosition, 1)[0]) diff --git a/commands/reload.js b/commands/reload.js new file mode 100644 index 0000000..3de7af1 --- /dev/null +++ b/commands/reload.js @@ -0,0 +1,32 @@ +exports.conf = { + enabled: true, + guildOnly: false, + aliases: [], + permLevel: 'Developer', + requiredPerms: [], + cooldown: 2000 +} + +exports.help = { + name: 'reload', + category: 'Developer', + description: 'Reloads a command without having to restart the whole bot.', + usage: 'reload [command]', + parameters: '[command] - command you want to reload' +} + +exports.run = async (client, message, args) => { // eslint-disable-line no-unused-vars + if (!args || args.length < 1) { + return message.channel.send( + `<:error:466995152976871434> You must provide a command to reload! Usage: \`${client.commands.get('reload').help.usage}\`` + ) + } + + let response = await client.unloadCommand(args[0]) + if (response) return message.channel.send(`<:error:466995152976871434> Error unloading: ${response}`) + + response = client.loadCommand(args[0]) + if (response) return message.channel.send(`<:error:466995152976871434> Error loading: ${response}`) + + message.channel.send(`<:success:466995111885144095> \`${args[0]}\` has been reloaded!`) +} diff --git a/commands/shuffle.js b/commands/shuffle.js index a574933..18edaca 100644 --- a/commands/shuffle.js +++ b/commands/shuffle.js @@ -27,14 +27,13 @@ module.exports.run = (client, message, args, level) => { let j, x, i - for (i = queue.length - 1; i > 0; i--) { - if (i > 1) { - console.log(i) - j = Math.floor(Math.random() * (i + 1)) - x = queue[i] - queue[i] = queue[j] - queue[j] = x - } + // Make it so it shuffles all elements EXCEPT [0] + + for (i = queue.length - 1; i > 1; i--) { + j = Math.floor(Math.random() * (i + 1)) + x = queue[i] + queue[i] = queue[j] + queue[j] = x } message.channel.send('Queue shuffled!') diff --git a/utils/music.js b/utils/music.js index c36c5d0..d5747d4 100644 --- a/utils/music.js +++ b/utils/music.js @@ -169,7 +169,6 @@ exports.play = async function (client, message, query, ignoreQueue) { guild.playing = true guild.voiceChannel = vc - console.log(vc) const connection = await vc.join() From 4d97bc1ad0af5ca8dc9ebc01987435c83dc37ec0 Mon Sep 17 00:00:00 2001 From: mudkipscience Date: Wed, 22 Apr 2020 16:54:55 +1000 Subject: [PATCH 128/156] shuffle command now excluses the first element --- commands/shuffle.js | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/commands/shuffle.js b/commands/shuffle.js index 18edaca..01f02c2 100644 --- a/commands/shuffle.js +++ b/commands/shuffle.js @@ -25,15 +25,13 @@ module.exports.run = (client, message, args, level) => { return message.channel.send('Not enough songs are in the queue for this command to work!') } - let j, x, i - - // Make it so it shuffles all elements EXCEPT [0] - - for (i = queue.length - 1; i > 1; i--) { - j = Math.floor(Math.random() * (i + 1)) - x = queue[i] - queue[i] = queue[j] - queue[j] = x + const max = queue.length - 1 + const min = 1 + for (let i = max; i >= min; i--) { + const randomIndex = Math.floor(Math.random() * (max - min + 1)) + min + const itemAtIndex = queue[randomIndex] + queue[randomIndex] = queue[i] + queue[i] = itemAtIndex } message.channel.send('Queue shuffled!') From 69815dbdf26e1b6c4e144cd8f5e43469d29c9738 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20H?= Date: Wed, 22 Apr 2020 09:39:46 +0200 Subject: [PATCH 129/156] voice chat leave detection --- events/voiceStateUpdate.js | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 events/voiceStateUpdate.js diff --git a/events/voiceStateUpdate.js b/events/voiceStateUpdate.js new file mode 100644 index 0000000..c8118e0 --- /dev/null +++ b/events/voiceStateUpdate.js @@ -0,0 +1,13 @@ +// Copyright 2020 Emily J. / mudkipscience and contributors. Subject to the AGPLv3 license. + +const music = require('../utils/music'); + +module.exports = (client, oldState, newState) => { + if(newState.channelID != oldState.channelID) { + let guild = music.getGuild(newState.guild.id); + + if(guild.playing && guild.voiceChannel.id == oldState.channelID) { + console.log(newState.id + ' left VC, in which Woomy is playing music'); + }; + } +} \ No newline at end of file From e7ed2881394ff33b481fc210791061588100ade1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20H?= Date: Wed, 22 Apr 2020 09:49:45 +0200 Subject: [PATCH 130/156] Leave if no one is listening --- events/voiceStateUpdate.js | 26 +++++++++++++++++++++++++- utils/music.js | 1 + 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/events/voiceStateUpdate.js b/events/voiceStateUpdate.js index c8118e0..56d7fdb 100644 --- a/events/voiceStateUpdate.js +++ b/events/voiceStateUpdate.js @@ -7,7 +7,31 @@ module.exports = (client, oldState, newState) => { let guild = music.getGuild(newState.guild.id); if(guild.playing && guild.voiceChannel.id == oldState.channelID) { - console.log(newState.id + ' left VC, in which Woomy is playing music'); + if(guild.voiceChannel.members.size == 1) { + guild.autoDisconnect = true; + + setTimeout(() => { + if(guild.voiceChannel.members.size == 1 && guild.autoDisconnect) { + setTimeout(() => { + if(guild.voiceChannel.members.size == 1 && guild.autoDisconnect) { + setTimeout(() => { + if(guild.voiceChannel.members.size == 1 && guild.autoDisconnect) { + // Probably should be async? But no need here I think + guild.dispatcher.end('silent'); + guild.message.channel.send('No one is listening to me. Leaving voice chat!'); + } else { + guild.autoDisconnect = false; + }; + }, 30000); + } else { + guild.autoDisconnect = false; + }; + }, 20000); + } else { + guild.autoDisconnect = false; + }; + }, 10000); + }; }; } } \ No newline at end of file diff --git a/utils/music.js b/utils/music.js index d5747d4..bd7e1ea 100644 --- a/utils/music.js +++ b/utils/music.js @@ -66,6 +66,7 @@ exports.getVideoByQuery = async function (client, query) { exports.play = async function (client, message, query, ignoreQueue) { const guild = exports.getGuild(message.guild.id) + guild.message = message; if (!message.member.voice.channel && !guild.voiceChannel) { return message.reply('You have to be connected to a voice channel to use this command!') From 3dd36604e51c150b8dfeb816a8eac3fab86a3831 Mon Sep 17 00:00:00 2001 From: mudkipscience Date: Wed, 22 Apr 2020 17:53:41 +1000 Subject: [PATCH 131/156] songName no longer causes problems --- commands/movesong.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/commands/movesong.js b/commands/movesong.js index 363e900..c56d95e 100644 --- a/commands/movesong.js +++ b/commands/movesong.js @@ -35,7 +35,6 @@ module.exports.run = (client, message, args, level) => { const oldPosition = +args[0] const newPosition = +args[1] - const songName = queue[oldPosition].video.title if (isNaN(oldPosition) === true) { return message.channel.send('That isn\'t a number! You need to tell me the songs position in the queue (1, 2, etc.)') @@ -61,6 +60,8 @@ module.exports.run = (client, message, args, level) => { return message.channel.send('This number is too high!') } + const songName = queue[oldPosition].video.title + queue.splice(newPosition, 0, queue.splice(oldPosition, 1)[0]) message.channel.send(`Moved **${songName}** from position \`${oldPosition}\` to \`${newPosition}\``) From 3956eb6fae21eaf0ca989611900f41158d80cc13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20H?= Date: Wed, 22 Apr 2020 09:53:55 +0200 Subject: [PATCH 132/156] fix --- events/voiceStateUpdate.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/events/voiceStateUpdate.js b/events/voiceStateUpdate.js index 56d7fdb..c3c20c7 100644 --- a/events/voiceStateUpdate.js +++ b/events/voiceStateUpdate.js @@ -16,6 +16,9 @@ module.exports = (client, oldState, newState) => { if(guild.voiceChannel.members.size == 1 && guild.autoDisconnect) { setTimeout(() => { if(guild.voiceChannel.members.size == 1 && guild.autoDisconnect) { + guild.playing = false; + guild.queue = []; + // Probably should be async? But no need here I think guild.dispatcher.end('silent'); guild.message.channel.send('No one is listening to me. Leaving voice chat!'); From 7c10c5309f30102387b601a47a074ccefef81618 Mon Sep 17 00:00:00 2001 From: mudkipscience Date: Wed, 22 Apr 2020 17:58:25 +1000 Subject: [PATCH 133/156] fixed formatting --- events/voiceStateUpdate.js | 64 +++++++++++++++++++------------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/events/voiceStateUpdate.js b/events/voiceStateUpdate.js index c3c20c7..f2e0caf 100644 --- a/events/voiceStateUpdate.js +++ b/events/voiceStateUpdate.js @@ -1,40 +1,40 @@ // Copyright 2020 Emily J. / mudkipscience and contributors. Subject to the AGPLv3 license. -const music = require('../utils/music'); +const music = require('../utils/music') module.exports = (client, oldState, newState) => { - if(newState.channelID != oldState.channelID) { - let guild = music.getGuild(newState.guild.id); + if (newState.channelID !== oldState.channelID) { + const guild = music.getGuild(newState.guild.id) - if(guild.playing && guild.voiceChannel.id == oldState.channelID) { - if(guild.voiceChannel.members.size == 1) { - guild.autoDisconnect = true; - + if (guild.playing && guild.voiceChannel.id === oldState.channelID) { + if (guild.voiceChannel.members.size === 1) { + guild.autoDisconnect = true + + setTimeout(() => { + if (guild.voiceChannel.members.size === 1 && guild.autoDisconnect) { + setTimeout(() => { + if (guild.voiceChannel.members.size === 1 && guild.autoDisconnect) { setTimeout(() => { - if(guild.voiceChannel.members.size == 1 && guild.autoDisconnect) { - setTimeout(() => { - if(guild.voiceChannel.members.size == 1 && guild.autoDisconnect) { - setTimeout(() => { - if(guild.voiceChannel.members.size == 1 && guild.autoDisconnect) { - guild.playing = false; - guild.queue = []; + if (guild.voiceChannel.members.size === 1 && guild.autoDisconnect) { + guild.playing = false + guild.queue = [] - // Probably should be async? But no need here I think - guild.dispatcher.end('silent'); - guild.message.channel.send('No one is listening to me. Leaving voice chat!'); - } else { - guild.autoDisconnect = false; - }; - }, 30000); - } else { - guild.autoDisconnect = false; - }; - }, 20000); - } else { - guild.autoDisconnect = false; - }; - }, 10000); - }; - }; + // Probably should be async? But no need here I think + guild.dispatcher.end('silent') + guild.message.channel.send('No one is listening to me. Leaving voice chat!') + } else { + guild.autoDisconnect = false + } + }, 30000) + } else { + guild.autoDisconnect = false + } + }, 20000) + } else { + guild.autoDisconnect = false + } + }, 10000) + } } -} \ No newline at end of file + } +} From 6ee912244233278575fd9b794285adeadae58746 Mon Sep 17 00:00:00 2001 From: mudkipscience Date: Wed, 22 Apr 2020 18:00:19 +1000 Subject: [PATCH 134/156] linter is mean --- utils/music.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/music.js b/utils/music.js index bd7e1ea..38887c6 100644 --- a/utils/music.js +++ b/utils/music.js @@ -66,7 +66,7 @@ exports.getVideoByQuery = async function (client, query) { exports.play = async function (client, message, query, ignoreQueue) { const guild = exports.getGuild(message.guild.id) - guild.message = message; + guild.message = message if (!message.member.voice.channel && !guild.voiceChannel) { return message.reply('You have to be connected to a voice channel to use this command!') From 98612a778420d5526321f032cdde963847c369fe Mon Sep 17 00:00:00 2001 From: mudkipscience Date: Wed, 22 Apr 2020 19:00:57 +1000 Subject: [PATCH 135/156] fixed music --- commands/stop.js | 8 +++++--- events/voiceStateUpdate.js | 41 +++++++++++++++++++------------------- utils/music.js | 7 +++++++ 3 files changed, 32 insertions(+), 24 deletions(-) diff --git a/commands/stop.js b/commands/stop.js index d82baed..0259dc0 100644 --- a/commands/stop.js +++ b/commands/stop.js @@ -24,11 +24,13 @@ exports.run = async (client, message) => { if (guild.queue.length < 1 || !guild.playing || !guild.dispatcher) return message.channel.send('Nothing is playing.') if (!message.member.voice.channel) return message.channel.send('You need to be in voice channel to use this command!') + guild.dispatcher.end('silent') + + guild.queue = [] guild.playing = false guild.paused = false - guild.queue = [] - - guild.dispatcher.end('silent') + guild.dispatcher = null + guild.skippers = [] message.channel.send('Playback stopped!') } diff --git a/events/voiceStateUpdate.js b/events/voiceStateUpdate.js index f2e0caf..9850f01 100644 --- a/events/voiceStateUpdate.js +++ b/events/voiceStateUpdate.js @@ -7,33 +7,32 @@ module.exports = (client, oldState, newState) => { const guild = music.getGuild(newState.guild.id) if (guild.playing && guild.voiceChannel.id === oldState.channelID) { - if (guild.voiceChannel.members.size === 1) { + if (guild.voiceChannel.members.filter(member => !member.user.bot).size < 1) { guild.autoDisconnect = true - setTimeout(() => { - if (guild.voiceChannel.members.size === 1 && guild.autoDisconnect) { - setTimeout(() => { - if (guild.voiceChannel.members.size === 1 && guild.autoDisconnect) { - setTimeout(() => { - if (guild.voiceChannel.members.size === 1 && guild.autoDisconnect) { - guild.playing = false - guild.queue = [] + guild.message.channel.send(`The music will end in 2 minutes if nobody rejoins **${guild.voiceChannel.name}**`) + .then(msg => { + msg.delete({ timeout: 120000 }) + }) - // Probably should be async? But no need here I think - guild.dispatcher.end('silent') - guild.message.channel.send('No one is listening to me. Leaving voice chat!') - } else { - guild.autoDisconnect = false - } - }, 30000) - } else { - guild.autoDisconnect = false - } - }, 20000) + setTimeout(() => { + if (guild.dispatcher !== null && guild.voiceChannel.members.filter(member => !member.user.bot).size < 1 && guild.autoDisconnect) { + // Probably should be async? But no need here I think + guild.dispatcher.end('silent') + + guild.queue = [] + guild.playing = false + guild.paused = false + guild.dispatcher = null + guild.skippers = [] + + guild.message.channel.send('The music has ended because no one was listening to me ;~;') } else { guild.autoDisconnect = false } - }, 10000) + }, 120000) + } else { + guild.autoDisconnect = false } } } diff --git a/utils/music.js b/utils/music.js index 38887c6..d08be5d 100644 --- a/utils/music.js +++ b/utils/music.js @@ -93,8 +93,11 @@ exports.play = async function (client, message, query, ignoreQueue) { // Fix the bot if somehow broken // music "playing", nothing in queue if ((guild.playing || guild.dispatcher) && guild.queue.length === 0) { + guild.queue = [] guild.playing = false + guild.paused = false guild.dispatcher = null + guild.skippers = [] // music not playing, something is in queue } else if (!guild.playing && !guild.dispatcher && guild.queue.length > 0) { guild.queue = [] @@ -188,7 +191,11 @@ exports.play = async function (client, message, query, ignoreQueue) { if (guild.queue.length > 0) { exports.play(client, message, null, true) } else { + guild.queue = [] + guild.playing = false + guild.paused = false guild.dispatcher = null + guild.skippers = [] connection.disconnect() } From be16d511e24e3aa3b3fc0388eff23ea68cc9862b Mon Sep 17 00:00:00 2001 From: mudkipscience Date: Wed, 22 Apr 2020 19:18:14 +1000 Subject: [PATCH 136/156] being force-disconnected from vc no longer breaks --- commands/stop.js | 1 - events/voiceStateUpdate.js | 9 +++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/commands/stop.js b/commands/stop.js index 0259dc0..ccad10d 100644 --- a/commands/stop.js +++ b/commands/stop.js @@ -29,7 +29,6 @@ exports.run = async (client, message) => { guild.queue = [] guild.playing = false guild.paused = false - guild.dispatcher = null guild.skippers = [] message.channel.send('Playback stopped!') diff --git a/events/voiceStateUpdate.js b/events/voiceStateUpdate.js index 9850f01..d252946 100644 --- a/events/voiceStateUpdate.js +++ b/events/voiceStateUpdate.js @@ -6,6 +6,15 @@ module.exports = (client, oldState, newState) => { if (newState.channelID !== oldState.channelID) { const guild = music.getGuild(newState.guild.id) + // Reset queue, dispatcher, etc if Woomy is forcibly disconnected from the queue + if (!guild.voiceChannel.members.get(client.user.id) && guild.queue.length > 0) { + guild.queue = [] + guild.playing = false + guild.paused = false + guild.skippers = [] + } + + // Auto-disconnect feature if (guild.playing && guild.voiceChannel.id === oldState.channelID) { if (guild.voiceChannel.members.filter(member => !member.user.bot).size < 1) { guild.autoDisconnect = true From 888a2fc6ef99ee90e558e11807f06aaf2d1e311d Mon Sep 17 00:00:00 2001 From: mudkipscience Date: Wed, 22 Apr 2020 19:30:19 +1000 Subject: [PATCH 137/156] removed useless stuff --- utils/music.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/utils/music.js b/utils/music.js index d08be5d..3e474b0 100644 --- a/utils/music.js +++ b/utils/music.js @@ -96,7 +96,6 @@ exports.play = async function (client, message, query, ignoreQueue) { guild.queue = [] guild.playing = false guild.paused = false - guild.dispatcher = null guild.skippers = [] // music not playing, something is in queue } else if (!guild.playing && !guild.dispatcher && guild.queue.length > 0) { @@ -194,7 +193,6 @@ exports.play = async function (client, message, query, ignoreQueue) { guild.queue = [] guild.playing = false guild.paused = false - guild.dispatcher = null guild.skippers = [] connection.disconnect() From 6ea766ed1d5c4e993cf9fbf902ccaf3ba226f9f0 Mon Sep 17 00:00:00 2001 From: mudkipscience Date: Wed, 22 Apr 2020 22:57:22 +1000 Subject: [PATCH 138/156] reordered functions --- utils/_functions.js | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/utils/_functions.js b/utils/_functions.js index be9d121..4d01421 100644 --- a/utils/_functions.js +++ b/utils/_functions.js @@ -152,25 +152,6 @@ module.exports = client => { return role } - // Loads commands - client.loadCommand = (commandName) => { - try { - const props = require(`../commands/${commandName}`) - if (props.init) { - props.init(client) - } - client.commands.set(props.help.name, props) - // So commands can each have their own cooldown time - client.cooldown.set(props.help.name, new Map()) - props.conf.aliases.forEach(alias => { - client.aliases.set(alias, props.help.name) - }) - return false - } catch (e) { - return `Failed to load ${commandName}: ${e}` - } - } - // Permission level function client.permlevel = (message, settings) => { let permlvl = 0 @@ -256,6 +237,25 @@ module.exports = client => { } } + // Loads commands + client.loadCommand = (commandName) => { + try { + const props = require(`../commands/${commandName}`) + if (props.init) { + props.init(client) + } + client.commands.set(props.help.name, props) + // So commands can each have their own cooldown time + client.cooldown.set(props.help.name, new Map()) + props.conf.aliases.forEach(alias => { + client.aliases.set(alias, props.help.name) + }) + return false + } catch (e) { + return `Failed to load ${commandName}: ${e}` + } + } + // Command unloader client.unloadCommand = async (commandName) => { let command From 2f5534524d6368153f5d410890a38230650c29c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20H?= Date: Wed, 22 Apr 2020 17:43:23 +0200 Subject: [PATCH 139/156] restart command --- commands/restart.js | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 commands/restart.js diff --git a/commands/restart.js b/commands/restart.js new file mode 100644 index 0000000..6eab30f --- /dev/null +++ b/commands/restart.js @@ -0,0 +1,30 @@ +exports.conf = { + enabled: true, + guildOnly: false, + aliases: [], + permLevel: 'Developer', + requiredPerms: [], + cooldown: 2000 +} + +exports.help = { + name: 'restart', + category: 'Developer', + description: 'Restarts the bot.', + usage: 'restart', + parameters: '' +} + +exports.run = async (client, message) => {// eslint-disable-line no-unused-vars + // This actually shuts down the bot, you'll need to use something like pm2 to get it to restart + + await message.channel.send("<:reboot:467216876938985482> Restarting..."); + + /* + client.commands.forEach( async cmd => { + await client.unloadCommand(cmd); + }); + */ + + process.exit(1); +}; \ No newline at end of file From 8373194feb1dfd36737ffeca4828888420a6ff5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20H?= Date: Wed, 22 Apr 2020 17:53:12 +0200 Subject: [PATCH 140/156] do not hardcode 8ball responses --- assets/json/8ball.json | 14 ++++++++++++++ commands/8ball.js | 13 +------------ 2 files changed, 15 insertions(+), 12 deletions(-) create mode 100644 assets/json/8ball.json diff --git a/assets/json/8ball.json b/assets/json/8ball.json new file mode 100644 index 0000000..0590ca3 --- /dev/null +++ b/assets/json/8ball.json @@ -0,0 +1,14 @@ +{ + "responses": [ + "No darndested clue.", + "¯\\_(ツ)_/¯", + "Stupid question. You should be ashamed of yourself for even asking.", + "Yes!", + "Not in your wildest dreams!", + "No chance.", + "Never.", + "Possibly.", + "There\"s a high chance.", + "I\"d rather not say." + ] +} \ No newline at end of file diff --git a/commands/8ball.js b/commands/8ball.js index 869c627..0608457 100644 --- a/commands/8ball.js +++ b/commands/8ball.js @@ -17,19 +17,8 @@ exports.help = { parameters: '`question` - the question you want to ask' } +const responses = require('../assets/json/8ball.json').responses exports.run = async (client, message, args, level, data) => { // Finish later - const responses = [ - 'No darndested clue.', - '¯\\_(ツ)_/¯', - 'Stupid question. You should be ashamed of yourself for even asking.', - 'Yes!', - 'Not in your wildest dreams!', - 'No chance.', - 'Never.', - 'Possibly.', - 'There\'s a high chance.', - 'I\'d rather not say.' - ] } From ecb9004ec8c591b34e3c93460ed69b9a5ed30e81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20H?= Date: Wed, 22 Apr 2020 17:55:10 +0200 Subject: [PATCH 141/156] fix volume displaying actual volume instead of user volume --- commands/volume.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/commands/volume.js b/commands/volume.js index 67ef589..c548a49 100644 --- a/commands/volume.js +++ b/commands/volume.js @@ -19,17 +19,17 @@ exports.help = { const { setVolume } = require('../utils/music') exports.run = async (client, message, args, level, data) => { - let vol = args[0] + let userVolume = args[0] if (vol) { - vol = Number(vol) + userVolume = Number(vol) - vol = vol / 100 * 0.5 + let vol = userVolume / 100 * 0.25 if (vol <= 1) { setVolume(message.guild, vol) - message.reply('set volume to ' + vol * 100 + '%') + message.reply('set volume to ' + userVolume * 100 + '%') } } } From a048d94cd0cac0ce9ee06ae23f08fb739f814bf7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20H?= Date: Wed, 22 Apr 2020 18:00:52 +0200 Subject: [PATCH 142/156] replace missing config values from config template --- index.js | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/index.js b/index.js index 73cb202..a36d2fa 100644 --- a/index.js +++ b/index.js @@ -21,12 +21,22 @@ const sentry = require('@sentry/node') const client = new Discord.Client({ disabledEvents: ['TYPING_START'] }) // Load all our useful utilities +client.configTemplate = require('./configTemplate') client.config = require('./config') client.version = require('./version.json') client.db = require('./utils/mongoose') client.logger = require('./utils/logger') require('./utils/_functions')(client) +// Set missing values in config from config template +for(let c in client.configTemplate) { + if(typeof client.config[c] == 'undefined') { + client.logger.warn('Config value missing: ' + String(c)) + + client.config[c] = client.configTemplate[c] + } +} + if (typeof client.config.devmode !== 'undefined') { // Check if devmode is explicitly overridden client.devmode = client.config.devmode } else { // Check if Woomy is running inside a Docker From 78aab0f9f656391d351124ccc5f6eb62e9b0f49c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20H?= Date: Wed, 22 Apr 2020 18:04:44 +0200 Subject: [PATCH 143/156] auto-update config prepartion --- configTemplate.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/configTemplate.js b/configTemplate.js index 14c8d39..26a068b 100644 --- a/configTemplate.js +++ b/configTemplate.js @@ -6,6 +6,14 @@ const config = { // Bot name botName: '', + // Auto-update from git (WIP) + autoUpdate: { + enabled: false, // enable auto-update + branch: 'next', // git branch + autoFetch: false, // check if an update is available and automatically restart and update + fetchInterval: 60000, // auto-fetch interval in milliseconds + }, + // API keys that are required for some features/commands keys: { dbl: '', // top.gg key From 8ed2c5948fb40448b121ac3cb0101bbde055e54a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20H?= Date: Thu, 23 Apr 2020 17:15:48 +0200 Subject: [PATCH 144/156] part of movehere --- commands/movehere.js | 57 ++++++++++++++++++++++++++++++++++++++++++++ utils/music.js | 3 ++- 2 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 commands/movehere.js diff --git a/commands/movehere.js b/commands/movehere.js new file mode 100644 index 0000000..36c1142 --- /dev/null +++ b/commands/movehere.js @@ -0,0 +1,57 @@ +// Copyright 2020 Emily J. / mudkipscience and contributors. Subject to the AGPLv3 license. + +exports.conf = { + enabled: true, + guildOnly: true, + aliases: [], + permLevel: 'Moderator', + requiredPerms: ['CONNECT', 'SPEAK'], + cooldown: 10000 +} + +exports.help = { + name: 'movehere', + category: 'Music', + description: 'Moves ' + client.config.botName + ' into your voice channel and/or text channel.', + usage: 'movehere', + parameters: '' +} + +const music = require('../utils/music') +exports.run = async (client, message, args, level, data) => { + // get guild music data + let mGuild = music.getGuild(message.guild.id) + + if(!mGuild.playing) { + return message.channel.send('<:error:466995152976871434> Nothing is playing.') + } + + // change text channel + let textChannelChanged = false + + if(mGuild.channel.id != message.channel.id) { + mGuild.channel = message.channel + + textChannelChanged = true + } + + // move to another voice channel + let voiceChannelMoved = false + + if(message.voice.channel && mGuild.voiceChannel && (message.voice.channel != mGuild.voiceChannel.id)) { + // TODO: this + + voiceChannelMoved = true + } + + // response + if(textChannelChanged && voiceChannelMoved) { + return message.channel.send('<:success:466995111885144095> Music playback moved to your voice channel and music messages to your text channel.') + } else if(textChannelChanged) { + return message.channel.send('<:success:466995111885144095> Music module will send messages to your text channel.') + } else if(voiceChannelMoved) { + return message.channel.send('<:success:466995111885144095> Music playback moved to your voice channel.') + } else { + return message.channel.send('<:error:466995152976871434> Music is already playing in your voice channel!') + } +} diff --git a/utils/music.js b/utils/music.js index 3e474b0..76de2f2 100644 --- a/utils/music.js +++ b/utils/music.js @@ -172,6 +172,7 @@ exports.play = async function (client, message, query, ignoreQueue) { guild.playing = true guild.voiceChannel = vc + guild.channel = message.channel const connection = await vc.join() @@ -180,7 +181,7 @@ exports.play = async function (client, message, query, ignoreQueue) { guild.dispatcher = connection.play(await ytdl(exports.getLinkFromID(v.video.videoId), { highWaterMark: 1024 * 1024 * 32 }), { type: 'opus' }) guild.dispatcher.setVolume(0.25) - message.channel.send('Playing **' + v.video.title + '**') + guild.channel.send('Playing **' + v.video.title + '**') // play next in queue on end guild.dispatcher.once('finish', () => { From 1f73cf351fd9e113badee5e8aa121d93f48f7992 Mon Sep 17 00:00:00 2001 From: mudkipscience Date: Fri, 24 Apr 2020 17:50:54 +1000 Subject: [PATCH 145/156] more music stuff --- commands/defaultvolume.js | 36 ++++++++++++++++++++++++++++++++++++ commands/play.js | 2 +- commands/pride.js | 2 +- models/guild.js | 8 +++++--- utils/music.js | 6 +++--- 5 files changed, 46 insertions(+), 8 deletions(-) create mode 100644 commands/defaultvolume.js diff --git a/commands/defaultvolume.js b/commands/defaultvolume.js new file mode 100644 index 0000000..e7575f2 --- /dev/null +++ b/commands/defaultvolume.js @@ -0,0 +1,36 @@ +// Copyright 2020 Emily J. / mudkipscience and contributors. Subject to the AGPLv3 license. + +exports.conf = { + enabled: true, + guildOnly: true, + aliases: [], + permLevel: 'Administrator', + requiredPerms: [], + cooldown: 5000 // miliseconds +} + +exports.help = { + name: 'defaultvolume', + category: 'Music', + description: 'Change the default volume Woomy plays music at.', + usage: 'volume [volume]', + params: '[volume] - what you want to set the default volume to' +} + +exports.run = async (client, message, args, level, data) => { + const prefix = args.join(' ') + + if (!prefix) { + return message.channel.send(`Current server prefix: \`${data.guild.prefix}\``) + } + + if (prefix.toLowerCase() === 'reset') { + await client.updateGuild(message.guild, { prefix: client.config.defaultPrefix }) + + return message.channel.send('Server prefix has been reset.') + } + + await client.updateGuild(message.guild, { prefix: prefix }) + + message.channel.send(`The server prefix has been updated: \`${prefix}\``) +} diff --git a/commands/play.js b/commands/play.js index 346b0f3..63313a8 100644 --- a/commands/play.js +++ b/commands/play.js @@ -19,5 +19,5 @@ exports.help = { const { play } = require('../utils/music') exports.run = async (client, message, args, level, data) => { - await play(client, message, args.join(' ')) + await play(client, data.guild.music, message, args.join(' ')) } diff --git a/commands/pride.js b/commands/pride.js index 5178a90..e1e06ed 100644 --- a/commands/pride.js +++ b/commands/pride.js @@ -12,7 +12,7 @@ exports.conf = { exports.help = { name: 'pride', category: 'Fun', - description: 'Adds a pride flag ring to your avatar. Available flags are lesbian, gay, bisexual, pansexual, trans, asexual, aromantic and ally. Generator created by [Demirramon.](https://demirramon.com/)', + description: 'Adds a pride flag ring to your avatar. Available flags are lesbian, gay, bisexual, pansexual, trans, asexual, aromantic and ally.', usage: '`pride [flag]` - Adds a pride flag overlay to your avatar.\n`pride -g [flag]` - Adds a pride flag gradient on your avatar.', parameters: '`flag` - What flag you want to add to your avatar (options listed above)\n`-g` - Add this to the start of the command to turn the flag into a gradient.' } diff --git a/models/guild.js b/models/guild.js index 1712da2..9482faf 100644 --- a/models/guild.js +++ b/models/guild.js @@ -38,9 +38,11 @@ module.exports = model('Guild', new Schema({ } }, - autoplay: { - type: Boolean, - default: false + music: { + type: Object, + default: { + defaultVolume: 0.25 + } }, plugins: { diff --git a/utils/music.js b/utils/music.js index 3e474b0..bbb7589 100644 --- a/utils/music.js +++ b/utils/music.js @@ -64,7 +64,7 @@ exports.getVideoByQuery = async function (client, query) { } } -exports.play = async function (client, message, query, ignoreQueue) { +exports.play = async function (client, data, message, query, ignoreQueue) { const guild = exports.getGuild(message.guild.id) guild.message = message @@ -178,7 +178,7 @@ exports.play = async function (client, message, query, ignoreQueue) { const v = guild.queue[0] guild.dispatcher = connection.play(await ytdl(exports.getLinkFromID(v.video.videoId), { highWaterMark: 1024 * 1024 * 32 }), { type: 'opus' }) - guild.dispatcher.setVolume(0.25) + guild.dispatcher.setVolume(data.defaultVolume) message.channel.send('Playing **' + v.video.title + '**') @@ -188,7 +188,7 @@ exports.play = async function (client, message, query, ignoreQueue) { guild.playing = false if (guild.queue.length > 0) { - exports.play(client, message, null, true) + exports.play(client, data, message, null, true) } else { guild.queue = [] guild.playing = false From e73301f87d2ee835b647e565a5ae95646af82ae0 Mon Sep 17 00:00:00 2001 From: amber Date: Fri, 24 Apr 2020 20:06:17 +0100 Subject: [PATCH 146/156] fixing style + an error --- commands/8ball.js | 1 + commands/movehere.js | 16 ++++++++-------- commands/restart.js | 30 +++++++++++++++--------------- commands/volume.js | 12 ++++++------ configTemplate.js | 2 +- index.js | 5 ++--- 6 files changed, 33 insertions(+), 33 deletions(-) diff --git a/commands/8ball.js b/commands/8ball.js index 0608457..6012c49 100644 --- a/commands/8ball.js +++ b/commands/8ball.js @@ -17,6 +17,7 @@ exports.help = { parameters: '`question` - the question you want to ask' } +// eslint-disable-next-line no-unused-vars const responses = require('../assets/json/8ball.json').responses exports.run = async (client, message, args, level, data) => { diff --git a/commands/movehere.js b/commands/movehere.js index 36c1142..b96b011 100644 --- a/commands/movehere.js +++ b/commands/movehere.js @@ -12,7 +12,7 @@ exports.conf = { exports.help = { name: 'movehere', category: 'Music', - description: 'Moves ' + client.config.botName + ' into your voice channel and/or text channel.', + description: 'Moves the bot into your voice channel and/or text channel.', usage: 'movehere', parameters: '' } @@ -20,16 +20,16 @@ exports.help = { const music = require('../utils/music') exports.run = async (client, message, args, level, data) => { // get guild music data - let mGuild = music.getGuild(message.guild.id) + const mGuild = music.getGuild(message.guild.id) - if(!mGuild.playing) { + if (!mGuild.playing) { return message.channel.send('<:error:466995152976871434> Nothing is playing.') } // change text channel let textChannelChanged = false - if(mGuild.channel.id != message.channel.id) { + if (mGuild.channel.id !== message.channel.id) { mGuild.channel = message.channel textChannelChanged = true @@ -38,18 +38,18 @@ exports.run = async (client, message, args, level, data) => { // move to another voice channel let voiceChannelMoved = false - if(message.voice.channel && mGuild.voiceChannel && (message.voice.channel != mGuild.voiceChannel.id)) { + if (message.voice.channel && mGuild.voiceChannel && (message.voice.channel !== mGuild.voiceChannel.id)) { // TODO: this voiceChannelMoved = true } // response - if(textChannelChanged && voiceChannelMoved) { + if (textChannelChanged && voiceChannelMoved) { return message.channel.send('<:success:466995111885144095> Music playback moved to your voice channel and music messages to your text channel.') - } else if(textChannelChanged) { + } else if (textChannelChanged) { return message.channel.send('<:success:466995111885144095> Music module will send messages to your text channel.') - } else if(voiceChannelMoved) { + } else if (voiceChannelMoved) { return message.channel.send('<:success:466995111885144095> Music playback moved to your voice channel.') } else { return message.channel.send('<:error:466995152976871434> Music is already playing in your voice channel!') diff --git a/commands/restart.js b/commands/restart.js index 6eab30f..05bc222 100644 --- a/commands/restart.js +++ b/commands/restart.js @@ -1,24 +1,24 @@ exports.conf = { - enabled: true, - guildOnly: false, - aliases: [], - permLevel: 'Developer', - requiredPerms: [], - cooldown: 2000 + enabled: true, + guildOnly: false, + aliases: [], + permLevel: 'Developer', + requiredPerms: [], + cooldown: 2000 } exports.help = { - name: 'restart', - category: 'Developer', - description: 'Restarts the bot.', - usage: 'restart', - parameters: '' + name: 'restart', + category: 'Developer', + description: 'Restarts the bot.', + usage: 'restart', + parameters: '' } -exports.run = async (client, message) => {// eslint-disable-line no-unused-vars +exports.run = async (client, message) => { // eslint-disable-line no-unused-vars // This actually shuts down the bot, you'll need to use something like pm2 to get it to restart - await message.channel.send("<:reboot:467216876938985482> Restarting..."); + await message.channel.send('<:reboot:467216876938985482> Restarting...') /* client.commands.forEach( async cmd => { @@ -26,5 +26,5 @@ exports.run = async (client, message) => {// eslint-disable-line no-unused-vars }); */ - process.exit(1); -}; \ No newline at end of file + process.exit(1) +} diff --git a/commands/volume.js b/commands/volume.js index c548a49..168c89a 100644 --- a/commands/volume.js +++ b/commands/volume.js @@ -21,15 +21,15 @@ const { setVolume } = require('../utils/music') exports.run = async (client, message, args, level, data) => { let userVolume = args[0] - if (vol) { - userVolume = Number(vol) + if (userVolume) { + userVolume = Number(userVolume) - let vol = userVolume / 100 * 0.25 + userVolume = userVolume / 100 * 0.25 - if (vol <= 1) { - setVolume(message.guild, vol) + if (userVolume <= 1) { + setVolume(message.guild, userVolume) - message.reply('set volume to ' + userVolume * 100 + '%') + message.reply('<:success:466995111885144095> Set volume to ' + userVolume * 100 + '%') } } } diff --git a/configTemplate.js b/configTemplate.js index 26a068b..cb4d4fc 100644 --- a/configTemplate.js +++ b/configTemplate.js @@ -11,7 +11,7 @@ const config = { enabled: false, // enable auto-update branch: 'next', // git branch autoFetch: false, // check if an update is available and automatically restart and update - fetchInterval: 60000, // auto-fetch interval in milliseconds + fetchInterval: 60000 // auto-fetch interval in milliseconds }, // API keys that are required for some features/commands diff --git a/index.js b/index.js index a36d2fa..4ee7d7c 100644 --- a/index.js +++ b/index.js @@ -29,10 +29,9 @@ client.logger = require('./utils/logger') require('./utils/_functions')(client) // Set missing values in config from config template -for(let c in client.configTemplate) { - if(typeof client.config[c] == 'undefined') { +for (const c in client.configTemplate) { + if (typeof client.config[c] === 'undefined') { client.logger.warn('Config value missing: ' + String(c)) - client.config[c] = client.configTemplate[c] } } From d8b02fe9c51b531f04e0d77fd775aa4d34d8dc35 Mon Sep 17 00:00:00 2001 From: amber Date: Fri, 24 Apr 2020 20:07:49 +0100 Subject: [PATCH 147/156] a word --- index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.js b/index.js index 4ee7d7c..e6cc82a 100644 --- a/index.js +++ b/index.js @@ -38,7 +38,7 @@ for (const c in client.configTemplate) { if (typeof client.config.devmode !== 'undefined') { // Check if devmode is explicitly overridden client.devmode = client.config.devmode -} else { // Check if Woomy is running inside a Docker +} else { // Check if Woomy is running inside a Docker container if (isDocker() === false) { client.devmode = true } else { From 828a0300706d12582dfc269f3210910e3124b04a Mon Sep 17 00:00:00 2001 From: mudkipscience Date: Sun, 26 Apr 2020 18:04:19 +1000 Subject: [PATCH 148/156] stuff --- commands/defaultvolume.js | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/commands/defaultvolume.js b/commands/defaultvolume.js index e7575f2..c52e9f7 100644 --- a/commands/defaultvolume.js +++ b/commands/defaultvolume.js @@ -18,19 +18,22 @@ exports.help = { } exports.run = async (client, message, args, level, data) => { - const prefix = args.join(' ') - - if (!prefix) { - return message.channel.send(`Current server prefix: \`${data.guild.prefix}\``) + if (!args[0]) { + return message.channel.send(`Current default volume: \`${data.guild.music.defaultVolume}\``) } - if (prefix.toLowerCase() === 'reset') { + if (args[0].toLowerCase() === 'reset') { await client.updateGuild(message.guild, { prefix: client.config.defaultPrefix }) - return message.channel.send('Server prefix has been reset.') } - await client.updateGuild(message.guild, { prefix: prefix }) + const vol = +args[0] + + if (isNaN(vol) === true) { + return message.channel.send('new volume must be a number') + } + + await client.updateGuild(message.guild, { music.defaultVoume: vol }) message.channel.send(`The server prefix has been updated: \`${prefix}\``) } From fb31e369f849f43a0e4ae8863cfbc1e590c239d2 Mon Sep 17 00:00:00 2001 From: mudkipscience Date: Tue, 28 Apr 2020 19:35:11 +1000 Subject: [PATCH 149/156] a --- commands/movehere.js | 28 ++++++++++++++-------------- events/voiceStateUpdate.js | 7 ++++--- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/commands/movehere.js b/commands/movehere.js index b96b011..38636aa 100644 --- a/commands/movehere.js +++ b/commands/movehere.js @@ -4,7 +4,7 @@ exports.conf = { enabled: true, guildOnly: true, aliases: [], - permLevel: 'Moderator', + permLevel: 'User ', requiredPerms: ['CONNECT', 'SPEAK'], cooldown: 10000 } @@ -20,36 +20,36 @@ exports.help = { const music = require('../utils/music') exports.run = async (client, message, args, level, data) => { // get guild music data - const mGuild = music.getGuild(message.guild.id) + const guild = music.getGuild(message.guild.id) - if (!mGuild.playing) { + if (!guild.playing) { return message.channel.send('<:error:466995152976871434> Nothing is playing.') } - // change text channel let textChannelChanged = false + let voiceChannelChanged = false - if (mGuild.channel.id !== message.channel.id) { - mGuild.channel = message.channel + // change text channel + if (guild.channel.id !== message.channel.id) { + guild.channel = message.channel textChannelChanged = true } // move to another voice channel - let voiceChannelMoved = false - - if (message.voice.channel && mGuild.voiceChannel && (message.voice.channel !== mGuild.voiceChannel.id)) { - // TODO: this - - voiceChannelMoved = true + if (message.member.voice.channel && guild.voiceChannel && (message.member.voice.channel !== guild.voiceChannel.id)) { + guild.voiceChannel.leave() + guild.voiceChannel = message.member.voice.channel + guild.voiceChannel.join() + voiceChannelChanged = true } // response - if (textChannelChanged && voiceChannelMoved) { + if (textChannelChanged && voiceChannelChanged) { return message.channel.send('<:success:466995111885144095> Music playback moved to your voice channel and music messages to your text channel.') } else if (textChannelChanged) { return message.channel.send('<:success:466995111885144095> Music module will send messages to your text channel.') - } else if (voiceChannelMoved) { + } else if (voiceChannelChanged) { return message.channel.send('<:success:466995111885144095> Music playback moved to your voice channel.') } else { return message.channel.send('<:error:466995152976871434> Music is already playing in your voice channel!') diff --git a/events/voiceStateUpdate.js b/events/voiceStateUpdate.js index d252946..0c06e62 100644 --- a/events/voiceStateUpdate.js +++ b/events/voiceStateUpdate.js @@ -6,16 +6,17 @@ module.exports = (client, oldState, newState) => { if (newState.channelID !== oldState.channelID) { const guild = music.getGuild(newState.guild.id) - // Reset queue, dispatcher, etc if Woomy is forcibly disconnected from the queue - if (!guild.voiceChannel.members.get(client.user.id) && guild.queue.length > 0) { + /* Reset queue, dispatcher, etc if Woomy is forcibly disconnected from the queue + if (guild.voiceChannel && !guild.voiceChannel.members.get(client.user.id) && guild.queue.length > 0) { guild.queue = [] guild.playing = false guild.paused = false guild.skippers = [] } + */ // Auto-disconnect feature - if (guild.playing && guild.voiceChannel.id === oldState.channelID) { + if (guild.playing && guild.Channel && guild.voiceChannel.id === oldState.channelID) { if (guild.voiceChannel.members.filter(member => !member.user.bot).size < 1) { guild.autoDisconnect = true From 16f540de8170f715a5ca87518ddb13215a691fc5 Mon Sep 17 00:00:00 2001 From: mudkipscience Date: Wed, 29 Apr 2020 20:59:08 +1000 Subject: [PATCH 150/156] fixed autoclear --- events/voiceStateUpdate.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/events/voiceStateUpdate.js b/events/voiceStateUpdate.js index 0c06e62..9d9afa9 100644 --- a/events/voiceStateUpdate.js +++ b/events/voiceStateUpdate.js @@ -6,17 +6,16 @@ module.exports = (client, oldState, newState) => { if (newState.channelID !== oldState.channelID) { const guild = music.getGuild(newState.guild.id) - /* Reset queue, dispatcher, etc if Woomy is forcibly disconnected from the queue + // Reset queue, dispatcher, etc if Woomy is forcibly disconnected from the queue if (guild.voiceChannel && !guild.voiceChannel.members.get(client.user.id) && guild.queue.length > 0) { guild.queue = [] guild.playing = false guild.paused = false guild.skippers = [] } - */ // Auto-disconnect feature - if (guild.playing && guild.Channel && guild.voiceChannel.id === oldState.channelID) { + if (guild.playing && guild.channel && guild.voiceChannel.id === oldState.channelID) { if (guild.voiceChannel.members.filter(member => !member.user.bot).size < 1) { guild.autoDisconnect = true From 962c1357242cb907f63227f87e4d6d8c6d42342e Mon Sep 17 00:00:00 2001 From: mudkipscience Date: Wed, 29 Apr 2020 20:59:21 +1000 Subject: [PATCH 151/156] delete defaultvolume.js --- commands/defaultvolume.js | 39 --------------------------------------- 1 file changed, 39 deletions(-) delete mode 100644 commands/defaultvolume.js diff --git a/commands/defaultvolume.js b/commands/defaultvolume.js deleted file mode 100644 index c52e9f7..0000000 --- a/commands/defaultvolume.js +++ /dev/null @@ -1,39 +0,0 @@ -// Copyright 2020 Emily J. / mudkipscience and contributors. Subject to the AGPLv3 license. - -exports.conf = { - enabled: true, - guildOnly: true, - aliases: [], - permLevel: 'Administrator', - requiredPerms: [], - cooldown: 5000 // miliseconds -} - -exports.help = { - name: 'defaultvolume', - category: 'Music', - description: 'Change the default volume Woomy plays music at.', - usage: 'volume [volume]', - params: '[volume] - what you want to set the default volume to' -} - -exports.run = async (client, message, args, level, data) => { - if (!args[0]) { - return message.channel.send(`Current default volume: \`${data.guild.music.defaultVolume}\``) - } - - if (args[0].toLowerCase() === 'reset') { - await client.updateGuild(message.guild, { prefix: client.config.defaultPrefix }) - return message.channel.send('Server prefix has been reset.') - } - - const vol = +args[0] - - if (isNaN(vol) === true) { - return message.channel.send('new volume must be a number') - } - - await client.updateGuild(message.guild, { music.defaultVoume: vol }) - - message.channel.send(`The server prefix has been updated: \`${prefix}\``) -} From cfcdf359f54df767110a17b9264989aa4159f002 Mon Sep 17 00:00:00 2001 From: mudkipscience Date: Wed, 29 Apr 2020 20:59:35 +1000 Subject: [PATCH 152/156] added playnext --- commands/playnext.js | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 commands/playnext.js diff --git a/commands/playnext.js b/commands/playnext.js new file mode 100644 index 0000000..71afda9 --- /dev/null +++ b/commands/playnext.js @@ -0,0 +1,23 @@ +// Copyright 2020 Emily J. / mudkipscience and contributors. Subject to the AGPLv3 license. + +exports.conf = { + enabled: true, + guildOnly: true, + aliases: [], + permLevel: 'User', + requiredPerms: ['CONNECT', 'SPEAK'], + cooldown: 5000 +} + +exports.help = { + name: 'playnext', + category: 'Music', + description: 'Similar to play, but adds it to the start of the queue instead of the end.', + usage: 'playnext [song]', + parameters: '[song] - The name or youtube URL of the song you want to play.' +} + +const { play } = require('../utils/music') +exports.run = async (client, message, args, level, data) => { + await play(client, data.guild.music, message, args.join(' '), true) +} From caeeafa3bb8b622246fabc98839cd39bcb8f5068 Mon Sep 17 00:00:00 2001 From: mudkipscience Date: Wed, 29 Apr 2020 20:59:58 +1000 Subject: [PATCH 153/156] update music to support playnext --- commands/play.js | 8 ++++---- utils/music.js | 15 +++++++++++---- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/commands/play.js b/commands/play.js index 63313a8..bf5ca8b 100644 --- a/commands/play.js +++ b/commands/play.js @@ -12,12 +12,12 @@ exports.conf = { exports.help = { name: 'play', category: 'Music', - description: 'Plays or adds to queue requested music.', - usage: 'play [query]', - parameters: '[query] - A query to find video by or a link to the video.' + description: 'Plays the song you request, or adds it to the queue.', + usage: 'playnext [song]', + parameters: '[song] - The name or youtube URL of the song you want to play.' } const { play } = require('../utils/music') exports.run = async (client, message, args, level, data) => { - await play(client, data.guild.music, message, args.join(' ')) + await play(client, data.guild.music, message, args.join(' '), false) } diff --git a/utils/music.js b/utils/music.js index a058f82..fa01dec 100644 --- a/utils/music.js +++ b/utils/music.js @@ -64,7 +64,7 @@ exports.getVideoByQuery = async function (client, query) { } } -exports.play = async function (client, data, message, query, ignoreQueue) { +exports.play = async function (client, data, message, query, playNext, ignoreQueue) { const guild = exports.getGuild(message.guild.id) guild.message = message @@ -162,7 +162,11 @@ exports.play = async function (client, data, message, query, ignoreQueue) { } // Add video to queue - guild.queue.push({ video: video, requestedBy: message.author }) + if (playNext === true) { + guild.queue.splice(1, 0, { video: video, requestedBy: message.author }) + } else { + guild.queue.push({ video: video, requestedBy: message.author }) + } } // Figure out if the bot should add it to queue or play it right now @@ -172,7 +176,10 @@ exports.play = async function (client, data, message, query, ignoreQueue) { guild.playing = true guild.voiceChannel = vc - guild.channel = message.channel + + if (!guild.channel) { + guild.channel = message.channel + } const connection = await vc.join() @@ -189,7 +196,7 @@ exports.play = async function (client, data, message, query, ignoreQueue) { guild.playing = false if (guild.queue.length > 0) { - exports.play(client, data, message, null, true) + exports.play(client, data, message, null, false, true) } else { guild.queue = [] guild.playing = false From a31dc025688578f47599b5660302ff0cefb8591d Mon Sep 17 00:00:00 2001 From: mudkipscience Date: Wed, 29 Apr 2020 21:00:11 +1000 Subject: [PATCH 154/156] begin polishing up music modules --- commands/movehere.js | 35 +++++++---------------------------- commands/movesong.js | 20 ++++++-------------- 2 files changed, 13 insertions(+), 42 deletions(-) diff --git a/commands/movehere.js b/commands/movehere.js index 38636aa..eb2d4cd 100644 --- a/commands/movehere.js +++ b/commands/movehere.js @@ -4,15 +4,15 @@ exports.conf = { enabled: true, guildOnly: true, aliases: [], - permLevel: 'User ', + permLevel: 'User', requiredPerms: ['CONNECT', 'SPEAK'], - cooldown: 10000 + cooldown: 2000 } exports.help = { name: 'movehere', category: 'Music', - description: 'Moves the bot into your voice channel and/or text channel.', + description: 'Moves music related messages to the channel the this command is ran in.', usage: 'movehere', parameters: '' } @@ -26,32 +26,11 @@ exports.run = async (client, message, args, level, data) => { return message.channel.send('<:error:466995152976871434> Nothing is playing.') } - let textChannelChanged = false - let voiceChannelChanged = false - - // change text channel - if (guild.channel.id !== message.channel.id) { - guild.channel = message.channel - - textChannelChanged = true + if (guild.channel.id === message.channel.id) { + return message.channel.send('<:error:466995152976871434> Music messages are already being sent to this channel.') } - // move to another voice channel - if (message.member.voice.channel && guild.voiceChannel && (message.member.voice.channel !== guild.voiceChannel.id)) { - guild.voiceChannel.leave() - guild.voiceChannel = message.member.voice.channel - guild.voiceChannel.join() - voiceChannelChanged = true - } + guild.channel = message.channel - // response - if (textChannelChanged && voiceChannelChanged) { - return message.channel.send('<:success:466995111885144095> Music playback moved to your voice channel and music messages to your text channel.') - } else if (textChannelChanged) { - return message.channel.send('<:success:466995111885144095> Music module will send messages to your text channel.') - } else if (voiceChannelChanged) { - return message.channel.send('<:success:466995111885144095> Music playback moved to your voice channel.') - } else { - return message.channel.send('<:error:466995152976871434> Music is already playing in your voice channel!') - } + message.channel.send('<:success:466995111885144095> Music messages will now be sent to this channel.') } diff --git a/commands/movesong.js b/commands/movesong.js index c56d95e..01807f0 100644 --- a/commands/movesong.js +++ b/commands/movesong.js @@ -37,27 +37,19 @@ module.exports.run = (client, message, args, level) => { const newPosition = +args[1] if (isNaN(oldPosition) === true) { - return message.channel.send('That isn\'t a number! You need to tell me the songs position in the queue (1, 2, etc.)') + return message.channel.send('<:error:466995152976871434> That isn\'t a number! You need to tell me the songs position in the queue (1, 2, etc.)') } if (isNaN(newPosition) === true) { - return message.channel.send('That isn\'t a number! You need to tell me the songs position in the queue (1, 2, etc.)') + return message.channel.send('<:error:466995152976871434> That isn\'t a number! You need to tell me the songs position in the queue (1, 2, etc.)') } - if (oldPosition < 1) { - return message.channel.send('This number is too low!') + if (oldPosition < 1 || oldPosition >= queue.length) { + return message.channel.send('<:error:466995152976871434> Invalid song ID.') } - if (newPosition < 1) { - return message.channel.send('This number is too low!') - } - - if (oldPosition >= queue.length) { - return message.channel.send('This number is too high!') - } - - if (newPosition >= queue.length) { - return message.channel.send('This number is too high!') + if (newPosition < 1 || newPosition >= queue.length) { + return message.channel.send('<:error:466995152976871434> Invalid song ID.') } const songName = queue[oldPosition].video.title From 5c6938369d7125de1c51364790fb63bab68cf7fb Mon Sep 17 00:00:00 2001 From: mudkipscience Date: Wed, 29 Apr 2020 21:21:34 +1000 Subject: [PATCH 155/156] polish --- commands/movesong.js | 6 +++--- commands/pause.js | 6 +++--- commands/removesong.js | 12 ++++-------- commands/resume.js | 6 +++--- commands/shuffle.js | 6 +++--- commands/skip.js | 2 +- commands/volume.js | 14 ++++++++++++-- commands/voteskip.js | 4 ++-- 8 files changed, 31 insertions(+), 25 deletions(-) diff --git a/commands/movesong.js b/commands/movesong.js index 01807f0..4645952 100644 --- a/commands/movesong.js +++ b/commands/movesong.js @@ -45,16 +45,16 @@ module.exports.run = (client, message, args, level) => { } if (oldPosition < 1 || oldPosition >= queue.length) { - return message.channel.send('<:error:466995152976871434> Invalid song ID.') + return message.channel.send('<:error:466995152976871434> Old position is not a valid song ID.') } if (newPosition < 1 || newPosition >= queue.length) { - return message.channel.send('<:error:466995152976871434> Invalid song ID.') + return message.channel.send('<:error:466995152976871434> New position is not a valid song ID.') } const songName = queue[oldPosition].video.title queue.splice(newPosition, 0, queue.splice(oldPosition, 1)[0]) - message.channel.send(`Moved **${songName}** from position \`${oldPosition}\` to \`${newPosition}\``) + message.channel.send(`<:success:466995111885144095> Moved **${songName}** from position \`${oldPosition}\` to \`${newPosition}\``) } diff --git a/commands/pause.js b/commands/pause.js index 9b6e8e0..a8b4f22 100644 --- a/commands/pause.js +++ b/commands/pause.js @@ -22,16 +22,16 @@ exports.run = async (client, message, args, level, data) => { const guild = getGuild(message.guild.id) if (guild.paused === true) { - return message.channel.send('The music has already been paused! Run resume to start the music again.') + return message.channel.send('<:error:466995152976871434> The music has already been paused! Run resume to start the music again.') } if (guild.queue.length < 1 || guild.playing === false) { - return message.channel.send('Nothing is playing!') + return message.channel.send('<:error:466995152976871434> Nothing is playing!') } guild.playing = false guild.paused = true guild.dispatcher.pause() - message.channel.send('Music paused!') + message.channel.send('<:pause:467639357961142273> Music playback has been paused.') } diff --git a/commands/removesong.js b/commands/removesong.js index c1d7daf..63a5891 100644 --- a/commands/removesong.js +++ b/commands/removesong.js @@ -32,20 +32,16 @@ module.exports.run = (client, message, args, level) => { var input = +args[0] if (isNaN(input) === true) { - return message.channel.send('That isn\'t a number! You need to tell me the songs position in the queue (1, 2, etc.)') + return message.channel.send('<:error:466995152976871434> That isn\'t a number! You need to tell me the songs position in the queue (1, 2, etc.)') } - if (input >= queue.length) { - return message.channel.send('Invalid (too large)') - } - - if (input < 1) { - return message.channel.send('Invalid (too small)') + if (input >= queue.length || input < 1) { + return message.channel.send('<:error:466995152976871434> Input is not a valid song ID.') } var songName = queue[input].video.title queue.splice(input, 1) - message.channel.send(`Removed from queue: **${songName}**`) + message.channel.send(`<:success:466995111885144095> Removed from queue: **${songName}**`) } diff --git a/commands/resume.js b/commands/resume.js index 6208e7a..96aa05c 100644 --- a/commands/resume.js +++ b/commands/resume.js @@ -22,16 +22,16 @@ exports.run = async (client, message, args, level, data) => { const guild = getGuild(message.guild.id) if (guild.paused === false) { - return message.channel.send('The music is already playing, use pause to pause the music first!') + return message.channel.send('<:error:466995152976871434> The music is already playing, use pause to pause the music first!') } if (guild.queue.length < 1) { - return message.channel.send('Nothing is playing!') + return message.channel.send('<:error:466995152976871434> Nothing is playing!') } guild.playing = true guild.paused = false guild.dispatcher.resume() - message.channel.send('Music resumed!') + message.channel.send('<:success:466995111885144095> Music playback has been resumed.') } diff --git a/commands/shuffle.js b/commands/shuffle.js index 01f02c2..0c81e1c 100644 --- a/commands/shuffle.js +++ b/commands/shuffle.js @@ -21,8 +21,8 @@ const { getGuild } = require('../utils/music') module.exports.run = (client, message, args, level) => { var queue = getGuild(message.guild.id).queue - if (queue.length < 3) { - return message.channel.send('Not enough songs are in the queue for this command to work!') + if (queue.length < 4) { + return message.channel.send('<:error:466995152976871434> There aren\'t enough songs are in the queue for this command to work!') } const max = queue.length - 1 @@ -34,5 +34,5 @@ module.exports.run = (client, message, args, level) => { queue[i] = itemAtIndex } - message.channel.send('Queue shuffled!') + message.channel.send('<:success:466995111885144095> Queue shuffled!') } diff --git a/commands/skip.js b/commands/skip.js index 13124b8..c55c061 100644 --- a/commands/skip.js +++ b/commands/skip.js @@ -21,5 +21,5 @@ const { skip } = require('../utils/music') exports.run = async (client, message, args, level, data) => { skip(message.guild, 'skip') - message.reply('skipped currently playing music') + message.reply('<:success:466995111885144095> Song skipped.') } diff --git a/commands/volume.js b/commands/volume.js index 168c89a..78b5a33 100644 --- a/commands/volume.js +++ b/commands/volume.js @@ -4,7 +4,7 @@ exports.conf = { enabled: true, guildOnly: true, aliases: ['vol'], - permLevel: 'Moderator', + permLevel: 'User', requiredPerms: [], cooldown: 2000 } @@ -19,7 +19,17 @@ exports.help = { const { setVolume } = require('../utils/music') exports.run = async (client, message, args, level, data) => { - let userVolume = args[0] + let userVolume + + if (args[0].includes('%')) { + userVolume.replace('%', '') + } + + userVolume = +userVolume + + if (isNaN(userVolume) === true) { + return message.channel.send('<:error:466995152976871434> Input must be a number!') + } if (userVolume) { userVolume = Number(userVolume) diff --git a/commands/voteskip.js b/commands/voteskip.js index 489ecdb..6792b8c 100644 --- a/commands/voteskip.js +++ b/commands/voteskip.js @@ -39,7 +39,7 @@ exports.run = (client, message, args, level) => { skip(message.guild, 'skip') message.channel.send( - '<:skip:467216735356059660> Song has been skipped by the user who requested it.' + '<:success:466995111885144095> Song has been skipped by the user who requested it.' ) return @@ -52,7 +52,7 @@ exports.run = (client, message, args, level) => { skip(message.guild, 'skip') message.channel.send( - '<:skip:467216735356059660> Song has been skipped.' + '<:skip:467216735356059660> Song skipped.' ) } else { message.channel.send( From 6ff02d7cae06ff29bc47cb47f847a1a574b9eba5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20H?= Date: Mon, 4 May 2020 22:04:04 +0200 Subject: [PATCH 156/156] discordapp.com -> discord.com --- README.md | 2 +- commands/help.js | 2 +- commands/invite.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index be6868a..35cb4cf 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ ## A feature-rich and configurable Discord bot for music, moderation, currency and more! **Links** -* [Official bot invite](https://discordapp.com/oauth2/authorize?client_id=435961704145485835&permissions=2134240503&scope=bot) +* [Official bot invite](https://discord.com/oauth2/authorize?client_id=435961704145485835&permissions=2134240503&scope=bot) * [For updates and support join my Discord server!](https://discord.gg/HCF8mdv) ## Using Woomy diff --git a/commands/help.js b/commands/help.js index bd7cabd..beadd92 100644 --- a/commands/help.js +++ b/commands/help.js @@ -57,7 +57,7 @@ exports.run = (client, message, args, level, data) => { } embed.addField('**Prefixes**', `Default Prefix: \`${client.config.defaultPrefix}\`\nUser Prefix: ${uPrefix}\nServer Prefix: ${gPrefix}`) embed.addField('**Command Syntax**', 'For arguments in commands:\n» Arguments in `[]` brackets are required.\n» Arguments in `<>` brackets are optional.\n» Arguments prefixed with `-` are flags, and are placed at the start of the command (`avatar -jpg mudkipscience`)') - embed.addField('**Commands**', `Use \`${message.prefix}help all\` to view all commands, or \`${message.prefix}help \` for more information on a specific command.\n\n[Bot Invite](https://discordapp.com/oauth2/authorize?client_id=${client.user.id}&permissions=2134240503&scope=bot) | [Discord Server](https://discord.gg/HCF8mdv) | [GitHub](https://github.com/mudkipscience/woomy) | [Vote for me!](https://top.gg/bot/435961704145485835/vote)`) + embed.addField('**Commands**', `Use \`${message.prefix}help all\` to view all commands, or \`${message.prefix}help \` for more information on a specific command.\n\n[Bot Invite](https://discord.com/oauth2/authorize?client_id=${client.user.id}&permissions=2134240503&scope=bot) | [Discord Server](https://discord.gg/HCF8mdv) | [GitHub](https://github.com/mudkipscience/woomy) | [Vote for me!](https://top.gg/bot/435961704145485835/vote)`) return message.channel.send(embed) } else if (args[0] === 'all') { diff --git a/commands/invite.js b/commands/invite.js index 87fe22b..e23d1e6 100644 --- a/commands/invite.js +++ b/commands/invite.js @@ -18,5 +18,5 @@ exports.help = { } exports.run = async (client, message, args, level, data) => { - message.channel.send(`Here you go! I hope you enjoy using me ^-^\n`) + message.channel.send(`Here you go! I hope you enjoy using me ^-^\n`) }