fix(discord): fix DM's not working

YappyBots · Feb 17, 2018 · ab54c6b · ab54c6b
1 parent bc7ef63
commit ab54c6b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/lib/Discord/Client.js b/lib/Discord/Client.js
@@ -184,8 +184,8 @@ class Client extends DiscordClient {
    */
   async execute(msg) {
     if (msg.author.equals(this.user) || msg.author.bot) return;
-    const serverConf = msg.guild.available ? ServerConfig.get(msg.guild.id) : await ServerConfig.add(msg.guild);
-    const prefix = serverConf.prefix || Math.random();
+    const serverConf = msg.guild && msg.guild.available ? ServerConfig.get(msg.guild.id) || await ServerConfig.add(msg.guild) : null;
+    const prefix = serverConf ? serverConf.prefix : Math.random();
     if (msg.channel.type !== 'dm' && !msg.content.startsWith(this.user.toString()) && !msg.content.startsWith(prefix) && !msg.content.startsWith(this.prefix)) return false;
 
     const content = (msg.content.startsWith(prefix) && msg.content.replace(prefix, '')) || (msg.content.startsWith(this.user.toString()) && msg.content.replace(`${this.user.toString()} `, '')) || (msg.content.startsWith(this.prefix) && msg.content.replace(this.prefix, '')) || msg.content;

diff --git a/lib/Discord/Modules/UnhandledError.js b/lib/Discord/Modules/UnhandledError.js
@@ -6,6 +6,8 @@ class UnhandledErrorModule extends Module {
     let embed = this.textToEmbed(`Yappy, the GitLab Monitor - Unhandled Error: \`${middleware ? middleware.constructor.name : msg.cleanContent}\``, '', '#CE0814');
     if (typeof error === 'string') embed.setDescription(error);
 
+    Log.error(error);
+
     return msg.channel.send({ embed });
   }
 }