feat: Rewrite old functions in TS.

Ayfri · Mar 23, 2021 · 429faf5 · 429faf5
1 parent be3f975
commit 429faf5
Showing 1 changed file with 12 additions and 8 deletions.
diff --git a/src/main.js → src/main.ts b/src/main.js → src/main.ts
@@ -1,4 +1,5 @@
-const {deprecate} = require('util');
+import {Client, Collection, Message, Snowflake, TextChannel} from 'discord.js';
+import {deprecate} from 'util';
 
 /**
  * Fetch all the messages from a Discord TextChannel.
@@ -8,8 +9,8 @@ const {deprecate} = require('util');
  * @returns {Promise<module:"discord.js".Message[]>} - All the messages fetched.
  * @deprecated Use {@link Fetcher} class instead.
  */
-async function fetchChannelMessages(client, channel) {
-	const total = [];
+async function fetchChannelMessages(client: Client, channel: TextChannel): Promise<Message[]> {
+	const total: Message[] = [];
 	let lastMessageID;
 	let messages;
 
@@ -29,24 +30,27 @@ async function fetchChannelMessages(client, channel) {
 
 		if (messages.size === 0) break;
 
-		lastMessageID = messages.last().id;
+		lastMessageID = messages.last()?.id;
 		console.log(`#${channel.name} : ${total.length}`);
 		total.push(...messages.array());
 	}
 
 	return total;
 }
 
+type ChannelMessages = {id: Snowflake; messages: Message[]};
+
 /**
  * Fetch all the messages from a Discord Guild.
  * @param {module:"discord.js".Client} client - Your Discord.js Client.
  * @param {string} guildID - The ID of the Guild to be fetch.
  * @returns {Promise<module:"discord.js".Message[]>} - All the messages fetched.
  * @deprecated Use {@link Fetcher} class instead.
  */
-async function fetchGuildMessages(client, guildID) {
-	const total = [];
-	const channels = client.guilds.cache.get(guildID).channels.cache.filter(c => c.isText());
+async function fetchGuildMessages(client: Client, guildID: Snowflake): Promise<ChannelMessages[]> {
+	const total: ChannelMessages[] = [];
+	if (!client.guilds.cache.has(guildID)) return total;
+	const channels = client.guilds.cache.get(guildID)!.channels.cache.filter(c => c.isText()) as Collection<Snowflake, TextChannel>;
 	console.log(
 		`Getting the messages from these channels : ${channels
 			.map(c => `#${c.name}`)
@@ -63,7 +67,7 @@ async function fetchGuildMessages(client, guildID) {
 				id: textChannel.id,
 				messages: [],
 			});
-		total.find(channel => channel.id === textChannel.id).messages.push(...messages.map(m => m.cleanContent));
+		total.find(channel => channel.id === textChannel.id)!.messages.push(...messages);
 	}
 
 	console.log(`Finished fetching messages, messages count: ${total.length}`);