diff --git a/.gitignore b/.gitignore index 6bc92775..ba90d134 100644 --- a/.gitignore +++ b/.gitignore @@ -114,3 +114,6 @@ build/ # Enmap databases data/ + +# Changelog +CHANGELOG.md \ No newline at end of file diff --git a/.vscode/launch.json b/.vscode/launch.json index b7939ad3..e0c93418 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -12,7 +12,8 @@ "preLaunchTask": "tsc: build", "outFiles": [ "${workspaceFolder}/build/**/*.js" - ] + ], + "outputCapture": "std" } ] } \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md deleted file mode 100644 index c822d30a..00000000 --- a/CHANGELOG.md +++ /dev/null @@ -1,15 +0,0 @@ -# Changelog - -## [v1.0.1](https://github.com/iwa/Kwako/tree/v1.0.1) (2020-08-03) - -**Fixed bugs:** - -- fix '!stop' being usable even if the bot isn't playing music [\#15](https://github.com/iwa/Kwako/issues/15) -- people re-joining don't get their exp & roles back [\#13](https://github.com/iwa/Kwako/issues/13) -- rank card doesn't show up if the bg link is no longer working [\#12](https://github.com/iwa/Kwako/issues/12) - -## [v1.0.0](https://github.com/iwa/Kwako/tree/v1.0.0) (2020-07-30) - - - -\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)* diff --git a/package.json b/package.json index 196fc7ca..ee992042 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "kwako", - "version": "1.0.2", + "version": "1.0.3", "description": "", "main": "build/index.js", "scripts": { @@ -22,6 +22,7 @@ "@discordjs/opus": "^0.3.2", "@types/mongodb": "^3.5.18", "@types/node": "^14.0.27", + "@types/pino": "^6.3.0", "@types/ws": "^7.2.4", "anilist-node": "^1.4.0", "bufferutil": "^4.0.1", @@ -29,10 +30,14 @@ "discord.js": "^12.2.0", "dotenv": "^8.2.0", "mongodb": "^3.5.8", + "pino": "^6.5.1", "popyt": "^4.1.1", "sodium": "^3.0.2", "timespan-parser": "^1.0.2", "utf-8-validate": "^5.0.2", "ytdl-core": "^3.1.2" + }, + "devDependencies": { + "pino-pretty": "^4.1.0" } } diff --git a/src/Logger.ts b/src/Logger.ts new file mode 100644 index 00000000..7764865b --- /dev/null +++ b/src/Logger.ts @@ -0,0 +1,9 @@ +import logger from 'pino'; + +let options: any = { level: 'trace' }; +if (process.env.NODE_ENV !== 'production') + options = { level: 'trace', prettyPrint: true }; + +const log = logger(options); + +export default log; \ No newline at end of file diff --git a/src/commands/actions/boop.ts b/src/commands/actions/boop.ts index 7c89259e..464b3951 100644 --- a/src/commands/actions/boop.ts +++ b/src/commands/actions/boop.ts @@ -1,9 +1,10 @@ import { Client, Message } from 'discord.js' import { Db } from 'mongodb' import actionsRun from '../../utils/actions'; +import { Logger } from 'pino'; -module.exports.run = (bot: Client, msg: Message, args: string[], db: Db) => { - actionsRun(bot, msg, args, db, 'boop', 'boops', false); +module.exports.run = (bot: Client, msg: Message, args: string[], db: Db, log: Logger) => { + actionsRun(bot, msg, args, db, log, 'boop', 'boops', false); }; module.exports.help = { diff --git a/src/commands/actions/cry.ts b/src/commands/actions/cry.ts index f5fa0a23..08ae695f 100644 --- a/src/commands/actions/cry.ts +++ b/src/commands/actions/cry.ts @@ -1,10 +1,11 @@ import { Client, Message, MessageEmbed } from 'discord.js' import utilities from '../../utils/utilities' +import { Logger } from 'pino'; let nbGifs = 9; let lastGif = 0; -module.exports.run = async (bot: Client, msg: Message) => { +module.exports.run = async (bot: Client, msg: Message, args: any, db: any, log: Logger) => { const embed = new MessageEmbed(); embed.setColor('#F2DEB0') embed.setDescription(`**<@${msg.author.id}>** is crying...`) @@ -18,7 +19,7 @@ module.exports.run = async (bot: Client, msg: Message) => { return msg.channel.send(embed) .then(() => { - console.log(`info: cry by ${msg.author.tag}`); + log.info({msg: 'cry', author: { id: msg.author.id, name: msg.author.tag }, guild: msg.guild.id}); }) .catch(console.error); }; diff --git a/src/commands/actions/facepalm.ts b/src/commands/actions/facepalm.ts index 9db92848..a256f67b 100644 --- a/src/commands/actions/facepalm.ts +++ b/src/commands/actions/facepalm.ts @@ -1,6 +1,7 @@ import { Client, Message, MessageEmbed } from 'discord.js' +import { Logger } from 'pino'; -module.exports.run = async (bot: Client, msg: Message) => { +module.exports.run = async (bot: Client, msg: Message, args: any, db: any, log: Logger) => { const embed = new MessageEmbed(); embed.setColor('#F2DEB0') embed.setDescription(`**<@${msg.author.id}>**, facepalm!`) @@ -8,9 +9,9 @@ module.exports.run = async (bot: Client, msg: Message) => { return msg.channel.send(embed) .then(() => { - console.log(`info: facepalm by ${msg.author.tag}`); + log.info({msg: 'facepalm', author: { id: msg.author.id, name: msg.author.tag }, guild: msg.guild.id}); }) - .catch(console.error); + .catch(log.error); }; module.exports.help = { diff --git a/src/commands/actions/glare.ts b/src/commands/actions/glare.ts index 8ef4c4d9..98685e7e 100644 --- a/src/commands/actions/glare.ts +++ b/src/commands/actions/glare.ts @@ -1,9 +1,10 @@ import { Client, Message } from 'discord.js' import { Db } from 'mongodb' import actionsRun from '../../utils/actions'; +import { Logger } from 'pino'; -module.exports.run = (bot: Client, msg: Message, args: string[], db: Db) => { - actionsRun(bot, msg, args, db, 'glare', 'glares', true); +module.exports.run = (bot: Client, msg: Message, args: string[], db: Db, log: Logger) => { + actionsRun(bot, msg, args, db, log, 'glare', 'glares', true); }; module.exports.help = { diff --git a/src/commands/actions/highfive.ts b/src/commands/actions/highfive.ts index d07dd0ff..022d220a 100644 --- a/src/commands/actions/highfive.ts +++ b/src/commands/actions/highfive.ts @@ -1,10 +1,11 @@ import { Client, Message, MessageReaction, User, MessageEmbed } from 'discord.js' import { Db } from 'mongodb' import utilities from '../../utils/utilities'; +import { Logger } from 'pino'; let lastGif: number = 0, count: number = 9; let lastGifFail: number = 0, countFail: number = 5; -module.exports.run = async (bot: Client, msg: Message, args: string[], db: Db) => { +module.exports.run = async (bot: Client, msg: Message, args: string[], db: Db, log: Logger) => { if (msg.mentions.everyone) return; let mention = msg.mentions.users.first() if (!mention) return; @@ -66,9 +67,9 @@ module.exports.run = async (bot: Client, msg: Message, args: string[], db: Db) = await db.collection('user').updateOne({ '_id': { $eq: mention.id } }, { $inc: { highfive: 1 } }); return msg.channel.send(embed) .then(() => { - console.log(`info: highfive`); + log.info({msg: 'highfive', author: { id: msg.author.id, name: msg.author.tag }, guild: msg.guild.id}); }) - .catch(console.error); + .catch(log.error); } else { let n = utilities.randomInt(countFail) while (lastGifFail == n) diff --git a/src/commands/actions/hug.ts b/src/commands/actions/hug.ts index 317b45be..49053b37 100644 --- a/src/commands/actions/hug.ts +++ b/src/commands/actions/hug.ts @@ -1,9 +1,10 @@ import { Client, Message } from 'discord.js' import { Db } from 'mongodb' import actionsRun from '../../utils/actions'; +import { Logger } from 'pino'; -module.exports.run = (bot: Client, msg: Message, args: string[], db: Db) => { - actionsRun(bot, msg, args, db, 'hug', 'hugs', false); +module.exports.run = (bot: Client, msg: Message, args: string[], db: Db, log: Logger) => { + actionsRun(bot, msg, args, db, log, 'hug', 'hugs', false); }; module.exports.help = { diff --git a/src/commands/actions/pat.ts b/src/commands/actions/pat.ts index 6c53b52c..1c8435e3 100644 --- a/src/commands/actions/pat.ts +++ b/src/commands/actions/pat.ts @@ -1,9 +1,10 @@ import { Client, Message } from 'discord.js' import { Db } from 'mongodb' import actionsRun from '../../utils/actions'; +import { Logger } from 'pino'; -module.exports.run = (bot: Client, msg: Message, args: string[], db: Db) => { - actionsRun(bot, msg, args, db, 'pat', 'pats', false); +module.exports.run = (bot: Client, msg: Message, args: string[], db: Db, log: Logger) => { + actionsRun(bot, msg, args, db, log, 'pat', 'pats', false); }; module.exports.help = { diff --git a/src/commands/actions/slap.ts b/src/commands/actions/slap.ts index effa938b..e87bc72f 100644 --- a/src/commands/actions/slap.ts +++ b/src/commands/actions/slap.ts @@ -1,9 +1,10 @@ import { Client, Message } from 'discord.js' import { Db } from 'mongodb' import actionsRun from '../../utils/actions'; +import { Logger } from 'pino'; -module.exports.run = (bot: Client, msg: Message, args: string[], db: Db) => { - actionsRun(bot, msg, args, db, 'slap', 'slaps', false); +module.exports.run = (bot: Client, msg: Message, args: string[], db: Db, log: Logger) => { + actionsRun(bot, msg, args, db, log, 'slap', 'slaps', false); }; module.exports.help = { diff --git a/src/commands/actions/squish.ts b/src/commands/actions/squish.ts index 619d459e..89cd8ad0 100644 --- a/src/commands/actions/squish.ts +++ b/src/commands/actions/squish.ts @@ -1,9 +1,10 @@ import { Client, Message } from 'discord.js' import { Db } from 'mongodb' import actionsRun from '../../utils/actions'; +import { Logger } from 'pino'; -module.exports.run = (bot: Client, msg: Message, args: string[], db: Db) => { - actionsRun(bot, msg, args, db, 'squish', 'squishes', false); +module.exports.run = (bot: Client, msg: Message, args: string[], db: Db, log: Logger) => { + actionsRun(bot, msg, args, db, log, 'squish', 'squishes', false); }; module.exports.help = { diff --git a/src/commands/actions/tickle.ts b/src/commands/actions/tickle.ts index 69465a78..e827e75f 100644 --- a/src/commands/actions/tickle.ts +++ b/src/commands/actions/tickle.ts @@ -1,9 +1,10 @@ import { Client, Message } from 'discord.js' import { Db } from 'mongodb' import actionsRun from '../../utils/actions'; +import { Logger } from 'pino'; -module.exports.run = (bot: Client, msg: Message, args: string[], db: Db) => { - actionsRun(bot, msg, args, db, 'tickle', 'tickles', false); +module.exports.run = (bot: Client, msg: Message, args: string[], db: Db, log: Logger) => { + actionsRun(bot, msg, args, db, log, 'tickle', 'tickles', false); }; module.exports.help = { diff --git a/src/commands/actions/wave.ts b/src/commands/actions/wave.ts index 0c939d25..13507fee 100644 --- a/src/commands/actions/wave.ts +++ b/src/commands/actions/wave.ts @@ -1,10 +1,11 @@ import { Client, Message, MessageEmbed } from 'discord.js' import utilities from '../../utils/utilities' +import { Logger } from 'pino'; let nbGifs = 6; let lastGif = 0; -module.exports.run = async (bot: Client, msg: Message) => { +module.exports.run = async (bot: Client, msg: Message, args: any, db: any, log: Logger) => { const embed = new MessageEmbed(); embed.setColor('#F2DEB0') embed.setDescription(`**<@${msg.author.id}>** is waving!`) @@ -18,9 +19,9 @@ module.exports.run = async (bot: Client, msg: Message) => { return msg.channel.send(embed) .then(() => { - console.log(`info: waving by ${msg.author.tag}`); + log.info({msg: 'wave', author: { id: msg.author.id, name: msg.author.tag }, guild: msg.guild.id}); }) - .catch(console.error); + .catch(log.error); }; module.exports.help = { diff --git a/src/commands/config/addembed.ts b/src/commands/config/addembed.ts index 4c0fc12c..ff81aa25 100644 --- a/src/commands/config/addembed.ts +++ b/src/commands/config/addembed.ts @@ -1,7 +1,8 @@ import { Client, Message } from 'discord.js'; import { Db } from 'mongodb' +import { Logger } from 'pino'; -module.exports.run = async (bot: Client, msg: Message, args: string[], db: Db) => { +module.exports.run = async (bot: Client, msg: Message, args: string[], db: Db, log: Logger) => { if ((!msg.member.hasPermission('MANAGE_GUILD'))) return; let embed = args.join(' ') embed = JSON.parse(embed) @@ -12,11 +13,13 @@ module.exports.run = async (bot: Client, msg: Message, args: string[], db: Db) = try { await msg.delete() } catch (ex) { - console.error(ex) + log.error(ex) } } - await db.collection('msg').insertOne({ _id: (await sent).id, channel: (await sent).channel.id }) + await db.collection('msg').insertOne({ _id: sent.id, channel: sent.channel.id }) + + log.info({msg: 'addembed', author: { id: msg.author.id, name: msg.author.tag }, guild: msg.guild.id}) }; module.exports.help = { diff --git a/src/commands/config/addlevelrole.ts b/src/commands/config/addlevelrole.ts index 8e0a8ca8..46e8c861 100644 --- a/src/commands/config/addlevelrole.ts +++ b/src/commands/config/addlevelrole.ts @@ -1,8 +1,9 @@ import { Client, Message, Presence } from 'discord.js'; import { Db } from 'mongodb' import utilities from '../../utils/utilities'; +import { Logger } from 'pino'; -module.exports.run = async (bot: Client, msg: Message, args: string[], db: Db) => { +module.exports.run = async (bot: Client, msg: Message, args: string[], db: Db, log: Logger) => { if ((!msg.member.hasPermission('MANAGE_GUILD'))) return; if (args.length < 2) return; let guildConf = await db.collection('settings').findOne({ '_id': { $eq: msg.guild.id } }); @@ -46,6 +47,8 @@ module.exports.run = async (bot: Client, msg: Message, args: string[], db: Db) = await msg.channel.send(`I'll now give the role <@&${role}> to members when they reach the level **${args[0]}** and to members currently above this level.`); if (previous) await msg.channel.send(`When I'll give this role, I'll remove <@&${previous}>.`) + + log.info({msg: 'addlevelrole', author: { id: msg.author.id, name: msg.author.tag }, guild: msg.guild.id, level: { id: args[0], role: role }}) }; module.exports.help = { diff --git a/src/commands/config/addrole.ts b/src/commands/config/addrole.ts index 7da1a84b..63679983 100644 --- a/src/commands/config/addrole.ts +++ b/src/commands/config/addrole.ts @@ -1,7 +1,8 @@ import { Client, Message } from 'discord.js'; import { Db } from 'mongodb' +import { Logger } from 'pino'; -module.exports.run = async (bot: Client, msg: Message, args: string[], db: Db) => { +module.exports.run = async (bot: Client, msg: Message, args: string[], db: Db, log: Logger) => { if ((!msg.member.hasPermission('MANAGE_GUILD'))) return; if (args.length != 3) return; @@ -29,11 +30,13 @@ module.exports.run = async (bot: Client, msg: Message, args: string[], db: Db) = try { await msg.delete() } catch (ex) { - console.error(ex) + log.error(ex) } } await db.collection('msg').updateOne({ _id: args[0] }, { $push: { roles: { "id": role, "emote": emote } } }) + + log.info({msg: 'addrole', author: { id: msg.author.id, name: msg.author.tag }, guild: msg.guild.id, role: { id: role, emote: emote }}) }; module.exports.help = { diff --git a/src/commands/config/delembed.ts b/src/commands/config/delembed.ts index aa462df9..3ee6c390 100644 --- a/src/commands/config/delembed.ts +++ b/src/commands/config/delembed.ts @@ -1,7 +1,8 @@ import { Client, Message } from 'discord.js'; import { Db } from 'mongodb' +import { Logger } from 'pino'; -module.exports.run = async (bot: Client, msg: Message, args: string[], db: Db) => { +module.exports.run = async (bot: Client, msg: Message, args: string[], db: Db, log: Logger) => { if ((!msg.member.hasPermission('MANAGE_GUILD'))) return; if (args.length != 1) return; @@ -14,11 +15,13 @@ module.exports.run = async (bot: Client, msg: Message, args: string[], db: Db) = await msg.delete() await fetchMsg.delete() } catch (ex) { - console.error(ex) + log.error(ex) } } await db.collection('msg').deleteOne({ _id: args[0] }) + + log.info({msg: 'delembed', author: { id: msg.author.id, name: msg.author.tag }, guild: msg.guild.id}) }; module.exports.help = { diff --git a/src/commands/config/dellevelrole.ts b/src/commands/config/dellevelrole.ts index 16ebac33..d227c7e8 100644 --- a/src/commands/config/dellevelrole.ts +++ b/src/commands/config/dellevelrole.ts @@ -1,7 +1,8 @@ import { Client, Message } from 'discord.js'; import { Db } from 'mongodb' +import { Logger } from 'pino'; -module.exports.run = async (bot: Client, msg: Message, args: string[], db: Db) => { +module.exports.run = async (bot: Client, msg: Message, args: string[], db: Db, log: Logger) => { if ((!msg.member.hasPermission('MANAGE_GUILD'))) return; if (args.length != 1) return; let guildConf = await db.collection('settings').findOne({ '_id': { $eq: msg.guild.id } }); @@ -21,7 +22,9 @@ module.exports.run = async (bot: Client, msg: Message, args: string[], db: Db) = await db.collection('settings').updateOne({ _id: msg.guild.id }, { $set: { levelroles: levelroles }}, { upsert: true }) - return msg.channel.send(`I'll no longer give a role when members achieve the level **${args[0]}**.`); + await msg.channel.send(`I'll no longer give a role when members achieve the level **${args[0]}**.`); + + log.info({msg: 'dellevelrole', author: { id: msg.author.id, name: msg.author.tag }, guild: msg.guild.id, level: args[0]}) }; module.exports.help = { diff --git a/src/commands/config/delrole.ts b/src/commands/config/delrole.ts index 5d3dab2c..23121ba8 100644 --- a/src/commands/config/delrole.ts +++ b/src/commands/config/delrole.ts @@ -1,7 +1,8 @@ import { Client, Message } from 'discord.js'; import { Db } from 'mongodb' +import { Logger } from 'pino'; -module.exports.run = async (bot: Client, msg: Message, args: string[], db: Db) => { +module.exports.run = async (bot: Client, msg: Message, args: string[], db: Db, log: Logger) => { if ((!msg.member.hasPermission('MANAGE_GUILD'))) return; if (args.length != 2) return; @@ -22,6 +23,8 @@ module.exports.run = async (bot: Client, msg: Message, args: string[], db: Db) = } await db.collection('msg').updateOne({ _id: args[0] }, { $pull: { roles: { "emote": emote } } }) + + log.info({msg: 'delrole', author: { id: msg.author.id, name: msg.author.tag }, guild: msg.guild.id}) }; module.exports.help = { diff --git a/src/commands/config/disable.ts b/src/commands/config/disable.ts index 088a9f48..ee982320 100644 --- a/src/commands/config/disable.ts +++ b/src/commands/config/disable.ts @@ -1,7 +1,8 @@ import { Client, Message, Collection } from 'discord.js'; import { Db } from 'mongodb' +import { Logger } from 'pino'; -module.exports.run = async (bot: Client, msg: Message, args: string[], db: Db, commands: Collection, guildConf: any) => { +module.exports.run = async (bot: Client, msg: Message, args: string[], db: Db, log: Logger, commands: Collection, guildConf: any) => { if ((!msg.member.hasPermission('MANAGE_GUILD'))) return; if (args.length != 1) return; @@ -21,12 +22,14 @@ module.exports.run = async (bot: Client, msg: Message, args: string[], db: Db, c await db.collection('settings').updateOne({ _id: msg.guild.id }, { $set: { config: guildConf }}); - return msg.channel.send({ + await msg.channel.send({ "embed": { "title": ":no_entry: Command disabled", "description": `The command \`${cmd.help.name}\` has been successfully disabled` } }) + + log.info({msg: 'disable', author: { id: msg.author.id, name: msg.author.tag }, guild: msg.guild.id, command: cmd.help.name}) }; module.exports.help = { diff --git a/src/commands/config/disabled.ts b/src/commands/config/disabled.ts index 5e06f02a..f5f69398 100644 --- a/src/commands/config/disabled.ts +++ b/src/commands/config/disabled.ts @@ -1,7 +1,8 @@ import { Client, Message, Collection, MessageEmbed } from 'discord.js'; import { Db } from 'mongodb' +import { Logger } from 'pino'; -module.exports.run = async (bot: Client, msg: Message, args: string[], db: Db, commands: Collection, guildConf: any) => { +module.exports.run = async (bot: Client, msg: Message, args: string[], db: Db, log: Logger, commands: Collection, guildConf: any) => { if ((!msg.member.hasPermission('MANAGE_GUILD'))) return; let disabled: string[] = guildConf.disabledCommands || []; @@ -18,7 +19,9 @@ module.exports.run = async (bot: Client, msg: Message, args: string[], db: Db, c embed.setDescription(desc) - return msg.channel.send(embed) + await msg.channel.send(embed) + + log.info({msg: 'disabled', author: { id: msg.author.id, name: msg.author.tag }, guild: msg.guild.id}) }; module.exports.help = { diff --git a/src/commands/config/editembed.ts b/src/commands/config/editembed.ts index 25a5912d..36c1a5b2 100644 --- a/src/commands/config/editembed.ts +++ b/src/commands/config/editembed.ts @@ -1,7 +1,8 @@ import { Client, Message } from 'discord.js'; import { Db } from 'mongodb' +import { Logger } from 'pino'; -module.exports.run = async (bot: Client, msg: Message, args: string[], db: Db) => { +module.exports.run = async (bot: Client, msg: Message, args: string[], db: Db, log: Logger) => { if ((!msg.member.hasPermission('MANAGE_GUILD'))) return; let dbEmbed = await db.collection('msg').findOne({ _id: args[0] }) @@ -19,9 +20,11 @@ module.exports.run = async (bot: Client, msg: Message, args: string[], db: Db) = try { await msg.delete() } catch (ex) { - console.error(ex) + log.error(ex) } } + + log.info({msg: 'editembed', author: { id: msg.author.id, name: msg.author.tag }, guild: msg.guild.id}) }; module.exports.help = { diff --git a/src/commands/config/enable.ts b/src/commands/config/enable.ts index 140ad602..c8ea21d4 100644 --- a/src/commands/config/enable.ts +++ b/src/commands/config/enable.ts @@ -1,7 +1,8 @@ import { Client, Message, Collection } from 'discord.js'; import { Db } from 'mongodb' +import { Logger } from 'pino'; -module.exports.run = async (bot: Client, msg: Message, args: string[], db: Db, commands: Collection, guildConf: any) => { +module.exports.run = async (bot: Client, msg: Message, args: string[], db: Db, log: Logger, commands: Collection, guildConf: any) => { if ((!msg.member.hasPermission('MANAGE_GUILD'))) return; if (args.length != 1) return; @@ -18,12 +19,14 @@ module.exports.run = async (bot: Client, msg: Message, args: string[], db: Db, c await db.collection('settings').updateOne({ _id: msg.guild.id }, { $set: { config: guildConf }}); - return msg.channel.send({ + await msg.channel.send({ "embed": { "title": ":white_check_mark: Command enabled", "description": `The command \`${cmd.help.name}\` has been successfully enabled` } }) + + log.info({msg: 'enable', author: { id: msg.author.id, name: msg.author.tag }, guild: msg.guild.id}) }; module.exports.help = { diff --git a/src/commands/config/setconf.ts b/src/commands/config/setconf.ts index 586d08c8..44c38b96 100644 --- a/src/commands/config/setconf.ts +++ b/src/commands/config/setconf.ts @@ -1,10 +1,12 @@ import { Client, Message } from 'discord.js'; -import { Db } from 'mongodb'; +import { Logger } from 'pino'; -module.exports.run = async (bot: Client, msg: Message) => { +module.exports.run = async (bot: Client, msg: Message, args: any, db: any, log: Logger) => { if ((!msg.member.hasPermission('MANAGE_GUILD'))) return msg.delete(); - msg.channel.send(`**☁️ Please now use Kwako Web Dashboard to configure the bot**\nhttps://kwako.iwa.sh`); + await msg.channel.send(`**☁️ Please now use Kwako Web Dashboard to configure the bot**\nhttps://kwako.iwa.sh`); + + log.info({msg: 'setconf', author: { id: msg.author.id, name: msg.author.tag }, guild: msg.guild.id}) }; module.exports.help = { diff --git a/src/commands/games/8ball.ts b/src/commands/games/8ball.ts index da407555..edece221 100644 --- a/src/commands/games/8ball.ts +++ b/src/commands/games/8ball.ts @@ -1,15 +1,16 @@ import { Client, Message, MessageEmbed } from 'discord.js' +import { Logger } from 'pino'; let reply = ["Yes", "No", "Yep", "Nope", "Probably", "Well...", "Probably not", "Reply hazy, try again", "Take a guess", "Nah.", "🎱"] // I like that last one. :) -module.exports.run = async (bot: Client, msg: Message, args: string[]) => { +module.exports.run = async (bot: Client, msg: Message, args: string[], db: any, log: Logger) => { if (msg.channel.type != "text") return; if (args.length < 1) return; let r = Math.floor((Math.random() * reply.length)); const embed = new MessageEmbed(); embed.setTitle(`🎱 ${reply[r]}`) embed.setColor('GREY') - console.log(`info: 8ball by ${msg.author.tag}`) + log.info({msg: '8ball', author: { id: msg.author.id, name: msg.author.tag }, guild: msg.guild.id}) return msg.channel.send(embed) }; diff --git a/src/commands/games/flip.ts b/src/commands/games/flip.ts index 3e840300..dce38ff8 100644 --- a/src/commands/games/flip.ts +++ b/src/commands/games/flip.ts @@ -1,13 +1,14 @@ import { Client, Message } from 'discord.js' import utilities from '../../utils/utilities' +import { Logger } from 'pino'; -module.exports.run = (bot: Client, msg: Message) => { +module.exports.run = (bot: Client, msg: Message, args: any, db: any, log: Logger) => { let n = utilities.randomInt(2); if (n == 1) msg.channel.send({ "embed": { "title": ":large_blue_diamond: **Heads**" } }) else msg.channel.send({ "embed": { "title": ":large_orange_diamond: **Tails**" } }) - return console.log(`info: flip coin by ${msg.author.tag}`) + return log.info({msg: 'flip', author: { id: msg.author.id, name: msg.author.tag }, guild: msg.guild.id}) }; module.exports.help = { diff --git a/src/commands/games/roll.ts b/src/commands/games/roll.ts index 5989fc5b..adb1554e 100644 --- a/src/commands/games/roll.ts +++ b/src/commands/games/roll.ts @@ -1,7 +1,8 @@ import { Client, Message } from 'discord.js' import utilities from '../../utils/utilities' +import { Logger } from 'pino'; -module.exports.run = (bot: Client, msg: Message, args: string[]) => { +module.exports.run = (bot: Client, msg: Message, args: string[], db: any, log: Logger) => { if (args.length > 0) { let x = args[0] msg.channel.send({ @@ -10,8 +11,8 @@ module.exports.run = (bot: Client, msg: Message, args: string[]) => { "color": 5601658 } }) - .then(() => { console.log(`info: roll (${x}) by ${msg.author.tag}`) }) - .catch(console.error); + .then(() => { log.info({msg: 'roll', author: { id: msg.author.id, name: msg.author.tag }, guild: msg.guild.id, x: x}) }) + .catch(log.error); } else { msg.channel.send({ "embed": { @@ -19,8 +20,8 @@ module.exports.run = (bot: Client, msg: Message, args: string[]) => { "color": 5601658 } }) - .then(() => { console.log(`info: roll (100) by ${msg.author.tag}`) }) - .catch(console.error); + .then(() => { log.info({msg: 'roll', author: { id: msg.author.id, name: msg.author.tag }, guild: msg.guild.id, x: 100}) }) + .catch(log.error); } }; diff --git a/src/commands/games/rps.ts b/src/commands/games/rps.ts index 2a6fdbfc..c2ee0bfa 100644 --- a/src/commands/games/rps.ts +++ b/src/commands/games/rps.ts @@ -1,7 +1,8 @@ import { Client, Message, MessageEmbed } from 'discord.js' import utilities from '../../utils/utilities' +import { Logger } from 'pino'; -module.exports.run = (bot: Client, msg: Message, args: string[]) => { +module.exports.run = (bot: Client, msg: Message, args: string[], db: any, log: Logger) => { if (args.length < 1) return; let req = args[0].toLowerCase(), numReq, res; @@ -43,8 +44,8 @@ module.exports.run = (bot: Client, msg: Message, args: string[]) => { embed.setDescription(res); - console.log(`info: rps by ${msg.author.tag}`) - return msg.channel.send(embed).catch(console.error) + log.info({msg: 'rps', author: { id: msg.author.id, name: msg.author.tag }, guild: msg.guild.id}) + return msg.channel.send(embed).catch(log.error) }; module.exports.help = { diff --git a/src/commands/mod/ban.ts b/src/commands/mod/ban.ts index e1397c10..5597a290 100644 --- a/src/commands/mod/ban.ts +++ b/src/commands/mod/ban.ts @@ -1,6 +1,7 @@ import { Client, Message, MessageEmbed } from 'discord.js' +import { Logger } from 'pino'; -module.exports.run = async (bot: Client, msg: Message, args:string[]) => { +module.exports.run = async (bot: Client, msg: Message, args:string[], db: any, log: Logger) => { if ((!msg.member.hasPermission('MANAGE_GUILD')) && (msg.author.id != process.env.IWA && process.env.SUDO === '0')) return; if (args.length >= 2 && msg.channel.type != 'dm') { @@ -14,7 +15,7 @@ module.exports.run = async (bot: Client, msg: Message, args:string[]) => { try { await msg.delete(); } catch (error) { - console.error(error); + log.error(error); } args.shift(); @@ -24,7 +25,7 @@ module.exports.run = async (bot: Client, msg: Message, args:string[]) => { const embed = new MessageEmbed(); embed.setColor('RED') - embed.setTitle(`πŸšͺ **${mention.user.username}** has been kicked by **${msg.author.username}**`) + embed.setTitle(`πŸ”¨ **${mention.user.username}** has been banned by **${msg.author.username}**`) try { await mention.ban({ days: 7, reason: reason }); @@ -32,6 +33,8 @@ module.exports.run = async (bot: Client, msg: Message, args:string[]) => { } catch (err) { await msg.channel.send("I can't ban this person!") } + + log.info({msg: 'ban', author: { id: msg.author.id, name: msg.author.tag }, guild: msg.guild.id, target: { id: mention.id, name: mention.user.tag, reason: reason }}); } }; diff --git a/src/commands/mod/bulk.ts b/src/commands/mod/bulk.ts index 3dac3c4d..60067234 100644 --- a/src/commands/mod/bulk.ts +++ b/src/commands/mod/bulk.ts @@ -1,9 +1,10 @@ import { Client, Message } from 'discord.js' import staff from '../../utils/staff'; +import { Logger } from 'pino'; -module.exports.run = (bot: Client, msg: Message, args: string[]) => { +module.exports.run = (bot: Client, msg: Message, args: string[], db: any, log: Logger) => { if ((!msg.member.hasPermission('MANAGE_GUILD'))) return; - staff.bulk(msg, args); + staff.bulk(msg, args, log); }; module.exports.help = { diff --git a/src/commands/mod/forceskip.ts b/src/commands/mod/forceskip.ts index 5263c5d8..a3f1d9dd 100644 --- a/src/commands/mod/forceskip.ts +++ b/src/commands/mod/forceskip.ts @@ -1,9 +1,10 @@ import { Client, Message } from 'discord.js' import music from '../../utils/music' +import { Logger } from 'pino'; -module.exports.run = (bot: Client, msg: Message) => { +module.exports.run = (bot: Client, msg: Message, args: any, db: any, log: Logger) => { if ((!msg.member.hasPermission('MANAGE_GUILD'))) return; - music.forceskip(bot, msg); + music.forceskip(bot, msg, log); }; module.exports.help = { diff --git a/src/commands/mod/kick.ts b/src/commands/mod/kick.ts index 88275236..e7e6798e 100644 --- a/src/commands/mod/kick.ts +++ b/src/commands/mod/kick.ts @@ -1,6 +1,7 @@ import { Client, Message, MessageEmbed } from 'discord.js' +import { Logger } from 'pino'; -module.exports.run = async (bot: Client, msg: Message, args:string[]) => { +module.exports.run = async (bot: Client, msg: Message, args:string[], db: any, log: Logger) => { if ((!msg.member.hasPermission('MANAGE_GUILD')) && (msg.author.id != process.env.IWA && process.env.SUDO === '0')) return; if (args.length >= 1 && msg.channel.type != 'dm') { @@ -14,7 +15,7 @@ module.exports.run = async (bot: Client, msg: Message, args:string[]) => { try { await msg.delete(); } catch (error) { - console.error(error); + log.error(error); } args.shift(); @@ -32,6 +33,8 @@ module.exports.run = async (bot: Client, msg: Message, args:string[]) => { } catch (err) { await msg.channel.send("I can't kick this person!") } + + log.info({msg: 'setconf', author: { id: msg.author.id, name: msg.author.tag }, guild: msg.guild.id, target: { id: mention.id, name: mention.user.tag, reason: reason }}) } }; diff --git a/src/commands/mod/lock.ts b/src/commands/mod/lock.ts index 4eed50bd..0af7c1a1 100644 --- a/src/commands/mod/lock.ts +++ b/src/commands/mod/lock.ts @@ -1,6 +1,7 @@ import { Client, Message, MessageEmbed, TextChannel } from 'discord.js' +import { Logger } from 'pino'; -module.exports.run = async (bot: Client, msg: Message) => { +module.exports.run = async (bot: Client, msg: Message, args: any, db: any, log: Logger) => { if ((!msg.member.hasPermission('MANAGE_GUILD')) && (msg.author.id != process.env.IWA && process.env.SUDO === '0')) return; (msg.channel as TextChannel).permissionOverwrites.forEach(async (value) => { @@ -16,8 +17,9 @@ module.exports.run = async (bot: Client, msg: Message) => { try { await msg.channel.send(embed); + log.info({msg: 'lock', author: { id: msg.author.id, name: msg.author.tag }, guild: msg.guild.id, channel: msg.channel.id}) } catch (err) { - console.error(err); + log.error(err); } }; diff --git a/src/commands/mod/mute.ts b/src/commands/mod/mute.ts index d44342eb..636ae8af 100644 --- a/src/commands/mod/mute.ts +++ b/src/commands/mod/mute.ts @@ -1,8 +1,9 @@ import { Client, Message } from 'discord.js' import staff from '../../utils/staff'; import { Db } from 'mongodb'; +import { Logger } from 'pino'; -module.exports.run = async (bot: Client, msg: Message, args:string[], db: Db, commands:any, guildConf:any) => { +module.exports.run = async (bot: Client, msg: Message, args:string[], db: Db, log: Logger, commands:any, guildConf:any) => { if ((!msg.member.hasPermission('MANAGE_GUILD')) && (msg.author.id != process.env.IWA && process.env.SUDO === '0')) return; let muteRole = guildConf.muteRole; @@ -21,12 +22,12 @@ module.exports.run = async (bot: Client, msg: Message, args:string[], db: Db, co muteRole = role.id; await db.collection('settings').updateOne({ _id: msg.guild.id }, { $set: { ['config.muteRole']: role.id } }); }) - await msg.channel.send("πŸ”¨ > A 'Muted' role has been generated."); + await msg.channel.send("πŸ›  > A 'Muted' role has been generated."); } let modLogChannel = guildConf.modLogChannel; - staff.mute(bot, msg, args, muteRole, modLogChannel); + staff.mute(bot, msg, args, log, muteRole, modLogChannel); }; module.exports.help = { diff --git a/src/commands/mod/unlock.ts b/src/commands/mod/unlock.ts index bfeb3a4c..b0982fa9 100644 --- a/src/commands/mod/unlock.ts +++ b/src/commands/mod/unlock.ts @@ -1,6 +1,7 @@ import { Client, Message, MessageEmbed, TextChannel } from 'discord.js' +import { Logger } from 'pino'; -module.exports.run = async (bot: Client, msg: Message) => { +module.exports.run = async (bot: Client, msg: Message, args: any, db: any, log: Logger) => { if ((!msg.member.hasPermission('MANAGE_GUILD')) && (msg.author.id != process.env.IWA && process.env.SUDO === '0')) return; (msg.channel as TextChannel).permissionOverwrites.forEach(async (value) => { @@ -16,8 +17,9 @@ module.exports.run = async (bot: Client, msg: Message) => { try { await msg.channel.send(embed); + log.info({msg: 'unlock', author: { id: msg.author.id, name: msg.author.tag }, guild: msg.guild.id, channel: msg.channel.id}) } catch (err) { - console.error(err); + log.error(err); } }; diff --git a/src/commands/music/clear.ts b/src/commands/music/clear.ts index 92771cc9..4bb6b325 100644 --- a/src/commands/music/clear.ts +++ b/src/commands/music/clear.ts @@ -1,8 +1,9 @@ import { Client, Message } from 'discord.js' import music from '../../utils/music' +import { Logger } from 'pino'; -module.exports.run = (bot: Client, msg: Message) => { - music.clear(msg); +module.exports.run = (bot: Client, msg: Message, args: any, db: any, log: Logger) => { + music.clear(msg, log); }; module.exports.help = { diff --git a/src/commands/music/loop.ts b/src/commands/music/loop.ts index 6361a83c..8441f4be 100644 --- a/src/commands/music/loop.ts +++ b/src/commands/music/loop.ts @@ -1,8 +1,9 @@ import { Client, Message } from 'discord.js' import music from '../../utils/music' +import { Logger } from 'pino'; -module.exports.run = (bot: Client, msg: Message) => { - music.loop(msg); +module.exports.run = (bot: Client, msg: Message, args: any, db: any, log: Logger) => { + music.loop(msg, log); }; module.exports.help = { diff --git a/src/commands/music/loopqueue.ts b/src/commands/music/loopqueue.ts index c8f61c8c..0971050d 100644 --- a/src/commands/music/loopqueue.ts +++ b/src/commands/music/loopqueue.ts @@ -1,8 +1,9 @@ import { Client, Message } from 'discord.js' import music from '../../utils/music' +import { Logger } from 'pino'; -module.exports.run = (bot: Client, msg: Message) => { - music.loopqueue(msg); +module.exports.run = (bot: Client, msg: Message, args: any, db: any, log: Logger) => { + music.loopqueue(msg, log); }; module.exports.help = { diff --git a/src/commands/music/nowplaying.ts b/src/commands/music/nowplaying.ts index f430f906..6167fd8a 100644 --- a/src/commands/music/nowplaying.ts +++ b/src/commands/music/nowplaying.ts @@ -1,8 +1,9 @@ import { Client, Message } from 'discord.js' import music from '../../utils/music' +import { Logger } from 'pino'; -module.exports.run = (bot: Client, msg: Message) => { - music.np(msg, bot); +module.exports.run = (bot: Client, msg: Message, args: any, db: any, log: Logger) => { + music.np(msg, bot, log); }; module.exports.help = { diff --git a/src/commands/music/pause.ts b/src/commands/music/pause.ts index 7b15fbad..ef264831 100644 --- a/src/commands/music/pause.ts +++ b/src/commands/music/pause.ts @@ -1,8 +1,9 @@ import { Client, Message } from 'discord.js' import music from '../../utils/music' +import { Logger } from 'pino'; -module.exports.run = (bot: Client, msg: Message) => { - music.pause(bot, msg); +module.exports.run = (bot: Client, msg: Message, args: any, db: any, log: Logger) => { + music.pause(bot, msg, log); }; module.exports.help = { diff --git a/src/commands/music/play.ts b/src/commands/music/play.ts index 8eadb3a8..c40b3697 100644 --- a/src/commands/music/play.ts +++ b/src/commands/music/play.ts @@ -1,8 +1,9 @@ import { Client, Message } from 'discord.js' import music from '../../utils/music' +import { Logger } from 'pino'; -module.exports.run = (bot: Client, msg: Message, args: string[]) => { - music.play(bot, msg, args); +module.exports.run = (bot: Client, msg: Message, args: string[], db: any, log: Logger) => { + music.play(bot, msg, args, log); }; module.exports.help = { diff --git a/src/commands/music/queue.ts b/src/commands/music/queue.ts index e409b146..7ae23251 100644 --- a/src/commands/music/queue.ts +++ b/src/commands/music/queue.ts @@ -1,8 +1,9 @@ import { Client, Message } from 'discord.js' import music from '../../utils/music' +import { Logger } from 'pino'; -module.exports.run = (bot: Client, msg: Message) => { - music.list(msg); +module.exports.run = (bot: Client, msg: Message, args: any, db: any, log: Logger) => { + music.list(msg, log); }; module.exports.help = { diff --git a/src/commands/music/remove.ts b/src/commands/music/remove.ts index 1d41512e..8568a6c2 100644 --- a/src/commands/music/remove.ts +++ b/src/commands/music/remove.ts @@ -1,8 +1,9 @@ import { Client, Message } from 'discord.js' import music from '../../utils/music' +import { Logger } from 'pino'; -module.exports.run = (bot: Client, msg: Message, args: string[]) => { - music.remove(msg, args); +module.exports.run = (bot: Client, msg: Message, args: string[], db: any, log: Logger) => { + music.remove(msg, args, log); }; module.exports.help = { diff --git a/src/commands/music/resume.ts b/src/commands/music/resume.ts index d3d91851..4a5574d2 100644 --- a/src/commands/music/resume.ts +++ b/src/commands/music/resume.ts @@ -1,8 +1,9 @@ import { Client, Message } from 'discord.js' import music from '../../utils/music' +import { Logger } from 'pino'; -module.exports.run = (bot: Client, msg: Message) => { - music.resume(bot, msg); +module.exports.run = (bot: Client, msg: Message, args: any, db: any, log: Logger) => { + music.resume(bot, msg, log); }; module.exports.help = { diff --git a/src/commands/music/shuffle.ts b/src/commands/music/shuffle.ts index 687c8fa0..8822dbb8 100644 --- a/src/commands/music/shuffle.ts +++ b/src/commands/music/shuffle.ts @@ -1,8 +1,9 @@ import { Client, Message } from 'discord.js' import music from '../../utils/music' +import { Logger } from 'pino'; -module.exports.run = (bot: Client, msg: Message) => { - music.shuffle(bot, msg); +module.exports.run = (bot: Client, msg: Message, args: any, db: any, log: Logger) => { + music.shuffle(bot, msg, log); }; module.exports.help = { diff --git a/src/commands/music/skip.ts b/src/commands/music/skip.ts index 98d5da40..4e259d34 100644 --- a/src/commands/music/skip.ts +++ b/src/commands/music/skip.ts @@ -1,8 +1,9 @@ import { Client, Message } from 'discord.js' import music from '../../utils/music' +import { Logger } from 'pino'; -module.exports.run = (bot: Client, msg: Message) => { - music.skip(bot, msg); +module.exports.run = (bot: Client, msg: Message, args: any, db: any, log: Logger) => { + music.skip(bot, msg, log); }; module.exports.help = { diff --git a/src/commands/music/stop.ts b/src/commands/music/stop.ts index 5685a173..a742208a 100644 --- a/src/commands/music/stop.ts +++ b/src/commands/music/stop.ts @@ -1,8 +1,9 @@ import { Client, Message } from 'discord.js' import music from '../../utils/music' +import { Logger } from 'pino'; -module.exports.run = (bot: Client, msg: Message) => { - music.stop(bot, msg); +module.exports.run = (bot: Client, msg: Message, args: any, db: any, log: Logger) => { + music.stop(bot, msg, log); }; module.exports.help = { diff --git a/src/commands/profile/fc.ts b/src/commands/profile/fc.ts index fedb2ae5..f883314e 100644 --- a/src/commands/profile/fc.ts +++ b/src/commands/profile/fc.ts @@ -1,14 +1,18 @@ import { Client, Message } from 'discord.js' import { Db } from 'mongodb' +import { Logger } from 'pino'; -module.exports.run = async (bot: Client, msg: Message, args: string[], db: Db, commands: any, guildConf: any) => { - if (args.length == 1) { +module.exports.run = async (bot: Client, msg: Message, args: string[], db: Db, log: Logger, commands: any, guildConf: any) => { + if (args.length === 1) { if (msg.mentions.everyone) return; let mention = msg.mentions.users.first() if (!mention) return; + log.info({msg: 'fc', author: { id: msg.author.id, name: msg.author.tag }, guild: msg.guild.id, target: { id: mention.id, name: mention.tag }}); return printFc(bot, msg, db, mention.id, guildConf.prefix); - } else + } else { + log.info({msg: 'fc', author: { id: msg.author.id, name: msg.author.tag }, guild: msg.guild.id, target: { id: msg.author.id, name: msg.author.tag, }}); return printFc(bot, msg, db, msg.author.id, guildConf.prefix); + } }; module.exports.help = { diff --git a/src/commands/profile/profile.ts b/src/commands/profile/profile.ts index 282d031e..c9abd440 100644 --- a/src/commands/profile/profile.ts +++ b/src/commands/profile/profile.ts @@ -1,16 +1,17 @@ -import { Client, Message, MessageEmbed } from 'discord.js' +import { Client, Message } from 'discord.js' import { Db } from 'mongodb' import imGenerator from '../../utils/img'; import utilities from '../../utils/utilities' +import { Logger } from 'pino'; -module.exports.run = (bot: Client, msg: Message, args: string[], db: Db) => { +module.exports.run = (bot: Client, msg: Message, args: string[], db: Db, log: Logger) => { if (args.length == 1) { if (msg.mentions.everyone) return; let mention = msg.mentions.users.first() if (!mention || mention.bot) return; - return profileImg(bot, msg, db, mention.id); + return profileImg(bot, msg, db, log, mention.id); } else - return profileImg(bot, msg, db, msg.author.id); + return profileImg(bot, msg, db, log, msg.author.id); }; module.exports.help = { @@ -21,7 +22,7 @@ module.exports.help = { perms: ['SEND_MESSAGES', 'ATTACH_FILES'] }; -async function profileImg(bot: Client, msg: Message, db: Db, id: string) { +async function profileImg(bot: Client, msg: Message, db: Db, log: Logger, id: string) { let userDB = await db.collection('user').findOne({ '_id': { $eq: id } }); msg.channel.startTyping(); @@ -47,10 +48,10 @@ async function profileImg(bot: Client, msg: Message, db: Db, id: string) { let file = await imGenerator(user); try { - console.log(`info: profile by ${msg.author.tag}`) + log.info({msg: 'profile', author: { id: msg.author.id, name: msg.author.tag }, guild: msg.guild.id, target: { id: userDiscord.id, name: userDiscord.tag }}); return msg.channel.send('', { files: [file] }).then(() => { msg.channel.stopTyping(true) }); } catch (err) { - console.error(err) + log.error(err) return msg.channel.send(":x: > An error occured. Please retry later.") } } @@ -78,10 +79,10 @@ async function profileImg(bot: Client, msg: Message, db: Db, id: string) { let file = await imGenerator(user); try { - console.log(`info: profile by ${msg.author.tag}`) + log.info({msg: 'profile', author: { id: msg.author.id, name: msg.author.tag }, guild: msg.guild.id, target: { id: userDiscord.id, name: userDiscord.tag }}); return msg.channel.send('', { files: [file] }).then(() => { msg.channel.stopTyping(true) }); } catch (err) { - console.error(err) + log.error(err) return msg.channel.send(":x: > An error occured. Please retry later.") } } \ No newline at end of file diff --git a/src/commands/profile/setbackground.ts b/src/commands/profile/setbackground.ts index c2048534..1819047f 100644 --- a/src/commands/profile/setbackground.ts +++ b/src/commands/profile/setbackground.ts @@ -1,8 +1,9 @@ import { Client, Message } from 'discord.js' import { Db } from 'mongodb' import { loadImage } from 'canvas'; +import { Logger } from 'pino'; -module.exports.run = async (bot: Client, msg: Message, args: string[], db: Db, commands: any, guildConf: any) => { +module.exports.run = async (bot: Client, msg: Message, args: string[], db: Db, log: Logger, commands: any, guildConf: any) => { if (args.length !== 1) return msg.channel.send({ "embed": { "description": `\`${guildConf.prefix}setbackground (url)\` to set an image background in your profile card\n\n\`${guildConf.prefix}setbackground off\` to disable it and use the colored background back`, @@ -18,7 +19,7 @@ module.exports.run = async (bot: Client, msg: Message, args: string[], db: Db, c try { await msg.delete() } catch (ex) { - console.error(ex) + log.error(ex) } } return msg.channel.send({ @@ -75,7 +76,9 @@ module.exports.run = async (bot: Client, msg: Message, args: string[], db: Db, c }, "color": 8311585 } - }) + }) + + log.info({msg: 'setbackground', author: { id: msg.author.id, name: msg.author.tag }, guild: msg.guild.id, image: url }); }; module.exports.help = { diff --git a/src/commands/profile/setbirthday.ts b/src/commands/profile/setbirthday.ts index 5a081fa1..cf5a6d00 100644 --- a/src/commands/profile/setbirthday.ts +++ b/src/commands/profile/setbirthday.ts @@ -1,7 +1,8 @@ import { Client, Message, MessageEmbed } from 'discord.js' import { Db } from 'mongodb' +import { Logger } from 'pino'; -module.exports.run = async (bot: Client, msg: Message, args: string[], db: Db, commands: any, guildConf: any) => { +module.exports.run = async (bot: Client, msg: Message, args: string[], db: Db, log: Logger, commands: any, guildConf: any) => { if (args.length !== 1) return msg.channel.send({ "embed": { "description": `\`${guildConf.prefix}setbirthday (your birthday, mm/dd)\` to register your birthday in your profile card\n\n\`${guildConf.prefix}setbirthday off\` to remove it`, @@ -17,7 +18,7 @@ module.exports.run = async (bot: Client, msg: Message, args: string[], db: Db, c try { await msg.delete() } catch (ex) { - console.error(ex) + log.error(ex) } } return msg.channel.send({ @@ -50,10 +51,10 @@ module.exports.run = async (bot: Client, msg: Message, args: string[], db: Db, c embed.setColor('AQUA') try { - console.log(`info: birthday of ${msg.author.tag} set on ${today}`) - return await msg.channel.send(embed); + log.info({msg: 'setbirthday', author: { id: msg.author.id, name: msg.author.tag }, guild: msg.guild.id, date: today}); + return msg.channel.send(embed); } catch (err) { - console.error(err); + log.error(err); } } else return msg.channel.send({ "embed": { "title": ":x: > **Date format is invalid! Please enter your birthday in mm/dd format.", "color": 13632027 } }); diff --git a/src/commands/profile/setfc.ts b/src/commands/profile/setfc.ts index 0d64e2a3..58d03345 100644 --- a/src/commands/profile/setfc.ts +++ b/src/commands/profile/setfc.ts @@ -1,7 +1,8 @@ import { Client, Message, MessageEmbed } from 'discord.js' import { Db } from 'mongodb' +import { Logger } from 'pino'; -module.exports.run = async (bot: Client, msg: Message, args: string[], db: Db, commands: any, guildConf: any) => { +module.exports.run = async (bot: Client, msg: Message, args: string[], db: Db, log: Logger, commands: any, guildConf: any) => { if (args.length !== 1) return msg.channel.send({ "embed": { "description": `\`${guildConf.prefix}setfc (Switch Friend Code)\` to register your FC in your profile card\n\n\`${guildConf.prefix}setfc off\` to remove it`, @@ -17,9 +18,10 @@ module.exports.run = async (bot: Client, msg: Message, args: string[], db: Db, c try { await msg.delete() } catch (ex) { - console.error(ex) + log.error(ex) } } + log.info({msg: 'setfc', author: { id: msg.author.id, name: msg.author.tag }, guild: msg.guild.id, fc: 'off'}); return msg.channel.send({ "embed": { "author": { @@ -41,10 +43,10 @@ module.exports.run = async (bot: Client, msg: Message, args: string[], db: Db, c embed.setTitle(`**${content}**`) embed.setColor('AQUA') try { - console.log(`info: switch fc of ${msg.author.tag} set`) - return await msg.channel.send(embed); + log.info({msg: 'setfc', author: { id: msg.author.id, name: msg.author.tag }, guild: msg.guild.id, fc: content}); + return msg.channel.send(embed); } catch (err) { - console.error(err); + log.error(err); } }; diff --git a/src/commands/suggestions/approve.ts b/src/commands/suggestions/approve.ts index 707bde69..f9c285e9 100644 --- a/src/commands/suggestions/approve.ts +++ b/src/commands/suggestions/approve.ts @@ -1,7 +1,8 @@ import { Client, Message, TextChannel, MessageEmbed } from 'discord.js'; import { Db } from 'mongodb'; +import { Logger } from 'pino'; -module.exports.run = async (bot: Client, msg: Message, args: string[], db: Db, commands: any, guildConf: { suggestionChannel: string; }) => { +module.exports.run = async (bot: Client, msg: Message, args: string[], db: Db, log: Logger, commands: any, guildConf: { suggestionChannel: string; }) => { if ((!msg.member.hasPermission('MANAGE_GUILD'))) return; let guild: { _id: string, suggestions: string[] } = await db.collection('suggestions').findOne({ _id: msg.guild.id }) || null; @@ -40,6 +41,9 @@ module.exports.run = async (bot: Client, msg: Message, args: string[], db: Db, c } await suggestion.edit(embed); + + log.info({msg: 'approve', author: { id: msg.author.id, name: msg.author.tag }, guild: msg.guild.id}); + return msg.react('βœ…'); }; diff --git a/src/commands/suggestions/consider.ts b/src/commands/suggestions/consider.ts index 11bad01b..5bd1b3cc 100644 --- a/src/commands/suggestions/consider.ts +++ b/src/commands/suggestions/consider.ts @@ -1,7 +1,8 @@ import { Client, Message, TextChannel, MessageEmbed } from 'discord.js'; import { Db } from 'mongodb'; +import { Logger } from 'pino'; -module.exports.run = async (bot: Client, msg: Message, args: string[], db: Db, commands: any, guildConf: { suggestionChannel: string; }) => { +module.exports.run = async (bot: Client, msg: Message, args: string[], db: Db, log: Logger, commands: any, guildConf: { suggestionChannel: string; }) => { if ((!msg.member.hasPermission('MANAGE_GUILD'))) return; let guild: { _id: string, suggestions: string[] } = await db.collection('suggestions').findOne({ _id: msg.guild.id }) || null; @@ -40,6 +41,9 @@ module.exports.run = async (bot: Client, msg: Message, args: string[], db: Db, c } await suggestion.edit(embed); + + log.info({msg: 'consider', author: { id: msg.author.id, name: msg.author.tag }, guild: msg.guild.id}); + return msg.react('βœ…'); }; diff --git a/src/commands/suggestions/deny.ts b/src/commands/suggestions/deny.ts index 5a5d589c..8df09a3e 100644 --- a/src/commands/suggestions/deny.ts +++ b/src/commands/suggestions/deny.ts @@ -1,7 +1,8 @@ import { Client, Message, TextChannel, MessageEmbed } from 'discord.js'; import { Db } from 'mongodb'; +import { Logger } from 'pino'; -module.exports.run = async (bot: Client, msg: Message, args: string[], db: Db, commands: any, guildConf: { suggestionChannel: string; }) => { +module.exports.run = async (bot: Client, msg: Message, args: string[], db: Db, log: Logger, commands: any, guildConf: { suggestionChannel: string; }) => { if ((!msg.member.hasPermission('MANAGE_GUILD'))) return; let guild: { _id: string, suggestions: string[] } = await db.collection('suggestions').findOne({ _id: msg.guild.id }) || null; @@ -40,6 +41,9 @@ module.exports.run = async (bot: Client, msg: Message, args: string[], db: Db, c } await suggestion.edit(embed); + + log.info({msg: 'deny', author: { id: msg.author.id, name: msg.author.tag }, guild: msg.guild.id}); + return msg.react('βœ…'); }; diff --git a/src/commands/suggestions/implemented.ts b/src/commands/suggestions/implemented.ts index fbe6f7cb..d73fd8d3 100644 --- a/src/commands/suggestions/implemented.ts +++ b/src/commands/suggestions/implemented.ts @@ -1,7 +1,8 @@ import { Client, Message, TextChannel, MessageEmbed } from 'discord.js'; import { Db } from 'mongodb'; +import { Logger } from 'pino'; -module.exports.run = async (bot: Client, msg: Message, args: string[], db: Db, commands: any, guildConf: { suggestionChannel: string; }) => { +module.exports.run = async (bot: Client, msg: Message, args: string[], db: Db, log: Logger, commands: any, guildConf: { suggestionChannel: string; }) => { if ((!msg.member.hasPermission('MANAGE_GUILD'))) return; let guild: { _id: string, suggestions: string[] } = await db.collection('suggestions').findOne({ _id: msg.guild.id }) || null; @@ -35,6 +36,9 @@ module.exports.run = async (bot: Client, msg: Message, args: string[], db: Db, c } await suggestion.edit(embed); + + log.info({msg: 'implemented', author: { id: msg.author.id, name: msg.author.tag }, guild: msg.guild.id}); + return msg.react('βœ…'); }; diff --git a/src/commands/update.ts b/src/commands/update.ts index a4d76b4f..7beb8749 100644 --- a/src/commands/update.ts +++ b/src/commands/update.ts @@ -11,8 +11,12 @@ module.exports.run = async (bot: Client, msg: Message, args: string[]) => { await bot.user.setStatus('idle').catch(console.error); setInterval(async () => { - min -= 1; - await bot.user.setActivity(`⚠️ update in ${min}min`, { type: 'LISTENING' }).catch(console.error); + if(min > 1) { + min -= 1; + await bot.user.setActivity(`⚠️ update in ${min}min`, { type: 'LISTENING' }).catch(console.error); + } else { + await bot.user.setActivity(`⚠️ update soon...`, { type: 'LISTENING' }).catch(console.error); + } }, 60000); }; diff --git a/src/commands/utility/anime.ts b/src/commands/utility/anime.ts index b38e07a3..19de7e1d 100644 --- a/src/commands/utility/anime.ts +++ b/src/commands/utility/anime.ts @@ -1,8 +1,9 @@ import { Client, Message, MessageEmbed } from 'discord.js' +import { Logger } from 'pino'; const al = require('anilist-node'); const Anilist = new al(); -module.exports.run = (bot: Client, msg: Message, args: string[]) => { +module.exports.run = (bot: Client, msg: Message, args: string[], db: any, log: Logger) => { if (args.length < 1) return; let req = args.join(' '); Anilist.search('anime', req, 1, 5).then(async (data: { media: any[]; }) => { @@ -66,10 +67,11 @@ module.exports.run = (bot: Client, msg: Message, args: string[]) => { embed.addField("Genres", info.genres.toString(), false) embed.setColor('BLUE') embed.setURL(info.siteUrl) - console.log(`info: anime request: ${req} by ${msg.author.tag}`) + + log.info({msg: 'anime', author: { id: msg.author.id, name: msg.author.tag }, guild: msg.guild.id, request: req}); return msg.channel.send(embed) }).catch((err: any) => { - console.error(err) + log.error(err) return msg.channel.send({ 'embed': { 'title': ":x: > **An error occured, please retry later.**" } }) }); }; diff --git a/src/commands/utility/help.ts b/src/commands/utility/help.ts index b946a04b..795d5ba4 100644 --- a/src/commands/utility/help.ts +++ b/src/commands/utility/help.ts @@ -5,6 +5,9 @@ let member = new MessageEmbed(); let mod = new MessageEmbed(); import * as fs from 'fs'; +import { Logger } from 'pino'; + +import log from '../../Logger'; readDirs() setTimeout(() => { @@ -51,7 +54,7 @@ setTimeout(() => { mod.setColor(4886754) }, 5000) -module.exports.run = async (bot: Client, msg: Message, args: string[], db: Db, commands: Collection, guildConf: any) => { +module.exports.run = async (bot: Client, msg: Message, args: string[], db: Db, log: Logger, commands: Collection, guildConf: any) => { if (args.length == 1) { let cmd: any = commands.get(args[0]) || commands.find((comd) => comd.help.aliases && comd.help.aliases.includes(args[0])); if (!cmd || !cmd.help.usage) return; @@ -75,7 +78,8 @@ module.exports.run = async (bot: Client, msg: Message, args: string[], db: Db, c return msg.channel.send(embed); } else sendHelp(msg, guildConf); - console.log(`info: help sent to ${msg.author.tag}`) + + log.info({msg: 'help', author: { id: msg.author.id, name: msg.author.tag }, guild: msg.guild.id}); } module.exports.help = { @@ -107,11 +111,11 @@ async function sendHelp(msg: Message, guildConf: any) { async function readDirs() { fs.readdir('./build/commands/', { withFileTypes: true }, async (error, f) => { - if (error) return console.error(error); + if (error) return log.error(error); f.forEach((f) => { if (f.isDirectory()) { fs.readdir(`./build/commands/${f.name}/`, async (error, fi) => { - if (error) return console.error(error); + if (error) return log.error(error); let string: string = ""; fi.forEach(async (fi) => { string = `${string}\`${fi.slice(0, -3)}\` `; diff --git a/src/commands/utility/invite.ts b/src/commands/utility/invite.ts index efa76221..8a4e00ad 100644 --- a/src/commands/utility/invite.ts +++ b/src/commands/utility/invite.ts @@ -1,14 +1,15 @@ import { Client, Message } from 'discord.js'; +import { Logger } from 'pino'; -module.exports.run = async (bot: Client, msg: Message) => { +module.exports.run = async (bot: Client, msg: Message, args: any, db: any, log: Logger) => { await msg.channel.send({ "embed": { "title": "You can invite me to your server through this link:", "description": "https://kwako.iwa.sh/", "color": 16774804} }) - .then(() => { console.log(`info: ping: ${msg.author.tag}`) }) - .catch(console.error); + .then(() => { log.info({msg: 'invite', author: { id: msg.author.id, name: msg.author.tag }, guild: msg.guild.id}) }) + .catch(log.error); }; module.exports.help = { diff --git a/src/commands/utility/leaderboard.ts b/src/commands/utility/leaderboard.ts index 0ddab5b8..d13d1f5a 100644 --- a/src/commands/utility/leaderboard.ts +++ b/src/commands/utility/leaderboard.ts @@ -1,44 +1,45 @@ import { Client, Message, MessageEmbed } from 'discord.js' import { Db } from 'mongodb' import utilities from '../../utils/utilities' +import { Logger } from 'pino'; -module.exports.run = async (bot: Client, msg: Message, args: string[], db: Db) => { +module.exports.run = async (bot: Client, msg: Message, args: string[], db: Db, log: Logger) => { if (args.length > 1) return; switch (args[0]) { case "xp": case "exp": - return leaderboard(bot, msg, db, 'exp', false) + return leaderboard(bot, msg, db, log, 'exp', false) case "pat": case "pats": case "patpat": case "patpats": - return leaderboard(bot, msg, db, 'pat', false) + return leaderboard(bot, msg, db, log, 'pat', false) case "hug": case "hugs": - return leaderboard(bot, msg, db, 'hug', false) + return leaderboard(bot, msg, db, log, 'hug', false) case "boop": case "boops": - return leaderboard(bot, msg, db, 'boop', false) + return leaderboard(bot, msg, db, log, 'boop', false) case "slap": case "slaps": - return leaderboard(bot, msg, db, 'slap', false) + return leaderboard(bot, msg, db, log, 'slap', false) case "glare": case "glares": - return leaderboard(bot, msg, db, 'glare', false) + return leaderboard(bot, msg, db, log, 'glare', false) case "squish": case "squishes": - return leaderboard(bot, msg, db, 'squish', true) + return leaderboard(bot, msg, db, log, 'squish', true) case "tickle": case "tickles": - return leaderboard(bot, msg, db, 'tickle', false) + return leaderboard(bot, msg, db, log, 'tickle', false) default: msg.channel.send({ "embed": { "title": "`exp | pat | hug | boop | slap`", "color": 3396531 } }); @@ -54,7 +55,7 @@ module.exports.help = { perms: ['EMBED_LINKS'] }; -async function leaderboard (bot: Client, msg: Message, db: Db, type: string, e: boolean) { +async function leaderboard (bot: Client, msg: Message, db: Db, log: Logger, type: string, e: boolean) { let guild = `${type}.${msg.guild.id.toString()}` let leaderboard = await db.collection('user').find({ [guild]: { $exists: true } }).sort({ [guild]: -1 }).limit(10).toArray(); let n = 0; @@ -97,7 +98,7 @@ async function leaderboard (bot: Client, msg: Message, db: Db, type: string, e: embed.setDescription(desc) msg.channel.send(embed) .then(() => { - console.log(`info: exp leaderboard: ${msg.author.tag}`); - }).catch(console.error) + log.info({msg: 'leaderboard', author: { id: msg.author.id, name: msg.author.tag }, guild: msg.guild.id, type: type}); + }).catch(log.error) }); } \ No newline at end of file diff --git a/src/commands/utility/link.ts b/src/commands/utility/link.ts index 80a88835..dc6671a6 100644 --- a/src/commands/utility/link.ts +++ b/src/commands/utility/link.ts @@ -1,14 +1,15 @@ import { Client, Message } from 'discord.js'; +import { Logger } from 'pino'; -module.exports.run = async (bot: Client, msg: Message) => { +module.exports.run = async (bot: Client, msg: Message, args: any, db: any, log: Logger) => { await msg.channel.send({ "embed": { "title": "You can invite me to your server through this link:", "description": "https://kwako.iwa.sh/", "color": 16774804} }) - .then(() => { console.log(`info: ping: ${msg.author.tag}`) }) - .catch(console.error); + .then(() => { log.info({msg: 'link', author: { id: msg.author.id, name: msg.author.tag }, guild: msg.guild.id}) }) + .catch(log.error); }; module.exports.help = { diff --git a/src/commands/utility/manga.ts b/src/commands/utility/manga.ts index a96fbba0..a25c141e 100644 --- a/src/commands/utility/manga.ts +++ b/src/commands/utility/manga.ts @@ -1,8 +1,9 @@ import { Client, Message, MessageEmbed } from 'discord.js' +import { Logger } from 'pino'; const al = require('anilist-node'); const Anilist = new al(); -module.exports.run = (bot: Client, msg: Message, args: string[]) => { +module.exports.run = (bot: Client, msg: Message, args: string[], db: any, log: Logger) => { if (args.length < 1) return; let req = args.join(' '); Anilist.search('manga', req, 1, 5).then(async (data: { media: any[]; }) => { @@ -65,10 +66,11 @@ module.exports.run = (bot: Client, msg: Message, args: string[]) => { embed.addField("Genres", info.genres.toString(), false) embed.setColor('BLUE') embed.setURL(info.siteUrl) - console.log(`info: manga request: '${req}' by ${msg.author.tag}`) + + log.info({msg: 'manga', author: { id: msg.author.id, name: msg.author.tag }, guild: msg.guild.id, request: req}); return msg.channel.send(embed) }).catch((err: any) => { - console.error(err) + log.error(err) return msg.channel.send({ 'embed': { 'title': ":x: > **An error occured, please retry later.**" } }) }); }; diff --git a/src/commands/utility/ping.ts b/src/commands/utility/ping.ts index 0f6a8b38..001a77dc 100644 --- a/src/commands/utility/ping.ts +++ b/src/commands/utility/ping.ts @@ -1,10 +1,11 @@ import { Client, Message } from 'discord.js'; +import { Logger } from 'pino'; -module.exports.run = async (bot: Client, msg: Message) => { +module.exports.run = async (bot: Client, msg: Message, args: any, db: any, log: Logger) => { let ping = Math.ceil(bot.ws.ping) await msg.channel.send(`:ping_pong: Pong ! \`${ping}ms\``) - .then(() => { console.log(`info: ping: ${msg.author.tag}`) }) - .catch(console.error); + .then(() => { log.info({msg: 'ping', author: { id: msg.author.id, name: msg.author.tag }, guild: msg.guild.id}) }) + .catch(log.error); }; module.exports.help = { diff --git a/src/commands/utility/pong.ts b/src/commands/utility/pong.ts index 2937ab98..829c3372 100644 --- a/src/commands/utility/pong.ts +++ b/src/commands/utility/pong.ts @@ -1,10 +1,11 @@ import { Client, Message } from 'discord.js'; +import { Logger } from 'pino'; -module.exports.run = async (bot: Client, msg: Message) => { +module.exports.run = async (bot: Client, msg: Message, args: any, db: any, log: Logger) => { let ping = Math.ceil(bot.ws.ping) await msg.channel.send(`:ping_pong: Ping ! \`${ping}ms\``) - .then(() => { console.log(`info: ping: ${msg.author.tag}`) }) - .catch(console.error); + .then(() => { log.info({msg: 'ping', author: { id: msg.author.id, name: msg.author.tag }, guild: msg.guild.id}) }) + .catch(log.error); }; module.exports.help = { diff --git a/src/events/logs/guildBanAdd.ts b/src/events/logs/guildBanAdd.ts index 1e20fe4d..e97ec777 100644 --- a/src/events/logs/guildBanAdd.ts +++ b/src/events/logs/guildBanAdd.ts @@ -10,7 +10,10 @@ export default async function guildBanAdd(guild: Guild, user: User | PartialUser const fetchedLogs = await guild.fetchAuditLogs({ limit: 1, type: 'MEMBER_BAN_ADD', - }); + }).catch(() => {return;}); + + if(!fetchedLogs) return; + const banLog = fetchedLogs.entries.first(); if (!banLog) return; diff --git a/src/events/logs/guildMemberRemove.ts b/src/events/logs/guildMemberRemove.ts index e9dbb823..132d6b17 100644 --- a/src/events/logs/guildMemberRemove.ts +++ b/src/events/logs/guildMemberRemove.ts @@ -13,7 +13,10 @@ export default async function guildMemberRemove(member: GuildMember |Β PartialGu const fetchedLogs = await member.guild.fetchAuditLogs({ limit: 1, type: 'MEMBER_KICK', - }); + }).catch(() => {return;}); + + if(!fetchedLogs) return; + const kickLog = fetchedLogs.entries.first(); if (!kickLog) return; diff --git a/src/events/logs/messageDelete.ts b/src/events/logs/messageDelete.ts index 88acb264..92cfb2dc 100644 --- a/src/events/logs/messageDelete.ts +++ b/src/events/logs/messageDelete.ts @@ -13,7 +13,10 @@ export default async function messageDelete(msg: Message | PartialMessage, bot: const fetchedLogs = await msg.guild.fetchAuditLogs({ limit: 1, type: 'MESSAGE_DELETE', - }); + }).catch(() => {return;}); + + if(!fetchedLogs) return; + const deletionLog = fetchedLogs.entries.first(); if (!deletionLog) return; diff --git a/src/events/messages/cooldown.ts b/src/events/messages/cooldown.ts index 79b217c9..7261d98a 100644 --- a/src/events/messages/cooldown.ts +++ b/src/events/messages/cooldown.ts @@ -55,14 +55,15 @@ export default class cooldown { if (!cooldownXP.has(msg.author.id)) { let guild = `exp.${msg.guild.id.toString()}` let user = await db.collection('user').findOne({ '_id': { $eq: msg.author.id } }); - if(user && user.exp) - if(user.exp[msg.guild.id]) - levelCheck(msg, (user.exp[msg.guild.id]), db, exp); let amount = exp; if(msg.member.premiumSinceTimestamp != null || msg.member.hasPermission('MANAGE_GUILD')) amount = Math.floor(amount * 1.5); + if(user && user.exp) + if(user.exp[msg.guild.id]) + levelCheck(msg, (user.exp[msg.guild.id]), db, amount); + await db.collection('user').updateOne({ _id: msg.author.id }, { $inc: { [guild]: amount } }, { upsert: true }); cooldownXP.add(msg.author.id); return setTimeout(async () => { cooldownXP.delete(msg.author.id) }, 5000) diff --git a/src/index.ts b/src/index.ts index 5980e18e..816b1df2 100644 --- a/src/index.ts +++ b/src/index.ts @@ -5,6 +5,8 @@ const commands: Discord.Collection = new Discord.Collection(); import * as dotenv from "dotenv"; dotenv.config(); +import log from './Logger'; + import * as fs from 'fs'; import * as http from 'http'; @@ -38,11 +40,11 @@ import suggestion from './events/messages/suggestion'; // Imports commands from the 'commands' folder fs.readdir('./build/commands/', { withFileTypes: true }, (error, f) => { - if (error) return console.error(error); + if (error) return log.error(error); f.forEach((f) => { if (f.isDirectory()) { fs.readdir(`./build/commands/${f.name}/`, (error, fi) => { - if (error) return console.error(error); + if (error) return log.error(error); fi.forEach((fi) => { if (!fi.endsWith(".js")) return; let commande = require(`./commands/${f.name}/${fi}`); @@ -58,23 +60,25 @@ fs.readdir('./build/commands/', { withFileTypes: true }, (error, f) => { }); // Process related Events -process.on('uncaughtException', exception => console.error(exception)); +process.on('uncaughtException', exception => log.error(exception)); +process.on('unhandledRejection', exception => log.error(exception)); // Bot-User related Events -bot.on('warn', console.warn); -bot.on('shardError', console.error); -bot.on('shardDisconnect', () => console.log("warn: bot disconnected")); -bot.on('shardReconnecting', () => console.log("info: bot reconnecting...")); +bot.on('warn', (warn) => log.warn(warn)); +bot.on('shardError', (error) => log.error(error)); +bot.on('shardDisconnect', (event) => log.debug({msg: "bot disconnected", event: event})); +bot.on('shardReconnecting', (event) => log.debug({msg: "bot reconnecting", event: event})); bot.on('shardResume', async () => ready(bot, db)); bot.on('shardReady', async () => { ready(bot, db); - console.log(`info: logged in as ${bot.user.username}`); + log.debug(`logged in as ${bot.user.username}`); }); // Message Event bot.on('message', async (msg: Discord.Message) => { if (!msg) return; - if (!msg.guild || msg.author.bot) return; + if (msg.author.bot) return; + if (!msg.guild) return log.trace({msg: 'dm', author: { id: msg.author.id, name: msg.author.tag }, content: msg.cleanContent, attachment: msg.attachments.first()}); if (msg.channel.type != "text") return; let guildConf = await db.collection('settings').findOne({ '_id': { $eq: msg.guild.id } }); @@ -113,12 +117,14 @@ bot.on('message', async (msg: Discord.Message) => { talkedRecently.delete(msg.author.id); }, 3000); - await cmd.run(bot, msg, args, db, commands, guildConf); + await cmd.run(bot, msg, args, db, log, commands, guildConf); } }); bot.on("guildMemberAdd", async member => { + if(!member.guild.available) return; + let guild = await db.collection('settings').findOne({ '_id': { $eq: member.guild.id } }); let guildConf = guild.config || defaultSettings; @@ -160,6 +166,8 @@ bot.on("guildMemberAdd", async member => { }); bot.on('guildCreate', async guild => { + if(!guild.available) return; + let channel = guild.channels.cache.find(val => val.name.includes('general') && val.type === 'text'); if(channel) { await (channel as Discord.TextChannel).send({ @@ -200,18 +208,23 @@ bot.on('guildCreate', async guild => { } } await db.collection('settings').insertOne({ '_id': guild.id }); - http.get('http://localhost:8080/api/guilds/update').on("error", console.error); + http.get('http://localhost:8080/api/guilds/update').on("error", log.error); + + log.info({msg: 'new guild', guild: guild.id}); }); bot.on("guildDelete", async guild => { await db.collection('settings').deleteOne({ '_id': { $eq: guild.id } }); - http.get('http://localhost:8080/api/guilds/update').on("error", console.error); + http.get('http://localhost:8080/api/guilds/update').on("error", log.error); + log.info({msg: 'guild removed', guild: guild.id}); }); // Starboard Event import starboard from './events/starboard'; bot.on('messageReactionAdd', async (reaction: Discord.MessageReaction, author: Discord.User) => { + if(!reaction.message.guild.available) return; + let guildConf = await db.collection('settings').findOne({ '_id': { $eq: reaction.message.guild.id } }); guildConf = guildConf.config || defaultSettings; @@ -224,10 +237,12 @@ bot.on('messageReactionAdd', async (reaction: Discord.MessageReaction, author: D // Reaction Role Events import reactionRoles from './events/reactionRoles'; bot.on('messageReactionAdd', async (reaction: Discord.MessageReaction, author: Discord.User) => { + if(!reaction.message.guild.available) return; if (author.bot) return; reactionRoles.add(reaction, author, db); }); bot.on('messageReactionRemove', async (reaction: Discord.MessageReaction, author: Discord.User) => { + if(!reaction.message.guild.available) return; if (author.bot) return; reactionRoles.remove(reaction, author, db); }); @@ -235,6 +250,8 @@ bot.on('messageReactionRemove', async (reaction: Discord.MessageReaction, author // Logs channel import messageDelete from './events/logs/messageDelete'; bot.on('messageDelete', async msg => { + if(!msg.guild.available) return; + let guildConf = await db.collection('settings').findOne({ '_id': { $eq: msg.guild.id } }); guildConf = guildConf.config || defaultSettings; @@ -246,6 +263,8 @@ bot.on('messageDelete', async msg => { import guildMemberRemove from './events/logs/guildMemberRemove'; bot.on('guildMemberRemove', async member => { + if(!member.guild.available) return; + let guildDB = `exp.${member.guild.id.toString()}` await db.collection('user').updateOne({ _id: member.id }, { $mul: { [guildDB]: -1 }}); @@ -261,6 +280,8 @@ bot.on('guildMemberRemove', async member => { import guildBanAdd from './events/logs/guildBanAdd'; import utilities from "./utils/utilities"; bot.on('guildBanAdd', async (guild, user) => { + if(!guild.available) return; + let guildDB = `exp.${guild.id.toString()}` await db.collection('user').updateOne({ _id: user.id }, { $unset: { [guildDB]: 0 }}); diff --git a/src/utils/actions.ts b/src/utils/actions.ts index 7e58ed63..c2f6b8d4 100644 --- a/src/utils/actions.ts +++ b/src/utils/actions.ts @@ -7,6 +7,7 @@ import { Client, Message, MessageEmbed } from 'discord.js'; import { Db } from 'mongodb'; import utilities from './utilities' +import { Logger } from 'pino'; /** @desc Automatic replies of the bot when an action is done on it */ let reply = ["awww", "thank you :33", "damn you're so precious", "why are you so cute with me ?", "omg", "<3", "so cuuuute c:", "c:", "c;", ":3", "QT af :O", "^u^ thanks!", ">u<", "-u-"] @@ -45,7 +46,7 @@ let count = new Map([ * @param db - Database connection object * @param type - Type of actions (hug, pat...) */ -export default async function actionsRun(bot: Client, msg: Message, args: string[], db: Db, type: string, verb: string, at: boolean) { +export default async function actionsRun(bot: Client, msg: Message, args: string[], db: Db, log: Logger, type: string, verb: string, at: boolean) { if (args.length === 0) return; if (args.length <= 4) { if (msg.mentions.everyone) return; @@ -64,8 +65,8 @@ export default async function actionsRun(bot: Client, msg: Message, args: string embed.setImage(`https://${process.env.CDN_URL}/img/${type}/${n}.gif`) return msg.channel.send(embed) - .then(() => { console.log(`info: ${type} sent by ${msg.author.tag}`); }) - .catch(console.error); + .then(() => { log.info({msg: type, cmd: type, author: { id: msg.author.id, name: msg.author.tag }, guild: msg.guild.id}); }) + .catch(log.error); } if (msg.mentions.members.has(bot.user.id) && !['slap', 'glare'].includes(type)) { @@ -103,6 +104,7 @@ export default async function actionsRun(bot: Client, msg: Message, args: string embed.setImage(`https://${process.env.CDN_URL}/img/${type}/${n}.gif`) } } else { + if(!msg.author.id) return; embed.setDescription(`<@${msg.author.id}> ${verb}${at ? ' at' : ''} you <@${(msg.mentions.members.first()).id}>!`) let n = utilities.randomInt(count.get(type)) @@ -121,8 +123,8 @@ export default async function actionsRun(bot: Client, msg: Message, args: string return msg.channel.send(embed) .then(() => { - console.log(`info: ${type} sent by ${msg.author.tag}`); + log.info({msg: type, author: { id: msg.author.id, name: msg.author.tag }, guild: msg.guild.id}); }) - .catch(console.error); + .catch(log.error); } } diff --git a/src/utils/music.ts b/src/utils/music.ts index 23bae12c..8e6c7d8e 100644 --- a/src/utils/music.ts +++ b/src/utils/music.ts @@ -7,6 +7,7 @@ import { Client, Message, MessageEmbed, Util, VoiceChannel, VoiceConnection, StreamDispatcher } from 'discord.js'; import ytdl from 'ytdl-core'; import { YouTube, Video } from 'popyt'; +import { Logger } from 'pino'; const yt = new YouTube(process.env.YT_TOKEN) let queue:Map = new Map(); @@ -24,7 +25,7 @@ export default class music { * @param msg - Message object * @param args - Arguments in the message */ - static async play(bot: Client, msg: Message, args: string[]) { + static async play(bot: Client, msg: Message, args: string[], log: Logger) { if (!args[0]) return; let voiceChannel:VoiceChannel = msg.member.voice.channel; @@ -96,7 +97,7 @@ export default class music { if (!connection) { try { const voiceConnection = await voiceChannel.join(); - playSong(msg, voiceConnection, voiceChannel); + playSong(msg, voiceConnection, voiceChannel, log); } catch (ex) { console.error(ex) @@ -178,7 +179,7 @@ export default class music { if (!connection) { try { const voiceConnection = await voiceChannel.join(); - playSong(msg, voiceConnection, voiceChannel); + playSong(msg, voiceConnection, voiceChannel, log); } catch (ex) { console.error(ex) @@ -187,7 +188,7 @@ export default class music { }); } else { if (ytdl.validateURL(video_url[0])) { - launchPlay(msg, voiceChannel, video_url[0]) + launchPlay(msg, voiceChannel, video_url[0], log) } else { let keywords = args.join(' ') @@ -201,7 +202,7 @@ export default class music { if (!video) return; if (!ytdl.validateURL(video)) return; - launchPlay(msg, voiceChannel, video) + launchPlay(msg, voiceChannel, video, log) } } } @@ -211,7 +212,7 @@ export default class music { * @param msg - Message object * @param args - Arguments in the message */ - static async remove(msg: Message, args: string[]) { + static async remove(msg: Message, args: string[], log: Logger) { let queueID: number = parseInt(args[0]); if (isNaN(queueID)) return; @@ -230,7 +231,7 @@ export default class music { msg.channel.send(embed) - console.log(`musc: remove from queue: ${msg.author.tag} removed ${data.title}`) + log.info({msg: 'remove', author: { id: msg.author.id, name: msg.author.tag }, guild: msg.guild.id, song: { title: data.title, url: data.shortUrl }}); queu.splice(queueID, 1); queue.set(msg.guild.id, queu); } @@ -240,7 +241,7 @@ export default class music { * @param msg - Message object * @param args - Arguments in the message */ - static async list(msg: Message) { + static async list(msg: Message, log: Logger) { let queu = queue.get(msg.guild.id) || []; if (queu.length < 0) return; @@ -250,7 +251,7 @@ export default class music { if (queu.length <= 1) { embed.setTitle("**:cd: The queue is empty.**") msg.channel.send(embed); - console.log(`musc: show queue by ${msg.author.tag}`) + log.info({msg: 'queue', author: { id: msg.author.id, name: msg.author.tag }, guild: msg.guild.id}) } else { msg.channel.startTyping(); embed.setTitle("**:cd: Music Queue**") @@ -287,7 +288,7 @@ export default class music { msg.channel.send(embed); msg.channel.stopTyping(true); - console.log(`musc: show queue by ${msg.author.tag}`) + log.info({msg: 'queue', author: { id: msg.author.id, name: msg.author.tag }, guild: msg.guild.id}) } } @@ -296,7 +297,7 @@ export default class music { * @param bot - Discord Client object * @param msg - Message object */ - static async skip(bot: Client, msg: Message) { + static async skip(bot: Client, msg: Message, log: Logger) { let voiceChannel:VoiceChannel = msg.member.voice.channel; let voiceConnection = bot.voice.connections.find(val => val.channel.id == voiceChannel.id); let queu = queue.get(msg.guild.id); @@ -322,7 +323,7 @@ export default class music { embed.setAuthor("Your voteskip has been registered!", msg.author.avatarURL({ format: 'png', dynamic: false, size: 128 })) msg.channel.send(embed) - console.log(`info: voteskip by ${msg.author.tag}`) + log.info({msg: 'voteskip', author: { id: msg.author.id, name: msg.author.tag }, guild: msg.guild.id}) if (reqs >= Math.ceil((voiceChannel.members.size - 1) / 2)) { let dispatcher = voiceConnection.dispatcher @@ -332,11 +333,11 @@ export default class music { msg.channel.send(embed) loop.set(msg.guild.id, false); dispatcher.end() - console.log(`musc: skipping song`) + log.info({msg: 'skipping song', author: { id: msg.author.id, name: msg.author.tag }, guild: msg.guild.id}) } else { const embed = new MessageEmbed(); embed.setColor('BRIGHT_RED') - embed.setTitle("You need **" + (Math.ceil((voiceChannel.members.size - 1) / 2) - reqs) + "** more skip vote to skip!") + embed.setTitle(`You need **${(Math.ceil((voiceChannel.members.size - 1) / 2) - reqs)}** more skip vote to skip!`) msg.channel.send(embed) } } else { @@ -351,19 +352,19 @@ export default class music { * Clears the queue * @param msg - Message object */ - static async clear(msg: Message) { + static async clear(msg: Message, log: Logger) { queue.delete(msg.guild.id) await msg.react('βœ…'); - console.log(`musc: clear queue by ${msg.author.tag}`) + log.info({msg: 'clear', author: { id: msg.author.id, name: msg.author.tag }, guild: msg.guild.id}) } /** * Stops the music * @param msg - Message object */ - static async stop(bot: Client, msg: Message) { + static async stop(bot: Client, msg: Message, log: Logger) { let dispatcher = await fetchDispatcher(bot, msg); if(dispatcher) { @@ -373,7 +374,7 @@ export default class music { await msg.react('βœ…'); voiceChannel.leave() - console.log(`musc: stop by ${msg.author.tag}`) + log.info({msg: 'stop', author: { id: msg.author.id, name: msg.author.tag }, guild: msg.guild.id}) } } @@ -383,7 +384,7 @@ export default class music { * @param bot - Discord Client object * @param msg - Message object */ - static async forceskip(bot: Client, msg: Message) { + static async forceskip(bot: Client, msg: Message, log: Logger) { let voiceChannel:VoiceChannel = msg.member.voice.channel; let voiceConnection = bot.voice.connections.find(val => val.channel.id == voiceChannel.id); let queu = queue.get(msg.guild.id); @@ -405,25 +406,25 @@ export default class music { dispatcher.end() - return console.log(`musc: forceskip by ${msg.author.tag}`) + return log.info({msg: 'forceskip', author: { id: msg.author.id, name: msg.author.tag }, guild: msg.guild.id}) } /** * Enables / Disables looping the current song * @param msg - Message object */ - static loop(msg: Message) { + static loop(msg: Message, log: Logger) { let loo = loop.get(msg.guild.id) || false if (!loo) { loop.set(msg.guild.id, true) - console.log(`info: loop enabled by ${msg.author.tag}`) + log.info({msg: 'loop', author: { id: msg.author.id, name: msg.author.tag }, guild: msg.guild.id, enable: true}) const embed = new MessageEmbed(); embed.setAuthor("πŸ”‚ Looping the current song...", msg.author.avatarURL({ format: 'png', dynamic: false, size: 128 })); embed.setColor('GREEN') return msg.channel.send(embed) } else if (loo) { loop.set(msg.guild.id, false) - console.log(`info: loop disabled by ${msg.author.tag}`) + log.info({msg: 'loop', author: { id: msg.author.id, name: msg.author.tag }, guild: msg.guild.id, enable: false}) const embed = new MessageEmbed(); embed.setAuthor("This song will no longer be looped...", msg.author.avatarURL({ format: 'png', dynamic: false, size: 128 })); embed.setColor('GREEN') @@ -431,18 +432,18 @@ export default class music { } } - static loopqueue(msg: Message) { + static loopqueue(msg: Message, log: Logger) { let loo = loopqueue.get(msg.guild.id) || false if (!loo) { loopqueue.set(msg.guild.id, true) - console.log(`info: loop enabled by ${msg.author.tag}`) + log.info({msg: 'loopqueue', author: { id: msg.author.id, name: msg.author.tag }, guild: msg.guild.id, enable: true}) const embed = new MessageEmbed(); embed.setAuthor("πŸ” Looping the queue...", msg.author.avatarURL({ format: 'png', dynamic: false, size: 128 })); embed.setColor('GREEN') return msg.channel.send(embed) } else if (loo) { loopqueue.set(msg.guild.id, false) - console.log(`info: loop disabled by ${msg.author.tag}`) + log.info({msg: 'loopqueue', author: { id: msg.author.id, name: msg.author.tag }, guild: msg.guild.id, enable: false}) const embed = new MessageEmbed(); embed.setAuthor("The queue will no longer be looped...", msg.author.avatarURL({ format: 'png', dynamic: false, size: 128 })); embed.setColor('GREEN') @@ -455,7 +456,7 @@ export default class music { * @param msg - Message object * @param bot - Discord Client object */ - static async np(msg: Message, bot: Client) { + static async np(msg: Message, bot: Client, log: Logger) { let voiceConnection = bot.voice.connections.find(val => val.channel.guild.id === msg.guild.id); let queu = queue.get(msg.guild.id); @@ -498,7 +499,7 @@ export default class music { msg.channel.send(embed) msg.channel.stopTyping(true); - console.log(`info: nowplaying by ${msg.author.tag}`) + log.info({msg: 'nowplaying', author: { id: msg.author.id, name: msg.author.tag }, guild: msg.guild.id}) } /** @@ -506,13 +507,15 @@ export default class music { * @param bot - Discord Client object * @param msg - Message object */ - static async pause(bot: Client, msg: Message) { + static async pause(bot: Client, msg: Message, log: Logger) { let dispatcher = await fetchDispatcher(bot, msg); if(dispatcher) { dispatcher.pause(false); await msg.react('βœ…'); } + + log.info({msg: 'pause', author: { id: msg.author.id, name: msg.author.tag }, guild: msg.guild.id}) } /** @@ -520,16 +523,18 @@ export default class music { * @param bot - Discord Client object * @param msg - Message object */ - static async resume(bot: Client, msg: Message) { + static async resume(bot: Client, msg: Message, log: Logger) { let dispatcher = await fetchDispatcher(bot, msg); if(dispatcher) { dispatcher.resume(); await msg.react('βœ…'); } + + log.info({msg: 'resume', author: { id: msg.author.id, name: msg.author.tag }, guild: msg.guild.id}) } - static async shuffle(bot: Client, msg: Message) { + static async shuffle(bot: Client, msg: Message, log: Logger) { let dispatcher = await fetchDispatcher(bot, msg); if(dispatcher) { @@ -547,6 +552,8 @@ export default class music { queue.set(msg.guild.id, queu) await msg.react('βœ…'); } + + log.info({msg: 'shuffle', author: { id: msg.author.id, name: msg.author.tag }, guild: msg.guild.id}) } } @@ -556,7 +563,7 @@ export default class music { * @param voiceConnection - Voice connection of the bot * @param voiceChannel - The voice channel where the bot should be connected in */ -async function playSong(msg: Message, voiceConnection: VoiceConnection, voiceChannel: VoiceChannel) { +async function playSong(msg: Message, voiceConnection: VoiceConnection, voiceChannel: VoiceChannel, log: Logger) { let queu = queue.get(msg.guild.id); const video = ytdl(queu[0], { filter: "audioonly", quality: "highestaudio", highWaterMark: (2048 * 1024) }); @@ -586,7 +593,7 @@ async function playSong(msg: Message, voiceConnection: VoiceConnection, voiceCha let thumbnail = infos.thumbnails embed.setThumbnail(thumbnail.high.url) msg.channel.send(embed) - console.log(`musc: playing: ${Util.escapeMarkdown(videoData.title)}`) + log.info({msg: 'music playing', author: { id: msg.author.id, name: msg.author.tag }, guild: msg.guild.id, song: { name: Util.escapeMarkdown(videoData.title), url: videoData.shortUrl}}); } }).on('finish', () => { let loo = loop.get(msg.guild.id) || false @@ -615,7 +622,7 @@ async function playSong(msg: Message, voiceConnection: VoiceConnection, voiceCha } else { skipReq.delete(msg.guild.id); skippers.delete(msg.guild.id); - playSong(msg, voiceConnection, voiceChannel) + playSong(msg, voiceConnection, voiceChannel, log) } }).on('error', console.error); } @@ -628,7 +635,7 @@ async function playSong(msg: Message, voiceConnection: VoiceConnection, voiceCha * @param video_url - The video url to check and play * @param data - Youtube Stream data infos */ -async function launchPlay(msg: Message, voiceChannel: VoiceChannel, video_url: string) { +async function launchPlay(msg: Message, voiceChannel: VoiceChannel, video_url: string, log: Logger) { msg.channel.startTyping(); let error = false, data; let queu = queue.get(msg.guild.id) ? queue.get(msg.guild.id) : []; @@ -662,13 +669,13 @@ async function launchPlay(msg: Message, voiceChannel: VoiceChannel, video_url: s embed.setColor('LUMINOUS_VIVID_PINK') msg.channel.stopTyping() await msg.channel.send(embed) - console.log(`musc: add to queue: ${msg.author.tag} added ${data.videoDetails.title}`) + log.info({msg: 'music added to queue', author: { id: msg.author.id, name: msg.author.tag }, guild: msg.guild.id, song: { name: Util.escapeMarkdown(data.videoDetails.title), url: data.videoDetails.video_url}}); } else { msg.channel.stopTyping() try { const voiceConnection = await voiceChannel.join(); - playSong(msg, voiceConnection, voiceChannel); + playSong(msg, voiceConnection, voiceChannel, log); } catch (ex) { console.error(ex) diff --git a/src/utils/staff.ts b/src/utils/staff.ts index 9a61d15b..d7904b90 100644 --- a/src/utils/staff.ts +++ b/src/utils/staff.ts @@ -5,6 +5,7 @@ * @category Utils */ import { Client, Message, MessageEmbed, TextChannel } from 'discord.js' +import { Logger } from 'pino'; const timespan = require("timespan-parser")("min"); export default class staff { @@ -14,7 +15,7 @@ export default class staff { * @param msg - Message object * @param args - Arguments in the message */ - static async bulk(msg: Message, args: string[]) { + static async bulk(msg: Message, args: string[], log: Logger) { if (args.length !== 0) { let channel: any = msg.channel if (msg.channel.type !== "dm") { @@ -22,9 +23,9 @@ export default class staff { let nb = parseInt(args[0]) msg.channel.bulkDelete(nb) .then(() => { - console.log(`info: bulk delete: ${nb} in #${channel.name} by ${msg.author.tag}`) + log.info({msg: 'bulk', author: { id: msg.author.id, name: msg.author.tag }, guild: msg.guild.id, bulk: { channel: channel.id, name: channel.name, x: nb }}); }) - .catch(console.error); + .catch(log.error); } } else @@ -38,7 +39,7 @@ export default class staff { * @param msg - Message object * @param args - Arguments in the message */ - static async mute(bot: Client, msg: Message, args: string[], muteRole: string, modLogChannel: string): Promise { + static async mute(bot: Client, msg: Message, args: string[], log: Logger, muteRole: string, modLogChannel: string): Promise { if (args.length >= 2 && msg.channel.type != 'dm') { if (msg.mentions.everyone) return; @@ -52,7 +53,7 @@ export default class staff { try { msg.delete(); } catch (error) { - console.error(error); + log.error(error); } args.shift(); @@ -68,6 +69,8 @@ export default class staff { await mention.roles.add(muteRole) let reply = await msg.channel.send(embed) + log.info({msg: 'mute', author: { id: msg.author.id, name: msg.author.tag }, guild: msg.guild.id}) + if(modLogChannel) { let channel = await bot.channels.fetch(modLogChannel); let embedLog = new MessageEmbed(); @@ -85,7 +88,7 @@ export default class staff { return mention.roles.remove(muteRole) }, timeParsed) } catch (err) { - console.error(err); + log.error(err); } } } diff --git a/src/utils/utilities.ts b/src/utils/utilities.ts index 0ee98684..29aa9a69 100644 --- a/src/utils/utilities.ts +++ b/src/utils/utilities.ts @@ -5,6 +5,7 @@ * @category Utils */ import * as Discord from "discord.js"; +import log from '../Logger'; /** @desc Importing package.json to fetch the version tag */ let packageJson = require('../../package.json') @@ -32,7 +33,7 @@ export default class utilities { } try { - console.log(`info: info: ${msg.author.tag}`) + log.info({msg: 'info', author: { id: msg.author.id, name: msg.author.tag }, guild: msg.guild.id}); await msg.author.send(embed) } catch (ex) { return msg.channel.send("**:x: > Please open your DMs!**") diff --git a/yarn.lock b/yarn.lock index ee02bedd..054a5895 100644 --- a/yarn.lock +++ b/yarn.lock @@ -40,6 +40,11 @@ "@discordjs/node-pre-gyp" "^0.1.0" node-addon-api "^2.0.0" +"@hapi/bourne@^2.0.0": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@hapi/bourne/-/bourne-2.0.0.tgz#5bb2193eb685c0007540ca61d166d4e1edaf918d" + integrity sha512-WEezM1FWztfbzqIUbsDzFRVMxSoLy3HugVcux6KDDtTqzPsLE8NDRHfXvev66aH1i2oOKKar3/XDjbvh/OUBdg== + "@types/bson@*": version "4.0.2" resolved "https://registry.yarnpkg.com/@types/bson/-/bson-4.0.2.tgz#7accb85942fc39bbdb7515d4de437c04f698115f" @@ -47,6 +52,11 @@ dependencies: "@types/node" "*" +"@types/color-name@^1.1.1": + version "1.1.1" + resolved "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz#1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0" + integrity sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ== + "@types/mongodb@^3.5.18": version "3.5.25" resolved "https://registry.yarnpkg.com/@types/mongodb/-/mongodb-3.5.25.tgz#ab187db04d79f8e3f15af236327dc9139d9d4736" @@ -60,6 +70,29 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-14.0.27.tgz#a151873af5a5e851b51b3b065c9e63390a9e0eb1" integrity sha512-kVrqXhbclHNHGu9ztnAwSncIgJv/FaxmzXJvGXNdcCpV1b8u1/Mi6z6m0vwy0LzKeXFTPLH0NzwmoJ3fNCIq0g== +"@types/pino-std-serializers@*": + version "2.4.1" + resolved "https://registry.yarnpkg.com/@types/pino-std-serializers/-/pino-std-serializers-2.4.1.tgz#f8bd52a209c8b3c97d1533b1ba27f57c816382bf" + integrity sha512-17XcksO47M24IVTVKPeAByWUd3Oez7EbIjXpSbzMPhXVzgjGtrOa49gKBwxH9hb8dKv58OelsWQ+A1G1l9S3wQ== + dependencies: + "@types/node" "*" + +"@types/pino@^6.3.0": + version "6.3.0" + resolved "https://registry.yarnpkg.com/@types/pino/-/pino-6.3.0.tgz#a4ad317278eca19becbc87f5ceafebb99d486604" + integrity sha512-AuZ32IbQlzW3XY9jA9X8iXkhMTtloKWHz1Ze23ClPx7L8ES69BNGfH308LsU2tHnDCLLCFoZvMn8+1njBx2EKg== + dependencies: + "@types/node" "*" + "@types/pino-std-serializers" "*" + "@types/sonic-boom" "*" + +"@types/sonic-boom@*": + version "0.7.0" + resolved "https://registry.yarnpkg.com/@types/sonic-boom/-/sonic-boom-0.7.0.tgz#38337036293992a1df65dd3161abddf8fb9b7176" + integrity sha512-AfqR0fZMoUXUNwusgXKxcE9DPlHNDHQp6nKYUd4PSRpLobF5CCevSpyTEBcVZreqaWKCnGBr9KI1fHMTttoB7A== + dependencies: + "@types/node" "*" + "@types/ws@^7.2.4": version "7.2.6" resolved "https://registry.yarnpkg.com/@types/ws/-/ws-7.2.6.tgz#516cbfb818310f87b43940460e065eb912a4178d" @@ -96,6 +129,21 @@ ansi-regex@^3.0.0: resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998" integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg= +ansi-styles@^3.2.1: + version "3.2.1" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" + integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA== + dependencies: + color-convert "^1.9.0" + +ansi-styles@^4.1.0: + version "4.2.1" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.2.1.tgz#90ae75c424d008d2624c5bf29ead3177ebfcf359" + integrity sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA== + dependencies: + "@types/color-name" "^1.1.1" + color-convert "^2.0.1" + aproba@^1.0.3: version "1.2.0" resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" @@ -109,11 +157,26 @@ are-we-there-yet@~1.1.2: delegates "^1.0.0" readable-stream "^2.0.6" +args@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/args/-/args-5.0.1.tgz#4bf298df90a4799a09521362c579278cc2fdd761" + integrity sha512-1kqmFCFsPffavQFGt8OxJdIcETti99kySRUPMpOhaGjL6mRJn8HFU1OxKY5bMqfZKUwTQc1mZkAjmGYaVOHFtQ== + dependencies: + camelcase "5.0.0" + chalk "2.4.2" + leven "2.1.0" + mri "1.1.4" + asynckit@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" integrity sha1-x57Zf380y48robyXkLzDZkdLS3k= +atomic-sleep@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/atomic-sleep/-/atomic-sleep-1.0.0.tgz#eb85b77a601fc932cfe432c5acd364a9e2c9075b" + integrity sha512-kNOjDqAh7px0XWNI+4QbzoiR/nTkHAWNud2uvnJquD1/x5a7EQZMJT0AczqK0Qn67oY/TTQ1LbUKajZpp3I9tQ== + balanced-match@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" @@ -147,6 +210,11 @@ bufferutil@^4.0.1: dependencies: node-gyp-build "~3.7.0" +camelcase@5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.0.0.tgz#03295527d58bd3cd4aa75363f35b2e8d97be2f42" + integrity sha512-faqwZqnWxbxn+F1d399ygeamQNy3lPp/H9H6rNrqYh4FSVCtcY+3cub1MxA8o9mDd55mM8Aghuu/kuyYA6VTsA== + canvas@^2.6.1: version "2.6.1" resolved "https://registry.yarnpkg.com/canvas/-/canvas-2.6.1.tgz#0d087dd4d60f5a5a9efa202757270abea8bef89e" @@ -156,6 +224,23 @@ canvas@^2.6.1: node-pre-gyp "^0.11.0" simple-get "^3.0.3" +chalk@2.4.2: + version "2.4.2" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" + integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== + dependencies: + ansi-styles "^3.2.1" + escape-string-regexp "^1.0.5" + supports-color "^5.3.0" + +chalk@^4.0.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a" + integrity sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A== + dependencies: + ansi-styles "^4.1.0" + supports-color "^7.1.0" + chownr@^1.1.1: version "1.1.4" resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b" @@ -171,6 +256,30 @@ code-point-at@^1.0.0: resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c= +color-convert@^1.9.0: + version "1.9.3" + resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" + integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg== + dependencies: + color-name "1.1.3" + +color-convert@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3" + integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ== + dependencies: + color-name "~1.1.4" + +color-name@1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" + integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= + +color-name@~1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" + integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== + combined-stream@^1.0.8: version "1.0.8" resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f" @@ -193,6 +302,11 @@ core-util-is@~1.0.0: resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= +dateformat@^3.0.3: + version "3.0.3" + resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae" + integrity sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q== + debug@^3.2.6: version "3.2.6" resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b" @@ -251,11 +365,38 @@ dotenv@^8.2.0: resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.2.0.tgz#97e619259ada750eea3e4ea3e26bceea5424b16a" integrity sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw== +end-of-stream@^1.1.0: + version "1.4.4" + resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0" + integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q== + dependencies: + once "^1.4.0" + +escape-string-regexp@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" + integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= + event-target-shim@^5.0.0: version "5.0.1" resolved "https://registry.yarnpkg.com/event-target-shim/-/event-target-shim-5.0.1.tgz#5d4d3ebdf9583d63a5333ce2deb7480ab2b05789" integrity sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ== +fast-redact@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/fast-redact/-/fast-redact-2.0.0.tgz#17bb8f5e1f56ecf4a38c8455985e5eab4c478431" + integrity sha512-zxpkULI9W9MNTK2sJ3BpPQrTEXFNESd2X6O1tXMFpK/XM0G5c5Rll2EVYZH2TqI3xRGK/VaJ+eEOt7pnENJpeA== + +fast-safe-stringify@^2.0.7: + version "2.0.7" + resolved "https://registry.yarnpkg.com/fast-safe-stringify/-/fast-safe-stringify-2.0.7.tgz#124aa885899261f68aedb42a7c080de9da608743" + integrity sha512-Utm6CdzT+6xsDk2m8S6uL8VHxNwI6Jub+e9NYTcAms28T84pTa25GJQV9j0CY0N1rM8hK4x6grpF2BQf+2qwVA== + +flatstr@^1.0.12: + version "1.0.12" + resolved "https://registry.yarnpkg.com/flatstr/-/flatstr-1.0.12.tgz#c2ba6a08173edbb6c9640e3055b95e287ceb5931" + integrity sha512-4zPxDyhCyiN2wIAtSLI6gc82/EjqZc1onI4Mz/l0pWrAlsSfYH/2ZIcU+e3oA2wDwbzIWNKwa23F8rh6+DRWkw== + fs-minipass@^1.2.5: version "1.2.7" resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.7.tgz#ccff8570841e7fe4265693da88936c55aed7f7c7" @@ -301,6 +442,16 @@ glob@^7.1.3: once "^1.3.0" path-is-absolute "^1.0.0" +has-flag@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" + integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0= + +has-flag@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" + integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== + has-unicode@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" @@ -333,7 +484,7 @@ inflight@^1.0.4: once "^1.3.0" wrappy "1" -inherits@2, inherits@~2.0.3: +inherits@2, inherits@^2.0.3, inherits@~2.0.3: version "2.0.4" resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== @@ -360,6 +511,21 @@ isarray@~1.0.0: resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= +jmespath@^0.15.0: + version "0.15.0" + resolved "https://registry.yarnpkg.com/jmespath/-/jmespath-0.15.0.tgz#a3f222a9aae9f966f5d27c796510e28091764217" + integrity sha1-o/Iiqarp+Wb10nx5ZRDigJF2Qhc= + +joycon@^2.2.5: + version "2.2.5" + resolved "https://registry.yarnpkg.com/joycon/-/joycon-2.2.5.tgz#8d4cf4cbb2544d7b7583c216fcdfec19f6be1615" + integrity sha512-YqvUxoOcVPnCp0VU1/56f+iKSdvIRJYPznH22BdXV3xMk75SFXhWeJkZ8C9XxUWt1b5x2X1SxuFygW1U0FmkEQ== + +leven@2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/leven/-/leven-2.1.0.tgz#c2e7a9f772094dee9d34202ae8acce4687875580" + integrity sha1-wuep93IJTe6dNCAq6KzORoeHVYA= + m3u8stream@^0.7.1: version "0.7.1" resolved "https://registry.yarnpkg.com/m3u8stream/-/m3u8stream-0.7.1.tgz#74b01a67ca248ac7bbdc263a65d9d8d2c479a65c" @@ -467,6 +633,11 @@ mongodb@^3.5.8: optionalDependencies: saslprep "^1.0.0" +mri@1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/mri/-/mri-1.1.4.tgz#7cb1dd1b9b40905f1fac053abe25b6720f44744a" + integrity sha512-6y7IjGPm8AzlvoUrwAaw1tLnUBudaS3752vcd8JtrpGGQn+rXIe63LFVHm/YMwtqAuh+LJPCFdlLYPWM1nYn6w== + ms@^2.1.1: version "2.1.2" resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" @@ -571,7 +742,7 @@ object-assign@^4.1.0: resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= -once@^1.3.0, once@^1.3.1: +once@^1.3.0, once@^1.3.1, once@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E= @@ -601,6 +772,40 @@ path-is-absolute@^1.0.0: resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18= +pino-pretty@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/pino-pretty/-/pino-pretty-4.1.0.tgz#ad47ae00d4f3959cfadcdd691b1ebdcbdd61e42e" + integrity sha512-D4rORz/7SCZ0AGeWw9QFXsJ+ky3jDOqi/ABFzxxCk5BtEelEgJ6AABFew7TosHGw7I1t8VuMaGdTVNoYMZc+jg== + dependencies: + "@hapi/bourne" "^2.0.0" + args "^5.0.1" + chalk "^4.0.0" + dateformat "^3.0.3" + fast-safe-stringify "^2.0.7" + jmespath "^0.15.0" + joycon "^2.2.5" + pump "^3.0.0" + readable-stream "^3.6.0" + split2 "^3.1.1" + strip-json-comments "^3.1.1" + +pino-std-serializers@^2.4.2: + version "2.4.2" + resolved "https://registry.yarnpkg.com/pino-std-serializers/-/pino-std-serializers-2.4.2.tgz#cb5e3e58c358b26f88969d7e619ae54bdfcc1ae1" + integrity sha512-WaL504dO8eGs+vrK+j4BuQQq6GLKeCCcHaMB2ItygzVURcL1CycwNEUHTD/lHFHs/NL5qAz2UKrjYWXKSf4aMQ== + +pino@^6.5.1: + version "6.5.1" + resolved "https://registry.yarnpkg.com/pino/-/pino-6.5.1.tgz#a245adf960a1f3e88e61a339045d509bccbfb7cc" + integrity sha512-76+RUhQkqjUD4AtQcSfEzh6vlsjXmoWZK5gg+2d70aCLXZTbo4/5js4I9rN1Xk6z1h2/7pnOFX10G4c2T4qNiA== + dependencies: + fast-redact "^2.0.0" + fast-safe-stringify "^2.0.7" + flatstr "^1.0.12" + pino-std-serializers "^2.4.2" + quick-format-unescaped "^4.0.1" + sonic-boom "^1.0.2" + popyt@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/popyt/-/popyt-4.1.1.tgz#53f1e0064a30946a8781e44c181f7be31452d57d" @@ -616,6 +821,19 @@ process-nextick-args@~2.0.0: resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag== +pump@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64" + integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww== + dependencies: + end-of-stream "^1.1.0" + once "^1.3.1" + +quick-format-unescaped@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/quick-format-unescaped/-/quick-format-unescaped-4.0.1.tgz#437a5ea1a0b61deb7605f8ab6a8fd3858dbeb701" + integrity sha512-RyYpQ6Q5/drsJyOhrWHYMWTedvjTIat+FTwv0K4yoUxzvekw2aRHMQJLlnvt8UantkZg2++bEzD9EdxXqkWf4A== + rc@^1.2.7, rc@^1.2.8: version "1.2.8" resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" @@ -639,6 +857,15 @@ readable-stream@^2.0.6, readable-stream@^2.3.5: string_decoder "~1.1.1" util-deprecate "~1.0.1" +readable-stream@^3.0.0, readable-stream@^3.6.0: + version "3.6.0" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198" + integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA== + dependencies: + inherits "^2.0.3" + string_decoder "^1.1.1" + util-deprecate "^1.0.1" + require_optional@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/require_optional/-/require_optional-1.0.1.tgz#4cf35a4247f64ca3df8c2ef208cc494b1ca8fc2e" @@ -666,7 +893,7 @@ rimraf@^3.0.2: dependencies: glob "^7.1.3" -safe-buffer@^5.1.1, safe-buffer@^5.1.2: +safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.2.0: version "5.2.1" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== @@ -739,6 +966,14 @@ sodium@^3.0.2: dependencies: node-addon-api "*" +sonic-boom@^1.0.2: + version "1.1.0" + resolved "https://registry.yarnpkg.com/sonic-boom/-/sonic-boom-1.1.0.tgz#538c2de63aaca1b49254a7ed9d16e4931fab6ad3" + integrity sha512-JyOf+Xt7GBN4tAic/DD1Bitw6OMgSHAnswhPeOiLpfRoSjPNjEIi73UF3OxHzhSNn9WavxGuCZzprFCGFSNwog== + dependencies: + atomic-sleep "^1.0.0" + flatstr "^1.0.12" + sparse-bitfield@^3.0.3: version "3.0.3" resolved "https://registry.yarnpkg.com/sparse-bitfield/-/sparse-bitfield-3.0.3.tgz#ff4ae6e68656056ba4b3e792ab3334d38273ca11" @@ -746,6 +981,13 @@ sparse-bitfield@^3.0.3: dependencies: memory-pager "^1.0.2" +split2@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/split2/-/split2-3.1.1.tgz#c51f18f3e06a8c4469aaab487687d8d956160bb6" + integrity sha512-emNzr1s7ruq4N+1993yht631/JH+jaj0NYBosuKmLcq+JkGQ9MmTw1RB1fGaTCzUuseRIClrlSLHRNYGwWQ58Q== + dependencies: + readable-stream "^3.0.0" + string-width@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3" @@ -763,6 +1005,13 @@ string-width@^1.0.1: is-fullwidth-code-point "^2.0.0" strip-ansi "^4.0.0" +string_decoder@^1.1.1: + version "1.3.0" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e" + integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA== + dependencies: + safe-buffer "~5.2.0" + string_decoder@~1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" @@ -784,11 +1033,30 @@ strip-ansi@^4.0.0: dependencies: ansi-regex "^3.0.0" +strip-json-comments@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006" + integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig== + strip-json-comments@~2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo= +supports-color@^5.3.0: + version "5.5.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" + integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow== + dependencies: + has-flag "^3.0.0" + +supports-color@^7.1.0: + version "7.1.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.1.0.tgz#68e32591df73e25ad1c4b49108a2ec507962bfd1" + integrity sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g== + dependencies: + has-flag "^4.0.0" + tar@^4: version "4.4.13" resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525" @@ -831,7 +1099,7 @@ utf-8-validate@^5.0.2: dependencies: node-gyp-build "~3.7.0" -util-deprecate@~1.0.1: +util-deprecate@^1.0.1, util-deprecate@~1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=