aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-x.pnp.cjs1100
-rw-r--r--.prettierignore5
-rw-r--r--.vscode/extensions.json2
-rw-r--r--.vscode/launch.json1
-rw-r--r--.vscode/settings.json23
-rw-r--r--.vscode/typescript.code-snippets1
-rw-r--r--package.json6
-rw-r--r--src/arguments/contentWithDuration.ts2
-rw-r--r--src/arguments/duration.ts2
-rw-r--r--src/bot.ts3
-rw-r--r--src/commands/config/muteRole.ts2
-rw-r--r--src/commands/config/prefix.ts2
-rw-r--r--src/commands/config/welcomeChannel.ts2
-rw-r--r--src/commands/dev/eval.ts4
-rw-r--r--src/commands/dev/reload.ts2
-rw-r--r--src/commands/dev/setLevel.ts2
-rw-r--r--src/commands/dev/superUser.ts2
-rw-r--r--src/commands/dev/testDuration.ts2
-rw-r--r--src/commands/info/botInfo.ts2
-rw-r--r--src/commands/info/help.ts2
-rw-r--r--src/commands/info/ping.ts2
-rw-r--r--src/commands/info/pronouns.ts2
-rw-r--r--src/commands/moderation/ban.ts2
-rw-r--r--src/commands/moderation/kick.ts2
-rw-r--r--src/commands/moderation/modlog.ts2
-rw-r--r--src/commands/moderation/mute.ts2
-rw-r--r--src/commands/moderation/role.ts2
-rw-r--r--src/commands/moderation/warn.ts2
-rw-r--r--src/commands/moulberry-bush/capePerms.ts2
-rw-r--r--src/commands/moulberry-bush/giveawayPing.ts2
-rw-r--r--src/commands/moulberry-bush/level.ts4
-rw-r--r--src/commands/moulberry-bush/rule.ts2
-rw-r--r--src/inhibitors/blacklist/guildBlacklist.ts2
-rw-r--r--src/inhibitors/blacklist/userBlacklist.ts2
-rw-r--r--src/inhibitors/commands/disabledCommand.ts2
-rw-r--r--src/inhibitors/noCache.ts2
-rw-r--r--src/lib/extensions/discord-akairo/BushArgumentTypeCaster.ts2
-rw-r--r--src/lib/extensions/discord-akairo/BushClient.ts108
-rw-r--r--src/lib/extensions/discord-akairo/BushClientUtil.ts31
-rw-r--r--src/lib/extensions/discord-akairo/BushCommand.ts5
-rw-r--r--src/lib/extensions/discord-akairo/BushCommandHandler.ts5
-rw-r--r--src/lib/extensions/discord-akairo/BushCommandUtil.ts4
-rw-r--r--src/lib/extensions/discord-akairo/BushInhibitor.ts5
-rw-r--r--src/lib/extensions/discord-akairo/BushInhibitorHandler.ts2
-rw-r--r--src/lib/extensions/discord-akairo/BushListener.ts2
-rw-r--r--src/lib/extensions/discord-akairo/BushListenerHandler.ts2
-rw-r--r--src/lib/extensions/discord-akairo/BushSlashMessage.ts6
-rw-r--r--src/lib/extensions/discord-akairo/BushTask.ts4
-rw-r--r--src/lib/extensions/discord-akairo/BushTaskHandler.ts2
-rw-r--r--src/lib/extensions/discord-akairo/index.ts13
-rw-r--r--src/lib/extensions/discord.js/BushActivity.ts3
-rw-r--r--src/lib/extensions/discord.js/BushApplicationCommand.ts3
-rw-r--r--src/lib/extensions/discord.js/BushApplicationCommandManager.ts5
-rw-r--r--src/lib/extensions/discord.js/BushApplicationCommandPermissionsManager.ts7
-rw-r--r--src/lib/extensions/discord.js/BushButtonInteraction.ts8
-rw-r--r--src/lib/extensions/discord.js/BushCategoryChannel.ts5
-rw-r--r--src/lib/extensions/discord.js/BushCommandInteraction.ts18
-rw-r--r--src/lib/extensions/discord.js/BushDMChannel.ts4
-rw-r--r--src/lib/extensions/discord.js/BushEmoji.ts2
-rw-r--r--src/lib/extensions/discord.js/BushGuild.ts3
-rw-r--r--src/lib/extensions/discord.js/BushGuildApplicationCommandManager.ts2
-rw-r--r--src/lib/extensions/discord.js/BushGuildChannel.ts3
-rw-r--r--src/lib/extensions/discord.js/BushGuildEmoji.ts5
-rw-r--r--src/lib/extensions/discord.js/BushGuildEmojiRoleManager.ts4
-rw-r--r--src/lib/extensions/discord.js/BushGuildMember.ts5
-rw-r--r--src/lib/extensions/discord.js/BushGuildMemberManager.ts2
-rw-r--r--src/lib/extensions/discord.js/BushMessage.ts18
-rw-r--r--src/lib/extensions/discord.js/BushMessageManager.ts6
-rw-r--r--src/lib/extensions/discord.js/BushMessageReaction.ts5
-rw-r--r--src/lib/extensions/discord.js/BushNewsChannel.ts5
-rw-r--r--src/lib/extensions/discord.js/BushPresence.ts5
-rw-r--r--src/lib/extensions/discord.js/BushReactionEmoji.ts3
-rw-r--r--src/lib/extensions/discord.js/BushRole.ts4
-rw-r--r--src/lib/extensions/discord.js/BushSelectMenuInteraction.ts8
-rw-r--r--src/lib/extensions/discord.js/BushStageChannel.ts6
-rw-r--r--src/lib/extensions/discord.js/BushStageInstance.ts4
-rw-r--r--src/lib/extensions/discord.js/BushStoreChannel.ts5
-rw-r--r--src/lib/extensions/discord.js/BushTextChannel.ts4
-rw-r--r--src/lib/extensions/discord.js/BushThreadChannel.ts17
-rw-r--r--src/lib/extensions/discord.js/BushThreadManager.ts3
-rw-r--r--src/lib/extensions/discord.js/BushThreadMember.ts4
-rw-r--r--src/lib/extensions/discord.js/BushThreadMemberManager.ts3
-rw-r--r--src/lib/extensions/discord.js/BushUser.ts3
-rw-r--r--src/lib/extensions/discord.js/BushVoiceChannel.ts4
-rw-r--r--src/lib/extensions/discord.js/BushVoiceState.ts5
-rw-r--r--src/lib/extensions/discord.js/index.ts35
-rw-r--r--src/lib/extensions/global.d.ts2
-rw-r--r--src/lib/extensions/index.ts3
-rw-r--r--src/lib/index.ts65
-rw-r--r--src/lib/models/Ban.ts2
-rw-r--r--src/lib/models/Global.ts2
-rw-r--r--src/lib/models/Guild.ts3
-rw-r--r--src/lib/models/Level.ts2
-rw-r--r--src/lib/models/ModLog.ts2
-rw-r--r--src/lib/models/Mute.ts2
-rw-r--r--src/lib/models/PunishmentRole.ts2
-rw-r--r--src/lib/models/StickyRole.ts2
-rw-r--r--src/lib/models/index.ts9
-rw-r--r--src/lib/utils/BushLogger.ts2
-rw-r--r--src/lib/utils/index.ts5
-rw-r--r--src/listeners/client/interaction.ts2
-rw-r--r--src/listeners/client/ready.ts12
-rw-r--r--src/listeners/commands/commandBlocked.ts2
-rw-r--r--src/listeners/commands/commandError.ts2
-rw-r--r--src/listeners/commands/commandMissingPermissions.ts2
-rw-r--r--src/listeners/commands/commandStarted.ts2
-rw-r--r--src/listeners/commands/slashBlocked.ts2
-rw-r--r--src/listeners/commands/slashCommandError.ts8
-rw-r--r--src/listeners/commands/slashMissingPermissions.ts2
-rw-r--r--src/listeners/commands/slashStarted.ts4
-rw-r--r--src/listeners/guild/syncUnban.ts2
-rw-r--r--src/listeners/message/level.ts2
-rw-r--r--src/listeners/other/consoleListener.ts4
-rw-r--r--src/listeners/other/promiseRejection.ts2
-rw-r--r--src/tasks/unban.ts2
-rw-r--r--src/tasks/unmute.ts2
-rw-r--r--src/tasks/updateCache.ts16
-rw-r--r--tsconfig.json6
-rw-r--r--yarn.lock972
119 files changed, 2416 insertions, 351 deletions
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/ex