More message manager consumption

WFCD · Feb 25, 2017 · c2e5dad · c2e5dad
1 parent 26f85fb
commit c2e5dad
Show file tree

Hide file tree

Showing 33 changed files with 169 additions and 223 deletions.
diff --git a/src/Command.js b/src/Command.js
@@ -96,6 +96,12 @@ class Command {
     * @type {Boolean}
     */
     this.allowDM = true;
+
+    /**
+     * Message manager for sending and managing messages
+     * @type {MessageManager}
+     */
+    this.messageManager = bot.messageManager;
   }
 
   /**

diff --git a/src/commands/Core/Bug.js b/src/commands/Core/Bug.js
@@ -68,8 +68,8 @@ class BugReport extends Command {
             };
           }
         }
-        this.bot.messageManager.sendDirectEmbedToOwner(embed);
-        this.bot.messageManager.sendReply(message, 'Bug report sent.', true, true);
+        this.messageManager.sendDirectEmbedToOwner(embed);
+        this.messageManager.reply(message, 'Bug report sent.', true, true);
       } else {
         const embed = {
           author: {
@@ -79,7 +79,7 @@ class BugReport extends Command {
           title: `Bug Report | ${message.author}`,
           fields: [{ name: '_ _', value: 'Need to provide a bug report, see `/help` for syntax.' }],
         };
-        this.bot.messageMAnager.sendEmbed(message, embed, true, false);
+        this.messageManager.embed(message, embed, true, false);
       }
     }
   }

diff --git a/src/commands/Core/Help.js b/src/commands/Core/Help.js
@@ -30,7 +30,7 @@ class Help extends Command {
    */
   run(message) {
     if (message.channel.type !== 'dm') {
-      this.bot.messageManager.sendReply(message, this.helpReplyMsg, true, false);
+      this.messageManager.reply(message, this.helpReplyMsg, true, false);
     }
     this.sendCoreEmbed(message);
     this.sendSettingsEmbed(message);
@@ -119,7 +119,7 @@ class Help extends Command {
       };
     }
     if (commands.length > 0) {
-      this.bot.messageManager.sendDirectEmbedToAuthor(message, embed, false);
+      this.messageManager.sendDirectEmbedToAuthor(message, embed, false);
     }
   }
 }

diff --git a/src/commands/Ondemand/Alerts.js b/src/commands/Ondemand/Alerts.js
@@ -25,7 +25,7 @@ class Alerts extends Command {
       .then(platform => this.bot.worldStates[platform].getData())
       .then((ws) => {
         const alerts = ws.alerts.filter(a => !a.getExpired());
-        this.bot.messageManager.sendEmbed(message, new AlertEmbed(this.bot, alerts), true, false);
+        this.messageManager.embed(message, new AlertEmbed(this.bot, alerts), true, false);
       })
       .catch(this.logger.error);
   }

diff --git a/src/commands/Ondemand/Armor.js b/src/commands/Ondemand/Armor.js
@@ -103,7 +103,7 @@ class Armor extends Command {
           text: 'Data evaluated by Warframe Community Developers',
         },
       };
-      this.bot.messageManager.sendEmbed(message, embed, true, false);
+      this.messageManager.embed(message, embed, true, false);
     } else {
       this.logger.debug('Entered 0-param armor');
       this.sendUsage(message);
@@ -139,7 +139,7 @@ class Armor extends Command {
       },
     };
 
