Fix bugs with /ban and rare exceptions.

retrixe · Nov 5, 2018 · 61dba67 · 61dba67
1 parent 5644b87
commit 61dba67
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/server/bot/client.ts b/server/bot/client.ts
@@ -165,7 +165,7 @@ export default class CommandParser {
   }
 
   async onMessage (message: Message) {
-    if (!message.content.startsWith('/')) {
+    if (message.content && !message.content.startsWith('/')) {
       botCallback(message, this.client, this.tempDB, this.db)
       return // Don't process it if it's not a command.
     }
@@ -198,7 +198,7 @@ export default class CommandParser {
   // For evaluating messages which weren't evaluated.
   async onMessageUpdate (message: Message, oldMessage?: Message) {
     // We won't bother with a lot of messages..
-    if (!message.content.startsWith('/')) return
+    if (message.content && !message.content.startsWith('/')) return
     else if (this.evaluatedMessages.includes(message.id)) return
     else if (!oldMessage || Date.now() - message.timestamp > 30000) return
     else if (message.editedTimestamp - message.timestamp > 30000) return

diff --git a/server/bot/commands/admin/ban.ts b/server/bot/commands/admin/ban.ts
@@ -26,7 +26,7 @@ export const handleBan: Command = {
       try { user = await client.getRESTUser(userSpecified) } catch (e) {
         return 'I cannot find that user.'
       }
-    } else return 'I cannot find that user.'
+    }
     if (!user) return `Specify a valid user, ${getInsult()}.`
     // If the user cannot ban the person..
     if (
@@ -75,7 +75,9 @@ export const handleUnban: Command = {
       user = client.users.find(i => i.username === userSpecified)
     } else if (client.users.find(i => i.id === userSpecified)) {
       user = client.users.find(i => i.id === userSpecified)
-    } else user = await client.getRESTUser(userSpecified)
+    } else {
+      try { user = await client.getRESTUser(userSpecified) } catch (e) {}
+    }
     if (!user) return 'I cannot find that user.'
     // Now we unban the person.
     try {