From 6db4e687ed8940075ebd6b00270a0e30cc69cac7 Mon Sep 17 00:00:00 2001 From: itsYuuki <2149694+itsYuuki@users.noreply.github.com> Date: Thu, 3 May 2018 17:57:06 +0800 Subject: [PATCH 1/6] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 38e58db..41d6672 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "mei-discord", - "version": "1.0.0", + "version": "1.1.2", "description": "An interactive discord bot", "main": "index.js", "engines": { From e40960c8e4418e5c9fd2d37bdbf1267b69b1bff4 Mon Sep 17 00:00:00 2001 From: itsYuuki <2149694+itsYuuki@users.noreply.github.com> Date: Thu, 3 May 2018 17:57:38 +0800 Subject: [PATCH 2/6] Update about.js --- commands/core/about.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/commands/core/about.js b/commands/core/about.js index 3de3205..5df096a 100644 --- a/commands/core/about.js +++ b/commands/core/about.js @@ -20,7 +20,7 @@ module.exports = class AboutCommand extends Commando.Command { embed.setColor(0x551A8B); embed.setDescription("Mei is a discord bot made by Eris#6753 using discord.js. Commands handled by discord.js-commando. For help please type `m!help`"); embed.addField("Owner","Eris#6753"); - embed.addField("Version","v1.0.2"); + embed.addField("Version","v1.1.2"); return msg.embed(embed).then(callback); } From 612b5ca30f8a2cf9cd54e363a2d1d40bb9acf657 Mon Sep 17 00:00:00 2001 From: itsYuuki <2149694+itsYuuki@users.noreply.github.com> Date: Sat, 19 May 2018 17:27:30 +0800 Subject: [PATCH 3/6] Bugfix --- commands/fun/ship.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/commands/fun/ship.js b/commands/fun/ship.js index ca894f4..78c7aa2 100644 --- a/commands/fun/ship.js +++ b/commands/fun/ship.js @@ -30,9 +30,8 @@ module.exports = class shipCommand extends Commando.Command { run (message, args, callback) { - var love = Math.floor(Math.random() * 100); - var ship; - args = message.content.split(" "); + let love = Math.floor(Math.random() * 100); + let ship; if (love == 100) { ship = "Perfect and lovely couple! <3 <3 <3"; @@ -48,7 +47,7 @@ module.exports = class shipCommand extends Commando.Command { const embed = new RichEmbed(); embed.setTitle("~Ship Analysis~"); - embed.addField("Shipped Members", args[1] + " & " + args[2]); + embed.addField("Shipped Members", args.shipUser1 + " & " + args.shipUser2); embed.addField("Ship Value", love + "%" + " " + ship); return message.embed(embed).then(callback); } From 8043835850d072a8de0e0f35ef199133288f9ab9 Mon Sep 17 00:00:00 2001 From: itsYuuki <2149694+itsYuuki@users.noreply.github.com> Date: Sat, 19 May 2018 17:28:51 +0800 Subject: [PATCH 4/6] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 41d6672..438372a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "mei-discord", - "version": "1.1.2", + "version": "1.1.3", "description": "An interactive discord bot", "main": "index.js", "engines": { From 19b2fc67a5a75b61b33bcc603d0d8d127e3775ce Mon Sep 17 00:00:00 2001 From: itsYuuki <2149694+itsYuuki@users.noreply.github.com> Date: Sat, 19 May 2018 17:29:53 +0800 Subject: [PATCH 5/6] Update about.js --- commands/core/about.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/commands/core/about.js b/commands/core/about.js index 5df096a..1138943 100644 --- a/commands/core/about.js +++ b/commands/core/about.js @@ -20,7 +20,7 @@ module.exports = class AboutCommand extends Commando.Command { embed.setColor(0x551A8B); embed.setDescription("Mei is a discord bot made by Eris#6753 using discord.js. Commands handled by discord.js-commando. For help please type `m!help`"); embed.addField("Owner","Eris#6753"); - embed.addField("Version","v1.1.2"); + embed.addField("Version","v1.1.3"); return msg.embed(embed).then(callback); } From b3d84efdcdf393547ee931f805046ee81804f00d Mon Sep 17 00:00:00 2001 From: Axel Greavette Date: Fri, 12 Oct 2018 07:39:55 -0400 Subject: [PATCH 6/6] Rewrote everything but the interactions tested everything but the booru do to cert error on my local pc --- .gitignore | 4 + index.js => Mei.js | 34 +- assets/json/eight_ball.json | 25 + assets/json/interactions.json | 56 ++ commands/booru/danbooru.js | 24 +- commands/booru/konachan.js | 25 +- commands/booru/yandere.js | 23 +- commands/core/about.js | 26 +- commands/core/invite.js | 19 +- commands/fun/8ball.js | 41 +- commands/fun/ratewaifu.js | 22 +- commands/fun/roll.js | 16 +- commands/fun/say.js | 20 +- commands/fun/ship.js | 47 +- commands/info/serverinfo.js | 72 +- commands/info/stats.js | 42 - commands/info/status.js | 25 + commands/info/userinfo.js | 60 +- commands/interactions/cuddle.js | 4 +- commands/interactions/hug.js | 4 +- commands/interactions/kiss.js | 4 +- commands/interactions/mf.js | 4 +- commands/interactions/pet.js | 4 +- commands/interactions/punch.js | 4 +- commands/interactions/slam.js | 4 +- commands/interactions/slap.js | 4 +- commands/interactions/stab.js | 4 +- commands/reactions/jail.js | 16 +- commands/reactions/lewd.js | 16 +- commands/reactions/lolicon.js | 15 +- commands/reactions/mp.js | 19 +- commands/reactions/nobulli.js | 15 +- commands/reactions/pervert.js | 15 +- commands/reactions/plsbulli.js | 15 +- commands/reactions/police.js | 19 +- commands/reactions/shameless.js | 15 +- commands/reactions/smex.js | 15 +- commands/reactions/tadaima.js | 14 +- commands/reactions/tsun.js | 15 +- database.sqlite3 | Bin 8192 -> 8192 bytes package-lock.json | 1590 +++++++++++++------------------ package.json | 11 +- 42 files changed, 988 insertions(+), 1419 deletions(-) rename index.js => Mei.js (59%) create mode 100644 assets/json/eight_ball.json create mode 100644 assets/json/interactions.json delete mode 100644 commands/info/stats.js create mode 100644 commands/info/status.js diff --git a/.gitignore b/.gitignore index 7b5d21b..a530319 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,7 @@ node_modules config.json .eslintrc.json +*.env +*.db +*.sqlite +*.sqlite3 \ No newline at end of file diff --git a/index.js b/Mei.js similarity index 59% rename from index.js rename to Mei.js index c52155c..14bd915 100644 --- a/index.js +++ b/Mei.js @@ -5,15 +5,16 @@ Check the MIT License */ //required libraries. (NOTE: Some commands do have module dependencies so check them out as well) +require('dotenv').config() const Commando = require("discord.js-commando"); const sqlite = require("sqlite"); const path = require("path"); -//const config = require("./config.json"); //this is just a config file (Only for the Indev version of Mei) +const { MEI_OWNERS, MEI_PREFIX, MEI_TOKEN } = process.env //client const client = new Commando.Client({ - owner: "175565380981358592", - commandPrefix: "m!", + owner: MEI_OWNERS.split(','), + commandPrefix: MEI_PREFIX, disableEveryone: true, unknownCommandResponse: false, guildOnly: true @@ -26,8 +27,8 @@ client.on("debug", console.log); client.on("ready", () => { console.log("Loading..."); - console.log("Mei is now up and running..."); - client.user.setActivity("m!help", ["Playing"]); + console.log(`${client.user.tag} is now up and running!`); + client.user.setActivity(`${MEI_PREFIX}help`, ["Playing"]); }); client.on("commandError", (cmd, err) => { @@ -43,14 +44,19 @@ client.setProvider( ).catch(console.error); //command group registries -client.registry.registerGroup("core", "Core"); -client.registry.registerGroup("info", "Info"); -client.registry.registerGroup("fun", "Fun"); -client.registry.registerGroup("reactions","Reactions"); -client.registry.registerGroup("interactions","Interactions"); -client.registry.registerGroup("booru","Booru") -client.registry.registerDefaults(); -client.registry.registerCommandsIn(path.join(__dirname, "commands")); +client.registry + .registerDefaultTypes() + .registerGroups([ + ['core', 'Core'], + ['info', 'Info'], + ['fun', 'Fun'], + ['reactions', 'Reactions'], + ['interactions', 'Interactions'], + ['booru', 'Booru'] + ]) + .registerDefaultGroups() + .registerDefaultCommands() + .registerCommandsIn(path.join(__dirname, 'commands')); //now we log in OwO -client.login(process.env.BOT_TOKEN); +client.login(MEI_TOKEN); diff --git a/assets/json/eight_ball.json b/assets/json/eight_ball.json new file mode 100644 index 0000000..d671bd0 --- /dev/null +++ b/assets/json/eight_ball.json @@ -0,0 +1,25 @@ +{ + "answer": [ + "It is certain", + "It is decidedly so", + "Without a doubt", + "Yes definitely", + "You may rely on it", + "As I see it, yes", + "Most likely", + "Outlook good", + "Yes", + "Signs point to yes", + "Reply hazy try again", + "Ask again later", + "Better not tell you now", + "Cannot predict now", + "Concentrate and ask again", + "Don't count on it", + "My reply is no", + "My sources say no", + "Outlook not so good", + "Very doubtful", + "Ask youself that" + ] +} \ No newline at end of file diff --git a/assets/json/interactions.json b/assets/json/interactions.json new file mode 100644 index 0000000..46595c0 --- /dev/null +++ b/assets/json/interactions.json @@ -0,0 +1,56 @@ +{ + "cuddle": [ + "https://media1.tenor.com/images/08de7ad3dcac4e10d27b2c203841a99f/tenor.gif?itemid=4885268", + "https://media1.tenor.com/images/7dc851c5531d26c0dfa5c62683c211e4/tenor.gif?itemid=4998184", + "https://media1.tenor.com/images/d0c2e7382742f1faf8fcb44db268615f/tenor.gif?itemid=5853736", + "https://media1.tenor.com/images/f73332aa4c013d56f5167efbcc5461d9/tenor.gif?itemid=9383130", + "https://media1.tenor.com/images/20ecc3af6a5523872854a7bc2c083b7e/tenor.gif?itemid=9032323" + ], + "kiss": [ + "https://media1.tenor.com/images/78095c007974aceb72b91aeb7ee54a71/tenor.gif?itemid=5095865", + "https://media1.tenor.com/images/1306732d3351afe642c9a7f6d46f548e/tenor.gif?itemid=6155670", + "https://media1.tenor.com/images/7fd98defeb5fd901afe6ace0dffce96e/tenor.gif?itemid=9670722", + "https://media1.tenor.com/images/621ceac89636fc46ecaf81824f9fee0e/tenor.gif?itemid=4958649", + "https://media1.tenor.com/images/bc5e143ab33084961904240f431ca0b1/tenor.gif?itemid=9838409" + ], + "hug": [ + "https://media1.tenor.com/images/6db54c4d6dad5f1f2863d878cfb2d8df/tenor.gif?itemid=7324587", + "https://media1.tenor.com/images/e58eb2794ff1a12315665c28d5bc3f5e/tenor.gif?itemid=10195705", + "https://media1.tenor.com/images/b77fd0cfd95f89f967be0a5ebb3b6c6a/tenor.gif?itemid=7864716", + "https://media1.tenor.com/images/42922e87b3ec288b11f59ba7f3cc6393/tenor.gif?itemid=5634630", + "https://media1.tenor.com/images/b8b017d93d2e24d43f48ac6c63464a9c/tenor.gif?itemid=7552069" + ], + "mf": [ + "https://media1.tenor.com/images/48d230e9557c2cc8182c4b0e509ff9cf/tenor.gif?itemid=9733014", + "https://media1.tenor.com/images/ca74a9cea9845b1eba6126e5a0aa1d9d/tenor.gif?itemid=9947973" + ], + "pet": [ + "https://media1.tenor.com/images/116fe7ede5b7976920fac3bf8067d42b/tenor.gif?itemid=9200932", + "https://media1.tenor.com/images/f79a9ec48bde0e592e55447b17ecfbad/tenor.gif?itemid=8053566", + "https://media1.tenor.com/images/f5176d4c5cbb776e85af5dcc5eea59be/tenor.gif?itemid=5081286", + "https://media1.tenor.com/images/c0bcaeaa785a6bdf1fae82ecac65d0cc/tenor.gif?itemid=7453915", + "https://media1.tenor.com/images/bf646b7164b76efe82502993ee530c78/tenor.gif?itemid=7394758", + "https://media1.tenor.com/images/d9b480bcd392d05426ae6150e986bbf0/tenor.gif?itemid=9332926" + ], + "punch": [ + "https://media1.tenor.com/images/6afcfbc435b698fa5ceb2ff019718e6d/tenor.gif?itemid=10480971", + "https://media1.tenor.com/images/c621075def6ca41785ef4aaea20cc3a2/tenor.gif?itemid=7679409", + "https://media1.tenor.com/images/965fabbfcdc09ee0eb4d697e25509f34/tenor.gif?itemid=7380310", + "https://media1.tenor.com/images/2487a7679b3d7d23cadcd51381635467/tenor.gif?itemid=11451829", + "https://media1.tenor.com/images/b2db2a7fe0b9f68f2869b4e0d11a9490/tenor.gif?itemid=8932977" + ], + "slam": [ + "https://media1.tenor.com/images/5f02103ea39728997617592fa3609955/tenor.gif?itemid=5176442", + "https://media1.tenor.com/images/9ea4fb41d066737c0e3f2d626c13f230/tenor.gif?itemid=7355956" + ], + "slap": [ + "https://media1.tenor.com/images/9ea4fb41d066737c0e3f2d626c13f230/tenor.gif?itemid=7355956", + "https://media1.tenor.com/images/fd14f63a93796ed26bd385c015df57b8/tenor.gif?itemid=4665506", + "https://media1.tenor.com/images/1cf84bf514d2abd2810588caf7d9fd08/tenor.gif?itemid=7679403", + "https://media1.tenor.com/images/0a3e109296e16977a61ed28c1e5bf7bf/tenor.gif?itemid=5122897", + "https://media1.tenor.com/images/4eed54377433c396ce2d9ad9ee5d22ef/tenor.gif?itemid=11234788" + ], + "stab": [ + "https://media1.tenor.com/images/aebaa1a854ea1fc04286a8729b3b6cf4/tenor.gif?itemid=5381666" + ] +} \ No newline at end of file diff --git a/commands/booru/danbooru.js b/commands/booru/danbooru.js index 9024212..95480ca 100644 --- a/commands/booru/danbooru.js +++ b/commands/booru/danbooru.js @@ -1,23 +1,18 @@ -const Commando = require("discord.js-commando"); -const { RichEmbed } = require("discord.js"); +const { Command } = require("discord.js-commando"); +const { MessageEmbed } = require("discord.js"); const Danbooru = require("danbooru"); -module.exports = class danbooruCommand extends Commando.Command { - - constructor(client) { - +module.exports = class danbooruCommand extends Command { +constructor(client) { super(client, { - name:"danbooru", group:"booru", memberName:"danbooru", description:"Posts a random image from Danbooru (SFW)" - }); - } - run(message, callback) { + run(message) { const booru = new Danbooru(); booru.posts({ tags: "rating:safe order:rank" }).then(posts => { @@ -25,10 +20,11 @@ module.exports = class danbooruCommand extends Commando.Command { const post = posts[index]; const url = booru.url(post.file_url); - const embed = new RichEmbed(); - embed.addField("Source", `${url}`) - embed.setImage(`${url}`); - return message.embed(embed).then(callback); + const embed = new MessageEmbed() + .addField("Source", `${url}`) + .setImage(`${url}`) + + return message.embed(embed); }); } diff --git a/commands/booru/konachan.js b/commands/booru/konachan.js index 3689fd9..356e9d0 100644 --- a/commands/booru/konachan.js +++ b/commands/booru/konachan.js @@ -1,33 +1,30 @@ -const Commando = require("discord.js-commando"); -const { RichEmbed } = require("discord.js"); +const { Command } = require("discord.js-commando"); +const { MessageEmbed } = require("discord.js"); const booru = require("booru") -module.exports = class konachanCommand extends Commando.Command { - - constructor(client) { - +module.exports = class konachanCommand extends Command { +constructor(client) { super(client, { - name: "konachan", group: "booru", memberName: "konachan", description: "Posts a random image from Konachan (SFW)" - }); - } - run(message, callback) { + run(message) { booru.search("kc",["rating:safe"],{limit:1,random:true}) .then(booru.commonfy) .then(images  =>  {   //Log the direct link to each image for  (let  image  of  images)  { let url = image.common.file_url - const embed = new RichEmbed(); - embed.addField("Source", `${url}`) - embed.setImage(`${url}`); - return message.embed(embed).then(callback); + + const embed = new MessageEmbed() + .addField("Source", `${url}`) + .setImage(`${url}`) + + return message.embed(embed); } }) } diff --git a/commands/booru/yandere.js b/commands/booru/yandere.js index 969cb9e..30ec580 100644 --- a/commands/booru/yandere.js +++ b/commands/booru/yandere.js @@ -1,13 +1,10 @@ -const Commando = require("discord.js-commando"); -const { RichEmbed } = require("discord.js"); +const { Command } = require("discord.js-commando"); +const { MessageEmbed } = require("discord.js"); const booru = require("booru") -module.exports = class yandereCommand extends Commando.Command { - - constructor(client) { - +module.exports = class yandereCommand extends Command { +constructor(client) { super(client, { - name: "yandere", group: "booru", memberName: "yandere", @@ -17,17 +14,19 @@ module.exports = class yandereCommand extends Commando.Command { } - run(message, callback) { + run(message) { booru.search("yd",["rating:safe"],{limit:1,random:true}) .then(booru.commonfy) .then(images  =>  {   //Log the direct link to each image for  (let  image  of  images)  { let url = image.common.file_url - const embed = new RichEmbed(); - embed.addField("Source", `${url}`) - embed.setImage(`${url}`); - return message.embed(embed).then(callback); + + const embed = new MessageEmbed() + .addField("Source", `${url}`) + .setImage(`${url}`) + + return message.embed(embed) } }) } diff --git a/commands/core/about.js b/commands/core/about.js index 1138943..bbb25bf 100644 --- a/commands/core/about.js +++ b/commands/core/about.js @@ -1,27 +1,23 @@ -const Commando = require("discord.js-commando"); -const { RichEmbed } = require("discord.js"); +const { Command } = require("discord.js-commando"); +const { MessageEmbed } = require("discord.js"); -module.exports = class AboutCommand extends Commando.Command { +module.exports = class AboutCommand extends Command { constructor(client) { super(client, { - name: "about", group: "core", memberName: "about", description: "Gives bot information" - }); } - run (msg, args, callback) { - - const embed = new RichEmbed(); - embed.setTitle("About Mei"); - embed.setColor(0x551A8B); - embed.setDescription("Mei is a discord bot made by Eris#6753 using discord.js. Commands handled by discord.js-commando. For help please type `m!help`"); - embed.addField("Owner","Eris#6753"); - embed.addField("Version","v1.1.3"); - return msg.embed(embed).then(callback); - + run (message) { + const embed = new MessageEmbed() + .setTitle("About Mei") + .setColor('0x551A8B') + .setDescription(`Mei is a discord bot made by Eris#6753 using discord.js. Commands handled by discord.js-commando. For help please type \`${process.env.MEI_PREFIX}help\``) + .addField("Owner","Eris#6753") + .addField("Version","v1.1.3") + return message.embed(embed) } }; diff --git a/commands/core/invite.js b/commands/core/invite.js index e09b337..451ab96 100644 --- a/commands/core/invite.js +++ b/commands/core/invite.js @@ -1,27 +1,16 @@ -const Commando = require("discord.js-commando"); -const { RichEmbed } = require("discord.js"); - -module.exports = class inviteCommand extends Commando.Command { +const { Command } = require("discord.js-commando"); +module.exports = class inviteCommand extends Command { constructor(client) { - super(client, { - name: "invite", group: "core", memberName: "invite", description: "Invite me!" - }); - } - run(message, callback) { - - const embed = new RichEmbed(); - embed.addField("Invite me!", "https://discordapp.com/oauth2/authorize?&client_id=432365216593084426&scope=bot&permissions=0"); - return message.embed(embed).then(callback); - + run(message) { + return message.say('https://discordapp.com/api/oauth2/authorize?client_id=499734554345603072&permissions=0&scope=bot') } - }; diff --git a/commands/fun/8ball.js b/commands/fun/8ball.js index 59eec02..e886ff2 100644 --- a/commands/fun/8ball.js +++ b/commands/fun/8ball.js @@ -1,49 +1,16 @@ -const Commando = require("discord.js-commando"); - -module.exports = class ballCommand extends Commando.Command { +const { Command } = require("discord.js-commando"); +const eightBall = require('../../assets/json/eight_ball.json').answer +module.exports = class ballCommand extends Command { constructor(client) { super(client, { - name: "8ball", group: "fun", memberName:"8ball", description: "Your favorite 8ball, now in this bot...and in many other bots, just for fun uwu" - }); } - run (message) { - - // taken from https://en.wikipedia.org/wiki/Magic_8-Ball#Possible_answers - var answer = [ - - "It is certain", - "It is decidedly so", - "Without a doubt", - "Yes definitely", - "You may rely on it", - "As I see it, yes", - "Most likely", - "Outlook good", - "Yes", - "Signs point to yes", - "Reply hazy try again", - "Ask again later", - "Better not tell you now", - "Cannot predict now", - "Concentrate and ask again", - "Don't count on it", - "My reply is no", - "My sources say no", - "Outlook not so good", - "Very doubtful", - "Ask youself that" - - ]; - - message.say(answer[Math.floor(Math.random() * answer.length)]); - + message.say(eightBall[Math.floor(Math.random() * eightBall.length)]); } - }; diff --git a/commands/fun/ratewaifu.js b/commands/fun/ratewaifu.js index aa7539c..7af6696 100644 --- a/commands/fun/ratewaifu.js +++ b/commands/fun/ratewaifu.js @@ -1,34 +1,26 @@ -const Commando = require("discord.js-commando"); -const { RichEmbed } = require("discord.js"); - -module.exports = class rateWaifuCommand extends Commando.Command { +const { Command } = require("discord.js-commando"); +module.exports = class rateWaifuCommand extends Command { constructor(client) { - super(client, { - name:"ratewaifu", group:"fun", memberName:"ratewaifu", description:"Rates your waifu, it's either a server member or just an anime character.", args: [ { - key:"waifu", - prompt:"Please enter your waifu name, or a member", - type:"string" + key: "waifu", + prompt: "Please enter your waifu name, or a member", + type: "string|member" } ] - }); } - run(message, args) { + run(message, { waifu }) { - const { waifu } = args; - const waifuRate = Math.floor(Math.random() * 100); - message.say("I would rate" + " " + waifu + " " + "a" + " " + waifuRate + "%"); + message.say(`I would rate ${(waifu.displayName) ? waifu.displayName : waifu} ${Math.floor(Math.random() * 100)}%`); } - }; diff --git a/commands/fun/roll.js b/commands/fun/roll.js index 4cedbbc..31f38f6 100644 --- a/commands/fun/roll.js +++ b/commands/fun/roll.js @@ -1,25 +1,17 @@ -const Commando = require("discord.js-commando"); - -class RollCommand extends Commando.Command { +const { Command } = require("discord.js-commando"); +module.exports = class RollCommand extends Command { constructor(client){ - super(client, { name: "roll", group: "fun", memberName: "roll", description: "Rolls a die, values are at random from 1-6", }); - - } +} run(message) { - var roll = Math.floor(Math.random() * 6) + 1; - message.reply("You rolled a " + roll + "!"); - + message.reply(`You rolled a ${Math.floor(Math.random() * 6) + 1}`); } - } - -module.exports = RollCommand; diff --git a/commands/fun/say.js b/commands/fun/say.js index d8f22a7..325bc16 100644 --- a/commands/fun/say.js +++ b/commands/fun/say.js @@ -1,24 +1,17 @@ const Commando = require("discord.js-commando"); -const client = new Commando.Client({ - owner: "175565380981358592", - commandPrefix: "m!" - -}); - module.exports = class SayCommand extends Commando.Command { - constructor(client) { - super(client, { name: "say", + aliases: ['echo', 'repeat'], group: "fun", memberName: "say", - description: "make the bot say something", + description: "Make the bot say / repeat something", args: [ { key: "text", - prompt: "Make the bot say something", + prompt: "What would you like me to repeat?", type: "string" } ] @@ -27,11 +20,8 @@ module.exports = class SayCommand extends Commando.Command { } - run(msg, args) { - const { text } = args; + run(msg, { text }) { msg.delete(); - return msg.say(`${text}`); - + msg.say(text); } - }; diff --git a/commands/fun/ship.js b/commands/fun/ship.js index 78c7aa2..3236b7c 100644 --- a/commands/fun/ship.js +++ b/commands/fun/ship.js @@ -1,55 +1,44 @@ -const Commando = require("discord.js-commando"); -const { RichEmbed } = require("discord.js"); - -module.exports = class shipCommand extends Commando.Command { +const { Command } = require("discord.js-commando"); +const { MessageEmbed } = require("discord.js"); +module.exports = class shipCommand extends Command { constructor(client) { - super(client, { - name:"ship", group:"fun", memberName:"ship", description:"Ship two members, bots are also welcome", args: [ { - key:"shipUser1", + key: "shipOne", prompt:"Please mention a member then a second member", type:"member" }, { - key:"shipUser2", + key: "shipTwo", prompt:"Please mention a second member!", type:"member" } ] - }); } - run (message, args, callback) { + run (message, { shipOne, shipTwo}) { - let love = Math.floor(Math.random() * 100); + const love = Math.floor(Math.random() * 100); let ship; - if (love == 100) { - ship = "Perfect and lovely couple! <3 <3 <3"; - } else if (love >= 75) { - ship = "Great Couple! <3 <3"; - } else if (love >= 50) { - ship = "Nice Couple! <3"; - } else if (love >= 25) { - ship = "Not bad"; - } else if (love <= 24) { - ship = "This won't last..."; - } - - const embed = new RichEmbed(); - embed.setTitle("~Ship Analysis~"); - embed.addField("Shipped Members", args.shipUser1 + " & " + args.shipUser2); - embed.addField("Ship Value", love + "%" + " " + ship); - return message.embed(embed).then(callback); + if (love == 100) ship = "Perfect and lovely couple! <3 <3 <3"; + else if (love >= 75) ship = "Great Couple! <3 <3"; + else if (love >= 50) ship = "Nice Couple! <3"; + else if (love >= 25) ship = "Not bad..."; + else if (love <= 24) ship = "This wont last..."; + + const embed = new MessageEmbed() + .setTitle("~Ship Analysis~") + .addField("Shipped Members", `${shipOne.displayName} & ${shipTwo.displayName}`) + .addField("Ship Value", `${love}% ${ship}`) + return message.embed(embed) } - }; diff --git a/commands/info/serverinfo.js b/commands/info/serverinfo.js index 6bed291..7ace986 100644 --- a/commands/info/serverinfo.js +++ b/commands/info/serverinfo.js @@ -1,62 +1,40 @@ -const Commando = require("discord.js-commando"); -const { RichEmbed } = require("discord.js"); - -module.exports = class ServerInfoCommand extends Commando.Command { +const { Command } = require("discord.js-commando"); +const { MessageEmbed } = require("discord.js"); +module.exports = class ServerInfoCommand extends Command { constructor(client) { - super(client, { - name: "serverinfo", group: "info", memberName: "serverinfo", description: "Displays the server info" - }); - } - run(message, callback) { + run(message) { - let owner = message.guild.owner; - let vLevelNum = message.guild.verificationLevel; + const vln = message.guild.verificationLevel; let vLevel; - - if (vLevelNum === 0) { - - vLevel = "None"; - - } else if (vLevelNum === 1) { - - vLevel = "Low"; - - } else if (vLevelNum === 2) { - - vLevel = "Medium"; - - } else if (vLevelNum === 3) { - - vLevel = "High"; - - } else if (vLevelNum === 4) { - - vLevel = "Extreme"; - - } - - const embed = new RichEmbed(); - embed.setAuthor(message.guild.name, message.guild.iconURL); - embed.setThumbnail(message.guild.iconURL); - embed.addField("ID", message.guild.id); - embed.addField("Server Owner", owner.user.username + "#" + owner.user.discriminator); - embed.addField("Verification Level", vLevel); - embed.addField("Region", message.guild.region); - embed.addField("Channels", message.guild.channels.size, true); - embed.addField("Members", message.guild.memberCount, true); - embed.addField("Created On", message.guild.createdAt); - embed.addField("Roles", message.guild.roles.size); - - return message.embed(embed).then(callback); + if(vln === 0) vLevel = 'None'; + else if(vln === 1) vLevel = 'Low'; + else if(vln === 2) vLevel = 'Medium'; + else if(vln === 3) vLevel = "High"; + else if(vln === 4) vLevel = "Extreme"; + else if(vln <= 5) vLevel = "Impossible"; + + const embed = new MessageEmbed() + .setAuthor('Mei', this.client.user.displayAvatarURL) + .setThumbnail(message.guild.iconURL) + .addField("ID", message.guild.id) + .addField("Server Owner", `${message.guild.owner.user.username}#${message.guild.owner.user.discriminator}`) + .addField("Verification Level", vLevel) + .addField("Region", message.guild.region) + .addField("Channels", message.guild.channels.size, true) + .addField("Members", message.guild.memberCount, true) + .addField("Created On", message.guild.createdAt) + .addField("Roles", message.guild.roles.size) + + return message.embed(embed) } diff --git a/commands/info/stats.js b/commands/info/stats.js deleted file mode 100644 index ed87860..0000000 --- a/commands/info/stats.js +++ /dev/null @@ -1,42 +0,0 @@ -const Commando = require("discord.js-commando"); -const { stripIndents } = require("common-tags"); -const moment = require("moment"); -require("moment-duration-format"); - -module.exports = class StatusCommand extends Commando.Command { - constructor(client) { - super(client, { - name: "status", - group: "info", - memberName: "status", - description: "Shows bot statistics like number of guilds the bot is in, the channels the bot is in, the users using the bot, and uptime", - }); - } - - run (msg) { - - return msg.embed({ - - color: 0x3D85C6, - title: "Mei Statistics", - fields: [ - - { - name: "Bot Info", - value: stripIndents` - Servers: ${this.client.guilds.size} - Channels: ${this.client.channels.size} - Users: ${this.client.guilds.map(guild => guild.memberCount).reduce((a, b) => a + b)}`, - inline: true - }, - { - name: "Uptime", - value: moment.duration(this.client.uptime).format("d[ days], h[ hours], m[ minutes, and ]s[ seconds]") - } - - ], - - }); - - } -}; diff --git a/commands/info/status.js b/commands/info/status.js new file mode 100644 index 0000000..2b12ae4 --- /dev/null +++ b/commands/info/status.js @@ -0,0 +1,25 @@ +const { Command } = require("discord.js-commando"); +const { MessageEmbed } = require('discord.js') +const moment = require("moment"); +require("moment-duration-format"); + +module.exports = class StatusCommand extends Command { + constructor(client) { + super(client, { + name: "status", + aliases: ['stats'], + group: "info", + memberName: "status", + description: "Shows bot statistics like number of guilds the bot is in, the channels the bot is in, the users using the bot, and uptime", + }); + } + + run (msg) { + const embed = new MessageEmbed() + .setTitle('Mei Statistics') + .setColor('0x3D85C6') + .addField("­", `Servers: ${this.client.guilds.size}\nChannels: ${this.client.channels.size}`, true) + .addField("­", `Users: ${this.client.users.size}\nUptime: ${moment.duration(this.client.uptime).format("d[ days], h[ hours], m[ minutes, and ]s[ seconds]")}`, true) + return msg.embed(embed) + } +}; diff --git a/commands/info/userinfo.js b/commands/info/userinfo.js index e56024f..98efef8 100644 --- a/commands/info/userinfo.js +++ b/commands/info/userinfo.js @@ -1,8 +1,7 @@ -const Commando = require("discord.js-commando"); -const {RichEmbed} = require("discord.js"); - -module.exports = class UserInfoCommand extends Commando.Command { +const { Command } = require("discord.js-commando"); +const {MessageEmbed} = require("discord.js"); +module.exports = class UserInfoCommand extends Command { constructor(client) { super(client, { name:"userinfo", @@ -10,41 +9,30 @@ module.exports = class UserInfoCommand extends Commando.Command { memberName:"userinfo", description:"Displays user info.", examples:["userinfo @Eris#6753","userinfo"], + args: [ + { + key: 'lookup', + prompt: 'Who do you want to lookup user info for?', + type: 'member', + default: '' + } + ] }); } - run(message, args, callback) { - - let member = message.mentions.members.first(); - const embed = new RichEmbed(); - var color = 0xC63D85; - - if (!member) { - - embed.setTitle("Information About" + " " + message.author.username); - embed.setColor(color); - embed.setThumbnail(message.author.avatarURL); - embed.addField("ID:", message.author.id, true); - embed.addField("Status", message.author.presence.status, true); - embed.addField("Account Created:", message.author.createdAt, true); - embed.addField("Joined on:", message.member.joinedAt, true); - embed.addField("Server Nickname:", message.member.nickname !== null ? `${message.member.nickname}` : "No nickname set", true); - embed.addField("Server Roles:", message.member.roles.map(roles => `${roles.name}`).join(", ")); - return message.embed(embed).then(callback); - - } else { - - embed.setTitle("Information About" + " " + member.displayName); - embed.setColor(color); - embed.addField("Status", member.presence.status); - embed.addField("ID:", member.id); - embed.addField("Account Created:", member.user.createdAt, true); - embed.addField("Joined on:", member.joinedAt, true); - embed.addField("Server Nickname:", member.nickname !== null ? `Nickname: ${member.nickname}` : "No nickname set", true); - embed.addField("Server Roles:", member.roles.map(roles => `${roles.name}`).join(", ")); - return message.embed(embed).then(callback); - - } + run(message, { lookup }) { + if(lookup === '') lookup = message.member + const embed = new MessageEmbed() + .setTitle("Information About" + " " + lookup.displayName) + .setColor('0xC63D85') + .setThumbnail(lookup.displayAvatarURL) + .addField("ID:", lookup.id, true) + .addField("Status", (lookup.presence.status) ? lookup.presence.status : '???', true) + .addField("Account Created:", lookup.user.createdAt, true) + .addField("Joined on:", lookup.joinedAt, true) + .addField("Server Nickname:", (lookup.nickname) ? lookup.nickname : "???", true) + .addField("Server Roles:", lookup.roles.map(roles => `${roles.name}`).join(", ")) + return message.embed(embed) } }; diff --git a/commands/interactions/cuddle.js b/commands/interactions/cuddle.js index 5c40761..1aac52d 100644 --- a/commands/interactions/cuddle.js +++ b/commands/interactions/cuddle.js @@ -1,6 +1,6 @@ const Commando = require("discord.js-commando"); const { - RichEmbed + MessageEmbed } = require("discord.js"); module.exports = class cuddleCommand extends Commando.Command { @@ -31,7 +31,7 @@ module.exports = class cuddleCommand extends Commando.Command { message.channel.send(message.author.username + " cuddles " + `${member}`); } - const embed = new RichEmbed() + const embed = new MessageEmbed() .setImage(cuddleIndex[Math.floor(Math.random() * cuddleIndex.length)]); message.channel.send({ embed diff --git a/commands/interactions/hug.js b/commands/interactions/hug.js index 32edbdc..f664ba5 100644 --- a/commands/interactions/hug.js +++ b/commands/interactions/hug.js @@ -1,5 +1,5 @@ const Commando = require("discord.js-commando"); -const { RichEmbed } = require("discord.js"); +const { MessageEmbed } = require("discord.js"); module.exports = class hugCommand extends Commando.Command { @@ -29,7 +29,7 @@ module.exports = class hugCommand extends Commando.Command { message.channel.send(message.author.username + " hugs " + `${member}`); } - const embed = new RichEmbed() + const embed = new MessageEmbed() .setImage(hugIndex[Math.floor(Math.random() * hugIndex.length)]); message.channel.send({ embed diff --git a/commands/interactions/kiss.js b/commands/interactions/kiss.js index e2076df..369cfc2 100644 --- a/commands/interactions/kiss.js +++ b/commands/interactions/kiss.js @@ -1,5 +1,5 @@ const Commando = require("discord.js-commando"); -const { RichEmbed } = require("discord.js"); +const { MessageEmbed } = require("discord.js"); module.exports = class kissCommand extends Commando.Command { @@ -29,7 +29,7 @@ module.exports = class kissCommand extends Commando.Command { message.channel.send(message.author.username + " kisses " + `${member}`); } - const embed = new RichEmbed() + const embed = new MessageEmbed() .setImage(kissIndex[Math.floor(Math.random() * kissIndex.length)]); message.channel.send({ embed diff --git a/commands/interactions/mf.js b/commands/interactions/mf.js index 71409c3..4651237 100644 --- a/commands/interactions/mf.js +++ b/commands/interactions/mf.js @@ -1,5 +1,5 @@ const Commando = require("discord.js-commando"); -const { RichEmbed } = require("discord.js"); +const { MessageEmbed } = require("discord.js"); module.exports = class mfCommand extends Commando.Command { @@ -27,7 +27,7 @@ module.exports = class mfCommand extends Commando.Command { message.channel.send(message.author.username + " gives the middle finger to " + `${member}`); } - const embed = new RichEmbed() + const embed = new MessageEmbed() .setImage(mf[Math.floor(Math.random() * mf.length)]); message.channel.send({embed}); diff --git a/commands/interactions/pet.js b/commands/interactions/pet.js index a1d6e6e..7ce2515 100644 --- a/commands/interactions/pet.js +++ b/commands/interactions/pet.js @@ -1,5 +1,5 @@ const Commando = require("discord.js-commando"); -const { RichEmbed } = require("discord.js"); +const { MessageEmbed } = require("discord.js"); module.exports = class petCommand extends Commando.Command { @@ -30,7 +30,7 @@ module.exports = class petCommand extends Commando.Command { message.channel.send(message.author.username + " pets " + `${member}`); } - const embed = new RichEmbed() + const embed = new MessageEmbed() .setImage(petIndex[Math.floor(Math.random() * petIndex.length)]); message.channel.send({ embed diff --git a/commands/interactions/punch.js b/commands/interactions/punch.js index 918b2c2..0b88fe3 100644 --- a/commands/interactions/punch.js +++ b/commands/interactions/punch.js @@ -1,5 +1,5 @@ const Commando = require("discord.js-commando"); -const { RichEmbed } = require("discord.js"); +const { MessageEmbed } = require("discord.js"); module.exports = class punchCommand extends Commando.Command { @@ -29,7 +29,7 @@ module.exports = class punchCommand extends Commando.Command { message.channel.send(message.author.username + " punches " + `${punchedMember}`); } - const embed = new RichEmbed() + const embed = new MessageEmbed() .setImage(punch[Math.floor(Math.random() * punch.length)]); message.channel.send({embed}); diff --git a/commands/interactions/slam.js b/commands/interactions/slam.js index 9a9519d..3170e21 100644 --- a/commands/interactions/slam.js +++ b/commands/interactions/slam.js @@ -1,5 +1,5 @@ const Commando = require("discord.js-commando"); -const { RichEmbed } = require("discord.js"); +const { MessageEmbed } = require("discord.js"); module.exports = class smalCommand extends Commando.Command { @@ -29,7 +29,7 @@ module.exports = class smalCommand extends Commando.Command { message.channel.send(message.author.username + " slams " + `${slammedMember}` + " " + "to the wall!"); } - const embed = new RichEmbed() + const embed = new MessageEmbed() .setImage(slam[Math.floor(Math.random() * slam.length)]); message.channel.send({embed}); diff --git a/commands/interactions/slap.js b/commands/interactions/slap.js index bce9e14..557d64e 100644 --- a/commands/interactions/slap.js +++ b/commands/interactions/slap.js @@ -1,5 +1,5 @@ const Commando = require("discord.js-commando"); -const { RichEmbed } = require("discord.js"); +const { MessageEmbed } = require("discord.js"); module.exports = class slapCommand extends Commando.Command { @@ -29,7 +29,7 @@ module.exports = class slapCommand extends Commando.Command { message.channel.send(message.author.username + " slaps " + `${slappedMember}`); } - const embed = new RichEmbed() + const embed = new MessageEmbed() .setImage(slap[Math.floor(Math.random() * slap.length)]); message.channel.send({embed}); diff --git a/commands/interactions/stab.js b/commands/interactions/stab.js index fe3d99d..83ae671 100644 --- a/commands/interactions/stab.js +++ b/commands/interactions/stab.js @@ -1,5 +1,5 @@ const Commando = require("discord.js-commando"); -const { RichEmbed } = require("discord.js"); +const { MessageEmbed } = require("discord.js"); module.exports = class stabCommand extends Commando.Command { @@ -29,7 +29,7 @@ module.exports = class stabCommand extends Commando.Command { message.channel.send(message.author.username + " stabs " + `${stabbedMember}`); } - const embed = new RichEmbed() + const embed = new MessageEmbed() .setImage(stab[Math.floor(Math.random() * stab.length)]); message.channel.send({embed}); diff --git a/commands/reactions/jail.js b/commands/reactions/jail.js index ba473ed..533dca0 100644 --- a/commands/reactions/jail.js +++ b/commands/reactions/jail.js @@ -1,26 +1,20 @@ -const Commando = require("discord.js-commando"); -const { RichEmbed } = require("discord.js"); - -module.exports = class jailCommand extends Commando.Command { +const { Command } = require("discord.js-commando"); +const { MessageEmbed } = require("discord.js"); +module.exports = class jailCommand extends Command { constructor(client) { - super(client, { - name:"jail", group:"reactions", memberName:"jail", description:"Jail is over there onii-chan", - }); - } run(message) { - - const embed = new RichEmbed() + const embed = new MessageEmbed() .setImage("http://i0.kym-cdn.com/photos/images/original/001/271/516/407.jpg"); - message.channel.send({embed}); + message.embed(embed); } diff --git a/commands/reactions/lewd.js b/commands/reactions/lewd.js index 9c59264..22267f7 100644 --- a/commands/reactions/lewd.js +++ b/commands/reactions/lewd.js @@ -1,26 +1,20 @@ -const Commando = require("discord.js-commando"); -const { RichEmbed } = require("discord.js"); - -module.exports = class lewdReactCommand extends Commando.Command { +const { Command } = require("discord.js-commando"); +const { MessageEmbed } = require("discord.js"); +module.exports = class lewdReactCommand extends Command { constructor(client) { - super(client, { - name:"lewd", group:"reactions", memberName:"lewd", description:"L-Lewd >///<", - }); - } run(message) { - - const embed = new RichEmbed() + const embed = new MessageEmbed() .setImage("https://i.imgur.com/qZyrUsn.png"); - message.channel.send({embed}); + message.embed(embed); } diff --git a/commands/reactions/lolicon.js b/commands/reactions/lolicon.js index 5858eaa..034cf47 100644 --- a/commands/reactions/lolicon.js +++ b/commands/reactions/lolicon.js @@ -1,26 +1,21 @@ -const Commando = require("discord.js-commando"); -const { RichEmbed } = require("discord.js"); - -module.exports = class loliconCommand extends Commando.Command { +const { Command } = require("discord.js-commando"); +const { MessageEmbed } = require("discord.js"); +module.exports = class loliconCommand extends Command { constructor(client) { - super(client, { - name:"lolicon", group:"reactions", memberName:"lolicon", description:"You Lolicon!", - }); - } run(message) { - const embed = new RichEmbed() + const embed = new MessageEmbed() .setImage("http://i0.kym-cdn.com/photos/images/original/001/085/877/f84.jpg"); - message.channel.send({embed}); + message.embed(embed); } diff --git a/commands/reactions/mp.js b/commands/reactions/mp.js index 998d20e..48bd7a9 100644 --- a/commands/reactions/mp.js +++ b/commands/reactions/mp.js @@ -1,27 +1,20 @@ -const Commando = require("discord.js-commando"); -const { RichEmbed } = require("discord.js"); - -module.exports = class mpCommand extends Commando.Command { +const { Command } = require("discord.js-commando"); +const { MessageEmbed } = require("discord.js"); +module.exports = class mpCommand extends Command { constructor(client) { - super(client, { - name:"mp", group:"reactions", memberName:"mp", description:"Military police, we have a severe case of lolicon here", - }); - } - + run(message) { - - const embed = new RichEmbed() + const embed = new MessageEmbed() .setImage("https://i.imgur.com/Cez6Gy4.jpg"); - message.channel.send({embed}); - + message.embed(embed); } }; diff --git a/commands/reactions/nobulli.js b/commands/reactions/nobulli.js index 73db364..3ed7225 100644 --- a/commands/reactions/nobulli.js +++ b/commands/reactions/nobulli.js @@ -1,26 +1,21 @@ -const Commando = require("discord.js-commando"); -const { RichEmbed } = require("discord.js"); - -module.exports = class nobulliCommand extends Commando.Command { +const { Command } = require("discord.js-commando"); +const { MessageEmbed } = require("discord.js"); +module.exports = class nobulliCommand extends Command { constructor(client) { - super(client, { - name: "nobulli", group: "reactions", memberName: "nobulli", description: "Reaction GIF: pls no bulli >.<" - }); - } run(message) { - const embed = new RichEmbed() + const embed = new MessageEmbed() .setImage("http://i0.kym-cdn.com/photos/images/original/000/979/749/3d8.gif"); - message.channel.send({embed}); + message.embed(embed); } diff --git a/commands/reactions/pervert.js b/commands/reactions/pervert.js index ffb48ac..2025c35 100644 --- a/commands/reactions/pervert.js +++ b/commands/reactions/pervert.js @@ -1,26 +1,21 @@ -const Commando = require("discord.js-commando"); -const { RichEmbed } = require("discord.js"); - -module.exports = class pervertCommand extends Commando.Command { +const { Command } = require("discord.js-commando"); +const { MessageEmbed } = require("discord.js"); +module.exports = class pervertCommand extends Command { constructor(client) { - super(client, { - name:"pervert", group:"reactions", memberName:"pervert", description:"Pervert!", - }); - } run(message) { - const embed = new RichEmbed() + const embed = new MessageEmbed() .setImage("https://pa1.narvii.com/5961/a6da21c2342e3acf67372b709e839fae4dbd1730_hq.gif"); - message.channel.send({embed}); + message.embed(embed); } diff --git a/commands/reactions/plsbulli.js b/commands/reactions/plsbulli.js index ba79a00..4b9376b 100644 --- a/commands/reactions/plsbulli.js +++ b/commands/reactions/plsbulli.js @@ -1,26 +1,21 @@ -const Commando = require("discord.js-commando"); -const { RichEmbed } = require("discord.js"); - -module.exports = class plsbulliCommand extends Commando.Command { +const { Command } = require("discord.js-commando"); +const { MessageEmbed } = require("discord.js"); +module.exports = class plsbulliCommand extends Command { constructor(client) { - super(client, { - name:"plsbulli", group:"reactions", memberName:"plsbulli", description:"pls bulli especially Satania", - }); - } run(message) { - const embed = new RichEmbed() + const embed = new MessageEmbed() .setImage("https://i.redd.it/20x9tn3ri8h01.png"); - message.channel.send({embed}); + message.embed(embed); } diff --git a/commands/reactions/police.js b/commands/reactions/police.js index b945ac0..aeb8fc4 100644 --- a/commands/reactions/police.js +++ b/commands/reactions/police.js @@ -1,28 +1,23 @@ -const Commando = require("discord.js-commando"); -const { RichEmbed } = require("discord.js"); - -module.exports = class policeCommand extends Commando.Command { +const { Command } = require("discord.js-commando"); +const { MessageEmbed } = require("discord.js"); +module.exports = class policeCommand extends Command { constructor(client) { - super(client, { - name:"police", group:"reactions", memberName:"police", description:"*siren*", - }); - } run(message) { - let police = ["https://media1.tenor.com/images/b87de85650b85bda6342261d516b7482/tenor.gif?itemid=7744617","https://www.mypalmbeachpost.com/rf/image_medium/Pub/Web/PalmBeachPost/Images/STOCK%20BN%20Police%20car%20blurred.jpg"] + const police = ["https://media1.tenor.com/images/b87de85650b85bda6342261d516b7482/tenor.gif?itemid=7744617","https://www.mypalmbeachpost.com/rf/image_medium/Pub/Web/PalmBeachPost/Images/STOCK%20BN%20Police%20car%20blurred.jpg"] - const embed = new RichEmbed() - .setImage(police[Math.floor(Math.random() * police.length)]); - message.channel.send({embed}); + const embed = new MessageEmbed() + .setImage(police[Math.floor(Math.random() * police.length) + 1]); + message.embed(embed); } diff --git a/commands/reactions/shameless.js b/commands/reactions/shameless.js index 9c21aef..0e59ec6 100644 --- a/commands/reactions/shameless.js +++ b/commands/reactions/shameless.js @@ -1,26 +1,21 @@ -const Commando = require("discord.js-commando"); -const { RichEmbed } = require("discord.js"); - -module.exports = class shamelessPervCommand extends Commando.Command { +const { Command } = require("discord.js-commando"); +const { MessageEmbed } = require("discord.js"); +module.exports = class shamelessPervCommand extends Command { constructor(client) { - super(client, { - name:"shameless", group:"reactions", memberName:"shameless", description:"Shameless pervert", - }); - } run(message) { - const embed = new RichEmbed() + const embed = new MessageEmbed() .setImage("https://pa1.narvii.com/5824/b9aeeecb706c61b7c5c6584945be6aec28acfc5c_hq.gif"); - message.channel.send({embed}); + message.embed(embed); } diff --git a/commands/reactions/smex.js b/commands/reactions/smex.js index e318404..e867231 100644 --- a/commands/reactions/smex.js +++ b/commands/reactions/smex.js @@ -1,26 +1,21 @@ -const Commando = require("discord.js-commando"); -const { RichEmbed } = require("discord.js"); - -module.exports = class smexGestureCommand extends Commando.Command { +const { Command } = require("discord.js-commando"); +const { MessageEmbed } = require("discord.js"); +module.exports = class smexGestureCommand extends Command { constructor(client) { - super(client, { - name:"smex", group:"reactions", memberName:"smex", description:"*does that gesture*", - }); - } run(message) { - const embed = new RichEmbed() + const embed = new MessageEmbed() .setImage("https://i.pinimg.com/originals/c8/d2/68/c8d268fbf65e72ab422165d6df200c07.jpg"); - message.channel.send({embed}); + message.embed(embed); } diff --git a/commands/reactions/tadaima.js b/commands/reactions/tadaima.js index 84fc2a8..5fc2c25 100644 --- a/commands/reactions/tadaima.js +++ b/commands/reactions/tadaima.js @@ -1,26 +1,22 @@ -const Commando = require("discord.js-commando"); -const { RichEmbed } = require("discord.js"); - -module.exports = class swatCommand extends Commando.Command { +const { Command } = require("discord.js-commando"); +const { MessageEmbed } = require("discord.js"); +module.exports = class swatCommand extends Command { constructor(client) { - super(client, { - name:"tadaima", group:"reactions", memberName:"swat", description:"TADAIMA!!!", - }); } run(message) { - const embed = new RichEmbed() + const embed = new MessageEmbed() .setImage("http://i0.kym-cdn.com/photos/images/original/001/066/980/cbd.jpg"); - message.channel.send({embed}); + message.embed(embed); } diff --git a/commands/reactions/tsun.js b/commands/reactions/tsun.js index 5aaa123..ddc9681 100644 --- a/commands/reactions/tsun.js +++ b/commands/reactions/tsun.js @@ -1,26 +1,21 @@ -const Commando = require("discord.js-commando"); -const { RichEmbed } = require("discord.js"); - -module.exports = class tsunCommand extends Commando.Command { +const { Command } = require("discord.js-commando"); +const { MessageEmbed } = require("discord.js"); +module.exports = class tsunCommand extends Command { constructor(client) { - super(client, { - name:"tsun", group:"reactions", memberName:"tsun", description:"Baka baka baka!", - }); - } run(message) { - const embed = new RichEmbed() + const embed = new MessageEmbed() .setImage("https://media.tenor.com/images/99ed452a33c03a91c37083df7eb2419f/tenor.gif"); - message.channel.send({embed}); + message.embed(embed); } diff --git a/database.sqlite3 b/database.sqlite3 index e03b6f5d42717e4a52f2d3d297425717bf121e9d..8fd82a6d0cc422c63c89530caaf2845b0cc2d876 100644 GIT binary patch delta 91 zcmZp0XmFSy&B#Ad#+jd=K~JTDmw|zSk$)ir|H93J0>=E47xE|bu<(a6@;~9P;NQs~ v3KX^BpX?*gDI?ju^TeSUA6go?m>DdqmC}m}bc<3GlS?x5^NJ@I%J%~REZQ33 delta 89 zcmZp0XmFSy&B!-V#+jdwL60$lmw|zSk$)ir|H93J0>=E47xE`_G4oe2@;~9P;NJ-p sv*DlYCC@F>z`)GlS*=u1l$w@Vp=70$tEi--lwMSzn^u}Pxlq0z0Hv}P_5c6? diff --git a/package-lock.json b/package-lock.json index 9d911c8..5d1308a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,24 +1,51 @@ { "name": "mei-discord", - "version": "1.0.0", + "version": "2.0.0", "lockfileVersion": 1, "requires": true, "dependencies": { + "abbrev": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", + "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==" + }, "ajv": { "version": "5.5.2", "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz", "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=", "requires": { - "co": "4.6.0", - "fast-deep-equal": "1.1.0", - "fast-json-stable-stringify": "2.0.0", - "json-schema-traverse": "0.3.1" + "co": "^4.6.0", + "fast-deep-equal": "^1.0.0", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.3.0" + } + }, + "ansi-regex": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" + }, + "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" } }, "asn1": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz", - "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y=" + "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", @@ -41,26 +68,22 @@ "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=" }, "aws4": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.7.0.tgz", - "integrity": "sha512-32NDda82rhwD9/JBCCkB+MRYDp0oSvlo2IL6rQWA10PQi7tDUM3eqMSltXmY+Oyl/7N3P3qNtAlv7X0d9bI28w==" - }, - "babel-runtime": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz", - "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=", - "requires": { - "core-js": "2.5.4", - "regenerator-runtime": "0.11.1" - } + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz", + "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==" + }, + "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.1", - "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz", - "integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz", + "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=", "optional": true, "requires": { - "tweetnacl": "0.14.5" + "tweetnacl": "^0.14.3" }, "dependencies": { "tweetnacl": { @@ -71,21 +94,22 @@ } } }, - "boom": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/boom/-/boom-4.3.1.tgz", - "integrity": "sha1-T4owBctKfjiJ90kDD9JbluAdLjE=", - "requires": { - "hoek": "4.2.1" - } - }, "booru": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/booru/-/booru-0.4.0.tgz", "integrity": "sha512-kWN7uW9yPZZyMh8u6ORXIJ5nhpSBA+EVmDr9Gq5gMcGVjyGpdf4C2nIIvl9isR5VnozTJQPk7poN5IaQqndr2g==", "requires": { - "snekfetch": "3.6.4", - "xml2js": "0.4.19" + "snekfetch": "^3.6.4", + "xml2js": "^0.4.17" + } + }, + "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": { @@ -93,118 +117,124 @@ "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=" }, + "chownr": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.1.tgz", + "integrity": "sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g==" + }, "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=" + }, "combined-stream": { "version": "1.0.6", - "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz", + "resolved": "http://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz", "integrity": "sha1-cj599ugBrFYTETp+RFqbactjKBg=", "requires": { - "delayed-stream": "1.0.0" + "delayed-stream": "~1.0.0" } }, "common-tags": { - "version": "1.7.2", - "resolved": "https://registry.npmjs.org/common-tags/-/common-tags-1.7.2.tgz", - "integrity": "sha512-joj9ZlUOjCrwdbmiLqafeUSgkUM74NqhLsZtSqDmhKudaIY197zTrb8JMl31fMnCUuxwFT23eC/oWvrZzDLRJQ==", - "requires": { - "babel-runtime": "6.26.0" - } + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/common-tags/-/common-tags-1.8.0.tgz", + "integrity": "sha512-6P6g0uetGpW/sdyUy/iQQCbFF0kWVMSIVSyYz7Zgjcgh8mgw8PQzDNZeyZ5DQ2gM7LBoZPHmnjz8rUthkBG5tw==" }, - "core-js": { - "version": "2.5.4", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.4.tgz", - "integrity": "sha1-8si/GB8qgLkvNgEhQpzmOi8K6uA=" + "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": "3.1.2", - "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-3.1.2.tgz", - "integrity": "sha1-qJ+7Ig9c4l7FboxKqKT9e1sNKf4=", - "requires": { - "boom": "5.2.0" - }, - "dependencies": { - "boom": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz", - "integrity": "sha512-Z5BTk6ZRe4tXXQlkqftmsAUANpXmuwlsF5Oov8ThoMbQRzdGTA1ngYRW160GexgOgjsFOKJz0LYhoNi+2AMBUw==", - "requires": { - "hoek": "4.2.1" - } - } - } - }, "danbooru": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/danbooru/-/danbooru-3.0.7.tgz", - "integrity": "sha512-f2iZzl+apE9H46DR/8oilU+EjcGCvfQivGicP1hsK+LqB0xAIRbCIQQryweET+fThZbw2Vd13cP34xOF5V+3PQ==" + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/danbooru/-/danbooru-3.0.8.tgz", + "integrity": "sha512-44C5budpnZINspc6HE7MKIF/3eXgatbfZg6BypmC+zJJ8D9C/JQuZ+zs+2w62slbBFstOfwiBPwFCxs/3rzsVQ==" }, "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" + "assert-plus": "^1.0.0" + } + }, + "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" } }, "deep-extend": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.5.0.tgz", - "integrity": "sha1-bvSgmwX5iw41jW2T1Mo8rsZnKAM=" + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz", + "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==" }, "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": "11.3.2", - "resolved": "https://registry.npmjs.org/discord.js/-/discord.js-11.3.2.tgz", - "integrity": "sha512-Abw9CTMX3Jb47IeRffqx2VNSnXl/OsTdQzhvbw/JnqCyqc2imAocc7pX2HoRmgKd8CgSqsjBFBneusz/E16e6A==", + "version": "github:discordjs/discord.js#4491b7b42ae19ca81338736d811f3b12d493a5f3", + "from": "github:discordjs/discord.js", "requires": { - "long": "4.0.0", - "prism-media": "0.0.2", - "snekfetch": "3.6.4", - "tweetnacl": "1.0.0", - "ws": "4.1.0" - }, - "dependencies": { - "ws": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ws/-/ws-4.1.0.tgz", - "integrity": "sha512-ZGh/8kF9rrRNffkLFV4AzhvooEclrOH0xaugmqGsIfFgOE/pIz4fMc4Ef+5HSQqTEug2S9JZIWDR47duDSLfaA==", - "requires": { - "async-limiter": "1.0.0", - "safe-buffer": "5.1.1" - } - } + "form-data": "^2.3.2", + "node-fetch": "^2.1.2", + "pako": "^1.0.0", + "prism-media": "github:amishshah/prism-media#7146426e462bf91b39053de4cf8b78c72490cd54", + "tweetnacl": "^1.0.0", + "ws": "^6.0.0" } }, "discord.js-commando": { - "version": "0.9.0", - "resolved": "https://registry.npmjs.org/discord.js-commando/-/discord.js-commando-0.9.0.tgz", - "integrity": "sha1-+dz+trjKuMxYXNXMfKbBxKmaLpQ=", + "version": "github:discordjs/Commando#f844d021d637f9e1e261d7119d52cf2478946aa9", + "from": "github:discordjs/Commando", "requires": { - "common-tags": "1.7.2", - "escape-string-regexp": "1.0.5", - "require-all": "2.2.0" + "common-tags": "^1.0.0", + "escape-string-regexp": "^1.0.0", + "require-all": "^3.0.0" } }, + "dotenv": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-6.1.0.tgz", + "integrity": "sha512-/veDn2ztgRlB7gKmE3i9f6CmDIyXAy6d5nBq+whO9SLX+Zs1sXEgFLPi+aSuWqUuusMfbi84fT8j34fs1HaYUw==" + }, "ecc-jsbn": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz", - "integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=", + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz", + "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=", "optional": true, "requires": { - "jsbn": "0.1.1" + "jsbn": "~0.1.0", + "safer-buffer": "^2.1.0" } }, "escape-string-regexp": { @@ -213,9 +243,9 @@ "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=" }, "extend": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz", - "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=" + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", + "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==" }, "extsprintf": { "version": "1.3.0", @@ -242,9 +272,37 @@ "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.2.tgz", "integrity": "sha1-SXBJi+YEwgwAXU9cI67NIda0kJk=", "requires": { - "asynckit": "0.4.0", + "asynckit": "^0.4.0", "combined-stream": "1.0.6", - "mime-types": "2.1.18" + "mime-types": "^2.1.12" + } + }, + "fs-minipass": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.5.tgz", + "integrity": "sha512-JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ==", + "requires": { + "minipass": "^2.2.1" + } + }, + "fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" + }, + "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" } }, "getpass": { @@ -252,7 +310,20 @@ "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", "requires": { - "assert-plus": "1.0.0" + "assert-plus": "^1.0.0" + } + }, + "glob": { + "version": "7.1.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz", + "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==", + "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" } }, "har-schema": { @@ -261,50 +332,82 @@ "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=" }, "har-validator": { - "version": "5.0.3", - "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz", - "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=", - "requires": { - "ajv": "5.5.2", - "har-schema": "2.0.0" - } - }, - "hawk": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/hawk/-/hawk-6.0.2.tgz", - "integrity": "sha512-miowhl2+U7Qle4vdLqDdPt9m09K6yZhkLDTWGoUiUzrQCn+mHHSmfJgAyGaLRZbPmTqfFFjRV1QWCW0VWUJBbQ==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.0.tgz", + "integrity": "sha512-+qnmNjI4OfH2ipQ9VQOw23bBd/ibtfbVdK2fYbY4acTDqKTW/YDp9McimZdDbG8iV9fZizUqQMD5xvriB146TA==", "requires": { - "boom": "4.3.1", - "cryptiles": "3.1.2", - "hoek": "4.2.1", - "sntp": "2.1.0" + "ajv": "^5.3.0", + "har-schema": "^2.0.0" } }, - "hoek": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.1.tgz", - "integrity": "sha512-QLg82fGkfnJ/4iy1xZ81/9SIJiq1NGFUMGs6ParyjBZr6jW2Ufj/snDqTHixNlHdPNwN2RLVD0Pi3igeK9+JfA==" + "has-unicode": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", + "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=" }, "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.4.1", - "sshpk": "1.14.1" + "assert-plus": "^1.0.0", + "jsprim": "^1.2.2", + "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==", + "requires": { + "safer-buffer": ">= 2.1.2 < 3" + } + }, + "ignore-walk": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.1.tgz", + "integrity": "sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==", + "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.1", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", - "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=" + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", + "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" + }, + "ini": { + "version": "1.3.5", + "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz", + "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==" + }, + "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-typedarray": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=" }, + "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", @@ -342,873 +445,377 @@ "verror": "1.10.0" } }, - "long": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/long/-/long-4.0.0.tgz", - "integrity": "sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==" - }, "mime-db": { - "version": "1.33.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.33.0.tgz", - "integrity": "sha512-BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ==" + "version": "1.36.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.36.0.tgz", + "integrity": "sha512-L+xvyD9MkoYMXb1jAmzI/lWYAxAMCPvIBSWur0PZ5nOf5euahRLVqH//FKW9mWp2lkqUgYiXPgkzfMUFi4zVDw==" }, "mime-types": { - "version": "2.1.18", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.18.tgz", - "integrity": "sha512-lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ==", + "version": "2.1.20", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.20.tgz", + "integrity": "sha512-HrkrPaP9vGuWbLK1B1FfgAkbqNjIuy4eHlIYnFi7kamZyLLrGlo2mpcx0bBmNpKqBtYtAfGbodDddIgddSJC2A==", + "requires": { + "mime-db": "~1.36.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": "0.0.8", + "resolved": "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", + "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=" + }, + "minipass": { + "version": "2.3.4", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.3.4.tgz", + "integrity": "sha512-mlouk1OHlaUE8Odt1drMtG1bAJA4ZA6B/ehysgV0LUIrDHdKgo1KorZq3pK0b/7Z7LJIQ12MNM6aC+Tn6lUZ5w==", "requires": { - "mime-db": "1.33.0" + "safe-buffer": "^5.1.2", + "yallist": "^3.0.0" + } + }, + "minizlib": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.1.1.tgz", + "integrity": "sha512-TrfjCjk4jLhcJyGMYymBH6oTXcWjYbUAXTHDbtnWHjZC25h0cdajHuPE1zxb4DVmu8crfh+HwH/WMuyLG0nHBg==", + "requires": { + "minipass": "^2.2.1" + } + }, + "mkdirp": { + "version": "0.5.1", + "resolved": "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", + "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", + "requires": { + "minimist": "0.0.8" } }, "moment": { - "version": "2.22.1", - "resolved": "https://registry.npmjs.org/moment/-/moment-2.22.1.tgz", - "integrity": "sha512-shJkRTSebXvsVqk56I+lkb2latjBs8I+pc2TzWc545y2iFnSjm7Wg0QMh+ZWcdSLQyGEau5jI8ocnmkyTgr9YQ==" + "version": "2.22.2", + "resolved": "https://registry.npmjs.org/moment/-/moment-2.22.2.tgz", + "integrity": "sha1-PCV/mDn8DpP/UxSWMiOeuQeD/2Y=" }, "moment-duration-format": { "version": "2.2.2", "resolved": "https://registry.npmjs.org/moment-duration-format/-/moment-duration-format-2.2.2.tgz", "integrity": "sha1-uVdhLeJgFsmtnrYIfAVFc+USd3k=" }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + }, + "nan": { + "version": "2.10.0", + "resolved": "http://registry.npmjs.org/nan/-/nan-2.10.0.tgz", + "integrity": "sha512-bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA==" + }, + "needle": { + "version": "2.2.4", + "resolved": "https://registry.npmjs.org/needle/-/needle-2.2.4.tgz", + "integrity": "sha512-HyoqEb4wr/rsoaIDfTH2aVL9nWtQqba2/HvMv+++m8u0dz808MaagKILxtfeSN7QU7nvbQ79zk3vYOJp9zsNEA==", + "requires": { + "debug": "^2.1.2", + "iconv-lite": "^0.4.4", + "sax": "^1.2.4" + } + }, + "node-fetch": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.2.0.tgz", + "integrity": "sha512-OayFWziIxiHY8bCUyLX6sTpDH8Jsbp4FfYd1j1f7vZyfgkcOnAyM4oQR16f8a0s7Gl/viMGRey8eScYk4V4EZA==" + }, + "node-pre-gyp": { + "version": "0.10.3", + "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.10.3.tgz", + "integrity": "sha512-d1xFs+C/IPS8Id0qPTZ4bUT8wWryfR/OzzAFxweG+uLN85oPzyo2Iw6bVlLQ/JOdgNonXLCoRyqDzDWq4iw72A==", + "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" + } + }, + "nopt": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz", + "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=", + "requires": { + "abbrev": "1", + "osenv": "^0.1.4" + } + }, + "npm-bundled": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.5.tgz", + "integrity": "sha512-m/e6jgWu8/v5niCUKQi9qQl8QdeEduFA96xHDDzFGqly0OOjI7c+60KM/2sppfnUU9JJagf+zs+yGhqSOFj71g==" + }, + "npm-packlist": { + "version": "1.1.12", + "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.1.12.tgz", + "integrity": "sha512-WJKFOVMeAlsU/pjXuqVdzU0WfgtIBCupkEVwn+1Y0ERAbUfWw8R4GjgVbaKnUjRoD2FoQbHOCbOyT5Mbs9Lw4g==", + "requires": { + "ignore-walk": "^3.0.1", + "npm-bundled": "^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" + } + }, + "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.8.2", - "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz", - "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=" + "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" + } + }, + "pako": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.6.tgz", + "integrity": "sha512-lQe48YPsMJAig+yngZ87Lus+NF+3mtu7DVOBu6b/gHO1YpKwIj5AWjZ/TOS7i46HD/UixzWb1zeWDZfGZ3iYcg==" }, "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.10", - "util": "0.10.3" + "process": "^0.11.1", + "util": "^0.10.3" } }, + "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=" }, "prism-media": { - "version": "0.0.2", - "resolved": "https://registry.npmjs.org/prism-media/-/prism-media-0.0.2.tgz", - "integrity": "sha512-L6yc8P5NVG35ivzvfI7bcTYzqFV+K8gTfX9YaJbmIFfMXTs71RMnAupvTQPTCteGsiOy9QcNLkQyWjAafY/hCQ==" + "version": "github:amishshah/prism-media#7146426e462bf91b39053de4cf8b78c72490cd54", + "from": "github:amishshah/prism-media" }, "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.0", + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz", + "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==" + }, + "psl": { + "version": "1.1.29", + "resolved": "https://registry.npmjs.org/psl/-/psl-1.1.29.tgz", + "integrity": "sha512-AeUmQ0oLN02flVHXWh9sSJF7mcdFq0ppid/JkErufc3hGIV/AMa8Fo9VgDo/cT2jFdOWoFvHp90qqBH54W+gjQ==" + }, "punycode": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=" }, "qs": { - "version": "6.5.1", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz", - "integrity": "sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A==" + "version": "6.5.2", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz", + "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==" + }, + "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": { + "minimist": { + "version": "1.2.0", + "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=" + } + } }, - "regenerator-runtime": { - "version": "0.11.1", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz", - "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==" + "readable-stream": { + "version": "2.3.6", + "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "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" + } }, "request": { - "version": "2.85.0", - "resolved": "https://registry.npmjs.org/request/-/request-2.85.0.tgz", - "integrity": "sha512-8H7Ehijd4js+s6wuVPLjwORxD4zeuyjYugprdOXlPSqaApmL/QOy+EB/beICHVCHkGMKNh5rvihb5ov+IDw4mg==", + "version": "2.88.0", + "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz", + "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==", "requires": { - "aws-sign2": "0.7.0", - "aws4": "1.7.0", - "caseless": "0.12.0", - "combined-stream": "1.0.6", - "extend": "3.0.1", - "forever-agent": "0.6.1", - "form-data": "2.3.2", - "har-validator": "5.0.3", - "hawk": "6.0.2", - "http-signature": "1.2.0", - "is-typedarray": "1.0.0", - "isstream": "0.1.2", - "json-stringify-safe": "5.0.1", - "mime-types": "2.1.18", - "oauth-sign": "0.8.2", - "performance-now": "2.1.0", - "qs": "6.5.1", - "safe-buffer": "5.1.1", - "stringstream": "0.0.5", - "tough-cookie": "2.3.4", - "tunnel-agent": "0.6.0", - "uuid": "3.2.1" + "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.0", + "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.4.3", + "tunnel-agent": "^0.6.0", + "uuid": "^3.3.2" } }, "require-all": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/require-all/-/require-all-2.2.0.tgz", - "integrity": "sha1-tEIMIzrAKC0P9Jsnf7iAqLXeCJQ=" + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/require-all/-/require-all-3.0.0.tgz", + "integrity": "sha1-Rz1JcEvjEBFc4ST3c4Ox69hnExI=" + }, + "rimraf": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz", + "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==", + "requires": { + "glob": "^7.0.5" + } }, "safe-buffer": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz", - "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==" + "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": "5.6.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz", + "integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==" + }, + "set-blocking": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", + "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=" + }, + "signal-exit": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz", + "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=" + }, "snekfetch": { "version": "3.6.4", "resolved": "https://registry.npmjs.org/snekfetch/-/snekfetch-3.6.4.tgz", "integrity": "sha512-NjxjITIj04Ffqid5lqr7XdgwM7X61c/Dns073Ly170bPQHLm6jkmelye/eglS++1nfTWktpP6Y2bFXjdPlQqdw==" }, - "sntp": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/sntp/-/sntp-2.1.0.tgz", - "integrity": "sha512-FL1b58BDrqS3A11lJ0zEdnJ3UOKqVxawAkF3k7F0CVN7VQ34aZrV+G8BZ1WC9ZL7NyrwsW0oviwsWDgRuVYtJg==", - "requires": { - "hoek": "4.2.1" - } - }, "sqlite": { - "version": "2.9.1", - "resolved": "https://registry.npmjs.org/sqlite/-/sqlite-2.9.1.tgz", - "integrity": "sha512-cu+Bkf5Kwc8JHoNr/iu3m+ZDzly5KIDc7omjwNimF7yZCTd+cIEzLpVXkYXJQFPz8GvHHrNvyqHIKE9JOvMzAw==", + "version": "2.9.3", + "resolved": "https://registry.npmjs.org/sqlite/-/sqlite-2.9.3.tgz", + "integrity": "sha512-2LJxdgtXsif9xR2D8KnM8Ki3g0dmOktba1B/6TanYCKx697J0sKfw+i28yRjtjPz5O/uzbEa1m1RXXgR2p9G0Q==", "requires": { - "sqlite3": "3.1.13" + "sqlite3": "^4.0.0" } }, "sqlite3": { - "version": "3.1.13", - "resolved": "https://registry.npmjs.org/sqlite3/-/sqlite3-3.1.13.tgz", - "integrity": "sha512-JxXKPJnkZ6NuHRojq+g2WXWBt3M1G9sjZaYiHEWSTGijDM3cwju/0T2XbWqMXFmPqDgw+iB7zKQvnns4bvzXlw==", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/sqlite3/-/sqlite3-4.0.2.tgz", + "integrity": "sha512-51ferIRwYOhzUEtogqOa/y9supADlAht98bF/gbIi6WkzRJX6Yioldxbzj1MV4yV+LgdKD/kkHwFTeFXOG4htA==", "requires": { - "nan": "2.7.0", - "node-pre-gyp": "0.6.38" - }, - "dependencies": { - "abbrev": { - "version": "1.1.1", - "bundled": true - }, - "ajv": { - "version": "4.11.8", - "bundled": true, - "requires": { - "co": "4.6.0", - "json-stable-stringify": "1.0.1" - } - }, - "ansi-regex": { - "version": "2.1.1", - "bundled": true - }, - "aproba": { - "version": "1.2.0", - "bundled": true - }, - "are-we-there-yet": { - "version": "1.1.4", - "bundled": true, - "requires": { - "delegates": "1.0.0", - "readable-stream": "2.3.3" - } - }, - "asn1": { - "version": "0.2.3", - "bundled": true - }, - "assert-plus": { - "version": "0.2.0", - "bundled": true - }, - "asynckit": { - "version": "0.4.0", - "bundled": true - }, - "aws-sign2": { - "version": "0.6.0", - "bundled": true - }, - "aws4": { - "version": "1.6.0", - "bundled": true - }, - "balanced-match": { - "version": "1.0.0", - "bundled": true - }, - "bcrypt-pbkdf": { - "version": "1.0.1", - "bundled": true, - "optional": true, - "requires": { - "tweetnacl": "0.14.5" - } - }, - "block-stream": { - "version": "0.0.9", - "bundled": true, - "requires": { - "inherits": "2.0.3" - } - }, - "boom": { - "version": "2.10.1", - "bundled": true, - "requires": { - "hoek": "2.16.3" - } - }, - "brace-expansion": { - "version": "1.1.8", - "bundled": true, - "requires": { - "balanced-match": "1.0.0", - "concat-map": "0.0.1" - } - }, - "caseless": { - "version": "0.12.0", - "bundled": true - }, - "co": { - "version": "4.6.0", - "bundled": true - }, - "code-point-at": { - "version": "1.1.0", - "bundled": true - }, - "combined-stream": { - "version": "1.0.5", - "bundled": true, - "requires": { - "delayed-stream": "1.0.0" - } - }, - "concat-map": { - "version": "0.0.1", - "bundled": true - }, - "console-control-strings": { - "version": "1.1.0", - "bundled": true - }, - "core-util-is": { - "version": "1.0.2", - "bundled": true - }, - "cryptiles": { - "version": "2.0.5", - "bundled": true, - "requires": { - "boom": "2.10.1" - } - }, - "dashdash": { - "version": "1.14.1", - "bundled": true, - "requires": { - "assert-plus": "1.0.0" - }, - "dependencies": { - "assert-plus": { - "version": "1.0.0", - "bundled": true - } - } - }, - "debug": { - "version": "2.6.9", - "bundled": true, - "requires": { - "ms": "2.0.0" - } - }, - "deep-extend": { - "version": "0.4.2", - "bundled": true - }, - "delayed-stream": { - "version": "1.0.0", - "bundled": true - }, - "delegates": { - "version": "1.0.0", - "bundled": true - }, - "ecc-jsbn": { - "version": "0.1.1", - "bundled": true, - "optional": true, - "requires": { - "jsbn": "0.1.1" - } - }, - "extend": { - "version": "3.0.1", - "bundled": true - }, - "extsprintf": { - "version": "1.3.0", - "bundled": true - }, - "forever-agent": { - "version": "0.6.1", - "bundled": true - }, - "form-data": { - "version": "2.1.4", - "bundled": true, - "requires": { - "asynckit": "0.4.0", - "combined-stream": "1.0.5", - "mime-types": "2.1.17" - } - }, - "fs.realpath": { - "version": "1.0.0", - "bundled": true - }, - "fstream": { - "version": "1.0.11", - "bundled": true, - "requires": { - "graceful-fs": "4.1.11", - "inherits": "2.0.3", - "mkdirp": "0.5.1", - "rimraf": "2.6.2" - } - }, - "fstream-ignore": { - "version": "1.0.5", - "bundled": true, - "requires": { - "fstream": "1.0.11", - "inherits": "2.0.3", - "minimatch": "3.0.4" - } - }, - "gauge": { - "version": "2.7.4", - "bundled": true, - "requires": { - "aproba": "1.2.0", - "console-control-strings": "1.1.0", - "has-unicode": "2.0.1", - "object-assign": "4.1.1", - "signal-exit": "3.0.2", - "string-width": "1.0.2", - "strip-ansi": "3.0.1", - "wide-align": "1.1.2" - } - }, - "getpass": { - "version": "0.1.7", - "bundled": true, - "requires": { - "assert-plus": "1.0.0" - }, - "dependencies": { - "assert-plus": { - "version": "1.0.0", - "bundled": true - } - } - }, - "glob": { - "version": "7.1.2", - "bundled": true, - "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" - } - }, - "graceful-fs": { - "version": "4.1.11", - "bundled": true - }, - "har-schema": { - "version": "1.0.5", - "bundled": true - }, - "har-validator": { - "version": "4.2.1", - "bundled": true, - "requires": { - "ajv": "4.11.8", - "har-schema": "1.0.5" - } - }, - "has-unicode": { - "version": "2.0.1", - "bundled": true - }, - "hawk": { - "version": "3.1.3", - "bundled": true, - "requires": { - "boom": "2.10.1", - "cryptiles": "2.0.5", - "hoek": "2.16.3", - "sntp": "1.0.9" - } - }, - "hoek": { - "version": "2.16.3", - "bundled": true - }, - "http-signature": { - "version": "1.1.1", - "bundled": true, - "requires": { - "assert-plus": "0.2.0", - "jsprim": "1.4.1", - "sshpk": "1.13.1" - } - }, - "inflight": { - "version": "1.0.6", - "bundled": true, - "requires": { - "once": "1.4.0", - "wrappy": "1.0.2" - } - }, - "inherits": { - "version": "2.0.3", - "bundled": true - }, - "ini": { - "version": "1.3.4", - "bundled": true - }, - "is-fullwidth-code-point": { - "version": "1.0.0", - "bundled": true, - "requires": { - "number-is-nan": "1.0.1" - } - }, - "is-typedarray": { - "version": "1.0.0", - "bundled": true - }, - "isarray": { - "version": "1.0.0", - "bundled": true - }, - "isstream": { - "version": "0.1.2", - "bundled": true - }, - "jsbn": { - "version": "0.1.1", - "bundled": true, - "optional": true - }, - "json-schema": { - "version": "0.2.3", - "bundled": true - }, - "json-stable-stringify": { - "version": "1.0.1", - "bundled": true, - "requires": { - "jsonify": "0.0.0" - } - }, - "json-stringify-safe": { - "version": "5.0.1", - "bundled": true - }, - "jsonify": { - "version": "0.0.0", - "bundled": true - }, - "jsprim": { - "version": "1.4.1", - "bundled": true, - "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", - "bundled": true - } - } - }, - "mime-db": { - "version": "1.30.0", - "bundled": true - }, - "mime-types": { - "version": "2.1.17", - "bundled": true, - "requires": { - "mime-db": "1.30.0" - } - }, - "minimatch": { - "version": "3.0.4", - "bundled": true, - "requires": { - "brace-expansion": "1.1.8" - } - }, - "minimist": { - "version": "0.0.8", - "bundled": true - }, - "mkdirp": { - "version": "0.5.1", - "bundled": true, - "requires": { - "minimist": "0.0.8" - } - }, - "ms": { - "version": "2.0.0", - "bundled": true - }, - "nan": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.7.0.tgz", - "integrity": "sha1-2Vv3IeyHfgjbJ27T/G63j5CDrUY=" - }, - "node-pre-gyp": { - "version": "0.6.38", - "bundled": true, - "requires": { - "hawk": "3.1.3", - "mkdirp": "0.5.1", - "nopt": "4.0.1", - "npmlog": "4.1.2", - "rc": "1.2.1", - "request": "2.81.0", - "rimraf": "2.6.2", - "semver": "5.4.1", - "tar": "2.2.1", - "tar-pack": "3.4.0" - } - }, - "nopt": { - "version": "4.0.1", - "bundled": true, - "requires": { - "abbrev": "1.1.1", - "osenv": "0.1.4" - } - }, - "npmlog": { - "version": "4.1.2", - "bundled": true, - "requires": { - "are-we-there-yet": "1.1.4", - "console-control-strings": "1.1.0", - "gauge": "2.7.4", - "set-blocking": "2.0.0" - } - }, - "number-is-nan": { - "version": "1.0.1", - "bundled": true - }, - "oauth-sign": { - "version": "0.8.2", - "bundled": true - }, - "object-assign": { - "version": "4.1.1", - "bundled": true - }, - "once": { - "version": "1.4.0", - "bundled": true, - "requires": { - "wrappy": "1.0.2" - } - }, - "os-homedir": { - "version": "1.0.2", - "bundled": true - }, - "os-tmpdir": { - "version": "1.0.2", - "bundled": true - }, - "osenv": { - "version": "0.1.4", - "bundled": true, - "requires": { - "os-homedir": "1.0.2", - "os-tmpdir": "1.0.2" - } - }, - "path-is-absolute": { - "version": "1.0.1", - "bundled": true - }, - "performance-now": { - "version": "0.2.0", - "bundled": true - }, - "process-nextick-args": { - "version": "1.0.7", - "bundled": true - }, - "punycode": { - "version": "1.4.1", - "bundled": true - }, - "qs": { - "version": "6.4.0", - "bundled": true - }, - "rc": { - "version": "1.2.1", - "bundled": true, - "requires": { - "deep-extend": "0.4.2", - "ini": "1.3.4", - "minimist": "1.2.0", - "strip-json-comments": "2.0.1" - }, - "dependencies": { - "minimist": { - "version": "1.2.0", - "bundled": true - } - } - }, - "readable-stream": { - "version": "2.3.3", - "bundled": true, - "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.3", - "isarray": "1.0.0", - "process-nextick-args": "1.0.7", - "safe-buffer": "5.1.1", - "string_decoder": "1.0.3", - "util-deprecate": "1.0.2" - } - }, - "request": { - "version": "2.81.0", - "bundled": true, - "requires": { - "aws-sign2": "0.6.0", - "aws4": "1.6.0", - "caseless": "0.12.0", - "combined-stream": "1.0.5", - "extend": "3.0.1", - "forever-agent": "0.6.1", - "form-data": "2.1.4", - "har-validator": "4.2.1", - "hawk": "3.1.3", - "http-signature": "1.1.1", - "is-typedarray": "1.0.0", - "isstream": "0.1.2", - "json-stringify-safe": "5.0.1", - "mime-types": "2.1.17", - "oauth-sign": "0.8.2", - "performance-now": "0.2.0", - "qs": "6.4.0", - "safe-buffer": "5.1.1", - "stringstream": "0.0.5", - "tough-cookie": "2.3.3", - "tunnel-agent": "0.6.0", - "uuid": "3.1.0" - } - }, - "rimraf": { - "version": "2.6.2", - "bundled": true, - "requires": { - "glob": "7.1.2" - } - }, - "safe-buffer": { - "version": "5.1.1", - "bundled": true - }, - "semver": { - "version": "5.4.1", - "bundled": true - }, - "set-blocking": { - "version": "2.0.0", - "bundled": true - }, - "signal-exit": { - "version": "3.0.2", - "bundled": true - }, - "sntp": { - "version": "1.0.9", - "bundled": true, - "requires": { - "hoek": "2.16.3" - } - }, - "sshpk": { - "version": "1.13.1", - "bundled": true, - "requires": { - "asn1": "0.2.3", - "assert-plus": "1.0.0", - "bcrypt-pbkdf": "1.0.1", - "dashdash": "1.14.1", - "ecc-jsbn": "0.1.1", - "getpass": "0.1.7", - "jsbn": "0.1.1", - "tweetnacl": "0.14.5" - }, - "dependencies": { - "assert-plus": { - "version": "1.0.0", - "bundled": true - } - } - }, - "string-width": { - "version": "1.0.2", - "bundled": true, - "requires": { - "code-point-at": "1.1.0", - "is-fullwidth-code-point": "1.0.0", - "strip-ansi": "3.0.1" - } - }, - "string_decoder": { - "version": "1.0.3", - "bundled": true, - "requires": { - "safe-buffer": "5.1.1" - } - }, - "stringstream": { - "version": "0.0.5", - "bundled": true - }, - "strip-ansi": { - "version": "3.0.1", - "bundled": true, - "requires": { - "ansi-regex": "2.1.1" - } - }, - "strip-json-comments": { - "version": "2.0.1", - "bundled": true - }, - "tar": { - "version": "2.2.1", - "bundled": true, - "requires": { - "block-stream": "0.0.9", - "fstream": "1.0.11", - "inherits": "2.0.3" - } - }, - "tar-pack": { - "version": "3.4.0", - "bundled": true, - "requires": { - "debug": "2.6.9", - "fstream": "1.0.11", - "fstream-ignore": "1.0.5", - "once": "1.4.0", - "readable-stream": "2.3.3", - "rimraf": "2.6.2", - "tar": "2.2.1", - "uid-number": "0.0.6" - } - }, - "tough-cookie": { - "version": "2.3.3", - "bundled": true, - "requires": { - "punycode": "1.4.1" - } - }, - "tunnel-agent": { - "version": "0.6.0", - "bundled": true, - "requires": { - "safe-buffer": "5.1.1" - } - }, - "tweetnacl": { - "version": "0.14.5", - "bundled": true, - "optional": true - }, - "uid-number": { - "version": "0.0.6", - "bundled": true - }, - "util-deprecate": { - "version": "1.0.2", - "bundled": true - }, - "uuid": { - "version": "3.1.0", - "bundled": true - }, - "verror": { - "version": "1.10.0", - "bundled": true, - "requires": { - "assert-plus": "1.0.0", - "core-util-is": "1.0.2", - "extsprintf": "1.3.0" - }, - "dependencies": { - "assert-plus": { - "version": "1.0.0", - "bundled": true - } - } - }, - "wide-align": { - "version": "1.1.2", - "bundled": true, - "requires": { - "string-width": "1.0.2" - } - }, - "wrappy": { - "version": "1.0.2", - "bundled": true - } + "nan": "~2.10.0", + "node-pre-gyp": "^0.10.3", + "request": "^2.87.0" } }, "sshpk": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.14.1.tgz", - "integrity": "sha1-Ew9Zde3a2WPx1W+SuaxsUfqfg+s=", + "version": "1.14.2", + "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.14.2.tgz", + "integrity": "sha1-xvxhZIo9nE52T9P8306hBeSSupg=", "requires": { - "asn1": "0.2.3", - "assert-plus": "1.0.0", - "bcrypt-pbkdf": "1.0.1", - "dashdash": "1.14.1", - "ecc-jsbn": "0.1.1", - "getpass": "0.1.7", - "jsbn": "0.1.1", - "tweetnacl": "0.14.5" + "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": { @@ -1219,17 +826,58 @@ } } }, - "stringstream": { - "version": "0.0.5", - "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz", - "integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg=" + "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.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" + } + }, + "strip-ansi": { + "version": "3.0.1", + "resolved": "http://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=" + }, + "tar": { + "version": "4.4.6", + "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.6.tgz", + "integrity": "sha512-tMkTnh9EdzxyfW+6GK6fCahagXsnYk6kE6S9Gr9pjVdys769+laCTbodXDhPAjzVtEBazRgP0gYqOjnk9dQzLg==", + "requires": { + "chownr": "^1.0.1", + "fs-minipass": "^1.2.5", + "minipass": "^2.3.3", + "minizlib": "^1.1.0", + "mkdirp": "^0.5.0", + "safe-buffer": "^5.1.2", + "yallist": "^3.0.2" + } }, "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==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz", + "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==", "requires": { - "punycode": "1.4.1" + "psl": "^1.1.24", + "punycode": "^1.4.1" } }, "tunnel-agent": { @@ -1237,7 +885,7 @@ "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", "requires": { - "safe-buffer": "5.1.1" + "safe-buffer": "^5.0.1" } }, "tweetnacl": { @@ -1250,31 +898,64 @@ "resolved": "https://registry.npmjs.org/twitter/-/twitter-1.7.1.tgz", "integrity": "sha1-B2I3jx3BwFDkj2ZqypBOJLGpYvQ=", "requires": { - "deep-extend": "0.5.0", - "request": "2.85.0" + "deep-extend": "^0.5.0", + "request": "^2.72.0" + }, + "dependencies": { + "deep-extend": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.5.1.tgz", + "integrity": "sha512-N8vBdOa+DF7zkRrDCsaOXoCs/E2fJfx9B9MrKnnSiHNh4ws7eSys6YQE4KvT1cecKmOASYQBhbKjeuDD9lT81w==" + } } }, "util": { - "version": "0.10.3", - "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz", - "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=", + "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.1" + "inherits": "2.0.3" } }, + "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.2.1", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.2.1.tgz", - "integrity": "sha512-jZnMwlb9Iku/O3smGWvZhauCf6cvvpKi4BKRiliS3cxnI+Gz9j5MEpTz2UFuXiKPJocb7gnsLHwiS05ige5BEA==" + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz", + "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==" }, "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", + "assert-plus": "^1.0.0", "core-util-is": "1.0.2", - "extsprintf": "1.3.0" + "extsprintf": "^1.2.0" + } + }, + "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": "6.1.0", + "resolved": "https://registry.npmjs.org/ws/-/ws-6.1.0.tgz", + "integrity": "sha512-H3dGVdGvW2H8bnYpIDc3u3LH8Wue3Qh+Zto6aXXFzvESkTVT6rAfKR6tR/+coaUvxs8yHtmNV0uioBF62ZGSTg==", + "requires": { + "async-limiter": "~1.0.0" } }, "xml2js": { @@ -1282,14 +963,19 @@ "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.19.tgz", "integrity": "sha512-esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q==", "requires": { - "sax": "1.2.4", - "xmlbuilder": "9.0.7" + "sax": ">=0.6.0", + "xmlbuilder": "~9.0.1" } }, "xmlbuilder": { "version": "9.0.7", - "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz", + "resolved": "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz", "integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=" + }, + "yallist": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.2.tgz", + "integrity": "sha1-hFK0u36Dx8GI2AQcGoN8dz1ti7k=" } } } diff --git a/package.json b/package.json index 438372a..96c344d 100644 --- a/package.json +++ b/package.json @@ -1,18 +1,18 @@ { "name": "mei-discord", - "version": "1.1.3", + "version": "2.0.0", "description": "An interactive discord bot", - "main": "index.js", + "main": "Mei.js", "engines": { "node": "8.11.1", "npm": "5.6.0" }, "dependencies": { "booru": "^0.4.0", - "common-tags": "^1.7.2", "danbooru": "^3.0.7", - "discord.js": "^11.3.2", - "discord.js-commando": "^0.9.0", + "discord.js": "github:discordjs/discord.js", + "discord.js-commando": "github:discordjs/Commando", + "dotenv": "^6.0.0", "moment": "^2.22.1", "moment-duration-format": "^2.2.2", "path": "^0.12.7", @@ -22,7 +22,6 @@ }, "devDependencies": {}, "scripts": { - "test": "echo \"Error: no test specified\" && exit 1", "start": "node index.js" }, "repository": {