stuff

1 files changed, 22 insertions, 63 deletions

diff --git a/src/commands/moderation/role.ts b/src/commands/moderation/role.ts
index f03e0ad..0c7d7db 100644
--- a/src/commands/moderation/role.ts
+++ b/src/commands/moderation/role.ts
@@ -7,15 +7,7 @@ import { ApplicationCommandOptionType } from 'discord-api-types';
 export default class RoleCommand extends BushCommand {
 	private roleWhitelist: Record<string, string[]> = {
 		'Partner': ['*', 'Admin Perms', 'Sr. Moderator', 'Moderator'],
-		'Suggester': [
-			'*',
-			'Admin Perms',
-			'Sr. Moderator',
-			'Moderator',
-			'Helper',
-			'Trial Helper',
-			'Contributor'
-		],
+		'Suggester': ['*', 'Admin Perms', 'Sr. Moderator', 'Moderator', 'Helper', 'Trial Helper', 'Contributor'],
 		'Level Locked': ['*', 'Admin Perms', 'Sr. Moderator', 'Moderator'],
 		'No Files': ['*', 'Admin Perms', 'Sr. Moderator', 'Moderator'],
 		'No Reactions': ['*', 'Admin Perms', 'Sr. Moderator', 'Moderator'],
@@ -81,59 +73,38 @@ export default class RoleCommand extends BushCommand {
 		});
 	}
 
-	public async exec(
-		message: Message,
-		{ user, role }: { user: GuildMember; role: Role }
-	): Promise<unknown> {
-		if (
-			!message.member.permissions.has('MANAGE_ROLES') &&
-			!this.client.ownerID.includes(message.author.id)
-		) {
+	public async exec(message: Message, { user, role }: { user: GuildMember; role: Role }): Promise<unknown> {
+		if (!message.member.permissions.has('MANAGE_ROLES') && !this.client.ownerID.includes(message.author.id)) {
 			const mappedRole = this.client.util.moulberryBushRoleMap.find((m) => m.id === role.id);
 			if (!mappedRole || !this.roleWhitelist[mappedRole.name]) {
-				return message.util.reply(
-					`<:error:837123021016924261> <@&${role.id}> is not whitelisted, and you do not have manage roles permission.`,
-					{
-						allowedMentions: AllowedMentions.none()
-					}
-				);
+				return message.util.reply(`<:error:837123021016924261> <@&${role.id}> is not whitelisted, and you do not have manage roles permission.`, {
+					allowedMentions: AllowedMentions.none()
+				});
 			}
 			const allowedRoles = this.roleWhitelist[mappedRole.name].map((r) => {
 				return this.client.util.moulberryBushRoleMap.find((m) => m.name === r).id;
 			});
 			if (!message.member.roles.cache.some((role) => allowedRoles.includes(role.id))) {
-				return message.util.reply(
-					`<:error:837123021016924261> <@&${role.id}> is whitelisted, but you do not have any of the roles required to manage it.`,
-					{
-						allowedMentions: AllowedMentions.none()
-					}
-				);
+				return message.util.reply(`<:error:837123021016924261> <@&${role.id}> is whitelisted, but you do not have any of the roles required to manage it.`, {
+					allowedMentions: AllowedMentions.none()
+				});
 			}
 		}
 		if (!this.client.ownerID.includes(message.author.id)) {
 			if (role.comparePositionTo(message.member.roles.highest) >= 0) {
-				return message.util.reply(
-					`<:error:837123021016924261> <@&${role.id}> is higher or equal to your highest role.`,
-					{
-						allowedMentions: AllowedMentions.none()
-					}
-				);
+				return message.util.reply(`<:error:837123021016924261> <@&${role.id}> is higher or equal to your highest role.`, {
+					allowedMentions: AllowedMentions.none()
+				});
 			}
 			if (role.comparePositionTo(message.guild.me.roles.highest) >= 0) {
-				return message.util.reply(
-					`<:error:837123021016924261> <@&${role.id}> is higher or equal to my highest role.`,
-					{
-						allowedMentions: AllowedMentions.none()
-					}
-				);
+				return message.util.reply(`<:error:837123021016924261> <@&${role.id}> is higher or equal to my highest role.`, {
+					allowedMentions: AllowedMentions.none()
+				});
 			}
 			if (role.managed) {
-				await message.util.reply(
-					`<:error:837123021016924261> <@&${role.id}> is managed by an integration and cannot be managed.`,
-					{
-						allowedMentions: AllowedMentions.none()
-					}
-				);
+				await message.util.reply(`<:error:837123021016924261> <@&${role.id}> is managed by an integration and cannot be managed.`, {
+					allowedMentions: AllowedMentions.none()
+				});
 			}
 		}
 		// No checks if the user has MANAGE_ROLES
@@ -141,28 +112,16 @@ export default class RoleCommand extends BushCommand {
 			try {
 				await user.roles.remove(role.id);
 			} catch {
-				return message.util.reply(
-					`<:error:837123021016924261> Could not remove <@&${role.id}> from <@${user.id}>.`,
-					{ allowedMentions: AllowedMentions.none() }
-				);
+				return message.util.reply(`<:error:837123021016924261> Could not remove <@&${role.id}> from <@${user.id}>.`, { allowedMentions: AllowedMentions.none() });
 			}
-			return message.util.reply(
-				`<:checkmark:837109864101707807> Successfully removed <@&${role.id}> from <@${user.id}>!`,
-				{ allowedMentions: AllowedMentions.none() }
-			);
+			return message.util.reply(`<:checkmark:837109864101707807> Successfully removed <@&${role.id}> from <@${user.id}>!`, { allowedMentions: AllowedMentions.none() });
 		} else {
 			try {
 				await user.roles.add(role.id);
 			} catch {
-				return message.util.reply(
-					`<:error:837123021016924261> Could not add <@&${role.id}> to <@${user.id}>.`,
-					{ allowedMentions: AllowedMentions.none() }
-				);
+				return message.util.reply(`<:error:837123021016924261> Could not add <@&${role.id}> to <@${user.id}>.`, { allowedMentions: AllowedMentions.none() });
 			}
-			return message.util.reply(
-				`<:checkmark:837109864101707807> Successfully added <@&${role.id}> to <@${user.id}>!`,
-				{ allowedMentions: AllowedMentions.none() }
-			);
+			return message.util.reply(`<:checkmark:837109864101707807> Successfully added <@&${role.id}> to <@${user.id}>!`, { allowedMentions: AllowedMentions.none() });
 		}
 	}
 }