Fixed conflicts.

Ayfri · Nov 22, 2020 · 9e4246f · 9e4246f
2 parents 5e85a39 + 57076b7
commit 9e4246f
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 130 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/types/main.d.ts b/types/main.d.ts
@@ -0,0 +1,18 @@
+import * as Discord from 'discord.js';
+
+declare module 'discord-fetch-messages' {
+	/**
+	 * 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.
+	 */
+	export function fetchGuildMessages(client: Discord.Client, guildID: Discord.Snowflake): Promise<Discord.Message[]>;
+	/**
+	 * Fetch all the messages from a Discord TextChannel.
+	 * @param {module:"discord.js".Client} client - Your Discord.js Client.
+	 * @param {module:"discord.js".TextChannel | module:"discord.js".NewsChannel} channel - The ID of the Discord TextChannel.
+	 * @returns {Promise<module:"discord.js".Message[]>} - All the messages fetched.
+	 */
+	export function fetchChannelMessages(client: Discord.Client, channel: Discord.Channel): Promise<Discord.Message[]>;
+}