From cc3537374903108f5c2682eb53242b7bd7ae6228 Mon Sep 17 00:00:00 2001
From: Supositware <sup@libtar.de>
Date: Thu, 13 Oct 2022 16:48:23 +0200
Subject: [PATCH] Improve mentionable args type and match the rest of the
 arguments for the last one

---
 events/client/messageCreate.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/events/client/messageCreate.js b/events/client/messageCreate.js
index d16ecd9..53ce363 100644
--- a/events/client/messageCreate.js
+++ b/events/client/messageCreate.js
@@ -370,12 +370,16 @@ export default {
 			};
 			const args = {};
 
-			for (let i = 0, j = 0; i < command.data.options.length; i++, j++) {
+			const argsLength = command.data.options.length;
+			for (let i = 0, j = 0; i < argsLength; i++, j++) {
 				if (!messageArgs[i]) continue;
 				const arg = command.data.options[j];
 				const type = arg.constructor.name.toLowerCase();
 				let payloadName = arg.name;
 				let payload = messageArgs[i];
+				if (i >= argsLength - 1) {
+					payload = messageArgs.slice(i).join(' ');
+				}
 
 				if (messageArgs[i].startsWith('--')) {
 					payloadName = payload.substring(2);
@@ -383,7 +387,8 @@ export default {
 					j--;
 				}
 				else if (type.includes('mentionable')) {
-					payload = message.mentions.members.first();
+					await message.guild.members.fetch();
+					payload = message.mentions.members.first() ? message.mentions.members.first() : message.guild.members.cache.find(u => u.user.username.toLowerCase().includes(payload.toLowerCase()));
 				}
 				else if (type.includes('attachment')) {
 					payload = message.attachments.first();