From 873123996889c824c7d52785b7cf2903372b71a5 Mon Sep 17 00:00:00 2001 From: TymanWasTaken Date: Sat, 19 Jun 2021 11:31:36 -0600 Subject: fix: Use latest features of akairo fork --- .pnp.js | 10 ++--- package.json | 2 +- src/commands/dev/reload.ts | 8 ++-- src/commands/dev/setLevel.ts | 10 ++--- src/commands/info/botInfo.ts | 3 +- src/commands/info/help.ts | 8 ++-- src/commands/info/ping.ts | 3 +- src/commands/info/pronouns.ts | 8 ++-- src/commands/moderation/ban.ts | 12 ++--- src/commands/moderation/kick.ts | 10 ++--- src/commands/moulberry-bush/capePerms.ts | 8 ++-- src/commands/moulberry-bush/level.ts | 8 ++-- src/commands/moulberry-bush/rule.ts | 10 ++--- src/commands/server-config/prefix.ts | 8 ++-- src/lib/extensions/BushClient.ts | 3 +- src/lib/extensions/BushCommandHandler.ts | 2 +- src/lib/extensions/BushTaskHandler.ts | 2 +- src/lib/extensions/Util.ts | 73 +------------------------------ src/lib/models/Modlog.ts | 3 +- src/listeners/client/syncSlashCommands.ts | 19 -------- yarn.lock | 8 ++-- 21 files changed, 66 insertions(+), 152 deletions(-) delete mode 100644 src/listeners/client/syncSlashCommands.ts diff --git a/.pnp.js b/.pnp.js index 75bae4b..2204508 100755 --- a/.pnp.js +++ b/.pnp.js @@ -48,7 +48,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["canvas", "npm:2.8.0"], ["chalk", "npm:4.1.1"], ["common-tags", "npm:1.8.0"], - ["discord-akairo", "https://github.com/IRONM00N-Development/discord-akairo.git#commit=690c219497dff280dd49360882f72ddd100fc148"], + ["discord-akairo", "https://github.com/SkyBlockDev/discord-akairo.git#commit=b2209bb203332222340689ecfa2093d806ce3e8f"], ["discord-api-types", "npm:0.18.1"], ["discord.js", "npm:13.0.0-dev.918921e8211fc16e9b12d2502f3168264246ea22"], ["esbuild", "npm:0.12.1"], @@ -902,7 +902,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["canvas", "npm:2.8.0"], ["chalk", "npm:4.1.1"], ["common-tags", "npm:1.8.0"], - ["discord-akairo", "https://github.com/IRONM00N-Development/discord-akairo.git#commit=690c219497dff280dd49360882f72ddd100fc148"], + ["discord-akairo", "https://github.com/SkyBlockDev/discord-akairo.git#commit=b2209bb203332222340689ecfa2093d806ce3e8f"], ["discord-api-types", "npm:0.18.1"], ["discord.js", "npm:13.0.0-dev.918921e8211fc16e9b12d2502f3168264246ea22"], ["esbuild", "npm:0.12.1"], @@ -1305,10 +1305,10 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }] ]], ["discord-akairo", [ - ["https://github.com/IRONM00N-Development/discord-akairo.git#commit=690c219497dff280dd49360882f72ddd100fc148", { - "packageLocation": "./.yarn/cache/discord-akairo-https-7a05c1a24f-cfce18b1f6.zip/node_modules/discord-akairo/", + ["https://github.com/SkyBlockDev/discord-akairo.git#commit=b2209bb203332222340689ecfa2093d806ce3e8f", { + "packageLocation": "./.yarn/cache/discord-akairo-https-1bbfcbf8c7-cfee203fc8.zip/node_modules/discord-akairo/", "packageDependencies": [ - ["discord-akairo", "https://github.com/IRONM00N-Development/discord-akairo.git#commit=690c219497dff280dd49360882f72ddd100fc148"] + ["discord-akairo", "https://github.com/SkyBlockDev/discord-akairo.git#commit=b2209bb203332222340689ecfa2093d806ce3e8f"] ], "linkType": "HARD", }] diff --git a/package.json b/package.json index bcebf14..7967bf1 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,7 @@ "canvas": "^2.8.0", "chalk": "^4.1.1", "common-tags": "^1.8.0", - "discord-akairo": "IRONM00N-Development/discord-akairo", + "discord-akairo": "SkyBlockDev/discord-akairo#b2209bb203332222340689ecfa2093d806ce3e8f", "discord-api-types": "^0.18.1", "discord.js": "dev", "got": "^11.8.1", diff --git a/src/commands/dev/reload.ts b/src/commands/dev/reload.ts index 3194ce2..4d6cc23 100644 --- a/src/commands/dev/reload.ts +++ b/src/commands/dev/reload.ts @@ -1,5 +1,4 @@ import { stripIndent } from 'common-tags'; -import { ApplicationCommandOptionType } from 'discord-api-types'; import { Message } from 'discord.js'; import { BushCommand } from '../../lib/extensions/BushCommand'; import { BushInteractionMessage } from '../../lib/extensions/BushInteractionMessage'; @@ -24,14 +23,15 @@ export default class ReloadCommand extends BushCommand { ], ownerOnly: true, typing: true, - slashCommandOptions: [ + slashOptions: [ { - type: ApplicationCommandOptionType.BOOLEAN, + type: 'BOOLEAN', name: 'fast', description: 'Wheather to use esbuild for fast compiling or not', required: false } - ] + ], + slash: true }); } diff --git a/src/commands/dev/setLevel.ts b/src/commands/dev/setLevel.ts index 7401699..83545b2 100644 --- a/src/commands/dev/setLevel.ts +++ b/src/commands/dev/setLevel.ts @@ -1,4 +1,3 @@ -import { ApplicationCommandOptionType } from 'discord-api-types'; import { Message, User } from 'discord.js'; import { BushCommand } from '../../lib/extensions/BushCommand'; import { BushInteractionMessage } from '../../lib/extensions/BushInteractionMessage'; @@ -35,20 +34,21 @@ export default class SetLevelCommand extends BushCommand { } ], ownerOnly: true, - slashCommandOptions: [ + slashOptions: [ { - type: ApplicationCommandOptionType.USER, + type: 'USER', name: 'user', description: 'The user to change the level of', required: true }, { - type: ApplicationCommandOptionType.INTEGER, + type: 'INTEGER', name: 'level', description: 'The level to set the user to', required: true } - ] + ], + slash: true }); } diff --git a/src/commands/info/botInfo.ts b/src/commands/info/botInfo.ts index 66bf5af..406ea2d 100644 --- a/src/commands/info/botInfo.ts +++ b/src/commands/info/botInfo.ts @@ -12,7 +12,8 @@ export default class BotInfoCommand extends BushCommand { content: 'Shows information about the bot', usage: 'botinfo', examples: ['botinfo'] - } + }, + slash: true }); } diff --git a/src/commands/info/help.ts b/src/commands/info/help.ts index 317091e..4073f74 100644 --- a/src/commands/info/help.ts +++ b/src/commands/info/help.ts @@ -1,5 +1,4 @@ import { stripIndent } from 'common-tags'; -import { ApplicationCommandOptionType } from 'discord-api-types'; import { Message, MessageEmbed } from 'discord.js'; import { BushCommand } from '../../lib/extensions/BushCommand'; import { BushInteractionMessage } from '../../lib/extensions/BushInteractionMessage'; @@ -22,14 +21,15 @@ export default class HelpCommand extends BushCommand { type: 'commandAlias' } ], - slashCommandOptions: [ + slashOptions: [ { - type: ApplicationCommandOptionType.STRING, + type: 'STRING', name: 'command', description: 'The command to get help for', required: false } - ] + ], + slash: true }); } diff --git a/src/commands/info/ping.ts b/src/commands/info/ping.ts index feb48ad..9b3b67b 100644 --- a/src/commands/info/ping.ts +++ b/src/commands/info/ping.ts @@ -11,7 +11,8 @@ export default class PingCommand extends BushCommand { content: 'Gets the latency of the bot', usage: 'ping', examples: ['ping'] - } + }, + slash: true }); } diff --git a/src/commands/info/pronouns.ts b/src/commands/info/pronouns.ts index faf3aa2..58b9580 100644 --- a/src/commands/info/pronouns.ts +++ b/src/commands/info/pronouns.ts @@ -1,4 +1,3 @@ -import { ApplicationCommandOptionType } from 'discord-api-types'; import { CommandInteraction, Message, MessageEmbed, User } from 'discord.js'; import got, { HTTPError } from 'got'; import { BushCommand } from '../../lib/extensions/BushCommand'; @@ -48,15 +47,16 @@ export default class PronounsCommand extends BushCommand { } ], clientPermissions: ['SEND_MESSAGES'], - slashCommandOptions: [ + slashOptions: [ { - type: ApplicationCommandOptionType.USER, + type: 'USER', name: 'user', description: 'The user to get pronouns for', required: false } ], - slashEphemeral: true // I'll add dynamic checking to this later + slashEphemeral: true, // I'll add dynamic checking to this later + slash: true }); } async sendResponse(message: Message | CommandInteraction, user: User, author: boolean): Promise { diff --git a/src/commands/moderation/ban.ts b/src/commands/moderation/ban.ts index f843ac4..e67bd6a 100644 --- a/src/commands/moderation/ban.ts +++ b/src/commands/moderation/ban.ts @@ -1,4 +1,3 @@ -import { ApplicationCommandOptionType } from 'discord-api-types'; import { CommandInteraction, Message, User } from 'discord.js'; import moment from 'moment'; import { BushCommand } from '../../lib/extensions/BushCommand'; @@ -46,26 +45,27 @@ export default class BanCommand extends BushCommand { usage: 'ban [--time]', examples: ['ban @Tyman being cool', 'ban @Tyman being cool --time 7days'] }, - slashCommandOptions: [ + slashOptions: [ { - type: ApplicationCommandOptionType.USER, + type: 'USER', name: 'user', description: 'The user to ban', required: true }, { - type: ApplicationCommandOptionType.STRING, + type: 'STRING', name: 'reason', description: 'The reason to show in modlogs and audit log', required: false }, { - type: ApplicationCommandOptionType.STRING, + type: 'STRING', name: 'time', description: 'The time the user should be banned for (default permanent)', required: false } - ] + ], + slash: true }); } async *genResponses( diff --git a/src/commands/moderation/kick.ts b/src/commands/moderation/kick.ts index eed0122..3e2e8d1 100644 --- a/src/commands/moderation/kick.ts +++ b/src/commands/moderation/kick.ts @@ -1,4 +1,3 @@ -import { ApplicationCommandOptionType } from 'discord-api-types'; import { CommandInteraction, GuildMember, Message } from 'discord.js'; import { BushCommand } from '../../lib/extensions/BushCommand'; import { BushInteractionMessage } from '../../lib/extensions/BushInteractionMessage'; @@ -29,20 +28,21 @@ export default class KickCommand extends BushCommand { usage: 'kick ', examples: ['kick @Tyman being cool'] }, - slashCommandOptions: [ + slashOptions: [ { - type: ApplicationCommandOptionType.USER, + type: 'USER', name: 'user', description: 'The user to kick', required: true }, { - type: ApplicationCommandOptionType.STRING, + type: 'STRING', name: 'reason', description: 'The reason to show in modlogs and audit log', required: false } - ] + ], + slash: true }); } diff --git a/src/commands/moulberry-bush/capePerms.ts b/src/commands/moulberry-bush/capePerms.ts index 7eb90c5..42e0d77 100644 --- a/src/commands/moulberry-bush/capePerms.ts +++ b/src/commands/moulberry-bush/capePerms.ts @@ -1,4 +1,3 @@ -import { ApplicationCommandOptionType } from 'discord-api-types'; import { Message, MessageEmbed } from 'discord.js'; import got from 'got'; import { BushCommand } from '../../lib/extensions/BushCommand'; @@ -64,14 +63,15 @@ export default class CapePermissionsCommand extends BushCommand { ], clientPermissions: ['EMBED_LINKS', 'SEND_MESSAGES'], channel: 'guild', - slashCommandOptions: [ + slashOptions: [ { - type: ApplicationCommandOptionType.STRING, + type: 'STRING', name: 'user', description: 'The username of the player to see the cape permissions of', required: true } - ] + ], + slash: true }); } private async getResponse(user: string): Promise<{ content?: string; embeds?: MessageEmbed[] }> { diff --git a/src/commands/moulberry-bush/level.ts b/src/commands/moulberry-bush/level.ts index f53aa64..64d6dad 100644 --- a/src/commands/moulberry-bush/level.ts +++ b/src/commands/moulberry-bush/level.ts @@ -1,4 +1,3 @@ -import { ApplicationCommandOptionType } from 'discord-api-types'; import { CommandInteractionOption, Message, User } from 'discord.js'; import { BushCommand } from '../../lib/extensions/BushCommand'; import { BushInteractionMessage } from '../../lib/extensions/BushInteractionMessage'; @@ -32,14 +31,15 @@ export default class LevelCommand extends BushCommand { } } ], - slashCommandOptions: [ + slashOptions: [ { - type: ApplicationCommandOptionType.USER, + type: 'USER', name: 'user', description: 'The user to get the level of', required: false } - ] + ], + slash: true }); } diff --git a/src/commands/moulberry-bush/rule.ts b/src/commands/moulberry-bush/rule.ts index b71b42f..c11c5d2 100644 --- a/src/commands/moulberry-bush/rule.ts +++ b/src/commands/moulberry-bush/rule.ts @@ -1,5 +1,4 @@ import { Argument } from 'discord-akairo'; -import { ApplicationCommandOptionType } from 'discord-api-types'; import { CommandInteraction, Message, MessageEmbed, User } from 'discord.js'; import { BushCommand } from '../../lib/extensions/BushCommand'; import { BushInteractionMessage } from '../../lib/extensions/BushInteractionMessage'; @@ -98,20 +97,21 @@ export default class RuleCommand extends BushCommand { ], clientPermissions: ['EMBED_LINKS', 'SEND_MESSAGES'], channel: 'guild', - slashCommandOptions: [ + slashOptions: [ { - type: ApplicationCommandOptionType.INTEGER, + type: 'INTEGER', name: 'rule', description: 'The rule to show', required: false }, { - type: ApplicationCommandOptionType.USER, + type: 'USER', name: 'user', description: 'The user to ping', required: false } - ] + ], + slash: true }); } private getResponse( diff --git a/src/commands/server-config/prefix.ts b/src/commands/server-config/prefix.ts index 9cdc331..28f8496 100644 --- a/src/commands/server-config/prefix.ts +++ b/src/commands/server-config/prefix.ts @@ -1,4 +1,3 @@ -import { ApplicationCommandOptionType } from 'discord-api-types'; import { Guild as DiscordGuild, Message } from 'discord.js'; import { BushCommand } from '../../lib/extensions/BushCommand'; import { BushInteractionMessage } from '../../lib/extensions/BushInteractionMessage'; @@ -21,14 +20,15 @@ export default class PrefixCommand extends BushCommand { usage: 'prefix [prefix]', examples: ['prefix', 'prefix +'] }, - slashCommandOptions: [ + slashOptions: [ { - type: ApplicationCommandOptionType.STRING, + type: 'STRING', name: 'prefix', description: 'The prefix to set for this server', required: false } - ] + ], + slash: true }); } diff --git a/src/lib/extensions/BushClient.ts b/src/lib/extensions/BushClient.ts index e2e889b..a173804 100644 --- a/src/lib/extensions/BushClient.ts +++ b/src/lib/extensions/BushClient.ts @@ -80,7 +80,8 @@ export class BushClient extends AkairoClient { }, ignorePermissions: this.config.owners, ignoreCooldown: this.config.owners, - automateCategories: true + automateCategories: true, + autoRegisterSlashCommands: true }); this.util = new BushUtil(this); diff --git a/src/lib/extensions/BushCommandHandler.ts b/src/lib/extensions/BushCommandHandler.ts index 6ef44d7..52e4665 100644 --- a/src/lib/extensions/BushCommandHandler.ts +++ b/src/lib/extensions/BushCommandHandler.ts @@ -3,7 +3,7 @@ import { Collection } from 'discord.js'; import { BushClient } from './BushClient'; import { BushCommand } from './BushCommand'; -export interface BushCommandHandlerOptions extends CommandHandlerOptions {} +export type BushCommandHandlerOptions = CommandHandlerOptions; export class BushCommandHandler extends CommandHandler { public constructor(client: BushClient, options: BushCommandHandlerOptions) { diff --git a/src/lib/extensions/BushTaskHandler.ts b/src/lib/extensions/BushTaskHandler.ts index f783eb3..923e42b 100644 --- a/src/lib/extensions/BushTaskHandler.ts +++ b/src/lib/extensions/BushTaskHandler.ts @@ -1,7 +1,7 @@ import { AkairoHandlerOptions, TaskHandler } from 'discord-akairo'; import { BushClient } from './BushClient'; -export interface BushTaskHandlerOptions extends AkairoHandlerOptions {} +export type BushTaskHandlerOptions = AkairoHandlerOptions; export class BushTaskHandler extends TaskHandler { public constructor(client: BushClient, options: BushTaskHandlerOptions) { diff --git a/src/lib/extensions/Util.ts b/src/lib/extensions/Util.ts index 3913437..4a4ccef 100644 --- a/src/lib/extensions/Util.ts +++ b/src/lib/extensions/Util.ts @@ -1,6 +1,5 @@ -import chalk from 'chalk'; import { exec } from 'child_process'; -import { ClientUtil, Command } from 'discord-akairo'; +import { ClientUtil } from 'discord-akairo'; import { APIInteractionDataResolvedChannel, APIInteractionDataResolvedGuildMember, @@ -11,7 +10,6 @@ import { ButtonInteraction, CommandInteractionOption, Constants, - Guild, GuildChannel, GuildMember, MessageActionRow, @@ -260,73 +258,6 @@ export class BushUtil extends ClientUtil { return apiRes.uuid.replace(/-/g, ''); } - public async syncSlashCommands(force = false, guild?: Snowflake): Promise { - let fetchedGuild: Guild; - if (guild) fetchedGuild = this.client.guilds.cache.get(guild); - try { - const registered = - guild === undefined ? await this.client.application.commands.fetch() : await fetchedGuild.commands.fetch(); - for (const [, registeredCommand] of registered) { - if (!this.client.commandHandler.modules.find((cmd) => cmd.id == registeredCommand.name)?.execSlash || force) { - guild === undefined - ? await this.client.application.commands.delete(registeredCommand.id) - : await fetchedGuild.commands.delete(registeredCommand.id); - this.client.logger.verbose( - chalk`{red Deleted slash command ${registeredCommand.name}${ - guild !== undefined ? ` in guild ${fetchedGuild.name}` : '' - }}` - ); - } - } - - for (const [, botCommand] of this.client.commandHandler.modules) { - if (botCommand.execSlash) { - const found = registered.find((i) => i.name == botCommand.id); - Command; - const slashdata = { - name: botCommand.id, - description: botCommand.description.content, - options: botCommand.options.slashCommandOptions - }; - botCommand; - - if (found?.id && !force) { - if (slashdata.description !== found.description) { - guild === undefined - ? await this.client.application.commands.edit(found.id, slashdata) - : fetchedGuild.commands.edit(found.id, slashdata); - this.client.logger.verbose( - chalk`{yellow Edited slash command ${botCommand.id}${ - guild !== undefined ? ` in guild ${fetchedGuild.name}` : '' - }}` - ); - } - } else { - guild === undefined - ? await this.client.application.commands.create(slashdata) - : fetchedGuild.commands.create(slashdata); - this.client.logger.verbose( - chalk`{green Created slash command ${botCommand.id}${ - guild !== undefined ? ` in guild ${fetchedGuild.name}` : '' - }}` - ); - } - } - } - - return this.client.logger.log( - chalk.green(`Slash commands registered${guild !== undefined ? ` in guild ${fetchedGuild.name}` : ''}`) - ); - } catch (e) { - console.log(chalk.red(e.stack)); - return this.client.logger.error( - chalk`{red Slash commands not registered${ - guild !== undefined ? ` in guild ${fetchedGuild.name}` : '' - }, see above error.}` - ); - } - } - public moulberryBushRoleMap = [ { name: '*', id: '792453550768390194' }, { name: 'Admin Perms', id: '746541309853958186' }, @@ -424,7 +355,7 @@ export class BushUtil extends ClientUtil { }); collector.on('end', async () => { - await msg.edit({ content: text, embeds: [embeds[curPage]], components: [getPaginationRow(true)] }).catch(() => {}); + await msg.edit({ content: text, embeds: [embeds[curPage]], components: [getPaginationRow(true)] }).catch(() => undefined); }); async function edit(interaction: MessageComponentInteraction): Promise { diff --git a/src/lib/models/Modlog.ts b/src/lib/models/Modlog.ts index 3917a88..5a2cb69 100644 --- a/src/lib/models/Modlog.ts +++ b/src/lib/models/Modlog.ts @@ -1,7 +1,6 @@ import { DataTypes, Sequelize } from 'sequelize'; -import { BaseModel } from './BaseModel'; import { v4 as uuidv4 } from 'uuid'; -import * as Models from './'; +import { BaseModel } from './BaseModel'; export enum ModlogType { BAN = 'BAN', diff --git a/src/listeners/client/syncSlashCommands.ts b/src/listeners/client/syncSlashCommands.ts deleted file mode 100644 index 69b91bc..0000000 --- a/src/listeners/client/syncSlashCommands.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { BushListener } from '../../lib/extensions/BushListener'; - -export default class SyncSlashCommandsListener extends BushListener { - constructor() { - super('syncslashcommands', { - emitter: 'client', - event: 'ready' - }); - } - async exec(): Promise { - if (this.client.config.dev && this.client.config.devGuild) { - // Use guild slash commands for instant registration in dev - await this.client.util.syncSlashCommands(false, this.client.config.devGuild); - } else { - // Use global in production - await this.client.util.syncSlashCommands(); - } - } -} diff --git a/yarn.lock b/yarn.lock index 3ca6314..2e5d4cd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -681,7 +681,7 @@ __metadata: canvas: ^2.8.0 chalk: ^4.1.1 common-tags: ^1.8.0 - discord-akairo: IRONM00N-Development/discord-akairo + discord-akairo: "SkyBlockDev/discord-akairo#b2209bb203332222340689ecfa2093d806ce3e8f" discord-api-types: ^0.18.1 discord.js: dev esbuild: ^0.12.1 @@ -1015,10 +1015,10 @@ __metadata: languageName: node linkType: hard -discord-akairo@IRONM00N-Development/discord-akairo: +"discord-akairo@SkyBlockDev/discord-akairo#b2209bb203332222340689ecfa2093d806ce3e8f": version: 8.2.2 - resolution: "discord-akairo@https://github.com/IRONM00N-Development/discord-akairo.git#commit=690c219497dff280dd49360882f72ddd100fc148" - checksum: cfce18b1f676817baa19d0a63df66e0c3d6b48c1eea9e11f67ed25711f141a347fce95756b586f7bbbab92511c1a266683776faa76d699c52ff097c53f9b215e + resolution: "discord-akairo@https://github.com/SkyBlockDev/discord-akairo.git#commit=b2209bb203332222340689ecfa2093d806ce3e8f" + checksum: cfee203fc87a05c6198a6f1ba026854aec9133fbc53cda7f4426efcf1527980608eba657f6ac06b6d8e44e91e58f1f4714febe43860a9d5fdc764f7be6f4c76c languageName: node linkType: hard -- cgit From 84a982986688486b5b5244e26a3e10ab5163d64f Mon Sep 17 00:00:00 2001 From: TymanWasTaken Date: Sat, 19 Jun 2021 11:49:51 -0600 Subject: fix: Make slash commands work again --- .pnp.js | 10 +++++----- package.json | 2 +- src/lib/extensions/Util.ts | 4 ++-- yarn.lock | 8 ++++---- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.pnp.js b/.pnp.js index 2204508..1559f22 100755 --- a/.pnp.js +++ b/.pnp.js @@ -48,7 +48,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["canvas", "npm:2.8.0"], ["chalk", "npm:4.1.1"], ["common-tags", "npm:1.8.0"], - ["discord-akairo", "https://github.com/SkyBlockDev/discord-akairo.git#commit=b2209bb203332222340689ecfa2093d806ce3e8f"], + ["discord-akairo", "https://github.com/SkyBlockDev/discord-akairo.git#commit=599ba6d382b3c156941928d9548f0f70d1d8d624"], ["discord-api-types", "npm:0.18.1"], ["discord.js", "npm:13.0.0-dev.918921e8211fc16e9b12d2502f3168264246ea22"], ["esbuild", "npm:0.12.1"], @@ -902,7 +902,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["canvas", "npm:2.8.0"], ["chalk", "npm:4.1.1"], ["common-tags", "npm:1.8.0"], - ["discord-akairo", "https://github.com/SkyBlockDev/discord-akairo.git#commit=b2209bb203332222340689ecfa2093d806ce3e8f"], + ["discord-akairo", "https://github.com/SkyBlockDev/discord-akairo.git#commit=599ba6d382b3c156941928d9548f0f70d1d8d624"], ["discord-api-types", "npm:0.18.1"], ["discord.js", "npm:13.0.0-dev.918921e8211fc16e9b12d2502f3168264246ea22"], ["esbuild", "npm:0.12.1"], @@ -1305,10 +1305,10 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }] ]], ["discord-akairo", [ - ["https://github.com/SkyBlockDev/discord-akairo.git#commit=b2209bb203332222340689ecfa2093d806ce3e8f", { - "packageLocation": "./.yarn/cache/discord-akairo-https-1bbfcbf8c7-cfee203fc8.zip/node_modules/discord-akairo/", + ["https://github.com/SkyBlockDev/discord-akairo.git#commit=599ba6d382b3c156941928d9548f0f70d1d8d624", { + "packageLocation": "./.yarn/cache/discord-akairo-https-a98237f107-8e420cef0d.zip/node_modules/discord-akairo/", "packageDependencies": [ - ["discord-akairo", "https://github.com/SkyBlockDev/discord-akairo.git#commit=b2209bb203332222340689ecfa2093d806ce3e8f"] + ["discord-akairo", "https://github.com/SkyBlockDev/discord-akairo.git#commit=599ba6d382b3c156941928d9548f0f70d1d8d624"] ], "linkType": "HARD", }] diff --git a/package.json b/package.json index 7967bf1..d818392 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,7 @@ "canvas": "^2.8.0", "chalk": "^4.1.1", "common-tags": "^1.8.0", - "discord-akairo": "SkyBlockDev/discord-akairo#b2209bb203332222340689ecfa2093d806ce3e8f", + "discord-akairo": "SkyBlockDev/discord-akairo#599ba6d382b3c156941928d9548f0f70d1d8d624", "discord-api-types": "^0.18.1", "discord.js": "dev", "got": "^11.8.1", diff --git a/src/lib/extensions/Util.ts b/src/lib/extensions/Util.ts index 4a4ccef..3f9612a 100644 --- a/src/lib/extensions/Util.ts +++ b/src/lib/extensions/Util.ts @@ -287,7 +287,7 @@ export class BushUtil extends ClientUtil { ]; private paginateEmojis = { - begging: '853667381335162910', + beggining: '853667381335162910', back: '853667410203770881', stop: '853667471110570034', forward: '853667492680564747', @@ -366,7 +366,7 @@ export class BushUtil extends ClientUtil { new MessageButton({ style, customID: 'paginate_beginning', - emoji: this.paginateEmojis.begging, + emoji: this.paginateEmojis.beggining, disabled: disableAll || curPage == 0 }), new MessageButton({ diff --git a/yarn.lock b/yarn.lock index 2e5d4cd..8c09cf7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -681,7 +681,7 @@ __metadata: canvas: ^2.8.0 chalk: ^4.1.1 common-tags: ^1.8.0 - discord-akairo: "SkyBlockDev/discord-akairo#b2209bb203332222340689ecfa2093d806ce3e8f" + discord-akairo: "SkyBlockDev/discord-akairo#599ba6d382b3c156941928d9548f0f70d1d8d624" discord-api-types: ^0.18.1 discord.js: dev esbuild: ^0.12.1 @@ -1015,10 +1015,10 @@ __metadata: languageName: node linkType: hard -"discord-akairo@SkyBlockDev/discord-akairo#b2209bb203332222340689ecfa2093d806ce3e8f": +"discord-akairo@SkyBlockDev/discord-akairo#599ba6d382b3c156941928d9548f0f70d1d8d624": version: 8.2.2 - resolution: "discord-akairo@https://github.com/SkyBlockDev/discord-akairo.git#commit=b2209bb203332222340689ecfa2093d806ce3e8f" - checksum: cfee203fc87a05c6198a6f1ba026854aec9133fbc53cda7f4426efcf1527980608eba657f6ac06b6d8e44e91e58f1f4714febe43860a9d5fdc764f7be6f4c76c + resolution: "discord-akairo@https://github.com/SkyBlockDev/discord-akairo.git#commit=599ba6d382b3c156941928d9548f0f70d1d8d624" + checksum: 8e420cef0d417e6af5f60fbc612319f736ae677b2af583d98d5c9ed1a5a72eb0947394a70e5ab55bbbf031c0d4436786e2ade42b5add0a3214540a90f1938f35 languageName: node linkType: hard -- cgit From 0c24fcffe34653564aaaf8a3cb124d6a3f6f4a42 Mon Sep 17 00:00:00 2001 From: TymanWasTaken Date: Sat, 19 Jun 2021 11:51:46 -0600 Subject: refactor: Remove canvas dependency as it is not used currently --- .pnp.js | 910 ++--------------------------------------------------------- package.json | 1 - yarn.lock | 819 ++--------------------------------------------------- 3 files changed, 53 insertions(+), 1677 deletions(-) diff --git a/.pnp.js b/.pnp.js index 1559f22..105532c 100755 --- a/.pnp.js +++ b/.pnp.js @@ -45,7 +45,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@typescript-eslint/eslint-plugin", "virtual:d7ae587dddcefd495158f5c047acecbca3203324d75e681c7d8657c07f901f74e152f0b39978f7428d3a91daad7b5020c47ece28de69c22fcbd49d04707bf15c#npm:4.24.0"], ["@typescript-eslint/parser", "virtual:d7ae587dddcefd495158f5c047acecbca3203324d75e681c7d8657c07f901f74e152f0b39978f7428d3a91daad7b5020c47ece28de69c22fcbd49d04707bf15c#npm:4.24.0"], ["body-parser", "npm:1.19.0"], - ["canvas", "npm:2.8.0"], ["chalk", "npm:4.1.1"], ["common-tags", "npm:1.8.0"], ["discord-akairo", "https://github.com/SkyBlockDev/discord-akairo.git#commit=599ba6d382b3c156941928d9548f0f70d1d8d624"], @@ -129,7 +128,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["discord-api-types", "npm:0.18.1"], ["prism-media", "virtual:275bceca0f79f8e7aeb7f77acb5a6bd201e7eea264e9dfd8dcc0bcf35691357327303c09557dfc1495b9a1f8e9cf8278133d234783570df6cb70a249778f3198#npm:1.3.1"], ["tiny-typed-emitter", "npm:2.0.3"], - ["ws", "virtual:275bceca0f79f8e7aeb7f77acb5a6bd201e7eea264e9dfd8dcc0bcf35691357327303c09557dfc1495b9a1f8e9cf8278133d234783570df6cb70a249778f3198#npm:7.4.6"] + ["ws", "virtual:275bceca0f79f8e7aeb7f77acb5a6bd201e7eea264e9dfd8dcc0bcf35691357327303c09557dfc1495b9a1f8e9cf8278133d234783570df6cb70a249778f3198#npm:7.5.0"] ], "linkType": "HARD", }] @@ -152,24 +151,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD", }] ]], - ["@mapbox/node-pre-gyp", [ - ["npm:1.0.5", { - "packageLocation": "./.yarn/cache/@mapbox-node-pre-gyp-npm-1.0.5-4e17430ec9-82d337a6df.zip/node_modules/@mapbox/node-pre-gyp/", - "packageDependencies": [ - ["@mapbox/node-pre-gyp", "npm:1.0.5"], - ["detect-libc", "npm:1.0.3"], - ["https-proxy-agent", "npm:5.0.0"], - ["make-dir", "npm:3.1.0"], - ["node-fetch", "npm:2.6.1"], - ["nopt", "npm:5.0.0"], - ["npmlog", "npm:4.1.2"], - ["rimraf", "npm:3.0.2"], - ["semver", "npm:7.3.5"], - ["tar", "npm:6.1.0"] - ], - "linkType": "HARD", - }] - ]], ["@nodelib/fs.scandir", [ ["npm:2.1.4", { "packageLocation": "./.yarn/cache/@nodelib-fs.scandir-npm-2.1.4-6f6ddb2372-30b3102ee3.zip/node_modules/@nodelib/fs.scandir/", @@ -201,17 +182,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD", }] ]], - ["@npmcli/move-file", [ - ["npm:1.1.2", { - "packageLocation": "./.yarn/cache/@npmcli-move-file-npm-1.1.2-4f6c7b3354-d178d86a0a.zip/node_modules/@npmcli/move-file/", - "packageDependencies": [ - ["@npmcli/move-file", "npm:1.1.2"], - ["mkdirp", "npm:1.0.4"], - ["rimraf", "npm:3.0.2"] - ], - "linkType": "HARD", - }] - ]], ["@sapphire/async-queue", [ ["npm:1.1.3", { "packageLocation": "./.yarn/cache/@sapphire-async-queue-npm-1.1.3-b5b8f54d92-1557a65173.zip/node_modules/@sapphire/async-queue/", @@ -240,15 +210,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD", }] ]], - ["@tootallnate/once", [ - ["npm:1.1.2", { - "packageLocation": "./.yarn/cache/@tootallnate-once-npm-1.1.2-0517220057-d030f3fb14.zip/node_modules/@tootallnate/once/", - "packageDependencies": [ - ["@tootallnate/once", "npm:1.1.2"] - ], - "linkType": "HARD", - }] - ]], ["@types/body-parser", [ ["npm:1.19.0", { "packageLocation": "./.yarn/cache/@types-body-parser-npm-1.19.0-3ca4d08a60-4576f3fde5.zip/node_modules/@types/body-parser/", @@ -596,15 +557,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD", }] ]], - ["abbrev", [ - ["npm:1.1.1", { - "packageLocation": "./.yarn/cache/abbrev-npm-1.1.1-3659247eab-9f9236a3cc.zip/node_modules/abbrev/", - "packageDependencies": [ - ["abbrev", "npm:1.1.1"] - ], - "linkType": "HARD", - }] - ]], ["abort-controller", [ ["npm:3.0.0", { "packageLocation": "./.yarn/cache/abort-controller-npm-3.0.0-2f3a9a2bcb-cc53ad8df9.zip/node_modules/abort-controller/", @@ -646,39 +598,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD", }] ]], - ["agent-base", [ - ["npm:6.0.2", { - "packageLocation": "./.yarn/cache/agent-base-npm-6.0.2-428f325a93-e77eff83e1.zip/node_modules/agent-base/", - "packageDependencies": [ - ["agent-base", "npm:6.0.2"], - ["debug", "virtual:428f325a939c2653ad822eb3d75efb02ac311523dd0d4f9645afc39ea00bd86eceac35a9d59c9b6977d76b670a4ef0ae057ea572338a44729aa592711a8c05a3#npm:4.3.2"] - ], - "linkType": "HARD", - }] - ]], - ["agentkeepalive", [ - ["npm:4.1.4", { - "packageLocation": "./.yarn/cache/agentkeepalive-npm-4.1.4-4d5b41b4c1-c58f69d05c.zip/node_modules/agentkeepalive/", - "packageDependencies": [ - ["agentkeepalive", "npm:4.1.4"], - ["debug", "virtual:428f325a939c2653ad822eb3d75efb02ac311523dd0d4f9645afc39ea00bd86eceac35a9d59c9b6977d76b670a4ef0ae057ea572338a44729aa592711a8c05a3#npm:4.3.2"], - ["depd", "npm:1.1.2"], - ["humanize-ms", "npm:1.2.1"] - ], - "linkType": "HARD", - }] - ]], - ["aggregate-error", [ - ["npm:3.1.0", { - "packageLocation": "./.yarn/cache/aggregate-error-npm-3.1.0-415a406f4e-704d2001a3.zip/node_modules/aggregate-error/", - "packageDependencies": [ - ["aggregate-error", "npm:3.1.0"], - ["clean-stack", "npm:2.2.0"], - ["indent-string", "npm:4.0.0"] - ], - "linkType": "HARD", - }] - ]], ["ajv", [ ["npm:6.12.6", { "packageLocation": "./.yarn/cache/ajv-npm-6.12.6-4b5105e2b2-19a8f3b0a0.zip/node_modules/ajv/", @@ -713,20 +632,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }] ]], ["ansi-regex", [ - ["npm:2.1.1", { - "packageLocation": "./.yarn/cache/ansi-regex-npm-2.1.1-ddd24d102b-93a53c923f.zip/node_modules/ansi-regex/", - "packageDependencies": [ - ["ansi-regex", "npm:2.1.1"] - ], - "linkType": "HARD", - }], - ["npm:3.0.0", { - "packageLocation": "./.yarn/cache/ansi-regex-npm-3.0.0-be0b845911-2e3c40d429.zip/node_modules/ansi-regex/", - "packageDependencies": [ - ["ansi-regex", "npm:3.0.0"] - ], - "linkType": "HARD", - }], ["npm:5.0.0", { "packageLocation": "./.yarn/cache/ansi-regex-npm-5.0.0-9c076068d9-cbd9b5c9db.zip/node_modules/ansi-regex/", "packageDependencies": [ @@ -762,26 +667,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD", }] ]], - ["aproba", [ - ["npm:1.2.0", { - "packageLocation": "./.yarn/cache/aproba-npm-1.2.0-34129f0778-d4bac3e640.zip/node_modules/aproba/", - "packageDependencies": [ - ["aproba", "npm:1.2.0"] - ], - "linkType": "HARD", - }] - ]], - ["are-we-there-yet", [ - ["npm:1.1.5", { - "packageLocation": "./.yarn/cache/are-we-there-yet-npm-1.1.5-b8418908b0-2d6fdb0ddd.zip/node_modules/are-we-there-yet/", - "packageDependencies": [ - ["are-we-there-yet", "npm:1.1.5"], - ["delegates", "npm:1.0.0"], - ["readable-stream", "npm:2.3.7"] - ], - "linkType": "HARD", - }] - ]], ["argparse", [ ["npm:1.0.10", { "packageLocation": "./.yarn/cache/argparse-npm-1.0.10-528934e59d-435adaef5f.zip/node_modules/argparse/", @@ -899,7 +784,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@typescript-eslint/eslint-plugin", "virtual:d7ae587dddcefd495158f5c047acecbca3203324d75e681c7d8657c07f901f74e152f0b39978f7428d3a91daad7b5020c47ece28de69c22fcbd49d04707bf15c#npm:4.24.0"], ["@typescript-eslint/parser", "virtual:d7ae587dddcefd495158f5c047acecbca3203324d75e681c7d8657c07f901f74e152f0b39978f7428d3a91daad7b5020c47ece28de69c22fcbd49d04707bf15c#npm:4.24.0"], ["body-parser", "npm:1.19.0"], - ["canvas", "npm:2.8.0"], ["chalk", "npm:4.1.1"], ["common-tags", "npm:1.8.0"], ["discord-akairo", "https://github.com/SkyBlockDev/discord-akairo.git#commit=599ba6d382b3c156941928d9548f0f70d1d8d624"], @@ -931,32 +815,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD", }] ]], - ["cacache", [ - ["npm:15.2.0", { - "packageLocation": "./.yarn/cache/cacache-npm-15.2.0-7b4a3a5b83-e7d6a93c34.zip/node_modules/cacache/", - "packageDependencies": [ - ["cacache", "npm:15.2.0"], - ["@npmcli/move-file", "npm:1.1.2"], - ["chownr", "npm:2.0.0"], - ["fs-minipass", "npm:2.1.0"], - ["glob", "npm:7.1.7"], - ["infer-owner", "npm:1.0.4"], - ["lru-cache", "npm:6.0.0"], - ["minipass", "npm:3.1.3"], - ["minipass-collect", "npm:1.0.2"], - ["minipass-flush", "npm:1.0.5"], - ["minipass-pipeline", "npm:1.2.4"], - ["mkdirp", "npm:1.0.4"], - ["p-map", "npm:4.0.0"], - ["promise-inflight", "virtual:7b4a3a5b83dd58ae7ce7698db506d3491e7014f774e78d5d0d3f6df0db964e99401515781c14a487335f1366f0d1c448759b6d13f1ae2d0ef08e605c4b8d5cd4#npm:1.0.1"], - ["rimraf", "npm:3.0.2"], - ["ssri", "npm:8.0.1"], - ["tar", "npm:6.1.0"], - ["unique-filename", "npm:1.1.1"] - ], - "linkType": "HARD", - }] - ]], ["cacheable-lookup", [ ["npm:5.0.4", { "packageLocation": "./.yarn/cache/cacheable-lookup-npm-5.0.4-8f13e8b44b-cb5849f584.zip/node_modules/cacheable-lookup/", @@ -991,19 +849,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD", }] ]], - ["canvas", [ - ["npm:2.8.0", { - "packageLocation": "./.yarn/unplugged/canvas-npm-2.8.0-b8a304d4de/node_modules/canvas/", - "packageDependencies": [ - ["canvas", "npm:2.8.0"], - ["@mapbox/node-pre-gyp", "npm:1.0.5"], - ["nan", "npm:2.14.2"], - ["node-gyp", "npm:8.0.0"], - ["simple-get", "npm:3.1.0"] - ], - "linkType": "HARD", - }] - ]], ["chalk", [ ["npm:2.4.2", { "packageLocation": "./.yarn/cache/chalk-npm-2.4.2-3ea16dd91e-22c7b7b5bc.zip/node_modules/chalk/", @@ -1025,24 +870,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD", }] ]], - ["chownr", [ - ["npm:2.0.0", { - "packageLocation": "./.yarn/cache/chownr-npm-2.0.0-638f1c9c61-b06ba0bf42.zip/node_modules/chownr/", - "packageDependencies": [ - ["chownr", "npm:2.0.0"] - ], - "linkType": "HARD", - }] - ]], - ["clean-stack", [ - ["npm:2.2.0", { - "packageLocation": "./.yarn/cache/clean-stack-npm-2.2.0-a8ce435a5c-e291ce2b8c.zip/node_modules/clean-stack/", - "packageDependencies": [ - ["clean-stack", "npm:2.2.0"] - ], - "linkType": "HARD", - }] - ]], ["clone-response", [ ["npm:1.0.2", { "packageLocation": "./.yarn/cache/clone-response-npm-1.0.2-135ae8239d-71832f9219.zip/node_modules/clone-response/", @@ -1053,15 +880,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD", }] ]], - ["code-point-at", [ - ["npm:1.1.0", { - "packageLocation": "./.yarn/cache/code-point-at-npm-1.1.0-37de5fe566-7d9837296e.zip/node_modules/code-point-at/", - "packageDependencies": [ - ["code-point-at", "npm:1.1.0"] - ], - "linkType": "HARD", - }] - ]], ["color-convert", [ ["npm:1.9.3", { "packageLocation": "./.yarn/cache/color-convert-npm-1.9.3-1fe690075e-5f244daa3d.zip/node_modules/color-convert/", @@ -1124,15 +942,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD", }] ]], - ["console-control-strings", [ - ["npm:1.1.0", { - "packageLocation": "./.yarn/cache/console-control-strings-npm-1.1.0-e3160e5275-58a404d951.zip/node_modules/console-control-strings/", - "packageDependencies": [ - ["console-control-strings", "npm:1.1.0"] - ], - "linkType": "HARD", - }] - ]], ["content-type", [ ["npm:1.0.4", { "packageLocation": "./.yarn/cache/content-type-npm-1.0.4-3b1a5ca16b-ff6e19cbf2.zip/node_modules/content-type/", @@ -1142,15 +951,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD", }] ]], - ["core-util-is", [ - ["npm:1.0.2", { - "packageLocation": "./.yarn/cache/core-util-is-npm-1.0.2-9fc2b94dc3-089015ee3c.zip/node_modules/core-util-is/", - "packageDependencies": [ - ["core-util-is", "npm:1.0.2"] - ], - "linkType": "HARD", - }] - ]], ["cross-spawn", [ ["npm:7.0.3", { "packageLocation": "./.yarn/cache/cross-spawn-npm-7.0.3-e4ff3e65b3-51f10036f5.zip/node_modules/cross-spawn/", @@ -1178,25 +978,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ], "linkType": "SOFT", }], - ["npm:4.3.2", { - "packageLocation": "./.yarn/cache/debug-npm-4.3.2-f0148b6afe-5543570879.zip/node_modules/debug/", - "packageDependencies": [ - ["debug", "npm:4.3.2"] - ], - "linkType": "SOFT", - }], - ["virtual:428f325a939c2653ad822eb3d75efb02ac311523dd0d4f9645afc39ea00bd86eceac35a9d59c9b6977d76b670a4ef0ae057ea572338a44729aa592711a8c05a3#npm:4.3.2", { - "packageLocation": "./.yarn/$$virtual/debug-virtual-c8b34b81df/0/cache/debug-npm-4.3.2-f0148b6afe-5543570879.zip/node_modules/debug/", - "packageDependencies": [ - ["debug", "virtual:428f325a939c2653ad822eb3d75efb02ac311523dd0d4f9645afc39ea00bd86eceac35a9d59c9b6977d76b670a4ef0ae057ea572338a44729aa592711a8c05a3#npm:4.3.2"], - ["ms", "npm:2.1.2"], - ["supports-color", null] - ], - "packagePeers": [ - "supports-color" - ], - "linkType": "HARD", - }], ["virtual:48933b28331d16c1d73786360e7ba20f54f6df4949c6ab5c13ac4c4353b5c70f2d36a97de9a9c531027ad3588d8fd7f384706f298f0eff0356b58bb9c47f63ec#npm:4.3.1", { "packageLocation": "./.yarn/$$virtual/debug-virtual-9b1bbab664/0/cache/debug-npm-4.3.1-22e08d605e-0d41ba5177.zip/node_modules/debug/", "packageDependencies": [ @@ -1223,14 +1004,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }] ]], ["decompress-response", [ - ["npm:4.2.1", { - "packageLocation": "./.yarn/cache/decompress-response-npm-4.2.1-abe5b4ebe4-d854171a10.zip/node_modules/decompress-response/", - "packageDependencies": [ - ["decompress-response", "npm:4.2.1"], - ["mimic-response", "npm:2.1.0"] - ], - "linkType": "HARD", - }], ["npm:6.0.0", { "packageLocation": "./.yarn/cache/decompress-response-npm-6.0.0-359de2878c-bb8b8c42be.zip/node_modules/decompress-response/", "packageDependencies": [ @@ -1267,15 +1040,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD", }] ]], - ["delegates", [ - ["npm:1.0.0", { - "packageLocation": "./.yarn/cache/delegates-npm-1.0.0-9b1942d75f-7459e34d29.zip/node_modules/delegates/", - "packageDependencies": [ - ["delegates", "npm:1.0.0"] - ], - "linkType": "HARD", - }] - ]], ["depd", [ ["npm:1.1.2", { "packageLocation": "./.yarn/cache/depd-npm-1.1.2-b0c8414da7-f45566ff70.zip/node_modules/depd/", @@ -1285,15 +1049,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD", }] ]], - ["detect-libc", [ - ["npm:1.0.3", { - "packageLocation": "./.yarn/cache/detect-libc-npm-1.0.3-c30ac344d4-6cec442139.zip/node_modules/detect-libc/", - "packageDependencies": [ - ["detect-libc", "npm:1.0.3"] - ], - "linkType": "HARD", - }] - ]], ["dir-glob", [ ["npm:3.0.1", { "packageLocation": "./.yarn/cache/dir-glob-npm-3.0.1-1aea628b1b-687fa3bd60.zip/node_modules/dir-glob/", @@ -1334,7 +1089,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["abort-controller", "npm:3.0.0"], ["discord-api-types", "npm:0.18.1"], ["node-fetch", "npm:2.6.1"], - ["ws", "virtual:275bceca0f79f8e7aeb7f77acb5a6bd201e7eea264e9dfd8dcc0bcf35691357327303c09557dfc1495b9a1f8e9cf8278133d234783570df6cb70a249778f3198#npm:7.4.6"] + ["ws", "virtual:1d25a578dd48372c4d017c7c5210dd9376a8b431fbafd3a793c80762d5fa053695bf4ef7d827ee944081ed716bea188119e13ae6a82dbf5ec3a4107e7a1f27f1#npm:7.4.6"] ], "linkType": "HARD", }] @@ -1376,16 +1131,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD", }] ]], - ["encoding", [ - ["npm:0.1.13", { - "packageLocation": "./.yarn/cache/encoding-npm-0.1.13-82a1837d30-282d5696a4.zip/node_modules/encoding/", - "packageDependencies": [ - ["encoding", "npm:0.1.13"], - ["iconv-lite", "npm:0.6.3"] - ], - "linkType": "HARD", - }] - ]], ["end-of-stream", [ ["npm:1.4.4", { "packageLocation": "./.yarn/cache/end-of-stream-npm-1.4.4-497fc6dee1-7da60e458b.zip/node_modules/end-of-stream/", @@ -1406,24 +1151,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD", }] ]], - ["env-paths", [ - ["npm:2.2.1", { - "packageLocation": "./.yarn/cache/env-paths-npm-2.2.1-7c7577428c-9579868bc7.zip/node_modules/env-paths/", - "packageDependencies": [ - ["env-paths", "npm:2.2.1"] - ], - "linkType": "HARD", - }] - ]], - ["err-code", [ - ["npm:2.0.3", { - "packageLocation": "./.yarn/cache/err-code-npm-2.0.3-082e0ff9a7-14e09e9990.zip/node_modules/err-code/", - "packageDependencies": [ - ["err-code", "npm:2.0.3"] - ], - "linkType": "HARD", - }] - ]], ["esbuild", [ ["npm:0.12.1", { "packageLocation": "./.yarn/unplugged/esbuild-npm-0.12.1-ce7e6881a2/node_modules/esbuild/", @@ -1714,16 +1441,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD", }] ]], - ["fs-minipass", [ - ["npm:2.1.0", { - "packageLocation": "./.yarn/cache/fs-minipass-npm-2.1.0-501ef87306-e14a490658.zip/node_modules/fs-minipass/", - "packageDependencies": [ - ["fs-minipass", "npm:2.1.0"], - ["minipass", "npm:3.1.3"] - ], - "linkType": "HARD", - }] - ]], ["fs.realpath", [ ["npm:1.0.0", { "packageLocation": "./.yarn/cache/fs.realpath-npm-1.0.0-c8f05d8126-698a91b169.zip/node_modules/fs.realpath/", @@ -1742,23 +1459,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD", }] ]], - ["gauge", [ - ["npm:2.7.4", { - "packageLocation": "./.yarn/cache/gauge-npm-2.7.4-2189a73529-b136dbeb8e.zip/node_modules/gauge/", - "packageDependencies": [ - ["gauge", "npm:2.7.4"], - ["aproba", "npm:1.2.0"], - ["console-control-strings", "npm:1.1.0"], - ["has-unicode", "npm:2.0.1"], - ["object-assign", "npm:4.1.1"], - ["signal-exit", "npm:3.0.3"], - ["string-width", "npm:1.0.2"], - ["strip-ansi", "npm:3.0.1"], - ["wide-align", "npm:1.1.3"] - ], - "linkType": "HARD", - }] - ]], ["get-stream", [ ["npm:5.2.0", { "packageLocation": "./.yarn/cache/get-stream-npm-5.2.0-2cfd3b452b-c71c5625f4.zip/node_modules/get-stream/", @@ -1847,15 +1547,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD", }] ]], - ["graceful-fs", [ - ["npm:4.2.6", { - "packageLocation": "./.yarn/cache/graceful-fs-npm-4.2.6-535b2234f1-84d39c7756.zip/node_modules/graceful-fs/", - "packageDependencies": [ - ["graceful-fs", "npm:4.2.6"] - ], - "linkType": "HARD", - }] - ]], ["has-flag", [ ["npm:3.0.0", { "packageLocation": "./.yarn/cache/has-flag-npm-3.0.0-16ac11fe05-63aade480d.zip/node_modules/has-flag/", @@ -1872,15 +1563,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD", }] ]], - ["has-unicode", [ - ["npm:2.0.1", { - "packageLocation": "./.yarn/cache/has-unicode-npm-2.0.1-893adb4747-ed3719f95c.zip/node_modules/has-unicode/", - "packageDependencies": [ - ["has-unicode", "npm:2.0.1"] - ], - "linkType": "HARD", - }] - ]], ["http-cache-semantics", [ ["npm:4.1.0", { "packageLocation": "./.yarn/cache/http-cache-semantics-npm-4.1.0-860520a31f-451df9784a.zip/node_modules/http-cache-semantics/", @@ -1904,18 +1586,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD", }] ]], - ["http-proxy-agent", [ - ["npm:4.0.1", { - "packageLocation": "./.yarn/cache/http-proxy-agent-npm-4.0.1-ce9ef61788-6703aeb5c5.zip/node_modules/http-proxy-agent/", - "packageDependencies": [ - ["http-proxy-agent", "npm:4.0.1"], - ["@tootallnate/once", "npm:1.1.2"], - ["agent-base", "npm:6.0.2"], - ["debug", "virtual:428f325a939c2653ad822eb3d75efb02ac311523dd0d4f9645afc39ea00bd86eceac35a9d59c9b6977d76b670a4ef0ae057ea572338a44729aa592711a8c05a3#npm:4.3.2"] - ], - "linkType": "HARD", - }] - ]], ["http2-wrapper", [ ["npm:1.0.3", { "packageLocation": "./.yarn/cache/http2-wrapper-npm-1.0.3-5b58ade1df-2fc0140a69.zip/node_modules/http2-wrapper/", @@ -1927,27 +1597,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD", }] ]], - ["https-proxy-agent", [ - ["npm:5.0.0", { - "packageLocation": "./.yarn/cache/https-proxy-agent-npm-5.0.0-bb777903c3-18aa04ea08.zip/node_modules/https-proxy-agent/", - "packageDependencies": [ - ["https-proxy-agent", "npm:5.0.0"], - ["agent-base", "npm:6.0.2"], - ["debug", "virtual:428f325a939c2653ad822eb3d75efb02ac311523dd0d4f9645afc39ea00bd86eceac35a9d59c9b6977d76b670a4ef0ae057ea572338a44729aa592711a8c05a3#npm:4.3.2"] - ], - "linkType": "HARD", - }] - ]], - ["humanize-ms", [ - ["npm:1.2.1", { - "packageLocation": "./.yarn/cache/humanize-ms-npm-1.2.1-e942bd7329-4a08769434.zip/node_modules/humanize-ms/", - "packageDependencies": [ - ["humanize-ms", "npm:1.2.1"], - ["ms", "npm:2.1.3"] - ], - "linkType": "HARD", - }] - ]], ["iconv-lite", [ ["npm:0.4.24", { "packageLocation": "./.yarn/cache/iconv-lite-npm-0.4.24-c5c4ac6695-a9b9521066.zip/node_modules/iconv-lite/", @@ -1956,14 +1605,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["safer-buffer", "npm:2.1.2"] ], "linkType": "HARD", - }], - ["npm:0.6.3", { - "packageLocation": "./.yarn/cache/iconv-lite-npm-0.6.3-24b8aae27e-9b4f24db66.zip/node_modules/iconv-lite/", - "packageDependencies": [ - ["iconv-lite", "npm:0.6.3"], - ["safer-buffer", "npm:2.1.2"] - ], - "linkType": "HARD", }] ]], ["ignore", [ @@ -2002,24 +1643,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD", }] ]], - ["indent-string", [ - ["npm:4.0.0", { - "packageLocation": "./.yarn/cache/indent-string-npm-4.0.0-7b717435b2-3e54996c6e.zip/node_modules/indent-string/", - "packageDependencies": [ - ["indent-string", "npm:4.0.0"] - ], - "linkType": "HARD", - }] - ]], - ["infer-owner", [ - ["npm:1.0.4", { - "packageLocation": "./.yarn/cache/infer-owner-npm-1.0.4-685ac3d2af-56aa1d87b0.zip/node_modules/infer-owner/", - "packageDependencies": [ - ["infer-owner", "npm:1.0.4"] - ], - "linkType": "HARD", - }] - ]], ["inflection", [ ["npm:1.12.0", { "packageLocation": "./.yarn/cache/inflection-npm-1.12.0-528e724bc4-b08d8b92fc.zip/node_modules/inflection/", @@ -2056,15 +1679,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD", }] ]], - ["ip", [ - ["npm:1.1.5", { - "packageLocation": "./.yarn/cache/ip-npm-1.1.5-af36318aa6-3ad007368c.zip/node_modules/ip/", - "packageDependencies": [ - ["ip", "npm:1.1.5"] - ], - "linkType": "HARD", - }] - ]], ["is-extglob", [ ["npm:2.1.1", { "packageLocation": "./.yarn/cache/is-extglob-npm-2.1.1-0870ea68b5-ca623e2c56.zip/node_modules/is-extglob/", @@ -2075,21 +1689,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }] ]], ["is-fullwidth-code-point", [ - ["npm:1.0.0", { - "packageLocation": "./.yarn/cache/is-fullwidth-code-point-npm-1.0.0-0e436ba1ef-fc3d51ef08.zip/node_modules/is-fullwidth-code-point/", - "packageDependencies": [ - ["is-fullwidth-code-point", "npm:1.0.0"], - ["number-is-nan", "npm:1.0.1"] - ], - "linkType": "HARD", - }], - ["npm:2.0.0", { - "packageLocation": "./.yarn/cache/is-fullwidth-code-point-npm-2.0.0-507f56ec71-e1e5284f84.zip/node_modules/is-fullwidth-code-point/", - "packageDependencies": [ - ["is-fullwidth-code-point", "npm:2.0.0"] - ], - "linkType": "HARD", - }], ["npm:3.0.0", { "packageLocation": "./.yarn/cache/is-fullwidth-code-point-npm-3.0.0-1ecf4ebee5-a01a19ecac.zip/node_modules/is-fullwidth-code-point/", "packageDependencies": [ @@ -2108,15 +1707,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD", }] ]], - ["is-lambda", [ - ["npm:1.0.1", { - "packageLocation": "./.yarn/cache/is-lambda-npm-1.0.1-7ab55bc8a8-669ea37e8f.zip/node_modules/is-lambda/", - "packageDependencies": [ - ["is-lambda", "npm:1.0.1"] - ], - "linkType": "HARD", - }] - ]], ["is-number", [ ["npm:7.0.0", { "packageLocation": "./.yarn/cache/is-number-npm-7.0.0-060086935c-eec6e506c6.zip/node_modules/is-number/", @@ -2126,15 +1716,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD", }] ]], - ["isarray", [ - ["npm:1.0.0", { - "packageLocation": "./.yarn/cache/isarray-npm-1.0.0-db4f547720-b0ff31a290.zip/node_modules/isarray/", - "packageDependencies": [ - ["isarray", "npm:1.0.0"] - ], - "linkType": "HARD", - }] - ]], ["isexe", [ ["npm:2.0.0", { "packageLocation": "./.yarn/cache/isexe-npm-2.0.0-b58870bd2e-7b437980bb.zip/node_modules/isexe/", @@ -2265,40 +1846,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD", }] ]], - ["make-dir", [ - ["npm:3.1.0", { - "packageLocation": "./.yarn/cache/make-dir-npm-3.1.0-d1d7505142-54b6f186c2.zip/node_modules/make-dir/", - "packageDependencies": [ - ["make-dir", "npm:3.1.0"], - ["semver", "npm:6.3.0"] - ], - "linkType": "HARD", - }] - ]], - ["make-fetch-happen", [ - ["npm:8.0.14", { - "packageLocation": "./.yarn/cache/make-fetch-happen-npm-8.0.14-fa5d78adad-0847aca9a3.zip/node_modules/make-fetch-happen/", - "packageDependencies": [ - ["make-fetch-happen", "npm:8.0.14"], - ["agentkeepalive", "npm:4.1.4"], - ["cacache", "npm:15.2.0"], - ["http-cache-semantics", "npm:4.1.0"], - ["http-proxy-agent", "npm:4.0.1"], - ["https-proxy-agent", "npm:5.0.0"], - ["is-lambda", "npm:1.0.1"], - ["lru-cache", "npm:6.0.0"], - ["minipass", "npm:3.1.3"], - ["minipass-collect", "npm:1.0.2"], - ["minipass-fetch", "npm:1.3.3"], - ["minipass-flush", "npm:1.0.5"], - ["minipass-pipeline", "npm:1.2.4"], - ["promise-retry", "npm:2.0.1"], - ["socks-proxy-agent", "npm:5.0.0"], - ["ssri", "npm:8.0.1"] - ], - "linkType": "HARD", - }] - ]], ["media-typer", [ ["npm:0.3.0", { "packageLocation": "./.yarn/cache/media-typer-npm-0.3.0-8674f8f0f5-be1c825782.zip/node_modules/media-typer/", @@ -2355,13 +1902,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ], "linkType": "HARD", }], - ["npm:2.1.0", { - "packageLocation": "./.yarn/cache/mimic-response-npm-2.1.0-037463e454-9c206f3aeb.zip/node_modules/mimic-response/", - "packageDependencies": [ - ["mimic-response", "npm:2.1.0"] - ], - "linkType": "HARD", - }], ["npm:3.1.0", { "packageLocation": "./.yarn/cache/mimic-response-npm-3.1.0-a4a24b4e96-cfbf19f66d.zip/node_modules/mimic-response/", "packageDependencies": [ @@ -2380,89 +1920,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD", }] ]], - ["minipass", [ - ["npm:3.1.3", { - "packageLocation": "./.yarn/cache/minipass-npm-3.1.3-af723e33f3-d12b95a845.zip/node_modules/minipass/", - "packageDependencies": [ - ["minipass", "npm:3.1.3"], - ["yallist", "npm:4.0.0"] - ], - "linkType": "HARD", - }] - ]], - ["minipass-collect", [ - ["npm:1.0.2", { - "packageLocation": "./.yarn/cache/minipass-collect-npm-1.0.2-3b4676eab5-529ef62123.zip/node_modules/minipass-collect/", - "packageDependencies": [ - ["minipass-collect", "npm:1.0.2"], - ["minipass", "npm:3.1.3"] - ], - "linkType": "HARD", - }] - ]], - ["minipass-fetch", [ - ["npm:1.3.3", { - "packageLocation": "./.yarn/cache/minipass-fetch-npm-1.3.3-6dd11d4b13-cc93f86391.zip/node_modules/minipass-fetch/", - "packageDependencies": [ - ["minipass-fetch", "npm:1.3.3"], - ["encoding", "npm:0.1.13"], - ["minipass", "npm:3.1.3"], - ["minipass-sized", "npm:1.0.3"], - ["minizlib", "npm:2.1.2"] - ], - "linkType": "HARD", - }] - ]], - ["minipass-flush", [ - ["npm:1.0.5", { - "packageLocation": "./.yarn/cache/minipass-flush-npm-1.0.5-efe79d9826-d354ca0da8.zip/node_modules/minipass-flush/", - "packageDependencies": [ - ["minipass-flush", "npm:1.0.5"], - ["minipass", "npm:3.1.3"] - ], - "linkType": "HARD", - }] - ]], - ["minipass-pipeline", [ - ["npm:1.2.4", { - "packageLocation": "./.yarn/cache/minipass-pipeline-npm-1.2.4-5924cb077f-001d5a4a0c.zip/node_modules/minipass-pipeline/", - "packageDependencies": [ - ["minipass-pipeline", "npm:1.2.4"], - ["minipass", "npm:3.1.3"] - ], - "linkType": "HARD", - }] - ]], - ["minipass-sized", [ - ["npm:1.0.3", { - "packageLocation": "./.yarn/cache/minipass-sized-npm-1.0.3-306d86f432-747cb22e8a.zip/node_modules/minipass-sized/", - "packageDependencies": [ - ["minipass-sized", "npm:1.0.3"], - ["minipass", "npm:3.1.3"] - ], - "linkType": "HARD", - }] - ]], - ["minizlib", [ - ["npm:2.1.2", { - "packageLocation": "./.yarn/cache/minizlib-npm-2.1.2-ea89cd0cfb-5a45b57b34.zip/node_modules/minizlib/", - "packageDependencies": [ - ["minizlib", "npm:2.1.2"], - ["minipass", "npm:3.1.3"], - ["yallist", "npm:4.0.0"] - ], - "linkType": "HARD", - }] - ]], - ["mkdirp", [ - ["npm:1.0.4", { - "packageLocation": "./.yarn/cache/mkdirp-npm-1.0.4-37f6ef56b9-1aa3a6a2d7.zip/node_modules/mkdirp/", - "packageDependencies": [ - ["mkdirp", "npm:1.0.4"] - ], - "linkType": "HARD", - }] - ]], ["moment", [ ["npm:2.29.1", { "packageLocation": "./.yarn/cache/moment-npm-2.29.1-787d9fdafd-86729013fe.zip/node_modules/moment/", @@ -2496,23 +1953,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["ms", "npm:2.1.2"] ], "linkType": "HARD", - }], - ["npm:2.1.3", { - "packageLocation": "./.yarn/cache/ms-npm-2.1.3-81ff3cfac1-6e721e648a.zip/node_modules/ms/", - "packageDependencies": [ - ["ms", "npm:2.1.3"] - ], - "linkType": "HARD", - }] - ]], - ["nan", [ - ["npm:2.14.2", { - "packageLocation": "./.yarn/unplugged/nan-npm-2.14.2-e3ede8ce5d/node_modules/nan/", - "packageDependencies": [ - ["nan", "npm:2.14.2"], - ["node-gyp", "npm:8.0.0"] - ], - "linkType": "HARD", }] ]], ["natural-compare", [ @@ -2533,35 +1973,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD", }] ]], - ["node-gyp", [ - ["npm:8.0.0", { - "packageLocation": "./.yarn/unplugged/node-gyp-npm-8.0.0-a27599670d/node_modules/node-gyp/", - "packageDependencies": [ - ["node-gyp", "npm:8.0.0"], - ["env-paths", "npm:2.2.1"], - ["glob", "npm:7.1.7"], - ["graceful-fs", "npm:4.2.6"], - ["make-fetch-happen", "npm:8.0.14"], - ["nopt", "npm:5.0.0"], - ["npmlog", "npm:4.1.2"], - ["rimraf", "npm:3.0.2"], - ["semver", "npm:7.3.5"], - ["tar", "npm:6.1.0"], - ["which", "npm:2.0.2"] - ], - "linkType": "HARD", - }] - ]], - ["nopt", [ - ["npm:5.0.0", { - "packageLocation": "./.yarn/cache/nopt-npm-5.0.0-304b40fbfe-e1523158fc.zi