From 66b958cd1d38a8ba0d64ecd188bc8d90e850cfbb Mon Sep 17 00:00:00 2001 From: IRONM00N <64110067+IRONM00N@users.noreply.github.com> Date: Sun, 11 Jul 2021 20:52:56 -0400 Subject: fix: circular imports --- .pnp.cjs | 1108 +++++++++++++++++++- .prettierignore | 5 +- .vscode/extensions.json | 2 +- .vscode/launch.json | 1 - .vscode/settings.json | 23 +- .vscode/typescript.code-snippets | 1 - package.json | 6 + src/arguments/contentWithDuration.ts | 2 +- src/arguments/duration.ts | 2 +- src/bot.ts | 3 +- src/commands/config/muteRole.ts | 2 +- src/commands/config/prefix.ts | 2 +- src/commands/config/welcomeChannel.ts | 2 +- src/commands/dev/eval.ts | 4 +- src/commands/dev/reload.ts | 2 +- src/commands/dev/setLevel.ts | 2 +- src/commands/dev/superUser.ts | 2 +- src/commands/dev/testDuration.ts | 2 +- src/commands/info/botInfo.ts | 2 +- src/commands/info/help.ts | 2 +- src/commands/info/ping.ts | 2 +- src/commands/info/pronouns.ts | 2 +- src/commands/moderation/ban.ts | 2 +- src/commands/moderation/kick.ts | 2 +- src/commands/moderation/modlog.ts | 2 +- src/commands/moderation/mute.ts | 2 +- src/commands/moderation/role.ts | 2 +- src/commands/moderation/warn.ts | 2 +- src/commands/moulberry-bush/capePerms.ts | 2 +- src/commands/moulberry-bush/giveawayPing.ts | 2 +- src/commands/moulberry-bush/level.ts | 4 +- src/commands/moulberry-bush/rule.ts | 2 +- src/inhibitors/blacklist/guildBlacklist.ts | 2 +- src/inhibitors/blacklist/userBlacklist.ts | 2 +- src/inhibitors/commands/disabledCommand.ts | 2 +- src/inhibitors/noCache.ts | 2 +- .../discord-akairo/BushArgumentTypeCaster.ts | 2 +- src/lib/extensions/discord-akairo/BushClient.ts | 108 +- .../extensions/discord-akairo/BushClientUtil.ts | 31 +- src/lib/extensions/discord-akairo/BushCommand.ts | 5 +- .../discord-akairo/BushCommandHandler.ts | 5 +- .../extensions/discord-akairo/BushCommandUtil.ts | 4 +- src/lib/extensions/discord-akairo/BushInhibitor.ts | 5 +- .../discord-akairo/BushInhibitorHandler.ts | 2 +- src/lib/extensions/discord-akairo/BushListener.ts | 2 +- .../discord-akairo/BushListenerHandler.ts | 2 +- .../extensions/discord-akairo/BushSlashMessage.ts | 6 +- src/lib/extensions/discord-akairo/BushTask.ts | 4 +- .../extensions/discord-akairo/BushTaskHandler.ts | 2 +- src/lib/extensions/discord-akairo/index.ts | 13 - src/lib/extensions/discord.js/BushActivity.ts | 3 +- .../discord.js/BushApplicationCommand.ts | 3 +- .../discord.js/BushApplicationCommandManager.ts | 5 +- .../BushApplicationCommandPermissionsManager.ts | 7 +- .../extensions/discord.js/BushButtonInteraction.ts | 8 +- .../extensions/discord.js/BushCategoryChannel.ts | 5 +- .../discord.js/BushCommandInteraction.ts | 18 +- src/lib/extensions/discord.js/BushDMChannel.ts | 4 +- src/lib/extensions/discord.js/BushEmoji.ts | 2 +- src/lib/extensions/discord.js/BushGuild.ts | 3 +- .../BushGuildApplicationCommandManager.ts | 2 +- src/lib/extensions/discord.js/BushGuildChannel.ts | 3 +- src/lib/extensions/discord.js/BushGuildEmoji.ts | 5 +- .../discord.js/BushGuildEmojiRoleManager.ts | 4 +- src/lib/extensions/discord.js/BushGuildMember.ts | 5 +- .../discord.js/BushGuildMemberManager.ts | 2 +- src/lib/extensions/discord.js/BushMessage.ts | 18 +- .../extensions/discord.js/BushMessageManager.ts | 6 +- .../extensions/discord.js/BushMessageReaction.ts | 5 +- src/lib/extensions/discord.js/BushNewsChannel.ts | 5 +- src/lib/extensions/discord.js/BushPresence.ts | 5 +- src/lib/extensions/discord.js/BushReactionEmoji.ts | 3 +- src/lib/extensions/discord.js/BushRole.ts | 4 +- .../discord.js/BushSelectMenuInteraction.ts | 8 +- src/lib/extensions/discord.js/BushStageChannel.ts | 6 +- src/lib/extensions/discord.js/BushStageInstance.ts | 4 +- src/lib/extensions/discord.js/BushStoreChannel.ts | 5 +- src/lib/extensions/discord.js/BushTextChannel.ts | 4 +- src/lib/extensions/discord.js/BushThreadChannel.ts | 17 +- src/lib/extensions/discord.js/BushThreadManager.ts | 3 +- src/lib/extensions/discord.js/BushThreadMember.ts | 4 +- .../discord.js/BushThreadMemberManager.ts | 3 +- src/lib/extensions/discord.js/BushUser.ts | 3 +- src/lib/extensions/discord.js/BushVoiceChannel.ts | 4 +- src/lib/extensions/discord.js/BushVoiceState.ts | 5 +- src/lib/extensions/discord.js/index.ts | 35 - src/lib/extensions/global.d.ts | 2 +- src/lib/extensions/index.ts | 3 - src/lib/index.ts | 65 +- src/lib/models/Ban.ts | 2 +- src/lib/models/Global.ts | 2 +- src/lib/models/Guild.ts | 3 +- src/lib/models/Level.ts | 2 +- src/lib/models/ModLog.ts | 2 +- src/lib/models/Mute.ts | 2 +- src/lib/models/PunishmentRole.ts | 2 +- src/lib/models/StickyRole.ts | 2 +- src/lib/models/index.ts | 9 - src/lib/utils/BushLogger.ts | 2 +- src/lib/utils/index.ts | 5 - src/listeners/client/interaction.ts | 2 +- src/listeners/client/ready.ts | 12 +- src/listeners/commands/commandBlocked.ts | 2 +- src/listeners/commands/commandError.ts | 2 +- .../commands/commandMissingPermissions.ts | 2 +- src/listeners/commands/commandStarted.ts | 2 +- src/listeners/commands/slashBlocked.ts | 2 +- src/listeners/commands/slashCommandError.ts | 8 +- src/listeners/commands/slashMissingPermissions.ts | 2 +- src/listeners/commands/slashStarted.ts | 4 +- src/listeners/guild/syncUnban.ts | 2 +- src/listeners/message/level.ts | 2 +- src/listeners/other/consoleListener.ts | 4 +- src/listeners/other/promiseRejection.ts | 2 +- src/tasks/unban.ts | 2 +- src/tasks/unmute.ts | 2 +- src/tasks/updateCache.ts | 16 +- tsconfig.json | 6 +- yarn.lock | 972 ++++++++++++++++- 119 files changed, 2420 insertions(+), 355 deletions(-) delete mode 100644 src/lib/extensions/discord-akairo/index.ts delete mode 100644 src/lib/extensions/discord.js/index.ts delete mode 100644 src/lib/extensions/index.ts delete mode 100644 src/lib/models/index.ts delete mode 100644 src/lib/utils/index.ts diff --git a/.pnp.cjs b/.pnp.cjs index bf30e67..c516ab5 100755 --- a/.pnp.cjs +++ b/.pnp.cjs @@ -39,6 +39,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@types/common-tags", "npm:1.8.1"], ["@types/express", "npm:4.17.13"], ["@types/humanize-duration", "npm:3.25.1"], + ["@types/module-alias", "npm:2.0.1"], ["@types/node", "npm:14.17.5"], ["@types/uuid", "npm:8.3.1"], ["@typescript-eslint/eslint-plugin", "virtual:d7ae587dddcefd495158f5c047acecbca3203324d75e681c7d8657c07f901f74e152f0b39978f7428d3a91daad7b5020c47ece28de69c22fcbd49d04707bf15c#npm:4.28.2"], @@ -46,14 +47,16 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["body-parser", "npm:1.19.0"], ["chalk", "npm:4.1.1"], ["common-tags", "npm:1.8.0"], - ["discord-akairo", "https://github.com/NotEnoughUpdates/discord-akairo.git#commit=58e5a8610d9cb47257cb163a94e284113a39a62b"], + ["discord-akairo", "https://github.com/NotEnoughUpdates/discord-akairo.git#commit=67e935e92f12105f2dfc517bb566d8325c794d8a"], ["discord-api-types", "npm:0.19.0-next.f393ba520d7d6d2aacaca7b3ca5d355fab614f6e"], - ["discord.js", "https://github.com/NotEnoughUpdates/discord.js.git#commit=c71d1042962848d9f644262fa27e6f777cda4d35"], + ["discord.js", "https://github.com/NotEnoughUpdates/discord.js.git#commit=20c84839fa43aad6c47ff6ffb11b34cc785e920b"], ["esbuild", "npm:0.12.15"], ["eslint", "npm:7.30.0"], ["eslint-config-prettier", "virtual:d7ae587dddcefd495158f5c047acecbca3203324d75e681c7d8657c07f901f74e152f0b39978f7428d3a91daad7b5020c47ece28de69c22fcbd49d04707bf15c#npm:8.3.0"], ["got", "npm:11.8.2"], ["humanize-duration", "npm:3.27.0"], + ["madge", "npm:5.0.1"], + ["module-alias", "npm:2.2.2"], ["moment", "npm:2.29.1"], ["pg", "virtual:d7ae587dddcefd495158f5c047acecbca3203324d75e681c7d8657c07f901f74e152f0b39978f7428d3a91daad7b5020c47ece28de69c22fcbd49d04707bf15c#npm:8.6.0"], ["pg-hstore", "npm:2.3.4"], @@ -98,6 +101,27 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD", }] ]], + ["@babel/parser", [ + ["npm:7.14.7", { + "packageLocation": "./.yarn/cache/@babel-parser-npm-7.14.7-13f9eb24d7-0d7acc8cf9.zip/node_modules/@babel/parser/", + "packageDependencies": [ + ["@babel/parser", "npm:7.14.7"], + ["@babel/types", "npm:7.14.5"] + ], + "linkType": "HARD", + }] + ]], + ["@babel/types", [ + ["npm:7.14.5", { + "packageLocation": "./.yarn/cache/@babel-types-npm-7.14.5-2e4e3fee48-7c1ab6e8bd.zip/node_modules/@babel/types/", + "packageDependencies": [ + ["@babel/types", "npm:7.14.5"], + ["@babel/helper-validator-identifier", "npm:7.14.5"], + ["to-fast-properties", "npm:2.0.0"] + ], + "linkType": "HARD", + }] + ]], ["@discordjs/builders", [ ["npm:0.2.0", { "packageLocation": "./.yarn/cache/@discordjs-builders-npm-0.2.0-7a1dcef5dd-820067c4d4.zip/node_modules/@discordjs/builders/", @@ -139,7 +163,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.5.2"] + ["ws", "virtual:275bceca0f79f8e7aeb7f77acb5a6bd201e7eea264e9dfd8dcc0bcf35691357327303c09557dfc1495b9a1f8e9cf8278133d234783570df6cb70a249778f3198#npm:7.5.3"] ], "linkType": "HARD", }] @@ -248,7 +272,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "packageDependencies": [ ["@types/body-parser", "npm:1.19.1"], ["@types/connect", "npm:3.4.35"], - ["@types/node", "npm:16.0.3"] + ["@types/node", "npm:16.3.1"] ], "linkType": "HARD", }] @@ -260,7 +284,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@types/cacheable-request", "npm:6.0.2"], ["@types/http-cache-semantics", "npm:4.0.1"], ["@types/keyv", "npm:3.1.2"], - ["@types/node", "npm:16.0.3"], + ["@types/node", "npm:16.3.1"], ["@types/responselike", "npm:1.0.0"] ], "linkType": "HARD", @@ -280,7 +304,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "packageLocation": "./.yarn/cache/@types-connect-npm-3.4.35-7337eee0a3-fe81351470.zip/node_modules/@types/connect/", "packageDependencies": [ ["@types/connect", "npm:3.4.35"], - ["@types/node", "npm:16.0.3"] + ["@types/node", "npm:16.3.1"] ], "linkType": "HARD", }] @@ -303,7 +327,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "packageLocation": "./.yarn/cache/@types-express-serve-static-core-npm-4.17.24-cd6b9fd3ba-2f0b471126.zip/node_modules/@types/express-serve-static-core/", "packageDependencies": [ ["@types/express-serve-static-core", "npm:4.17.24"], - ["@types/node", "npm:16.0.3"], + ["@types/node", "npm:16.3.1"], ["@types/qs", "npm:6.9.7"], ["@types/range-parser", "npm:1.2.4"] ], @@ -342,7 +366,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "packageLocation": "./.yarn/cache/@types-keyv-npm-3.1.2-f562027480-769e462ae9.zip/node_modules/@types/keyv/", "packageDependencies": [ ["@types/keyv", "npm:3.1.2"], - ["@types/node", "npm:16.0.3"] + ["@types/node", "npm:16.3.1"] ], "linkType": "HARD", }] @@ -356,6 +380,15 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD", }] ]], + ["@types/module-alias", [ + ["npm:2.0.1", { + "packageLocation": "./.yarn/cache/@types-module-alias-npm-2.0.1-17237ff3bb-c6d6d30605.zip/node_modules/@types/module-alias/", + "packageDependencies": [ + ["@types/module-alias", "npm:2.0.1"] + ], + "linkType": "HARD", + }] + ]], ["@types/node", [ ["npm:14.17.5", { "packageLocation": "./.yarn/cache/@types-node-npm-14.17.5-7c88786ff6-8fba22a8df.zip/node_modules/@types/node/", @@ -364,10 +397,10 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ], "linkType": "HARD", }], - ["npm:16.0.3", { - "packageLocation": "./.yarn/cache/@types-node-npm-16.0.3-e952901743-b91ee69dbc.zip/node_modules/@types/node/", + ["npm:16.3.1", { + "packageLocation": "./.yarn/cache/@types-node-npm-16.3.1-c090cf2395-2a9d69db32.zip/node_modules/@types/node/", "packageDependencies": [ - ["@types/node", "npm:16.0.3"] + ["@types/node", "npm:16.3.1"] ], "linkType": "HARD", }] @@ -395,7 +428,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "packageLocation": "./.yarn/cache/@types-responselike-npm-1.0.0-85dd08af42-e99fc7cc62.zip/node_modules/@types/responselike/", "packageDependencies": [ ["@types/responselike", "npm:1.0.0"], - ["@types/node", "npm:16.0.3"] + ["@types/node", "npm:16.3.1"] ], "linkType": "HARD", }] @@ -406,7 +439,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "packageDependencies": [ ["@types/serve-static", "npm:1.13.10"], ["@types/mime", "npm:1.3.2"], - ["@types/node", "npm:16.0.3"] + ["@types/node", "npm:16.3.1"] ], "linkType": "HARD", }] @@ -425,7 +458,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "packageLocation": "./.yarn/cache/@types-ws-npm-7.4.6-292d5dff7c-500c2f7edc.zip/node_modules/@types/ws/", "packageDependencies": [ ["@types/ws", "npm:7.4.6"], - ["@types/node", "npm:16.0.3"] + ["@types/node", "npm:16.3.1"] ], "linkType": "HARD", }] @@ -549,6 +582,24 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ], "linkType": "SOFT", }], + ["virtual:0b2a98b04801e7c5e352e78c20b3d43b8788e2df7e18f73d547bf7ef07d88839905bfdc80d1bf00f7b250f66198c373e1e2aee2a45b316c6eeb61083f1b50e29#npm:4.28.2", { + "packageLocation": "./.yarn/__virtual__/@typescript-eslint-typescript-estree-virtual-e80cdc72e0/0/cache/@typescript-eslint-typescript-estree-npm-4.28.2-9689f71c15-b098c01cf2.zip/node_modules/@typescript-eslint/typescript-estree/", + "packageDependencies": [ + ["@typescript-eslint/typescript-estree", "virtual:0b2a98b04801e7c5e352e78c20b3d43b8788e2df7e18f73d547bf7ef07d88839905bfdc80d1bf00f7b250f66198c373e1e2aee2a45b316c6eeb61083f1b50e29#npm:4.28.2"], + ["@typescript-eslint/types", "npm:4.28.2"], + ["@typescript-eslint/visitor-keys", "npm:4.28.2"], + ["debug", "virtual:f8b688e6542ef635eefae684748f7db5410cd1803b0f43b02ae3ebd860a79349e9ae07146ce05bdfb5fca9536ad9dbe230ed7f4c2f2ffe26893f1f1b0b8700e7#npm:4.3.2"], + ["globby", "npm:11.0.4"], + ["is-glob", "npm:4.0.1"], + ["semver", "npm:7.3.5"], + ["tsutils", "virtual:e80cdc72e08c6e158b3fe27966e42eeafb0f16e195057b040b6c514670447c80dafe8fc16100d9b2f7bb32fe41bdf1e09babdd886e6cbab55d81f720d133e296#npm:3.21.0"], + ["typescript", "patch:typescript@npm%3A3.9.10#~builtin::version=3.9.10&hash=d8b4e7"] + ], + "packagePeers": [ + "typescript" + ], + "linkType": "HARD", + }], ["virtual:2b2a5f7a2dfd41e59c3d0344a41d4679003ce64226f5555e56df9016cbc42c3e348d8287bc94e2e608e0099ebf28e5e09faad2139c30c85854f2f82cd34213d4#npm:4.28.2", { "packageLocation": "./.yarn/__virtual__/@typescript-eslint-typescript-estree-virtual-c1c1619803/0/cache/@typescript-eslint-typescript-estree-npm-4.28.2-9689f71c15-b098c01cf2.zip/node_modules/@typescript-eslint/typescript-estree/", "packageDependencies": [ @@ -707,6 +758,15 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD", }] ]], + ["app-module-path", [ + ["npm:2.2.0", { + "packageLocation": "./.yarn/cache/app-module-path-npm-2.2.0-71fdc42bce-b52aa49cfa.zip/node_modules/app-module-path/", + "packageDependencies": [ + ["app-module-path", "npm:2.2.0"] + ], + "linkType": "HARD", + }] + ]], ["argparse", [ ["npm:1.0.10", { "packageLocation": "./.yarn/cache/argparse-npm-1.0.10-528934e59d-7ca6e45583.zip/node_modules/argparse/", @@ -726,6 +786,15 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD", }] ]], + ["ast-module-types", [ + ["npm:2.7.1", { + "packageLocation": "./.yarn/cache/ast-module-types-npm-2.7.1-1833572dd9-6238647bcf.zip/node_modules/ast-module-types/", + "packageDependencies": [ + ["ast-module-types", "npm:2.7.1"] + ], + "linkType": "HARD", + }] + ]], ["astral-regex", [ ["npm:2.0.0", { "packageLocation": "./.yarn/cache/astral-regex-npm-2.0.0-f30d866aab-876231688c.zip/node_modules/astral-regex/", @@ -753,6 +822,27 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD", }] ]], + ["base64-js", [ + ["npm:1.5.1", { + "packageLocation": "./.yarn/cache/base64-js-npm-1.5.1-b2f7275641-669632eb37.zip/node_modules/base64-js/", + "packageDependencies": [ + ["base64-js", "npm:1.5.1"] + ], + "linkType": "HARD", + }] + ]], + ["bl", [ + ["npm:4.1.0", { + "packageLocation": "./.yarn/cache/bl-npm-4.1.0-7f94cdcf3f-9e8521fa7e.zip/node_modules/bl/", + "packageDependencies": [ + ["bl", "npm:4.1.0"], + ["buffer", "npm:5.7.1"], + ["inherits", "npm:2.0.4"], + ["readable-stream", "npm:3.6.0"] + ], + "linkType": "HARD", + }] + ]], ["body-parser", [ ["npm:1.19.0", { "packageLocation": "./.yarn/cache/body-parser-npm-1.19.0-6e177cabfa-490231b4c8.zip/node_modules/body-parser/", @@ -793,6 +883,17 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD", }] ]], + ["buffer", [ + ["npm:5.7.1", { + "packageLocation": "./.yarn/cache/buffer-npm-5.7.1-513ef8259e-e2cf8429e1.zip/node_modules/buffer/", + "packageDependencies": [ + ["buffer", "npm:5.7.1"], + ["base64-js", "npm:1.5.1"], + ["ieee754", "npm:1.2.1"] + ], + "linkType": "HARD", + }] + ]], ["buffer-from", [ ["npm:1.1.1", { "packageLocation": "./.yarn/cache/buffer-from-npm-1.1.1-22917b8ed8-ccc53b6973.zip/node_modules/buffer-from/", @@ -820,6 +921,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@types/common-tags", "npm:1.8.1"], ["@types/express", "npm:4.17.13"], ["@types/humanize-duration", "npm:3.25.1"], + ["@types/module-alias", "npm:2.0.1"], ["@types/node", "npm:14.17.5"], ["@types/uuid", "npm:8.3.1"], ["@typescript-eslint/eslint-plugin", "virtual:d7ae587dddcefd495158f5c047acecbca3203324d75e681c7d8657c07f901f74e152f0b39978f7428d3a91daad7b5020c47ece28de69c22fcbd49d04707bf15c#npm:4.28.2"], @@ -827,14 +929,16 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["body-parser", "npm:1.19.0"], ["chalk", "npm:4.1.1"], ["common-tags", "npm:1.8.0"], - ["discord-akairo", "https://github.com/NotEnoughUpdates/discord-akairo.git#commit=58e5a8610d9cb47257cb163a94e284113a39a62b"], + ["discord-akairo", "https://github.com/NotEnoughUpdates/discord-akairo.git#commit=67e935e92f12105f2dfc517bb566d8325c794d8a"], ["discord-api-types", "npm:0.19.0-next.f393ba520d7d6d2aacaca7b3ca5d355fab614f6e"], - ["discord.js", "https://github.com/NotEnoughUpdates/discord.js.git#commit=c71d1042962848d9f644262fa27e6f777cda4d35"], + ["discord.js", "https://github.com/NotEnoughUpdates/discord.js.git#commit=20c84839fa43aad6c47ff6ffb11b34cc785e920b"], ["esbuild", "npm:0.12.15"], ["eslint", "npm:7.30.0"], ["eslint-config-prettier", "virtual:d7ae587dddcefd495158f5c047acecbca3203324d75e681c7d8657c07f901f74e152f0b39978f7428d3a91daad7b5020c47ece28de69c22fcbd49d04707bf15c#npm:8.3.0"], ["got", "npm:11.8.2"], ["humanize-duration", "npm:3.27.0"], + ["madge", "npm:5.0.1"], + ["module-alias", "npm:2.2.2"], ["moment", "npm:2.29.1"], ["pg", "virtual:d7ae587dddcefd495158f5c047acecbca3203324d75e681c7d8657c07f901f74e152f0b39978f7428d3a91daad7b5020c47ece28de69c22fcbd49d04707bf15c#npm:8.6.0"], ["pg-hstore", "npm:2.3.4"], @@ -912,6 +1016,34 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD", }] ]], + ["cli-cursor", [ + ["npm:3.1.0", { + "packageLocation": "./.yarn/cache/cli-cursor-npm-3.1.0-fee1e46b5e-2692784c6c.zip/node_modules/cli-cursor/", + "packageDependencies": [ + ["cli-cursor", "npm:3.1.0"], + ["restore-cursor", "npm:3.1.0"] + ], + "linkType": "HARD", + }] + ]], + ["cli-spinners", [ + ["npm:2.6.0", { + "packageLocation": "./.yarn/cache/cli-spinners-npm-2.6.0-57d233343c-bc5d06af9f.zip/node_modules/cli-spinners/", + "packageDependencies": [ + ["cli-spinners", "npm:2.6.0"] + ], + "linkType": "HARD", + }] + ]], + ["clone", [ + ["npm:1.0.4", { + "packageLocation": "./.yarn/cache/clone-npm-1.0.4-a610fcbcf9-d06418b733.zip/node_modules/clone/", + "packageDependencies": [ + ["clone", "npm:1.0.4"] + ], + "linkType": "HARD", + }] + ]], ["clone-response", [ ["npm:1.0.2", { "packageLocation": "./.yarn/cache/clone-response-npm-1.0.2-135ae8239d-2d0e61547f.zip/node_modules/clone-response/", @@ -956,6 +1088,15 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD", }] ]], + ["colorette", [ + ["npm:1.2.2", { + "packageLocation": "./.yarn/cache/colorette-npm-1.2.2-da75bd0b32-69fec14dda.zip/node_modules/colorette/", + "packageDependencies": [ + ["colorette", "npm:1.2.2"] + ], + "linkType": "HARD", + }] + ]], ["combined-stream", [ ["npm:1.0.8", { "packageLocation": "./.yarn/cache/combined-stream-npm-1.0.8-dc14d4a63a-49fa4aeb49.zip/node_modules/combined-stream/", @@ -966,6 +1107,22 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD", }] ]], + ["commander", [ + ["npm:2.20.3", { + "packageLocation": "./.yarn/cache/commander-npm-2.20.3-d8dcbaa39b-ab8c07884e.zip/node_modules/commander/", + "packageDependencies": [ + ["commander", "npm:2.20.3"] + ], + "linkType": "HARD", + }], + ["npm:7.2.0", { + "packageLocation": "./.yarn/cache/commander-npm-7.2.0-19178180f8-53501cbeee.zip/node_modules/commander/", + "packageDependencies": [ + ["commander", "npm:7.2.0"] + ], + "linkType": "HARD", + }] + ]], ["common-tags", [ ["npm:1.8.0", { "packageLocation": "./.yarn/cache/common-tags-npm-1.8.0-7a31956e16-fb0cc9420d.zip/node_modules/common-tags/", @@ -975,6 +1132,15 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD", }] ]], + ["commondir", [ + ["npm:1.0.1", { + "packageLocation": "./.yarn/cache/commondir-npm-1.0.1-291b790340-59715f2fc4.zip/node_modules/commondir/", + "packageDependencies": [ + ["commondir", "npm:1.0.1"] + ], + "linkType": "HARD", + }] + ]], ["concat-map", [ ["npm:0.0.1", { "packageLocation": "./.yarn/cache/concat-map-npm-0.0.1-85a921b7ee-902a9f5d89.zip/node_modules/concat-map/", @@ -1045,6 +1211,16 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD", }] ]], + ["decomment", [ + ["npm:0.9.4", { + "packageLocation": "./.yarn/cache/decomment-npm-0.9.4-f712939bb5-d883c9563e.zip/node_modules/decomment/", + "packageDependencies": [ + ["decomment", "npm:0.9.4"], + ["esprima", "npm:4.0.1"] + ], + "linkType": "HARD", + }] + ]], ["decompress-response", [ ["npm:6.0.0", { "packageLocation": "./.yarn/cache/decompress-response-npm-6.0.0-359de2878c-d377cf47e0.zip/node_modules/decompress-response/", @@ -1055,6 +1231,15 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD", }] ]], + ["deep-extend", [ + ["npm:0.6.0", { + "packageLocation": "./.yarn/cache/deep-extend-npm-0.6.0-e182924219-7be7e5a8d4.zip/node_modules/deep-extend/", + "packageDependencies": [ + ["deep-extend", "npm:0.6.0"] + ], + "linkType": "HARD", + }] + ]], ["deep-is", [ ["npm:0.1.3", { "packageLocation": "./.yarn/cache/deep-is-npm-0.1.3-0941784645-c15b04c384.zip/node_modules/deep-is/", @@ -1064,6 +1249,16 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD", }] ]], + ["defaults", [ + ["npm:1.0.3", { + "packageLocation": "./.yarn/cache/defaults-npm-1.0.3-e829107b9e-96e2112da6.zip/node_modules/defaults/", + "packageDependencies": [ + ["defaults", "npm:1.0.3"], + ["clone", "npm:1.0.4"] + ], + "linkType": "HARD", + }] + ]], ["defer-to-connect", [ ["npm:2.0.1", { "packageLocation": "./.yarn/cache/defer-to-connect-npm-2.0.1-9005cc8c60-8a9b50d2f2.zip/node_modules/defer-to-connect/", @@ -1091,6 +1286,136 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD", }] ]], + ["dependency-tree", [ + ["npm:8.1.1", { + "packageLocation": "./.yarn/cache/dependency-tree-npm-8.1.1-7adc130185-435e53c5c6.zip/node_modules/dependency-tree/", + "packageDependencies": [ + ["dependency-tree", "npm:8.1.1"], + ["commander", "npm:2.20.3"], + ["debug", "virtual:f8b688e6542ef635eefae684748f7db5410cd1803b0f43b02ae3ebd860a79349e9ae07146ce05bdfb5fca9536ad9dbe230ed7f4c2f2ffe26893f1f1b0b8700e7#npm:4.3.2"], + ["filing-cabinet", "npm:3.0.0"], + ["precinct", "npm:8.1.0"], + ["typescript", "patch:typescript@npm%3A3.9.10#~builtin::version=3.9.10&hash=d8b4e7"] + ], + "linkType": "HARD", + }] + ]], + ["detective-amd", [ + ["npm:3.1.0", { + "packageLocation": "./.yarn/cache/detective-amd-npm-3.1.0-b1b0fa631b-aa3783d587.zip/node_modules/detective-amd/", + "packageDependencies": [ + ["detective-amd", "npm:3.1.0"], + ["ast-module-types", "npm:2.7.1"], + ["escodegen", "npm:2.0.0"], + ["get-amd-module-type", "npm:3.0.0"], + ["node-source-walk", "npm:4.2.0"] + ], + "linkType": "HARD", + }] + ]], + ["detective-cjs", [ + ["npm:3.1.1", { + "packageLocation": "./.yarn/cache/detective-cjs-npm-3.1.1-d60e67b4c2-626aec314f.zip/node_modules/detective-cjs/", + "packageDependencies": [ + ["detective-cjs", "npm:3.1.1"], + ["ast-module-types", "npm:2.7.1"], + ["node-source-walk", "npm:4.2.0"] + ], + "linkType": "HARD", + }] + ]], + ["detective-es6", [ + ["npm:2.2.0", { + "packageLocation": "./.yarn/cache/detective-es6-npm-2.2.0-6f2e8f76b1-5065731a2d.zip/node_modules/detective-es6/", + "packageDependencies": [ + ["detective-es6", "npm:2.2.0"], + ["node-source-walk", "npm:4.2.0"] + ], + "linkType": "HARD", + }] + ]], + ["detective-less", [ + ["npm:1.0.2", { + "packageLocation": "./.yarn/cache/detective-less-npm-1.0.2-51713fb487-858936fbad.zip/node_modules/detective-less/", + "packageDependencies": [ + ["detective-less", "npm:1.0.2"], + ["debug", "virtual:f8b688e6542ef635eefae684748f7db5410cd1803b0f43b02ae3ebd860a79349e9ae07146ce05bdfb5fca9536ad9dbe230ed7f4c2f2ffe26893f1f1b0b8700e7#npm:4.3.2"], + ["gonzales-pe", "npm:4.3.0"], + ["node-source-walk", "npm:4.2.0"] + ], + "linkType": "HARD", + }] + ]], + ["detective-postcss", [ + ["npm:4.0.0", { + "packageLocation": "./.yarn/cache/detective-postcss-npm-4.0.0-3898e15a71-e4c9fed316.zip/node_modules/detective-postcss/", + "packageDependencies": [ + ["detective-postcss", "npm:4.0.0"], + ["debug", "virtual:f8b688e6542ef635eefae684748f7db5410cd1803b0f43b02ae3ebd860a79349e9ae07146ce05bdfb5fca9536ad9dbe230ed7f4c2f2ffe26893f1f1b0b8700e7#npm:4.3.2"], + ["is-url", "npm:1.2.4"], + ["postcss", "npm:8.3.5"], + ["postcss-values-parser", "npm:2.0.1"] + ], + "linkType": "HARD", + }], + ["npm:5.0.0", { + "packageLocation": "./.yarn/cache/detective-postcss-npm-5.0.0-8244b49af7-68e36bbc39.zip/node_modules/detective-postcss/", + "packageDependencies": [ + ["detective-postcss", "npm:5.0.0"], + ["debug", "virtual:f8b688e6542ef635eefae684748f7db5410cd1803b0f43b02ae3ebd860a79349e9ae07146ce05bdfb5fca9536ad9dbe230ed7f4c2f2ffe26893f1f1b0b8700e7#npm:4.3.2"], + ["is-url", "npm:1.2.4"], + ["postcss", "npm:8.3.5"], + ["postcss-values-parser", "virtual:8244b49af75f36ab3bbbb3108f5b6cbb14bde9685c57375a5ac631aa5412460bb10f35c7d7d11e8249793723e99d29770c9d223d8ff83b9be690e7ae8761bba5#npm:5.0.0"] + ], + "linkType": "HARD", + }] + ]], + ["detective-sass", [ + ["npm:3.0.1", { + "packageLocation": "./.yarn/cache/detective-sass-npm-3.0.1-9633e30583-86f76671d9.zip/node_modules/detective-sass/", + "packageDependencies": [ + ["detective-sass", "npm:3.0.1"], + ["debug", "virtual:f8b688e6542ef635eefae684748f7db5410cd1803b0f43b02ae3ebd860a79349e9ae07146ce05bdfb5fca9536ad9dbe230ed7f4c2f2ffe26893f1f1b0b8700e7#npm:4.3.2"], + ["gonzales-pe", "npm:4.3.0"], + ["node-source-walk", "npm:4.2.0"] + ], + "linkType": "HARD", + }] + ]], + ["detective-scss", [ + ["npm:2.0.1", { + "packageLocation": "./.yarn/cache/detective-scss-npm-2.0.1-062d87fc43-e130745b4a.zip/node_modules/detective-scss/", + "packageDependencies": [ + ["detective-scss", "npm:2.0.1"], + ["debug", "virtual:f8b688e6542ef635eefae684748f7db5410cd1803b0f43b02ae3ebd860a79349e9ae07146ce05bdfb5fca9536ad9dbe230ed7f4c2f2ffe26893f1f1b0b8700e7#npm:4.3.2"], + ["gonzales-pe", "npm:4.3.0"], + ["node-source-walk", "npm:4.2.0"] + ], + "linkType": "HARD", + }] + ]], + ["detective-stylus", [ + ["npm:1.0.0", { + "packageLocation": "./.yarn/cache/detective-stylus-npm-1.0.0-ea4d9b6a87-e9c74c9763.zip/node_modules/detective-stylus/", + "packageDependencies": [ + ["detective-stylus", "npm:1.0.0"] + ], + "linkType": "HARD", + }] + ]], + ["detective-typescript", [ + ["npm:7.0.0", { + "packageLocation": "./.yarn/cache/detective-typescript-npm-7.0.0-0b2a98b048-fc92e20e7b.zip/node_modules/detective-typescript/", + "packageDependencies": [ + ["detective-typescript", "npm:7.0.0"], + ["@typescript-eslint/typescript-estree", "virtual:0b2a98b04801e7c5e352e78c20b3d43b8788e2df7e18f73d547bf7ef07d88839905bfdc80d1bf00f7b250f66198c373e1e2aee2a45b316c6eeb61083f1b50e29#npm:4.28.2"], + ["ast-module-types", "npm:2.7.1"], + ["node-source-walk", "npm:4.2.0"], + ["typescript", "patch:typescript@npm%3A3.9.10#~builtin::version=3.9.10&hash=d8b4e7"] + ], + "linkType": "HARD", + }] + ]], ["dir-glob", [ ["npm:3.0.1", { "packageLocation": "./.yarn/cache/dir-glob-npm-3.0.1-1aea628b1b-fa05e18324.zip/node_modules/dir-glob/", @@ -1102,10 +1427,10 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }] ]], ["discord-akairo", [ - ["https://github.com/NotEnoughUpdates/discord-akairo.git#commit=58e5a8610d9cb47257cb163a94e284113a39a62b", { - "packageLocation": "./.yarn/unplugged/discord-akairo-https-10183ac4c6/node_modules/discord-akairo/", + ["https://github.com/NotEnoughUpdates/discord-akairo.git#commit=67e935e92f12105f2dfc517bb566d8325c794d8a", { + "packageLocation": "./.yarn/unplugged/discord-akairo-https-5d1cbe7c33/node_modules/discord-akairo/", "packageDependencies": [ - ["discord-akairo", "https://github.com/NotEnoughUpdates/discord-akairo.git#commit=58e5a8610d9cb47257cb163a94e284113a39a62b"] + ["discord-akairo", "https://github.com/NotEnoughUpdates/discord-akairo.git#commit=67e935e92f12105f2dfc517bb566d8325c794d8a"] ], "linkType": "HARD", }] @@ -1127,10 +1452,10 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }] ]], ["discord.js", [ - ["https://github.com/NotEnoughUpdates/discord.js.git#commit=c71d1042962848d9f644262fa27e6f777cda4d35", { - "packageLocation": "./.yarn/cache/discord.js-https-cb3a4c165c-c5767e602e.zip/node_modules/discord.js/", + ["https://github.com/NotEnoughUpdates/discord.js.git#commit=20c84839fa43aad6c47ff6ffb11b34cc785e920b", { + "packageLocation": "./.yarn/cache/discord.js-https-5f1ff7cab7-1d6f87e67f.zip/node_modules/discord.js/", "packageDependencies": [ - ["discord.js", "https://github.com/NotEnoughUpdates/discord.js.git#commit=c71d1042962848d9f644262fa27e6f777cda4d35"], + ["discord.js", "https://github.com/NotEnoughUpdates/discord.js.git#commit=20c84839fa43aad6c47ff6ffb11b34cc785e920b"], ["@discordjs/builders", "npm:0.2.0"], ["@discordjs/collection", "npm:0.1.6"], ["@discordjs/form-data", "npm:3.0.1"], @@ -1139,7 +1464,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["abort-controller", "npm:3.0.0"], ["discord-api-types", "npm:0.19.0-next.f393ba520d7d6d2aacaca7b3ca5d355fab614f6e"], ["node-fetch", "npm:2.6.1"], - ["ws", "virtual:275bceca0f79f8e7aeb7f77acb5a6bd201e7eea264e9dfd8dcc0bcf35691357327303c09557dfc1495b9a1f8e9cf8278133d234783570df6cb70a249778f3198#npm:7.5.2"] + ["ws", "virtual:275bceca0f79f8e7aeb7f77acb5a6bd201e7eea264e9dfd8dcc0bcf35691357327303c09557dfc1495b9a1f8e9cf8278133d234783570df6cb70a249778f3198#npm:7.5.3"] ], "linkType": "HARD", }] @@ -1191,6 +1516,17 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD", }] ]], + ["enhanced-resolve", [ + ["npm:5.8.2", { + "packageLocation": "./.yarn/cache/enhanced-resolve-npm-5.8.2-b25228f39b-6e871ec5b1.zip/node_modules/enhanced-resolve/", + "packageDependencies": [ + ["enhanced-resolve", "npm:5.8.2"], + ["graceful-fs", "npm:4.2.6"], + ["tapable", "npm:2.2.0"] + ], + "linkType": "HARD", + }] + ]], ["enquirer", [ ["npm:2.3.6", { "packageLocation": "./.yarn/cache/enquirer-npm-2.3.6-7899175762-1c0911e14a.zip/node_modules/enquirer/", @@ -1226,6 +1562,20 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD", }] ]], + ["escodegen", [ + ["npm:2.0.0", { + "packageLocation": "./.yarn/cache/escodegen-npm-2.0.0-6450b02925-5aa6b2966f.zip/node_modules/escodegen/", + "packageDependencies": [ + ["escodegen", "npm:2.0.0"], + ["esprima", "npm:4.0.1"], + ["estraverse", "npm:5.2.0"], + ["esutils", "npm:2.0.3"], + ["optionator", "npm:0.8.3"], + ["source-map", "npm:0.6.1"] + ], + "linkType": "HARD", + }] + ]], ["eslint", [ ["npm:7.30.0", { "packageLocation": "./.yarn/cache/eslint-npm-7.30.0-8a8a06f9b4-872f90844b.zip/node_modules/eslint/", @@ -1491,6 +1841,28 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD", }] ]], + ["filing-cabinet", [ + ["npm:3.0.0", { + "packageLocation": "./.yarn/cache/filing-cabinet-npm-3.0.0-2698fa309a-509ffa5a51.zip/node_modules/filing-cabinet/", + "packageDependencies": [ + ["filing-cabinet", "npm:3.0.0"], + ["app-module-path", "npm:2.2.0"], + ["commander", "npm:2.20.3"], + ["debug", "virtual:f8b688e6542ef635eefae684748f7db5410cd1803b0f43b02ae3ebd860a79349e9ae07146ce05bdfb5fca9536ad9dbe230ed7f4c2f2ffe26893f1f1b0b8700e7#npm:4.3.2"], + ["decomment", "npm:0.9.4"], + ["enhanced-resolve", "npm:5.8.2"], + ["is-relative-path", "npm:1.0.2"], + ["module-definition", "npm:3.3.1"], + ["module-lookup-amd", "npm:7.0.1"], + ["resolve", "patch:resolve@npm%3A1.20.0#~builtin::version=1.20.0&hash=00b1ff"], + ["resolve-dependency-path", "npm:2.0.0"], + ["sass-lookup", "npm:3.0.0"], + ["stylus-lookup", "npm:3.0.2"], + ["typescript", "patch:typescript@npm%3A3.9.10#~builtin::version=3.9.10&hash=d8b4e7"] + ], + "linkType": "HARD", + }] + ]], ["fill-range", [ ["npm:7.0.1", { "packageLocation": "./.yarn/cache/fill-range-npm-7.0.1-b8b1817caa-cc283f4e65.zip/node_modules/fill-range/", @@ -1521,6 +1893,15 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD", }] ]], + ["flatten", [ + ["npm:1.0.3", { + "packageLocation": "./.yarn/cache/flatten-npm-1.0.3-87bf6559dd-5c57379816.zip/node_modules/flatten/", + "packageDependencies": [ + ["flatten", "npm:1.0.3"] + ], + "linkType": "HARD", + }] + ]], ["fs.realpath", [ ["npm:1.0.0", { "packageLocation": "./.yarn/cache/fs.realpath-npm-1.0.0-c8f05d8126-99ddea01a7.zip/node_modules/fs.realpath/", @@ -1530,6 +1911,15 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD", }] ]], + ["function-bind", [ + ["npm:1.1.1", { + "packageLocation": "./.yarn/cache/function-bind-npm-1.1.1-b56b322ae9-b32fbaebb3.zip/node_modules/function-bind/", + "packageDependencies": [ + ["function-bind", "npm:1.1.1"] + ], + "linkType": "HARD", + }] + ]], ["functional-red-black-tree", [ ["npm:1.0.1", { "packageLocation": "./.yarn/cache/functional-red-black-tree-npm-1.0.1-ccfe924dcd-ca6c170f37.zip/node_modules/functional-red-black-tree/", @@ -1539,6 +1929,26 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD", }] ]], + ["get-amd-module-type", [ + ["npm:3.0.0", { + "packageLocation": "./.yarn/cache/get-amd-module-type-npm-3.0.0-2fcd610976-a2df61d329.zip/node_modules/get-amd-module-type/", + "packageDependencies": [ + ["get-amd-module-type", "npm:3.0.0"], + ["ast-module-types", "npm:2.7.1"], + ["node-source-walk", "npm:4.2.0"] + ], + "linkType": "HARD", + }] + ]], + ["get-own-enumerable-property-symbols", [ + ["npm:3.0.2", { + "packageLocation": "./.yarn/cache/get-own-enumerable-property-symbols-npm-3.0.2-f143f9e8d3-8f0331f141.zip/node_modules/get-own-enumerable-property-symbols/", + "packageDependencies": [ + ["get-own-enumerable-property-symbols", "npm:3.0.2"] + ], + "linkType": "HARD", + }] + ]], ["get-stream", [ ["npm:5.2.0", { "packageLocation": "./.yarn/cache/get-stream-npm-5.2.0-2cfd3b452b-8bc1a23174.zip/node_modules/get-stream/", @@ -1599,6 +2009,16 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD", }] ]], + ["gonzales-pe", [ + ["npm:4.3.0", { + "packageLocation": "./.yarn/cache/gonzales-pe-npm-4.3.0-82921c6976-49d60fc49a.zip/node_modules/gonzales-pe/", + "packageDependencies": [ + ["gonzales-pe", "npm:4.3.0"], + ["minimist", "npm:1.2.5"] + ], + "linkType": "HARD", + }] + ]], ["got", [ ["npm:11.8.2", { "packageLocation": "./.yarn/cache/got-npm-11.8.2-c1eb105458-41ad7bf74f.zip/node_modules/got/", @@ -1619,6 +2039,35 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD", }] ]], + ["graceful-fs", [ + ["npm:4.2.6", { + "packageLocation": "./.yarn/cache/graceful-fs-npm-4.2.6-535b2234f1-792e64aafd.zip/node_modules/graceful-fs/", + "packageDependencies": [ + ["graceful-fs", "npm:4.2.6"] + ], + "linkType": "HARD", + }] + ]], + ["graphviz", [ + ["npm:0.0.9", { + "packageLocation": "./.yarn/cache/graphviz-npm-0.0.9-33eecd7ed1-fb414f8976.zip/node_modules/graphviz/", + "packageDependencies": [ + ["graphviz", "npm:0.0.9"], + ["temp", "npm:0.4.0"] + ], + "linkType": "HARD", + }] + ]], + ["has", [ + ["npm:1.0.3", { + "packageLocation": "./.yarn/cache/has-npm-1.0.3-b7f00631c1-b9ad53d53b.zip/node_modules/has/", + "packageDependencies": [ + ["has", "npm:1.0.3"], + ["function-bind", "npm:1.1.1"] + ], + "linkType": "HARD", + }] + ]], ["has-flag", [ ["npm:3.0.0", { "packageLocation": "./.yarn/cache/has-flag-npm-3.0.0-16ac11fe05-4a15638b45.zip/node_modules/has-flag/", @@ -1688,11 +2137,20 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD", }] ]], - ["ignore", [ - ["npm:4.0.6", { - "packageLocation": "./.yarn/cache/ignore-npm-4.0.6-66c0d6543e-248f82e50a.zip/node_modules/ignore/", + ["ieee754", [ + ["npm:1.2.1", { + "packageLocation": "./.yarn/cache/ieee754-npm-1.2.1-fb63b3caeb-5144c0c981.zip/node_modules/ieee754/", "packageDependencies": [ - ["ignore", "npm:4.0.6"] + ["ieee754", "npm:1.2.1"] + ], + "linkType": "HARD", + }] + ]], + ["ignore", [ + ["npm:4.0.6", { + "packageLocation": "./.yarn/cache/ignore-npm-4.0.6-66c0d6543e-248f82e50a.zip/node_modules/ignore/", + "packageDependencies": [ + ["ignore", "npm:4.0.6"] ], "linkType": "HARD", }], @@ -1724,6 +2182,15 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD", }] ]], + ["indexes-of", [ + ["npm:1.0.1", { + "packageLocation": "./.yarn/cache/indexes-of-npm-1.0.1-5ce8500941-4f9799b173.zip/node_modules/indexes-of/", + "packageDependencies": [ + ["indexes-of", "npm:1.0.1"] + ], + "linkType": "HARD", + }] + ]], ["inflection", [ ["npm:1.13.1", { "packageLocation": "./.yarn/cache/inflection-npm-1.13.1-aa8a2a81df-0ae265f710.zip/node_modules/inflection/", @@ -1760,6 +2227,25 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD", }] ]], + ["ini", [ + ["npm:1.3.8", { + "packageLocation": "./.yarn/cache/ini-npm-1.3.8-fb5040b4c0-dfd98b0ca3.zip/node_modules/ini/", + "packageDependencies": [ + ["ini", "npm:1.3.8"] + ], + "linkType": "HARD", + }] + ]], + ["is-core-module", [ + ["npm:2.4.0", { + "packageLocation": "./.yarn/cache/is-core-module-npm-2.4.0-bae19c65cd-c498902d4c.zip/node_modules/is-core-module/", + "packageDependencies": [ + ["is-core-module", "npm:2.4.0"], + ["has", "npm:1.0.3"] + ], + "linkType": "HARD", + }] + ]], ["is-extglob", [ ["npm:2.1.1", { "packageLocation": "./.yarn/cache/is-extglob-npm-2.1.1-0870ea68b5-df033653d0.zip/node_modules/is-extglob/", @@ -1788,6 +2274,15 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD", }] ]], + ["is-interactive", [ + ["npm:1.0.0", { + "packageLocation": "./.yarn/cache/is-interactive-npm-1.0.0-7ff7c6e04a-824808776e.zip/node_modules/is-interactive/", + "packageDependencies": [ + ["is-interactive", "npm:1.0.0"] + ], + "linkType": "HARD", + }] + ]], ["is-number", [ ["npm:7.0.0", { "packageLocation": "./.yarn/cache/is-number-npm-7.0.0-060086935c-456ac6f8e0.zip/node_modules/is-number/", @@ -1797,6 +2292,60 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD", }] ]], + ["is-obj", [ + ["npm:1.0.1", { + "packageLocation": "./.yarn/cache/is-obj-npm-1.0.1-7d391539d7-3ccf0efdea.zip/node_modules/is-obj/", + "packageDependencies": [ + ["is-obj", "npm:1.0.1"] + ], + "linkType": "HARD", + }] + ]], + ["is-regexp", [ + ["npm:1.0.0", { + "packageLocation": "./.yarn/cache/is-regexp-npm-1.0.0-8f95f51a0c-be692828e2.zip/node_modules/is-regexp/", + "packageDependencies": [ + ["is-regexp", "npm:1.0.0"] + ], + "linkType": "HARD", + }] + ]], + ["is-relative-path", [ + ["npm:1.0.2", { + "packageLocation": "./.yarn/cache/is-relative-path-npm-1.0.2-920be97603-6c2ccffd3c.zip/node_modules/is-relative-path/", + "packageDependencies": [ + ["is-relative-path", "npm:1.0.2"] + ], + "linkType": "HARD", + }] + ]], + ["is-unicode-supported", [ + ["npm:0.1.0", { + "packageLocation": "./.yarn/cache/is-unicode-supported-npm-0.1.0-0833e1bbfb-a2aab86ee7.zip/node_modules/is-unicode-supported/", + "packageDependencies": [ + ["is-unicode-supported", "npm:0.1.0"] + ], + "linkType": "HARD", + }] + ]], + ["is-url", [ + ["npm:1.2.4", { + "packageLocation": "./.yarn/cache/is-url-npm-1.2.4-0a28aeb560-100e74b3b1.zip/node_modules/is-url/", + "packageDependencies": [ + ["is-url", "npm:1.2.4"] + ], + "linkType": "HARD", + }] + ]], + ["is-url-superb", [ + ["npm:4.0.0", { + "packageLocation": "./.yarn/cache/is-url-superb-npm-4.0.0-71f6df9bc1-fd55e91c96.zip/node_modules/is-url-superb/", + "packageDependencies": [ + ["is-url-superb", "npm:4.0.0"] + ], + "linkType": "HARD", + }] + ]], ["isexe", [ ["npm:2.0.0", { "packageLocation": "./.yarn/cache/isexe-npm-2.0.0-b58870bd2e-26bf6c5480.zip/node_modules/isexe/", @@ -1871,6 +2420,15 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }] ]], ["levn", [ + ["npm:0.3.0", { + "packageLocation": "./.yarn/cache/levn-npm-0.3.0-48d774b1c2-0d084a5242.zip/node_modules/levn/", + "packageDependencies": [ + ["levn", "npm:0.3.0"], + ["prelude-ls", "npm:1.1.2"], + ["type-check", "npm:0.3.2"] + ], + "linkType": "HARD", + }], ["npm:0.4.1", { "packageLocation": "./.yarn/cache/levn-npm-0.4.1-d183b2d7bb-12c5021c85.zip/node_modules/levn/", "packageDependencies": [ @@ -1917,6 +2475,17 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD", }] ]], + ["log-symbols", [ + ["npm:4.1.0", { + "packageLocation": "./.yarn/cache/log-symbols-npm-4.1.0-0a13492d8b-fce1497b31.zip/node_modules/log-symbols/", + "packageDependencies": [ + ["log-symbols", "npm:4.1.0"], + ["chalk", "npm:4.1.1"], + ["is-unicode-supported", "npm:0.1.0"] + ], + "linkType": "HARD", + }] + ]], ["lowercase-keys", [ ["npm:2.0.0", { "packageLocation": "./.yarn/cache/lowercase-keys-npm-2.0.0-1876065a32-24d7ebd56c.zip/node_modules/lowercase-keys/", @@ -1936,6 +2505,37 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD", }] ]], + ["madge", [ + ["npm:5.0.1", { + "packageLocation": "./.yarn/cache/madge-npm-5.0.1-9f3b536039-821db88fdc.zip/node_modules/madge/", + "packageDependencies": [ + ["madge", "npm:5.0.1"], + ["chalk", "npm:4.1.1"], + ["commander", "npm:7.2.0"], + ["commondir", "npm:1.0.1"], + ["debug", "virtual:f8b688e6542ef635eefae684748f7db5410cd1803b0f43b02ae3ebd860a79349e9ae07146ce05bdfb5fca9536ad9dbe230ed7f4c2f2ffe26893f1f1b0b8700e7#npm:4.3.2"], + ["dependency-tree", "npm:8.1.1"], + ["detective-amd", "npm:3.1.0"], + ["detective-cjs", "npm:3.1.1"], + ["detective-es6", "npm:2.2.0"], + ["detective-less", "npm:1.0.2"], + ["detective-postcss", "npm:5.0.0"], + ["detective-sass", "npm:3.0.1"], + ["detective-scss", "npm:2.0.1"], + ["detective-stylus", "npm:1.0.0"], + ["detective-typescript", "npm:7.0.0"], + ["graphviz", "npm:0.0.9"], + ["ora", "npm:5.4.1"], + ["pluralize", "npm:8.0.0"], + ["precinct", "npm:8.1.0"], + ["pretty-ms", "npm:7.0.1"], + ["rc", "npm:1.2.8"], + ["typescript", "patch:typescript@npm%3A3.9.10#~builtin::version=3.9.10&hash=d8b4e7"], + ["walkdir", "npm:0.4.1"] + ], + "linkType": "HARD", + }] + ]], ["media-typer", [ ["npm:0.3.0", { "packageLocation": "./.yarn/cache/media-typer-npm-0.3.0-8674f8f0f5-af1b38516c.zip/node_modules/media-typer/", @@ -1984,6 +2584,15 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD", }] ]], + ["mimic-fn", [ + ["npm:2.1.0", { + "packageLocation": "./.yarn/cache/mimic-fn-npm-2.1.0-4fbeb3abb4-d2421a3444.zip/node_modules/mimic-fn/", + "packageDependencies": [ + ["mimic-fn", "npm:2.1.0"] + ], + "linkType": "HARD", + }] + ]], ["mimic-response", [ ["npm:1.0.1", { "packageLocation": "./.yarn/cache/mimic-response-npm-1.0.1-f6f85dde84-034c78753b.zip/node_modules/mimic-response/", @@ -2010,6 +2619,49 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD", }] ]], + ["minimist", [ + ["npm:1.2.5", { + "packageLocation": "./.yarn/cache/minimist-npm-1.2.5-ced0e1f617-86706ce5b3.zip/node_modules/minimist/", + "packageDependencies": [ + ["minimist", "npm:1.2.5"] + ], + "linkType": "HARD", + }] + ]], + ["module-alias", [ + ["npm:2.2.2", { + "packageLocation": "./.yarn/cache/module-alias-npm-2.2.2-576bd37c03-4b5543f834.zip/node_modules/module-alias/", + "packageDependencies": [ + ["module-alias", "npm:2.2.2"] + ], + "linkType": "HARD", + }] + ]], + ["module-definition", [ + ["npm:3.3.1", { + "packageLocation": "./.yarn/cache/module-definition-npm-3.3.1-16753154b4-f1c0587983.zip/node_modules/module-definition/", + "packageDependencies": [ + ["module-definition", "npm:3.3.1"], + ["ast-module-types", "npm:2.7.1"], + ["node-source-walk", "npm:4.2.0"] + ], + "linkType": "HARD", + }] + ]], + ["module-lookup-amd", [ + ["npm:7.0.1", { + "packageLocation": "./.yarn/cache/module-lookup-amd-npm-7.0.1-83d0a3e93f-911abd6b8f.zip/node_modules/module-lookup-amd/", + "packageDependencies": [ + ["module-lookup-amd", "npm:7.0.1"], + ["commander", "npm:2.20.3"], + ["debug", "virtual:f8b688e6542ef635eefae684748f7db5410cd1803b0f43b02ae3ebd860a79349e9ae07146ce05bdfb5fca9536ad9dbe230ed7f4c2f2ffe26893f1f1b0b8700e7#npm:4.3.2"], + ["glob", "npm:7.1.7"], + ["requirejs", "npm:2.3.6"], + ["requirejs-config-file", "npm:4.0.0"] + ], + "linkType": "HARD", + }] + ]], ["moment", [ ["npm:2.29.1", { "packageLocation": "./.yarn/cache/moment-npm-2.29.1-787d9fdafd-1e14d5f422.zip/node_modules/moment/", @@ -2045,6 +2697,15 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD", }] ]], + ["nanoid", [ + ["npm:3.1.23", { + "packageLocation": "./.yarn/cache/nanoid-npm-3.1.23-5f6acb650d-8fa8dc3283.zip/node_modules/nanoid/", + "packageDependencies": [ + ["nanoid", "npm:3.1.23"] + ], + "linkType": "HARD", + }] + ]], ["natural-compare", [ ["npm:1.4.0", { "packageLocation": "./.yarn/cache/natural-compare-npm-1.4.0-97b75b362d-23ad088b08.zip/node_modules/natural-compare/", @@ -2063,6 +2724,16 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD", }] ]], + ["node-source-walk", [ + ["npm:4.2.0", { + "packageLocation": "./.yarn/cache/node-source-walk-npm-4.2.0-aa0230f616-995979cdd3.zip/node_modules/node-source-walk/", + "packageDependencies": [ + ["node-source-walk", "npm:4.2.0"], + ["@babel/parser", "npm:7.14.7"] + ], + "linkType": "HARD", + }] + ]], ["normalize-url", [ ["npm:6.1.0", { "packageLocation": "./.yarn/cache/normalize-url-npm-6.1.0-b95bc12ece-4a49446311.zip/node_modules/normalize-url/", @@ -2092,7 +2763,30 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD", }] ]], + ["onetime", [ + ["npm:5.1.2", { + "packageLocation": "./.yarn/cache/onetime-npm-5.1.2-3ed148fa42-2478859ef8.zip/node_modules/onetime/", + "packageDependencies": [ + ["onetime", "npm:5.1.2"], + ["mimic-fn", "npm:2.1.0"] + ], + "linkType": "HARD", + }] + ]], ["optionator", [ + ["npm:0.8.3", { + "packageLocation": "./.yarn/cache/optionator-npm-0.8.3-bc555bc5b7-b8695ddf3d.zip/node_modules/optionator/", + "packageDependencies": [ + ["optionator", "npm:0.8.3"], + ["deep-is", "npm:0.1.3"], + ["fast-levenshtein", "npm:2.0.6"], + ["levn", "npm:0.3.0"], + ["prelude-ls", "npm:1.1.2"], + ["type-check", "npm:0.3.2"], + ["word-wrap", "npm:1.2.3"] + ], + "linkType": "HARD", + }], ["npm:0.9.1", { "packageLocation": "./.yarn/cache/optionator-npm-0.9.1-577e397aae-dbc6fa0656.zip/node_modules/optionator/", "packageDependencies": [ @@ -2107,6 +2801,24 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD", }] ]], + ["ora", [ + ["npm:5.4.1", { + "packageLocation": "./.yarn/cache/ora-npm-5.4.1-4f0343adb7-28d476ee6c.zip/node_modules/ora/", + "packageDependencies": [ + ["ora", "npm:5.4.1"], + ["bl", "npm:4.1.0"], + ["chalk", "npm:4.1.1"], + ["cli-cursor", "npm:3.1.0"], + ["cli-spinners", "npm:2.6.0"], + ["is-interactive", "npm:1.0.0"], + ["is-unicode-supported", "npm:0.1.0"], + ["log-symbols", "npm:4.1.0"], + ["strip-ansi", "npm:6.0.0"], + ["wcwidth", "npm:1.0.1"] + ], + "linkType": "HARD", + }] + ]], ["p-cancelable", [ ["npm:2.1.1", { "packageLocation": "./.yarn/cache/p-cancelable-npm-2.1.1-9388305f02-3dba12b4fb.zip/node_modules/p-cancelable/", @@ -2135,6 +2847,15 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD", }] ]], + ["parse-ms", [ + ["npm:2.1.0", { + "packageLocation": "./.yarn/cache/parse-ms-npm-2.1.0-de852c39bb-d5c66c76cc.zip/node_modules/parse-ms/", + "packageDependencies": [ + ["parse-ms", "npm:2.1.0"] + ], + "linkType": "HARD", + }] + ]], ["path-is-absolute", [ ["npm:1.0.1", { "packageLocation": "./.yarn/cache/path-is-absolute-npm-1.0.1-31bc695ffd-060840f92c.zip/node_modules/path-is-absolute/", @@ -2153,6 +2874,15 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD", }] ]], + ["path-parse", [ + ["npm:1.0.7", { + "packageLocation": "./.yarn/cache/path-parse-npm-1.0.7-09564527b7-49abf3d811.zip/node_modules/path-parse/", + "packageDependencies": [ + ["path-parse", "npm:1.0.7"] + ], + "linkType": "HARD", + }] + ]], ["path-type", [ ["npm:4.0.0", { "packageLocation": "./.yarn/cache/path-type-npm-4.0.0-10d47fc86a-5b1e2daa24.zip/node_modules/path-type/", @@ -2283,6 +3013,62 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD", }] ]], + ["pluralize", [ + ["npm:8.0.0", { + "packageLocation": "./.yarn/cache/pluralize-npm-8.0.0-f5f044ed52-08931d4a6a.zip/node_modules/pluralize/", + "packageDependencies": [ + ["pluralize", "npm:8.0.0"] + ], + "linkType": "HARD", + }] + ]], + ["postcss", [ + ["npm:8.3.5", { + "packageLocation": "./.yarn/cache/postcss-npm-8.3.5-2a354f6bd3-c73fc4825e.zip/node_modules/postcss/", + "packageDependencies": [ + ["postcss", "npm:8.3.5"], + ["colorette", "npm:1.2.2"], + ["nanoid", "npm:3.1.23"], + ["source-map-js", "npm:0.6.2"] + ], + "linkType": "HARD", + }] + ]], + ["postcss-values-parser", [ + ["npm:2.0.1", { + "packageLocation": "./.yarn/cache/postcss-values-parser-npm-2.0.1-b7d7dda30d-0508778809.zip/node_modules/postcss-values-parser/", + "packageDependencies": [ + ["postcss-values-parser", "npm:2.0.1"], + ["flatten", "npm:1.0.3"], + ["indexes-of", "npm:1.0.1"], + ["uniq", "npm:1.0.1"] + ], + "linkType": "HARD", + }], + ["npm:5.0.0", { + "packageLocation": "./.yarn/cache/postcss-values-parser-npm-5.0.0-7185aec6fd-d45bde8606.zip/node_modules/postcss-values-parser/", + "packageDependencies": [ + ["postcss-values-parser", "npm:5.0.0"] + ], + "linkType": "SOFT", + }], + ["virtual:8244b49af75f36ab3bbbb3108f5b6cbb14bde9685c57375a5ac631aa5412460bb10f35c7d7d11e8249793723e99d29770c9d223d8ff83b9be690e7ae8761bba5#npm:5.0.0", { + "packageLocation": "./.yarn/__virtual__/postcss-values-parser-virtual-6fa64ca72d/0/cache/postcss-values-parser-npm-5.0.0-7185aec6fd-d45bde8606.zip/node_modules/postcss-values-parser/", + "packageDependencies": [ + ["postcss-values-parser", "virtual:8244b49af75f36ab3bbbb3108f5b6cbb14bde9685c57375a5ac631aa5412460bb10f35c7d7d11e8249793723e99d29770c9d223d8ff83b9be690e7ae8761bba5#npm:5.0.0"], + ["@types/postcss", null], + ["color-name", "npm:1.1.4"], + ["is-url-superb", "npm:4.0.0"], + ["postcss", "npm:8.3.5"], + ["quote-unquote", "npm:1.0.0"] + ], + "packagePeers": [ + "@types/postcss", + "postcss" + ], + "linkType": "HARD", + }] + ]], ["postgres-array", [ ["npm:2.0.0", { "packageLocation": "./.yarn/cache/postgres-array-npm-2.0.0-4f49dc1389-0e1e659888.zip/node_modules/postgres-array/", @@ -2320,7 +3106,36 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD", }] ]], + ["precinct", [ + ["npm:8.1.0", { + "packageLocation": "./.yarn/cache/precinct-npm-8.1.0-bd85b73fc8-0b5667f55a.zip/node_modules/precinct/", + "packageDependencies": [ + ["precinct", "npm:8.1.0"], + ["commander", "npm:2.20.3"], + ["debug", "virtual:f8b688e6542ef635eefae684748f7db5410cd1803b0f43b02ae3ebd860a79349e9ae07146ce05bdfb5fca9536ad9dbe230ed7f4c2f2ffe26893f1f1b0b8700e7#npm:4.3.2"], + ["detective-amd", "npm:3.1.0"], + ["detective-cjs", "npm:3.1.1"], + ["detective-es6", "npm:2.2.0"], + ["detective-less", "npm:1.0.2"], + ["detective-postcss", "npm:4.0.0"], + ["detective-sass", "npm:3.0.1"], + ["detective-scss", "npm:2.0.1"], + ["detective-stylus", "npm:1.0.0"], + ["detective-typescript", "npm:7.0.0"], + ["module-definition", "npm:3.3.1"], + ["node-source-walk", "npm:4.2.0"] + ], + "linkType": "HARD", + }] + ]], ["prelude-ls", [ + ["npm:1.1.2", { + "packageLocation": "./.yarn/cache/prelude-ls-npm-1.1.2-a0daac0886-c4867c8748.zip/node_modules/prelude-ls/", + "packageDependencies": [ + ["prelude-ls", "npm:1.1.2"] + ], + "linkType": "HARD", + }], ["npm:1.2.1", { "packageLocation": "./.yarn/cache/prelude-ls-npm-1.2.1-3e4d272a55-cd192ec0d0.zip/node_modules/prelude-ls/", "packageDependencies": [ @@ -2338,6 +3153,16 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD", }] ]], + ["pretty-ms", [ + ["npm:7.0.1", { + "packageLocation": "./.yarn/cache/pretty-ms-npm-7.0.1-d748cac064-d76c492028.zip/node_modules/pretty-ms/", + "packageDependencies": [ + ["pretty-ms", "npm:7.0.1"], + ["parse-ms", "npm:2.1.0"] + ], + "linkType": "HARD", + }] + ]], ["prism-media", [ ["npm:1.3.1", { "packageLocation": "./.yarn/cache/prism-media-npm-1.3.1-67bb6ad0fd-26f89b3ff9.zip/node_modules/prism-media/", @@ -2428,6 +3253,15 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD", }] ]], + ["quote-unquote", [ + ["npm:1.0.0", { + "packageLocation": "./.yarn/cache/quote-unquote-npm-1.0.0-5aa1091ab3-955a2ead53.zip/node_modules/quote-unquote/", + "packageDependencies": [ + ["quote-unquote", "npm:1.0.0"] + ], + "linkType": "HARD", + }] + ]], ["raw-body", [ ["npm:2.4.0", { "packageLocation": "./.yarn/cache/raw-body-npm-2.4.0-14d9d633af-6343906939.zip/node_modules/raw-body/", @@ -2441,6 +3275,19 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD", }] ]], + ["rc", [ + ["npm:1.2.8", { + "packageLocation": "./.yarn/cache/rc-npm-1.2.8-d6768ac936-2e26e052f8.zip/node_modules/rc/", + "packageDependencies": [ + ["rc", "npm:1.2.8"], + ["deep-extend", "npm:0.6.0"], + ["ini", "npm:1.3.8"], + ["minimist", "npm:1.2.5"], + ["strip-json-comments", "npm:2.0.1"] + ], + "linkType": "HARD", + }] + ]], ["readable-stream", [ ["npm:3.6.0", { "packageLocation": "./.yarn/cache/readable-stream-npm-3.6.0-23a4a5eb56-d4ea81502d.zip/node_modules/readable-stream/", @@ -2471,6 +3318,37 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD", }] ]], + ["requirejs", [ + ["npm:2.3.6", { + "packageLocation": "./.yarn/cache/requirejs-npm-2.3.6-cda05b5f88-7c3c006bf5.zip/node_modules/requirejs/", + "packageDependencies": [ + ["requirejs", "npm:2.3.6"] + ], + "linkType": "HARD", + }] + ]], + ["requirejs-config-file", [ + ["npm:4.0.0", { + "packageLocation": "./.yarn/cache/requirejs-config-file-npm-4.0.0-e89c26c364-61ac1c419a.zip/node_modules/requirejs-config-file/", + "packageDependencies": [ + ["requirejs-config-file", "npm:4.0.0"], + ["esprima", "npm:4.0.1"], + ["stringify-object", "npm:3.3.0"] + ], + "linkType": "HARD", + }] + ]], + ["resolve", [ + ["patch:resolve@npm%3A1.20.0#~builtin::version=1.20.0&hash=00b1ff", { + "packageLocation": "./.yarn/cache/resolve-patch-da1bf0dd3c-bed00be983.zip/node_modules/resolve/", + "packageDependencies": [ + ["resolve", "patch:resolve@npm%3A1.20.0#~builtin::version=1.20.0&hash=00b1ff"], + ["is-core-module", "npm:2.4.0"], + ["path-parse", "npm:1.0.7"] + ], + "linkType": "HARD", + }] + ]], ["resolve-alpn", [ ["npm:1.1.2", { "packageLocation": "./.yarn/cache/resolve-alpn-npm-1.1.2-cb74069612-99ffb597ca.zip/node_modules/resolve-alpn/", @@ -2480,6 +3358,15 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD", }] ]], + ["resolve-dependency-path", [ + ["npm:2.0.0", { + "packageLocation": "./.yarn/cache/resolve-dependency-path-npm-2.0.0-81572580e9-161296969a.zip/node_modules/resolve-dependency-path/", + "packageDependencies": [ + ["resolve-dependency-path", "npm:2.0.0"] + ], + "linkType": "HARD", + }] + ]], ["resolve-from", [ ["npm:4.0.0", { "packageLocation": "./.yarn/cache/resolve-from-npm-4.0.0-f758ec21bf-f4ba0b8494.zip/node_modules/resolve-from/", @@ -2499,6 +3386,17 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD", }] ]], + ["restore-cursor", [ + ["npm:3.1.0", { + "packageLocation": "./.yarn/cache/restore-cursor-npm-3.1.0-52c5a4c98f-f877dd8741.zip/node_modules/restore-cursor/", + "packageDependencies": [ + ["restore-cursor", "npm:3.1.0"], + ["onetime", "npm:5.1.2"], + ["signal-exit", "npm:3.0.3"] + ], + "linkType": "HARD", + }] + ]], ["retry-as-promised", [ ["npm:3.2.0", { "packageLocation": "./.yarn/cache/retry-as-promised-npm-3.2.0-292b66348b-282aa6fc28.zip/node_modules/retry-as-promised/", @@ -2556,6 +3454,16 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD", }] ]], + ["sass-lookup", [ + ["npm:3.0.0", { + "packageLocation": "./.yarn/cache/sass-lookup-npm-3.0.0-c756430816-fd4bf1ad9c.zip/node_modules/sass-lookup/", + "packageDependencies": [ + ["sass-lookup", "npm:3.0.0"], + ["commander", "npm:2.20.3"] + ], + "linkType": "HARD", + }] + ]], ["semver", [ ["npm:7.3.5", { "packageLocation": "./.yarn/cache/semver-npm-7.3.5-618cf5db6a-5eafe6102b.zip/node_modules/semver/", @@ -2646,6 +3554,15 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD", }] ]], + ["signal-exit", [ + ["npm:3.0.3", { + "packageLocation": "./.yarn/cache/signal-exit-npm-3.0.3-5a2d797648-f0169d3f12.zip/node_modules/signal-exit/", + "packageDependencies": [ + ["signal-exit", "npm:3.0.3"] + ], + "linkType": "HARD", + }] + ]], ["slash", [ ["npm:3.0.0", { "packageLocation": "./.yarn/cache/slash-npm-3.0.0-b87de2279a-94a93fff61.zip/node_modules/slash/", @@ -2676,6 +3593,15 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD", }] ]], + ["source-map-js", [ + ["npm:0.6.2", { + "packageLocation": "./.yarn/cache/source-map-js-npm-0.6.2-af388ea7f1-9c8151a29e.zip/node_modules/source-map-js/", + "packageDependencies": [ + ["source-map-js", "npm:0.6.2"] + ], + "linkType": "HARD", + }] + ]], ["source-map-support", [ ["npm:0.5.19", { "packageLocation": "./.yarn/cache/source-map-support-npm-0.5.19-65b33ae61e-c72802fdba.zip/node_modules/source-map-support/", @@ -2737,6 +3663,18 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD", }] ]], + ["stringify-object", [ + ["npm:3.3.0", { + "packageLocation": "./.yarn/cache/stringify-object-npm-3.3.0-3e6784f7df-6827a3f359.zip/node_modules/stringify-object/", + "packageDependencies": [ + ["stringify-object", "npm:3.3.0"], + ["get-own-enumerable-property-symbols", "npm:3.0.2"], + ["is-obj", "npm:1.0.1"], + ["is-regexp", "npm:1.0.0"] + ], + "linkType": "HARD", + }] + ]], ["strip-ansi", [ ["npm:6.0.0", { "packageLocation": "./.yarn/cache/strip-ansi-npm-6.0.0-904613e9eb-04c3239ede.zip/node_modules/strip-ansi/", @@ -2748,6 +3686,13 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }] ]], ["strip-json-comments", [ + ["npm:2.0.1", { + "packageLocation": "./.yarn/cache/strip-json-comments-npm-2.0.1-e7883b2d04-1074ccb632.zip/node_modules/strip-json-comments/", + "packageDependencies": [ + ["strip-json-comments", "npm:2.0.1"] + ], + "linkType": "HARD", + }], ["npm:3.1.1", { "packageLocation": "./.yarn/cache/strip-json-comments-npm-3.1.1-dcb2324823-492f73e272.zip/node_modules/strip-json-comments/", "packageDependencies": [ @@ -2756,6 +3701,17 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD", }] ]], + ["stylus-lookup", [ + ["npm:3.0.2", { + "packageLocation": "./.yarn/cache/stylus-lookup-npm-3.0.2-fed0f86b51-460e9b6e7e.zip/node_modules/stylus-lookup/", + "packageDependencies": [ + ["stylus-lookup", "npm:3.0.2"], + ["commander", "npm:2.20.3"], + ["debug", "virtual:f8b688e6542ef635eefae684748f7db5410cd1803b0f43b02ae3ebd860a79349e9ae07146ce05bdfb5fca9536ad9dbe230ed7f4c2f2ffe26893f1f1b0b8700e7#npm:4.3.2"] + ], + "linkType": "HARD", + }] + ]], ["supports-color", [ ["npm:5.5.0", { "packageLocation": "./.yarn/cache/supports-color-npm-5.5.0-183ac537bc-95f6f4ba5a.zip/node_modules/supports-color/", @@ -2789,6 +3745,24 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD", }] ]], + ["tapable", [ + ["npm:2.2.0", { + "packageLocation": "./.yarn/cache/tapable-npm-2.2.0-516ee6aa5b-5a7e31ddd2.zip/node_modules/tapable/", + "packageDependencies": [ + ["tapable", "npm:2.2.0"] + ], + "linkType": "HARD", + }] + ]], + ["temp", [ + ["npm:0.4.0", { + "packageLocation": "./.yarn/cache/temp-npm-0.4.0-47d405c87b-8b83f98833.zip/node_modules/temp/", + "packageDependencies": [ + ["temp", "npm:0.4.0"] + ], + "linkType": "HARD", + }] + ]], ["text-table", [ ["npm:0.2.0", { "packageLocation": "./.yarn/cache/text-table-npm-0.2.0-d92a778b59-b6937a38c8.zip/node_modules/text-table/", @@ -2807,6 +3781,15 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD", }] ]], + ["to-fast-properties", [ + ["npm:2.0.0", { + "packageLocation": "./.yarn/cache/to-fast-properties-npm-2.0.0-0dc60cc481-be2de62fe5.zip/node_modules/to-fast-properties/", + "packageDependencies": [ + ["to-fast-properties", "npm:2.0.0"] + ], + "linkType": "HARD", + }] + ]], ["to-regex-range", [ ["npm:5.0.1", { "packageLocation": "./.yarn/cache/to-regex-range-npm-5.0.1-f1e8263b00-f76fa01b3d.zip/node_modules/to-regex-range/", @@ -2886,9 +3869,31 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "typescript" ], "linkType": "HARD", + }], + ["virtual:e80cdc72e08c6e158b3fe27966e42eeafb0f16e195057b040b6c514670447c80dafe8fc16100d9b2f7bb32fe41bdf1e09babdd886e6cbab55d81f720d133e296#npm:3.21.0", { + "packageLocation": "./.yarn/__virtual__/tsutils-virtual-d7ec71a158/0/cache/tsutils-npm-3.21.0-347e6636c5-1843f4c1b2.zip/node_modules/tsutils/", + "packageDependencies": [ + ["tsutils", "virtual:e80cdc72e08c6e158b3fe27966e42eeafb0f16e195057b040b6c514670447c80dafe8fc16100d9b2f7bb32fe41bdf1e09babdd886e6cbab55d81f720d133e296#npm:3.21.0"], + ["@types/typescript", null], + ["tslib", "npm:1.14.1"], + ["typescript", "patch:typescript@npm%3A3.9.10#~builtin::version=3.9.10&hash=d8b4e7"] + ], + "packagePeers": [ + "@types/typescript", + "typescript" + ], + "linkType": "HARD", }] ]], ["type-check", [ + ["npm:0.3.2", { + "packageLocation": "./.yarn/cache/type-check-npm-0.3.2-a4a38bb0b6-dd3b149564.zip/node_modules/type-check/", + "packageDependencies": [ + ["type-check", "npm:0.3.2"], + ["prelude-ls", "npm:1.1.2"] + ], + "linkType": "HARD", + }], ["npm:0.4.0", { "packageLocation": "./.yarn/cache/type-check-npm-0.4.0-60565800ce-ec688ebfc9.zip/node_modules/type-check/", "packageDependencies": [ @@ -2919,6 +3924,13 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }] ]], ["typescript", [ + ["patch:typescript@npm%3A3.9.10#~builtin::version=3.9.10&hash=d8b4e7", { + "packageLocation": "./.yarn/cache/typescript-patch-c1d4db350f-8dcd46a8a2.zip/node_modules/typescript/", + "packageDependencies": [ + ["typescript", "patch:typescript@npm%3A3.9.10#~builtin::version=3.9.10&hash=d8b4e7"] + ], + "linkType": "HARD", + }], ["patch:typescript@npm%3A4.2.4#~builtin::version=4.2.4&hash=d8b4e7", { "packageLocation": "./.yarn/cache/typescript-patch-f44dec8005-3d8ac56cd9.zip/node_modules/typescript/", "packageDependencies": [ @@ -2936,6 +3948,15 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD", }] ]], + ["uniq", [ + ["npm:1.0.1", { + "packageLocation": "./.yarn/cache/uniq-npm-1.0.1-5cab2dd0f3-8206535f83.zip/node_modules/uniq/", + "packageDependencies": [ + ["uniq", "npm:1.0.1"] + ], + "linkType": "HARD", + }] + ]], ["unpipe", [ ["npm:1.0.0", { "packageLocation": "./.yarn/cache/unpipe-npm-1.0.0-2ed2a3c2bf-4fa18d8d8d.zip/node_modules/unpipe/", @@ -2991,6 +4012,25 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD", }] ]], + ["walkdir", [ + ["npm:0.4.1", { + "packageLocation": "./.yarn/cache/walkdir-npm-0.4.1-de0c3aebeb-71045c21dc.zip/node_modules/walkdir/", + "packageDependencies": [ + ["walkdir", "npm:0.4.1"] + ], + "linkType": "HARD", + }] + ]], + ["wcwidth", [ + ["npm:1.0.1", { + "packageLocation": "./.yarn/cache/wcwidth-npm-1.0.1-05fa596453-814e9d1ddc.zip/node_modules/wcwidth/", + "packageDependencies": [ + ["wcwidth", "npm:1.0.1"], + ["defaults", "npm:1.0.3"] + ], + "linkType": "HARD", + }] + ]], ["which", [ ["npm:2.0.2", { "packageLocation": "./.yarn/cache/which-npm-2.0.2-320ddf72f7-1a5c563d3c.zip/node_modules/which/", @@ -3006,7 +4046,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "packageLocation": "./.yarn/cache/wkx-npm-0.5.0-fca5152cd8-47b27387de.zip/node_modules/wkx/", "packageDependencies": [ ["wkx", "npm:0.5.0"], - ["@types/node", "npm:16.0.3"] + ["@types/node", "npm:16.3.1"] ], "linkType": "HARD", }] @@ -3030,17 +4070,17 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }] ]], ["ws", [ - ["npm:7.5.2", { - "packageLocation": "./.yarn/cache/ws-npm-7.5.2-503309778c-23aef92486.zip/node_modules/ws/", + ["npm:7.5.3", { + "packageLocation": "./.yarn/cache/ws-npm-7.5.3-3a046a0b1a-423dc0d859.zip/node_modules/ws/", "packageDependencies": [ - ["ws", "npm:7.5.2"] + ["ws", "npm:7.5.3"] ], "linkType": "SOFT", }], - ["virtual:275bceca0f79f8e7aeb7f77acb5a6bd201e7eea264e9dfd8dcc0bcf35691357327303c09557dfc1495b9a1f8e9cf8278133d234783570df6cb70a249778f3198#npm:7.5.2", { - "packageLocation": "./.yarn/__virtual__/ws-virtual-c877665648/0/cache/ws-npm-7.5.2-503309778c-23aef92486.zip/node_modules/ws/", + ["virtual:275bceca0f79f8e7aeb7f77acb5a6bd201e7eea264e9dfd8dcc0bcf35691357327303c09557dfc1495b9a1f8e9cf8278133d234783570df6cb70a249778f3198#npm:7.5.3", { + "packageLocation": "./.yarn/__virtual__/ws-virtual-1fc0fff7d6/0/cache/ws-npm-7.5.3-3a046a0b1a-423dc0d859.zip/node_modules/ws/", "packageDependencies": [ - ["ws", "virtual:275bceca0f79f8e7aeb7f77acb5a6bd201e7eea264e9dfd8dcc0bcf35691357327303c09557dfc1495b9a1f8e9cf8278133d234783570df6cb70a249778f3198#npm:7.5.2"], + ["ws", "virtual:275bceca0f79f8e7aeb7f77acb5a6bd201e7eea264e9dfd8dcc0bcf35691357327303c09557dfc1495b9a1f8e9cf8278133d234783570df6cb70a249778f3198#npm:7.5.3"], ["@types/bufferutil", null], ["@types/utf-8-validate", null], ["bufferutil", null], diff --git a/.prettierignore b/.prettierignore index 3acd2e8..4dabf94 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1,4 +1,5 @@ dist .git -.yarn/** -.pnp.* \ No newline at end of file +.yarn +.pnp.* +.vscode \ No newline at end of file diff --git a/.vscode/extensions.json b/.vscode/extensions.json index e6ce365..d3de569 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -1,4 +1,4 @@ -/* prettier-ignore */ { +{ "recommendations": [ "aaron-bond.better-comments", "arcanis.vscode-zipfs", diff --git a/.vscode/launch.json b/.vscode/launch.json index f526e03..d75268c 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -1,4 +1,3 @@ -/* prettier-ignore */ { "version": "0.2.0", "configurations": [ diff --git a/.vscode/settings.json b/.vscode/settings.json index ff71740..76966c1 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,12 +1,11 @@ -/* prettier-ignore */ { +{ "files.exclude": { "**/.git": true, "**/.svn": true, "**/.hg": true, "**/CVS": true, "**/.DS_Store": true, - "node_modules": true, - "dist": true, + "dist": false, ".pnp.js": true }, "javascript.preferences.importModuleSpecifier": "project-relative", @@ -54,15 +53,15 @@ "bold": false, "italic": false }, - { - "tag": "#", - "color": "#f003fc", - "strikethrough": false, - "underline": false, - "backgroundColor": "transparent", - "bold": false, - "italic": false - }, + // { + // "tag": "#", + // "color": "#f003fc", + // "strikethrough": false, + // "underline": false, + // "backgroundColor": "transparent", + // "bold": false, + // "italic": false + // }, { "tag": "//", "color": "#474747", diff --git a/.vscode/typescript.code-snippets b/.vscode/typescript.code-snippets index 0984c3c..f105a20 100644 --- a/.vscode/typescript.code-snippets +++ b/.vscode/typescript.code-snippets @@ -1,4 +1,3 @@ -/* prettier-ignore */ { /** * Place your snippets for typescript here. Each snippet is defined under a snippet name and has a prefix, body and diff --git a/package.json b/package.json index ece0619..2b50aba 100644 --- a/package.json +++ b/package.json @@ -6,6 +6,9 @@ "repository": "https://github.com/NotEnoughUpdates/bush-bot", "author": "Tyman, IRONM00N, and TrashCan", "license": "CC-BY-NC-SA-4.0", + "_moduleAliases": { + "@lib": "dist/lib" + }, "scripts": { "build-esbuild": "yarn rimraf dist && yarn esbuild --sourcemap=inline --minify-whitespace --minify-syntax --outdir=dist --platform=node --target=es2020 --format=cjs --log-level=warning src/**/*.ts", "build-tsc": "yarn rimraf dist && yarn tsc", @@ -21,6 +24,7 @@ "@types/common-tags": "^1.8.0", "@types/express": "^4.17.12", "@types/humanize-duration": "^3", + "@types/module-alias": "^2", "@types/node": "^14.14.22", "@types/uuid": "^8.3.0", "@typescript-eslint/eslint-plugin": "^4.14.1", @@ -43,6 +47,8 @@ "discord.js": "NotEnoughUpdates/discord.js", "got": "^11.8.2", "humanize-duration": "^3.27.0", + "madge": "^5.0.1", + "module-alias": "^2.2.2", "moment": "^2.29.1", "pg": "^8.5.1", "pg-hstore": "^2.3.3", diff --git a/src/arguments/contentWithDuration.ts b/src/arguments/contentWithDuration.ts index c48e723..9753f50 100644 --- a/src/arguments/contentWithDuration.ts +++ b/src/arguments/contentWithDuration.ts @@ -1,4 +1,4 @@ -import { BushArgumentTypeCaster, BushMessage } from '../lib'; +import { BushArgumentTypeCaster, BushMessage } from '@lib'; export const contentWithDurationTypeCaster: BushArgumentTypeCaster = async ( _message: BushMessage, diff --git a/src/arguments/duration.ts b/src/arguments/duration.ts index 9ef3845..53b200e 100644 --- a/src/arguments/duration.ts +++ b/src/arguments/duration.ts @@ -1,4 +1,4 @@ -import { BushArgumentTypeCaster, BushMessage } from '../lib'; +import { BushArgumentTypeCaster, BushMessage } from '@lib'; export const durationTypeCaster: BushArgumentTypeCaster = (_message: BushMessage, phrase): number => { // if (!phrase) return null; diff --git a/src/bot.ts b/src/bot.ts index 0751577..9fb306f 100644 --- a/src/bot.ts +++ b/src/bot.ts @@ -1,5 +1,6 @@ +import 'module-alias/register'; import * as config from './config/options'; -import { BushClient } from './lib'; +import { BushClient } from './lib/'; BushClient.preStart(); const client: BushClient = new BushClient(config); diff --git a/src/commands/config/muteRole.ts b/src/commands/config/muteRole.ts index 6fa84df..6fda0b8 100644 --- a/src/commands/config/muteRole.ts +++ b/src/commands/config/muteRole.ts @@ -1,5 +1,5 @@ +import { AllowedMentions, BushCommand, BushMessage, BushSlashMessage } from '@lib'; import { Role } from 'discord.js'; -import { AllowedMentions, BushCommand, BushMessage, BushSlashMessage } from '../../lib'; export default class MuteRoleCommand extends BushCommand { public constructor() { diff --git a/src/commands/config/prefix.ts b/src/commands/config/prefix.ts index 52f6034..9be6ec4 100644 --- a/src/commands/config/prefix.ts +++ b/src/commands/config/prefix.ts @@ -1,4 +1,4 @@ -import { BushCommand, BushMessage, BushSlashMessage } from '../../lib'; +import { BushCommand, BushMessage, BushSlashMessage } from '@lib'; export default class PrefixCommand extends BushCommand { public constructor() { diff --git a/src/commands/config/welcomeChannel.ts b/src/commands/config/welcomeChannel.ts index 0c07b9a..f15e07d 100644 --- a/src/commands/config/welcomeChannel.ts +++ b/src/commands/config/welcomeChannel.ts @@ -1,5 +1,5 @@ +import { BushCommand, BushMessage, BushSlashMessage } from '@lib'; import { Channel } from 'discord.js'; -import { BushCommand, BushMessage, BushSlashMessage } from '../../lib'; export default class WelcomeChannelCommand extends BushCommand { public constructor() { diff --git a/src/commands/dev/eval.ts b/src/commands/dev/eval.ts index 295d042..f3a30ab 100644 --- a/src/commands/dev/eval.ts +++ b/src/commands/dev/eval.ts @@ -1,11 +1,11 @@ /* eslint-disable @typescript-eslint/no-var-requires */ /* eslint-disable @typescript-eslint/no-unused-vars */ +import { BushCommand, BushMessage, BushSlashMessage } from '@lib'; import { exec } from 'child_process'; import { Constants } from 'discord-akairo'; import { CommandInteraction, MessageEmbed, MessageEmbedOptions, Util } from 'discord.js'; import { transpile } from 'typescript'; import { inspect, promisify } from 'util'; -import { BushCommand, BushMessage, BushSlashMessage } from '../../lib'; const clean = (text) => { if (typeof text === 'string') { @@ -181,7 +181,7 @@ export default class EvalCommand extends BushCommand { members = message.guild.members, roles = message.guild.roles, client = this.client, - { Ban, Global, Guild, Level, ModLog, StickyRole } = await import('../../lib'), + { Ban, Global, Guild, Level, ModLog, StickyRole } = await import('@lib'), { ButtonInteraction, Collector, diff --git a/src/commands/dev/reload.ts b/src/commands/dev/reload.ts index a66d755..c6a2140 100644 --- a/src/commands/dev/reload.ts +++ b/src/commands/dev/reload.ts @@ -1,4 +1,4 @@ -import { BushCommand, BushMessage, BushSlashMessage } from '../../lib'; +import { BushCommand, BushMessage, BushSlashMessage } from '@lib'; export default class ReloadCommand extends BushCommand { public constructor() { diff --git a/src/commands/dev/setLevel.ts b/src/commands/dev/setLevel.ts index fb2f41f..9c7daeb 100644 --- a/src/commands/dev/setLevel.ts +++ b/src/commands/dev/setLevel.ts @@ -1,5 +1,5 @@ +import { AllowedMentions, BushCommand, BushMessage, BushSlashMessage, Level } from '@lib'; import { User } from 'discord.js'; -import { AllowedMentions, BushCommand, BushMessage, BushSlashMessage, Level } from '../../lib'; export default class SetLevelCommand extends BushCommand { public constructor() { diff --git a/src/commands/dev/superUser.ts b/src/commands/dev/superUser.ts index 4d5ce2d..83623df 100644 --- a/src/commands/dev/superUser.ts +++ b/src/commands/dev/superUser.ts @@ -1,6 +1,6 @@ +import { BushCommand, BushMessage, BushSlashMessage, Global } from '@lib'; import { Constants } from 'discord-akairo'; import { User } from 'discord.js'; -import { BushCommand, BushMessage, BushSlashMessage, Global } from '../../lib'; export default class SuperUserCommand extends BushCommand { public constructor() { diff --git a/src/commands/dev/testDuration.ts b/src/commands/dev/testDuration.ts index 2fc757e..719292e 100644 --- a/src/commands/dev/testDuration.ts +++ b/src/commands/dev/testDuration.ts @@ -1,6 +1,6 @@ +import { BushCommand, BushSlashMessage } from '@lib'; import { stripIndents } from 'common-tags'; import { Message } from 'discord.js'; -import { BushCommand, BushSlashMessage } from '../../lib'; export default class TestDurationCommand extends BushCommand { public constructor() { diff --git a/src/commands/info/botInfo.ts b/src/commands/info/botInfo.ts index 80ca29d..d9961af 100644 --- a/src/commands/info/botInfo.ts +++ b/src/commands/info/botInfo.ts @@ -1,5 +1,5 @@ +import { BushCommand, BushMessage, BushSlashMessage } from '@lib'; import { MessageEmbed } from 'discord.js'; -import { BushCommand, BushMessage, BushSlashMessage } from '../../lib'; export default class BotInfoCommand extends BushCommand { public constructor() { diff --git a/src/commands/info/help.ts b/src/commands/info/help.ts index a561d69..439f0ef 100644 --- a/src/commands/info/help.ts +++ b/src/commands/info/help.ts @@ -1,5 +1,5 @@ +import { BushCommand, BushMessage, BushSlashMessage } from '@lib'; import { MessageActionRow, MessageButton, MessageEmbed } from 'discord.js'; -import { BushCommand, BushMessage, BushSlashMessage } from '../../lib'; export default class HelpCommand extends BushCommand { public constructor() { diff --git a/src/commands/info/ping.ts b/src/commands/info/ping.ts index 804ede2..4638aa9 100644 --- a/src/commands/info/ping.ts +++ b/src/commands/info/ping.ts @@ -1,5 +1,5 @@ +import { BushCommand, BushMessage, BushSlashMessage } from '@lib'; import { Message, MessageEmbed } from 'discord.js'; -import { BushCommand, BushMessage, BushSlashMessage } from '../../lib'; export default class PingCommand extends BushCommand { public constructor() { diff --git a/src/commands/info/pronouns.ts b/src/commands/info/pronouns.ts index 241dce3..60701d1 100644 --- a/src/commands/info/pronouns.ts +++ b/src/commands/info/pronouns.ts @@ -1,6 +1,6 @@ +import { BushCommand, BushSlashMessage } from '@lib'; import { Message, MessageEmbed, User } from 'discord.js'; import got, { HTTPError } from 'got'; -import { BushCommand, BushSlashMessage } from '../../lib'; export const pronounMapping = { unspecified: 'Unspecified', diff --git a/src/commands/moderation/ban.ts b/src/commands/moderation/ban.ts index 244014b..be7a51f 100644 --- a/src/commands/moderation/ban.ts +++ b/src/commands/moderation/ban.ts @@ -1,5 +1,5 @@ +import { BushCommand, BushMessage, BushSlashMessage } from '@lib'; import { User } from 'discord.js'; -import { BushCommand, BushMessage, BushSlashMessage } from '../../lib'; export default class BanCommand extends BushCommand { public constructor() { diff --git a/src/commands/moderation/kick.ts b/src/commands/moderation/kick.ts index 87bf1f7..f960488 100644 --- a/src/commands/moderation/kick.ts +++ b/src/commands/moderation/kick.ts @@ -1,4 +1,4 @@ -import { BushCommand, BushGuildMember, BushMessage, BushSlashMessage, BushUser } from '../../lib'; +import { BushCommand, BushGuildMember, BushMessage, BushSlashMessage, BushUser } from '@lib'; export default class KickCommand extends BushCommand { public constructor() { diff --git a/src/commands/moderation/modlog.ts b/src/commands/moderation/modlog.ts index 36f72fc..c71f962 100644 --- a/src/commands/moderation/modlog.ts +++ b/src/commands/moderation/modlog.ts @@ -1,7 +1,7 @@ +import { BushCommand, BushMessage, BushSlashMessage, ModLog } from '@lib'; import { Argument } from 'discord-akairo'; import { MessageEmbed } from 'discord.js'; import moment from 'moment'; -import { BushCommand, BushMessage, BushSlashMessage, ModLog } from '../../lib'; export default class ModlogCommand extends BushCommand { public constructor() { diff --git a/src/commands/moderation/mute.ts b/src/commands/moderation/mute.ts index bc3abf2..26ccb21 100644 --- a/src/commands/moderation/mute.ts +++ b/src/commands/moderation/mute.ts @@ -1,5 +1,5 @@ +import { BushCommand, BushGuildMember, BushMessage, BushSlashMessage, BushUser } from '@lib'; import { Argument } from 'discord-akairo'; -import { BushCommand, BushGuildMember, BushMessage, BushSlashMessage, BushUser } from '../../lib'; export default class MuteCommand extends BushCommand { public constructor() { diff --git a/src/commands/moderation/role.ts b/src/commands/moderation/role.ts index 6bac9e8..33f474e 100644 --- a/src/commands/moderation/role.ts +++ b/src/commands/moderation/role.ts @@ -1,5 +1,5 @@ /* eslint-disable @typescript-eslint/no-empty-function */ -import { AllowedMentions, BushCommand, BushGuildMember, BushMessage, BushRole, BushSlashMessage } from '../../lib'; +import { AllowedMentions, BushCommand, BushGuildMember, BushMessage, BushRole, BushSlashMessage } from '@lib'; export default class RoleCommand extends BushCommand { public constructor() { diff --git a/src/commands/moderation/warn.ts b/src/commands/moderation/warn.ts index d1c17d4..5d679ab 100644 --- a/src/commands/moderation/warn.ts +++ b/src/commands/moderation/warn.ts @@ -1,4 +1,4 @@ -import { BushCommand, BushGuildMember, BushMessage, BushSlashMessage, BushUser } from '../../lib'; +import { BushCommand, BushGuildMember, BushMessage, BushSlashMessage, BushUser } from '@lib'; export default class WarnCommand extends BushCommand { public constructor() { diff --git a/src/commands/moulberry-bush/capePerms.ts b/src/commands/moulberry-bush/capePerms.ts index a564fc3..b19d3bc 100644 --- a/src/commands/moulberry-bush/capePerms.ts +++ b/src/commands/moulberry-bush/capePerms.ts @@ -1,7 +1,7 @@ +import { BushCommand, BushMessage, BushSlashMessage } from '@lib'; import { Constants } from 'discord-akairo'; import { MessageEmbed } from 'discord.js'; import got from 'got'; -import { BushCommand, BushMessage, BushSlashMessage } from '../../lib'; export default class CapePermissionsCommand extends BushCommand { private nameMap = { diff --git a/src/commands/moulberry-bush/giveawayPing.ts b/src/commands/moulberry-bush/giveawayPing.ts index 80555b1..93373b0 100644 --- a/src/commands/moulberry-bush/giveawayPing.ts +++ b/src/commands/moulberry-bush/giveawayPing.ts @@ -1,4 +1,4 @@ -import { AllowedMentions, BushCommand, BushMessage } from '../../lib'; +import { AllowedMentions, BushCommand, BushMessage } from '@lib'; export default class GiveawayPingCommand extends BushCommand { public constructor() { diff --git a/src/commands/moulberry-bush/level.ts b/src/commands/moulberry-bush/level.ts index 5dcafe5..7f3509f 100644 --- a/src/commands/moulberry-bush/level.ts +++ b/src/commands/moulberry-bush/level.ts @@ -1,10 +1,10 @@ -import { BushCommand, BushMessage, BushSlashMessage, BushUser, Level } from '../../lib'; +import { BushCommand, BushMessage, BushSlashMessage, BushUser, Level } from '@lib'; /* import canvas from 'canvas'; import { MessageAttachment } from 'discord.js'; import { join } from 'path'; import got from 'got/dist/source'; -import { CanvasProgressBar } from '../../lib'; +import { CanvasProgressBar } from '@lib'; */ export default class LevelCommand extends BushCommand { diff --git a/src/commands/moulberry-bush/rule.ts b/src/commands/moulberry-bush/rule.ts index f2e0911..a2b8c78 100644 --- a/src/commands/moulberry-bush/rule.ts +++ b/src/commands/moulberry-bush/rule.ts @@ -1,6 +1,6 @@ +import { AllowedMentions, BushCommand, BushMessage, BushSlashMessage } from '@lib'; import { Argument, Constants } from 'discord-akairo'; import { MessageEmbed, User } from 'discord.js'; -import { AllowedMentions, BushCommand, BushMessage, BushSlashMessage } from '../../lib'; const rules = [ { diff --git a/src/inhibitors/blacklist/guildBlacklist.ts b/src/inhibitors/blacklist/guildBlacklist.ts index 06e93fa..d9a42da 100644 --- a/src/inhibitors/blacklist/guildBlacklist.ts +++ b/src/inhibitors/blacklist/guildBlacklist.ts @@ -1,4 +1,4 @@ -import { BushInhibitor, BushMessage, BushSlashMessage } from '../../lib'; +import { BushInhibitor, BushMessage, BushSlashMessage } from '@lib'; export default class GuildBlacklistInhibitor extends BushInhibitor { public constructor() { diff --git a/src/inhibitors/blacklist/userBlacklist.ts b/src/inhibitors/blacklist/userBlacklist.ts index 01563a0..f3cc642 100644 --- a/src/inhibitors/blacklist/userBlacklist.ts +++ b/src/inhibitors/blacklist/userBlacklist.ts @@ -1,4 +1,4 @@ -import { BushInhibitor, BushMessage, BushSlashMessage } from '../../lib'; +import { BushInhibitor, BushMessage, BushSlashMessage } from '@lib'; export default class UserBlacklistInhibitor extends BushInhibitor { public constructor() { diff --git a/src/inhibitors/commands/disabledCommand.ts b/src/inhibitors/commands/disabledCommand.ts index ba143ee..fb31375 100644 --- a/src/inhibitors/commands/disabledCommand.ts +++ b/src/inhibitors/commands/disabledCommand.ts @@ -1,4 +1,4 @@ -import { BushCommand, BushInhibitor, BushMessage, BushSlashMessage } from '../../lib'; +import { BushCommand, BushInhibitor, BushMessage, BushSlashMessage } from '@lib'; export default class DisabledCommandInhibitor extends BushInhibitor { public constructor() { diff --git a/src/inhibitors/noCache.ts b/src/inhibitors/noCache.ts index 1115af7..9d6e560 100644 --- a/src/inhibitors/noCache.ts +++ b/src/inhibitors/noCache.ts @@ -1,4 +1,4 @@ -import { BushInhibitor, BushMessage, BushSlashMessage } from '../lib'; +import { BushInhibitor, BushMessage, BushSlashMessage } from '@lib'; export default class NoCacheInhibitor extends BushInhibitor { public constructor() { diff --git a/src/lib/extensions/discord-akairo/BushArgumentTypeCaster.ts b/src/lib/extensions/discord-akairo/BushArgumentTypeCaster.ts index ed81290..9afcf8b 100644 --- a/src/lib/extensions/discord-akairo/BushArgumentTypeCaster.ts +++ b/src/lib/extensions/discord-akairo/BushArgumentTypeCaster.ts @@ -1,4 +1,4 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ -import { BushMessage } from '..'; +import { BushMessage } from '../discord.js/BushMessage'; export type BushArgumentTypeCaster = (message: BushMessage, phrase: string) => any; diff --git a/src/lib/extensions/discord-akairo/BushClient.ts b/src/lib/extensions/discord-akairo/BushClient.ts index 99fd772..cb6a1de 100644 --- a/src/lib/extensions/discord-akairo/BushClient.ts +++ b/src/lib/extensions/discord-akairo/BushClient.ts @@ -15,42 +15,46 @@ import * as path from 'path'; import { exit } from 'process'; import readline from 'readline'; import { Sequelize } from 'sequelize'; -import { - AllowedMentions, - BushButtonInteraction, - BushCache, - BushCategoryChannel, - BushClientUtil, - BushCommandHandler, - BushCommandInteraction, - BushConstants, - BushDMChannel, - BushGuild, - BushGuildEmoji, - BushGuildMember, - BushInhibitorHandler, - BushListenerHandler, - BushLogger, - BushMessage, - BushMessageReaction, - BushNewsChannel, - BushPresence, - BushRole, - BushSelectMenuInteraction, - BushStoreChannel, - BushTaskHandler, - BushTextChannel, - BushThreadChannel, - BushThreadMember, - BushUser, - BushVoiceChannel, - BushVoiceState -} from '../..'; import { contentWithDurationTypeCaster } from '../../../arguments/contentWithDuration'; import { durationTypeCaster } from '../../../arguments/duration'; import * as config from '../../../config/options'; import { UpdateCacheTask } from '../../../tasks/updateCache'; -import * as Models from '../../models'; +import { Ban } from '../../models/Ban'; +import { Global } from '../../models/Global'; +import { Guild as GuildModel } from '../../models/Guild'; +import { Level } from '../../models/Level'; +import { ModLog } from '../../models/ModLog'; +import { Mute } from '../../models/Mute'; +import { StickyRole } from '../../models/StickyRole'; +import { AllowedMentions } from '../../utils/AllowedMentions'; +import { BushCache } from '../../utils/BushCache'; +import { BushConstants } from '../../utils/BushConstants'; +import { BushLogger } from '../../utils/BushLogger'; +import { BushButtonInteraction } from '../discord.js/BushButtonInteraction'; +import { BushCategoryChannel } from '../discord.js/BushCategoryChannel'; +import { BushCommandInteraction } from '../discord.js/BushCommandInteraction'; +import { BushDMChannel } from '../discord.js/BushDMChannel'; +import { BushGuild } from '../discord.js/BushGuild'; +import { BushGuildEmoji } from '../discord.js/BushGuildEmoji'; +import { BushGuildMember } from '../discord.js/BushGuildMember'; +import { BushMessage } from '../discord.js/BushMessage'; +import { BushMessageReaction } from '../discord.js/BushMessageReaction'; +import { BushNewsChannel } from '../discord.js/BushNewsChannel'; +import { BushPresence } from '../discord.js/BushPresence'; +import { BushRole } from '../discord.js/BushRole'; +import { BushSelectMenuInteraction } from '../discord.js/BushSelectMenuInteraction'; +import { BushStoreChannel } from '../discord.js/BushStoreChannel'; +import { BushTextChannel } from '../discord.js/BushTextChannel'; +import { BushThreadChannel } from '../discord.js/BushThreadChannel'; +import { BushThreadMember } from '../discord.js/BushThreadMember'; +import { BushUser } from '../discord.js/BushUser'; +import { BushVoiceChannel } from '../discord.js/BushVoiceChannel'; +import { BushVoiceState } from '../discord.js/BushVoiceState'; +import { BushClientUtil } from './BushClientUtil'; +import { BushCommandHandler } from './BushCommandHandler'; +import { BushInhibitorHandler } from './BushInhibitorHandler'; +import { BushListenerHandler } from './BushListenerHandler'; +import { BushTaskHandler } from './BushTaskHandler'; export type BotConfig = typeof config; export type BushReplyMessageType = string | MessagePayload | ReplyMessageOptions; @@ -106,11 +110,29 @@ export class BushClient extends AkairoClient { super( { ownerID: config.owners, - intents: Object.values(Intents.FLAGS).reduce((acc, p) => acc | p, 0) + intents: Object.values(Intents.FLAGS).reduce((acc, p) => acc | p, 0), + presence: { + activities: [ + { + name: 'Beep Boop', + type: 'WATCHING' + } + ], + status: 'online' + } }, { allowedMentions: AllowedMentions.users(), // No everyone or role mentions by default - intents: Object.values(Intents.FLAGS).reduce((acc, p) => acc | p, 0) + intents: Object.values(Intents.FLAGS).reduce((acc, p) => acc | p, 0), + presence: { + activities: [ + { + name: 'Beep Boop', + type: 'WATCHING' + } + ], + status: 'online' + } } ); @@ -142,7 +164,7 @@ export class BushClient extends AkairoClient { directory: path.join(__dirname, '..', '..', '..', 'commands'), prefix: async ({ guild }: { guild: Guild }) => { if (this.config.dev) return 'dev '; - const row = await Models.Guild.findByPk(guild.id); + const row = await GuildModel.findByPk(guild.id); return (row?.prefix || this.config.prefix) as string; }, allowMention: true, @@ -223,7 +245,7 @@ export class BushClient extends AkairoClient { } } await this.dbPreInit(); - await new UpdateCacheTask().init(this); + await UpdateCacheTask.init(this); this.console.success('Startup', `Successfully created <>.`, false); this.taskHandler.startAll(); } @@ -231,13 +253,13 @@ export class BushClient extends AkairoClient { public async dbPreInit(): Promise { try { await this.db.authenticate(); - Models.Global.initModel(this.db); - Models.Guild.initModel(this.db, this); - Models.ModLog.initModel(this.db); - Models.Ban.initModel(this.db); - Models.Mute.initModel(this.db); - Models.Level.initModel(this.db); - Models.StickyRole.initModel(this.db); + Global.initModel(this.db); + GuildModel.initModel(this.db, this); + ModLog.initModel(this.db); + Ban.initModel(this.db); + Mute.initModel(this.db); + Level.initModel(this.db); + StickyRole.initModel(this.db); await this.db.sync({ alter: true }); // Sync all tables to fix everything if updated await this.console.success('Startup', `Successfully connected to <>.`, false); } catch (e) { diff --git a/src/lib/extensions/discord-akairo/BushClientUtil.ts b/src/lib/extensions/discord-akairo/BushClientUtil.ts index c2d9da7..6c6d49a 100644 --- a/src/lib/extensions/discord-akairo/BushClientUtil.ts +++ b/src/lib/extensions/discord-akairo/BushClientUtil.ts @@ -1,5 +1,6 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ /* eslint-disable @typescript-eslint/explicit-module-boundary-types */ + import { exec } from 'child_process'; import { ClientUtil } from 'discord-akairo'; import { APIMessage } from 'discord-api-types'; @@ -26,23 +27,19 @@ import { import got from 'got'; import humanizeDuration from 'humanize-duration'; import { promisify } from 'util'; -import { - Ban, - BushCache, - BushClient, - BushConstants, - BushGuildMember, - BushGuildMemberResolvable, - BushGuildResolvable, - BushMessage, - BushSlashMessage, - Global, - Guild, - ModLog, - ModLogType, - Mute, - PunishmentRole -} from '../..'; +import { Ban } from '../../models/Ban'; +import { Global } from '../../models/Global'; +import { Guild } from '../../models/Guild'; +import { ModLog, ModLogType } from '../../models/ModLog'; +import { Mute } from '../../models/Mute'; +import { PunishmentRole } from '../../models/PunishmentRole'; +import { BushCache } from '../../utils/BushCache'; +import { BushConstants } from '../../utils/BushConstants'; +import { BushGuildResolvable } from '../discord.js/BushCommandInteraction'; +import { BushGuildMember } from '../discord.js/BushGuildMember'; +import { BushMessage } from '../discord.js/BushMessage'; +import { BushClient, BushGuildMemberResolvable } from './BushClient'; +import { BushSlashMessage } from './BushSlashMessage'; interface hastebinRes { key: string; diff --git a/src/lib/extensions/discord-akairo/BushCommand.ts b/src/lib/extensions/discord-akairo/BushCommand.ts index 6143816..90c68df 100644 --- a/src/lib/extensions/discord-akairo/BushCommand.ts +++ b/src/lib/extensions/discord-akairo/BushCommand.ts @@ -9,7 +9,10 @@ import { CommandOptions } from 'discord-akairo'; import { Snowflake } from 'discord.js'; -import { BushClient, BushCommandHandler, BushMessage, BushSlashMessage } from '..'; +import { BushMessage } from '../discord.js/BushMessage'; +import { BushClient } from './BushClient'; +import { BushCommandHandler } from './BushCommandHandler'; +import { BushSlashMessage } from './BushSlashMessage'; type BushArgumentType = | 'string' diff --git a/src/lib/extensions/discord-akairo/BushCommandHandler.ts b/src/lib/extensions/discord-akairo/BushCommandHandler.ts index 76bade4..09baf2e 100644 --- a/src/lib/extensions/discord-akairo/BushCommandHandler.ts +++ b/src/lib/extensions/discord-akairo/BushCommandHandler.ts @@ -1,7 +1,10 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ import { Category, CommandHandler, CommandHandlerOptions } from 'discord-akairo'; import { Collection } from 'discord.js'; -import { BushClient, BushCommand, BushConstants, BushMessage } from '../..'; +import { BushConstants } from '../../utils/BushConstants'; +import { BushMessage } from '../discord.js/BushMessage'; +import { BushClient } from './BushClient'; +import { BushCommand } from './BushCommand'; export type BushCommandHandlerOptions = CommandHandlerOptions; diff --git a/src/lib/extensions/discord-akairo/BushCommandUtil.ts b/src/lib/extensions/discord-akairo/BushCommandUtil.ts index 35fdd55..1e86401 100644 --- a/src/lib/extensions/discord-akairo/BushCommandUtil.ts +++ b/src/lib/extensions/discord-akairo/BushCommandUtil.ts @@ -1,6 +1,8 @@ import { CommandUtil, ParsedComponentData } from 'discord-akairo'; import { Collection, Snowflake } from 'discord.js'; -import { BushCommand, BushCommandHandler, BushMessage } from '..'; +import { BushMessage } from '../discord.js/BushMessage'; +import { BushCommand } from './BushCommand'; +import { BushCommandHandler } from './BushCommandHandler'; export interface BushParsedComponentData extends ParsedComponentData { command?: BushCommand; diff --git a/src/lib/extensions/discord-akairo/BushInhibitor.ts b/src/lib/extensions/discord-akairo/BushInhibitor.ts index 47e9515..ae91494 100644 --- a/src/lib/extensions/discord-akairo/BushInhibitor.ts +++ b/src/lib/extensions/discord-akairo/BushInhibitor.ts @@ -1,6 +1,9 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ import { Inhibitor } from 'discord-akairo'; -import { BushClient, BushCommand, BushMessage, BushSlashMessage } from '..'; +import { BushMessage } from '../discord.js/BushMessage'; +import { BushClient } from './BushClient'; +import { BushCommand } from './BushCommand'; +import { BushSlashMessage } from './BushSlashMessage'; export class BushInhibitor extends Inhibitor { public declare client: BushClient; diff --git a/src/lib/extensions/discord-akairo/BushInhibitorHandler.ts b/src/lib/extensions/discord-akairo/BushInhibitorHandler.ts index 4077228..2a947da 100644 --- a/src/lib/extensions/discord-akairo/BushInhibitorHandler.ts +++ b/src/lib/extensions/discord-akairo/BushInhibitorHandler.ts @@ -1,5 +1,5 @@ import { InhibitorHandler } from 'discord-akairo'; -import { BushClient } from '..'; +import { BushClient } from './BushClient'; export class BushInhibitorHandler extends InhibitorHandler { public declare client: BushClient; diff --git a/src/lib/extensions/discord-akairo/BushListener.ts b/src/lib/extensions/discord-akairo/BushListener.ts index 573bed9..e555e89 100644 --- a/src/lib/extensions/discord-akairo/BushListener.ts +++ b/src/lib/extensions/discord-akairo/BushListener.ts @@ -1,5 +1,5 @@ import { Listener } from 'discord-akairo'; -import { BushClient } from '..'; +import { BushClient } from './BushClient'; export class BushListener extends Listener { public declare client: BushClient; diff --git a/src/lib/extensions/discord-akairo/BushListenerHandler.ts b/src/lib/extensions/discord-akairo/BushListenerHandler.ts index 73ca2df..28615fc 100644 --- a/src/lib/extensions/discord-akairo/BushListenerHandler.ts +++ b/src/lib/extensions/discord-akairo/BushListenerHandler.ts @@ -1,5 +1,5 @@ import { ListenerHandler } from 'discord-akairo'; -import { BushClient } from '..'; +import { BushClient } from './BushClient'; export class BushListenerHandler extends ListenerHandler { declare client: BushClient; diff --git a/src/lib/extensions/discord-akairo/BushSlashMessage.ts b/src/lib/extensions/discord-akairo/BushSlashMessage.ts index 63358b0..eee6ac2 100644 --- a/src/lib/extensions/discord-akairo/BushSlashMessage.ts +++ b/src/lib/extensions/discord-akairo/BushSlashMessage.ts @@ -1,6 +1,10 @@ import { AkairoMessage } from 'discord-akairo'; import { CommandInteraction } from 'discord.js'; -import { BushClient, BushCommandUtil, BushGuild, BushGuildMember, BushUser } from '..'; +import { BushGuild } from '../discord.js/BushGuild'; +import { BushGuildMember } from '../discord.js/BushGuildMember'; +import { BushUser } from '../discord.js/BushUser'; +import { BushClient } from './BushClient'; +import { BushCommandUtil } from './BushCommandUtil'; export class BushSlashMessage extends AkairoMessage { public declare client: BushClient; diff --git a/src/lib/extensions/discord-akairo/BushTask.ts b/src/lib/extensions/discord-akairo/BushTask.ts index 498a837..b315270 100644 --- a/src/lib/extensions/discord-akairo/BushTask.ts +++ b/src/lib/extensions/discord-akairo/BushTask.ts @@ -1,9 +1,9 @@ import { Task, TaskOptions } from 'discord-akairo'; -import { BushClient } from '..'; +import { BushClient } from './BushClient'; export class BushTask extends Task { + public declare client: BushClient; public constructor(id: string, options?: TaskOptions) { super(id, options); } - public declare client: BushClient; } diff --git a/src/lib/extensions/discord-akairo/BushTaskHandler.ts b/src/lib/extensions/discord-akairo/BushTaskHandler.ts index a24aa23..588988d 100644 --- a/src/lib/extensions/discord-akairo/BushTaskHandler.ts +++ b/src/lib/extensions/discord-akairo/BushTaskHandler.ts @@ -1,5 +1,5 @@ import { AkairoHandlerOptions, TaskHandler } from 'discord-akairo'; -import { BushClient } from '..'; +import { BushClient } from './BushClient'; export type BushTaskHandlerOptions = AkairoHandlerOptions; diff --git a/src/lib/extensions/discord-akairo/index.ts b/src/lib/extensions/discord-akairo/index.ts deleted file mode 100644 index fd92de2..0000000 --- a/src/lib/extensions/discord-akairo/index.ts +++ /dev/null @@ -1,13 +0,0 @@ -export * from './BushArgumentTypeCaster'; -export * from './BushClient'; -export * from './BushClientUtil'; -export * from './BushCommand'; -export * from './BushCommandHandler'; -export * from './BushCommandUtil'; -export * from './BushInhibitor'; -export * from './BushInhibitorHandler'; -export * from './BushListener'; -export * from './BushListenerHandler'; -export * from './BushSlashMessage'; -export * from './BushTask'; -export * from './BushTaskHandler'; diff --git a/src/lib/extensions/discord.js/BushActivity.ts b/src/lib/extensions/discord.js/BushActivity.ts index 1ac19ed..6ca1611 100644 --- a/src/lib/extensions/discord.js/BushActivity.ts +++ b/src/lib/extensions/discord.js/BushActivity.ts @@ -1,5 +1,6 @@ import { Activity } from 'discord.js'; -import { BushEmoji, BushPresence } from '..'; +import { BushEmoji } from './BushEmoji'; +import { BushPresence } from './BushPresence'; export class BushActivity extends Activity { public emoji: BushEmoji | null; diff --git a/src/lib/extensions/discord.js/BushApplicationCommand.ts b/src/lib/extensions/discord.js/BushApplicationCommand.ts index 97cc650..5a0e139 100644 --- a/src/lib/extensions/discord.js/BushApplicationCommand.ts +++ b/src/lib/extensions/discord.js/BushApplicationCommand.ts @@ -1,7 +1,8 @@ /* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/no-unused-vars */ import { ApplicationCommand, Snowflake } from 'discord.js'; -import { BushClient, BushGuild } from '..'; +import { BushClient } from '../discord-akairo/BushClient'; +import { BushGuild } from './BushGuild'; export class BushApplicationCommand extends ApplicationCommand { public declare readonly client: BushClient; diff --git a/src/lib/extensions/discord.js/BushApplicationCommandManager.ts b/src/lib/extensions/discord.js/BushApplicationCommandManager.ts index 74def59..51c93dd 100644 --- a/src/lib/extensions/discord.js/BushApplicationCommandManager.ts +++ b/src/lib/extensions/discord.js/BushApplicationCommandManager.ts @@ -1,6 +1,9 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ import { ApplicationCommandManager, GuildResolvable, Snowflake } from 'discord.js'; -import { BushApplicationCommand, BushApplicationCommandPermissionsManager, BushClient, BushGuildResolvable } from '..'; +import { BushClient } from '../discord-akairo/BushClient'; +import { BushApplicationCommand } from './BushApplicationCommand'; +import { BushApplicationCommandPermissionsManager } from './BushApplicationCommandPermissionsManager'; +import { BushGuildResolvable } from './BushCommandInteraction'; export type BushApplicationCommandResolvable = BushApplicationCommand | Snowflake; diff --git a/src/lib/extensions/discord.js/BushApplicationCommandPermissionsManager.ts b/src/lib/extensions/discord.js/BushApplicationCommandPermissionsManager.ts index 29be5d9..3779c93 100644 --- a/src/lib/extensions/discord.js/BushApplicationCommandPermissionsManager.ts +++ b/src/lib/extensions/discord.js/BushApplicationCommandPermissionsManager.ts @@ -1,10 +1,13 @@ import { + ApplicationCommandPermissionsManager, ApplicationCommand, ApplicationCommandManager, - ApplicationCommandPermissionsManager, GuildApplicationCommandManager } from 'discord.js'; -import { BushApplicationCommand, BushApplicationCommandManager, BushClient, BushGuildApplicationCommandManager } from '..'; +import { BushClient } from '../discord-akairo/BushClient'; +import { BushApplicationCommand } from './BushApplicationCommand'; +import { BushApplicationCommandManager } from './BushApplicationCommandManager'; +import { BushGuildApplicationCommandManager } from './BushGuildApplicationCommandManager'; export class BushApplicationCommandPermissionsManager< BaseOptions, diff --git a/src/lib/extensions/discord.js/BushButtonInteraction.ts b/src/lib/extensions/discord.js/BushButtonInteraction.ts index 6f934bc..3a54f61 100644 --- a/src/lib/extensions/discord.js/BushButtonInteraction.ts +++ b/src/lib/extensions/discord.js/BushButtonInteraction.ts @@ -1,6 +1,12 @@ import { APIInteractionGuildMember } from 'discord-api-types/v8'; import { ButtonInteraction, PartialDMChannel } from 'discord.js'; -import { BushClient, BushDMChannel, BushGuild, BushGuildMember, BushNewsChannel, BushTextChannel, BushUser } from '..'; +import { BushClient } from '../discord-akairo/BushClient'; +import { BushDMChannel } from './BushDMChannel'; +import { BushGuild } from './BushGuild'; +import { BushGuildMember } from './BushGuildMember'; +import { BushNewsChannel } from './BushNewsChannel'; +import { BushTextChannel } from './BushTextChannel'; +import { BushUser } from './BushUser'; export class BushButtonInteraction extends ButtonInteraction { public declare readonly channel: BushTextChannel | BushDMChannel | BushNewsChannel | PartialDMChannel | null; diff --git a/src/lib/extensions/discord.js/BushCategoryChannel.ts b/src/lib/extensions/discord.js/BushCategoryChannel.ts index 584fc6d..a66b2c6 100644 --- a/src/lib/extensions/discord.js/BushCategoryChannel.ts +++ b/src/lib/extensions/discord.js/BushCategoryChannel.ts @@ -1,5 +1,8 @@ import { CategoryChannel, Collection, Snowflake } from 'discord.js'; -import { BushClient, BushGuild, BushGuildChannel, BushGuildMember } from '..'; +import { BushClient } from '../discord-akairo/BushClient'; +import { BushGuild } from './BushGuild'; +import { BushGuildChannel } from './BushGuildChannel'; +import { BushGuildMember } from './BushGuildMember'; export class BushCategoryChannel extends CategoryChannel { public declare readonly client: BushClient; diff --git a/src/lib/extensions/discord.js/BushCommandInteraction.ts b/src/lib/extensions/discord.js/BushCommandInteraction.ts index d1ba954..84c0707 100644 --- a/src/lib/extensions/discord.js/BushCommandInteraction.ts +++ b/src/lib/extensions/discord.js/BushCommandInteraction.ts @@ -9,16 +9,14 @@ import { Snowflake, TextChannel } from 'discord.js'; -import { - BushApplicationCommand, - BushClient, - BushGuild, - BushGuildChannel, - BushGuildEmoji, - BushGuildMember, - BushRole, - BushUser -} from '..'; +import { BushClient } from '../discord-akairo/BushClient'; +import { BushApplicationCommand } from './BushApplicationCommand'; +import { BushGuild } from './BushGuild'; +import { BushGuildChannel } from './BushGuildChannel'; +import { BushGuildEmoji } from './BushGuildEmoji'; +import { BushGuildMember } from './BushGuildMember'; +import { BushRole } from './BushRole'; +import { BushUser } from './BushUser'; export type BushGuildResolvable = | BushGuild diff --git a/src/lib/extensions/discord.js/BushDMChannel.ts b/src/lib/extensions/discord.js/BushDMChannel.ts index c6f5ca3..9bf814b 100644 --- a/src/lib/extensions/discord.js/BushDMChannel.ts +++ b/src/lib/extensions/discord.js/BushDMChannel.ts @@ -1,5 +1,7 @@ import { DMChannel } from 'discord.js'; -import { BushClient, BushMessageManager, BushUser } from '..'; +import { BushClient } from '../discord-akairo/BushClient'; +import { BushMessageManager } from './BushMessageManager'; +import { BushUser } from './BushUser'; export class BushDMChannel extends DMChannel { public declare readonly client: BushClient; diff --git a/src/lib/extensions/discord.js/BushEmoji.ts b/src/lib/extensions/discord.js/BushEmoji.ts index 9d46d44..ba48166 100644 --- a/src/lib/extensions/discord.js/BushEmoji.ts +++ b/src/lib/extensions/discord.js/BushEmoji.ts @@ -1,5 +1,5 @@ import { Emoji } from 'discord.js'; -import { BushClient } from '..'; +import { BushClient } from '../discord-akairo/BushClient'; export class BushEmoji extends Emoji { public declare readonly client: BushClient; diff --git a/src/lib/extensions/discord.js/BushGuild.ts b/src/lib/extensions/discord.js/BushGuild.ts index 691dc92..ea34aec 100644 --- a/src/lib/extensions/discord.js/BushGuild.ts +++ b/src/lib/extensions/discord.js/BushGuild.ts @@ -1,5 +1,6 @@ import { Guild } from 'discord.js'; -import { BushClient, Guild as GuildDB, GuildModel } from '../..'; +import { Guild as GuildDB, GuildModel } from '../../models/Guild'; +import { BushClient } from '../discord-akairo/BushClient'; export class BushGuild extends Guild { public declare readonly client: BushClient; diff --git a/src/lib/extensions/discord.js/BushGuildApplicationCommandManager.ts b/src/lib/extensions/discord.js/BushGuildApplicationCommandManager.ts index 4c80bba..d4c1337 100644 --- a/src/lib/extensions/discord.js/BushGuildApplicationCommandManager.ts +++ b/src/lib/extensions/discord.js/BushGuildApplicationCommandManager.ts @@ -1,6 +1,6 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ import { GuildApplicationCommandManager } from 'discord.js'; -import { BushGuild } from '..'; +import { BushGuild } from './BushGuild'; export class BushGuildApplicationCommandManager extends GuildApplicationCommandManager { public guild: BushGuild; diff --git a/src/lib/extensions/discord.js/BushGuildChannel.ts b/src/lib/extensions/discord.js/BushGuildChannel.ts index 351e454..7eada41 100644 --- a/src/lib/extensions/discord.js/BushGuildChannel.ts +++ b/src/lib/extensions/discord.js/BushGuildChannel.ts @@ -1,5 +1,6 @@ import { GuildChannel } from 'discord.js'; -import { BushClient, BushGuild } from '..'; +import { BushClient } from '../discord-akairo/BushClient'; +import { BushGuild } from './BushGuild'; export class BushGuildChannel extends GuildChannel { public declare readonly client: BushClient; diff --git a/src/lib/extensions/discord.js/BushGuildEmoji.ts b/src/lib/extensions/discord.js/BushGuildEmoji.ts index ed41bf8..c03c1b5 100644 --- a/src/lib/extensions/discord.js/BushGuildEmoji.ts +++ b/src/lib/extensions/discord.js/BushGuildEmoji.ts @@ -1,5 +1,8 @@ import { GuildEmoji } from 'discord.js'; -import { BushClient, BushGuild, BushGuildEmojiRoleManager, BushUser } from '..'; +import { BushClient } from '../discord-akairo/BushClient'; +import { BushGuild } from './BushGuild'; +import { BushGuildEmojiRoleManager } from './BushGuildEmojiRoleManager'; +import { BushUser } from './BushUser'; export class BushGuildEmoji extends GuildEmoji { public declare readonly client: BushClient; diff --git a/src/lib/extensions/discord.js/BushGuildEmojiRoleManager.ts b/src/lib/extensions/discord.js/BushGuildEmojiRoleManager.ts index 042d062..00afb25 100644 --- a/src/lib/extensions/discord.js/BushGuildEmojiRoleManager.ts +++ b/src/lib/extensions/discord.js/BushGuildEmojiRoleManager.ts @@ -1,5 +1,7 @@ import { Collection, GuildEmojiRoleManager, Snowflake } from 'discord.js'; -import { BushGuild, BushGuildEmoji, BushRole } from '..'; +import { BushGuild } from './BushGuild'; +import { BushGuildEmoji } from './BushGuildEmoji'; +import { BushRole } from './BushRole'; export class BushGuildEmojiRoleManager extends GuildEmojiRoleManager { public declare emoji: BushGuildEmoji; diff --git a/src/lib/extensions/discord.js/BushGuildMember.ts b/src/lib/extensions/discord.js/BushGuildMember.ts index 4dcd99c..9e9266e 100644 --- a/src/lib/extensions/discord.js/BushGuildMember.ts +++ b/src/lib/extensions/discord.js/BushGuildMember.ts @@ -1,6 +1,9 @@ /* eslint-disable @typescript-eslint/no-unused-vars */ import { GuildMember, RoleResolvable } from 'discord.js'; -import { BushClient, BushGuild, BushUser, BushUserResolvable, ModLogType } from '../..'; +import { ModLogType } from '../../models/ModLog'; +import { BushClient, BushUserResolvable } from '../discord-akairo/BushClient'; +import { BushGuild } from './BushGuild'; +import { BushUser } from './BushUser'; interface BushPunishmentOptions { reason?: string; diff --git a/src/lib/extensions/discord.js/BushGuildMemberManager.ts b/src/lib/extensions/discord.js/BushGuildMemberManager.ts index 7643463..dbc2da5 100644 --- a/src/lib/extensions/discord.js/BushGuildMemberManager.ts +++ b/src/lib/extensions/discord.js/BushGuildMemberManager.ts @@ -1,6 +1,6 @@ // /* eslint-disable @typescript-eslint/no-explicit-any */ // import { GuildMemberManager } from 'discord.js'; -// import { BushGuild } from '..'; +// import { BushGuild } from './BushGuild'; // export class BushGuildMemberManager extends GuildMemberManager { // public guild: BushGuild; diff --git a/src/lib/extensions/discord.js/BushMessage.ts b/src/lib/extensions/discord.js/BushMessage.ts index 3694356..d4b47c6 100644 --- a/src/lib/extensions/discord.js/BushMessage.ts +++ b/src/lib/extensions/discord.js/BushMessage.ts @@ -1,14 +1,12 @@ import { Message } from 'discord.js'; -import { - BushClient, - BushDMChannel, - BushGuild, - BushGuildMember, - BushNewsChannel, - BushTextChannel, - BushThreadChannel, - BushUser -} from '..'; +import { BushClient } from '../discord-akairo/BushClient'; +import { BushDMChannel } from './BushDMChannel'; +import { BushGuild } from './BushGuild'; +import { BushGuildMember } from './BushGuildMember'; +import { BushNewsChannel } from './BushNewsChannel'; +import { BushTextChannel } from './BushTextChannel'; +import { BushThreadChannel } from './BushThreadChannel'; +import { BushUser } from './BushUser'; export class BushMessage extends Message { public declare readonly client: BushClient; diff --git a/src/lib/extensions/discord.js/BushMessageManager.ts b/src/lib/extensions/discord.js/BushMessageManager.ts index fb449f2..181808a 100644 --- a/src/lib/extensions/discord.js/BushMessageManager.ts +++ b/src/lib/extensions/discord.js/BushMessageManager.ts @@ -1,6 +1,10 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ import { Collection, MessageManager, Snowflake } from 'discord.js'; -import { BushClient, BushDMChannel, BushMessage, BushTextChannel, BushThreadChannel } from '..'; +import { BushClient } from '../discord-akairo/BushClient'; +import { BushDMChannel } from './BushDMChannel'; +import { BushMessage } from './BushMessage'; +import { BushTextChannel } from './BushTextChannel'; +import { BushThreadChannel } from './BushThreadChannel'; export class BushMessageManager extends MessageManager { public declare readonly client: BushClient; diff --git a/src/lib/extensions/discord.js/BushMessageReaction.ts b/src/lib/extensions/discord.js/BushMessageReaction.ts index 0f81c3f..9958059 100644 --- a/src/lib/extensions/discord.js/BushMessageReaction.ts +++ b/src/lib/extensions/discord.js/BushMessageReaction.ts @@ -1,5 +1,8 @@ import { MessageReaction } from 'discord.js'; -import { BushClient, BushGuildEmoji, BushMessage, BushReactionEmoji } from '..'; +import { BushClient } from '../discord-akairo/BushClient'; +import { BushGuildEmoji } from './BushGuildEmoji'; +import { BushMessage } from './BushMessage'; +import { BushReactionEmoji } from './BushReactionEmoji'; export class BushMessageReaction extends MessageReaction { public readonly client: BushClient; diff --git a/src/lib/extensions/discord.js/BushNewsChannel.ts b/src/lib/extensions/discord.js/BushNewsChannel.ts index 1b23abf..9682632 100644 --- a/src/lib/extensions/discord.js/BushNewsChannel.ts +++ b/src/lib/extensions/discord.js/BushNewsChannel.ts @@ -1,5 +1,8 @@ import { AllowedThreadTypeForNewsChannel, NewsChannel } from 'discord.js'; -import { BushClient, BushGuild, BushMessageManager, BushThreadManager } from '..'; +import { BushClient } from '../discord-akairo/BushClient'; +import { BushGuild } from './BushGuild'; +import { BushMessageManager } from './BushMessageManager'; +import { BushThreadManager } from './BushThreadManager'; export class BushNewsChannel extends NewsChannel { public declare readonly client: BushClient; diff --git a/src/lib/extensions/discord.js/BushPresence.ts b/src/lib/extensions/discord.js/BushPresence.ts index a119bf9..13c7567 100644 --- a/src/lib/extensions/discord.js/BushPresence.ts +++ b/src/lib/extensions/discord.js/BushPresence.ts @@ -1,5 +1,8 @@ import { Presence } from 'discord.js'; -import { BushClient, BushGuild, BushGuildMember, BushUser } from '..'; +import { BushClient } from '../discord-akairo/BushClient'; +import { BushGuild } from './BushGuild'; +import { BushGuildMember } from './BushGuildMember'; +import { BushUser } from './BushUser'; export class BushPresence extends Presence { public declare guild: BushGuild | null; diff --git a/src/lib/extensions/discord.js/BushReactionEmoji.ts b/src/lib/extensions/discord.js/BushReactionEmoji.ts index 404ac17..a25c1b8 100644 --- a/src/lib/extensions/discord.js/BushReactionEmoji.ts +++ b/src/lib/extensions/discord.js/BushReactionEmoji.ts @@ -1,5 +1,6 @@ import { ReactionEmoji } from 'discord.js'; -import { BushClient, BushMessageReaction } from '..'; +import { BushClient } from '../discord-akairo/BushClient'; +import { BushMessageReaction } from './BushMessageReaction'; export class BushReactionEmoji extends ReactionEmoji { public declare readonly client: BushClient; diff --git a/src/lib/extensions/discord.js/BushRole.ts b/src/lib/extensions/discord.js/BushRole.ts index d4df18e..1d502b2 100644 --- a/src/lib/extensions/discord.js/BushRole.ts +++ b/src/lib/extensions/discord.js/BushRole.ts @@ -1,5 +1,7 @@ import { Collection, Role, Snowflake } from 'discord.js'; -import { BushClient, BushGuild, BushGuildMember } from '..'; +import { BushClient } from '../discord-akairo/BushClient'; +import { BushGuild } from './BushGuild'; +import { BushGuildMember } from './BushGuildMember'; export class BushRole extends Role { public declare readonly client: BushClient; diff --git a/src/lib/extensions/discord.js/BushSelectMenuInteraction.ts b/src/lib/extensions/discord.js/BushSelectMenuInteraction.ts index 4099fa1..1dd1638 100644 --- a/src/lib/extensions/discord.js/BushSelectMenuInteraction.ts +++ b/src/lib/extensions/discord.js/BushSelectMenuInteraction.ts @@ -1,6 +1,12 @@ import { APIInteractionGuildMember } from 'discord-api-types/v8'; import { PartialDMChannel, SelectMenuInteraction } from 'discord.js'; -import { BushClient, BushDMChannel, BushGuild, BushGuildMember, BushNewsChannel, BushTextChannel, BushUser } from '..'; +import { BushClient } from '../discord-akairo/BushClient'; +import { BushDMChannel } from './BushDMChannel'; +import { BushGuild } from './BushGuild'; +import { BushGuildMember } from './BushGuildMember'; +import { BushNewsChannel } from './BushNewsChannel'; +import { BushTextChannel } from './BushTextChannel'; +import { BushUser } from './BushUser'; export class BushSelectMenuInteraction extends SelectMenuInteraction { public declare readonly channel: BushTextChannel | BushDMChannel | BushNewsChannel | PartialDMChannel | null; diff --git a/src/lib/extensions/discord.js/BushStageChannel.ts b/src/lib/extensions/discord.js/BushStageChannel.ts index a29fc5a..5bd3f45 100644 --- a/src/lib/extensions/discord.js/BushStageChannel.ts +++ b/src/lib/extensions/discord.js/BushStageChannel.ts @@ -1,5 +1,9 @@ import { Collection, Snowflake, StageChannel } from 'discord.js'; -import { BushCategoryChannel, BushClient, BushGuild, BushGuildMember, BushStageInstance } from '..'; +import { BushClient } from '../discord-akairo/BushClient'; +import { BushCategoryChannel } from './BushCategoryChannel'; +import { BushGuild } from './BushGuild'; +import { BushGuildMember } from './BushGuildMember'; +import { BushStageInstance } from './BushStageInstance'; export class BushStageChannel extends StageChannel { public declare readonly client: BushClient; diff --git a/src/lib/extensions/discord.js/BushStageInstance.ts b/src/lib/extensions/discord.js/BushStageInstance.ts index e5d99b1..f162d33 100644 --- a/src/lib/extensions/discord.js/BushStageInstance.ts +++ b/src/lib/extensions/discord.js/BushStageInstance.ts @@ -1,5 +1,7 @@ import { StageInstance } from 'discord.js'; -import { BushClient, BushGuild, BushStageChannel } from '..'; +import { BushClient } from '../discord-akairo/BushClient'; +import { BushGuild } from './BushGuild'; +import { BushStageChannel } from './BushStageChannel'; export class BushStageInstance extends StageInstance { public declare readonly client: BushClient; diff --git a/src/lib/extensions/discord.js/BushStoreChannel.ts b/src/lib/extensions/discord.js/BushStoreChannel.ts index f730828..8ce22c0 100644 --- a/src/lib/extensions/discord.js/BushStoreChannel.ts +++ b/src/lib/extensions/discord.js/BushStoreChannel.ts @@ -1,5 +1,8 @@ import { Collection, Snowflake, StoreChannel } from 'discord.js'; -import { BushCategoryChannel, BushClient, BushGuild, BushGuildMember } from '..'; +import { BushClient } from '../discord-akairo/BushClient'; +import { BushCategoryChannel } from './BushCategoryChannel'; +import { BushGuild } from './BushGuild'; +import { BushGuildMember } from './BushGuildMember'; export class BushStoreChannel extends StoreChannel { public declare readonly client: BushClient; diff --git a/src/lib/extensions/discord.js/BushTextChannel.ts b/src/lib/extensions/discord.js/BushTextChannel.ts index 2572378..26e3858 100644 --- a/src/lib/extensions/discord.js/BushTextChannel.ts +++ b/src/lib/extensions/discord.js/BushTextChannel.ts @@ -1,5 +1,7 @@ import { TextChannel } from 'discord.js'; -import { BushClient, BushGuild, BushMessageManager } from '..'; +import { BushClient } from '../discord-akairo/BushClient'; +import { BushGuild } from './BushGuild'; +import { BushMessageManager } from './BushMessageManager'; export class BushTextChannel extends TextChannel { public declare readonly client: BushClient; diff --git a/src/lib/extensions/discord.js/BushThreadChannel.ts b/src/lib/extensions/discord.js/BushThreadChannel.ts index 8d7c353..455939d 100644 --- a/src/lib/extensions/discord.js/BushThreadChannel.ts +++ b/src/lib/extensions/discord.js/BushThreadChannel.ts @@ -1,14 +1,13 @@ /* eslint-disable @typescript-eslint/ban-types */ + import { Collection, Snowflake, ThreadChannel } from 'discord.js'; -import { - BushClient, - BushGuild, - BushGuildMember, - BushMessageManager, - BushNewsChannel, - BushTextChannel, - BushThreadMemberManager -} from '..'; +import { BushClient } from '../discord-akairo/BushClient'; +import { BushGuild } from './BushGuild'; +import { BushGuildMember } from './BushGuildMember'; +import { BushMessageManager } from './BushMessageManager'; +import { BushNewsChannel } from './BushNewsChannel'; +import { BushTextChannel } from './BushTextChannel'; +import { BushThreadMemberManager } from './BushThreadMemberManager'; export class BushThreadChannel extends ThreadChannel { public declare guild: BushGuild; diff --git a/src/lib/extensions/discord.js/BushThreadManager.ts b/src/lib/extensions/discord.js/BushThreadManager.ts index 15a1c8e..50eaa2d 100644 --- a/src/lib/extensions/discord.js/BushThreadManager.ts +++ b/src/lib/extensions/discord.js/BushThreadManager.ts @@ -1,6 +1,7 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ import { ThreadManager } from 'discord.js'; -import { BushNewsChannel, BushTextChannel } from '..'; +import { BushNewsChannel } from './BushNewsChannel'; +import { BushTextChannel } from './BushTextChannel'; export class BushThreadManager extends ThreadManager { public declare channel: BushTextChannel | BushNewsChannel; diff --git a/src/lib/extensions/discord.js/BushThreadMember.ts b/src/lib/extensions/discord.js/BushThreadMember.ts index 634606f..4ef51ae 100644 --- a/src/lib/extensions/discord.js/BushThreadMember.ts +++ b/src/lib/extensions/discord.js/BushThreadMember.ts @@ -1,6 +1,8 @@ /* eslint-disable @typescript-eslint/ban-types */ import { ThreadMember } from 'discord.js'; -import { BushGuildMember, BushThreadChannel, BushUser } from '..'; +import { BushGuildMember } from './BushGuildMember'; +import { BushThreadChannel } from './BushThreadChannel'; +import { BushUser } from './BushUser'; export class BushThreadMember extends ThreadMember { public declare readonly guildMember: BushGuildMember | null; diff --git a/src/lib/extensions/discord.js/BushThreadMemberManager.ts b/src/lib/extensions/discord.js/BushThreadMemberManager.ts index df4fc74..e585ee7 100644 --- a/src/lib/extensions/discord.js/BushThreadMemberManager.ts +++ b/src/lib/extensions/discord.js/BushThreadMemberManager.ts @@ -1,7 +1,8 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ /* eslint-disable @typescript-eslint/no-empty-interface */ import { ThreadMemberManager } from 'discord.js'; -import { BushClient, BushThreadChannel } from '..'; +import { BushClient } from '../discord-akairo/BushClient'; +import { BushThreadChannel } from './BushThreadChannel'; export class BushThreadMemberManager extends ThreadMemberManager { public declare thread: BushThreadChannel; diff --git a/src/lib/extensions/discord.js/BushUser.ts b/src/lib/extensions/discord.js/BushUser.ts index 64b803c..53a6be3 100644 --- a/src/lib/extensions/discord.js/BushUser.ts +++ b/src/lib/extensions/discord.js/BushUser.ts @@ -1,5 +1,6 @@ import { User } from 'discord.js'; -import { BushClient, BushDMChannel } from '..'; +import { BushClient } from '../discord-akairo/BushClient'; +import { BushDMChannel } from './BushDMChannel'; export class BushUser extends User { public declare readonly client: BushClient; diff --git a/src/lib/extensions/discord.js/BushVoiceChannel.ts b/src/lib/extensions/discord.js/BushVoiceChannel.ts index 4f96b1f..82a68b1 100644 --- a/src/lib/extensions/discord.js/BushVoiceChannel.ts +++ b/src/lib/extensions/discord.js/BushVoiceChannel.ts @@ -1,5 +1,7 @@ import { Collection, Snowflake, VoiceChannel } from 'discord.js'; -import { BushClient, BushGuild, BushGuildMember } from '..'; +import { BushClient } from '../discord-akairo/BushClient'; +import { BushGuild } from './BushGuild'; +import { BushGuildMember } from './BushGuildMember'; export class BushVoiceChannel extends VoiceChannel { public declare readonly client: BushClient; diff --git a/src/lib/extensions/discord.js/BushVoiceState.ts b/src/lib/extensions/discord.js/BushVoiceState.ts index 1d00e20..d93fa13 100644 --- a/src/lib/extensions/discord.js/BushVoiceState.ts +++ b/src/lib/extensions/discord.js/BushVoiceState.ts @@ -1,5 +1,8 @@ import { VoiceState } from 'discord.js'; -import { BushGuild, BushGuildMember, BushStageChannel, BushVoiceChannel } from '..'; +import { BushGuild } from './BushGuild'; +import { BushGuildMember } from './BushGuildMember'; +import { BushStageChannel } from './BushStageChannel'; +import { BushVoiceChannel } from './BushVoiceChannel'; export class BushVoiceState extends VoiceState { public readonly channel: BushVoiceChannel | BushStageChannel | null; diff --git a/src/lib/extensions/discord.js/index.ts b/src/lib/extensions/discord.js/index.ts deleted file mode 100644 index 766500d..0000000 --- a/src/lib/extensions/discord.js/index.ts +++ /dev/null @@ -1,35 +0,0 @@ -export * from './BushActivity'; -export * from './BushApplicationCommand'; -export * from './BushApplicationCommandManager'; -export * from './BushApplicationCommandPermissionsManager'; -export * from './BushButtonInteraction'; -export * from './BushCategoryChannel'; -export * from './BushCommandInteraction'; -export * from './BushDMChannel'; -export * from './BushEmoji'; -export * from './BushGuild'; -export * from './BushGuildApplicationCommandManager'; -export * from './BushGuildChannel'; -export * from './BushGuildEmoji'; -export * from './BushGuildEmojiRoleManager'; -export * from './BushGuildMember'; -// export * from './BushGuildMemberManager'; -export * from './BushMessage'; -export * from './BushMessageManager'; -export * from './BushMessageReaction'; -export * from './BushNewsChannel'; -export * from './BushPresence'; -export * from './BushReactionEmoji'; -export * from './BushRole'; -export * from './BushSelectMenuInteraction'; -export * from './BushStageChannel'; -export * from './BushStageInstance'; -export * from './BushStoreChannel'; -export * from './BushTextChannel'; -export * from './BushThreadChannel'; -export * from './BushThreadManager'; -export * from './BushThreadMember'; -export * from './BushThreadMemberManager'; -export * from './BushUser'; -export * from './BushVoiceChannel'; -export * from './BushVoiceState'; diff --git a/src/lib/extensions/global.d.ts b/src/lib/extensions/global.d.ts index 6b5d129..8c7a117 100644 --- a/src/lib/extensions/global.d.ts +++ b/src/lib/extensions/global.d.ts @@ -1,6 +1,6 @@ import { BushClient } from './discord-akairo/BushClient'; declare global { - declare namespace NodeJS { + namespace NodeJS { export interface Global { client: BushClient; } diff --git a/src/lib/extensions/index.ts b/src/lib/extensions/index.ts deleted file mode 100644 index 318adcc..0000000 --- a/src/lib/extensions/index.ts +++ /dev/null @@ -1,3 +0,0 @@ -export * from './discord-akairo/index'; -export * from './discord.js/index'; -export * from './global'; diff --git a/src/lib/index.ts b/src/lib/index.ts index 6a1433c..1059e2b 100644 --- a/src/lib/index.ts +++ b/src/lib/index.ts @@ -1,3 +1,62 @@ -export * from './extensions'; -export * from './models'; -export * from './utils'; +export * from './extensions/discord-akairo/BushArgumentTypeCaster'; +export * from './extensions/discord-akairo/BushClient'; +export * from './extensions/discord-akairo/BushClientUtil'; +export * from './extensions/discord-akairo/BushCommand'; +export * from './extensions/discord-akairo/BushCommandHandler'; +export * from './extensions/discord-akairo/BushCommandUtil'; +export * from './extensions/discord-akairo/BushInhibitor'; +export * from './extensions/discord-akairo/BushInhibitorHandler'; +export * from './extensions/discord-akairo/BushListener'; +export * from './extensions/discord-akairo/BushListenerHandler'; +export * from './extensions/discord-akairo/BushSlashMessage'; +export * from './extensions/discord-akairo/BushTask'; +export * from './extensions/discord-akairo/BushTaskHandler'; +export * from './extensions/discord.js/BushActivity'; +export * from './extensions/discord.js/BushApplicationCommand'; +export * from './extensions/discord.js/BushApplicationCommandManager'; +export * from './extensions/discord.js/BushApplicationCommandPermissionsManager'; +export * from './extensions/discord.js/BushButtonInteraction'; +export * from './extensions/discord.js/BushCategoryChannel'; +export * from './extensions/discord.js/BushCommandInteraction'; +export * from './extensions/discord.js/BushDMChannel'; +export * from './extensions/discord.js/BushEmoji'; +export * from './extensions/discord.js/BushGuild'; +export * from './extensions/discord.js/BushGuildApplicationCommandManager'; +export * from './extensions/discord.js/BushGuildChannel'; +export * from './extensions/discord.js/BushGuildEmoji'; +export * from './extensions/discord.js/BushGuildEmojiRoleManager'; +export * from './extensions/discord.js/BushGuildMember'; +// export * from './extensions/discord.js/BushGuildMemberManager'; +export * from './extensions/discord.js/BushMessage'; +export * from './extensions/discord.js/BushMessageManager'; +export * from './extensions/discord.js/BushMessageReaction'; +export * from './extensions/discord.js/BushNewsChannel'; +export * from './extensions/discord.js/BushPresence'; +export * from './extensions/discord.js/BushReactionEmoji'; +export * from './extensions/discord.js/BushRole'; +export * from './extensions/discord.js/BushSelectMenuInteraction'; +export * from './extensions/discord.js/BushStageChannel'; +export * from './extensions/discord.js/BushStageInstance'; +export * from './extensions/discord.js/BushStoreChannel'; +export * from './extensions/discord.js/BushTextChannel'; +export * from './extensions/discord.js/BushThreadChannel'; +export * from './extensions/discord.js/BushThreadManager'; +export * from './extensions/discord.js/BushThreadMember'; +export * from './extensions/discord.js/BushThreadMemberManager'; +export * from './extensions/discord.js/BushUser'; +export * from './extensions/discord.js/BushVoiceChannel'; +export * from './extensions/discord.js/BushVoiceState'; +export * from './models/Ban'; +export * from './models/BaseModel'; +export * from './models/Global'; +export * from './models/Guild'; +export * from './models/Level'; +export * from './models/ModLog'; +export * from './models/Mute'; +export * from './models/PunishmentRole'; +export * from './models/StickyRole'; +export * from './utils/AllowedMentions'; +export * from './utils/BushCache'; +export * from './utils/BushConstants'; +export * from './utils/BushLogger'; +export * from './utils/CanvasProgressBar'; diff --git a/src/lib/models/Ban.ts b/src/lib/models/Ban.ts index eac03e2..54ca6ae 100644 --- a/src/lib/models/Ban.ts +++ b/src/lib/models/Ban.ts @@ -1,7 +1,7 @@ import { Snowflake } from 'discord.js'; import { DataTypes, Sequelize } from 'sequelize'; import { v4 as uuidv4 } from 'uuid'; -import { BaseModel } from '..'; +import { BaseModel } from './BaseModel'; export interface BanModel { id: string; diff --git a/src/lib/models/Global.ts b/src/lib/models/Global.ts index 7018fae..842f14b 100644 --- a/src/lib/models/Global.ts +++ b/src/lib/models/Global.ts @@ -1,6 +1,6 @@ import { Snowflake } from 'discord.js'; import { DataTypes, Optional, Sequelize } from 'sequelize'; -import { BaseModel } from '..'; +import { BaseModel } from './BaseModel'; export interface GlobalModel { environment: 'production' | 'development'; diff --git a/src/lib/models/Guild.ts b/src/lib/models/Guild.ts index 5980fb9..0fc3413 100644 --- a/src/lib/models/Guild.ts +++ b/src/lib/models/Guild.ts @@ -1,6 +1,7 @@ import { Snowflake } from 'discord.js'; import { DataTypes, Optional, Sequelize } from 'sequelize'; -import { BaseModel, BushClient } from '..'; +import { BushClient } from '../extensions/discord-akairo/BushClient'; +import { BaseModel } from './BaseModel'; export interface GuildModel { id: string; diff --git a/src/lib/models/Level.ts b/src/lib/models/Level.ts index 0daa61b..e1f30f4 100644 --- a/src/lib/models/Level.ts +++ b/src/lib/models/Level.ts @@ -1,5 +1,5 @@ import { DataTypes, Sequelize } from 'sequelize'; -import { BaseModel } from '..'; +import { BaseModel } from './BaseModel'; export interface LevelModel { id: string; diff --git a/src/lib/models/ModLog.ts b/src/lib/models/ModLog.ts index a1a3085..6261794 100644 --- a/src/lib/models/ModLog.ts +++ b/src/lib/models/ModLog.ts @@ -1,7 +1,7 @@ import { Snowflake } from 'discord.js'; import { DataTypes, Sequelize } from 'sequelize'; import { v4 as uuidv4 } from 'uuid'; -import { BaseModel } from '..'; +import { BaseModel } from './BaseModel'; export enum ModLogType { PERM_BAN = 'PERM_BAN', diff --git a/src/lib/models/Mute.ts b/src/lib/models/Mute.ts index 7ca40d5..71a32e3 100644 --- a/src/lib/models/Mute.ts +++ b/src/lib/models/Mute.ts @@ -1,7 +1,7 @@ import { Snowflake } from 'discord.js'; import { DataTypes, Sequelize } from 'sequelize'; import { v4 as uuidv4 } from 'uuid'; -import { BaseModel } from '..'; +import { BaseModel } from './BaseModel'; export interface MuteModel { id: string; diff --git a/src/lib/models/PunishmentRole.ts b/src/lib/models/PunishmentRole.ts index 9753b57..927cf28 100644 --- a/src/lib/models/PunishmentRole.ts +++ b/src/lib/models/PunishmentRole.ts @@ -1,7 +1,7 @@ import { Snowflake } from 'discord.js'; import { DataTypes, Sequelize } from 'sequelize'; import { v4 as uuidv4 } from 'uuid'; -import { BaseModel } from '..'; +import { BaseModel } from './BaseModel'; export interface PunishmentRoleModel { id: string; diff --git a/src/lib/models/StickyRole.ts b/src/lib/models/StickyRole.ts index d2dc9ac..a3928e7 100644 --- a/src/lib/models/StickyRole.ts +++ b/src/lib/models/StickyRole.ts @@ -1,6 +1,6 @@ import { Snowflake } from 'discord.js'; import { DataTypes, Sequelize } from 'sequelize'; -import { BaseModel } from '..'; +import { BaseModel } from './BaseModel'; export interface StickyRoleModel { user: Snowflake; diff --git a/src/lib/models/index.ts b/src/lib/models/index.ts deleted file mode 100644 index 794c335..0000000 --- a/src/lib/models/index.ts +++ /dev/null @@ -1,9 +0,0 @@ -export * from './Ban'; -export * from './BaseModel'; -export * from './Global'; -export * from './Guild'; -export * from './Level'; -export * from './ModLog'; -export * from './Mute'; -export * from './PunishmentRole'; -export * from './StickyRole'; diff --git a/src/lib/utils/BushLogger.ts b/src/lib/utils/BushLogger.ts index 184b100..915d8f1 100644 --- a/src/lib/utils/BushLogger.ts +++ b/src/lib/utils/BushLogger.ts @@ -3,7 +3,7 @@ import chalk from 'chalk'; import { MessageEmbed } from 'discord.js'; import { inspect } from 'util'; -import { BushClient, BushSendMessageType } from '..'; +import { BushClient, BushSendMessageType } from '../extensions/discord-akairo/BushClient'; export class BushLogger { private client: BushClient; diff --git a/src/lib/utils/index.ts b/src/lib/utils/index.ts deleted file mode 100644 index b0319e5..0000000 --- a/src/lib/utils/index.ts +++ /dev/null @@ -1,5 +0,0 @@ -export * from './AllowedMentions'; -export * from './BushCache'; -export * from './BushConstants'; -export * from './BushLogger'; -export * from './CanvasProgressBar'; diff --git a/src/listeners/client/interaction.ts b/src/listeners/client/interaction.ts index d7d8776..c848d15 100644 --- a/src/listeners/client/interaction.ts +++ b/src/listeners/client/interaction.ts @@ -1,5 +1,5 @@ +import { BushListener } from '@lib'; import { ButtonInteraction, CommandInteraction, Interaction, SelectMenuInteraction } from 'discord.js'; -import { BushListener } from '../../lib'; export default class InteractionListener extends BushListener { public constructor() { diff --git a/src/listeners/client/ready.ts b/src/listeners/client/ready.ts index d6e5f2f..c3d9b45 100644 --- a/src/listeners/client/ready.ts +++ b/src/listeners/client/ready.ts @@ -1,5 +1,5 @@ +import { BushListener } from '@lib'; import chalk from 'chalk'; -import { BushListener } from '../../lib'; export default class ReadyListener extends BushListener { public constructor() { @@ -20,15 +20,5 @@ export default class ReadyListener extends BushListener { `------------------------------------------------------------------------------${this.client.config.dev ? '---' : ''}` ) ); - - this.client.user.setPresence({ - activities: [ - { - name: 'Beep Boop', - type: 'WATCHING' - } - ], - status: 'online' - }); } } diff --git a/src/listeners/commands/commandBlocked.ts b/src/listeners/commands/commandBlocked.ts index aebc05d..03050c2 100644 --- a/src/listeners/commands/commandBlocked.ts +++ b/src/listeners/commands/commandBlocked.ts @@ -1,4 +1,4 @@ -import { BushCommand, BushListener, BushMessage } from '../../lib'; +import { BushCommand, BushListener, BushMessage } from '@lib'; export default class CommandBlockedListener extends BushListener { public constructor() { diff --git a/src/listeners/commands/commandError.ts b/src/listeners/commands/commandError.ts index 36a482d..9d51ea8 100644 --- a/src/listeners/commands/commandError.ts +++ b/src/listeners/commands/commandError.ts @@ -1,7 +1,7 @@ +import { BushListener, BushMessage } from '@lib'; import { stripIndents } from 'common-tags'; import { Command } from 'discord-akairo'; import { MessageEmbed } from 'discord.js'; -import { BushListener, BushMessage } from '../../lib'; export default class CommandErrorListener extends BushListener { public constructor() { diff --git a/src/listeners/commands/commandMissingPermissions.ts b/src/listeners/commands/commandMissingPermissions.ts index 7f04304..ffcc408 100644 --- a/src/listeners/commands/commandMissingPermissions.ts +++ b/src/listeners/commands/commandMissingPermissions.ts @@ -1,5 +1,5 @@ +import { BushCommand, BushListener, BushMessage } from '@lib'; import { PermissionString } from 'discord.js'; -import { BushCommand, BushListener, BushMessage } from '../../lib'; export default class CommandMissingPermissionsListener extends BushListener { public constructor() { diff --git a/src/listeners/commands/commandStarted.ts b/src/listeners/commands/commandStarted.ts index ba1af42..24bb041 100644 --- a/src/listeners/commands/commandStarted.ts +++ b/src/listeners/commands/commandStarted.ts @@ -1,5 +1,5 @@ +import { BushCommand, BushListener } from '@lib'; import { Message } from 'discord.js'; -import { BushCommand, BushListener } from '../../lib'; export default class CommandStartedListener extends BushListener { public constructor() { diff --git a/src/listeners/commands/slashBlocked.ts b/src/listeners/commands/slashBlocked.ts index a2e4b0e..bf98734 100644 --- a/src/listeners/commands/slashBlocked.ts +++ b/src/listeners/commands/slashBlocked.ts @@ -1,4 +1,4 @@ -import { BushCommand, BushListener, BushSlashMessage } from '../../lib'; +import { BushCommand, BushListener, BushSlashMessage } from '@lib'; export default class SlashBlockedListener extends BushListener { public constructor() { diff --git a/src/listeners/commands/slashCommandError.ts b/src/listeners/commands/slashCommandError.ts index 1fa9dfa..9bf5f6a 100644 --- a/src/listeners/commands/slashCommandError.ts +++ b/src/listeners/commands/slashCommandError.ts @@ -1,6 +1,6 @@ +import { BushCommand, BushListener, BushSlashMessage } from '@lib'; import { stripIndents } from 'common-tags'; -import { MessageEmbed } from 'discord.js'; -import { BushCommand, BushListener, BushSlashMessage } from '../../lib'; +import { GuildChannel, MessageEmbed } from 'discord.js'; export default class SlashCommandErrorListener extends BushListener { public constructor() { @@ -25,7 +25,7 @@ export default class SlashCommandErrorListener extends BushListener { await this.client.logger.channelError({ embeds: [errorEmbed] }); if (message) { - const channel = message.channel?.name || message.interaction.user.tag; + const channel = (message.channel as GuildChannel)?.name || message.interaction.user.tag; if (!this.client.config.owners.includes(message.author.id)) { const errorUserEmbed: MessageEmbed = new MessageEmbed() .setTitle('A Slash Command Error Occurred') @@ -51,7 +51,7 @@ export default class SlashCommandErrorListener extends BushListener { }); } } - const channel = message.channel?.name || message.interaction.user.tag; + const channel = (message.channel as GuildChannel)?.name || message.interaction.user.tag; this.client.console.error( 'SlashError', `an error occurred with the <<${command}>> command in <<${channel}>> triggered by <<${message?.author?.tag}>>:\n` + diff --git a/src/listeners/commands/slashMissingPermissions.ts b/src/listeners/commands/slashMissingPermissions.ts index 85cb5dd..a410bef 100644 --- a/src/listeners/commands/slashMissingPermissions.ts +++ b/src/listeners/commands/slashMissingPermissions.ts @@ -1,6 +1,6 @@ +import { BushListener } from '@lib'; import { Command } from 'discord-akairo'; import { CommandInteraction } from 'discord.js'; -import { BushListener } from '../../lib'; export default class SlashMissingPermissionsListener extends BushListener { public constructor() { diff --git a/src/listeners/commands/slashStarted.ts b/src/listeners/commands/slashStarted.ts index c6a6351..a0201c5 100644 --- a/src/listeners/commands/slashStarted.ts +++ b/src/listeners/commands/slashStarted.ts @@ -1,4 +1,4 @@ -import { BushCommand, BushListener, BushSlashMessage } from '../../lib'; +import { BushCommand, BushListener, BushSlashMessage } from '@lib'; export default class SlashStartedListener extends BushListener { public constructor() { @@ -11,7 +11,7 @@ export default class SlashStartedListener extends BushListener { this.client.logger.info( 'SlashCommand', `The <<${command.id}>> command was used by <<${message.author.tag}>> in ${ - !message.channel ? `their <>` : `<<#${message.channel.name}>> in <<${message.guild?.name}>>` + message.channel.type === 'DM' ? `their <>` : `<<#${message.channel.name}>> in <<${message.guild?.name}>>` }.`, true //// I don't want to spam the log channel when people use commands ); diff --git a/src/listeners/guild/syncUnban.ts b/src/listeners/guild/syncUnban.ts index 2729ae7..aa148f9 100644 --- a/src/listeners/guild/syncUnban.ts +++ b/src/listeners/guild/syncUnban.ts @@ -1,5 +1,5 @@ +import { Ban, BushListener } from '@lib'; import { Guild, User } from 'discord.js'; -import { Ban, BushListener } from '../../lib'; export default class SyncUnbanListener extends BushListener { public constructor() { diff --git a/src/listeners/message/level.ts b/src/listeners/message/level.ts index 1a24e1b..ab78c77 100644 --- a/src/listeners/message/level.ts +++ b/src/listeners/message/level.ts @@ -1,5 +1,5 @@ +import { BushListener, Level } from '@lib'; import { Message } from 'discord.js'; -import { BushListener, Level } from '../../lib'; export default class LevelListener extends BushListener { private levelCooldowns: Set = new Set(); diff --git a/src/listeners/other/consoleListener.ts b/src/listeners/other/consoleListener.ts index d1915f1..ef1efd5 100644 --- a/src/listeners/other/consoleListener.ts +++ b/src/listeners/other/consoleListener.ts @@ -1,6 +1,6 @@ /* eslint-disable @typescript-eslint/no-var-requires */ /* eslint-disable @typescript-eslint/no-unused-vars */ -import { BushListener } from '../../lib'; +import { BushListener } from '@lib'; export default class ConsoleListener extends BushListener { public constructor() { @@ -15,7 +15,7 @@ export default class ConsoleListener extends BushListener { const bot = this.client, config = this.client.config, client = this.client, - { Ban, Global, Guild, Level, ModLog, StickyRole } = await import('../../lib'), + { Ban, Global, Guild, Level, ModLog, StickyRole } = await import('@lib'), { ButtonInteraction, Collector, diff --git a/src/listeners/other/promiseRejection.ts b/src/listeners/other/promiseRejection.ts index 883197a..460d849 100644 --- a/src/listeners/other/promiseRejection.ts +++ b/src/listeners/other/promiseRejection.ts @@ -1,4 +1,4 @@ -import { BushListener } from '../../lib'; +import { BushListener } from '@lib'; export default class PromiseRejectionListener extends BushListener { public constructor() { diff --git a/src/tasks/unban.ts b/src/tasks/unban.ts index 3d39b02..f5d6b53 100644 --- a/src/tasks/unban.ts +++ b/src/tasks/unban.ts @@ -1,6 +1,6 @@ +import { Ban, BushTask } from '@lib'; import { DiscordAPIError } from 'discord.js'; import { Op } from 'sequelize'; -import { Ban, BushTask } from '../lib'; export default class UnbanTask extends BushTask { public constructor() { diff --git a/src/tasks/unmute.ts b/src/tasks/unmute.ts index 379fca4..7a04360 100644 --- a/src/tasks/unmute.ts +++ b/src/tasks/unmute.ts @@ -1,6 +1,6 @@ +import { BushTask, Guild, Mute } from '@lib'; import { DiscordAPIError } from 'discord.js'; import { Op } from 'sequelize'; -import { BushTask, Guild, Mute } from '../lib'; export default class UnmuteTask extends BushTask { public constructor() { diff --git a/src/tasks/updateCache.ts b/src/tasks/updateCache.ts index 5babb5e..05c7dc0 100644 --- a/src/tasks/updateCache.ts +++ b/src/tasks/updateCache.ts @@ -1,4 +1,6 @@ -import { BushClient, BushTask, Global } from '../lib'; +import { BushClient } from '../lib/extensions/discord-akairo/BushClient'; +import { BushTask } from '../lib/extensions/discord-akairo/BushTask'; +import { Global } from '../lib/models/Global'; import * as config from './../config/options'; export class UpdateCacheTask extends BushTask { @@ -8,16 +10,16 @@ export class UpdateCacheTask extends BushTask { runOnStart: false // done in preinit task }); } - async exec(): Promise { - await this.updateCache(this.client); + public async exec(): Promise { + await UpdateCacheTask.updateCache(this.client); await this.client.logger.verbose(`UpdateCache`, `Updated cache.`); } - async init(client: BushClient): Promise { - await this.updateCache(client); + public static async init(client: BushClient): Promise { + await UpdateCacheTask.updateCache(client); } - async updateCache(client: BushClient): Promise { + private static async updateCache(client: BushClient): Promise { const environment = config.dev ? 'development' : 'production'; const row = (await Global.findByPk(environment)) || @@ -31,7 +33,7 @@ export class UpdateCacheTask extends BushTask { })); for (const option in row) { - if (client.cache[option]) this.client.cache[option] = row[option]; + if (client.cache[option]) client.cache[option] = row[option]; } } } diff --git a/tsconfig.json b/tsconfig.json index d0a66c5..751efc2 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -11,7 +11,11 @@ "esModuleInterop": true, "experimentalDecorators": true, "emitDecoratorMetadata": true, - "skipLibCheck": true + "baseUrl": "./", + "paths": { + "src/*": ["./src/*"], + "@lib": ["./src/lib"] + } }, "include": ["src/**/*.ts"], "exclude": ["node_modules"] diff --git a/yarn.lock b/yarn.lock index 12d69ca..3d75bc5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -32,6 +32,25 @@ __metadata: languageName: node linkType: hard +"@babel/parser@npm:^7.0.0": + version: 7.14.7 + resolution: "@babel/parser@npm:7.14.7" + bin: + parser: ./bin/babel-parser.js + checksum: 0d7acc8cf9c19ccd0e80ab0608953f32f4375f3867c080211270e7bb4bb94c551fd1fc3f49b3cc92a4eec356cf507801f5c93c4c72996968bdc4c28815fe0550 + languageName: node + linkType: hard + +"@babel/types@npm:^7.8.3": + version: 7.14.5 + resolution: "@babel/types@npm:7.14.5" + dependencies: + "@babel/helper-validator-identifier": ^7.14.5 + to-fast-properties: ^2.0.0 + checksum: 7c1ab6e8bdf438d44236034cab10f7d0f1971179bc405dca26733a9b89dd87dd692dc49a238a7495075bc41a9a17fb6f08b4d1da45ea6ddcce1e5c8593574aea + languageName: node + linkType: hard + "@discordjs/builders@npm:^0.2.0": version: 0.2.0 resolution: "@discordjs/builders@npm:0.2.0" @@ -256,10 +275,17 @@ __metadata: languageName: node linkType: hard +"@types/module-alias@npm:^2": + version: 2.0.1 + resolution: "@types/module-alias@npm:2.0.1" + checksum: c6d6d30605833b03465c39760df42616fd24e4f532a29bb77954220885feb21eb2d84dd38eed68b0c18997e6930fdc5914d2dc6fd7cc5d110a42068d2204e11e + languageName: node + linkType: hard + "@types/node@npm:*": - version: 16.0.3 - resolution: "@types/node@npm:16.0.3" - checksum: b91ee69dbcf2c4b8a3c421439c5045a9903236506dae056d098587eec18770b867692018bb21ed8c911105c575670d88b8797f0a7fbca53e0899e2f3ad28d826 + version: 16.3.1 + resolution: "@types/node@npm:16.3.1" + checksum: 2a9d69db32540157827a06893a80dcbc9c86a6287dace38e1ff27490f34ec4b4164426165f2c4146c412eca451bf1b782be17d5ce57a935b1fd1e7c5fae89f43 languageName: node linkType: hard @@ -390,7 +416,7 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/typescript-estree@npm:4.28.2": +"@typescript-eslint/typescript-estree@npm:4.28.2, @typescript-eslint/typescript-estree@npm:^4.8.2": version: 4.28.2 resolution: "@typescript-eslint/typescript-estree@npm:4.28.2" dependencies: @@ -508,6 +534,13 @@ __metadata: languageName: node linkType: hard +"app-module-path@npm:^2.2.0": + version: 2.2.0 + resolution: "app-module-path@npm:2.2.0" + checksum: b52aa49cfa809efbad41b514222e8ef3f8ee9e147f5eccf79280b45eddcc61f7aeb302b0049474e3f42072dd53a28348c57dd96f36cd461d2e31cc8ab1ef56b5 + languageName: node + linkType: hard + "argparse@npm:^1.0.7": version: 1.0.10 resolution: "argparse@npm:1.0.10" @@ -524,6 +557,13 @@ __metadata: languageName: node linkType: hard +"ast-module-types@npm:^2.3.2, ast-module-types@npm:^2.4.0, ast-module-types@npm:^2.7.0, ast-module-types@npm:^2.7.1": + version: 2.7.1 + resolution: "ast-module-types@npm:2.7.1" + checksum: 6238647bcf34eeff2a1390cb60388da8a5064dd598acf48d68f8d972d9a332dc8d0382a5a7c511b16470e314b313bcbb95de4b0b669515393e043282c0489538 + languageName: node + linkType: hard + "astral-regex@npm:^2.0.0": version: 2.0.0 resolution: "astral-regex@npm:2.0.0" @@ -545,6 +585,24 @@ __metadata: languageName: node linkType: hard +"base64-js@npm:^1.3.1": + version: 1.5.1 + resolution: "base64-js@npm:1.5.1" + checksum: 669632eb3745404c2f822a18fc3a0122d2f9a7a13f7fb8b5823ee19d1d2ff9ee5b52c53367176ea4ad093c332fd5ab4bd0ebae5a8e27917a4105a4cfc86b1005 + languageName: node + linkType: hard + +"bl@npm:^4.1.0": + version: 4.1.0 + resolution: "bl@npm:4.1.0" + dependencies: + buffer: ^5.5.0 + inherits: ^2.0.4 + readable-stream: ^3.4.0 + checksum: 9e8521fa7e83aa9427c6f8ccdcba6e8167ef30cc9a22df26effcc5ab682ef91d2cbc23a239f945d099289e4bbcfae7a192e9c28c84c6202e710a0dfec3722662 + languageName: node + linkType: hard + "body-parser@npm:^1.19.0": version: 1.19.0 resolution: "body-parser@npm:1.19.0" @@ -596,6 +654,16 @@ __metadata: languageName: node linkType: hard +"buffer@npm:^5.5.0": + version: 5.7.1 + resolution: "buffer@npm:5.7.1" + dependencies: + base64-js: ^1.3.1 + ieee754: ^1.1.13 + checksum: e2cf8429e1c4c7b8cbd30834ac09bd61da46ce35f5c22a78e6c2f04497d6d25541b16881e30a019c6fd3154150650ccee27a308eff3e26229d788bbdeb08ab84 + languageName: node + linkType: hard + "bush-bot@workspace:.": version: 0.0.0-use.local resolution: "bush-bot@workspace:." @@ -604,6 +672,7 @@ __metadata: "@types/common-tags": ^1.8.0 "@types/express": ^4.17.12 "@types/humanize-duration": ^3 + "@types/module-alias": ^2 "@types/node": ^14.14.22 "@types/uuid": ^8.3.0 "@typescript-eslint/eslint-plugin": ^4.14.1 @@ -619,6 +688,8 @@ __metadata: eslint-config-prettier: ^8.3.0 got: ^11.8.2 humanize-duration: ^3.27.0 + madge: ^5.0.1 + module-alias: ^2.2.2 moment: ^2.29.1 pg: ^8.5.1 pg-hstore: ^2.3.3 @@ -683,7 +754,7 @@ __metadata: languageName: node linkType: hard -"chalk@npm:^4.0.0, chalk@npm:^4.1.1": +"chalk@npm:^4.0.0, chalk@npm:^4.1.0, chalk@npm:^4.1.1": version: 4.1.1 resolution: "chalk@npm:4.1.1" dependencies: @@ -693,6 +764,22 @@ __metadata: languageName: node linkType: hard +"cli-cursor@npm:^3.1.0": + version: 3.1.0 + resolution: "cli-cursor@npm:3.1.0" + dependencies: + restore-cursor: ^3.1.0 + checksum: 2692784c6cd2fd85cfdbd11f53aea73a463a6d64a77c3e098b2b4697a20443f430c220629e1ca3b195ea5ac4a97a74c2ee411f3807abf6df2b66211fec0c0a29 + languageName: node + linkType: hard + +"cli-spinners@npm:^2.5.0": + version: 2.6.0 + resolution: "cli-spinners@npm:2.6.0" + checksum: bc5d06af9f896e95d0c277e2a5ee0adc5876767decca6b3c22e212934b96033453268cb59be904eccb6d59119e57dbb3fc8ca9bdf5f8476506283b3dd8728748 + languageName: node + linkType: hard + "clone-response@npm:^1.0.2": version: 1.0.2 resolution: "clone-response@npm:1.0.2" @@ -702,6 +789,13 @@ __metadata: languageName: node linkType: hard +"clone@npm:^1.0.2": + version: 1.0.4 + resolution: "clone@npm:1.0.4" + checksum: d06418b7335897209e77bdd430d04f882189582e67bd1f75a04565f3f07f5b3f119a9d670c943b6697d0afb100f03b866b3b8a1f91d4d02d72c4ecf2bb64b5dd + languageName: node + linkType: hard + "color-convert@npm:^1.9.0": version: 1.9.3 resolution: "color-convert@npm:1.9.3" @@ -727,13 +821,20 @@ __metadata: languageName: node linkType: hard -"color-name@npm:~1.1.4": +"color-name@npm:^1.1.4, color-name@npm:~1.1.4": version: 1.1.4 resolution: "color-name@npm:1.1.4" checksum: b0445859521eb4021cd0fb0cc1a75cecf67fceecae89b63f62b201cca8d345baf8b952c966862a9d9a2632987d4f6581f0ec8d957dfacece86f0a7919316f610 languageName: node linkType: hard +"colorette@npm:^1.2.2": + version: 1.2.2 + resolution: "colorette@npm:1.2.2" + checksum: 69fec14ddaedd0f5b00e4bae40dc4bc61f7050ebdc82983a595d6fd64e650b9dc3c033fff378775683138e992e0ddd8717ac7c7cec4d089679dcfbe3cd921b04 + languageName: node + linkType: hard + "combined-stream@npm:^1.0.8": version: 1.0.8 resolution: "combined-stream@npm:1.0.8" @@ -743,6 +844,20 @@ __metadata: languageName: node linkType: hard +"commander@npm:^2.16.0, commander@npm:^2.20.3, commander@npm:^2.8.1": + version: 2.20.3 + resolution: "commander@npm:2.20.3" + checksum: ab8c07884e42c3a8dbc5dd9592c606176c7eb5c1ca5ff274bcf907039b2c41de3626f684ea75ccf4d361ba004bbaff1f577d5384c155f3871e456bdf27becf9e + languageName: node + linkType: hard + +"commander@npm:^7.2.0": + version: 7.2.0 + resolution: "commander@npm:7.2.0" + checksum: 53501cbeee61d5157546c0bef0fedb6cdfc763a882136284bed9a07225f09a14b82d2a84e7637edfd1a679fb35ed9502fd58ef1d091e6287f60d790147f68ddc + languageName: node + linkType: hard + "common-tags@npm:^1.8.0": version: 1.8.0 resolution: "common-tags@npm:1.8.0" @@ -750,6 +865,13 @@ __metadata: languageName: node linkType: hard +"commondir@npm:^1.0.1": + version: 1.0.1 + resolution: "commondir@npm:1.0.1" + checksum: 59715f2fc456a73f68826285718503340b9f0dd89bfffc42749906c5cf3d4277ef11ef1cca0350d0e79204f00f1f6d83851ececc9095dc88512a697ac0b9bdcb + languageName: node + linkType: hard + "concat-map@npm:0.0.1": version: 0.0.1 resolution: "concat-map@npm:0.0.1" @@ -784,7 +906,7 @@ __metadata: languageName: node linkType: hard -"debug@npm:^4.0.1, debug@npm:^4.1.1, debug@npm:^4.3.1": +"debug@npm:^4.0.0, debug@npm:^4.0.1, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.1": version: 4.3.2 resolution: "debug@npm:4.3.2" dependencies: @@ -796,6 +918,15 @@ __metadata: languageName: node linkType: hard +"decomment@npm:^0.9.3": + version: 0.9.4 + resolution: "decomment@npm:0.9.4" + dependencies: + esprima: 4.0.1 + checksum: d883c9563e271bfc8741a371db405af6e4d952a16df37c93434ca2e6123e4a26c05b20355f663941bb8e9602d0ad9b209960dce32af8e57fbc166b16b5797d26 + languageName: node + linkType: hard + "decompress-response@npm:^6.0.0": version: 6.0.0 resolution: "decompress-response@npm:6.0.0" @@ -805,13 +936,29 @@ __metadata: languageName: node linkType: hard -"deep-is@npm:^0.1.3": +"deep-extend@npm:^0.6.0": + version: 0.6.0 + resolution: "deep-extend@npm:0.6.0" + checksum: 7be7e5a8d468d6b10e6a67c3de828f55001b6eb515d014f7aeb9066ce36bd5717161eb47d6a0f7bed8a9083935b465bc163ee2581c8b128d29bf61092fdf57a7 + languageName: node + linkType: hard + +"deep-is@npm:^0.1.3, deep-is@npm:~0.1.3": version: 0.1.3 resolution: "deep-is@npm:0.1.3" checksum: c15b04c3848a89880c94e25b077c19b47d9a30dd99048e70e5f95d943e7b246bee1da0c1376b56b01bc045be2cae7d9b1c856e68e47e9805634327de7c6cb6d5 languageName: node linkType: hard +"defaults@npm:^1.0.3": + version: 1.0.3 + resolution: "defaults@npm:1.0.3" + dependencies: + clone: ^1.0.2 + checksum: 96e2112da6553d376afd5265ea7cbdb2a3b45535965d71ab8bb1da10c8126d168fdd5268799625324b368356d21ba2a7b3d4ec50961f11a47b7feb9de3d4413e + languageName: node + linkType: hard + "defer-to-connect@npm:^2.0.0": version: 2.0.1 resolution: "defer-to-connect@npm:2.0.1" @@ -833,6 +980,130 @@ __metadata: languageName: node linkType: hard +"dependency-tree@npm:^8.1.1": + version: 8.1.1 + resolution: "dependency-tree@npm:8.1.1" + dependencies: + commander: ^2.20.3 + debug: ^4.3.1 + filing-cabinet: ^3.0.0 + precinct: ^8.0.0 + typescript: ^3.9.7 + bin: + dependency-tree: bin/cli.js + checksum: 435e53c5c63ded037d948a86b95bf0179cef46238d4bc67844ae197535e8f1fe41d054c8dc544d0d799f0789b322a43cd7ca502ba14e39c9ba491d4465dfc193 + languageName: node + linkType: hard + +"detective-amd@npm:^3.0.1, detective-amd@npm:^3.1.0": + version: 3.1.0 + resolution: "detective-amd@npm:3.1.0" + dependencies: + ast-module-types: ^2.7.0 + escodegen: ^2.0.0 + get-amd-module-type: ^3.0.0 + node-source-walk: ^4.0.0 + bin: + detective-amd: bin/detective-amd.js + checksum: aa3783d5873823cbec6d10707afe0340231ec865f465f4b83e49eeebceb5ee455c701d96f295ba3d93b519ff8fd7568c87ccf3ce76083f498d9261e8253b4d3a + languageName: node + linkType: hard + +"detective-cjs@npm:^3.1.1": + version: 3.1.1 + resolution: "detective-cjs@npm:3.1.1" + dependencies: + ast-module-types: ^2.4.0 + node-source-walk: ^4.0.0 + checksum: 626aec314fa5ec04fdb23ef6de86c1cf18a4d23ec4cd46556d25d8bf05843c7393b2933c5271e5b46140738d55b2c3d8e73a47d3ec04a3804f28ddd17f741ff9 + languageName: node + linkType: hard + +"detective-es6@npm:^2.2.0": + version: 2.2.0 + resolution: "detective-es6@npm:2.2.0" + dependencies: + node-source-walk: ^4.0.0 + checksum: 5065731a2d2edc48ae374ce0f7d36e427447fd1ebae2144297e81319da662b7b70e9b0120cb93b228d9de2a7a30ae2f30df4e50ee351c339898829033884ac03 + languageName: node + linkType: hard + +"detective-less@npm:^1.0.2": + version: 1.0.2 + resolution: "detective-less@npm:1.0.2" + dependencies: + debug: ^4.0.0 + gonzales-pe: ^4.2.3 + node-source-walk: ^4.0.0 + checksum: 858936fbad87423bd5d7502ff5fafca023e7c99e4006ed01b31c12c4b5ff8697edce91419798479d857efec68ee8f022fcac64de5530db6a64012be600a2249e + languageName: node + linkType: hard + +"detective-postcss@npm:^4.0.0": + version: 4.0.0 + resolution: "detective-postcss@npm:4.0.0" + dependencies: + debug: ^4.1.1 + is-url: ^1.2.4 + postcss: ^8.1.7 + postcss-values-parser: ^2.0.1 + checksum: e4c9fed31613df43466357fb104c4c5cdaf45a12909f7c1174161a45ebb2ebe77bb0843b3c0c117b68f55c9acb4e0578668298594c7f0108dfb73e54aaec8513 + languageName: node + linkType: hard + +"detective-postcss@npm:^5.0.0": + version: 5.0.0 + resolution: "detective-postcss@npm:5.0.0" + dependencies: + debug: ^4.3.1 + is-url: ^1.2.4 + postcss: ^8.2.13 + postcss-values-parser: ^5.0.0 + checksum: 68e36bbc39fd143d19ed371710f1561162b603faf09caa0691d7d502b6bfbc7e9fbc6b30f62b7c33285753105048322fd5c71bb8b715e6422f3b47a3f327f588 + languageName: node + linkType: hard + +"detective-sass@npm:^3.0.1": + version: 3.0.1 + resolution: "detective-sass@npm:3.0.1" + dependencies: + debug: ^4.1.1 + gonzales-pe: ^4.2.3 + node-source-walk: ^4.0.0 + checksum: 86f76671d95740a4a298057ed56f6f56c44eba68fb07beb719c1c583e507d7a102db693a344abf7a3a382e389b923fc3366d83654f633664c8b80d3c5fd16455 + languageName: node + linkType: hard + +"detective-scss@npm:^2.0.1": + version: 2.0.1 + resolution: "detective-scss@npm:2.0.1" + dependencies: + debug: ^4.1.1 + gonzales-pe: ^4.2.3 + node-source-walk: ^4.0.0 + checksum: e130745b4ac53c5a38720ae004fb92f07cd1b9228eb8e21f960725b761ebcad99886a40092ca5a1c2f52ec9e00104deccad526f5b67456e5fe7c13803c816d37 + languageName: node + linkType: hard + +"detective-stylus@npm:^1.0.0": + version: 1.0.0 + resolution: "detective-stylus@npm:1.0.0" + checksum: e9c74c97633f4ebc0f0c08546e8fbce5ad145c0411e3e6f79ebeacc00d555a471489f8599dc62150c53c0a7741a8a7b6ea32cac0b987d239c5b035d80a125f73 + languageName: node + linkType: hard + +"detective-typescript@npm:^7.0.0": + version: 7.0.0 + resolution: "detective-typescript@npm:7.0.0" + dependencies: + "@typescript-eslint/typescript-estree": ^4.8.2 + ast-module-types: ^2.7.1 + node-source-walk: ^4.2.0 + typescript: ^3.9.7 + checksum: fc92e20e7b3aa9127c0a3809adea0e4101fa1e294328ad9b3868004cc6973e5f49b9296354ad79f10a2d5150c3ca03fc77d471d6afe2dc07f1f4845ef1e0cf98 + languageName: node + linkType: hard + "dir-glob@npm:^3.0.1": version: 3.0.1 resolution: "dir-glob@npm:3.0.1" @@ -844,8 +1115,8 @@ __metadata: discord-akairo@NotEnoughUpdates/discord-akairo: version: 8.2.2 - resolution: "discord-akairo@https://github.com/NotEnoughUpdates/discord-akairo.git#commit=58e5a8610d9cb47257cb163a94e284113a39a62b" - checksum: 8e8fa006dbec989b4d2e74802293775bd49013be7600a46e54a2481ef348f589c95c338130e8ec27cf653f5f619ddb872221aef0befa8c4677f3bab503cf0439 + resolution: "discord-akairo@https://github.com/NotEnoughUpdates/discord-akairo.git#commit=67e935e92f12105f2dfc517bb566d8325c794d8a" + checksum: 5b656adce3f002f7712d99d78bb03fd4bb6c27fcbdd6195900a0d6e05c40f644519b953d68d6a2b46c6d0ccd07800c19151698fd0b7733aa267bec12a58656bc languageName: node linkType: hard @@ -865,7 +1136,7 @@ discord-akairo@NotEnoughUpdates/discord-akairo: discord.js@NotEnoughUpdates/discord.js: version: 13.0.0-dev - resolution: "discord.js@https://github.com/NotEnoughUpdates/discord.js.git#commit=c71d1042962848d9f644262fa27e6f777cda4d35" + resolution: "discord.js@https://github.com/NotEnoughUpdates/discord.js.git#commit=20c84839fa43aad6c47ff6ffb11b34cc785e920b" dependencies: "@discordjs/builders": ^0.2.0 "@discordjs/collection": ^0.1.6 @@ -876,7 +1147,7 @@ discord.js@NotEnoughUpdates/discord.js: discord-api-types: ^0.19.0-next.f393ba520d7d6d2aacaca7b3ca5d355fab614f6e node-fetch: ^2.6.1 ws: ^7.5.1 - checksum: c5767e602ead72369d5bf43a03ca9931283e683374ad0e071bea7658c50541d24a70a834964e1a3e0af840d7d14ddb990d262a87b9f7002b3e64881824b85673 + checksum: 1d6f87e67ff077d5986e1df125b03416f236be81841641629c4b7f4ac17807270667d9d7b3fe3b91051de0a062105a10569558c5462879dfebc26fc65600ea91 languageName: node linkType: hard @@ -919,6 +1190,16 @@ discord.js@NotEnoughUpdates/discord.js: languageName: node linkType: hard +"enhanced-resolve@npm:^5.3.2": + version: 5.8.2 + resolution: "enhanced-resolve@npm:5.8.2" + dependencies: + graceful-fs: ^4.2.4 + tapable: ^2.2.0 + checksum: 6e871ec5b183220dbcdaff8580cbdacee5425e321790e5846abd1b573d20d2bcb37f73ee983fd10c6d6878d31a2d08e234e72fc91a81236d64623ee6ba7d6611 + languageName: node + linkType: hard + "enquirer@npm:^2.3.5": version: 2.3.6 resolution: "enquirer@npm:2.3.6" @@ -951,6 +1232,25 @@ discord.js@NotEnoughUpdates/discord.js: languageName: node linkType: hard +"escodegen@npm:^2.0.0": + version: 2.0.0 + resolution: "escodegen@npm:2.0.0" + dependencies: + esprima: ^4.0.1 + estraverse: ^5.2.0 + esutils: ^2.0.2 + optionator: ^0.8.1 + source-map: ~0.6.1 + dependenciesMeta: + source-map: + optional: true + bin: + escodegen: bin/escodegen.js + esgenerate: bin/esgenerate.js + checksum: 5aa6b2966fafe0545e4e77936300cc94ad57cfe4dc4ebff9950492eaba83eef634503f12d7e3cbd644ecc1bab388ad0e92b06fd32222c9281a75d1cf02ec6cef + languageName: node + linkType: hard + "eslint-config-prettier@npm:^8.3.0": version: 8.3.0 resolution: "eslint-config-prettier@npm:8.3.0" @@ -1067,7 +1367,7 @@ discord.js@NotEnoughUpdates/discord.js: languageName: node linkType: hard -"esprima@npm:^4.0.0": +"esprima@npm:4.0.1, esprima@npm:^4.0.0, esprima@npm:^4.0.1": version: 4.0.1 resolution: "esprima@npm:4.0.1" bin: @@ -1150,7 +1450,7 @@ discord.js@NotEnoughUpdates/discord.js: languageName: node linkType: hard -"fast-levenshtein@npm:^2.0.6": +"fast-levenshtein@npm:^2.0.6, fast-levenshtein@npm:~2.0.6": version: 2.0.6 resolution: "fast-levenshtein@npm:2.0.6" checksum: 92cfec0a8dfafd9c7a15fba8f2cc29cd0b62b85f056d99ce448bbcd9f708e18ab2764bda4dd5158364f4145a7c72788538994f0d1787b956ef0d1062b0f7c24c @@ -1175,6 +1475,29 @@ discord.js@NotEnoughUpdates/discord.js: languageName: node linkType: hard +"filing-cabinet@npm:^3.0.0": + version: 3.0.0 + resolution: "filing-cabinet@npm:3.0.0" + dependencies: + app-module-path: ^2.2.0 + commander: ^2.20.3 + debug: ^4.3.1 + decomment: ^0.9.3 + enhanced-resolve: ^5.3.2 + is-relative-path: ^1.0.2 + module-definition: ^3.3.1 + module-lookup-amd: ^7.0.0 + resolve: ^1.19.0 + resolve-dependency-path: ^2.0.0 + sass-lookup: ^3.0.0 + stylus-lookup: ^3.0.1 + typescript: ^3.9.7 + bin: + filing-cabinet: bin/cli.js + checksum: 509ffa5a51408eb6a146896a4ff24954eb029eac9c32602a75cca008f1579f8669cb75d8e361604efa1898da52e86464f7768dbdf159f88fb0a3dd60790e5591 + languageName: node + linkType: hard + "fill-range@npm:^7.0.1": version: 7.0.1 resolution: "fill-range@npm:7.0.1" @@ -1201,6 +1524,13 @@ discord.js@NotEnoughUpdates/discord.js: languageName: node linkType: hard +"flatten@npm:^1.0.2": + version: 1.0.3 + resolution: "flatten@npm:1.0.3" + checksum: 5c57379816f1692aaa79fbc6390e0a0644e5e8442c5783ed57c6d315468eddbc53a659eaa03c9bb1e771b0f4a9bd8dd8a2620286bf21fd6538a7857321fdfb20 + languageName: node + linkType: hard + "fs.realpath@npm:^1.0.0": version: 1.0.0 resolution: "fs.realpath@npm:1.0.0" @@ -1208,6 +1538,13 @@ discord.js@NotEnoughUpdates/discord.js: languageName: node linkType: hard +"function-bind@npm:^1.1.1": + version: 1.1.1 + resolution: "function-bind@npm:1.1.1" + checksum: b32fbaebb3f8ec4969f033073b43f5c8befbb58f1a79e12f1d7490358150359ebd92f49e72ff0144f65f2c48ea2a605bff2d07965f548f6474fd8efd95bf361a + languageName: node + linkType: hard + "functional-red-black-tree@npm:^1.0.1": version: 1.0.1 resolution: "functional-red-black-tree@npm:1.0.1" @@ -1215,6 +1552,23 @@ discord.js@NotEnoughUpdates/discord.js: languageName: node linkType: hard +"get-amd-module-type@npm:^3.0.0": + version: 3.0.0 + resolution: "get-amd-module-type@npm:3.0.0" + dependencies: + ast-module-types: ^2.3.2 + node-source-walk: ^4.0.0 + checksum: a2df61d329541e04d9ddeb3880b52df12d70d48822bd3ac340b17a445785fc8dcc195194e0ed79e04271217c1eaccf94c46bb8e5d5b7acd2cdd48661f004916f + languageName: node + linkType: hard + +"get-own-enumerable-property-symbols@npm:^3.0.0": + version: 3.0.2 + resolution: "get-own-enumerable-property-symbols@npm:3.0.2" + checksum: 8f0331f14159f939830884799f937343c8c0a2c330506094bc12cbee3665d88337fe97a4ea35c002cc2bdba0f5d9975ad7ec3abb925015cdf2a93e76d4759ede + languageName: node + linkType: hard + "get-stream@npm:^5.1.0": version: 5.2.0 resolution: "get-stream@npm:5.2.0" @@ -1233,7 +1587,7 @@ discord.js@NotEnoughUpdates/discord.js: languageName: node linkType: hard -"glob@npm:^7.1.3": +"glob@npm:^7.1.3, glob@npm:^7.1.6": version: 7.1.7 resolution: "glob@npm:7.1.7" dependencies: @@ -1270,6 +1624,17 @@ discord.js@NotEnoughUpdates/discord.js: languageName: node linkType: hard +"gonzales-pe@npm:^4.2.3": + version: 4.3.0 + resolution: "gonzales-pe@npm:4.3.0" + dependencies: + minimist: ^1.2.5 + bin: + gonzales: bin/gonzales.js + checksum: 49d60fc49ad35639e5d55923c1516d3ec2e4de5e6e5913ec3458a479b66623e54a060d568295349b0bb9f96ee970c473ff984d4b82a5cfeaf736c55f0d6dc3b7 + languageName: node + linkType: hard + "got@npm:^11.8.2": version: 11.8.2 resolution: "got@npm:11.8.2" @@ -1289,6 +1654,22 @@ discord.js@NotEnoughUpdates/discord.js: languageName: node linkType: hard +"graceful-fs@npm:^4.2.4": + version: 4.2.6 + resolution: "graceful-fs@npm:4.2.6" + checksum: 792e64aafda05a151289f83eaa16aff34ef259658cefd65393883d959409f5a2389b0ec9ebf28f3d21f1b0ddc8f594a1162ae9b18e2b507a6799a70706ec573d + languageName: node + linkType: hard + +"graphviz@npm:0.0.9": + version: 0.0.9 + resolution: "graphviz@npm:0.0.9" + dependencies: + temp: ~0.4.0 + checksum: fb414f89763d568646f2d899f9a2baa19e1cdf1b97db831f64f2b3f7322609ca1e4e43bcb3d2e3bfc992b9e0f657803559d7a98e289d5aa6dc549d578939d599 + languageName: node + linkType: hard + "has-flag@npm:^3.0.0": version: 3.0.0 resolution: "has-flag@npm:3.0.0" @@ -1303,6 +1684,15 @@ discord.js@NotEnoughUpdates/discord.js: languageName: node linkType: hard +"has@npm:^1.0.3": + version: 1.0.3 + resolution: "has@npm:1.0.3" + dependencies: + function-bind: ^1.1.1 + checksum: b9ad53d53be4af90ce5d1c38331e712522417d017d5ef1ebd0507e07c2fbad8686fffb8e12ddecd4c39ca9b9b47431afbb975b8abf7f3c3b82c98e9aad052792 + languageName: node + linkType: hard + "http-cache-semantics@npm:^4.0.0": version: 4.1.0 resolution: "http-cache-semantics@npm:4.1.0" @@ -1349,6 +1739,13 @@ discord.js@NotEnoughUpdates/discord.js: languageName: node linkType: hard +"ieee754@npm:^1.1.13": + version: 1.2.1 + resolution: "ieee754@npm:1.2.1" + checksum: 5144c0c9815e54ada181d80a0b810221a253562422e7c6c3a60b1901154184f49326ec239d618c416c1c5945a2e197107aee8d986a3dd836b53dffefd99b5e7e + languageName: node + linkType: hard + "ignore@npm:^4.0.6": version: 4.0.6 resolution: "ignore@npm:4.0.6" @@ -1380,6 +1777,13 @@ discord.js@NotEnoughUpdates/discord.js: languageName: node linkType: hard +"indexes-of@npm:^1.0.1": + version: 1.0.1 + resolution: "indexes-of@npm:1.0.1" + checksum: 4f9799b1739a62f3e02d09f6f4162cf9673025282af7fa36e790146e7f4e216dad3e776a25b08536c093209c9fcb5ea7bd04b082d42686a45f58ff401d6da32e + languageName: node + linkType: hard + "inflection@npm:1.13.1": version: 1.13.1 resolution: "inflection@npm:1.13.1" @@ -1397,7 +1801,7 @@ discord.js@NotEnoughUpdates/discord.js: languageName: node linkType: hard -"inherits@npm:2, inherits@npm:^2.0.3": +"inherits@npm:2, inherits@npm:^2.0.3, inherits@npm:^2.0.4": version: 2.0.4 resolution: "inherits@npm:2.0.4" checksum: 4a48a733847879d6cf6691860a6b1e3f0f4754176e4d71494c41f3475553768b10f84b5ce1d40fbd0e34e6bfbb864ee35858ad4dd2cf31e02fc4a154b724d7f1 @@ -1411,6 +1815,22 @@ discord.js@NotEnoughUpdates/discord.js: languageName: node linkType: hard +"ini@npm:~1.3.0": + version: 1.3.8 + resolution: "ini@npm:1.3.8" + checksum: dfd98b0ca3a4fc1e323e38a6c8eb8936e31a97a918d3b377649ea15bdb15d481207a0dda1021efbd86b464cae29a0d33c1d7dcaf6c5672bee17fa849bc50a1b3 + languageName: node + linkType: hard + +"is-core-module@npm:^2.2.0": + version: 2.4.0 + resolution: "is-core-module@npm:2.4.0" + dependencies: + has: ^1.0.3 + checksum: c498902d4c4d0e8eba3a2e8293ccd442158cfe49a71d7cfad136ccf9902b6a41de34ddaa86cdc95c8b7c22f872e59572d8a5d994cbec04c8ecf27ffe75137119 + languageName: node + linkType: hard + "is-extglob@npm:^2.1.1": version: 2.1.1 resolution: "is-extglob@npm:2.1.1" @@ -1434,6 +1854,13 @@ discord.js@NotEnoughUpdates/discord.js: languageName: node linkType: hard +"is-interactive@npm:^1.0.0": + version: 1.0.0 + resolution: "is-interactive@npm:1.0.0" + checksum: 824808776e2d468b2916cdd6c16acacebce060d844c35ca6d82267da692e92c3a16fdba624c50b54a63f38bdc4016055b6f443ce57d7147240de4f8cdabaf6f9 + languageName: node + linkType: hard + "is-number@npm:^7.0.0": version: 7.0.0 resolution: "is-number@npm:7.0.0" @@ -1441,6 +1868,48 @@ discord.js@NotEnoughUpdates/discord.js: languageName: node linkType: hard +"is-obj@npm:^1.0.1": + version: 1.0.1 + resolution: "is-obj@npm:1.0.1" + checksum: 3ccf0efdea12951e0b9c784e2b00e77e87b2f8bd30b42a498548a8afcc11b3287342a2030c308e473e93a7a19c9ea7854c99a8832a476591c727df2a9c79796c + languageName: node + linkType: hard + +"is-regexp@npm:^1.0.0": + version: 1.0.0 + resolution: "is-regexp@npm:1.0.0" + checksum: be692828e24cba479ec33644326fa98959ec68ba77965e0291088c1a741feaea4919d79f8031708f85fd25e39de002b4520622b55460660b9c369e6f7187faef + languageName: node + linkType: hard + +"is-relative-path@npm:^1.0.2": + version: 1.0.2 + resolution: "is-relative-path@npm:1.0.2" + checksum: 6c2ccffd3c0a3e3990535d0571370883d558b825b51940085f3446ec338857f4552f44521dfec3e83b7e067de08c0b0369de290208a91200bcae2c569533e340 + languageName: node + linkType: hard + +"is-unicode-supported@npm:^0.1.0": + version: 0.1.0 + resolution: "is-unicode-supported@npm:0.1.0" + checksum: a2aab86ee7712f5c2f999180daaba5f361bdad1efadc9610ff5b8ab5495b86e4f627839d085c6530363c6d6d4ecbde340fb8e54bdb83da4ba8e0865ed5513c52 + languageName: node + linkType: hard + +"is-url-superb@npm:^4.0.0": + version: 4.0.0 + resolution: "is-url-superb@npm:4.0.0" + checksum: fd55e91c96349acb0d688f95fcb1ac67450e5db934976e3a8ff13ef446841e779a6f4d18b15f02331f05a3429c8fdaba2382ac1ab444059e86e9ffcde1ec8db0 + languageName: node + linkType: hard + +"is-url@npm:^1.2.4": + version: 1.2.4 + resolution: "is-url@npm:1.2.4" + checksum: 100e74b3b1feab87a43ef7653736e88d997eb7bd32e71fd3ebc413e58c1cbe56269699c776aaea84244b0567f2a7d68dfaa512a062293ed2f9fdecb394148432 + languageName: node + linkType: hard + "isexe@npm:^2.0.0": version: 2.0.0 resolution: "isexe@npm:2.0.0" @@ -1514,6 +1983,16 @@ discord.js@NotEnoughUpdates/discord.js: languageName: node linkType: hard +"levn@npm:~0.3.0": + version: 0.3.0 + resolution: "levn@npm:0.3.0" + dependencies: + prelude-ls: ~1.1.2 + type-check: ~0.3.2 + checksum: 0d084a524231a8246bb10fec48cdbb35282099f6954838604f3c7fc66f2e16fa66fd9cc2f3f20a541a113c4dafdf181e822c887c8a319c9195444e6c64ac395e + languageName: node + linkType: hard + "lodash.clonedeep@npm:^4.5.0": version: 4.5.0 resolution: "lodash.clonedeep@npm:4.5.0" @@ -1542,6 +2021,16 @@ discord.js@NotEnoughUpdates/discord.js: languageName: node linkType: hard +"log-symbols@npm:^4.1.0": + version: 4.1.0 + resolution: "log-symbols@npm:4.1.0" + dependencies: + chalk: ^4.1.0 + is-unicode-supported: ^0.1.0 + checksum: fce1497b3135a0198803f9f07464165e9eb83ed02ceb2273930a6f8a508951178d8cf4f0378e9d28300a2ed2bc49050995d2bd5f53ab716bb15ac84d58c6ef74 + languageName: node + linkType: hard + "lowercase-keys@npm:^2.0.0": version: 2.0.0 resolution: "lowercase-keys@npm:2.0.0" @@ -1558,6 +2047,38 @@ discord.js@NotEnoughUpdates/discord.js: languageName: node linkType: hard +"madge@npm:^5.0.1": + version: 5.0.1 + resolution: "madge@npm:5.0.1" + dependencies: + chalk: ^4.1.1 + commander: ^7.2.0 + commondir: ^1.0.1 + debug: ^4.3.1 + dependency-tree: ^8.1.1 + detective-amd: ^3.1.0 + detective-cjs: ^3.1.1 + detective-es6: ^2.2.0 + detective-less: ^1.0.2 + detective-postcss: ^5.0.0 + detective-sass: ^3.0.1 + detective-scss: ^2.0.1 + detective-stylus: ^1.0.0 + detective-typescript: ^7.0.0 + graphviz: 0.0.9 + ora: ^5.4.1 + pluralize: ^8.0.0 + precinct: ^8.1.0 + pretty-ms: ^7.0.1 + rc: ^1.2.7 + typescript: ^3.9.5 + walkdir: ^0.4.1 + bin: + madge: bin/cli.js + checksum: 821db88fdcb6259cf4bf1665abb976dd859fb7157a712886468d4172ab6d758f3446212fcd3fa92be21e9e2b408854f96e9495b7119d7387e6fe5690bd9786c4 + languageName: node + linkType: hard + "media-typer@npm:0.3.0": version: 0.3.0 resolution: "media-typer@npm:0.3.0" @@ -1598,6 +2119,13 @@ discord.js@NotEnoughUpdates/discord.js: languageName: node linkType: hard +"mimic-fn@npm:^2.1.0": + version: 2.1.0 + resolution: "mimic-fn@npm:2.1.0" + checksum: d2421a3444848ce7f84bd49115ddacff29c15745db73f54041edc906c14b131a38d05298dae3081667627a59b2eb1ca4b436ff2e1b80f69679522410418b478a + languageName: node + linkType: hard + "mimic-response@npm:^1.0.0": version: 1.0.1 resolution: "mimic-response@npm:1.0.1" @@ -1621,6 +2149,47 @@ discord.js@NotEnoughUpdates/discord.js: languageName: node linkType: hard +"minimist@npm:^1.2.0, minimist@npm:^1.2.5": + version: 1.2.5 + resolution: "minimist@npm:1.2.5" + checksum: 86706ce5b36c16bfc35c5fe3dbb01d5acdc9a22f2b6cc810b6680656a1d2c0e44a0159c9a3ba51fb072bb5c203e49e10b51dcd0eec39c481f4c42086719bae52 + languageName: node + linkType: hard + +"module-alias@npm:^2.2.2": + version: 2.2.2 + resolution: "module-alias@npm:2.2.2" + checksum: 4b5543f834b484033e5bd184096ca8276b9195e32e88883ee6ea8d3a4789d97c470d26f5fa7271bd7a26588bf67e4d27dbdb594ee327aef1c9619d855dc78342 + languageName: node + linkType: hard + +"module-definition@npm:^3.3.1": + version: 3.3.1 + resolution: "module-definition@npm:3.3.1" + dependencies: + ast-module-types: ^2.7.1 + node-source-walk: ^4.0.0 + bin: + module-definition: bin/module-definition.js + checksum: f1c0587983aecb650c8e761b6defde383d308d2664c27f8e90b855b9a0d3415010dcaa46643fbe4c9761c8978978fd6f65315834b702544d7cec9af84b0a7528 + languageName: node + linkType: hard + +"module-lookup-amd@npm:^7.0.0": + version: 7.0.1 + resolution: "module-lookup-amd@npm:7.0.1" + dependencies: + commander: ^2.8.1 + debug: ^4.1.0 + glob: ^7.1.6 + requirejs: ^2.3.5 + requirejs-config-file: ^4.0.0 + bin: + lookup-amd: bin/cli.js + checksum: 911abd6b8fb1d82cfae4ef38050981d4eb7e710bfeba898903c5c49a4d3a44b3cacb6201ddf9930a39fae3473faf9b96d39930cfa8766dbf0da86689108895b1 + languageName: node + linkType: hard + "moment-timezone@npm:^0.5.31": version: 0.5.33 resolution: "moment-timezone@npm:0.5.33" @@ -1651,6 +2220,15 @@ discord.js@NotEnoughUpdates/discord.js: languageName: node linkType: hard +"nanoid@npm:^3.1.23": + version: 3.1.23 + resolution: "nanoid@npm:3.1.23" + bin: + nanoid: bin/nanoid.cjs + checksum: 8fa8dc3283a4fa159700a36cb22f61197547c8155831cb74f1b9c51fbc29ea80c136fd91001468d147a31d3a77f884958aec6c1beabac903c89780acacca9327 + languageName: node + linkType: hard + "natural-compare@npm:^1.4.0": version: 1.4.0 resolution: "natural-compare@npm:1.4.0" @@ -1665,6 +2243,15 @@ discord.js@NotEnoughUpdates/discord.js: languageName: node linkType: hard +"node-source-walk@npm:^4.0.0, node-source-walk@npm:^4.2.0": + version: 4.2.0 + resolution: "node-source-walk@npm:4.2.0" + dependencies: + "@babel/parser": ^7.0.0 + checksum: 995979cdd34e708a93c0ab0a9a7c6d89b46060608d12c5a92cb277e7a6e68707e3182dfcc5b50f17c21e442f47b0f3986aa6699bd21ab07e5c7e054652bb9fe8 + languageName: node + linkType: hard + "normalize-url@npm:^6.0.1": version: 6.1.0 resolution: "normalize-url@npm:6.1.0" @@ -1690,6 +2277,29 @@ discord.js@NotEnoughUpdates/discord.js: languageName: node linkType: hard +"onetime@npm:^5.1.0": + version: 5.1.2 + resolution: "onetime@npm:5.1.2" + dependencies: + mimic-fn: ^2.1.0 + checksum: 2478859ef817fc5d4e9c2f9e5728512ddd1dbc9fb7829ad263765bb6d3b91ce699d6e2332eef6b7dff183c2f490bd3349f1666427eaba4469fba0ac38dfd0d34 + languageName: node + linkType: hard + +"optionator@npm:^0.8.1": + version: 0.8.3 + resolution: "optionator@npm:0.8.3" + dependencies: + deep-is: ~0.1.3 + fast-levenshtein: ~2.0.6 + levn: ~0.3.0 + prelude-ls: ~1.1.2 + type-check: ~0.3.2 + word-wrap: ~1.2.3 + checksum: b8695ddf3d593203e25ab0900e265d860038486c943ff8b774f596a310f8ceebdb30c6832407a8198ba3ec9debe1abe1f51d4aad94843612db3b76d690c61d34 + languageName: node + linkType: hard + "optionator@npm:^0.9.1": version: 0.9.1 resolution: "optionator@npm:0.9.1" @@ -1704,6 +2314,23 @@ discord.js@NotEnoughUpdates/discord.js: languageName: node linkType: hard +"ora@npm:^5.4.1": + version: 5.4.1 + resolution: "ora@npm:5.4.1" + dependencies: + bl: ^4.1.0 + chalk: ^4.1.0 + cli-cursor: ^3.1.0 + cli-spinners: ^2.5.0 + is-interactive: ^1.0.0 + is-unicode-supported: ^0.1.0 + log-symbols: ^4.1.0 + strip-ansi: ^6.0.0 + wcwidth: ^1.0.1 + checksum: 28d476ee6c1049d68368c0dc922e7225e3b5600c3ede88fade8052837f9ed342625fdaa84a6209302587c8ddd9b664f71f0759833cbdb3a4cf81344057e63c63 + languageName: node + linkType: hard + "p-cancelable@npm:^2.0.0": version: 2.1.1 resolution: "p-cancelable@npm:2.1.1" @@ -1727,6 +2354,13 @@ discord.js@NotEnoughUpdates/discord.js: languageName: node linkType: hard +"parse-ms@npm:^2.1.0": + version: 2.1.0 + resolution: "parse-ms@npm:2.1.0" + checksum: d5c66c76cca8df5bd0574e2d11b9c3752893b59b466e74308d4a2f09760dc5436a1633f549cad300fc8c3c19154d14959a3b8333d3b2f7bd75898fe18149d564 + languageName: node + linkType: hard + "path-is-absolute@npm:^1.0.0": version: 1.0.1 resolution: "path-is-absolute@npm:1.0.1" @@ -1741,6 +2375,13 @@ discord.js@NotEnoughUpdates/discord.js: languageName: node linkType: hard +"path-parse@npm:^1.0.6": + version: 1.0.7 + resolution: "path-parse@npm:1.0.7" + checksum: 49abf3d81115642938a8700ec580da6e830dde670be21893c62f4e10bd7dd4c3742ddc603fe24f898cba7eb0c6bc1777f8d9ac14185d34540c6d4d80cd9cae8a + languageName: node + linkType: hard + "path-type@npm:^4.0.0": version: 4.0.0 resolution: "path-type@npm:4.0.0" @@ -1836,6 +2477,48 @@ discord.js@NotEnoughUpdates/discord.js: languageName: node linkType: hard +"pluralize@npm:^8.0.0": + version: 8.0.0 + resolution: "pluralize@npm:8.0.0" + checksum: 08931d4a6a4a5561a7f94f67a31c17e6632cb21e459ab3ff4f6f629d9a822984cf8afef2311d2005fbea5d7ef26016ebb090db008e2d8bce39d0a9a9d218736e + languageName: node + linkType: hard + +"postcss-values-parser@npm:^2.0.1": + version: 2.0.1 + resolution: "postcss-values-parser@npm:2.0.1" + dependencies: + flatten: ^1.0.2 + indexes-of: ^1.0.1 + uniq: ^1.0.1 + checksum: 050877880937e15af8d18bf48902e547e2123d7cc32c1f215b392642bc5e2598a87a341995d62f38e450aab4186b8afeb2c9541934806d458ad8b117020b2ebf + languageName: node + linkType: hard + +"postcss-values-parser@npm:^5.0.0": + version: 5.0.0 + resolution: "postcss-values-parser@npm:5.0.0" + dependencies: + color-name: ^1.1.4 + is-url-superb: ^4.0.0 + quote-unquote: ^1.0.0 + peerDependencies: + postcss: ^8.0.9 + checksum: d45bde8606fdb721cf7fc1f971bc635b0da156fd75a1b706b0503af00416d5699afc477d028781229eabab56fa543b17f15b5b13807cfb8c5ba0e442281eb463 + languageName: node + linkType: hard + +"postcss@npm:^8.1.7, postcss@npm:^8.2.13": + version: 8.3.5 + resolution: "postcss@npm:8.3.5" + dependencies: + colorette: ^1.2.2 + nanoid: ^3.1.23 + source-map-js: ^0.6.2 + checksum: c73fc4825ed27396d453a942628cd8e34dd43c11b724f43f65f376d3900037736013b6446f1d9947ce5a847837cf96649e9a3f200ca2bd94a884e91e56ee1ceb + languageName: node + linkType: hard + "postgres-array@npm:~2.0.0": version: 2.0.0 resolution: "postgres-array@npm:2.0.0" @@ -1866,6 +2549,29 @@ discord.js@NotEnoughUpdates/discord.js: languageName: node linkType: hard +"precinct@npm:^8.0.0, precinct@npm:^8.1.0": + version: 8.1.0 + resolution: "precinct@npm:8.1.0" + dependencies: + commander: ^2.20.3 + debug: ^4.3.1 + detective-amd: ^3.0.1 + detective-cjs: ^3.1.1 + detective-es6: ^2.2.0 + detective-less: ^1.0.2 + detective-postcss: ^4.0.0 + detective-sass: ^3.0.1 + detective-scss: ^2.0.1 + detective-stylus: ^1.0.0 + detective-typescript: ^7.0.0 + module-definition: ^3.3.1 + node-source-walk: ^4.2.0 + bin: + precinct: bin/cli.js + checksum: 0b5667f55ad3d064add80ca70a548aa94fbb1f221ee6d1c6a6bbbc87b20328be8b0878148a974b4b5abc9c57bc89a7da40fa28fa11d11d0e939c1ac82774d5b7 + languageName: node + linkType: hard + "prelude-ls@npm:^1.2.1": version: 1.2.1 resolution: "prelude-ls@npm:1.2.1" @@ -1873,6 +2579,13 @@ discord.js@NotEnoughUpdates/discord.js: languageName: node linkType: hard +"prelude-ls@npm:~1.1.2": + version: 1.1.2 + resolution: "prelude-ls@npm:1.1.2" + checksum: c4867c87488e4a0c233e158e4d0d5565b609b105d75e4c05dc760840475f06b731332eb93cc8c9cecb840aa8ec323ca3c9a56ad7820ad2e63f0261dadcb154e4 + languageName: node + linkType: hard + "prettier@npm:^2.3.2": version: 2.3.2 resolution: "prettier@npm:2.3.2" @@ -1882,6 +2595,15 @@ discord.js@NotEnoughUpdates/discord.js: languageName: node linkType: hard +"pretty-ms@npm:^7.0.1": + version: 7.0.1 + resolution: "pretty-ms@npm:7.0.1" + dependencies: + parse-ms: ^2.1.0 + checksum: d76c4920283b48be91f1d3797a2ce4bd51187d58d2a609ae993c028f73c92d16439449d857af57ccad91ae3a38b30c87307f5589749a056102ebb494c686957e + languageName: node + linkType: hard + "prism-media@npm:^1.3.1": version: 1.3.1 resolution: "prism-media@npm:1.3.1" @@ -1948,6 +2670,13 @@ discord.js@NotEnoughUpdates/discord.js: languageName: node linkType: hard +"quote-unquote@npm:^1.0.0": + version: 1.0.0 + resolution: "quote-unquote@npm:1.0.0" + checksum: 955a2ead534f5b6a3f8d4dc5a4b95ac6468213d3fb11f8c1592a0a56345c45a3d14d5ca04d3de2bc9891493fcac38c03dfa91c48a6159aef50124e9c5afcea49 + languageName: node + linkType: hard + "raw-body@npm:2.4.0": version: 2.4.0 resolution: "raw-body@npm:2.4.0" @@ -1960,7 +2689,21 @@ discord.js@NotEnoughUpdates/discord.js: languageName: node linkType: hard -"readable-stream@npm:^3.0.0": +"rc@npm:^1.2.7": + version: 1.2.8 + resolution: "rc@npm:1.2.8" + dependencies: + deep-extend: ^0.6.0 + ini: ~1.3.0 + minimist: ^1.2.0 + strip-json-comments: ~2.0.1 + bin: + rc: ./cli.js + checksum: 2e26e052f8be2abd64e6d1dabfbd7be03f80ec18ccbc49562d31f617d0015fbdbcf0f9eed30346ea6ab789e0fdfe4337f033f8016efdbee0df5354751842080e + languageName: node + linkType: hard + +"readable-stream@npm:^3.0.0, readable-stream@npm:^3.4.0": version: 3.6.0 resolution: "readable-stream@npm:3.6.0" dependencies: @@ -1985,6 +2728,26 @@ discord.js@NotEnoughUpdates/discord.js: languageName: node linkType: hard +"requirejs-config-file@npm:^4.0.0": + version: 4.0.0 + resolution: "requirejs-config-file@npm:4.0.0" + dependencies: + esprima: ^4.0.0 + stringify-object: ^3.2.1 + checksum: 61ac1c419a8978df9484211827047f0a43d48a97e242ebca9628a2e52da8c739ee068bd67dc4d5dc5fd7be6d1c9a863006bb02df691c86914921fe12713fbebb + languageName: node + linkType: hard + +"requirejs@npm:^2.3.5": + version: 2.3.6 + resolution: "requirejs@npm:2.3.6" + bin: + r.js: ./bin/r.js + r_js: ./bin/r.js + checksum: 7c3c006bf5e1887d93ac7adb7f600328918d23cf3d28282a505a2873d4ddde499c7ec560e55cee3440d17fe1205cb4dcb72b07f35b39e8940372eca850e49b62 + languageName: node + linkType: hard + "resolve-alpn@npm:^1.0.0": version: 1.1.2 resolution: "resolve-alpn@npm:1.1.2" @@ -1992,6 +2755,13 @@ discord.js@NotEnoughUpdates/discord.js: languageName: node linkType: hard +"resolve-dependency-path@npm:^2.0.0": + version: 2.0.0 + resolution: "resolve-dependency-path@npm:2.0.0" + checksum: 161296969a0a7853ebb7710847154ffb5bd11a51c370b67a0d0c89cacfcb57063d204587617fd030ea227bfd19a3c4af79d39e9d20ae0fbe354c27598d1ea8a8 + languageName: node + linkType: hard + "resolve-from@npm:^4.0.0": version: 4.0.0 resolution: "resolve-from@npm:4.0.0" @@ -1999,6 +2769,26 @@ discord.js@NotEnoughUpdates/discord.js: languageName: node linkType: hard +resolve@^1.19.0: + version: 1.20.0 + resolution: "resolve@npm:1.20.0" + dependencies: + is-core-module: ^2.2.0 + path-parse: ^1.0.6 + checksum: 40cf70b2cde00ef57f99daf2dc63c6a56d6c14a1b7fc51735d06a6f0a3b97cb67b4fb7ef6c747b4e13a7baba83b0ef625d7c4ce92a483cd5af923c3b65fd16fe + languageName: node + linkType: hard + +"resolve@patch:resolve@^1.19.0#~builtin": + version: 1.20.0 + resolution: "resolve@patch:resolve@npm%3A1.20.0#~builtin::version=1.20.0&hash=00b1ff" + dependencies: + is-core-module: ^2.2.0 + path-parse: ^1.0.6 + checksum: bed00be983cd20a8af0e7840664f655c4b269786dbd9595c5f156cd9d8a0050e65cdbbbdafc30ee9b6245b230c78a2c8ab6447a52545b582f476c29adb188cc5 + languageName: node + linkType: hard + "responselike@npm:^2.0.0": version: 2.0.0 resolution: "responselike@npm:2.0.0" @@ -2008,6 +2798,16 @@ discord.js@NotEnoughUpdates/discord.js: languageName: node linkType: hard +"restore-cursor@npm:^3.1.0": + version: 3.1.0 + resolution: "restore-cursor@npm:3.1.0" + dependencies: + onetime: ^5.1.0 + signal-exit: ^3.0.2 + checksum: f877dd8741796b909f2a82454ec111afb84eb45890eb49ac947d87991379406b3b83ff9673a46012fca0d7844bb989f45cc5b788254cf1a39b6b5a9659de0630 + languageName: node + linkType: hard + "retry-as-promised@npm:^3.2.0": version: 3.2.0 resolution: "retry-as-promised@npm:3.2.0" @@ -2058,6 +2858,17 @@ discord.js@NotEnoughUpdates/discord.js: languageName: node linkType: hard +"sass-lookup@npm:^3.0.0": + version: 3.0.0 + resolution: "sass-lookup@npm:3.0.0" + dependencies: + commander: ^2.16.0 + bin: + sass-lookup: bin/cli.js + checksum: fd4bf1ad9c54111617dec30dd90aff083e87c96aef50aff6cec443ad2fbbfa65da09f6e67a7e5ef99fa39dff65c937dc7358f18d319e083c6031f21def85ce6d + languageName: node + linkType: hard + "semver@npm:^7.2.1, semver@npm:^7.3.2, semver@npm:^7.3.5": version: 7.3.5 resolution: "semver@npm:7.3.5" @@ -2133,6 +2944,13 @@ discord.js@NotEnoughUpdates/discord.js: languageName: node linkType: hard +"signal-exit@npm:^3.0.2": + version: 3.0.3 + resolution: "signal-exit@npm:3.0.3" + checksum: f0169d3f1263d06df32ca072b0bf33b34c6f8f0341a7a1621558a2444dfbe8f5fec76b35537fcc6f0bc4944bdb5336fe0bdcf41a5422c4e45a1dba3f45475e6c + languageName: node + linkType: hard + "slash@npm:^3.0.0": version: 3.0.0 resolution: "slash@npm:3.0.0" @@ -2151,6 +2969,13 @@ discord.js@NotEnoughUpdates/discord.js: languageName: node linkType: hard +"source-map-js@npm:^0.6.2": + version: 0.6.2 + resolution: "source-map-js@npm:0.6.2" + checksum: 9c8151a29e00fd8d3ba87709fdf9a9ce48313d653f4a29a39b4ae53d346ac79e005de624796ff42eff55cbaf26d2e87f4466001ca87831d400d818c5cf146a0e + languageName: node + linkType: hard + "source-map-support@npm:^0.5.19": version: 0.5.19 resolution: "source-map-support@npm:0.5.19" @@ -2161,7 +2986,7 @@ discord.js@NotEnoughUpdates/discord.js: languageName: node linkType: hard -"source-map@npm:^0.6.0": +"source-map@npm:^0.6.0, source-map@npm:~0.6.1": version: 0.6.1 resolution: "source-map@npm:0.6.1" checksum: 59ce8640cf3f3124f64ac289012c2b8bd377c238e316fb323ea22fbfe83da07d81e000071d7242cad7a23cd91c7de98e4df8830ec3f133cb6133a5f6e9f67bc2 @@ -2211,6 +3036,17 @@ discord.js@NotEnoughUpdates/discord.js: languageName: node linkType: hard +"stringify-object@npm:^3.2.1": + version: 3.3.0 + resolution: "stringify-object@npm:3.3.0" + dependencies: + get-own-enumerable-property-symbols: ^3.0.0 + is-obj: ^1.0.1 + is-regexp: ^1.0.0 + checksum: 6827a3f35975cfa8572e8cd3ed4f7b262def260af18655c6fde549334acdac49ddba69f3c861ea5a6e9c5a4990fe4ae870b9c0e6c31019430504c94a83b7a154 + languageName: node + linkType: hard + "strip-ansi@npm:^6.0.0": version: 6.0.0 resolution: "strip-ansi@npm:6.0.0" @@ -2227,6 +3063,25 @@ discord.js@NotEnoughUpdates/discord.js: languageName: node linkType: hard +"strip-json-comments@npm:~2.0.1": + version: 2.0.1 + resolution: "strip-json-comments@npm:2.0.1" + checksum: 1074ccb63270d32ca28edfb0a281c96b94dc679077828135141f27d52a5a398ef5e78bcf22809d23cadc2b81dfbe345eb5fd8699b385c8b1128907dec4a7d1e1 + languageName: node + linkType: hard + +"stylus-lookup@npm:^3.0.1": + version: 3.0.2 + resolution: "stylus-lookup@npm:3.0.2" + dependencies: + commander: ^2.8.1 + debug: ^4.1.0 + bin: + stylus-lookup: bin/cli.js + checksum: 460e9b6e7e662e2cf98d41ee670cb5da9ec8b8dbc1d4574de29ac422c632d5c7933772822fc12792f2ee9f9c2f62b3f60ed5850690e7c780ab7b6f07010199e4 + languageName: node + linkType: hard + "supports-color@npm:^5.3.0": version: 5.5.0 resolution: "supports-color@npm:5.5.0" @@ -2259,6 +3114,20 @@ discord.js@NotEnoughUpdates/discord.js: languageName: node linkType: hard +"tapable@npm:^2.2.0": + version: 2.2.0 + resolution: "tapable@npm:2.2.0" + checksum: 5a7e31ddd2400d524b68e7ba0373e492ba52b321b8e1eb15b65956e9c1b9ba90dd175210a1318b6752538cbe3b284f4a7218a714be942aeeb812623c243aea25 + languageName: node + linkType: hard + +"temp@npm:~0.4.0": + version: 0.4.0 + resolution: "temp@npm:0.4.0" + checksum: 8b83f98833b7f6cd03a1f523d17f8b06fe687cbdfc5654ae41edacdf640e71f1057c3cf2534ac44e265834c1af6270d9a0b9baeee6b86ccb2ef379e43dbc0d0a + languageName: node + linkType: hard + "text-table@npm:^0.2.0": version: 0.2.0 resolution: "text-table@npm:0.2.0" @@ -2273,6 +3142,13 @@ discord.js@NotEnoughUpdates/discord.js: languageName: node linkType: hard +"to-fast-properties@npm:^2.0.0": + version: 2.0.0 + resolution: "to-fast-properties@npm:2.0.0" + checksum: be2de62fe58ead94e3e592680052683b1ec986c72d589e7b21e5697f8744cdbf48c266fa72f6c15932894c10187b5f54573a3bcf7da0bfd964d5caf23d436168 + languageName: node + linkType: hard + "to-regex-range@npm:^5.0.1": version: 5.0.1 resolution: "to-regex-range@npm:5.0.1" @@ -2330,6 +3206,15 @@ discord.js@NotEnoughUpdates/discord.js: languageName: node linkType: hard +"type-check@npm:~0.3.2": + version: 0.3.2 + resolution: "type-check@npm:0.3.2" + dependencies: + prelude-ls: ~1.1.2 + checksum: dd3b1495642731bc0e1fc40abe5e977e0263005551ac83342ecb6f4f89551d106b368ec32ad3fb2da19b3bd7b2d1f64330da2ea9176d8ddbfe389fb286eb5124 + languageName: node + linkType: hard + "type-fest@npm:^0.20.2": version: 0.20.2 resolution: "type-fest@npm:0.20.2" @@ -2357,6 +3242,16 @@ typescript@4.2.4: languageName: node linkType: hard +"typescript@^3.9.5, typescript@^3.9.7": + version: 3.9.10 + resolution: "typescript@npm:3.9.10" + bin: + tsc: bin/tsc + tsserver: bin/tsserver + checksum: 46c842e2cd4797b88b66ef06c9c41dd21da48b95787072ccf39d5f2aa3124361bc4c966aa1c7f709fae0509614d76751455b5231b12dbb72eb97a31369e1ff92 + languageName: node + linkType: hard + "typescript@patch:typescript@4.2.4#~builtin": version: 4.2.4 resolution: "typescript@patch:typescript@npm%3A4.2.4#~builtin::version=4.2.4&hash=d8b4e7" @@ -2367,6 +3262,16 @@ typescript@4.2.4: languageName: node linkType: hard +"typescript@patch:typescript@^3.9.5#~builtin, typescript@patch:typescript@^3.9.7#~builtin": + version: 3.9.10 + resolution: "typescript@patch:typescript@npm%3A3.9.10#~builtin::version=3.9.10&hash=d8b4e7" + bin: + tsc: bin/tsc + tsserver: bin/tsserver + checksum: 8dcd46a8a2cb81198497f00c7721a34c914bf6b3241bf9687b868bdec9e59f1f44da41e7917cfc1dcabee4595229c73bab047f2d85c1aedacc0d1b526cc81534 + languageName: node + linkType: hard + "underscore@npm:^1.13.1": version: 1.13.1 resolution: "underscore@npm:1.13.1" @@ -2374,6 +3279,13 @@ typescript@4.2.4: languageName: node linkType: hard +"uniq@npm:^1.0.1": + version: 1.0.1 + resolution: "uniq@npm:1.0.1" + checksum: 8206535f83745ea83f9da7035f3b983fd6ed5e35b8ed7745441944e4065b616bc67cf0d0a23a86b40ee0074426f0607f0a138f9b78e124eb6a7a6a6966055709 + languageName: node + linkType: hard + "unpipe@npm:1.0.0": version: 1.0.0 resolution: "unpipe@npm:1.0.0" @@ -2420,6 +3332,22 @@ typescript@4.2.4: languageName: node linkType: hard +"walkdir@npm:^0.4.1": + version: 0.4.1 + resolution: "walkdir@npm:0.4.1" + checksum: 71045c21dc19aae3321f897b6e9e507cf8039202665c35a0b908eecccaf25636aab769b31cbd61ef8267237fe22fc316923a691ecc2d9d38840a15c59c0f2594 + languageName: node + linkType: hard + +"wcwidth@npm:^1.0.1": + version: 1.0.1 + resolution: "wcwidth@npm:1.0.1" + dependencies: + defaults: ^1.0.3 + checksum: 814e9d1ddcc9798f7377ffa448a5a3892232b9275ebb30a41b529607691c0491de47cba426e917a4d08ded3ee7e9ba2f3fe32e62ee3cd9c7d3bafb7754bd553c + languageName: node + linkType: hard + "which@npm:^2.0.1": version: 2.0.2 resolution: "which@npm:2.0.2" @@ -2440,7 +3368,7 @@ typescript@4.2.4: languageName: node linkType: hard -"word-wrap@npm:^1.2.3": +"word-wrap@npm:^1.2.3, word-wrap@npm:~1.2.3": version: 1.2.3 resolution: "word-wrap@npm:1.2.3" checksum: 30b48f91fcf12106ed3186ae4fa86a6a1842416df425be7b60485de14bec665a54a68e4b5156647dec3a70f25e84d270ca8bc8cd23182ed095f5c7206a938c1f @@ -2455,8 +3383,8 @@ typescript@4.2.4: linkType: hard "ws@npm:^7.4.4, ws@npm:^7.5.1": - version: 7.5.2 - resolution: "ws@npm:7.5.2" + version: 7.5.3 + resolution: "ws@npm:7.5.3" peerDependencies: bufferutil: ^4.0.1 utf-8-validate: ^5.0.2 @@ -2465,7 +3393,7 @@ typescript@4.2.4: optional: true utf-8-validate: optional: true - checksum: 23aef9248676d1f2695b85ed52de2b8babc7989f126e4ee60ef4ceaa3dcdf5cb7447822f0341d9ab2907ccad2a232247f59220f2292a30269adc7d0a30bf0e34 + checksum: 423dc0d859fa74020f5555140905b862470a60ea1567bb9ad55a087263d7718b9c94f69678be1cee9868925c570f1e6fc79d09f90c39057bc63fa2edbb2c547b languageName: node linkType: hard -- cgit