littlelimedragon, union types

types/avatar.js

@@ -0,0 +1,18 @@
+const { ArgumentType } = require('discord.js-commando');
+
+class AvatarArgumentType extends ArgumentType {
+	constructor(client) {
+		super(client, 'avatar');
+	}
+
+	validate(value, msg, arg) {
+		return this.client.types.get('user').validate(value, msg, arg);
+	}
+
+	async parse(value, msg, arg) {
+		const user = await this.client.types.get('user').parse(value, msg, arg);
+		return user.displayAvatarURL({ format: 'png', size: 512 });
+	}
+}
+
+module.exports = AvatarArgumentType;

types/image.js

@@ -7,27 +7,16 @@ class ImageArgumentType extends ArgumentType {
 
 	async validate(value, msg) {
 		const attachment = msg.attachments.first();
-		if (!attachment) {
-			const valid = await this.client.registry.types.get('user').validate(value, msg);
-			return valid;
-		}
-		if (!attachment.height || !attachment.width) return false;
+		if (!attachment || !attachment.height || !attachment.width) return false;
 		if (attachment.size > 8e+6) return 'Please provide an image under 8 MB.';
 		return true;
 	}
 
 	parse(value, msg) {
-		if (!msg.attachments.size) {
-			return this.client.registry.types.get('user').parse(value, msg).displayAvatarURL({
-				format: 'png',
-				size: 512
-			});
-		}
 		return msg.attachments.first().url;
 	}
 
 	isEmpty(value, msg) {
-		if (!msg.attachments.size) return !value;
 		return !msg.attachments.size;
 	}
 }