-    this.bot.messageManager.sendEmbed(message, embed, true, false);
+    this.messageManager.embed(message, embed, true, false);
   }
 
   /**

diff --git a/src/commands/Ondemand/ConclaveChallenges.js b/src/commands/Ondemand/ConclaveChallenges.js
@@ -35,7 +35,7 @@ class ConclaveChallenges extends Command {
       .then((ws) => {
         const conclaveChallenges = ws.conclaveChallenges;
         const embed = new ConclaveChallengeEmbed(this.bot, conclaveChallenges, category);
-        this.bot.messageManager.sendEmbed(message, embed, true, false);
+        this.messageManager.embed(message, embed, true, false);
       })
       .catch(this.logger.error);
   }

diff --git a/src/commands/Ondemand/Darvo.js b/src/commands/Ondemand/Darvo.js
@@ -25,7 +25,7 @@ class Darvo extends Command {
       .then(platform => this.bot.worldStates[platform].getData())
       .then((ws) => {
         const deal = ws.dailyDeals[0];
-        this.bot.messageManager.sendEmbed(message, new DarvoEmbed(this.bot, deal), true, false);
+        this.messageManager.embed(message, new DarvoEmbed(this.bot, deal), true, false);
       })
       .catch(this.logger.error);
   }

diff --git a/src/commands/Ondemand/EarthCycle.js b/src/commands/Ondemand/EarthCycle.js
@@ -45,7 +45,7 @@ class EarthCycle extends Command {
    */
   run(message) {
     const state = getCurrentEarthCycle();
-    this.bot.messageManager.sendEmbed(message, new EarthCycleEmbed(this.bot, state), true, false);
+    this.messageManager.embed(message, new EarthCycleEmbed(this.bot, state), true, false);
   }
 }
 

