From 382480e1c7c37e3e656d1c01a8c1cadc14bbec67 Mon Sep 17 00:00:00 2001
From: Essem <smswessem@gmail.com>
Date: Sat, 14 Aug 2021 16:15:21 -0500
Subject: [PATCH] Fixed issue with pagination message

---
 app.js                                | 10 +++++-----
 shard.js                              |  2 +-
 utils/database/postgresql.js          |  2 +-
 utils/database/sqlite.js              |  2 +-
 utils/pagination/awaitinteractions.js |  5 ++---
 utils/pagination/pagination.js        |  2 +-
 6 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/app.js b/app.js
index 53bd155..4c08227 100644
--- a/app.js
+++ b/app.js
@@ -39,7 +39,7 @@ k  <BBBw BBBBEBBBBBBBBBBBBBBBBBQ4BM  #
           
 esmBot ${require("./package.json").version}, powered by eris-fleet ${require("./node_modules/eris-fleet/package.json").version}
 `);
-// a bit of a hacky way to get the eris-fleet version
+  // a bit of a hacky way to get the eris-fleet version
 }
 
 const Admiral = new Fleet({
@@ -100,13 +100,13 @@ const Admiral = new Fleet({
   },
   services: [
     { name: "prometheus", path: path.join(__dirname, "./utils/services/prometheus.js") },
-    { name: "image", path: path.join(__dirname, "./utils/services/image.js")}
+    { name: "image", path: path.join(__dirname, "./utils/services/image.js") }
   ]
 });
 
 if (isMaster) {
   const logger = winston.createLogger({
-    levels: { 
+    levels: {
       error: 0,
       warn: 1,
       info: 2,
@@ -125,12 +125,12 @@ if (isMaster) {
         const {
           timestamp, level, message, ...args
         } = info;
-    
+
         return `[${timestamp}]: [${level.toUpperCase()}] - ${message} ${Object.keys(args).length ? JSON.stringify(args, null, 2) : ""}`;
       }),
     )
   });
-  
+
   winston.addColors({
     info: "green",
     main: "gray",
diff --git a/shard.js b/shard.js
index ab315c8..35980ec 100644
--- a/shard.js
+++ b/shard.js
@@ -96,7 +96,7 @@ class Shard extends BaseClusterWorker {
       broadcast = false;
       return this.ipc.broadcast("broadcastEnd");
     });
-    
+
     // connect to lavalink
     if (!sound.status && !sound.connected) sound.connect(this.bot);
 
diff --git a/utils/database/postgresql.js b/utils/database/postgresql.js
index c61cfd7..f95c3a4 100644
--- a/utils/database/postgresql.js
+++ b/utils/database/postgresql.js
@@ -127,7 +127,7 @@ exports.setup = async () => {
       }
       exists.push(command);
     }
-      
+
     for (const { command } of counts.rows) {
       if (!exists.includes(command)) {
         await connection.query("DELETE FROM counts WHERE command = $1", [command]);
diff --git a/utils/database/sqlite.js b/utils/database/sqlite.js
index 5d11682..d8404de 100644
--- a/utils/database/sqlite.js
+++ b/utils/database/sqlite.js
@@ -32,7 +32,7 @@ exports.setup = async () => {
       }
       exists.push(command);
     }
-      
+
     for (const { command } of counts) {
       if (!exists.includes(command)) {
         connection.prepare("DELETE FROM counts WHERE command = ?").run(command);
diff --git a/utils/pagination/awaitinteractions.js b/utils/pagination/awaitinteractions.js
index ee55224..cc80918 100644
--- a/utils/pagination/awaitinteractions.js
+++ b/utils/pagination/awaitinteractions.js
@@ -10,7 +10,7 @@ class InteractionCollector extends EventEmitter {
     this.bot = client;
     this.listener = async (packet) => {
       if (packet.t !== "INTERACTION_CREATE") return;
-      await this.verify(packet.d.message, packet.d.data.custom_id, packet.d.id, packet.d.token, packet.d.member ? packet.d.member.id : packet.d.user.id);
+      await this.verify(packet.d.message, packet.d.data.custom_id, packet.d.id, packet.d.token, packet.d.member ? packet.d.member.user.id : packet.d.user.id);
     };
     this.bot.on("rawWS", this.listener);
     if (options.time) setTimeout(() => this.stop("time"), options.time);
@@ -18,8 +18,7 @@ class InteractionCollector extends EventEmitter {
 
   async verify(message, interaction, id, token, member) {
     if (this.message.id !== message.id) return false;
-    const msg = await this.bot.getMessage(message.channel_id, message.id);
-    this.emit("interaction", msg, interaction, id, token, member);
+    this.emit("interaction", interaction, id, token, member);
     return true;
   }
 
diff --git a/utils/pagination/pagination.js b/utils/pagination/pagination.js
index 448ea58..1420370 100644
--- a/utils/pagination/pagination.js
+++ b/utils/pagination/pagination.js
@@ -73,7 +73,7 @@ module.exports = async (client, message, pages, timeout = 120000) => {
   let currentPage = await client.createMessage(message.channel.id, Object.assign(pages[page], options, pages.length > 1 ? components : {}));
   if (pages.length > 1) {
     const interactionCollector = new InteractionCollector(client, currentPage, { time: timeout });
-    interactionCollector.on("interaction", async (msg, interaction, id, token, member) => {
+    interactionCollector.on("interaction", async (interaction, id, token, member) => {
       if (member === message.author.id) {
         switch (interaction) {
           case "back":