From 998eefef4cf94ba381549ffca95e96f39d9fa074 Mon Sep 17 00:00:00 2001 From: Emily J Date: Tue, 18 Aug 2020 18:29:36 +1000 Subject: [PATCH] additions to util --- bot/util/messageUtil.js | 27 +++++++++++++++++++++++++++ bot/util/util.js | 9 +++++++++ 2 files changed, 36 insertions(+) diff --git a/bot/util/messageUtil.js b/bot/util/messageUtil.js index 035b9ac..817281c 100644 --- a/bot/util/messageUtil.js +++ b/bot/util/messageUtil.js @@ -3,6 +3,33 @@ class MessageUtil { this.client = client; } + // Grab the last message sent in a channel (excludes the command) + async getLastMessage (channel) { + if (channel) { + let lastMsg; + + await channel.messages.fetch({ limit: 2 }).then(messages => { + lastMsg = messages.last().content; + }); + return lastMsg; + } + } + + // Wait for a reply to a message, then pass through the response + async awaitReply (msg, question, limit = 60000) { + const filter = m => m.author.id === msg.author.id; + await msg.channel.send(question); + try { + const collected = await msg.channel.awaitMessages(filter, { + max: 1, + time: limit, + errors: ["time"] + }); + return collected.first().content; + } catch (e) { + return false; + } + } } module.exports = MessageUtil; \ No newline at end of file diff --git a/bot/util/util.js b/bot/util/util.js index c5873a8..fdcd33a 100644 --- a/bot/util/util.js +++ b/bot/util/util.js @@ -3,6 +3,7 @@ class Util { this.client = client; } + // Simple check to see if someone is a developer or not isDeveloper (userID) { let isDev = false; const developers = this.client.config.ownerIDs; @@ -17,6 +18,7 @@ class Util { return isDev; } + // Cleans output and removes sensitive information, used by eval async clean (text) { if (text && text.constructor.name == "Promise") text = await text; @@ -30,6 +32,13 @@ class Util { return text; } + + // Return random integer between two given integers + intBetween (min, max) { + return Math.round((Math.random() * (max - min))+min); + } + + } module.exports = Util; \ No newline at end of file