diff --git a/src/commands/Ondemand/Enemies.js b/src/commands/Ondemand/Enemies.js
@@ -25,7 +25,7 @@ class Enemies extends Command {
       .then(platform => this.bot.worldStates[platform].getData())
       .then((ws) => {
         const persistentEnemies = ws.persistentEnemies;
-        this.bot.messageManager.sendEmbed(message,
+        this.messageManager.embed(message,
           new EnemyEmbed(this.bot, persistentEnemies), true, false);
       })
       .catch(this.logger.error);

diff --git a/src/commands/Ondemand/FeaturedDeal.js b/src/commands/Ondemand/FeaturedDeal.js
@@ -26,7 +26,7 @@ class FeaturedDeal extends Command {
       .then(platform => this.bot.worldStates[platform].getData())
       .then((ws) => {
         const sales = ws.flashSales.filter(popularItem => popularItem.isFeatured);
-        this.bot.messageManager.sendEmbed(message,
+        this.messageManager.embed(message,
           new SalesEmbed(this.bot, sales), true, false);
       })
       .catch(this.logger.error);

diff --git a/src/commands/Ondemand/Fissures.js b/src/commands/Ondemand/Fissures.js
@@ -25,7 +25,7 @@ class Fissures extends Command {
       .then(platform => this.bot.worldStates[platform].getData())
       .then((ws) => {
         const fissures = ws.fissures;
-        this.bot.messageManager.sendEmbed(message,
+        this.messageManager.embed(message,
           new FissureEmbed(this.bot, fissures), true, false);
       })
       .catch(this.logger.error);

diff --git a/src/commands/Ondemand/Invasions.js b/src/commands/Ondemand/Invasions.js
@@ -25,7 +25,7 @@ class Invasions extends Command {
       .then(platform => this.bot.worldStates[platform].getData())
       .then((ws) => {
         const invasions = ws.invasions.filter(i => !i.completed);
-        this.bot.messageManager.sendEmbed(message,
+        this.messageManager.embed(message,
           new InvasionEmbed(this.bot, invasions), true, false);
       })
       .catch(this.logger.error);

diff --git a/src/commands/Ondemand/Mod.js b/src/commands/Ondemand/Mod.js
@@ -16,6 +16,7 @@ class Mod extends Command {
   constructor(bot) {
     super(bot, 'warframe.misc.mod', 'mod', 'Search the Warframe Wiki for a mod\'s image');
     this.regex = new RegExp('^mod(.+)', 'i');
+    this.noResultStr = `${this.md.codeMulti}No result for search, Operator. Attempt another search query.${this.md.blockEnd}`;
   }
 
   /**
@@ -26,7 +27,7 @@ class Mod extends Command {
   run(message) {
     const query = this.regex.exec(message.strippedContent.match(this.regex)[0])[1];
     if (!query) {
-      message.reply(`${this.md.codeMulti}Please specify a search term${this.md.blockEnd}`);
+      this.messageManager.reply(message, this.noResultStr, true, false);
     } else {
       warframe.getSearchList({
         query,
@@ -49,35 +50,26 @@ class Mod extends Command {
              list.items.forEach((item) => {
                if (item.id === id) {
                  sent = true;
-                 message.channel.sendFile(thumbUrl, 'Mod.png', message.author.toString()).then(() => {
-                   if (message.deletable) {
-                     return message.delete(2000);
-                   }
-                   return Promise.resolve();
-                 }).catch(this.logger.error);
+                 const embed = {
+                   title: query,
+                   color: 0xC0C0C0,
+                   description: `Mod result for ${query}`,
+                   image: {
+                     url: thumbUrl,
+                   },
+                 };
+                 this.messageManager.embed(message, embed, true, false);
                }
              });
              if (!sent) {
-               message.reply(`${this.md.codeMulti}No result for search, Operator. Attempt another search query.${this.md.blockEnd}`)
-               .then(() => {
-                 if (message.deletable) {
-                   return message.delete(2000);
-                 }
-                 return Promise.resolve();
-               }).catch(this.logger.error);
+               this.messageManager.reply(message, this.noResultStr, true, false);
              }
            });
         });
       })
       .catch((error) => {
         this.logger.error(error);
-        message.reply(`${this.md.codeMulti}No result for search, Operator. Attempt another search query.${this.md.blockEnd}`)
-        .then(() => {
-          if (message.deletable) {
-            return message.delete(2000);
-          }
-          return Promise.resolve();
-        }).catch(this.logger.error);
+        this.messageManager.reply(message, this.noResultStr, true, false);
       });
     }
   }

diff --git a/src/commands/Ondemand/News.js b/src/commands/Ondemand/News.js
@@ -25,12 +25,7 @@ class News extends Command {
       .then(platform => this.bot.worldStates[platform].getData())
       .then((ws) => {
         const news = ws.news;
-        return message.channel.sendEmbed(new NewsEmbed(this.bot, news));
-      }).then(() => {
-        if (message.deletable) {
-          return message.delete(2000);
-        }
-        return Promise.resolve();
+        this.messageManager.embed(message, new NewsEmbed(this.bot, news), true, false);
       })
       .catch(this.logger.error);
   }

diff --git a/src/commands/Ondemand/PopularSale.js b/src/commands/Ondemand/PopularSale.js
@@ -26,13 +26,7 @@ class PopularSale extends Command {
       .then(platform => this.bot.worldStates[platform].getData())
       .then((ws) => {
         const sales = ws.flashSales.filter(popularItem => popularItem.isPopular);
-        return message.channel.sendEmbed(new SalesEmbed(this.bot, sales));
-      })
-      .then(() => {
-        if (message.deletable) {
-          return message.delete(2000);
-        }
-        return new Promise();
+        this.messageManager.embed(message, new SalesEmbed(this.bot, sales), true, false);
       })
       .catch(this.logger.error);
   }

diff --git a/src/commands/Ondemand/Pricecheck.js b/src/commands/Ondemand/Pricecheck.js
@@ -2,6 +2,7 @@
 
 const Nexus = require('warframe-nexus-query');
 const Command = require('../../Command.js');
+const PriceCheckEmbed = require('../../embeds/PriceCheckEmbed.js');
 
 /**
  * Looks up items from Nexus-stats.com
@@ -35,48 +36,8 @@ class PriceCheck extends Command {
 
     this.nexusQuerier.priceCheckQueryAttachment(item)
         .then((result) => {
-          let embed = {};
-          if (typeof result[0] === 'string') {
-            embed = {
-              color: 0xff0000,
-              title: 'Warframe - Pricecheck',
-              url: 'http://nexus-stats.com',
-              description: `Pricecheck for: ${item}`,
-              thumbnail: {
-                url: 'https://cdn.discordapp.com/icons/195582152849620992/4c1fbd47b3e6c8d49b6d2362c79a537b.jpg',
-              },
-              fields: [
-                {
-                  name: '_ _',
-                  value: result[0],
-                  inline: true,
-                },
-              ],
-              footer: {
-                icon_url: 'https://cdn.discordapp.com/icons/195582152849620992/4c1fbd47b3e6c8d49b6d2362c79a537b.jpg',
-                text: 'Pricechecks provided by Nexus Stats - https://nexus-stats.com',
-              },
-            };
-          } else {
-            const attachment = result[0];
-            embed = {
-              description: `Price query for ${item}`,
-              color: parseInt(attachment.color, 16),
-              type: attachment.type,
-              title: attachment.title,
-              url: attachment.url,
-              fields: attachment.fields,
-              thumbnail: attachment.thumbnail,
-              footer: attachment.footer,
-            };
-          }
-          return message.channel.sendEmbed(embed);
-        })
-        .then(() => {
-          if (message.deletable) {
-            return message.delete(2000);
-          }
-          return Promise.resolve();
+          this.messageManager.embed(message,
+            new PriceCheckEmbed(this.bot, result, item), true, false);
         })
         .catch(this.logger.error);
   }

diff --git a/src/commands/Ondemand/PrimeAccess.js b/src/commands/Ondemand/PrimeAccess.js
@@ -26,12 +26,7 @@ class PrimeAccess extends Command {
       .then(platform => this.bot.worldStates[platform].getData())
       .then((ws) => {
         const news = ws.news.filter(n => n.isPrimeAccess());
-        return message.channel.sendEmbed(new PrimeAccessEmbed(this.bot, news, 'primeaccess'));
-      }).then(() => {
-        if (message.deletable) {
-          return message.delete(2000);
-        }
-        return Promise.resolve();
+        this.messageManager.embed(message, new PrimeAccessEmbed(this.bot, news, 'primeaccess'), true, false);
       })
       .catch(this.logger.error);
   }

diff --git a/src/commands/Ondemand/Profile.js b/src/commands/Ondemand/Profile.js
@@ -28,32 +28,22 @@ class FrameProfile extends Command {
    */
   run(message) {
     let frame = message.strippedContent.match(this.regex)[1];
-    let promise;
     if (frame) {
       frame = frame.trim().toLowerCase();
-
       profiles.forEach((profile) => {
         if (new RegExp(profile.regex, 'ig').test(frame)) {
-          promise = message.reply(`Warfame Profile | ${profile.name} : ${profile.url}`);
+          this.messageManager.reply(message, `Warfame Profile | ${profile.name} : ${profile.url}`, true, false);
         }
       });
     } else {
-      promise = message.channel.sendEmbed({
+      this.messageManager.embed(message, {
         title: 'Available Profiles',
         fields: [{ name: '_ _', value: profiles.map(profile => profile.name).join('\n') }],
         footer: {
           icon_url: 'https://avatars1.githubusercontent.com/u/24436369',
           text: 'Data evaluated by Warframe Community Developers',
         },
-      });
-    }
-    if (promise) {
-      promise.then(() => {
-        if (message.deletable) {
-          message.delete(10000);
-        }
-      })
-      .catch(this.logger.error);
+      }, true, false);
     }
   }
 }

diff --git a/src/commands/Ondemand/Raid.js b/src/commands/Ondemand/Raid.js
@@ -40,18 +40,10 @@ class Raid extends Command {
       .then((platform) => {
         const url = encodeURI(`https://api.trials.wf/api/player/${platform.toLowerCase()}/${query}/completed`);
         const raidCache = new Cache(url, 999999);
-
         raidCache.getDataJson().then((data) => {
-          const embed = new RaidEmbed(this.bot, data, query);
-          return message.channel.sendEmbed(embed);
+          this.messageManager.embed(message, new RaidEmbed(this.bot, data, query), true, false);
         });
       })
-      .then(() => {
-        if (message.deletable) {
-          return message.delete(2000);
-        }
-        return Promise.resolve();
-      })
       .catch(this.logger.error);
   }
 }