1 files changed, 34 insertions, 13 deletions
diff --git a/src/commands/info/color.ts b/src/commands/info/color.ts
index 4db20e7..45c2545 100644
--- a/src/commands/info/color.ts
+++ b/src/commands/info/color.ts
@@ -1,6 +1,15 @@
-import { BushCommand, BushMessage, BushSlashMessage } from '@lib';
-import { Constants } from 'discord-akairo';
-import { ColorResolvable, MessageEmbed } from 'discord.js';
+import { BushCommand, BushGuildMember, BushMessage, BushRole, BushSlashMessage } from '@lib';
+import { Argument } from 'discord-akairo';
+import { ColorResolvable, MessageEmbed, Role } from 'discord.js';
+import { Constructor } from 'tinycolor2';
+
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const tinycolor: Constructor = require('tinycolor2'); // this is the only way I got it to work consistently
+const isValidTinyColor = (_message: BushMessage, phase: string) => {
+	// if the phase is a number it converts it to hex incase it could be representing a color in decimal
+	const newPhase = Number.isNaN(phase) ? phase : `#${Number(phase).toString(16)}`;
+	return tinycolor(newPhase).isValid() ? newPhase : null;
+};
 
 export default class ColorCommand extends BushCommand {
 	public constructor() {
@@ -8,18 +17,17 @@ export default class ColorCommand extends BushCommand {
 			aliases: ['color'],
 			category: 'info',
 			description: {
-				content: 'See what color a hex code is.',
-				usage: 'color <color>',
+				content: 'Find the color of a hex code, user, or role.',
+				usage: 'color <color|role|user>',
 				examples: ['color #0000FF']
 			},
 			args: [
 				{
 					id: 'color',
-					type: /^#?(?<code>[0-9A-F]{6})$/i,
-					match: Constants.ArgumentMatches.PHRASE,
+					type: Argument.union(isValidTinyColor, 'role', 'member'),
 					prompt: {
-						start: 'What color value would you like to see the color of',
-						retry: '{error} Choose a valid hex color code.'
+						start: 'What color code, role, or user would you like to find the color of?',
+						retry: '{error} Choose a valid color, role, or member.'
 					}
 				}
 			],
@@ -28,14 +36,27 @@ export default class ColorCommand extends BushCommand {
 		});
 	}
 
+  public removePrefixAndParenthesis(color: string): string{
+		return color.substr(4, color.length-5)
+	}
+
 	public async exec(
 		message: BushMessage | BushSlashMessage,
-		{ color: { match } }: { color: { match: RegExpMatchArray; matches: RegExpMatchArray[] } }
+		args: { color: string | BushRole | BushGuildMember }
 	): Promise<unknown> {
+		const color =
+			typeof args.color === 'string'
+				? tinycolor(args.color)
+				: args.color instanceof Role
+				? tinycolor(args.color.hexColor)
+				: tinycolor(args.color.displayHexColor);
+
 		const embed = new MessageEmbed()
-			.addField('Hex', match.groups.code, false)
-			.addField('RGB', this.client.util.hexToRgb(match.groups.code), false)
-			.setColor(match.groups.code as ColorResolvable);
+			.addField('» Hexadecimal', color.toHexString())
+			.addField('» Decimal', `${parseInt(color.toHex(), 16)}`)
+			.addField('» HSL', this.removePrefixAndParenthesis(color.toHslString()))
+			.addField('» RGB', this.removePrefixAndParenthesis(color.toRgbString()))
+			.setColor(color.toHex() as ColorResolvable);
 
 		return await message.util.reply({ embeds: [embed] });
 	}