From 17815f3ebe9d7e7ef0b184b7c03c1ce8f080df79 Mon Sep 17 00:00:00 2001 From: IDeletedSystem64 Date: Tue, 1 Feb 2022 17:34:07 -0600 Subject: [PATCH 01/21] Fixed the aliases on 8ball. --- src/app/cmds/Fun/8ball.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/cmds/Fun/8ball.js b/src/app/cmds/Fun/8ball.js index d94efc0..96a6c37 100644 --- a/src/app/cmds/Fun/8ball.js +++ b/src/app/cmds/Fun/8ball.js @@ -7,7 +7,7 @@ module.exports = { hidden: false, permissions: ["DEFAULT"], cooldown: 2, - aliases: [""], + aliases: [], syntax: [" "], execute: async(app, message, args) => { let question = args.slice(0).join(" "); From b12e8078dc6fcdea16f2e6f28bbc7fe73197d59f Mon Sep 17 00:00:00 2001 From: IDeletedSystem64 Date: Tue, 1 Feb 2022 22:24:41 -0600 Subject: [PATCH 02/21] Create and finish purge command. --- src/app/cmds/Moderation/purge.js | 45 ++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 src/app/cmds/Moderation/purge.js diff --git a/src/app/cmds/Moderation/purge.js b/src/app/cmds/Moderation/purge.js new file mode 100644 index 0000000..d2822b0 --- /dev/null +++ b/src/app/cmds/Moderation/purge.js @@ -0,0 +1,45 @@ +module.exports = { + name: "purge", + description: "Purge those spicy messages", + category: "Moderation", + guildOnly: false, + authorizedGuilds: [], + hidden: false, + permissions: ["MANAGE_MESSAGES"], + cooldown: 2, + aliases: ["prune"], + syntax: [" "], + execute: async(app, message, args) => { + let msgcount = args.slice(" ") + + if (!isNaN(args[0])) { + try { + message.delete(); + await message.channel.messages.fetch({ limit: msgcount }).then(fetchedMsgs => { + const msgsPrune = fetchedMsgs.filter(msg => !msg.pinned); + return message.channel.bulkDelete(msgsPrune).then(prunedMsgs => { + app.functions.msgHandler(message, { + embeds: [{ + title: `${app.config.system.emotes.success} Purge Successfull`, + color: app.config.system.embedColors.lime, + description: `Successfully purged ${prunedMsgs.size} messages!`, + footer: { text: app.config.system.footerText } + }] + }, 0, true); + }); + }); + } catch (e) { + + } + } else { + app.functions.msgHandler(message, { + embeds: [{ + title: `${app.config.system.emotes.error} Purge Error`, + color: app.config.system.embedColors.red, + description: "You need to specify how many messages to delete!", + footer: { text: app.config.system.footerText + " | An error occurred." } + }] + }, 0, true); + } + } +} From 9da0bfb7fc4f97e3ac13dd6e09fa2f4f126b0777 Mon Sep 17 00:00:00 2001 From: IDeletedSystem64 Date: Wed, 2 Feb 2022 20:27:14 -0600 Subject: [PATCH 03/21] Fix issue with it trying to reply to a non existant message. --- src/app/cmds/Moderation/purge.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/cmds/Moderation/purge.js b/src/app/cmds/Moderation/purge.js index d2822b0..2326c32 100644 --- a/src/app/cmds/Moderation/purge.js +++ b/src/app/cmds/Moderation/purge.js @@ -20,12 +20,12 @@ module.exports = { return message.channel.bulkDelete(msgsPrune).then(prunedMsgs => { app.functions.msgHandler(message, { embeds: [{ - title: `${app.config.system.emotes.success} Purge Successfull`, + title: `${app.config.system.emotes.success} Purge Successful!`, color: app.config.system.embedColors.lime, - description: `Successfully purged ${prunedMsgs.size} messages!`, + description: `Successfully purged ${prunedMsgs.size} spicy messages!`, footer: { text: app.config.system.footerText } }] - }, 0, true); + }); }); }); } catch (e) { From 04cdd8ddf304572e79db6523a0e5ad3e237948ef Mon Sep 17 00:00:00 2001 From: IDeletedSystem64 Date: Wed, 2 Feb 2022 20:45:12 -0600 Subject: [PATCH 04/21] Typing is hard, Grammarly can help. --- src/bot.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/bot.js b/src/bot.js index cd7855b..4a8a813 100644 --- a/src/bot.js +++ b/src/bot.js @@ -3,9 +3,9 @@ 6/24/2021 Now open-source! - Can you believe it Matt 4 years (as of 2022) + Can you believe it took Matt 4 years (as of 2022) to open-source his bot projects? - Yeah, I know crazy. wait.. why am i talking third-person again? + Yeah, I know crazy. wait.. why am I talking third-person again? https://tcb.nekos.tech/source https://themattchannel.com From 45cfd4d491b983400a96ed128061e31a77ee689f Mon Sep 17 00:00:00 2001 From: IDeletedSystem64 Date: Wed, 2 Feb 2022 21:48:22 -0600 Subject: [PATCH 05/21] Change cooldown, set to guildOnly. Fix succ. message --- src/app/cmds/Moderation/purge.js | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/src/app/cmds/Moderation/purge.js b/src/app/cmds/Moderation/purge.js index 2326c32..e0399a4 100644 --- a/src/app/cmds/Moderation/purge.js +++ b/src/app/cmds/Moderation/purge.js @@ -1,14 +1,13 @@ module.exports = { name: "purge", description: "Purge those spicy messages", - category: "Moderation", - guildOnly: false, + guildOnly: true, authorizedGuilds: [], hidden: false, permissions: ["MANAGE_MESSAGES"], - cooldown: 2, + cooldown: 5, aliases: ["prune"], - syntax: [" "], + syntax: [" "], execute: async(app, message, args) => { let msgcount = args.slice(" ") @@ -23,13 +22,20 @@ module.exports = { title: `${app.config.system.emotes.success} Purge Successful!`, color: app.config.system.embedColors.lime, description: `Successfully purged ${prunedMsgs.size} spicy messages!`, - footer: { text: app.config.system.footerText } + footer: { text: app.config.system.footerText + " | This message will blow up in 5 seconds."} }] + }, 0, false, (msg => { setTimeout(() => msg.delete(), 5000) })); }); - }); }); } catch (e) { - + app.functions.msgHandler(message, { + embeds: [{ + title: `${app.config.system.emotes.error} Uh-Oh! Something went wrong!`, + color: app.config.system.embedColors.red, + description: e.message + footer: { text: app.config.system.footerText + " | An error occurred."} + }] + }); } } else { app.functions.msgHandler(message, { From 18fdd5d5237d99e3e4464485c3b77cf3d73a8956 Mon Sep 17 00:00:00 2001 From: IDeletedSystem64 Date: Wed, 2 Feb 2022 21:50:23 -0600 Subject: [PATCH 06/21] Okay, now I think I can commit changes. (Change the cooldown, set as guildOnly, Fix that sexy embed) --- src/app/cmds/Moderation/purge.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/cmds/Moderation/purge.js b/src/app/cmds/Moderation/purge.js index e0399a4..af4d58e 100644 --- a/src/app/cmds/Moderation/purge.js +++ b/src/app/cmds/Moderation/purge.js @@ -32,7 +32,7 @@ module.exports = { embeds: [{ title: `${app.config.system.emotes.error} Uh-Oh! Something went wrong!`, color: app.config.system.embedColors.red, - description: e.message + description: `e.message`, footer: { text: app.config.system.footerText + " | An error occurred."} }] }); From e2809a0c932af83e684f198d734a1871c8b036ca Mon Sep 17 00:00:00 2001 From: TheCodingGuy Date: Wed, 2 Feb 2022 22:57:19 -0500 Subject: [PATCH 07/21] Update purge.js fix up description of the error. error in the error, ay? --- src/app/cmds/Moderation/purge.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/cmds/Moderation/purge.js b/src/app/cmds/Moderation/purge.js index af4d58e..0b2e32d 100644 --- a/src/app/cmds/Moderation/purge.js +++ b/src/app/cmds/Moderation/purge.js @@ -32,7 +32,7 @@ module.exports = { embeds: [{ title: `${app.config.system.emotes.error} Uh-Oh! Something went wrong!`, color: app.config.system.embedColors.red, - description: `e.message`, + description: `Could not purge messages due to: **${e.message}**`, footer: { text: app.config.system.footerText + " | An error occurred."} }] }); From abccc7a68c1d495d8936e54b5b8c9729588c669d Mon Sep 17 00:00:00 2001 From: IDeletedSystem64 Date: Thu, 3 Feb 2022 12:46:03 -0600 Subject: [PATCH 08/21] Update Dependencies --- package-lock.json | 11 +++++++++++ package.json | 1 + 2 files changed, 12 insertions(+) diff --git a/package-lock.json b/package-lock.json index ab2620f..979b118 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18,6 +18,7 @@ "discord.js": "^13.3.1", "node-fetch": "^2.6.1", "node-vibrant": "^3.2.1-alpha.1", + "os": "^0.1.2", "sequelize": "^6.7.0", "sqlite": "^4.0.23", "sqlite3": "^5.0.2" @@ -1879,6 +1880,11 @@ "wrappy": "1" } }, + "node_modules/os": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/os/-/os-0.1.2.tgz", + "integrity": "sha512-ZoXJkvAnljwvc56MbvhtKVWmSkzV712k42Is2mA0+0KTSRakq5XXuXpjZjgAt9ctzl51ojhQWakQQpmOvXWfjQ==" + }, "node_modules/os-homedir": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", @@ -4172,6 +4178,11 @@ "wrappy": "1" } }, + "os": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/os/-/os-0.1.2.tgz", + "integrity": "sha512-ZoXJkvAnljwvc56MbvhtKVWmSkzV712k42Is2mA0+0KTSRakq5XXuXpjZjgAt9ctzl51ojhQWakQQpmOvXWfjQ==" + }, "os-homedir": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", diff --git a/package.json b/package.json index e3e4dba..0ac2337 100644 --- a/package.json +++ b/package.json @@ -25,6 +25,7 @@ "discord.js": "^13.3.1", "node-fetch": "^2.6.1", "node-vibrant": "^3.2.1-alpha.1", + "os": "^0.1.2", "sequelize": "^6.7.0", "sqlite": "^4.0.23", "sqlite3": "^5.0.2" From 2da1ff1767266ceebd2315f903d5e8815f43d3e5 Mon Sep 17 00:00:00 2001 From: IDeletedSystem64 Date: Thu, 3 Feb 2022 12:52:29 -0600 Subject: [PATCH 09/21] Whoops, All dependencies! --- package-lock.json | 177 +++++++++++++++------------------------------- package.json | 1 + 2 files changed, 58 insertions(+), 120 deletions(-) diff --git a/package-lock.json b/package-lock.json index 979b118..7861e7b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -19,6 +19,7 @@ "node-fetch": "^2.6.1", "node-vibrant": "^3.2.1-alpha.1", "os": "^0.1.2", + "osu": "^3.0.0-0", "sequelize": "^6.7.0", "sqlite": "^4.0.23", "sqlite3": "^5.0.2" @@ -467,7 +468,6 @@ "version": "6.12.6", "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", - "optional": true, "dependencies": { "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", @@ -520,7 +520,6 @@ "version": "0.2.4", "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz", "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==", - "optional": true, "dependencies": { "safer-buffer": "~2.1.0" } @@ -529,7 +528,6 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", - "optional": true, "engines": { "node": ">=0.8" } @@ -551,7 +549,6 @@ "version": "0.7.0", "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=", - "optional": true, "engines": { "node": "*" } @@ -559,8 +556,7 @@ "node_modules/aws4": { "version": "1.11.0", "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz", - "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==", - "optional": true + "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==" }, "node_modules/balanced-match": { "version": "1.0.2", @@ -590,7 +586,6 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz", "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=", - "optional": true, "dependencies": { "tweetnacl": "^0.14.3" } @@ -677,8 +672,7 @@ "node_modules/caseless": { "version": "0.12.0", "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", - "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=", - "optional": true + "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=" }, "node_modules/chownr": { "version": "2.0.0", @@ -746,7 +740,6 @@ "version": "1.14.1", "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", - "optional": true, "dependencies": { "assert-plus": "^1.0.0" }, @@ -880,7 +873,6 @@ "version": "0.1.2", "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz", "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=", - "optional": true, "dependencies": { "jsbn": "~0.1.0", "safer-buffer": "^2.1.0" @@ -899,8 +891,7 @@ "node_modules/extend": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", - "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==", - "optional": true + "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==" }, "node_modules/extsprintf": { "version": "1.3.0", @@ -908,20 +899,17 @@ "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=", "engines": [ "node >=0.6.0" - ], - "optional": true + ] }, "node_modules/fast-deep-equal": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", - "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", - "optional": true + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==" }, "node_modules/fast-json-stable-stringify": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", - "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", - "optional": true + "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==" }, "node_modules/file-type": { "version": "9.0.0", @@ -935,7 +923,6 @@ "version": "0.6.1", "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=", - "optional": true, "engines": { "node": "*" } @@ -944,7 +931,6 @@ "version": "2.3.3", "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz", "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==", - "optional": true, "dependencies": { "asynckit": "^0.4.0", "combined-stream": "^1.0.6", @@ -1071,7 +1057,6 @@ "version": "0.1.7", "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", - "optional": true, "dependencies": { "assert-plus": "^1.0.0" } @@ -1123,7 +1108,6 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz", "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=", - "optional": true, "engines": { "node": ">=4" } @@ -1133,7 +1117,6 @@ "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz", "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==", "deprecated": "this library is no longer supported", - "optional": true, "dependencies": { "ajv": "^6.12.3", "har-schema": "^2.0.0" @@ -1151,7 +1134,6 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=", - "optional": true, "dependencies": { "assert-plus": "^1.0.0", "jsprim": "^1.2.2", @@ -1271,8 +1253,7 @@ "node_modules/is-typedarray": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", - "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=", - "optional": true + "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=" }, "node_modules/isarray": { "version": "1.0.0", @@ -1288,8 +1269,7 @@ "node_modules/isstream": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", - "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=", - "optional": true + "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=" }, "node_modules/jpeg-js": { "version": "0.4.2", @@ -1299,32 +1279,27 @@ "node_modules/jsbn": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", - "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=", - "optional": true + "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=" }, "node_modules/json-schema": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz", - "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==", - "optional": true + "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==" }, "node_modules/json-schema-traverse": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", - "optional": true + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==" }, "node_modules/json-stringify-safe": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", - "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=", - "optional": true + "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=" }, "node_modules/jsprim": { "version": "1.4.2", "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz", "integrity": "sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==", - "optional": true, "dependencies": { "assert-plus": "1.0.0", "extsprintf": "1.3.0", @@ -1854,7 +1829,6 @@ "version": "0.9.0", "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz", "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==", - "optional": true, "engines": { "node": "*" } @@ -1910,6 +1884,14 @@ "os-tmpdir": "^1.0.0" } }, + "node_modules/osu": { + "version": "3.0.0-0", + "resolved": "https://registry.npmjs.org/osu/-/osu-3.0.0-0.tgz", + "integrity": "sha512-9BclDcLzFJDA/T6itmLtqlliQMtuLEFWbESfeTF8omQL35U2pOv5dvlssqyO12TSKCsmc3SE2HSbIcFYYfwK3A==", + "dependencies": { + "request": "^2.67.0" + } + }, "node_modules/ow": { "version": "0.27.0", "resolved": "https://registry.npmjs.org/ow/-/ow-0.27.0.tgz", @@ -1969,8 +1951,7 @@ "node_modules/performance-now": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", - "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=", - "optional": true + "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=" }, "node_modules/phin": { "version": "2.9.3", @@ -2037,14 +2018,12 @@ "node_modules/psl": { "version": "1.8.0", "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz", - "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==", - "optional": true + "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==" }, "node_modules/punycode": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", - "optional": true, "engines": { "node": ">=6" } @@ -2053,7 +2032,6 @@ "version": "6.5.2", "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz", "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==", - "optional": true, "engines": { "node": ">=0.6" } @@ -2105,7 +2083,6 @@ "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz", "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==", "deprecated": "request has been deprecated, see https://github.com/request/request/issues/3142", - "optional": true, "dependencies": { "aws-sign2": "~0.7.0", "aws4": "^1.8.0", @@ -2137,7 +2114,6 @@ "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==", "deprecated": "Please upgrade to version 7 or higher. Older versions may use Math.random() in certain circumstances, which is known to be problematic. See https://v8.dev/blog/math-random for details.", - "optional": true, "bin": { "uuid": "bin/uuid" } @@ -2313,7 +2289,6 @@ "version": "1.16.1", "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz", "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==", - "optional": true, "dependencies": { "asn1": "~0.2.3", "assert-plus": "^1.0.0", @@ -2417,7 +2392,6 @@ "version": "2.5.0", "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz", "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==", - "optional": true, "dependencies": { "psl": "^1.1.28", "punycode": "^2.1.1" @@ -2445,7 +2419,6 @@ "version": "0.6.0", "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", - "optional": true, "dependencies": { "safe-buffer": "^5.0.1" }, @@ -2456,8 +2429,7 @@ "node_modules/tweetnacl": { "version": "0.14.5", "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", - "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=", - "optional": true + "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=" }, "node_modules/type-fest": { "version": "1.4.0", @@ -2474,7 +2446,6 @@ "version": "4.4.1", "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", - "optional": true, "dependencies": { "punycode": "^2.1.0" } @@ -2537,7 +2508,6 @@ "engines": [ "node >=0.6.0" ], - "optional": true, "dependencies": { "assert-plus": "^1.0.0", "core-util-is": "1.0.2", @@ -2547,8 +2517,7 @@ "node_modules/verror/node_modules/core-util-is": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=", - "optional": true + "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" }, "node_modules/webidl-conversions": { "version": "3.0.1", @@ -3078,7 +3047,6 @@ "version": "6.12.6", "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", - "optional": true, "requires": { "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", @@ -3124,7 +3092,6 @@ "version": "0.2.4", "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz", "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==", - "optional": true, "requires": { "safer-buffer": "~2.1.0" } @@ -3132,8 +3099,7 @@ "assert-plus": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", - "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", - "optional": true + "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=" }, "async-queue": { "version": "0.1.0", @@ -3148,14 +3114,12 @@ "aws-sign2": { "version": "0.7.0", "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", - "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=", - "optional": true + "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=" }, "aws4": { "version": "1.11.0", "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz", - "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==", - "optional": true + "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==" }, "balanced-match": { "version": "1.0.2", @@ -3171,7 +3135,6 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz", "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=", - "optional": true, "requires": { "tweetnacl": "^0.14.3" } @@ -3231,8 +3194,7 @@ "caseless": { "version": "0.12.0", "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", - "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=", - "optional": true + "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=" }, "chownr": { "version": "2.0.0", @@ -3285,7 +3247,6 @@ "version": "1.14.1", "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", - "optional": true, "requires": { "assert-plus": "^1.0.0" } @@ -3379,7 +3340,6 @@ "version": "0.1.2", "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz", "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=", - "optional": true, "requires": { "jsbn": "~0.1.0", "safer-buffer": "^2.1.0" @@ -3398,26 +3358,22 @@ "extend": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", - "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==", - "optional": true + "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==" }, "extsprintf": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", - "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=", - "optional": true + "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=" }, "fast-deep-equal": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", - "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", - "optional": true + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==" }, "fast-json-stable-stringify": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", - "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", - "optional": true + "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==" }, "file-type": { "version": "9.0.0", @@ -3427,14 +3383,12 @@ "forever-agent": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", - "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=", - "optional": true + "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=" }, "form-data": { "version": "2.3.3", "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz", "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==", - "optional": true, "requires": { "asynckit": "^0.4.0", "combined-stream": "^1.0.6", @@ -3538,7 +3492,6 @@ "version": "0.1.7", "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", - "optional": true, "requires": { "assert-plus": "^1.0.0" } @@ -3583,14 +3536,12 @@ "har-schema": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz", - "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=", - "optional": true + "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=" }, "har-validator": { "version": "5.1.5", "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz", "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==", - "optional": true, "requires": { "ajv": "^6.12.3", "har-schema": "^2.0.0" @@ -3605,7 +3556,6 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=", - "optional": true, "requires": { "assert-plus": "^1.0.0", "jsprim": "^1.2.2", @@ -3689,8 +3639,7 @@ "is-typedarray": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", - "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=", - "optional": true + "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=" }, "isarray": { "version": "1.0.0", @@ -3706,8 +3655,7 @@ "isstream": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", - "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=", - "optional": true + "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=" }, "jpeg-js": { "version": "0.4.2", @@ -3717,32 +3665,27 @@ "jsbn": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", - "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=", - "optional": true + "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=" }, "json-schema": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz", - "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==", - "optional": true + "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==" }, "json-schema-traverse": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", - "optional": true + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==" }, "json-stringify-safe": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", - "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=", - "optional": true + "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=" }, "jsprim": { "version": "1.4.2", "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz", "integrity": "sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==", - "optional": true, "requires": { "assert-plus": "1.0.0", "extsprintf": "1.3.0", @@ -4157,8 +4100,7 @@ "oauth-sign": { "version": "0.9.0", "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz", - "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==", - "optional": true + "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==" }, "object-assign": { "version": "4.1.1", @@ -4202,6 +4144,14 @@ "os-tmpdir": "^1.0.0" } }, + "osu": { + "version": "3.0.0-0", + "resolved": "https://registry.npmjs.org/osu/-/osu-3.0.0-0.tgz", + "integrity": "sha512-9BclDcLzFJDA/T6itmLtqlliQMtuLEFWbESfeTF8omQL35U2pOv5dvlssqyO12TSKCsmc3SE2HSbIcFYYfwK3A==", + "requires": { + "request": "^2.67.0" + } + }, "ow": { "version": "0.27.0", "resolved": "https://registry.npmjs.org/ow/-/ow-0.27.0.tgz", @@ -4252,8 +4202,7 @@ "performance-now": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", - "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=", - "optional": true + "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=" }, "phin": { "version": "2.9.3", @@ -4292,20 +4241,17 @@ "psl": { "version": "1.8.0", "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz", - "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==", - "optional": true + "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==" }, "punycode": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", - "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", - "optional": true + "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==" }, "qs": { "version": "6.5.2", "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz", - "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==", - "optional": true + "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==" }, "querystring": { "version": "0.2.0", @@ -4346,7 +4292,6 @@ "version": "2.88.2", "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz", "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==", - "optional": true, "requires": { "aws-sign2": "~0.7.0", "aws4": "^1.8.0", @@ -4373,8 +4318,7 @@ "uuid": { "version": "3.4.0", "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", - "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==", - "optional": true + "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==" } } }, @@ -4486,7 +4430,6 @@ "version": "1.16.1", "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz", "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==", - "optional": true, "requires": { "asn1": "~0.2.3", "assert-plus": "^1.0.0", @@ -4567,7 +4510,6 @@ "version": "2.5.0", "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz", "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==", - "optional": true, "requires": { "psl": "^1.1.28", "punycode": "^2.1.1" @@ -4592,7 +4534,6 @@ "version": "0.6.0", "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", - "optional": true, "requires": { "safe-buffer": "^5.0.1" } @@ -4600,8 +4541,7 @@ "tweetnacl": { "version": "0.14.5", "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", - "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=", - "optional": true + "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=" }, "type-fest": { "version": "1.4.0", @@ -4612,7 +4552,6 @@ "version": "4.4.1", "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", - "optional": true, "requires": { "punycode": "^2.1.0" } @@ -4665,7 +4604,6 @@ "version": "1.10.0", "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", - "optional": true, "requires": { "assert-plus": "^1.0.0", "core-util-is": "1.0.2", @@ -4675,8 +4613,7 @@ "core-util-is": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=", - "optional": true + "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" } } }, diff --git a/package.json b/package.json index 0ac2337..bcc05a2 100644 --- a/package.json +++ b/package.json @@ -26,6 +26,7 @@ "node-fetch": "^2.6.1", "node-vibrant": "^3.2.1-alpha.1", "os": "^0.1.2", + "osu": "^3.0.0-0", "sequelize": "^6.7.0", "sqlite": "^4.0.23", "sqlite3": "^5.0.2" From 1ff7b20f6632a192490130e41aa34bbe209e20ef Mon Sep 17 00:00:00 2001 From: IDeletedSystem64 Date: Thu, 3 Feb 2022 14:14:49 -0600 Subject: [PATCH 10/21] Whoops, all systeminformation. --- package-lock.json | 210 +++++++++++++++++++++++++++++++++------------- package.json | 4 +- 2 files changed, 154 insertions(+), 60 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7861e7b..43763ae 100644 --- a/package-lock.json +++ b/package-lock.json @@ -19,10 +19,10 @@ "node-fetch": "^2.6.1", "node-vibrant": "^3.2.1-alpha.1", "os": "^0.1.2", - "osu": "^3.0.0-0", "sequelize": "^6.7.0", "sqlite": "^4.0.23", - "sqlite3": "^5.0.2" + "sqlite3": "^5.0.2", + "systeminformation": "^5.11.1" } }, "node_modules/@babel/runtime": { @@ -468,6 +468,7 @@ "version": "6.12.6", "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "optional": true, "dependencies": { "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", @@ -520,6 +521,7 @@ "version": "0.2.4", "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz", "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==", + "optional": true, "dependencies": { "safer-buffer": "~2.1.0" } @@ -528,6 +530,7 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", + "optional": true, "engines": { "node": ">=0.8" } @@ -549,6 +552,7 @@ "version": "0.7.0", "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=", + "optional": true, "engines": { "node": "*" } @@ -556,7 +560,8 @@ "node_modules/aws4": { "version": "1.11.0", "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz", - "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==" + "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==", + "optional": true }, "node_modules/balanced-match": { "version": "1.0.2", @@ -586,6 +591,7 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz", "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=", + "optional": true, "dependencies": { "tweetnacl": "^0.14.3" } @@ -672,7 +678,8 @@ "node_modules/caseless": { "version": "0.12.0", "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", - "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=" + "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=", + "optional": true }, "node_modules/chownr": { "version": "2.0.0", @@ -740,6 +747,7 @@ "version": "1.14.1", "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", + "optional": true, "dependencies": { "assert-plus": "^1.0.0" }, @@ -873,6 +881,7 @@ "version": "0.1.2", "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz", "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=", + "optional": true, "dependencies": { "jsbn": "~0.1.0", "safer-buffer": "^2.1.0" @@ -891,7 +900,8 @@ "node_modules/extend": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", - "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==" + "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==", + "optional": true }, "node_modules/extsprintf": { "version": "1.3.0", @@ -899,17 +909,20 @@ "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=", "engines": [ "node >=0.6.0" - ] + ], + "optional": true }, "node_modules/fast-deep-equal": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", - "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==" + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", + "optional": true }, "node_modules/fast-json-stable-stringify": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", - "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==" + "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", + "optional": true }, "node_modules/file-type": { "version": "9.0.0", @@ -923,6 +936,7 @@ "version": "0.6.1", "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=", + "optional": true, "engines": { "node": "*" } @@ -931,6 +945,7 @@ "version": "2.3.3", "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz", "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==", + "optional": true, "dependencies": { "asynckit": "^0.4.0", "combined-stream": "^1.0.6", @@ -1057,6 +1072,7 @@ "version": "0.1.7", "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", + "optional": true, "dependencies": { "assert-plus": "^1.0.0" } @@ -1108,6 +1124,7 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz", "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=", + "optional": true, "engines": { "node": ">=4" } @@ -1117,6 +1134,7 @@ "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz", "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==", "deprecated": "this library is no longer supported", + "optional": true, "dependencies": { "ajv": "^6.12.3", "har-schema": "^2.0.0" @@ -1134,6 +1152,7 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=", + "optional": true, "dependencies": { "assert-plus": "^1.0.0", "jsprim": "^1.2.2", @@ -1253,7 +1272,8 @@ "node_modules/is-typedarray": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", - "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=" + "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=", + "optional": true }, "node_modules/isarray": { "version": "1.0.0", @@ -1269,7 +1289,8 @@ "node_modules/isstream": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", - "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=" + "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=", + "optional": true }, "node_modules/jpeg-js": { "version": "0.4.2", @@ -1279,27 +1300,32 @@ "node_modules/jsbn": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", - "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=" + "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=", + "optional": true }, "node_modules/json-schema": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz", - "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==" + "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==", + "optional": true }, "node_modules/json-schema-traverse": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==" + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", + "optional": true }, "node_modules/json-stringify-safe": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", - "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=" + "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=", + "optional": true }, "node_modules/jsprim": { "version": "1.4.2", "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz", "integrity": "sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==", + "optional": true, "dependencies": { "assert-plus": "1.0.0", "extsprintf": "1.3.0", @@ -1829,6 +1855,7 @@ "version": "0.9.0", "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz", "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==", + "optional": true, "engines": { "node": "*" } @@ -1884,14 +1911,6 @@ "os-tmpdir": "^1.0.0" } }, - "node_modules/osu": { - "version": "3.0.0-0", - "resolved": "https://registry.npmjs.org/osu/-/osu-3.0.0-0.tgz", - "integrity": "sha512-9BclDcLzFJDA/T6itmLtqlliQMtuLEFWbESfeTF8omQL35U2pOv5dvlssqyO12TSKCsmc3SE2HSbIcFYYfwK3A==", - "dependencies": { - "request": "^2.67.0" - } - }, "node_modules/ow": { "version": "0.27.0", "resolved": "https://registry.npmjs.org/ow/-/ow-0.27.0.tgz", @@ -1951,7 +1970,8 @@ "node_modules/performance-now": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", - "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=" + "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=", + "optional": true }, "node_modules/phin": { "version": "2.9.3", @@ -2018,12 +2038,14 @@ "node_modules/psl": { "version": "1.8.0", "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz", - "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==" + "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==", + "optional": true }, "node_modules/punycode": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", + "optional": true, "engines": { "node": ">=6" } @@ -2032,6 +2054,7 @@ "version": "6.5.2", "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz", "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==", + "optional": true, "engines": { "node": ">=0.6" } @@ -2083,6 +2106,7 @@ "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz", "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==", "deprecated": "request has been deprecated, see https://github.com/request/request/issues/3142", + "optional": true, "dependencies": { "aws-sign2": "~0.7.0", "aws4": "^1.8.0", @@ -2114,6 +2138,7 @@ "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==", "deprecated": "Please upgrade to version 7 or higher. Older versions may use Math.random() in certain circumstances, which is known to be problematic. See https://v8.dev/blog/math-random for details.", + "optional": true, "bin": { "uuid": "bin/uuid" } @@ -2289,6 +2314,7 @@ "version": "1.16.1", "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz", "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==", + "optional": true, "dependencies": { "asn1": "~0.2.3", "assert-plus": "^1.0.0", @@ -2349,6 +2375,31 @@ "node": ">=0.10.0" } }, + "node_modules/systeminformation": { + "version": "5.11.1", + "resolved": "https://registry.npmjs.org/systeminformation/-/systeminformation-5.11.1.tgz", + "integrity": "sha512-E8ZGcnW4Pj4boATSdajw0neHh1B+f+3IqL2iAcT9t1DMgc8mdI0NRT04XPrL6oxrpvMzk0A/bSHT9eKd05tQag==", + "os": [ + "darwin", + "linux", + "win32", + "freebsd", + "openbsd", + "netbsd", + "sunos", + "android" + ], + "bin": { + "systeminformation": "lib/cli.js" + }, + "engines": { + "node": ">=8.0.0" + }, + "funding": { + "type": "Buy me a coffee", + "url": "https://www.buymeacoffee.com/systeminfo" + } + }, "node_modules/tar": { "version": "6.1.11", "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.11.tgz", @@ -2392,6 +2443,7 @@ "version": "2.5.0", "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz", "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==", + "optional": true, "dependencies": { "psl": "^1.1.28", "punycode": "^2.1.1" @@ -2419,6 +2471,7 @@ "version": "0.6.0", "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", + "optional": true, "dependencies": { "safe-buffer": "^5.0.1" }, @@ -2429,7 +2482,8 @@ "node_modules/tweetnacl": { "version": "0.14.5", "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", - "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=" + "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=", + "optional": true }, "node_modules/type-fest": { "version": "1.4.0", @@ -2446,6 +2500,7 @@ "version": "4.4.1", "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", + "optional": true, "dependencies": { "punycode": "^2.1.0" } @@ -2508,6 +2563,7 @@ "engines": [ "node >=0.6.0" ], + "optional": true, "dependencies": { "assert-plus": "^1.0.0", "core-util-is": "1.0.2", @@ -2517,7 +2573,8 @@ "node_modules/verror/node_modules/core-util-is": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" + "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=", + "optional": true }, "node_modules/webidl-conversions": { "version": "3.0.1", @@ -3047,6 +3104,7 @@ "version": "6.12.6", "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "optional": true, "requires": { "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", @@ -3092,6 +3150,7 @@ "version": "0.2.4", "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz", "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==", + "optional": true, "requires": { "safer-buffer": "~2.1.0" } @@ -3099,7 +3158,8 @@ "assert-plus": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", - "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=" + "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", + "optional": true }, "async-queue": { "version": "0.1.0", @@ -3114,12 +3174,14 @@ "aws-sign2": { "version": "0.7.0", "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", - "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=" + "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=", + "optional": true }, "aws4": { "version": "1.11.0", "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz", - "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==" + "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==", + "optional": true }, "balanced-match": { "version": "1.0.2", @@ -3135,6 +3197,7 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz", "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=", + "optional": true, "requires": { "tweetnacl": "^0.14.3" } @@ -3194,7 +3257,8 @@ "caseless": { "version": "0.12.0", "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", - "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=" + "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=", + "optional": true }, "chownr": { "version": "2.0.0", @@ -3247,6 +3311,7 @@ "version": "1.14.1", "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", + "optional": true, "requires": { "assert-plus": "^1.0.0" } @@ -3340,6 +3405,7 @@ "version": "0.1.2", "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz", "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=", + "optional": true, "requires": { "jsbn": "~0.1.0", "safer-buffer": "^2.1.0" @@ -3358,22 +3424,26 @@ "extend": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", - "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==" + "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==", + "optional": true }, "extsprintf": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", - "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=" + "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=", + "optional": true }, "fast-deep-equal": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", - "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==" + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", + "optional": true }, "fast-json-stable-stringify": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", - "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==" + "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", + "optional": true }, "file-type": { "version": "9.0.0", @@ -3383,12 +3453,14 @@ "forever-agent": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", - "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=" + "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=", + "optional": true }, "form-data": { "version": "2.3.3", "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz", "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==", + "optional": true, "requires": { "asynckit": "^0.4.0", "combined-stream": "^1.0.6", @@ -3492,6 +3564,7 @@ "version": "0.1.7", "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", + "optional": true, "requires": { "assert-plus": "^1.0.0" } @@ -3536,12 +3609,14 @@ "har-schema": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz", - "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=" + "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=", + "optional": true }, "har-validator": { "version": "5.1.5", "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz", "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==", + "optional": true, "requires": { "ajv": "^6.12.3", "har-schema": "^2.0.0" @@ -3556,6 +3631,7 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=", + "optional": true, "requires": { "assert-plus": "^1.0.0", "jsprim": "^1.2.2", @@ -3639,7 +3715,8 @@ "is-typedarray": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", - "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=" + "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=", + "optional": true }, "isarray": { "version": "1.0.0", @@ -3655,7 +3732,8 @@ "isstream": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", - "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=" + "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=", + "optional": true }, "jpeg-js": { "version": "0.4.2", @@ -3665,27 +3743,32 @@ "jsbn": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", - "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=" + "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=", + "optional": true }, "json-schema": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz", - "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==" + "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==", + "optional": true }, "json-schema-traverse": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==" + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", + "optional": true }, "json-stringify-safe": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", - "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=" + "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=", + "optional": true }, "jsprim": { "version": "1.4.2", "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz", "integrity": "sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==", + "optional": true, "requires": { "assert-plus": "1.0.0", "extsprintf": "1.3.0", @@ -4100,7 +4183,8 @@ "oauth-sign": { "version": "0.9.0", "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz", - "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==" + "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==", + "optional": true }, "object-assign": { "version": "4.1.1", @@ -4144,14 +4228,6 @@ "os-tmpdir": "^1.0.0" } }, - "osu": { - "version": "3.0.0-0", - "resolved": "https://registry.npmjs.org/osu/-/osu-3.0.0-0.tgz", - "integrity": "sha512-9BclDcLzFJDA/T6itmLtqlliQMtuLEFWbESfeTF8omQL35U2pOv5dvlssqyO12TSKCsmc3SE2HSbIcFYYfwK3A==", - "requires": { - "request": "^2.67.0" - } - }, "ow": { "version": "0.27.0", "resolved": "https://registry.npmjs.org/ow/-/ow-0.27.0.tgz", @@ -4202,7 +4278,8 @@ "performance-now": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", - "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=" + "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=", + "optional": true }, "phin": { "version": "2.9.3", @@ -4241,17 +4318,20 @@ "psl": { "version": "1.8.0", "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz", - "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==" + "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==", + "optional": true }, "punycode": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", - "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==" + "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", + "optional": true }, "qs": { "version": "6.5.2", "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz", - "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==" + "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==", + "optional": true }, "querystring": { "version": "0.2.0", @@ -4292,6 +4372,7 @@ "version": "2.88.2", "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz", "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==", + "optional": true, "requires": { "aws-sign2": "~0.7.0", "aws4": "^1.8.0", @@ -4318,7 +4399,8 @@ "uuid": { "version": "3.4.0", "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", - "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==" + "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==", + "optional": true } } }, @@ -4430,6 +4512,7 @@ "version": "1.16.1", "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz", "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==", + "optional": true, "requires": { "asn1": "~0.2.3", "assert-plus": "^1.0.0", @@ -4473,6 +4556,11 @@ "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=" }, + "systeminformation": { + "version": "5.11.1", + "resolved": "https://registry.npmjs.org/systeminformation/-/systeminformation-5.11.1.tgz", + "integrity": "sha512-E8ZGcnW4Pj4boATSdajw0neHh1B+f+3IqL2iAcT9t1DMgc8mdI0NRT04XPrL6oxrpvMzk0A/bSHT9eKd05tQag==" + }, "tar": { "version": "6.1.11", "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.11.tgz", @@ -4510,6 +4598,7 @@ "version": "2.5.0", "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz", "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==", + "optional": true, "requires": { "psl": "^1.1.28", "punycode": "^2.1.1" @@ -4534,6 +4623,7 @@ "version": "0.6.0", "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", + "optional": true, "requires": { "safe-buffer": "^5.0.1" } @@ -4541,7 +4631,8 @@ "tweetnacl": { "version": "0.14.5", "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", - "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=" + "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=", + "optional": true }, "type-fest": { "version": "1.4.0", @@ -4552,6 +4643,7 @@ "version": "4.4.1", "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", + "optional": true, "requires": { "punycode": "^2.1.0" } @@ -4604,6 +4696,7 @@ "version": "1.10.0", "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", + "optional": true, "requires": { "assert-plus": "^1.0.0", "core-util-is": "1.0.2", @@ -4613,7 +4706,8 @@ "core-util-is": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" + "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=", + "optional": true } } }, diff --git a/package.json b/package.json index bcc05a2..4e12054 100644 --- a/package.json +++ b/package.json @@ -26,9 +26,9 @@ "node-fetch": "^2.6.1", "node-vibrant": "^3.2.1-alpha.1", "os": "^0.1.2", - "osu": "^3.0.0-0", "sequelize": "^6.7.0", "sqlite": "^4.0.23", - "sqlite3": "^5.0.2" + "sqlite3": "^5.0.2", + "systeminformation": "^5.11.1" } } From 5a12c5f07d9e3e2d4ed6da412e6a8cc94e30a689 Mon Sep 17 00:00:00 2001 From: IDeletedSystem64 Date: Thu, 3 Feb 2022 16:51:25 -0600 Subject: [PATCH 11/21] Delete example json --- src/app/extras/extras.json.example | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 src/app/extras/extras.json.example diff --git a/src/app/extras/extras.json.example b/src/app/extras/extras.json.example deleted file mode 100644 index 7fdb1dc..0000000 --- a/src/app/extras/extras.json.example +++ /dev/null @@ -1,6 +0,0 @@ -[{ - "extraName": "Web", - "extraCfg": "web/web.json", - "extraApp": "web/web.js", - "extraEnab": true -}] \ No newline at end of file From 4768f1c2ff148bc34d832b29a064d46f9cecdb1d Mon Sep 17 00:00:00 2001 From: IDeletedSystem64 Date: Thu, 3 Feb 2022 18:59:58 -0600 Subject: [PATCH 12/21] Make TStoHR function not put time in bold by default --- src/app/cfg/app.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/cfg/app.js b/src/app/cfg/app.js index 71d777c..0fc70e7 100644 --- a/src/app/cfg/app.js +++ b/src/app/cfg/app.js @@ -50,7 +50,7 @@ const app = { totalSeconds %= 3600; let minutes = Math.floor(totalSeconds / 60); let seconds = totalSeconds % 60; - let HR = `**${days} days, ${hours} hours, ${minutes} minutes and ${Math.round(seconds)} seconds**`; + let HR = `${days} days, ${hours} hours, ${minutes} minutes and ${Math.round(seconds)} seconds`; if (days == 0) HR = HR.replace(days + " days, ", ""); else if (days == 1) HR = HR.replace("days", "day"); From c1b22f10e2987a03ef3ad0226f023c6ea4128eae Mon Sep 17 00:00:00 2001 From: IDeletedSystem64 Date: Thu, 3 Feb 2022 19:25:57 -0600 Subject: [PATCH 13/21] Add about command (mostly finished) --- src/app/cmds/General/about.js | 38 +++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 src/app/cmds/General/about.js diff --git a/src/app/cmds/General/about.js b/src/app/cmds/General/about.js new file mode 100644 index 0000000..8363c91 --- /dev/null +++ b/src/app/cmds/General/about.js @@ -0,0 +1,38 @@ +module.exports = { + name: "about", + description: "Get info about me, ${app.client.user.tag}!", + guildOnly: false, + authorizedGuilds: [], + hidden: false, + permissions: ["DEFAULT"], + cooldown: 2, + aliases: ["botinfo", "aboutme"], + syntax: [], + execute: async(app, message, args) => { + var si = require('systeminformation'); + app.functions.msgHandler(message, { + embeds: [{ + title: app.config.system.emotes.information + ` All about your favorite bot, **${app.client.user.tag}**!`, + color: app.config.system.embedColors.blue, + thumbnail: { url: app.client.user.displayAvatarURL({ format: 'png', dynamic: true, size: 1024 }) }, + fields: [ + { name: "Bot Information", value: "** **" }, + { name: "User Tag", value: `${app.client.user.tag}`, inline: true}, + { name: "User ID", value: `${app.client.user.id}`, inline: true}, + { name: "Bot Version", value: app.version.toFullString(), inline: true}, + { name: "Bot Uptime", value: app.functions.TStoHR(app.client.uptime), inline: true}, + { name: "Emote Count", value: `${Object.keys(app.config.system.emotes).length} total`, inline: true}, + { name: "Embed Color Count", value: `${Object.keys(app.config.system.embedColors).length} total`, inline: true}, + { name: "RPS Count", value: `${Object.keys(app.config.system.rotatingStatus.statuses).length} total`, inline: true}, + { name: "Bot Memory Usage", value: (Math.round(process.memoryUsage().heapUsed / 1024 / 1024 * 100) / 100) + " MiB", inline: true }, + { name: "Servers I'm In", value: app.client.guilds.cache.size + " total", inline: true}, + { name: "Host System Information", value: "** **" }, + { name: "Node Version", value: `${process.version}`, inline: true }, + { name: "Node Uptime", value: app.functions.TStoHR(process.uptime()* 1000), inline: true }, + { name: "Node Execution Path", value: `${process.execPath}`, inline: true}, + ] + }] + }); + } + } + \ No newline at end of file From 013d0a417828fce6fe8e72a5354fca79edfe3e45 Mon Sep 17 00:00:00 2001 From: IDeletedSystem64 Date: Thu, 3 Feb 2022 19:33:43 -0600 Subject: [PATCH 14/21] Move dependency to app.js --- src/app/cfg/app.js | 1 + src/app/cmds/General/about.js | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/cfg/app.js b/src/app/cfg/app.js index 0fc70e7..32de966 100644 --- a/src/app/cfg/app.js +++ b/src/app/cfg/app.js @@ -422,6 +422,7 @@ const app = { { name: "node-fetch", required: true }, { name: "discord.js", required: true }, { name: "sequelize", required: true }, + { name: "systeminformation", required: true}, { name: "http", required: false }, { name: "canvas", required: false } ] diff --git a/src/app/cmds/General/about.js b/src/app/cmds/General/about.js index 8363c91..5c46bc9 100644 --- a/src/app/cmds/General/about.js +++ b/src/app/cmds/General/about.js @@ -9,7 +9,6 @@ module.exports = { aliases: ["botinfo", "aboutme"], syntax: [], execute: async(app, message, args) => { - var si = require('systeminformation'); app.functions.msgHandler(message, { embeds: [{ title: app.config.system.emotes.information + ` All about your favorite bot, **${app.client.user.tag}**!`, From a11b8da4c44326aa7ed0d63cef49d512cc429c42 Mon Sep 17 00:00:00 2001 From: IDeletedSystem64 Date: Thu, 3 Feb 2022 19:53:23 -0600 Subject: [PATCH 15/21] Update dependencies one more fricken time.. --- src/app/cfg/app.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/cfg/app.js b/src/app/cfg/app.js index 32de966..740ebbc 100644 --- a/src/app/cfg/app.js +++ b/src/app/cfg/app.js @@ -423,7 +423,7 @@ const app = { { name: "discord.js", required: true }, { name: "sequelize", required: true }, { name: "systeminformation", required: true}, - { name: "http", required: false }, + { name: "os", required: true}, { name: "canvas", required: false } ] } From e6fca8a28ff2d34d8c0b3d3ca07ca57ab13937b0 Mon Sep 17 00:00:00 2001 From: IDeletedSystem64 Date: Thu, 3 Feb 2022 21:01:08 -0600 Subject: [PATCH 16/21] Remove system information --- package-lock.json | 33 +-------------------------------- package.json | 3 +-- src/app/cfg/app.js | 1 - 3 files changed, 2 insertions(+), 35 deletions(-) diff --git a/package-lock.json b/package-lock.json index 43763ae..979b118 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21,8 +21,7 @@ "os": "^0.1.2", "sequelize": "^6.7.0", "sqlite": "^4.0.23", - "sqlite3": "^5.0.2", - "systeminformation": "^5.11.1" + "sqlite3": "^5.0.2" } }, "node_modules/@babel/runtime": { @@ -2375,31 +2374,6 @@ "node": ">=0.10.0" } }, - "node_modules/systeminformation": { - "version": "5.11.1", - "resolved": "https://registry.npmjs.org/systeminformation/-/systeminformation-5.11.1.tgz", - "integrity": "sha512-E8ZGcnW4Pj4boATSdajw0neHh1B+f+3IqL2iAcT9t1DMgc8mdI0NRT04XPrL6oxrpvMzk0A/bSHT9eKd05tQag==", - "os": [ - "darwin", - "linux", - "win32", - "freebsd", - "openbsd", - "netbsd", - "sunos", - "android" - ], - "bin": { - "systeminformation": "lib/cli.js" - }, - "engines": { - "node": ">=8.0.0" - }, - "funding": { - "type": "Buy me a coffee", - "url": "https://www.buymeacoffee.com/systeminfo" - } - }, "node_modules/tar": { "version": "6.1.11", "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.11.tgz", @@ -4556,11 +4530,6 @@ "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=" }, - "systeminformation": { - "version": "5.11.1", - "resolved": "https://registry.npmjs.org/systeminformation/-/systeminformation-5.11.1.tgz", - "integrity": "sha512-E8ZGcnW4Pj4boATSdajw0neHh1B+f+3IqL2iAcT9t1DMgc8mdI0NRT04XPrL6oxrpvMzk0A/bSHT9eKd05tQag==" - }, "tar": { "version": "6.1.11", "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.11.tgz", diff --git a/package.json b/package.json index 4e12054..0ac2337 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,6 @@ "os": "^0.1.2", "sequelize": "^6.7.0", "sqlite": "^4.0.23", - "sqlite3": "^5.0.2", - "systeminformation": "^5.11.1" + "sqlite3": "^5.0.2" } } diff --git a/src/app/cfg/app.js b/src/app/cfg/app.js index 740ebbc..2d50582 100644 --- a/src/app/cfg/app.js +++ b/src/app/cfg/app.js @@ -422,7 +422,6 @@ const app = { { name: "node-fetch", required: true }, { name: "discord.js", required: true }, { name: "sequelize", required: true }, - { name: "systeminformation", required: true}, { name: "os", required: true}, { name: "canvas", required: false } ] From 245c92b9d0ce1bd17a6b251ff71a1f6378ed2733 Mon Sep 17 00:00:00 2001 From: IDeletedSystem64 Date: Thu, 3 Feb 2022 21:07:45 -0600 Subject: [PATCH 17/21] This better be the last fucking time I modify the dependencies, You hear me!??? --- package-lock.json | 14 ++++++++++++++ package.json | 1 + src/app/cfg/app.js | 1 + 3 files changed, 16 insertions(+) diff --git a/package-lock.json b/package-lock.json index 979b118..0d05303 100644 --- a/package-lock.json +++ b/package-lock.json @@ -19,6 +19,7 @@ "node-fetch": "^2.6.1", "node-vibrant": "^3.2.1-alpha.1", "os": "^0.1.2", + "os-utils": "^0.0.14", "sequelize": "^6.7.0", "sqlite": "^4.0.23", "sqlite3": "^5.0.2" @@ -1901,6 +1902,14 @@ "node": ">=0.10.0" } }, + "node_modules/os-utils": { + "version": "0.0.14", + "resolved": "https://registry.npmjs.org/os-utils/-/os-utils-0.0.14.tgz", + "integrity": "sha1-KeURaXsZgrjGJ3Ihdf45eX72QVY=", + "engines": { + "node": "*" + } + }, "node_modules/osenv": { "version": "0.1.5", "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz", @@ -4193,6 +4202,11 @@ "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=" }, + "os-utils": { + "version": "0.0.14", + "resolved": "https://registry.npmjs.org/os-utils/-/os-utils-0.0.14.tgz", + "integrity": "sha1-KeURaXsZgrjGJ3Ihdf45eX72QVY=" + }, "osenv": { "version": "0.1.5", "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz", diff --git a/package.json b/package.json index 0ac2337..3aa4a86 100644 --- a/package.json +++ b/package.json @@ -26,6 +26,7 @@ "node-fetch": "^2.6.1", "node-vibrant": "^3.2.1-alpha.1", "os": "^0.1.2", + "os-utils": "^0.0.14", "sequelize": "^6.7.0", "sqlite": "^4.0.23", "sqlite3": "^5.0.2" diff --git a/src/app/cfg/app.js b/src/app/cfg/app.js index 2d50582..ec8091f 100644 --- a/src/app/cfg/app.js +++ b/src/app/cfg/app.js @@ -423,6 +423,7 @@ const app = { { name: "discord.js", required: true }, { name: "sequelize", required: true }, { name: "os", required: true}, + { name: "os-utils", required: true}, { name: "canvas", required: false } ] } From 634590fc948f482b60d2992520f40c49151507b5 Mon Sep 17 00:00:00 2001 From: IDeletedSystem64 Date: Sun, 6 Feb 2022 19:22:43 -0600 Subject: [PATCH 18/21] Am I done modifying dependents for one day?? --- package-lock.json | 11 +++++++++++ package.json | 1 + src/app/cfg/app.js | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/package-lock.json b/package-lock.json index 0d05303..e301c84 100644 --- a/package-lock.json +++ b/package-lock.json @@ -17,6 +17,7 @@ "colors": "^1.4.0", "discord.js": "^13.3.1", "node-fetch": "^2.6.1", + "node-os-utils": "^1.3.6", "node-vibrant": "^3.2.1-alpha.1", "os": "^0.1.2", "os-utils": "^0.0.14", @@ -1642,6 +1643,11 @@ "inherits": "2" } }, + "node_modules/node-os-utils": { + "version": "1.3.6", + "resolved": "https://registry.npmjs.org/node-os-utils/-/node-os-utils-1.3.6.tgz", + "integrity": "sha512-WympE9ELtdOzNak/rAuuIV5DwvX/PTJtN0LjyWeGyTTR2Kt0sY56ldLoGbVBnfM1dz46VeO3sHcNZI5BZ+EB+w==" + }, "node_modules/node-pre-gyp": { "version": "0.11.0", "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.11.0.tgz", @@ -3992,6 +3998,11 @@ } } }, + "node-os-utils": { + "version": "1.3.6", + "resolved": "https://registry.npmjs.org/node-os-utils/-/node-os-utils-1.3.6.tgz", + "integrity": "sha512-WympE9ELtdOzNak/rAuuIV5DwvX/PTJtN0LjyWeGyTTR2Kt0sY56ldLoGbVBnfM1dz46VeO3sHcNZI5BZ+EB+w==" + }, "node-pre-gyp": { "version": "0.11.0", "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.11.0.tgz", diff --git a/package.json b/package.json index 3aa4a86..81d76df 100644 --- a/package.json +++ b/package.json @@ -24,6 +24,7 @@ "colors": "^1.4.0", "discord.js": "^13.3.1", "node-fetch": "^2.6.1", + "node-os-utils": "^1.3.6", "node-vibrant": "^3.2.1-alpha.1", "os": "^0.1.2", "os-utils": "^0.0.14", diff --git a/src/app/cfg/app.js b/src/app/cfg/app.js index ec8091f..1d22677 100644 --- a/src/app/cfg/app.js +++ b/src/app/cfg/app.js @@ -423,7 +423,7 @@ const app = { { name: "discord.js", required: true }, { name: "sequelize", required: true }, { name: "os", required: true}, - { name: "os-utils", required: true}, + { name: "node-os-utils", required: true}, { name: "canvas", required: false } ] } From 3bdaa98aef58fbd9e7cc04088bddab135f1c02e3 Mon Sep 17 00:00:00 2001 From: IDeletedSystem64 Date: Sun, 6 Feb 2022 19:31:03 -0600 Subject: [PATCH 19/21] Finish that fine fine lookin' about command --- src/app/cmds/General/about.js | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/app/cmds/General/about.js b/src/app/cmds/General/about.js index 5c46bc9..cd6c7de 100644 --- a/src/app/cmds/General/about.js +++ b/src/app/cmds/General/about.js @@ -9,6 +9,9 @@ module.exports = { aliases: ["botinfo", "aboutme"], syntax: [], execute: async(app, message, args) => { + const os = app.modules["os"] + // Welcome to os(u)~! + const si = app.modules["systeminformation"] app.functions.msgHandler(message, { embeds: [{ title: app.config.system.emotes.information + ` All about your favorite bot, **${app.client.user.tag}**!`, @@ -29,7 +32,12 @@ module.exports = { { name: "Node Version", value: `${process.version}`, inline: true }, { name: "Node Uptime", value: app.functions.TStoHR(process.uptime()* 1000), inline: true }, { name: "Node Execution Path", value: `${process.execPath}`, inline: true}, - ] + { name: "Process PID", value: `${process.pid}`, inline: true}, + { name: "System Platform", value: `${process.platform}`, inline: true}, + { name: ((process.platform == "linux") ? "Kernel Version" : "System Version"), value: os.version(), inline: true } + // I'd like to have this show the current CPU usage, I'm open to ideas on how to get it to work. - IDeletedSystem64 + ], + footer: { text: app.config.system.footerText } }] }); } From 2480b54fb77825fb13e8cd0b82b3246859060bd8 Mon Sep 17 00:00:00 2001 From: TheCodingGuy Date: Sun, 6 Feb 2022 20:39:30 -0500 Subject: [PATCH 20/21] Fix a missing reference to systeminformation It was a old reference and I took care of it for you. It was not referenced in the app.modules section, so this would cause issues when pushed. --- src/app/cmds/General/about.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/app/cmds/General/about.js b/src/app/cmds/General/about.js index cd6c7de..aedcde5 100644 --- a/src/app/cmds/General/about.js +++ b/src/app/cmds/General/about.js @@ -9,9 +9,7 @@ module.exports = { aliases: ["botinfo", "aboutme"], syntax: [], execute: async(app, message, args) => { - const os = app.modules["os"] - // Welcome to os(u)~! - const si = app.modules["systeminformation"] + const os = app.modules["os"]; // Welcome to os(u)~! app.functions.msgHandler(message, { embeds: [{ title: app.config.system.emotes.information + ` All about your favorite bot, **${app.client.user.tag}**!`, @@ -42,4 +40,4 @@ module.exports = { }); } } - \ No newline at end of file + From eb1545d75a8ffd420d9781868688613df9edb3d1 Mon Sep 17 00:00:00 2001 From: TheCodingGuy Date: Sun, 6 Feb 2022 20:45:59 -0500 Subject: [PATCH 21/21] Syntax error You can't use "" when using the ${} in a string, or else you'll see "Get info about me, ${app.client.user.tag}!" - literally - instead of "Get info about me, TheCodingGuy#6697". --- src/app/cmds/General/about.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/cmds/General/about.js b/src/app/cmds/General/about.js index aedcde5..868bbf1 100644 --- a/src/app/cmds/General/about.js +++ b/src/app/cmds/General/about.js @@ -1,6 +1,6 @@ module.exports = { name: "about", - description: "Get info about me, ${app.client.user.tag}!", + description: `Get info about me, ${app.client.user.tag}!`, guildOnly: false, authorizedGuilds: [], hidden: false,