fix: attachment type

Author: xhyrom

src/handlers/MessageCommandHandler.ts

@@ -1,4 +1,4 @@
-import { Client, Collection, CommandInteractionOptionResolver, Guild, Message, MessageActionRow, MessageSelectMenu, SelectMenuInteraction, TextChannel, User } from 'discord.js';
+import { Client, Collection, CommandInteractionOptionResolver, Guild, Message, MessageActionRow, MessageAttachment, MessageSelectMenu, SelectMenuInteraction, TextChannel, User } from 'discord.js';
 import type { GClient } from '../lib/GClient';
 import { CommandContext } from '../lib/structures/contexts/CommandContext';
 import { CommandType } from '../lib/structures/Command';
@@ -8,10 +8,11 @@ import { Logger, Events } from '../lib/util/logger/Logger';
 import { Argument, ArgumentType } from '../lib/structures/Argument';
 import { MessageArgumentTypeBase, MessageArgumentTypes } from '../lib/structures/arguments/base';
 import { Util } from '../lib/util/Util';
+import { AttachmentType } from '../lib/structures/arguments/Attachment';
 
 const cooldowns = new Collection<string, Collection<string, number>>();
 
-const checkValidation = async(arg: MessageArgumentTypes, content: string, client: Client, guild: Guild, argument: Argument, channel: TextChannel, user: User) => {
+const checkValidation = async(arg: MessageArgumentTypes, content: string | MessageAttachment, client: Client, guild: Guild, argument: Argument, channel: TextChannel, user: User) => {
 	if (!content) {
 		const text = `${user.toString()}, please define argument \`${argument.name}\`, type: ${Util.toPascalCase(ArgumentType[argument.type.toString()])}`
 		if (argument.type === ArgumentType.STRING && argument.choices?.length !== 0) {
@@ -43,13 +44,15 @@ const checkValidation = async(arg: MessageArgumentTypes, content: string, client
 			channel.send(text);
 			const message = await channel.awaitMessages({ filter: (m) => m.author.id === user.id && m.channelId === channel.id, time: 60000, max: 1 });
 
-			content = [...message.values()]?.[0]?.content;
+			// @ts-expect-error TODO: Use ArgumentType.ATTACHMENT | Need wait for https://github.com/Garlic-Team/gcommands/pull/314 to be merged (:
+			if (argument.type == 11) {
+				content = [...[...message.values()]?.[0]?.attachments?.values()]?.[0];
+			}
+			else content = [...message.values()]?.[0]?.content;
 		}
 	}
 
-	if (!content) return channel.send(`${user.toString()}, Time :(`);
-
-	const validate = arg.validate(content);
+	const validate = arg instanceof AttachmentType ? arg.validate(content) : arg.validate(content as string);
 	if (!validate) return checkValidation(arg, null, client, guild, argument, channel, user);
 
 	return arg.resolve(argument, client, guild);

src/lib/structures/arguments/Attachment.ts

@@ -1,7 +1,24 @@
+import { MessageAttachment } from 'discord.js';
+import { Argument, ArgumentType } from '../Argument';
 import { MessageArgumentTypeBase } from './base';
 
 export class AttachmentType extends MessageArgumentTypeBase {
-	validate() {
-		return true;
+	value;
+
+	validate(attachment: string | MessageAttachment) {
+		if (attachment instanceof MessageAttachment) {
+			this.value = attachment;
+			return true;
+		}
+
+		return false;
+	}
+
+	resolve(argument: Argument) {
+		return {
+			...argument.toJSON(),
+			type: ArgumentType[argument.type],
+			attachment: this.value
+		};
 	}
 }

src/lib/structures/arguments/base.ts

@@ -1,5 +1,6 @@
 import { Util } from '../../util/Util';
 import { Argument, ArgumentType } from '../Argument';
+import type { AttachmentType } from './Attachment';
 import type { BooleanType } from './Boolean';
 import type { ChannelType } from './Channel';
 import type { IntegerType } from './Integer';
@@ -9,7 +10,7 @@ import type { RoleType } from './Role';
 import type { StringType } from './String';
 import type { UserType } from './User';
 
-export type MessageArgumentTypes = BooleanType | ChannelType | IntegerType | MentionableType | NumberType | RoleType | StringType | UserType;
+export type MessageArgumentTypes = BooleanType | ChannelType | IntegerType | MentionableType | NumberType | RoleType | StringType | UserType | AttachmentType;
 
 export class MessageArgumentTypeBase {
 	// eslint-disable-next-line @typescript-eslint/no-unused-vars
@@ -57,6 +58,11 @@ export class MessageArgumentTypeBase {
 			const { UserType } = await import('./User');
 			return new UserType();
 		}
+		// @ts-expect-error TODO: Use ArgumentType.ATTACHMENT | Need wait for https://github.com/Garlic-Team/gcommands/pull/314 to be merged (:
+		case 11: {
+			const { AttachmentType } = await import('./Attachment');
+			return new AttachmentType();
+		}
 		}
 	}
 }

src/listeners/AutocompleteHandler.ts

@@ -1,7 +1,7 @@
 import { Listener } from '../lib/structures/Listener';
 import type { Interaction } from 'discord.js';
 import { Handlers } from '../lib/managers/HandlerManager';
-import { Logger } from './logger/Logger';;
+import { Logger } from '../lib/util/logger/Logger';
 
 new Listener({
 	event: 'interactionCreate',

src/listeners/ComponentHandler.ts

@@ -1,7 +1,7 @@
 import { Listener } from '../lib/structures/Listener';
 import type { Interaction } from 'discord.js';
 import { Handlers } from '../lib/managers/HandlerManager';
-import { Logger } from './logger/Logger';;
+import { Logger } from '../lib/util/logger/Logger';
 
 new Listener({
 	event: 'interactionCreate',

src/listeners/InteractionCommandHandler.ts

@@ -1,7 +1,7 @@
 import { Listener } from '../lib/structures/Listener';
 import type { Interaction } from 'discord.js';
 import { Handlers } from '../lib/managers/HandlerManager';
-import { Logger } from './logger/Logger';;
+import { Logger } from '../lib/util/logger/Logger';
 
 new Listener({
 	event: 'interactionCreate',

src/listeners/MessageCommandHandler.ts

@@ -2,7 +2,7 @@ import { Listener } from '../lib/structures/Listener';
 import type { GClient } from '../lib/GClient';
 import type { Message } from 'discord.js';
 import { Handlers } from '../lib/managers/HandlerManager';
-import { Logger } from './logger/Logger';;
+import { Logger } from '../lib/util/logger/Logger';
 
 new Listener({
 	event: 'messageCreate',

src/listeners/Ready.ts

@@ -2,7 +2,7 @@ import { Listener } from '../lib/structures/Listener';
 import type { GClient } from '../lib/GClient';
 import type { Client } from 'discord.js';
 import { sync } from '../lib/util/sync';
-import { Logger } from './logger/Logger';;
+import { Logger } from '../lib/util/logger/Logger';
 
 new Listener({
 	event: 'ready',