aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIRONM00N <64110067+IRONM00N@users.noreply.github.com>2022-01-31 19:20:39 -0500
committerIRONM00N <64110067+IRONM00N@users.noreply.github.com>2022-01-31 19:20:39 -0500
commitbab76f38a17c62f8c1477172fe1bc9428efb3843 (patch)
tree9aee5ed7b54e74735ff417820427c9d2efa984f4
parent78ab3362a52578d0bcada903732f147747c609df (diff)
downloadtanzanite-bab76f38a17c62f8c1477172fe1bc9428efb3843.tar.gz
tanzanite-bab76f38a17c62f8c1477172fe1bc9428efb3843.tar.bz2
tanzanite-bab76f38a17c62f8c1477172fe1bc9428efb3843.zip
fixes, and breaking changes
-rw-r--r--package.json25
-rw-r--r--src/arguments/permission.ts8
-rw-r--r--src/commands/admin/channelPermissions.ts8
-rw-r--r--src/commands/admin/roleAll.ts8
-rw-r--r--src/commands/config/_customAutomodPhrases.ts4
-rw-r--r--src/commands/config/blacklist.ts4
-rw-r--r--src/commands/config/config.ts6
-rw-r--r--src/commands/config/disable.ts5
-rw-r--r--src/commands/config/features.ts6
-rw-r--r--src/commands/config/log.ts4
-rw-r--r--src/commands/dev/eval.ts4
-rw-r--r--src/commands/info/avatar.ts6
-rw-r--r--src/commands/info/botInfo.ts4
-rw-r--r--src/commands/info/color.ts5
-rw-r--r--src/commands/info/guildInfo.ts14
-rw-r--r--src/commands/info/help.ts4
-rw-r--r--src/commands/info/icon.ts6
-rw-r--r--src/commands/info/ping.ts4
-rw-r--r--src/commands/info/pronouns.ts4
-rw-r--r--src/commands/info/snowflake.ts4
-rw-r--r--src/commands/info/userInfo.ts18
-rw-r--r--src/commands/leveling/leaderboard.ts4
-rw-r--r--src/commands/leveling/level.ts6
-rw-r--r--src/commands/leveling/levelRoles.ts6
-rw-r--r--src/commands/leveling/setLevel.ts4
-rw-r--r--src/commands/leveling/setXp.ts4
-rw-r--r--src/commands/moderation/_activePunishments.ts2
-rw-r--r--src/commands/moderation/ban.ts6
-rw-r--r--src/commands/moderation/block.ts6
-rw-r--r--src/commands/moderation/evidence.ts4
-rw-r--r--src/commands/moderation/hideCase.ts4
-rw-r--r--src/commands/moderation/kick.ts6
-rw-r--r--src/commands/moderation/lockdown.ts7
-rw-r--r--src/commands/moderation/modlog.ts4
-rw-r--r--src/commands/moderation/mute.ts6
-rw-r--r--src/commands/moderation/purge.ts6
-rw-r--r--src/commands/moderation/removeReactionEmoji.ts6
-rw-r--r--src/commands/moderation/role.ts6
-rw-r--r--src/commands/moderation/slowmode.ts6
-rw-r--r--src/commands/moderation/timeout.ts6
-rw-r--r--src/commands/moderation/unban.ts6
-rw-r--r--src/commands/moderation/unblock.ts6
-rw-r--r--src/commands/moderation/unlockdown.ts6
-rw-r--r--src/commands/moderation/unmute.ts6
-rw-r--r--src/commands/moderation/untimeout.ts6
-rw-r--r--src/commands/moderation/warn.ts4
-rw-r--r--src/commands/moulberry-bush/capePermissions.ts4
-rw-r--r--src/commands/moulberry-bush/capes.ts4
-rw-r--r--src/commands/moulberry-bush/giveawayPing.ts18
-rw-r--r--src/commands/moulberry-bush/moulHammer.ts4
-rw-r--r--src/commands/moulberry-bush/report.ts4
-rw-r--r--src/commands/moulberry-bush/rule.ts4
-rw-r--r--src/commands/moulberry-bush/serverStatus.ts4
-rw-r--r--src/commands/utilities/activity.ts8
-rw-r--r--src/commands/utilities/price.ts4
-rw-r--r--src/commands/utilities/reminders.ts4
-rw-r--r--src/commands/utilities/steal.ts6
-rw-r--r--src/commands/utilities/viewRaw.ts4
-rw-r--r--src/lib/common/AutoMod.ts6
-rw-r--r--src/lib/common/util/Moderation.ts4
-rw-r--r--src/lib/extensions/discord-akairo/BushClient.ts55
-rw-r--r--src/lib/extensions/discord-akairo/BushClientUtil.ts19
-rw-r--r--src/lib/extensions/discord-akairo/BushCommand.ts4
-rw-r--r--src/lib/extensions/discord-akairo/BushCommandHandler.ts6
-rw-r--r--src/lib/extensions/discord.js/BushChannel.ts7
-rw-r--r--src/lib/extensions/discord.js/BushClientEvents.ts14
-rw-r--r--src/lib/extensions/discord.js/BushDMChannel.ts3
-rw-r--r--src/lib/extensions/discord.js/BushGuild.ts16
-rw-r--r--src/lib/extensions/discord.js/BushGuildChannel.ts3
-rw-r--r--src/lib/extensions/discord.js/BushGuildChannelManager.ts2
-rw-r--r--src/lib/extensions/discord.js/BushGuildMember.ts27
-rw-r--r--src/lib/extensions/discord.js/BushGuildMemberManager.ts2
-rw-r--r--src/lib/extensions/discord.js/BushStoreChannel.ts3
-rw-r--r--src/lib/extensions/discord.js/BushTextChannel.ts3
-rw-r--r--src/lib/extensions/discord.js/BushThreadChannel.ts3
-rw-r--r--src/lib/extensions/discord.js/BushThreadMemberManager.ts2
-rw-r--r--src/lib/extensions/discord.js/BushUserManager.ts4
-rw-r--r--src/lib/utils/BushConstants.ts113
-rw-r--r--src/listeners/client/rateLimit.ts15
-rw-r--r--src/listeners/commands/commandMissingPermissions.ts3
-rw-r--r--src/listeners/commands/commandStarted.ts6
-rw-r--r--src/listeners/member-custom/bushBan.ts2
-rw-r--r--src/listeners/member-custom/bushBlock.ts2
-rw-r--r--src/listeners/member-custom/bushKick.ts2
-rw-r--r--src/listeners/member-custom/bushMute.ts2
-rw-r--r--src/listeners/member-custom/bushPunishRole.ts2
-rw-r--r--src/listeners/member-custom/bushPunishRoleRemove.ts2
-rw-r--r--src/listeners/member-custom/bushPurge.ts2
-rw-r--r--src/listeners/member-custom/bushRemoveTimeout.ts2
-rw-r--r--src/listeners/member-custom/bushTimeout.ts2
-rw-r--r--src/listeners/member-custom/bushUnban.ts2
-rw-r--r--src/listeners/member-custom/bushUnblock.ts2
-rw-r--r--src/listeners/member-custom/bushUnmute.ts2
-rw-r--r--src/listeners/member-custom/bushUpdateModlog.ts2
-rw-r--r--src/listeners/member-custom/bushUpdateSettings.ts2
-rw-r--r--src/listeners/member-custom/bushWarn.ts2
-rw-r--r--src/listeners/message/autoThread.ts4
-rw-r--r--src/listeners/rest/rateLimit.ts16
-rw-r--r--src/listeners/track-manual-punishments/modlogSyncBan.ts6
-rw-r--r--src/listeners/track-manual-punishments/modlogSyncKick.ts6
-rw-r--r--src/listeners/track-manual-punishments/modlogSyncTimeout.ts6
-rw-r--r--src/listeners/track-manual-punishments/modlogSyncUnban.ts6
-rw-r--r--tsconfig.json30
-rw-r--r--yarn.lock393
104 files changed, 627 insertions, 542 deletions
diff --git a/package.json b/package.json
index 786a3d7..ea8c3fc 100644
--- a/package.json
+++ b/package.json
@@ -7,13 +7,13 @@
"repository": "https://github.com/NotEnoughUpdates/bush-bot-3.0",
"author": "IRONM00N#0001 (@IRONM00N)",
"contributors": [
+ "jani270#0119 (@jani270)",
"Tyman#5998 (@TymanWasTaken)",
"TrashCan#8913 (@TrashCan69420)",
"tricked#3777 (@Tricked-dev)",
"rioho#0001 (@riohorealhk)",
"Proudmuslim#2900 (@proudmuslim-dev)",
"katherine🌺#0668 (@Lisenaaaa)",
- "jani270#0119 (@jani270)",
"pjones123#6025 (@pjones123)",
"Angry_Pineapple#6926 (@Angry-Pineapple3121)",
"EthanDevelops#5366 (@EthanDevelops)"
@@ -44,7 +44,7 @@
"format:check": "yarn prettier . --check",
"upgrade": "yarn rimraf yarn.lock && yarn cache clean && yarn install && yarn up && yarn up -R && yarn set version latest",
"upgrade:sdk": "yarn dlx @yarnpkg/sdks vscode",
- "upgrade:manual": "yarn add @notenoughupdates/discord.js-minesweeper @notenoughupdates/events-intercept @notenoughupdates/humanize-duration @notenoughupdates/simplify-number @notenoughupdates/wolfram-alpha-api @sentry/integrations @sentry/node @sentry/tracing canvas deep-lock chalk discord-akairo@npm:@notenoughupdates/discord-akairo@dev discord.js@npm:@notenoughupdates/discord.js@dev fuse.js got lodash mathjs moment nanoid node-os-utils numeral pg pg-hstore prettier pretty-bytes rimraf sequelize source-map-support tinycolor2 tslib typescript vm2 && yarn add --dev @types/express @types/lodash @types/node @types/node-os-utils @types/numeral @types/tinycolor2 @types/validator @typescript-eslint/eslint-plugin @typescript-eslint/parser discord-api-types@0.26.0 eslint eslint-config-prettier",
+ "upgrade:manual": "yarn add @notenoughupdates/discord.js-minesweeper @notenoughupdates/events-intercept @notenoughupdates/humanize-duration @notenoughupdates/simplify-number @notenoughupdates/wolfram-alpha-api @sentry/integrations @sentry/node @sentry/tracing canvas chalk deep-lock discord-akairo@npm:@notenoughupdates/discord-akairo@dev discord.js@npm:@notenoughupdates/discord.js@dev fuse.js got lodash mathjs moment nanoid node-os-utils numeral pg pg-hstore prettier pretty-bytes rimraf sequelize source-map-support tinycolor2 tslib typescript vm2 && yarn add --dev @types/express @types/lodash @types/node @types/node-os-utils @types/numeral @types/tinycolor2 @types/validator @typescript-eslint/eslint-plugin @typescript-eslint/parser discord-api-types@0.26.1 eslint eslint-config-prettier node-fetch",
"upgrade:package": "powershell -c \"yarn info --name-only | %{\\$_ -replace '^(?:├─ |└─ )?(@?[a-z0-9-~][a-z0-9-._~/]{0,}(?=.*(npm:(?!.*dev)|patch:.*?@npm).*))|.*\\$','\\$1'} | where{[string]::IsNullOrEmpty(\\$_) -eq \\$false} | yarn add\"",
"beta": "git push && git checkout beta && git merge master && git push && git checkout master",
"deploy:beta": "pm2 deploy ecosystem.config.cjs beta",
@@ -57,9 +57,9 @@
"@notenoughupdates/humanize-duration": "^4.0.1",
"@notenoughupdates/simplify-number": "^1.0.1",
"@notenoughupdates/wolfram-alpha-api": "^1.0.1",
- "@sentry/integrations": "^6.16.1",
- "@sentry/node": "^6.16.1",
- "@sentry/tracing": "^6.16.1",
+ "@sentry/integrations": "^6.17.3",
+ "@sentry/node": "^6.17.3",
+ "@sentry/tracing": "^6.17.3",
"canvas": "^2.9.0",
"chalk": "^5.0.0",
"deep-lock": "^1.0.0",
@@ -78,18 +78,18 @@
"prettier": "^2.5.1",
"pretty-bytes": "^5.6.0",
"rimraf": "^3.0.2",
- "sequelize": "^6.13.0",
+ "sequelize": "6.13.0",
"source-map-support": "^0.5.21",
"tinycolor2": "^1.4.2",
"tslib": "^2.3.1",
- "typescript": "^4.5.4",
+ "typescript": "^4.5.5",
"vm2": "^3.9.5"
},
"devDependencies": {
"@types/eslint": "^8",
"@types/express": "^4.17.13",
"@types/lodash": "^4.14.178",
- "@types/node": "^17.0.10",
+ "@types/node": "^17.0.13",
"@types/node-os-utils": "^1.2.0",
"@types/numeral": "^2.0.2",
"@types/pg": "^8",
@@ -98,12 +98,13 @@
"@types/source-map-support": "^0",
"@types/tinycolor2": "^1.4.3",
"@types/validator": "^13.7.1",
- "@typescript-eslint/eslint-plugin": "^5.10.0",
- "@typescript-eslint/parser": "^5.10.0",
+ "@typescript-eslint/eslint-plugin": "^5.10.2",
+ "@typescript-eslint/parser": "^5.10.2",
"discord-api-types": "0.26.1",
- "eslint": "^8.7.0",
+ "eslint": "^8.8.0",
"eslint-config-prettier": "^8.3.0",
- "eslint-plugin-deprecation": "^1.3.2"
+ "eslint-plugin-deprecation": "^1.3.2",
+ "node-fetch": "^3.2.0"
},
"packageManager": "yarn@3.1.1"
}
diff --git a/src/arguments/permission.ts b/src/arguments/permission.ts
index 4ae6327..cf4c42c 100644
--- a/src/arguments/permission.ts
+++ b/src/arguments/permission.ts
@@ -1,12 +1,12 @@
import { type BushArgumentTypeCaster } from '#lib';
-import { Permissions, type PermissionString } from 'discord.js';
+import { PermissionFlagsBits, type PermissionsString } from 'discord.js';
-export const permission: BushArgumentTypeCaster<PermissionString | null> = (_, phrase) => {
+export const permission: BushArgumentTypeCaster<PermissionsString | null> = (_, phrase) => {
if (!phrase) return null;
phrase = phrase.toUpperCase().replace(/ /g, '_');
- if (!(phrase in Permissions.FLAGS)) {
+ if (!(phrase in PermissionFlagsBits)) {
return null;
} else {
- return phrase as PermissionString;
+ return phrase as PermissionsString;
}
};
diff --git a/src/commands/admin/channelPermissions.ts b/src/commands/admin/channelPermissions.ts
index 4f511cd..e12a131 100644
--- a/src/commands/admin/channelPermissions.ts
+++ b/src/commands/admin/channelPermissions.ts
@@ -1,5 +1,5 @@
import { BushCommand, ButtonPaginator, type ArgType, type BushMessage, type BushSlashMessage } from '#lib';
-import { ApplicationCommandOptionType, Embed, Permissions } from 'discord.js';
+import { ApplicationCommandOptionType, Embed, PermissionFlagsBits } from 'discord.js';
export default class ChannelPermissionsCommand extends BushCommand {
public constructor() {
@@ -47,8 +47,8 @@ export default class ChannelPermissionsCommand extends BushCommand {
]
}
],
- clientPermissions: (m) => util.clientSendAndPermCheck(m, [Permissions.FLAGS.MANAGE_CHANNELS]),
- userPermissions: [Permissions.FLAGS.ADMINISTRATOR],
+ clientPermissions: (m) => util.clientSendAndPermCheck(m, [PermissionFlagsBits.ManageChannels]),
+ userPermissions: [PermissionFlagsBits.Administrator],
channel: 'guild',
slash: true
});
@@ -63,7 +63,7 @@ export default class ChannelPermissionsCommand extends BushCommand {
}
) {
if (!message.inGuild()) return await message.util.reply(`${util.emojis.error} This command can only be run in a server.`);
- if (!message.member!.permissions.has(Permissions.FLAGS.ADMINISTRATOR) && !message.member!.user.isOwner())
+ if (!message.member!.permissions.has(PermissionFlagsBits.Administrator) && !message.member!.user.isOwner())
return await message.util.reply(`${util.emojis.error} You must have admin perms to use this command.`);
if (message.util.isSlashMessage(message)) await message.interaction.deferReply();
diff --git a/src/commands/admin/roleAll.ts b/src/commands/admin/roleAll.ts
index 3b438d9..c056bbd 100644
--- a/src/commands/admin/roleAll.ts
+++ b/src/commands/admin/roleAll.ts
@@ -1,5 +1,5 @@
import { AllowedMentions, BushCommand, type ArgType, type BushMessage, type BushSlashMessage } from '#lib';
-import { ApplicationCommandOptionType, Permissions, type GuildMember } from 'discord.js';
+import { ApplicationCommandOptionType, PermissionFlagsBits, type GuildMember } from 'discord.js';
export default class RoleAllCommand extends BushCommand {
public constructor() {
@@ -30,8 +30,8 @@ export default class RoleAllCommand extends BushCommand {
}
],
channel: 'guild',
- clientPermissions: (m) => util.clientSendAndPermCheck(m, [Permissions.FLAGS.MANAGE_ROLES]),
- userPermissions: [Permissions.FLAGS.ADMINISTRATOR],
+ clientPermissions: (m) => util.clientSendAndPermCheck(m, [PermissionFlagsBits.ManageRoles]),
+ userPermissions: [PermissionFlagsBits.Administrator],
typing: true,
slash: true
});
@@ -39,7 +39,7 @@ export default class RoleAllCommand extends BushCommand {
public override async exec(message: BushMessage | BushSlashMessage, args: { role: ArgType<'role'>; bots: ArgType<'boolean'> }) {
if (!message.inGuild()) return await message.util.reply(`${util.emojis.error} This command can only be run in a server.`);
- if (!message.member!.permissions.has(Permissions.FLAGS.ADMINISTRATOR) && !message.member!.user.isOwner())
+