diff options
| -rw-r--r-- | .eslintrc.cjs | 3 | ||||
| -rw-r--r-- | .vscode/settings.json | 3 | ||||
| -rw-r--r-- | lib/common/CanvasProgressBar.ts | 6 | ||||
| -rw-r--r-- | lib/models/BaseModel.ts | 2 | ||||
| -rw-r--r-- | lib/utils/BushClientUtils.ts | 2 | ||||
| m--------- | neu-item-repo | 0 | ||||
| m--------- | neu-item-repo-dangerous | 0 | ||||
| -rw-r--r-- | package.json | 7 | ||||
| -rw-r--r-- | src/commands/dev/eval.ts | 4 | ||||
| -rw-r--r-- | src/commands/leveling/level.ts | 18 | ||||
| -rw-r--r-- | src/commands/moderation/slowmode.ts | 2 | ||||
| -rw-r--r-- | src/commands/moulberry-bush/neuRepo.ts | 11 | ||||
| -rw-r--r-- | tsconfig.base.json | 3 | ||||
| -rw-r--r-- | yarn.lock | 399 |
14 files changed, 180 insertions, 280 deletions
diff --git a/.eslintrc.cjs b/.eslintrc.cjs index e65a7c8..b8ef98d 100644 --- a/.eslintrc.cjs +++ b/.eslintrc.cjs @@ -174,6 +174,7 @@ module.exports = { 'no-restricted-globals': ['error', ...globals.map((v) => ({ name: v, message: "Don't use DOM globals." }))], '@typescript-eslint/no-namespace': 'off', 'no-debugger': 'warn', - '@typescript-eslint/prefer-as-const': 'warn' + '@typescript-eslint/prefer-as-const': 'warn', + '@typescript-eslint/ban-types': 'off' } }; diff --git a/.vscode/settings.json b/.vscode/settings.json index 4eed974..651c2c2 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -39,5 +39,6 @@ "discord.removeDetails": false, "discord.removeLowerDetails": false, "discord.removeRemoteRepository": false, - "discord.removeTimestamp": false + "discord.removeTimestamp": false, + "typescript.tsdk": "node_modules/typescript/lib" } diff --git a/lib/common/CanvasProgressBar.ts b/lib/common/CanvasProgressBar.ts index fb4f778..279df13 100644 --- a/lib/common/CanvasProgressBar.ts +++ b/lib/common/CanvasProgressBar.ts @@ -1,4 +1,4 @@ -import { CanvasRenderingContext2D } from 'canvas'; +import { SKRSContext2D } from '@napi-rs/canvas'; /** * I just copy pasted this code from stackoverflow don't yell at me if there is issues for it @@ -12,10 +12,10 @@ export class CanvasProgressBar { private readonly color: string; private percentage: number; private p?: number; - private ctx: CanvasRenderingContext2D; + private ctx: SKRSContext2D; public constructor( - ctx: CanvasRenderingContext2D, + ctx: SKRSContext2D, dimension: { x: number; y: number; width: number; height: number }, color: string, percentage: number diff --git a/lib/models/BaseModel.ts b/lib/models/BaseModel.ts index 8fba5e5..6e0d0e5 100644 --- a/lib/models/BaseModel.ts +++ b/lib/models/BaseModel.ts @@ -1,6 +1,6 @@ import { Model } from 'sequelize'; -export abstract class BaseModel<A, B> extends Model<A, B> { +export abstract class BaseModel<A extends {}, B extends {}> extends Model<A, B> { /** * The date when the row was created. */ diff --git a/lib/utils/BushClientUtils.ts b/lib/utils/BushClientUtils.ts index bc4a40a..e468cd7 100644 --- a/lib/utils/BushClientUtils.ts +++ b/lib/utils/BushClientUtils.ts @@ -71,7 +71,7 @@ export class BushClientUtils { } for (const url of this.#hasteURLs) { try { - const res: HastebinRes = await (await fetch(`${url}/documents`, { method: 'POST', body: content })).json(); + const res = (await (await fetch(`${url}/documents`, { method: 'POST', body: content })).json()) as HastebinRes; return { url: `${url}/${res.key}`, error: isSubstr ? 'substr' : undefined }; } catch { void this.client.console.error('haste', `Unable to upload haste to ${url}`); diff --git a/neu-item-repo b/neu-item-repo -Subproject 6ca9e1d2b01e68b7b2df20e183260c201ff12c0 +Subproject 17617a4517877c3e514bee9445668f3b4d83459 diff --git a/neu-item-repo-dangerous b/neu-item-repo-dangerous -Subproject 6ca9e1d2b01e68b7b2df20e183260c201ff12c0 +Subproject 17617a4517877c3e514bee9445668f3b4d83459 diff --git a/package.json b/package.json index b22a63d..3106ca0 100644 --- a/package.json +++ b/package.json @@ -67,6 +67,7 @@ "@discordjs/builders": "^1.1.0", "@discordjs/rest": "^1.0.1", "@ironm00n/nbt-ts": "^1.4.0", + "@napi-rs/canvas": "^0.1.29", "@notenoughupdates/discord.js-minesweeper": "^1.0.10", "@notenoughupdates/events-intercept": "^3.0.1", "@notenoughupdates/humanize-duration": "^4.0.1", @@ -75,7 +76,6 @@ "@sentry/integrations": "^7.11.1", "@sentry/node": "^7.11.1", "@sentry/tracing": "^7.11.1", - "canvas": "^2.9.3", "chalk": "^5.0.1", "deep-lock": "^1.0.0", "discord-akairo": "npm:@notenoughupdates/discord-akairo@dev", @@ -95,7 +95,7 @@ "rimraf": "^3.0.2", "sequelize": "6.21.4", "tinycolor2": "^1.4.2", - "typescript": "^4.7.4", + "typescript": "^4.8.2", "vm2": "^3.9.10" }, "devDependencies": { @@ -113,10 +113,9 @@ "@types/validator": "^13.7.5", "@typescript-eslint/eslint-plugin": "^5.35.1", "@typescript-eslint/parser": "^5.35.1", - "eslint": "^8.22.0", + "eslint": "^8.23.0", "eslint-config-prettier": "^8.5.0", "eslint-plugin-deprecation": "^1.3.2", - "node-fetch": "^3.2.10", "ts-essentials": "^9.3.0", "vitest": "^0.22.1" }, diff --git a/src/commands/dev/eval.ts b/src/commands/dev/eval.ts index fdef3ac..dd21454 100644 --- a/src/commands/dev/eval.ts +++ b/src/commands/dev/eval.ts @@ -18,9 +18,9 @@ import { type CommandMessage, type SlashMessage } from '#lib'; +import canvas from '@napi-rs/canvas'; import { Snowflake as Snowflake_ } from '@sapphire/snowflake'; import assert from 'assert/strict'; -import { Canvas } from 'canvas'; import { exec } from 'child_process'; import { ActionRow, @@ -56,7 +56,7 @@ const { transpile } = ts, /* eslint-enable @typescript-eslint/no-unused-vars */ // prettier-ignore -assertAll(ActivePunishment, BushCommand, Global, Guild, Level, ModLog, Shared, StickyRole, Snowflake_, Canvas, exec, ActionRow, ButtonComponent, ButtonInteraction, Collection, Collector, CommandInteraction, ContextMenuCommandInteraction, DMChannel, Embed, Emoji, InteractionCollector, Message, Attachment, MessageCollector, OAuth2Scopes, PermissionFlagsBits, PermissionsBitField, ReactionCollector, SelectMenuComponent, path, ts, fileURLToPath, promisify, assert, transpile, sh, SnowflakeUtil, __dirname); +assertAll(ActivePunishment, BushCommand, Global, Guild, Level, ModLog, Shared, StickyRole, Snowflake_, canvas, exec, ActionRow, ButtonComponent, ButtonInteraction, Collection, Collector, CommandInteraction, ContextMenuCommandInteraction, DMChannel, Embed, Emoji, InteractionCollector, Message, Attachment, MessageCollector, OAuth2Scopes, PermissionFlagsBits, PermissionsBitField, ReactionCollector, SelectMenuComponent, path, ts, fileURLToPath, promisify, assert, transpile, sh, SnowflakeUtil, __dirname); export default class EvalCommand extends BushCommand { public constructor() { diff --git a/src/commands/leveling/level.ts b/src/commands/leveling/level.ts index 219ae19..ea2a724 100644 --- a/src/commands/leveling/level.ts +++ b/src/commands/leveling/level.ts @@ -9,9 +9,9 @@ import { type OptArgType, type SlashMessage } from '#lib'; +import canvas from '@napi-rs/canvas'; import { SimplifyNumber } from '@notenoughupdates/simplify-number'; import assert from 'assert/strict'; -import canvas from 'canvas'; import { ApplicationCommandOptionType, AttachmentBuilder, Guild, PermissionFlagsBits, User } from 'discord.js'; assert(canvas); assert(SimplifyNumber); @@ -82,11 +82,6 @@ export default class LevelCommand extends BushCommand { gray = '#23272A', highlight = user.hexAccentColor ?? '#5865F2'; - // ! Broken on node v18 - install the font instead - /* // Load roboto font - canvas.registerFont(join(dirname(fileURLToPath(import.meta.url)), '..', '..', '..', '..', 'assets', 'Roboto-Regular.ttf'), { - family: 'Roboto' - }); */ // Create image canvas const levelCard = canvas.createCanvas(800, 200), ctx = levelCard.getContext('2d'); @@ -96,12 +91,9 @@ export default class LevelCommand extends BushCommand { // Draw avatar const AVATAR_SIZE = 128; const avatarImage = new canvas.Image(); - avatarImage.src = user.displayAvatarURL({ extension: 'png', size: AVATAR_SIZE }); - - await new Promise((resolve, reject) => { - avatarImage.onload = () => resolve(undefined); - avatarImage.onerror = (e) => reject(e); - }); + avatarImage.src = Buffer.from( + await (await fetch(user.displayAvatarURL({ extension: 'png', size: AVATAR_SIZE }))).arrayBuffer() + ); const imageTopCoord = levelCard.height / 2 - AVATAR_SIZE / 2; ctx.drawImage(avatarImage, imageTopCoord, imageTopCoord, AVATAR_SIZE, AVATAR_SIZE); @@ -133,6 +125,6 @@ export default class LevelCommand extends BushCommand { ctx.fillText(`Level: ${userLevel} XP: ${xpTxt} Rank: ${rankTxt}`, AVATAR_SIZE + 70, AVATAR_SIZE - 20); // Return image in buffer form - return levelCard.toBuffer(); + return levelCard.toBuffer('image/png'); } } diff --git a/src/commands/moderation/slowmode.ts b/src/commands/moderation/slowmode.ts index 44ed84f..2e603c6 100644 --- a/src/commands/moderation/slowmode.ts +++ b/src/commands/moderation/slowmode.ts @@ -63,6 +63,8 @@ export default class SlowmodeCommand extends BushCommand { args.channel ??= message.channel!; + assert(args.channel); + if ( args.channel.type !== ChannelType.GuildText && args.channel.type !== ChannelType.GuildNews && diff --git a/src/commands/moulberry-bush/neuRepo.ts b/src/commands/moulberry-bush/neuRepo.ts index fcb6f23..4baae7d 100644 --- a/src/commands/moulberry-bush/neuRepo.ts +++ b/src/commands/moulberry-bush/neuRepo.ts @@ -1,5 +1,5 @@ import { BushCommand, clientSendAndPermCheck, type ArgType, type CommandMessage, type SlashMessage } from '#lib'; -import canvas from 'canvas'; +import canvas from '@napi-rs/canvas'; import { ApplicationCommandOptionType, AttachmentBuilder, @@ -7,9 +7,8 @@ import { CacheType, PermissionFlagsBits } from 'discord.js'; -import { dirname, join } from 'path'; +import { join } from 'path'; import tinycolor from 'tinycolor2'; -import { fileURLToPath } from 'url'; import { formattingInfo, RawNeuItem } from '../../../lib/utils/Minecraft.js'; export default class NeuRepoCommand extends BushCommand { @@ -66,10 +65,6 @@ export default class NeuRepoCommand extends BushCommand { } public toolTip(item: RawNeuItem): Buffer { - canvas.registerFont(join(dirname(fileURLToPath(import.meta.url)), '..', '..', '..', '..', 'assets', 'Faithful.ttf'), { - family: 'Faithful' - }); - const background = '#100010'; const width = 250; @@ -143,7 +138,7 @@ export default class NeuRepoCommand extends BushCommand { item.displayname.split(''); - return itemRender.toBuffer(); + return itemRender.toBuffer('image/png'); } // stolen from NEU and modified diff --git a/tsconfig.base.json b/tsconfig.base.json index 71b1bb2..9c7e8de 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -56,10 +56,11 @@ "noFallthroughCasesInSwitch": true, "noImplicitOverride": true, "allowUnusedLabels": true, - "allowUnreachableCode": true + "allowUnreachableCode": true, // #endregion // #region Completeness + "skipLibCheck": true // #endregion } } @@ -56,20 +56,20 @@ __metadata: languageName: node linkType: hard -"@eslint/eslintrc@npm:^1.3.0": - version: 1.3.0 - resolution: "@eslint/eslintrc@npm:1.3.0" +"@eslint/eslintrc@npm:^1.3.1": + version: 1.3.1 + resolution: "@eslint/eslintrc@npm:1.3.1" dependencies: ajv: ^6.12.4 debug: ^4.3.2 - espree: ^9.3.2 + espree: ^9.4.0 globals: ^13.15.0 ignore: ^5.2.0 import-fresh: ^3.2.1 js-yaml: ^4.1.0 minimatch: ^3.1.2 strip-json-comments: ^3.1.1 - checksum: a1e734ad31a8b5328dce9f479f185fd4fc83dd7f06c538e1fa457fd8226b89602a55cc6458cd52b29573b01cdfaf42331be8cfc1fec732570086b591f4ed6515 + checksum: 9844dcc58a44399649926d5a17a2d53d529b80d3e8c3e9d0964ae198bac77ee6bb1cf44940f30cd9c2e300f7568ec82500be42ace6cacefb08aebf9905fe208e languageName: node linkType: hard @@ -98,6 +98,13 @@ __metadata: languageName: node linkType: hard +"@humanwhocodes/module-importer@npm:^1.0.1": + version: 1.0.1 + resolution: "@humanwhocodes/module-importer@npm:1.0.1" + checksum: 0fd22007db8034a2cdf2c764b140d37d9020bbfce8a49d3ec5c05290e77d4b0263b1b972b752df8c89e5eaa94073408f2b7d977aed131faf6cf396ebb5d7fb61 + languageName: node + linkType: hard + "@humanwhocodes/object-schema@npm:^1.2.1": version: 1.2.1 resolution: "@humanwhocodes/object-schema@npm:1.2.1" @@ -112,22 +119,102 @@ __metadata: languageName: node linkType: hard -"@mapbox/node-pre-gyp@npm:^1.0.0": - version: 1.0.9 - resolution: "@mapbox/node-pre-gyp@npm:1.0.9" +"@napi-rs/canvas-android-arm64@npm:0.1.29": + version: 0.1.29 + resolution: "@napi-rs/canvas-android-arm64@npm:0.1.29" + conditions: os=android & cpu=arm64 + languageName: node + linkType: hard + +"@napi-rs/canvas-darwin-arm64@npm:0.1.29": + version: 0.1.29 + resolution: "@napi-rs/canvas-darwin-arm64@npm:0.1.29" + conditions: os=darwin & cpu=arm64 + languageName: node + linkType: hard + +"@napi-rs/canvas-darwin-x64@npm:0.1.29": + version: 0.1.29 + resolution: "@napi-rs/canvas-darwin-x64@npm:0.1.29" + conditions: os=darwin & cpu=x64 + languageName: node + linkType: hard + +"@napi-rs/canvas-linux-arm-gnueabihf@npm:0.1.29": + version: 0.1.29 + resolution: "@napi-rs/canvas-linux-arm-gnueabihf@npm:0.1.29" + conditions: os=linux & cpu=arm + languageName: node + linkType: hard + +"@napi-rs/canvas-linux-arm64-gnu@npm:0.1.29": + version: 0.1.29 + resolution: "@napi-rs/canvas-linux-arm64-gnu@npm:0.1.29" + conditions: os=linux & cpu=arm64 & libc=glibc + languageName: node + linkType: hard + +"@napi-rs/canvas-linux-arm64-musl@npm:0.1.29": + version: 0.1.29 + resolution: "@napi-rs/canvas-linux-arm64-musl@npm:0.1.29" + conditions: os=linux & cpu=arm64 & libc=musl + languageName: node + linkType: hard + +"@napi-rs/canvas-linux-x64-gnu@npm:0.1.29": + version: 0.1.29 + resolution: "@napi-rs/canvas-linux-x64-gnu@npm:0.1.29" + conditions: os=linux & cpu=x64 & libc=glibc + languageName: node + linkType: hard + +"@napi-rs/canvas-linux-x64-musl@npm:0.1.29": + version: 0.1.29 + resolution: "@napi-rs/canvas-linux-x64-musl@npm:0.1.29" + conditions: os=linux & cpu=x64 & libc=musl + languageName: node + linkType: hard + +"@napi-rs/canvas-win32-x64-msvc@npm:0.1.29": + version: 0.1.29 + resolution: "@napi-rs/canvas-win32-x64-msvc@npm:0.1.29" + conditions: os=win32 & cpu=x64 + languageName: node + linkType: hard + +"@napi-rs/canvas@npm:^0.1.29": + version: 0.1.29 + resolution: "@napi-rs/canvas@npm:0.1.29" dependencies: - detect-libc: ^2.0.0 - https-proxy-agent: ^5.0.0 - make-dir: ^3.1.0 - node-fetch: ^2.6.7 - nopt: ^5.0.0 - npmlog: ^5.0.1 - rimraf: ^3.0.2 - semver: ^7.3.5 - tar: ^6.1.11 - bin: - node-pre-gyp: bin/node-pre-gyp - checksum: 1b9c4c87a68d200daa13151d0fe033aa7aa8f7b26f3585255424dd8dfee2ec672c3e9bea4071c624469bc0aebbbcde08f8a300c8a958db52c50abadd5fb56920 + "@napi-rs/canvas-android-arm64": 0.1.29 + "@napi-rs/canvas-darwin-arm64": 0.1.29 + "@napi-rs/canvas-darwin-x64": 0.1.29 + "@napi-rs/canvas-linux-arm-gnueabihf": 0.1.29 + "@napi-rs/canvas-linux-arm64-gnu": 0.1.29 + "@napi-rs/canvas-linux-arm64-musl": 0.1.29 + "@napi-rs/canvas-linux-x64-gnu": 0.1.29 + "@napi-rs/canvas-linux-x64-musl": 0.1.29 + "@napi-rs/canvas-win32-x64-msvc": 0.1.29 + dependenciesMeta: + "@napi-rs/canvas-android-arm64": + optional: true + "@napi-rs/canvas-darwin-arm64": + optional: true + "@napi-rs/canvas-darwin-x64": + optional: true + "@napi-rs/canvas-linux-arm-gnueabihf": + optional: true + "@napi-rs/canvas-linux-arm64-gnu": + optional: true + "@napi-rs/canvas-linux-arm64-musl": + optional: true + "@napi-rs/canvas-linux-x64-gnu": + optional: true + "@napi-rs/canvas-linux-x64-musl": + optional: true + "@napi-rs/canvas-win32-x64-msvc": + optional: true + checksum: 1a8a61429f2be2c975e5e543f6a79c2d1762acfe85a87d308e156b5cbcf4d0d60649fb374128888f465b09563bc96ef91c14c2c9b6c4dd21e1c1acf22c000737 languageName: node linkType: hard @@ -534,9 +621,9 @@ __metadata: linkType: hard "@types/validator@npm:^13.7.1, @types/validator@npm:^13.7.5": - version: 13.7.5 - resolution: "@types/validator@npm:13.7.5" - checksum: cc143351a23aef713b5d6b6794314b6b8b8332511cf44070c3358559b43267217b01c85eab0965c6104ffea362124a949187f348c67ff94ab0ee9966af6d3728 + version: 13.7.6 + resolution: "@types/validator@npm:13.7.6" + checksum: f860dd87bc5f90cc33d2802cf2a4da307ddac63c86d86b858a85dd62d457c8fa42fc8756e05b5d24e741376debc13d46ed14bc700006bf7d0cb910118022492b languageName: node linkType: hard @@ -774,16 +861,6 @@ __metadata: languageName: node linkType: hard -"are-we-there-yet@npm:^2.0.0": - version: 2.0.0 - resolution: "are-we-there-yet@npm:2.0.0" - dependencies: - delegates: ^1.0.0 - readable-stream: ^3.6.0 - checksum: 6c80b4fd04ecee6ba6e737e0b72a4b41bdc64b7d279edfc998678567ff583c8df27e27523bc789f2c99be603ffa9eaa612803da1d886962d2086e7ff6fa90c7c - languageName: node - linkType: hard - "are-we-there-yet@npm:^3.0.0": version: 3.0.1 resolution: "are-we-there-yet@npm:3.0.1" @@ -943,6 +1020,7 @@ __metadata: "@discordjs/builders": ^1.1.0 "@discordjs/rest": ^1.0.1 "@ironm00n/nbt-ts": ^1.4.0 + "@napi-rs/canvas": ^0.1.29 "@notenoughupdates/discord.js-minesweeper": ^1.0.10 "@notenoughupdates/events-intercept": ^3.0.1 "@notenoughupdates/humanize-duration": ^4.0.1 @@ -965,13 +1043,12 @@ __metadata: "@types/validator": ^13.7.5 "@typescript-eslint/eslint-plugin": ^5.35.1 "@typescript-eslint/parser": ^5.35.1 - canvas: ^2.9.3 chalk: ^5.0.1 deep-lock: ^1.0.0 discord-akairo: "npm:@notenoughupdates/discord-akairo@dev" discord-api-types: 0.37.1 discord.js: "npm:@notenoughupdates/discord.js@forum" - eslint: ^8.22.0 + eslint: ^8.23.0 eslint-config-prettier: ^8.5.0 eslint-plugin-deprecation: ^1.3.2 fuse.js: ^6.6.2 @@ -980,7 +1057,6 @@ __metadata: lodash: ^4.17.21 mathjs: ^11.1.0 nanoid: ^4.0.0 - node-fetch: ^3.2.10 numeral: ^2.0.6 pg: ^8.8.0 pg-hstore: ^2.3.4 @@ -990,7 +1066,7 @@ __metadata: sequelize: 6.21.4 tinycolor2: ^1.4.2 ts-essentials: ^9.3.0 - typescript: ^4.7.4 + typescript: ^4.8.2 vitest: ^0.22.1 vm2: ^3.9.10 languageName: unknown @@ -1039,18 +1115,6 @@ __metadata: languageName: node linkType: hard -"canvas@npm:^2.9.3": - version: 2.9.3 - resolution: "canvas@npm:2.9.3" - dependencies: - "@mapbox/node-pre-gyp": ^1.0.0 - nan: ^2.15.0 - node-gyp: latest - simple-get: ^3.0.3 - checksum: 368112ba4b16f54ce6dfac1ccbc45ddd1eb0b76dc09509c2601c2a26459bb4449d259a7aa8664fd94153aad13b48557535f3b9eb7fad9a97929b9eb962e50f09 - languageName: node - linkType: hard - "chai@npm:^4.3.6": version: 4.3.6 resolution: "chai@npm:4.3.6" @@ -1120,7 +1184,7 @@ __metadata: languageName: node linkType: hard -"color-support@npm:^1.1.2, color-support@npm:^1.1.3": +"color-support@npm:^1.1.3": version: 1.1.3 resolution: "color-support@npm:1.1.3" bin: @@ -1150,7 +1214,7 @@ __metadata: languageName: node linkType: hard -"console-control-strings@npm:^1.0.0, console-control-strings@npm:^1.1.0": +"console-control-strings@npm:^1.1.0": version: 1.1.0 resolution: "console-control-strings@npm:1.1.0" checksum: 8755d76787f94e6cf79ce4666f0c5519906d7f5b02d4b884cf41e11dcd759ed69c57da0670afd9236d229a46e0f9cf519db0cd829c6dca820bb5a5c3def584ed @@ -1193,13 +1257,6 @@ __metadata: languageName: node linkType: hard -"data-uri-to-buffer@npm:^4.0.0": - version: 4.0.0 - resolution: "data-uri-to-buffer@npm:4.0.0" - checksum: a010653869abe8bb51259432894ac62c52bf79ad761d418d94396f48c346f2ae739c46b254e8bb5987bded8a653d467db1968db3a69bab1d33aa5567baa5cfc7 - languageName: node - linkType: hard - "debug@npm:4, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.2, debug@npm:^4.3.3, debug@npm:^4.3.4": version: 4.3.4 resolution: "debug@npm:4.3.4" @@ -1219,15 +1276,6 @@ __metadata: languageName: node linkType: hard -"decompress-response@npm:^4.2.0": - version: 4.2.1 - resolution: "decompress-response@npm:4.2.1" - dependencies: - mimic-response: ^2.0.0 - checksum: 4e783ca4dfe9417354d61349750fe05236f565a4415a6ca20983a311be2371debaedd9104c0b0e7b36e5f167aeaae04f84f1a0b3f8be4162f1d7d15598b8fdba - languageName: node - linkType: hard - "decompress-tar@npm:^4.0.0, decompress-tar@npm:^4.1.0, decompress-tar@npm:^4.1.1": version: 4.1.1 resolution: "decompress-tar@npm:4.1.1" @@ -1328,13 +1376,6 @@ __metadata: languageName: node linkType: hard -"detect-libc@npm:^2.0.0": - version: 2.0.1 - resolution: "detect-libc@npm:2.0.1" - checksum: ccb05fcabbb555beb544d48080179c18523a343face9ee4e1a86605a8715b4169f94d663c21a03c310ac824592f2ba9a5270218819bb411ad7be578a527593d7 - languageName: node - linkType: hard - "dir-glob@npm:^3.0.1": version: 3.0.1 resolution: "dir-glob@npm:3.0.1" @@ -1368,9 +1409,9 @@ __metadata: linkType: hard "discord-api-types@npm:^0.37.3": - version: 0.37.4 - resolution: "discord-api-types@npm:0.37.4" - checksum: 18b74acfcd5f6c554668eb5cb31a5db9076dfb5cb6b5c538a342ab9d22816644bada22a66285468fe7dd9980287921d5d50ba3b11cc8e391fe4f09e761bcd179 + version: 0.37.5 + resolution: "discord-api-types@npm:0.37.5" + checksum: 10a23b813d9a30d836aa27169f768883eeed971ab67e58325ff272bfe6b63b169d727ae983d7c1b69c7e0b02ed9072e66e79319ce48174b36cd4a2a5fafe2e9f languageName: node linkType: hard @@ -1755,13 +1796,14 @@ __metadata: languageName: node linkType: hard -"eslint@npm:^8.22.0": - version: 8.22.0 - resolution: "eslint@npm:8.22.0" +"eslint@npm:^8.23.0": + version: 8.23.0 + resolution: "eslint@npm:8.23.0" dependencies: - "@eslint/eslintrc": ^1.3.0 + "@eslint/eslintrc": ^1.3.1 "@humanwhocodes/config-array": ^0.10.4 "@humanwhocodes/gitignore-to-minimatch": ^1.0.2 + "@humanwhocodes/module-importer": ^1.0.1 ajv: ^6.10.0 chalk: ^4.0.0 cross-spawn: ^7.0.2 @@ -1771,7 +1813,7 @@ __metadata: eslint-scope: ^7.1.1 eslint-utils: ^3.0.0 eslint-visitor-keys: ^3.3.0 - espree: ^9.3.3 + espree: ^9.4.0 esquery: ^1.4.0 esutils: ^2.0.2 fast-deep-equal: ^3.1.3 @@ -1797,21 +1839,20 @@ __metadata: strip-ansi: ^6.0.1 strip-json-comments: ^3.1.0 text-table: ^0.2.0 - v8-compile-cache: ^2.0.3 bin: eslint: bin/eslint.js - checksum: 2d84a7a2207138cdb250759b047fdb05a57fede7f87b7a039d9370edba7f26e23a873a208becfd4b2c9e4b5499029f3fc3b9318da3290e693d25c39084119c80 + checksum: ff6075daa28d817a7ac4508f31bc108a04d9ab5056608c8651b5bf9cfea5d708ca16dea6cdab2c3c0ae99b0bf0e726af8504eaa8e17c8e12e242cb68237ead64 languageName: node linkType: hard -"espree@npm:^9.3.2, espree@npm:^9.3.3": - version: 9.3.3 - resolution: "espree@npm:9.3.3" +"espree@npm:^9.4.0": + version: 9.4.0 + resolution: "espree@npm:9.4.0" dependencies: acorn: ^8.8.0 acorn-jsx: ^5.3.2 eslint-visitor-keys: ^3.3.0 - checksum: 33e8a36fc15d082e68672e322e22a53856b564d60aad8f291a667bfc21b2c900c42412d37dd3c7a0f18b9d0d8f8858dabe8776dbd4b4c2f72c5cf4d6afeabf65 + checksum: 2e3020dde67892d2ba3632413b44d0dc31d92c29ce72267d7ec24216a562f0a6494d3696e2fa39a3ec8c0e0088d773947ab2925fbb716801a11eb8dd313ac89c languageName: node linkType: hard @@ -1935,16 +1976,6 @@ __metadata: languageName: node linkType: hard -"fetch-blob@npm:^3.1.2, fetch-blob@npm:^3.1.4": - version: 3.2.0 - resolution: "fetch-blob@npm:3.2.0" - dependencies: - node-domexception: ^1.0.0 - web-streams-polyfill: ^3.0.3 - checksum: f19bc28a2a0b9626e69fd7cf3a05798706db7f6c7548da657cbf5026a570945f5eeaedff52007ea35c8bcd3d237c58a20bf1543bc568ab2422411d762dd3d5bf - languageName: node - linkType: hard - "file-entry-cache@npm:^6.0.1": version: 6.0.1 resolution: "file-entry-cache@npm:6.0.1" @@ -2022,15 +2053,6 @@ __metadata: languageName: node linkType: hard -"formdata-polyfill@npm:^4.0.10": - version: 4.0.10 - resolution: "formdata-polyfill@npm:4.0.10" - dependencies: - fetch-blob: ^3.1.2 - checksum: 82a34df292afadd82b43d4a740ce387bc08541e0a534358425193017bf9fb3567875dc5f69564984b1da979979b70703aa73dee715a17b6c229752ae736dd9db - languageName: node - linkType: hard - "fraction.js@npm:^4.2.0": version: 4.2.0 resolution: "fraction.js@npm:4.2.0" @@ -2101,23 +2123,6 @@ __metadata: languageName: node linkType: hard -"gauge@npm:^3.0.0": - version: 3.0.2 - resolution: "gauge@npm:3.0.2" - dependencies: - aproba: ^1.0.3 || ^2.0.0 - color-support: ^1.1.2 - console-control-strings: ^1.0.0 - has-unicode: ^2.0.1 - object-assign: ^4.1.1 - signal-exit: ^3.0.0 - string-width: ^4.2.3 - strip-ansi: ^6.0.1 - wide-align: ^1.1.2 - checksum: 81296c00c7410cdd48f997800155fbead4f32e4f82109be0719c63edc8560e6579946cc8abd04205297640691ec26d21b578837fd13a4e96288ab4b40b1dc3e9 - languageName: node - linkType: hard - "gauge@npm:^4.0.3": version: 4.0.4 resolution: "gauge@npm:4.0.4" @@ -2287,13 +2292,13 @@ __metadata: linkType: hard "google-p12-pem@npm:^4.0.0": - version: 4.0.0 - resolution: "google-p12-pem@npm:4.0.0" + version: 4.0.1 + resolution: "google-p12-pem@npm:4.0.1" dependencies: node-forge: ^1.3.1 bin: gp12-pem: build/src/bin/gp12-pem.js - checksum: f41a88d339e9fe633dc915bc0f3335c0196fa318f994dcd5dfaa0f3f7aa2d99f6122e2c80bd0f4bb22f2b61ff645b7cc782a74e12ceaf6c9ad9e08cdeb4d615e + checksum: 59a5026331ea67455672e83770da29f09d979f02e06cb2227ea5916f8cca437887c2d3869f2602a686dc84437886ae9d2ac010780803cbe8e5f161c2d02d8efd languageName: node linkType: hard @@ -2771,15 +2776,6 @@ __metadata: languageName: node linkType: hard -"make-dir@npm:^3.1.0": - version: 3.1.0 - resolution: "make-dir@npm:3.1.0" - dependencies: - semver: ^6.0.0 - checksum: 484200020ab5a1fdf12f393fe5f385fc8e4378824c940fba1729dcd198ae4ff24867bc7a5646331e50cead8abff5d9270c456314386e629acec6dff4b8016b78 - languageName: node - linkType: hard - "make-fetch-happen@npm:^10.0.3": version: 10.2.1 resolution: "make-fetch-happen@npm:10.2.1" @@ -2840,13 +2836,6 @@ __metadata: languageName: node linkType: hard -"mimic-response@npm:^2.0.0": - version: 2.1.0 - resolution: "mimic-response@npm:2.1.0" - checksum: 014fad6ab936657e5f2f48bd87af62a8e928ebe84472aaf9e14fec4fcb31257a5edff77324d8ac13ddc6685ba5135cf16e381efac324e5f174fb4ddbf902bf07 - languageName: node - linkType: hard - "minimatch@npm:^3.0.4, minimatch@npm:^3.1.1, minimatch@npm:^3.1.2": version: 3.1.2 resolution: "minimatch@npm:3.1.2" @@ -2945,11 +2934,11 @@ __metadata: linkType: hard "moment-timezone@npm:^0.5.34": - version: 0.5.35 - resolution: "moment-timezone@npm:0.5.35" + version: 0.5.37 + resolution: "moment-timezone@npm:0.5.37" dependencies: moment: ">= 2.9.0" - checksum: 0f3907282dc9ae3d405fefaccf486dc4222945ff479127fd269e6c4ddc25e526e7ca9e849d6bf941c871bd17e875b256bdb276137a55db9fce4177c792a003df + checksum: b3fc24848a396ee3801331a4b5511591df0e22241e59f55200a475603f23a8429f01887294c7a0c005dae25b8e4bef20472fbc875ff20080f26fded066559f1a languageName: node linkType: hard @@ -2974,15 +2963,6 @@ __metadata: languageName: node linkType: hard -"nan@npm:^2.15.0": - version: 2.16.0 - resolution: "nan@npm:2.16.0" - dependencies: - node-gyp: latest - checksum: cb16937273ea55b01ea47df244094c12297ce6b29b36e845d349f1f7c268b8d7c5abd126a102c5678a1e1afd0d36bba35ea0cc959e364928ce60561c9306064a - languageName: node - linkType: hard - "nanoid@npm:^3.3.4": version: 3.3.4 resolution: "nanoid@npm:3.3.4" @@ -3015,13 +2995,6 @@ __metadata: languageName: node linkType: hard -"node-domexception@npm:^1.0.0": - version: 1.0.0 - resolution: "node-domexception@npm:1.0.0" - checksum: ee1d37dd2a4eb26a8a92cd6b64dfc29caec72bff5e1ed9aba80c294f57a31ba4895a60fd48347cf17dd6e766da0ae87d75657dfd1f384ebfa60462c2283f5c7f - languageName: node - linkType: hard - "node-fetch@npm:^2.6.7": version: 2.6.7 resolution: "node-fetch@npm:2.6.7" @@ -3036,17 +3009,6 @@ __metadata: languageName: node linkType: hard -"node-fetch@npm:^3.2.10": - version: 3.2.10 - resolution: "node-fetch@npm:3.2.10" - dependencies: - data-uri-to-buffer: ^4.0.0 - fetch-blob: ^3.1.4 - formdata-polyfill: ^4.0.10 - checksum: e65322431f4897ded04197aa5923eaec63a8d53e00432de4e70a4f7006625c8dc32629c5c35f4fe8ee719a4825544d07bf53f6e146a7265914262f493e8deac1 - languageName: node - linkType: hard - "node-forge@npm:^1.3.1": version: 1.3.1 resolution: "node-forge@npm:1.3.1" @@ -3094,18 +3056,6 @@ __metadata: languageName: node linkType: hard -"npmlog@npm:^5.0.1": - version: 5.0.1 - resolution: "npmlog@npm:5.0.1" - dependencies: - are-we-there-yet: ^2.0.0 - console-control-strings: ^1.1.0 - gauge: ^3.0.0 - set-blocking: ^2.0.0 - checksum: 516b2663028761f062d13e8beb3f00069c5664925871a9b57989642ebe09f23ab02145bf3ab88da7866c4e112cafff72401f61a672c7c8a20edc585a7016ef5f - languageName: node - linkType: hard - "npmlog@npm:^6.0.0": version: 6.0.2 resolution: "npmlog@npm:6.0.2" @@ -3125,7 +3075,7 @@ __metadata: languageName: node linkType: hard -"object-assign@npm:^4.0.1, object-assign@npm:^4.1.1": +"object-assign@npm:^4.0.1": version: 4.1.1 resolution: "object-assign@npm:4.1.1" checksum: fcc6e4ea8c7fe48abfbb552578b1c53e0d194086e2e6bbbf59e0a536381a292f39943c6e9628af05b5528aa5e3318bb30d6b2e53cadaf5b8fe9e12c4b69af23f @@ -3139,7 +3089,7 @@ __metadata: languageName: node linkType: hard -"once@npm:^1.3.0, once@npm:^1.3.1, once@npm:^1.4.0": +"once@npm:^1.3.0, once@npm:^1.4.0": version: 1.4.0 resolution: "once@npm:1.4.0" dependencies: @@ -3695,15 +3645,6 @@ __metadata: languageName: node linkType: hard -"semver@npm:^6.0.0": - version: 6.3.0 - resolution: "semver@npm:6.3.0" - bin: - semver: ./bin/semver.js - checksum: 1b26ecf6db9e8292dd90df4e781d91875c0dcc1b1909e70f5d12959a23c7eebb8f01ea581c00783bbee72ceeaad9505797c381756326073850dc36ed284b21b9 - languageName: node - linkType: hard - "semver@npm:^7.3.5, semver@npm:^7.3.7": version: 7.3.7 resolution: "semver@npm:7.3.7" @@ -3820,24 +3761,6 @@ __metadata: languageName: node linkType: hard -"simple-concat@npm:^1.0.0": - version: 1.0.1 - resolution: "simple-concat@npm:1.0.1" - checksum: 4d211042cc3d73a718c21ac6c4e7d7a0363e184be6a5ad25c8a1502e49df6d0a0253979e3d50dbdd3f60ef6c6c58d756b5d66ac1e05cda9cacd2e9fc59e3876a - languageName: node - linkType: hard - -"simple-get@npm:^3.0.3": - version: 3.1.1 - resolution: "simple-get@npm:3.1.1" - dependencies: - decompress-response: ^4.2.0 - once: ^1.3.1 - simple-concat: ^1.0.0 - checksum: 80195e70bf171486e75c31e28e5485468195cc42f85940f8b45c4a68472160144d223eb4d07bc82ef80cb974b7c401db021a540deb2d34ac4b3b8883da2d6401 - languageName: node - linkType: hard - "slash@npm:^3.0.0": version: 3.0.0 resolution: "slash@npm:3.0.0" @@ -4158,23 +4081,23 @@ __metadata: languageName: node linkType: hard -"typescript@npm:^4.7.4": - version: 4.7.4 - resolution: "typescript@npm:4.7.4" +"typescript@npm:^4.8.2": + version: 4.8.2 + resolution: "typescript@npm:4.8.2" bin: tsc: bin/tsc tsserver: bin/tsserver - checksum: 5750181b1cd7e6482c4195825547e70f944114fb47e58e4aa7553e62f11b3f3173766aef9c281783edfd881f7b8299cf35e3ca8caebe73d8464528c907a164df + checksum: 7f5b81d0d558c9067f952c7af52ab7f19c2e70a916817929e4a5b256c93990bf3178eccb1ac8a850bc75df35f6781b6f4cb3370ce20d8b1ded92ed462348f628 languageName: node linkType: hard -"typescript@patch:typescript@^4.7.4#~builtin<compat/typescript>": - version: 4.7.4 - resolution: "typescript@patch:typescript@npm%3A4.7.4#~builtin<compat/typescript>::version=4.7.4&hash=a1c5e5" +"typescript@patch:typescript@^4.8.2#~builtin<compat/typescript>": + version: 4.8.2 + resolution: "typescript@patch:typescript@npm%3A4.8.2#~builtin<compat/typescript>::version=4.8.2&hash=a1c5e5" bin: tsc: bin/tsc tsserver: bin/tsserver - checksum: 9096d8f6c16cb80ef3bf96fcbbd055bf1c4a43bd14f3b7be45a9fbe7ada46ec977f604d5feed3263b4f2aa7d4c7477ce5f9cd87de0d6feedec69a983f3a4f93e + checksum: 5cb0f02f414f5405f4b0e7ee1fd7fa9177b6a8783c9017b6cad85f56ce4c4f93e0e6f2ce37e863cb597d44227cd009474c9fbd85bf7a50004e5557426cb58079 languageName: node linkType: hard @@ -4203,20 +4126,20 @@ __metadata: linkType: hard "unique-filename@npm:^2.0.0": - version: 2.0.0 - resolution: "unique-filename@npm:2.0.0" + version: 2.0.1 + resolution: "unique-filename@npm:2.0.1" dependencies: - unique-slug: ^2.0.2 - checksum: 801d5255b21e8be0b25c6c063df7c8d5e2d2dd295a466701ff6ffd31d86db4ece6cf4f0a3271374e48d8e26009163907fbed975195d4106bf5ca43b0923d74a0 + unique-slug: ^3.0.0 + checksum: 807acf3381aff319086b64dc7125a9a37c09c44af7620bd4f7f3247fcd5565660ac12d8b80534dcbfd067e6fe88a67e621386dd796a8af828d1337a8420a255f languageName: node linkType: hard -"unique-slug@npm:^2.0.2": - version: 2.0.2 - resolution: "unique-slug@npm:2.0.2" +"unique-slug@npm:^3.0.0": + version: 3.0.0 + resolution: "unique-slug@npm:3.0.0" dependencies: imurmurhash: ^0.1.4 - checksum: 5b6876a645da08d505dedb970d1571f6cebdf87044cb6b740c8dbb24f0d6e1dc8bdbf46825fd09f994d7cf50760e6f6e063cfa197d51c5902c00a861702eb75a + checksum: 49f8d915ba7f0101801b922062ee46b7953256c93ceca74303bd8e6413ae10aa7e8216556b54dc5382895e8221d04f1efaf75f945c2e4a515b4139f77aa6640c languageName: node linkType: hard @@ -4252,13 +4175,6 @@ __metadata: languageName: node linkType: hard -"v8-compile-cache@npm:^2.0.3": - version: 2.3.0 - resolution: "v8-compile-cache@npm:2.3.0" - checksum: adb0a271eaa2297f2f4c536acbfee872d0dd26ec2d76f66921aa7fc437319132773483344207bdbeee169225f4739016d8d2dbf0553913a52bb34da6d0334f8e - languageName: node - linkType: hard - "validator@npm:^13.7.0": version: 13.7.0 resolution: "validator@npm:13.7.0" @@ -4346,13 +4262,6 @@ __metadata: languageName: node linkType: hard -"web-streams-polyfill@npm:^3.0.3": - version: 3.2.1 - resolution: "web-streams-polyfill@npm:3.2.1" - checksum: b119c78574b6d65935e35098c2afdcd752b84268e18746606af149e3c424e15621b6f1ff0b42b2676dc012fc4f0d313f964b41a4b5031e525faa03997457da02 - languageName: node - linkType: hard - "webidl-conversions@npm:^3.0.0": version: 3.0.1 resolution: "webidl-conversions@npm:3.0.1" @@ -4392,7 +4301,7 @@ __metadata: languageName: node linkType: hard -"wide-align@npm:^1.1.2, wide-align@npm:^1.1.5": +"wide-align@npm:^1.1.5": version: 1.1.5 resolution: "wide-align@npm:1.1.5" dependencies: |