Merge pull request #27 from sustained/hotfix-util-try-delete

fix: Fix issue with tryDelete in direct messages.
Elfayer · Oct 7, 2019 · a60e869 · a60e869
2 parents 565b269 + 39f204f
commit a60e869
Showing 1 changed file with 14 additions and 12 deletions.
diff --git a/src/utils/messages.js b/src/utils/messages.js
@@ -8,19 +8,21 @@ import client from '../client'
 export function tryDelete(msg, delay = 0) {
   console.debug(`Attempting to delete msg #${msg.id}.`)
 
-  if (msg.channel.type === 'dm' && msg.author.id !== msg.client.user.id) {
-    console.debug('Cannot delete - is DM.')
-    return false
-  }
-
-  if (!msg.guild.me.hasPermission('MANAGE_MESSAGES')) {
-    console.debug('Cannot delete - lacking permissions.')
-    return false
-  }
+  if (msg.channel.type === 'dm') {
+    if (msg.author.id !== msg.client.user.id) {
+      console.debug('Cannot delete - is DM.')
+      return false
+    }
+  } else {
+    if (!msg.guild.me.hasPermission('MANAGE_MESSAGES')) {
+      console.debug('Cannot delete - lacking permissions.')
+      return false
+    }
 
-  if (msg.member.hasPermission('ADMINISTRATOR')) {
-    if (!msg.guild.me.hasPermission('ADMINISTRATOR')) {
-      console.debug('Cannot delete - user is admin but I am not.')
+    if (msg.member.hasPermission('ADMINISTRATOR')) {
+      if (!msg.guild.me.hasPermission('ADMINISTRATOR')) {
+        console.debug('Cannot delete - user is admin but I am not.')
+      }
     }
   }