src/events/message/messageCreate.ts

@@ -1,7 +1,7 @@
-import { GuildBasedChannel, Message } from 'discord.js';
+import { Message, TextBasedChannel } from 'discord.js';
 
 /** https://discord.js.org/#/docs/discord.js/main/class/Client?scrollTo=e-messageCreate */
-export default (message: Message) => {
+export default async (message: Message) => {
 	// Ignore message if
 	if (
 		// Author is a bot
@@ -28,10 +28,11 @@ export default (message: Message) => {
 	}
 
 	const messages = (
+		await Promise.all(
 			urls.reduce(
 				(data: {
 					message_id: string;
-				found_channel: GuildBasedChannel;
+					channel: TextBasedChannel;
 				}[] = [], match) => {
 					const [,
 						guild_id,
@@ -44,21 +45,32 @@ export default (message: Message) => {
 						return data;
 					}
 
-				const found_channel =
-					message.guild.channels.cache.get(channel_id);
+					const channel =
+						message.guild.channels.cache.get(channel_id) as TextBasedChannel;
 
-				// If channel doesn't exist in the guild
-				if (!found_channel) {
+					// If channel doesn't exist in the guild and isn't text
+					if (!channel) {
 						return data;
 					}
 
-				data.push({ message_id, found_channel });
+					data.push({ message_id, channel });
 
 					return data;
-			},
-			[]
-		)
-	);
+				}, []
+			).map(async ({ message_id, channel }) => {
+				const quoted_message = await channel.messages
+					.fetch(message_id)
+					.catch(() => undefined);
+
+				// If message doesn't exist or empty
+				if (!quoted_message || (!quoted_message.content && quoted_message.attachments.size == 0)) {
+					return;
+				}
+
+				return quoted_message;
+			})
+		)
+	// Remove undefined elements
+	).filter(Boolean);
 
-	console.log(messages);
 };