From d011393f20469fd6da681819d0bd7e25079d67c0 Mon Sep 17 00:00:00 2001
From: Max Litruv Boonzaayer <litruv@gmail.com>
Date: Mon, 18 Mar 2019 18:53:16 +1100
Subject: [PATCH] Added error checking for no users mentioned

---
 commands/kick.js | 21 ++++++++++++---------
 commands/slap.js | 32 ++++++++++++++++++--------------
 2 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/commands/kick.js b/commands/kick.js
index b25648c..448ed66 100644
--- a/commands/kick.js
+++ b/commands/kick.js
@@ -8,15 +8,18 @@ module.exports = {
     category: 'admin',
     command: (client, msg) => {
         if (msg.mentions.members.array().length > 0)
-            msg.member.guild.createChannel('Kicked', 'voice')
-                .then(channel => {
-                    msg.mentions.members.first().setVoiceChannel(channel.id);
-                    c = channel;
-                    setTimeout(function () {
-                        c.delete()
-                    }, 150);
-                })
-                .catch(console.error);
+            if (msg.mentions.members.first().voiceChannelID != undefined)
+                msg.member.guild.createChannel('Kicked', 'voice')
+                    .then(channel => {
+                        msg.mentions.members.first().setVoiceChannel(channel.id);
+                        c = channel;
+                        setTimeout(function () {
+                            c.delete()
+                        }, 150);
+                    })
+                    .catch(console.error);
+            else
+                msg.reply("User isn't in a channel")
 
     }
 }
\ No newline at end of file
diff --git a/commands/slap.js b/commands/slap.js
index cf69591..6eeae7a 100644
--- a/commands/slap.js
+++ b/commands/slap.js
@@ -7,22 +7,26 @@ module.exports = {
     args: ['@Tag'],
     category: 'admin',
     command: (client, msg) => {
-        client.database.get_setting("autoVoice", msg.guild.id).then((autochan) => {
-            var itemsProcessed = 0
-            var cid = msg.mentions.members.first().voiceChannelID
-            msg.guild.channels.filter(c => value.type == "voice").forEach(element => {
-                itemsProcessed++
-                if (itemsProcessed <= 8) {
-                    if (element.id != autochan) {
-                        if (element.members.array().length == 0)
-                            msg.mentions.members.first().setVoiceChannel(element.id)
+        if (msg.mentions.members.array().length > 0)
+        if (msg.mentions.members.first().voiceChannelID != undefined)
+            client.database.get_setting("autoVoice", msg.guild.id).then((autochan) => {
+                var itemsProcessed = 0
+                var cid = msg.mentions.members.first().voiceChannelID
+                msg.guild.channels.filter(c => c.type == "voice").forEach(element => {
+                    itemsProcessed++
+                    if (itemsProcessed <= 8) {
+                        if (element.id != autochan) {
+                            if (element.members.array().length == 0)
+                                msg.mentions.members.first().setVoiceChannel(element.id)
+                        }
+                        if (itemsProcessed >= msg.guild.channels.filter(c => c.type == "voice").array().length || itemsProcessed >= 8) {
+                            msg.mentions.members.first().setVoiceChannel(cid)
+                        }
                     }
-                    if (itemsProcessed >= msg.guild.channels.filter(c => value.type == "voice").array().length || itemsProcessed >= 8) {
-                        msg.mentions.members.first().setVoiceChannel(cid)
-                    }
-                }
+                })
             })
-        })
+        else
+            msg.reply("User isn't in a channel")
 
     }
 }
\ No newline at end of file