Merge branch 'master' of https://github.com/NotEnoughUpdates/bush-bot

12 files changed, 26 insertions, 27 deletions

diff --git a/.yarnrc.yml b/.yarnrc.yml
index 113750a..6d86dae 100644
--- a/.yarnrc.yml
+++ b/.yarnrc.yml
@@ -2,6 +2,6 @@ nodeLinker: node-modules
 
 plugins:
   - path: .yarn/plugins/@yarnpkg/plugin-typescript.cjs
-    spec: "@yarnpkg/plugin-typescript"
+    spec: '@yarnpkg/plugin-typescript'
 
 yarnPath: .yarn/releases/yarn-3.1.1.cjs
diff --git a/src/commands/dev/superUser.ts b/src/commands/dev/superUser.ts
index e0328db..f38419f 100644
--- a/src/commands/dev/superUser.ts
+++ b/src/commands/dev/superUser.ts
@@ -20,7 +20,7 @@ export default class SuperUserCommand extends BushCommand {
 					readableType: 'add|remove',
 					slashType: false
 				},
-				{ 
+				{
 					id: 'user',
 					description: 'The user to add/remove from the superuser list.',
 					type: 'user',
diff --git a/src/commands/info/help.ts b/src/commands/info/help.ts
index 3b7883f..629e57f 100644
--- a/src/commands/info/help.ts
+++ b/src/commands/info/help.ts
@@ -81,16 +81,10 @@ export default class HelpCommand extends BushCommand {
 			.setTitle(`${command.id} Command`)
 			.setDescription(`${command.description ?? '*This command does not have a description.*'}`);
 		if (command.usage?.length) {
-			embed.addField(
-				`» Usage${command.usage.length > 1 ? 's' : ''}`,
-				command.usage.map((u) => `\`${u}\``).join('\n')
-			);
+			embed.addField(`» Usage${command.usage.length > 1 ? 's' : ''}`, command.usage.map((u) => `\`${u}\``).join('\n'));
 		}
 		if (command.examples?.length) {
-			embed.addField(
-				`» Example${command.examples.length > 1 ? 's' : ''}`,
-				command.examples.map((u) => `\`${u}\``).join('\n')
-			);
+			embed.addField(`» Example${command.examples.length > 1 ? 's' : ''}`, command.examples.map((u) => `\`${u}\``).join('\n'));
 		}
 		if (command.aliases?.length > 1) embed.addField('» Aliases', `\`${command.aliases.join('` `')}\``);
 		if (
diff --git a/src/commands/info/userInfo.ts b/src/commands/info/userInfo.ts
index 8ed6304..89d3c23 100644
--- a/src/commands/info/userInfo.ts
+++ b/src/commands/info/userInfo.ts
@@ -99,7 +99,10 @@ export default class UserInfoCommand extends BushCommand {
 		if (member?.displayHexColor) serverUserInfo.push(`**Display Color:** ${member.displayHexColor}`);
 		if (user.id == '322862723090219008' && message.guild?.id == client.consts.mappings.guilds.bush)
 			serverUserInfo.push(`**General Deletions:** 1⅓`);
-		if ((['384620942577369088', '496409778822709251'] as const).includes(user.id) && message.guild?.id == client.consts.mappings.guilds.bush)
+		if (
+			(['384620942577369088', '496409778822709251'] as const).includes(user.id) &&
+			message.guild?.id == client.consts.mappings.guilds.bush
+		)
 			serverUserInfo.push(`**General Deletions:** ⅓`);
 		if (member?.nickname) serverUserInfo.push(`**Nickname:** ${util.discord.escapeMarkdown(member?.nickname)}`);
 		if (serverUserInfo.length)
diff --git a/src/commands/leveling/leaderboard.ts b/src/commands/leveling/leaderboard.ts
index 7e6eefd..6bf66d1 100644
--- a/src/commands/leveling/leaderboard.ts
+++ b/src/commands/leveling/leaderboard.ts
@@ -17,7 +17,7 @@ export default class LeaderboardCommand extends BushCommand {
 					prompt: 'What page of the leaderboard would you like to view?',
 					retry: '{error} Pick a valid argument.',
 					optional: true,
-					slashType: 'INTEGER',
+					slashType: 'INTEGER'
 				}
 			],
 			slash: true,
diff --git a/src/commands/moderation/mute.ts b/src/commands/moderation/mute.ts
index 0584d97..a18c04e 100644
--- a/src/commands/moderation/mute.ts
+++ b/src/commands/moderation/mute.ts
@@ -25,7 +25,7 @@ export default class MuteCommand extends BushCommand {
 					prompt: 'Why should this user be muted and for how long?',
 					retry: '{error} Choose a valid mute reason and duration.',
 					optional: true,
-					slashType:'STRING'
+					slashType: 'STRING'
 				},
 				{
 					id: 'force',
diff --git a/src/commands/moderation/purge.ts b/src/commands/moderation/purge.ts
index 6bc62de..21b9a3a 100644
--- a/src/commands/moderation/purge.ts
+++ b/src/commands/moderation/purge.ts
@@ -47,7 +47,7 @@ export default class PurgeCommand extends BushCommand {
 		});
 	}
 
-	public override async exec(message: BushMessage, args: { amount: number; bot: boolean, user: BushUser }) {
+	public override async exec(message: BushMessage, args: { amount: number; bot: boolean; user: BushUser }) {
 		if (message.channel.type === 'DM') return message.util.reply(`${util.emojis.error} You cannot run this command in dms.`);
 		if (args.amount > 100 || args.amount < 1) return message.util.reply(`${util.emojis.error} `);
 
diff --git a/src/commands/moderation/removeReactionEmoji.ts b/src/commands/moderation/removeReactionEmoji.ts
index e847aba..d543f60 100644
--- a/src/commands/moderation/removeReactionEmoji.ts
+++ b/src/commands/moderation/removeReactionEmoji.ts
@@ -22,7 +22,7 @@ export default class RemoveReactionEmojiCommand extends BushCommand {
 					id: 'emoji',
 					description: 'The emoji to remove all the reactions of from a message.',
 					customType: util.arg.union('emoji', 'snowflake'),
-					readableType:'emoji|snowflake',
+					readableType: 'emoji|snowflake',
 					match: 'restContent',
 					prompt: 'What emoji would you like to remove?',
 					retry: '{error} Please pick a valid emoji.',
@@ -36,11 +36,8 @@ export default class RemoveReactionEmojiCommand extends BushCommand {
 		});
 	}
 
-	public override async exec(
-		message: BushMessage,
-		args: { message: BushMessage|Snowflake; emoji: Emoji | Snowflake }
-	) {
-		const resolvedMessage = args.message instanceof Message ? args.message : await message.channel.messages.fetch(args.message )
+	public override async exec(message: BushMessage, args: { message: BushMessage | Snowflake; emoji: Emoji | Snowflake }) {
+		const resolvedMessage = args.message instanceof Message ? args.message : await message.channel.messages.fetch(args.message);
 
 		const id = !(['string'] as const).includes(typeof args.emoji);
 		const emojiID = !id ? `${args.emoji}` : (args.emoji as Emoji).id;
diff --git a/src/lib/badlinks.ts b/src/lib/badlinks.ts
index 95e7122..f0dbc60 100644
--- a/src/lib/badlinks.ts
+++ b/src/lib/badlinks.ts
@@ -554,6 +554,7 @@ export default [
 	"dicsord-app.com",
 	"dicsord-events.com",
 	"dicsord-gift.com",
+	"dicsord-gifted.ru",
 	"dicsord-give.com",
 	"dicsord-gives.com",
 	"dicsord-hypesquads.com",
@@ -581,6 +582,7 @@ export default [
 	"didscord.com",
 	"diiiscrod.club",
 	"diisccord.club",
+	"diiscord-nittro.ru",
 	"diiscord.com",
 	"dIiscord.com",
 	"diiscord.gift",
@@ -1147,6 +1149,7 @@ export default [
 	"discorddevs.com",
 	"discorddiscord.com",
 	"discorddrop.com",
+	"discorde-gift.com",
 	"discorde.gift",
 	"discorde.xyz",
 	"discordevents.com",
@@ -1514,6 +1517,7 @@ export default [
 	"dliscrd.one",
 	"dllscord.online",
 	"dlscard.ru",
+	"dlsccord-app.club",
 	"dlsccord-apps.club",
 	"dlsccrd.com",
 	"dlscocrd.club",
@@ -1540,6 +1544,7 @@ export default [
 	"dlscord-developer.com",
 	"dlscord-game.com",
 	"dlscord-gift.com",
+	"dlscord-gift.one",
 	"dlscord-gift.ru.com",
 	"dlscord-gift.xyz",
 	"dlscord-gifts.com",
diff --git a/src/lib/extensions/discord-akairo/BushClientUtil.ts b/src/lib/extensions/discord-akairo/BushClientUtil.ts
index 889cd6e..cded096 100644
--- a/src/lib/extensions/discord-akairo/BushClientUtil.ts
+++ b/src/lib/extensions/discord-akairo/BushClientUtil.ts
@@ -790,7 +790,7 @@ export class BushClientUtil extends ClientUtil {
 	 * Discord.js's Util constants
 	 */
 	public get discordConstants() {
-		return DiscordConstants
+		return DiscordConstants;
 	}
 
 	/**
diff --git a/src/lib/extensions/discord-akairo/BushCommand.ts b/src/lib/extensions/discord-akairo/BushCommand.ts
index 8872831..d8f0d38 100644
--- a/src/lib/extensions/discord-akairo/BushCommand.ts
+++ b/src/lib/extensions/discord-akairo/BushCommand.ts
@@ -29,7 +29,7 @@ export type BaseBushArgumentType =
 	| 'roleWithDuration'
 	| 'abbreviatedNumber'
 	| 'globalUser'
-	| 'messageLink'
+	| 'messageLink';
 
 export type BushArgumentType = BaseBushArgumentType | RegExp;
 
diff --git a/src/lib/utils/BushLogger.ts b/src/lib/utils/BushLogger.ts
index 3421985..5bae96d 100644
--- a/src/lib/utils/BushLogger.ts
+++ b/src/lib/utils/BushLogger.ts
@@ -62,8 +62,8 @@ export class BushLogger {
 		return BushLogger.info;
 	}
 
-	/** 
-	 * Sends a message to the log channel 
+	/**
+	 * Sends a message to the log channel
 	 * @param message The parameter to pass to {@link PartialTextBasedChannelFields.send}
 	 */
 	public static async channelLog(message: BushSendMessageType) {
@@ -71,8 +71,8 @@ export class BushLogger {
 		await channel.send(message).catch(() => {});
 	}
 
-	/** 
-	 * Sends a message to the error channel 
+	/**
+	 * Sends a message to the error channel
 	 */
 	public static async channelError(message: BushSendMessageType): Promise<Message> {
 		const channel = await util.getConfigChannel('error');
@@ -213,4 +213,4 @@ export class BushLogger {
 	}
 }
 
-/** @typedef {PartialTextBasedChannelFields} vscodeDontDeleteMyImportTy */
\ No newline at end of file
+/** @typedef {PartialTextBasedChannelFields} vscodeDontDeleteMyImportTy */