From fb31e369f849f43a0e4ae8863cfbc1e590c239d2 Mon Sep 17 00:00:00 2001
From: mudkipscience <me@emily.im>
Date: Tue, 28 Apr 2020 19:35:11 +1000
Subject: [PATCH] a

---
 commands/movehere.js       | 28 ++++++++++++++--------------
 events/voiceStateUpdate.js |  7 ++++---
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/commands/movehere.js b/commands/movehere.js
index b96b011..38636aa 100644
--- a/commands/movehere.js
+++ b/commands/movehere.js
@@ -4,7 +4,7 @@ exports.conf = {
   enabled: true,
   guildOnly: true,
   aliases: [],
-  permLevel: 'Moderator',
+  permLevel: 'User  ',
   requiredPerms: ['CONNECT', 'SPEAK'],
   cooldown: 10000
 }
@@ -20,36 +20,36 @@ exports.help = {
 const music = require('../utils/music')
 exports.run = async (client, message, args, level, data) => {
   // get guild music data
-  const mGuild = music.getGuild(message.guild.id)
+  const guild = music.getGuild(message.guild.id)
 
-  if (!mGuild.playing) {
+  if (!guild.playing) {
     return message.channel.send('<:error:466995152976871434> Nothing is playing.')
   }
 
-  // change text channel
   let textChannelChanged = false
+  let voiceChannelChanged = false
 
-  if (mGuild.channel.id !== message.channel.id) {
-    mGuild.channel = message.channel
+  // change text channel
+  if (guild.channel.id !== message.channel.id) {
+    guild.channel = message.channel
 
     textChannelChanged = true
   }
 
   // move to another voice channel
-  let voiceChannelMoved = false
-
-  if (message.voice.channel && mGuild.voiceChannel && (message.voice.channel !== mGuild.voiceChannel.id)) {
-    // TODO: this
-
-    voiceChannelMoved = true
+  if (message.member.voice.channel && guild.voiceChannel && (message.member.voice.channel !== guild.voiceChannel.id)) {
+    guild.voiceChannel.leave()
+    guild.voiceChannel = message.member.voice.channel
+    guild.voiceChannel.join()
+    voiceChannelChanged = true
   }
 
   // response
-  if (textChannelChanged && voiceChannelMoved) {
+  if (textChannelChanged && voiceChannelChanged) {
     return message.channel.send('<:success:466995111885144095> Music playback moved to your voice channel and music messages to your text channel.')
   } else if (textChannelChanged) {
     return message.channel.send('<:success:466995111885144095> Music module will send messages to your text channel.')
-  } else if (voiceChannelMoved) {
+  } else if (voiceChannelChanged) {
     return message.channel.send('<:success:466995111885144095> Music playback moved to your voice channel.')
   } else {
     return message.channel.send('<:error:466995152976871434> Music is already playing in your voice channel!')
diff --git a/events/voiceStateUpdate.js b/events/voiceStateUpdate.js
index d252946..0c06e62 100644
--- a/events/voiceStateUpdate.js
+++ b/events/voiceStateUpdate.js
@@ -6,16 +6,17 @@ module.exports = (client, oldState, newState) => {
   if (newState.channelID !== oldState.channelID) {
     const guild = music.getGuild(newState.guild.id)
 
-    // Reset queue, dispatcher, etc if Woomy is forcibly disconnected from the queue
-    if (!guild.voiceChannel.members.get(client.user.id) && guild.queue.length > 0) {
+    /* Reset queue, dispatcher, etc if Woomy is forcibly disconnected from the queue
+    if (guild.voiceChannel && !guild.voiceChannel.members.get(client.user.id) && guild.queue.length > 0) {
       guild.queue = []
       guild.playing = false
       guild.paused = false
       guild.skippers = []
     }
+    */
 
     // Auto-disconnect feature
-    if (guild.playing && guild.voiceChannel.id === oldState.channelID) {
+    if (guild.playing && guild.Channel && guild.voiceChannel.id === oldState.channelID) {
       if (guild.voiceChannel.members.filter(member => !member.user.bot).size < 1) {
         guild.autoDisconnect = true