diff options
| -rw-r--r-- | .eslintrc.cjs | 9 | ||||
| -rw-r--r-- | package.json | 21 | ||||
| -rw-r--r-- | src/commands/info/inviteInfo.ts | 6 | ||||
| -rw-r--r-- | src/commands/utilities/highlight-!.ts | 5 | ||||
| -rw-r--r-- | src/lib/utils/BushLogger.ts | 58 | ||||
| -rw-r--r-- | src/tasks/cache/updateNeuItemCache.ts | 4 | ||||
| -rw-r--r-- | yarn.lock | 800 |
7 files changed, 718 insertions, 185 deletions
diff --git a/.eslintrc.cjs b/.eslintrc.cjs index 9a6837f..e2d7435 100644 --- a/.eslintrc.cjs +++ b/.eslintrc.cjs @@ -115,17 +115,20 @@ const globals = [ 'btoa', 'createImageBitmap', 'fetch', 'queueMicrotask', 'sessionStorage', 'addEventListener', 'removeEventListener' ] +/** + * @type {import('eslint').Linter.Config} + */ module.exports = { env: { - es2021: true, + es2022: true, node: true }, extends: ['eslint:recommended', 'plugin:@typescript-eslint/recommended', 'prettier'], parser: '@typescript-eslint/parser', parserOptions: { - ecmaVersion: 12, + ecmaVersion: 'latest', sourceType: 'module', - project: './tsconfig.json' + project: './tsconfig.eslint.json' }, plugins: ['@typescript-eslint', 'deprecation', 'import'], ignorePatterns: ['dist'], diff --git a/package.json b/package.json index e858ae6..faa2706 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ "license": "CC-BY-NC-SA-4.0", "scripts": { "build:esbuild": "yarn rimraf dist && yarn esbuild --sourcemap=inline --outdir=dist --platform=node --target=es2020 --format=esm --log-level=warning src/**/*.ts", - "build:tsc": "yarn rimraf dist && yarn tsc", + "build:tsc": "yarn tsc", "build:tsc:no-emit": "yarn tsc --noEmit", "start:raw": "node --enable-source-maps --experimental-json-modules --no-warnings dist/src/bot.js", "start:esbuild": "yarn build:esbuild && yarn start:raw", @@ -58,8 +58,8 @@ } }, "dependencies": { - "@discordjs/builders": "^0.15.0", - "@discordjs/rest": "^0.5.0", + "@discordjs/builders": "^1.0.0", + "@discordjs/rest": "^1.0.0", "@ironm00n/nbt-ts": "^1.4.0", "@notenoughupdates/discord.js-minesweeper": "^1.0.10", "@notenoughupdates/events-intercept": "^3.0.1", @@ -73,7 +73,7 @@ "chalk": "^5.0.1", "deep-lock": "^1.0.0", "discord-akairo": "npm:@notenoughupdates/discord-akairo@dev", - "discord-api-types": "0.34.0", + "discord-api-types": "0.36.2", "discord.js": "npm:@notenoughupdates/discord.js@dev", "fuse.js": "^6.6.2", "gif-to-apng": "^0.1.2", @@ -99,22 +99,23 @@ "@types/eslint": "^8.4.5", "@types/express": "^4.17.13", "@types/lodash": "^4.14.182", - "@types/node": "^18.0.4", + "@types/node": "^18.0.6", "@types/numeral": "^2.0.2", "@types/pg": "^8.6.5", "@types/prettier": "^2.6.3", "@types/rimraf": "^3.0.2", "@types/tinycolor2": "^1.4.3", "@types/validator": "^13.7.4", - "@typescript-eslint/eslint-plugin": "^5.30.5", - "@typescript-eslint/parser": "^5.30.5", - "eslint": "^8.19.0", + "@typescript-eslint/eslint-plugin": "^5.30.7", + "@typescript-eslint/parser": "^5.30.7", + "electron": "latest", + "eslint": "^8.20.0", "eslint-config-prettier": "^8.5.0", "eslint-plugin-deprecation": "^1.3.2", "eslint-plugin-import": "^2.26.0", - "node-fetch": "^3.2.8", + "node-fetch": "^3.2.9", "ts-essentials": "^9.2.0", - "vitest": "^0.18.0" + "vitest": "^0.18.1" }, "packageManager": "yarn@3.2.1" } diff --git a/src/commands/info/inviteInfo.ts b/src/commands/info/inviteInfo.ts index bfe7eae..5df86ad 100644 --- a/src/commands/info/inviteInfo.ts +++ b/src/commands/info/inviteInfo.ts @@ -28,15 +28,15 @@ export default class InviteInfoCommand extends BushCommand { public override async exec(message: CommandMessage | SlashMessage, args: { invite: ArgType<'invite' | 'string'> }) { const invite = message.util.isSlashMessage(message) ? ((await Arg.cast('invite', message, args.invite as string)) as ArgType<'invite'>) - : args.invite; + : (args.invite as Invite); - const inviteInfoEmbed = new EmbedBuilder().setTitle(`Invite to ${invite.guild.name}`).setColor(colors.default); + const inviteInfoEmbed = new EmbedBuilder().setTitle(`Invite to ${invite.guild!.name}`).setColor(colors.default); this.generateAboutField(inviteInfoEmbed, invite); } private generateAboutField(embed: EmbedBuilder, invite: Invite) { - const about = [`**code:** ${invite.code}`, `**channel:** ${}`]; + const about = [`**code:** ${invite.code}`, `**channel:** ${invite.channel!.name}`]; embed.addFields({ name: 'ยป About', value: about.join('\n') }); } diff --git a/src/commands/utilities/highlight-!.ts b/src/commands/utilities/highlight-!.ts index b93f59a..f2ee259 100644 --- a/src/commands/utilities/highlight-!.ts +++ b/src/commands/utilities/highlight-!.ts @@ -186,10 +186,7 @@ export default class HighlightCommand extends BushCommand { throw new Error('This command is not meant to be executed directly.'); } - public override async execSlash( - message: SlashMessage, - args: { subcommand: keyof typeof highlightSubcommands; subcommandGroup?: string } - ) { + public override async execSlash(message: SlashMessage, args: { subcommand: string; subcommandGroup?: string }) { // manual `Flag.continue` const subcommand = this.handler.modules.get(`highlight-${args.subcommandGroup ?? args.subcommand}`)!; return subcommand.exec(message, args); diff --git a/src/lib/utils/BushLogger.ts b/src/lib/utils/BushLogger.ts index 5c98760..995dd82 100644 --- a/src/lib/utils/BushLogger.ts +++ b/src/lib/utils/BushLogger.ts @@ -1,6 +1,7 @@ import chalk from 'chalk'; // eslint-disable-next-line @typescript-eslint/no-unused-vars -import { Client, EmbedBuilder, escapeMarkdown, PartialTextBasedChannelFields, type Message } from 'discord.js'; +import { Client, EmbedBuilder, escapeMarkdown, Formatters, PartialTextBasedChannelFields, type Message } from 'discord.js'; +import { stripVTControlCharacters as stripColor } from 'node:util'; import repl, { REPLServer, REPL_MODE_STRICT } from 'repl'; import { WriteStream } from 'tty'; import { type SendMessageType } from '../extensions/discord-akairo/BushClient.js'; @@ -72,16 +73,16 @@ function parseFormatting( discordFormat = false ): string | typeof content { if (typeof content !== 'string') return content; - const newContent: Array<string> = content.split(/<<|>>/); - const tempParsedArray: Array<string> = []; - newContent.forEach((value, index) => { - if (index % 2 !== 0) { - tempParsedArray.push(discordFormat ? `**${escapeMarkdown(value)}**` : color ? chalk[color](value) : value); - } else { - tempParsedArray.push(discordFormat ? escapeMarkdown(value) : value); - } - }); - return tempParsedArray.join(''); + return content + .split(/<<|>>/) + .map((value, index) => { + if (discordFormat) { + return index % 2 === 0 ? escapeMarkdown(value) : Formatters.bold(escapeMarkdown(value)); + } else { + return index % 2 === 0 || !color ? value : chalk[color](value); + } + }) + .join(''); } /** @@ -99,33 +100,24 @@ function inspectContent(content: any, depth = 2, colors = true): string { } /** - * Strips ANSI color codes from a string. - * @param text The string to strip color codes from. - * @returns A string without ANSI color codes. - */ -function stripColor(text: string): string { - return text.replace( - // eslint-disable-next-line no-control-regex - /[\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]/g, - '' - ); -} - -/** * Generates a formatted timestamp for logging. * @returns The formatted timestamp. */ function getTimeStamp(): string { const now = new Date(); - const hours = now.getHours(); - const minute = now.getMinutes(); - let hour = hours; - let amOrPm: 'AM' | 'PM' = 'AM'; - if (hour > 12) { - amOrPm = 'PM'; - hour = hour - 12; - } - return `${hour >= 10 ? hour : `0${hour}`}:${minute >= 10 ? minute : `0${minute}`} ${amOrPm}`; + const minute = pad(now.getMinutes()); + const hour = pad(now.getHours() % 12); + const meridiem = now.getHours() > 12 ? 'PM' : 'AM'; + const year = now.getFullYear().toString().slice(2).padStart(2, '0'); + const date = `${pad(now.getMonth() + 1)}/${pad(now.getDay())}/${year}`; + return `${date} ${hour}:${minute} ${meridiem}`; +} + +/** + * Pad a two-digit number. + */ +function pad(num: number) { + return num.toString().padStart(2, '0'); } /** diff --git a/src/tasks/cache/updateNeuItemCache.ts b/src/tasks/cache/updateNeuItemCache.ts index fff9e08..14c107b 100644 --- a/src/tasks/cache/updateNeuItemCache.ts +++ b/src/tasks/cache/updateNeuItemCache.ts @@ -1,8 +1,8 @@ import { BushTask, Time } from '#lib'; -export default class UpdatePriceItemCache extends BushTask { +export default class UpdateNeuItemCache extends BushTask { public constructor() { - super('updatePriceItemCache', { + super('updateNeuItemCache', { delay: 1 * Time.Hour, runOnStart: true }); @@ -14,20 +14,6 @@ __metadata: languageName: node linkType: hard -"@discordjs/builders@npm:^0.15.0": - version: 0.15.0 - resolution: "@discordjs/builders@npm:0.15.0" - dependencies: - "@sapphire/shapeshift": ^3.1.0 - "@sindresorhus/is": ^4.6.0 - discord-api-types: ^0.33.3 - fast-deep-equal: ^3.1.3 - ts-mixer: ^6.0.1 - tslib: ^2.4.0 - checksum: 1a8a4ffe048243ebb9fbbc76a113e4994c68904a5b3d256a6b10c0123f1d0fb58b45809d134ba993293fb2190c9f3506663ddfb5068a86ec6b9c53b5db61f6a6 - languageName: node - linkType: hard - "@discordjs/builders@npm:^0.16.0-dev": version: 0.16.0-dev.1655510999-2681929 resolution: "@discordjs/builders@npm:0.16.0-dev.1655510999-2681929" @@ -42,10 +28,16 @@ __metadata: languageName: node linkType: hard -"@discordjs/collection@npm:^0.7.0": - version: 0.7.0 - resolution: "@discordjs/collection@npm:0.7.0" - checksum: 141aa35a5433bacba3617b533557b4948388c7b59cdaecee51ccd721c1b9242e50d95bdef53ee2491535a017095f5072ace3c3e9e594193f67a1c5a8a4b7db93 +"@discordjs/builders@npm:^1.0.0": + version: 1.0.0 + resolution: "@discordjs/builders@npm:1.0.0" + dependencies: + "@sapphire/shapeshift": ^3.5.1 + discord-api-types: ^0.36.2 + fast-deep-equal: ^3.1.3 + ts-mixer: ^6.0.1 + tslib: ^2.4.0 + checksum: eeb627c772a2bd1fea1bddd58d46d391c30d0e2411cc3976386b7efc2048724e6bfd204ba848724ebd6d04791b358637c3a9eee878f924ef525c4920bfbfa2de languageName: node linkType: hard @@ -56,17 +48,10 @@ __metadata: languageName: node linkType: hard -"@discordjs/rest@npm:^0.5.0": - version: 0.5.0 - resolution: "@discordjs/rest@npm:0.5.0" - dependencies: - "@discordjs/collection": ^0.7.0 - "@sapphire/async-queue": ^1.3.1 - "@sapphire/snowflake": ^3.2.2 - discord-api-types: ^0.33.3 - tslib: ^2.4.0 - undici: ^5.4.0 - checksum: 36427fd77ff11285da4400e9960fccb71aafa657e43c3de4fe4772d1497f20c3d84754c844ad44d2c6f68fed45303ace790191fd811c94414312fde20d0346c2 +"@discordjs/collection@npm:^1.0.0": + version: 1.0.0 + resolution: "@discordjs/collection@npm:1.0.0" + checksum: d8eafd35e782a6a2ee83a22c31679958bc827fce8cd5ffc7e5942cf681c96fd9543334b48c743ecda45179fcefa8d7be7a13f771d7f14effaec8a8ca25077031 languageName: node linkType: hard @@ -84,6 +69,43 @@ __metadata: languageName: node linkType: hard +"@discordjs/rest@npm:^1.0.0": + version: 1.0.0 + resolution: "@discordjs/rest@npm:1.0.0" + dependencies: + "@discordjs/collection": ^1.0.0 + "@sapphire/async-queue": ^1.3.2 + "@sapphire/snowflake": ^3.2.2 + discord-api-types: ^0.36.2 + file-type: ^17.1.2 + tslib: ^2.4.0 + undici: ^5.7.0 + checksum: dfe4348ce3d9cd7e91b1ee090b4b7c9eaf9f0b5a2acb4e2a1e71cb9a08afa260393190db5461e5873663d7d3bd29fbeda1ebec1bd74dcce87577371cf887cbbe + languageName: node + linkType: hard + +"@electron/get@npm:^1.14.1": + version: 1.14.1 + resolution: "@electron/get@npm:1.14.1" + dependencies: + debug: ^4.1.1 + env-paths: ^2.2.0 + fs-extra: ^8.1.0 + global-agent: ^3.0.0 + global-tunnel-ng: ^2.7.1 + got: ^9.6.0 + progress: ^2.0.3 + semver: ^6.2.0 + sumchecker: ^3.0.1 + dependenciesMeta: + global-agent: + optional: true + global-tunnel-ng: + optional: true + checksum: 21fec5e82bbee8f9fa183b46e05675b137c3130c7999d3b2b34a0047d1a06ec3c76347b9bbdb9911ba9b2123697804e360a15dda9db614c0226d5d4dcc4d6d15 + languageName: node + linkType: hard + "@eslint/eslintrc@npm:^1.3.0": version: 1.3.0 resolution: "@eslint/eslintrc@npm:1.3.0" @@ -241,6 +263,13 @@ __metadata: languageName: node linkType: hard +"@sapphire/async-queue@npm:^1.3.2": + version: 1.3.2 + resolution: "@sapphire/async-queue@npm:1.3.2" + checksum: 348f35a278bff68cb6d5e2c2219b03ce66243162522003bb14426e5fdad251300bea8ef3883043eb034c181dddd52296a519e9f377075a5b31074807fe163e76 + languageName: node + linkType: hard + "@sapphire/shapeshift@npm:^3.1.0": version: 3.2.0 resolution: "@sapphire/shapeshift@npm:3.2.0" @@ -248,6 +277,16 @@ __metadata: languageName: node linkType: hard +"@sapphire/shapeshift@npm:^3.5.1": + version: 3.5.1 + resolution: "@sapphire/shapeshift@npm:3.5.1" + dependencies: + fast-deep-equal: ^3.1.3 + lodash.uniqwith: ^4.5.0 + checksum: caecfef844c9e43e921a5051da888fae7da8980bfd9f9bb4f7fee85931d40929ffb9b6dfae464c0dccee61e56f7698f998e4d9a54d25f35fad39a51ba1a4f391 + languageName: node + linkType: hard + "@sapphire/snowflake@npm:^3.2.2": version: 3.2.2 resolution: "@sapphire/snowflake@npm:3.2.2" @@ -335,6 +374,13 @@ __metadata: languageName: node linkType: hard +"@sindresorhus/is@npm:^0.14.0": + version: 0.14.0 + resolution: "@sindresorhus/is@npm:0.14.0" + checksum: 971e0441dd44ba3909b467219a5e242da0fc584048db5324cfb8048148fa8dcc9d44d71e3948972c4f6121d24e5da402ef191420d1266a95f713bb6d6e59c98a + languageName: node + linkType: hard + "@sindresorhus/is@npm:^4.6.0": version: 4.6.0 resolution: "@sindresorhus/is@npm:4.6.0" @@ -342,6 +388,15 @@ __metadata: languageName: node linkType: hard +"@szmarczak/http-timer@npm:^1.1.2": + version: 1.1.2 + resolution: "@szmarczak/http-timer@npm:1.1.2" + dependencies: + defer-to-connect: ^1.0.1 + checksum: 4d9158061c5f397c57b4988cde33a163244e4f02df16364f103971957a32886beb104d6180902cbe8b38cb940e234d9f98a4e486200deca621923f62f50a06fe + languageName: node + linkType: hard + "@szmarczak/http-timer@npm:^5.0.1": version: 5.0.1 resolution: "@szmarczak/http-timer@npm:5.0.1" @@ -351,6 +406,13 @@ __metadata: languageName: node linkType: hard +"@tokenizer/token@npm:^0.3.0": + version: 0.3.0 + resolution: "@tokenizer/token@npm:0.3.0" + checksum: 1d575d02d2a9f0c5a4ca5180635ebd2ad59e0f18b42a65f3d04844148b49b3db35cf00b6012a1af2d59c2ab3caca59451c5689f747ba8667ee586ad717ee58e1 + languageName: node + linkType: hard + "@tootallnate/once@npm:2": version: 2.0.0 resolution: "@tootallnate/once@npm:2.0.0" @@ -492,7 +554,7 @@ __metadata: languageName: node linkType: hard -"@types/keyv@npm:*": +"@types/keyv@npm:*, @types/keyv@npm:^3.1.1": version: 3.1.4 resolution: "@types/keyv@npm:3.1.4" dependencies: @@ -536,10 +598,17 @@ __metadata: languageName: node linkType: hard -"@types/node@npm:^18.0.4": - version: 18.0.4 - resolution: "@types/node@npm:18.0.4" - checksum: 981284fd57941f233f0e77038087c122f56e3c2b4fc4e090dfc7f0a93abfc526d5ccdd59eb3ef551d713245cf3943e37c7b957f12ba699209341a447c39fab59 +"@types/node@npm:^16.11.26": + version: 16.11.45 + resolution: "@types/node@npm:16.11.45" + checksum: 57d61c951024f66d796e71e4a972faef266007398cd4e93a195822fea2d5deb41d0615f394a99ece89772b145ff057321d138c7e3442455dc7d785ff67cebde3 + languageName: node + linkType: hard + +"@types/node@npm:^18.0.6": + version: 18.0.6 + resolution: "@types/node@npm:18.0.6" + checksum: 780f8885a6b6eb12f4c0246617747fdc37a451931b3c01ce8148d356c0903b705dcb16cc6a914de63d48b0dc1b002c7a3dfae681f580e1761aa551d3cd996813 languageName: node linkType: hard @@ -641,13 +710,13 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/eslint-plugin@npm:^5.30.5": - version: 5.30.5 - resolution: "@typescript-eslint/eslint-plugin@npm:5.30.5" +"@typescript-eslint/eslint-plugin@npm:^5.30.7": + version: 5.30.7 + resolution: "@typescript-eslint/eslint-plugin@npm:5.30.7" dependencies: - "@typescript-eslint/scope-manager": 5.30.5 - "@typescript-eslint/type-utils": 5.30.5 - "@typescript-eslint/utils": 5.30.5 + "@typescript-eslint/scope-manager": 5.30.7 + "@typescript-eslint/type-utils": 5.30.7 + "@typescript-eslint/utils": 5.30.7 debug: ^4.3.4 functional-red-black-tree: ^1.0.1 ignore: ^5.2.0 @@ -660,7 +729,7 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: cf763fb091dcdfd6c25843251a220b654ca83968b17266e0f343771f489085c6afc4e41fcf2187b4c72c4d12a787070c64b5e5367069460f95a8174573f48905 + checksum: d42af514f5817732646b5601030699687b4ef619ba7983754a4173bf908f6c6030324038e3733b88342ec6ace07af61aa946d677da6a6266931275bd2afc9fc2 languageName: node linkType: hard @@ -675,20 +744,20 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/parser@npm:^5.30.5": - version: 5.30.5 - resolution: "@typescript-eslint/parser@npm:5.30.5" +"@typescript-eslint/parser@npm:^5.30.7": + version: 5.30.7 + resolution: "@typescript-eslint/parser@npm:5.30.7" dependencies: - "@typescript-eslint/scope-manager": 5.30.5 - "@typescript-eslint/types": 5.30.5 - "@typescript-eslint/typescript-estree": 5.30.5 + "@typescript-eslint/scope-manager": 5.30.7 + "@typescript-eslint/types": 5.30.7 + "@typescript-eslint/typescript-estree": 5.30.7 debug: ^4.3.4 peerDependencies: eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 peerDependenciesMeta: typescript: optional: true - checksum: 6c16821e122b891420a538f200f6e576ad1167855a67e87f9a7d3a08c0513fe26006f6411b8ba6f4662a81526bd0339ae37c47dd88fa5943e6f27ff70da9f989 + checksum: f0b2da3cfd047d241f0bd3065a36afe008214aa9e8cd05e9f92d8b0e4b9ec19d3651d0e4a3995b8cb34b553cccb4b0d02d18c0cfbe11f53acd85923dd68366d5 languageName: node linkType: hard @@ -702,21 +771,21 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/scope-manager@npm:5.30.5": - version: 5.30.5 - resolution: "@typescript-eslint/scope-manager@npm:5.30.5" +"@typescript-eslint/scope-manager@npm:5.30.7": + version: 5.30.7 + resolution: "@typescript-eslint/scope-manager@npm:5.30.7" dependencies: - "@typescript-eslint/types": 5.30.5 - "@typescript-eslint/visitor-keys": 5.30.5 - checksum: 509bee6d62cca1716e8f4792d9180c189974992ba13d8103ca04423a64006cf184c4b2c606d55c776305458140c798a3a9a414d07a60790b83dd714f56c457b0 + "@typescript-eslint/types": 5.30.7 + "@typescript-eslint/visitor-keys": 5.30.7 + checksum: 434ce7a13a8f3bffae2af2b7fe19bab6e490c78114584212519f50cd1b91fbdcddc8ad93bdb3cacdc8cecca5a8c5d2eb606557e66bd3fcd9d3040846846c22ff languageName: node linkType: hard -"@typescript-eslint/type-utils@npm:5.30.5": - version: 5.30.5 - resolution: "@typescript-eslint/type-utils@npm:5.30.5" +"@typescript-eslint/type-utils@npm:5.30.7": + version: 5.30.7 + resolution: "@typescript-eslint/type-utils@npm:5.30.7" dependencies: - "@typescript-eslint/utils": 5.30.5 + "@typescript-eslint/utils": 5.30.7 debug: ^4.3.4 tsutils: ^3.21.0 peerDependencies: @@ -724,7 +793,7 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 080cc1231729c34b778395658374e32d034474056f9b777dbc89d20d15eb93d93d0959328ad47c2a6623d40c6552364ababadce439842a944bce001f55b731b3 + checksum: e7a8d4ec973355c0fe5bad4c317a55940e41d24b1c33b0bf40e8bb268d784f6584a8048fc84ebdb7287849a2c70e2b36365067cba7815de849cd41a1d7653167 languageName: node linkType: hard @@ -735,10 +804,10 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/types@npm:5.30.5": - version: 5.30.5 - resolution: "@typescript-eslint/types@npm:5.30.5" - checksum: c70420618cb875d4e964a20a3fa4cf40cb97a8ad3123e24860e3d829edf3b081c77fa1fe25644700499d27e44aee5783abc7765deee61e2ef59a928db96b2175 +"@typescript-eslint/types@npm:5.30.7": + version: 5.30.7 + resolution: "@typescript-eslint/types@npm:5.30.7" + checksum: 2f6345bf0e2e9f392c1f62a5f96c630d4565574230a000508d923444229e51c1a05e07cef042935ca30f4f35755dbf3871b8b9da808911f578d63e6a4b897b79 languageName: node linkType: hard @@ -760,12 +829,12 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/typescript-estree@npm:5.30.5": - version: 5.30.5 - resolution: "@typescript-eslint/typescript-estree@npm:5.30.5" +"@typescript-eslint/typescript-estree@npm:5.30.7": + version: 5.30.7 + resolution: "@typescript-eslint/typescript-estree@npm:5.30.7" dependencies: - "@typescript-eslint/types": 5.30.5 - "@typescript-eslint/visitor-keys": 5.30.5 + "@typescript-eslint/types": 5.30.7 + "@typescript-eslint/visitor-keys": 5.30.7 debug: ^4.3.4 globby: ^11.1.0 is-glob: ^4.0.3 @@ -774,7 +843,7 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 19dce426c826cddd4aadf2fa15be943c6ad7d2038685cc2665749486a5f44a47819aab5d260b54f8a4babf6acf2500e9f62e709d61fce337b12d5468ff285277 + checksum: 7cff83a9b9c91a89bcbb677d539b7122b2a423a66f575364858b4635d7e53a25b9329cd20a5adfb732758a41d1c6801d4bfa3eb798a192f351aafb11eedc58b6 languageName: node linkType: hard @@ -794,19 +863,19 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/utils@npm:5.30.5": - version: 5.30.5 - resolution: "@typescript-eslint/utils@npm:5.30.5" +"@typescript-eslint/utils@npm:5.30.7": + version: 5.30.7 + resolution: "@typescript-eslint/utils@npm:5.30.7" dependencies: "@types/json-schema": ^7.0.9 - "@typescript-eslint/scope-manager": 5.30.5 - "@typescript-eslint/types": 5.30.5 - "@typescript-eslint/typescript-estree": 5.30.5 + "@typescript-eslint/scope-manager": 5.30.7 + "@typescript-eslint/types": 5.30.7 + "@typescript-eslint/typescript-estree": 5.30.7 eslint-scope: ^5.1.1 eslint-utils: ^3.0.0 peerDependencies: eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 - checksum: 12f68cb34a150d39708f4e09a54964360f29589885cd50f119a2061660011752ec72eff3d90111f0e597575d32aae7250a6e2c730a84963e5e30352759d5f1f4 + checksum: 77b0baf069f70290214294d74fdf7c46a7ddeab322ef53f65766b0c8e59f0e6f8074beb19233be34faca5beb390ac1b932dd1c983337355674c4437b4b1e2b44 languageName: node linkType: hard @@ -820,13 +889,13 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/visitor-keys@npm:5.30.5": - version: 5.30.5 - resolution: "@typescript-eslint/visitor-keys@npm:5.30.5" +"@typescript-eslint/visitor-keys@npm:5.30.7": + version: 5.30.7 + resolution: "@typescript-eslint/visitor-keys@npm:5.30.7" dependencies: - "@typescript-eslint/types": 5.30.5 + "@typescript-eslint/types": 5.30.7 eslint-visitor-keys: ^3.3.0 - checksum: c0de9ae48378eec2682b860a059518bed213ea29575aad538d8d2f8137875e7279e375a7f23d38c1c183466fdd9cf1ca1db4ed5a1d374968f9460d83e48b2437 + checksum: f322972aeda3143d4c24826436357937131f7fbad102d48cfa6dfca70ac245f93b20cf7beb5f1809bda4fe8f454676a6cabf8f73e39af6724076f2b2c213ee80 languageName: node linkType: hard @@ -1040,6 +1109,13 @@ __metadata: languageName: node linkType: hard +"boolean@npm:^3.0.1": + version: 3.2.0 + resolution: "boolean@npm:3.2.0" + checksum: fb29535b8bf710ef45279677a86d14f5185d604557204abd2ca5fa3fb2a5c80e04d695c8dbf13ab269991977a79bb6c04b048220a6b2a3849853faa94f4a7d77 + languageName: node + linkType: hard + "brace-expansion@npm:^1.1.7": version: 1.1.11 resolution: "brace-expansion@npm:1.1.11" @@ -1106,6 +1182,13 @@ __metadata: languageName: node linkType: hard +"buffer-from@npm:^1.0.0": + version: 1.1.2 + resolution: "buffer-from@npm:1.1.2" + checksum: 0448524a562b37d4d7ed9efd91685a5b77a50672c556ea254ac9a6d30e3403a517d8981f10e565db24e8339413b43c97ca2951f10e399c6125a0d8911f5679bb + languageName: node + linkType: hard + "buffer-writer@npm:2.0.0": version: 2.0.0 resolution: "buffer-writer@npm:2.0.0" @@ -1127,8 +1210,8 @@ __metadata: version: 0.0.0-use.local resolution: "bush-bot@workspace:." dependencies: - "@discordjs/builders": ^0.15.0 - "@discordjs/rest": ^0.5.0 + "@discordjs/builders": ^1.0.0 + "@discordjs/rest": ^1.0.0 "@ironm00n/nbt-ts": ^1.4.0 "@notenoughupdates/discord.js-minesweeper": ^1.0.10 "@notenoughupdates/events-intercept": ^3.0.1 @@ -1143,22 +1226,23 @@ __metadata: "@types/eslint": ^8.4.5 "@types/express": ^4.17.13 "@types/lodash": ^4.14.182 - "@types/node": ^18.0.4 + "@types/node": ^18.0.6 "@types/numeral": ^2.0.2 "@types/pg": ^8.6.5 "@types/prettier": ^2.6.3 "@types/rimraf": ^3.0.2 "@types/tinycolor2": ^1.4.3 "@types/validator": ^13.7.4 - "@typescript-eslint/eslint-plugin": ^5.30.5 - "@typescript-eslint/parser": ^5.30.5 + "@typescript-eslint/eslint-plugin": ^5.30.7 + "@typescript-eslint/parser": ^5.30.7 canvas: ^2.9.3 chalk: ^5.0.1 deep-lock: ^1.0.0 discord-akairo: "npm:@notenoughupdates/discord-akairo@dev" - discord-api-types: 0.34.0 + discord-api-types: 0.36.2 discord.js: "npm:@notenoughupdates/discord.js@dev" - eslint: ^8.19.0 + electron: latest + eslint: ^8.20.0 eslint-config-prettier: ^8.5.0 eslint-plugin-deprecation: ^1.3.2 eslint-plugin-import: ^2.26.0 @@ -1169,7 +1253,7 @@ __metadata: lodash: ^4.17.21 mathjs: ^10.6.4 nanoid: ^4.0.0 - node-fetch: ^3.2.8 + node-fetch: ^3.2.9 numeral: ^2.0.6 pg: ^8.7.3 pg-hstore: ^2.3.4 @@ -1180,7 +1264,7 @@ __metadata: tinycolor2: ^1.4.2 ts-essentials: ^9.2.0 typescript: ^4.7.4 - vitest: ^0.18.0 + vitest: ^0.18.1 vm2: ^3.9.10 languageName: unknown linkType: soft @@ -1218,6 +1302,21 @@ __metadata: languageName: node linkType: hard +"cacheable-request@npm:^6.0.0": + version: 6.1.0 + resolution: "cacheable-request@npm:6.1.0" + dependencies: + clone-response: ^1.0.2 + get-stream: ^5.1.0 + http-cache-semantics: ^4.0.0 + keyv: ^3.0.0 + lowercase-keys: ^2.0.0 + normalize-url: ^4.1.0 + responselike: ^1.0.2 + checksum: b510b237b18d17e89942e9ee2d2a077cb38db03f12167fd100932dfa8fc963424bfae0bfa1598df4ae16c944a5484e43e03df8f32105b04395ee9495e9e4e9f1 + languageName: node + linkType: hard + "cacheable-request@npm:^7.0.2": version: 7.0.2 resolution: "cacheable-request@npm:7.0.2" @@ -1380,6 +1479,28 @@ __metadata: languageName: node linkType: hard +"concat-stream@npm:^1.6.2": + version: 1.6.2 + resolution: "concat-stream@npm:1.6.2" + dependencies: + buffer-from: ^1.0.0 + inherits: ^2.0.3 + readable-stream: ^2.2.2 + typedarray: ^0.0.6 + checksum: 1ef77032cb4459dcd5187bd710d6fc962b067b64ec6a505810de3d2b8cc0605638551b42f8ec91edf6fcd26141b32ef19ad749239b58fae3aba99187adc32285 + languageName: node + linkType: hard + +"config-chain@npm:^1.1.11": + version: 1.1.13 + resolution: "config-chain@npm:1.1.13" + dependencies: + ini: ^1.3.4 + proto-list: ~1.2.1 + checksum: 828137a28e7c2fc4b7fb229bd0cd6c1397bcf83434de54347e608154008f411749041ee392cbe42fab6307e02de4c12480260bf769b7d44b778fdea3839eafab + languageName: node + linkType: hard + "console-control-strings@npm:^1.0.0, console-control-strings@npm:^1.1.0": version: 1.1.0 resolution: "console-control-strings@npm:1.1.0" @@ -1467,6 +1588,15 @@ __metadata: languageName: node linkType: hard +"decompress-response@npm:^3.3.0": + version: 3.3.0 + resolution: "decompress-response@npm:3.3.0" + dependencies: + mimic-response: ^1.0.0 + checksum: 952552ac3bd7de2fc18015086b09468645c9638d98a551305e485230ada278c039c91116e946d07894b39ee53c0f0d5b6473f25a224029344354513b412d7380 + languageName: node + linkType: hard + "decompress-response@npm:^4.2.0": version: 4.2.1 resolution: "decompress-response@npm:4.2.1" @@ -1571,6 +1701,13 @@ __metadata: languageName: node linkType: hard +"defer-to-connect@npm:^1.0.1": + version: 1.1.3 + resolution: "defer-to-connect@npm:1.1.3" + checksum: 9491b301dcfa04956f989481ba7a43c2231044206269eb4ab64a52d6639ee15b1252262a789eb4239fb46ab63e44d4e408641bae8e0793d640aee55398cb3930 + languageName: node + linkType: hard + "defer-to-connect@npm:^2.0.1": version: 2.0.1 resolution: "defer-to-connect@npm:2.0.1" @@ -1609,6 +1746,13 @@ __metadata: languageName: node linkType: hard +"detect-node@npm:^2.0.4": + version: 2.1.0 + resolution: "detect-node@npm:2.1.0" + checksum: 832184ec458353e41533ac9c622f16c19f7c02d8b10c303dfd3a756f56be93e903616c0bb2d4226183c9351c15fc0b3dba41a17a2308262afabcfa3776e6ae6e + languageName: node + linkType: hard + "dir-glob@npm:^3.0.1": version: 3.0.1 resolution: "dir-glob@npm:3.0.1" @@ -1625,14 +1769,14 @@ __metadata: languageName: node linkType: hard -"discord-api-types@npm:0.34.0": - version: 0.34.0 - resolution: "discord-api-types@npm:0.34.0" - checksum: 16ef4a7e82c442808447d2062adb907c050f1c0b10b0dd7ffd459b5cbc2ae8e5ba46d17c645e401500a0263ee661c651d29ab5b41bd2af15a72281d03cba90dc +"discord-api-types@npm:0.36.2, discord-api-types@npm:^0.36.2": + version: 0.36.2 + resolution: "discord-api-types@npm:0.36.2" + checksum: 0275ac9db1bb8354ed3fedb37d7fa66d02b63aa6dc749add1e9ed52b428e94cb8b5111bd60e781cf0c2c5cdb0e948c4e83d00b74f500f1b0ac90ddc38a822798 languageName: node linkType: hard -"discord-api-types@npm:^0.33.3, discord-api-types@npm:^0.33.5": +"discord-api-types@npm:^0.33.5": version: 0.33.5 resolution: "discord-api-types@npm:0.33.5" checksum: 6dcaad640c5693a69c9a4f5e444e739dde11ba835164ae6fd3dd5a1ab7b4d7f96cd022ed653eeaff2c8051ead0d998a5d502a2915cfacdde596364b82d9e3b3f @@ -1683,6 +1827,13 @@ __metadata: languageName: node linkType: hard +"duplexer3@npm:^0.1.4": + version: 0.1.5 + resolution: "duplexer3@npm:0.1.5" + checksum: e677cb4c48f031ca728601d6a20bf6aed4c629d69ef9643cb89c67583d673c4ec9317cc6427501f38bd8c368d3a18f173987cc02bd99d8cf8fe3d94259a22a20 + languageName: node + linkType: hard + "ecdsa-sig-formatter@npm:1.0.11, ecdsa-sig-formatter@npm:^1.0.11": version: 1.0.11 resolution: "ecdsa-sig-formatter@npm:1.0.11" @@ -1692,6 +1843,19 @@ __metadata: languageName: node linkType: hard +"electron@npm:latest": + version: 19.0.9 + resolution: "electron@npm:19.0.9" + dependencies: + "@electron/get": ^1.14.1 + "@types/node": ^16.11.26 + extract-zip: ^1.0.3 + bin: + electron: cli.js + checksum: 662e63216c2802340cd1d2f28664818ec30fade0e1cb9da3a1afb2b13b2c6d920d1506b2c62442ea0118ba8965edee3f1e7c365b8cd1d4060f9a250db1161d47 + languageName: node + linkType: hard + "emoji-regex@npm:^8.0.0": version: 8.0.0 resolution: "emoji-regex@npm:8.0.0" @@ -1699,6 +1863,13 @@ __metadata: languageName: node linkType: hard +"encodeurl@npm:^1.0.2": + version: 1.0.2 + resolution: "encodeurl@npm:1.0.2" + checksum: e50e3d508cdd9c4565ba72d2012e65038e5d71bdc9198cb125beb6237b5b1ade6c0d343998da9e170fb2eae52c1bed37d4d6d98a46ea423a0cddbed5ac3f780c + languageName: node + linkType: hard + "encoding@npm:^0.1.13": version: 0.1.13 resolution: "encoding@npm:0.1.13" @@ -1782,6 +1953,13 @@ __metadata: languageName: node linkType: hard +"es6-error@npm:^4.1.1": + version: 4.1.1 + resolution: "es6-error@npm:4.1.1" + checksum: ae41332a51ec1323da6bbc5d75b7803ccdeddfae17c41b6166ebbafc8e8beb7a7b80b884b7fab1cc80df485860ac3c59d78605e860bb4f8cd816b3d6ade0d010 + languageName: node + linkType: hard + "esbuild-android-64@npm:0.14.48": version: 0.14.48 resolution: "esbuild-android-64@npm:0.14.48" @@ -2120,9 +2298,9 @@ __metadata: languageName: node linkType: hard -"eslint@npm:^8.19.0": - version: 8.19.0 - resolution: "eslint@npm:8.19.0" +"eslint@npm:^8.20.0": + version: 8.20.0 + resolution: "eslint@npm:8.20.0" dependencies: "@eslint/eslintrc": ^1.3.0 "@humanwhocodes/config-array": ^0.9.2 @@ -2161,7 +2339,7 @@ __metadata: v8-compile-cache: ^2.0.3 bin: eslint: bin/eslint.js - checksum: 0bc9df1a3a09dcd5a781ec728f280aa8af3ab19c2d1f14e2668b5ee5b8b1fb0e72dde5c3acf738e7f4281685fb24ec149b6154255470b06cf41de76350bca7a4 + checksum: a31adf390d71d916925586bc8467b48f620e93dd0416bc1e897d99265af88b48d4eba3985b5ff4653ae5cc46311a360d373574002277e159bb38a4363abf9228 languageName: node linkType: hard @@ -2244,6 +2422,20 @@ __metadata: languageName: node linkType: hard +"extract-zip@npm:^1.0.3": + version: 1.7.0 + resolution: "extract-zip@npm:1.7.0" + dependencies: + concat-stream: ^1.6.2 + debug: ^2.6.9 + mkdirp: ^0.5.4 + yauzl: ^2.10.0 + bin: + extract-zip: cli.js + checksum: 011bab660d738614555773d381a6ba4815d98c1cfcdcdf027e154ebcc9fc8c9ef637b3ea5c9b2144013100071ee41722ed041fc9aacc60f6198ef747cac0c073 + languageName: node + linkType: hard + "fast-deep-equal@npm:^3.1.1, fast-deep-equal@npm:^3.1.3": version: 3.1.3 resolution: "fast-deep-equal@npm:3.1.3" @@ -2322,6 +2514,17 @@ __metadata: languageName: node linkType: hard +"file-type@npm:^17.1.2": + version: 17.1.2 + resolution: "file-type@npm:17.1.2" + dependencies: + readable-web-to-node-stream: ^3.0.2 + strtok3: ^7.0.0-alpha.7 + token-types: ^5.0.0-alpha.2 + checksum: 22103084b47d1fdc82e84b979512a2e9e488643f975b04cfd39acb2a9ab212438274a4f06039061631ca01be030f174c387c4a3ab9fe3417a1a199cb59079cb8 + languageName: node + linkType: hard + "file-type@npm:^3.8.0": version: 3.9.0 resolution: "file-type@npm:3.9.0" @@ -2408,6 +2611,17 @@ __metadata: languageName: node linkType: hard +"fs-extra@npm:^8.1.0": + version: 8.1.0 + resolution: "fs-extra@npm:8.1.0" + dependencies: + graceful-fs: ^4.2.0 + jsonfile: ^4.0.0 + universalify: ^0.1.0 + checksum: bf44f0e6cea59d5ce071bba4c43ca76d216f89e402dc6285c128abc0902e9b8525135aa808adad72c9d5d218e9f4bcc63962815529ff2f684ad532172a284880 + languageName: node + linkType: hard + "fs-minipass@npm:^2.0.0, fs-minipass@npm:^2.1.0": version: 2.1.0 resolution: "fs-minipass@npm:2.1.0" @@ -2587,6 +2801,15 @@ __metadata: languageName: node linkType: hard +"get-stream@npm:^4.1.0": + version: 4.1.0 + resolution: "get-stream@npm:4.1.0" + dependencies: + pump: ^3.0.0 + checksum: 443e1914170c15bd52ff8ea6eff6dfc6d712b031303e36302d2778e3de2506af9ee964d6124010f7818736dcfde05c04ba7ca6cc26883106e084357a17ae7d73 + languageName: node + linkType: hard + "get-stream@npm:^5.1.0": version: 5.2.0 resolution: "get-stream@npm:5.2.0" @@ -2668,6 +2891,32 @@ __metadata: languageName: node linkType: hard +"global-agent@npm:^3.0.0": + version: 3.0 |