fix(lfg): check if initial embed is created, leverage direct calls

WFCD · Dec 23, 2020 · aeeb07d · aeeb07d
1 parent aa498d6
commit aeeb07d
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 5 deletions.
diff --git a/src/commands/LFG/LFG.js b/src/commands/LFG/LFG.js
@@ -94,8 +94,15 @@ class AddLFG extends Command {
       // save params based on order
       const embed = new LFGEmbed(this.bot, lfg);
       try {
-        const msg = await this.messageManager
-          .embedToChannel(ctx.lfg[lfg.platform] || ctx.lfg[Object.keys(ctx.lfg)[0]], embed);
+        const chn = message.guild.channels
+          .resolve(ctx.lfg[lfg.platform] || ctx.lfg[Object.keys(ctx.lfg)[0]]);
+
+        const msg = await chn.send(embed);
+
+        if (!msg) {
+          message.channel.send('Unknown error. Could not create LFG entry.');
+          return this.messageManager.statuses.FAILURE;
+        }
         msg.delete({ timeout: dehumanize(lfg.expiry) + 10000 });
         msg.react('🔰');
         msg.react('❌');

diff --git a/src/commands/Ondemand/Wiki.js b/src/commands/Ondemand/Wiki.js
@@ -7,6 +7,7 @@ const WikiEmbed = require('../../embeds/WikiEmbed.js');
 const warframe = new Wikia('warframe');
 
 const { emojify } = require('../../CommonFunctions');
+
 const noResult = `${emojify('red_tick')} No result for search, Operator. Attempt another query.`;
 
 /**
@@ -49,7 +50,6 @@ class Wiki extends Command {
       await message.channel.send(JSON.parse(JSON.stringify(embed)));
       return this.messageManager.statuses.SUCCESS;
     } catch (error) {
-      console.error(error);
       message.channel.send(noResult);
       return this.messageManager.statuses.FAILURE;
     }

diff --git a/src/commands/Reddit/BaseReddit.js b/src/commands/Reddit/BaseReddit.js
@@ -28,7 +28,6 @@ class BaseReddit extends Command {
   async run(message) {
     const { permalink, url, title } = (await fetch(this.url))[0].data.children[0].data;
     const embed = new Embed();
-    console.log(`url: ${url} | ${title} | ${permalink}`);
     embed.setTitle(title);
     embed.setURL(`https://reddit.com${permalink}`);
     embed.setImage(url);

diff --git a/src/settings/MessageManager.js b/src/settings/MessageManager.js
@@ -138,6 +138,24 @@ class MessageManager {
     return undefined;
   }
 
+  wrap(embed, ctx) {
+    return this.wraps([embed], ctx);
+  }
+
+  wraps(embeds, ctx) {
+    return ctx.webhook && ctx.webhook.avatar
+      ? {
+        username: ctx.webhook.name,
+        avatarURL: ctx.webhook.avatar,
+        embeds,
+      }
+      : {
+        username: this.settings.defaults.username,
+        avatarURL: this.settings.defaults.avatar,
+        embeds,
+      };
+  }
+
   /**
    * Send an embed, with options to delete messages after calling
    * @param {Message} message original message being responded to
@@ -298,7 +316,7 @@ class MessageManager {
     const channelWebhook = await this.settings.getChannelWebhook(ctx.channel);
     if (!embed.embeds) {
       // eslint-disable-next-line no-param-reassign
-      embed = this.webhookWrapEmbed(embed, ctx);
+      embed = this.wrap(embed, ctx);
     }
     if (channelWebhook && channelWebhook.token && channelWebhook.id) {
       // eslint-disable-next-line no-param-reassign