From 8a58c63bf1b44a189f4081c33941bcdbfd571a87 Mon Sep 17 00:00:00 2001
From: Master Kwoth <srki0509@gmail.com>
Date: Tue, 26 Apr 2016 10:54:44 +0200
Subject: [PATCH] People who are not in a voice channel now have much less
 control, Thanks to Lepia for suggestion.

---
 NadekoBot/Modules/Music/MusicModule.cs | 28 +++++++++++++++++++++-----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/NadekoBot/Modules/Music/MusicModule.cs b/NadekoBot/Modules/Music/MusicModule.cs
index 304f76f8..bb0acd11 100644
--- a/NadekoBot/Modules/Music/MusicModule.cs
+++ b/NadekoBot/Modules/Music/MusicModule.cs
@@ -57,12 +57,13 @@ namespace NadekoBot.Modules.Music
                 cgb.CreateCommand("n")
                     .Alias("next")
                     .Alias("skip")
-                    .Description("Goes to the next song in the queue.**Usage**: `!m n`")
+                    .Description("Goes to the next song in the queue. You have to be in the same voice channel as the bot.\n**Usage**: `!m n`")
                     .Do(e =>
                     {
                         MusicPlayer musicPlayer;
                         if (!MusicPlayers.TryGetValue(e.Server, out musicPlayer)) return;
-                        musicPlayer.Next();
+                        if (musicPlayer.PlaybackVoiceChannel == e.User.VoiceChannel)
+                            musicPlayer.Next();
                     });
 
                 cgb.CreateCommand("s")
@@ -74,7 +75,8 @@ namespace NadekoBot.Modules.Music
                         {
                             MusicPlayer musicPlayer;
                             if (!MusicPlayers.TryGetValue(e.Server, out musicPlayer)) return;
-                            musicPlayer.Stop();
+                            if (e.User.VoiceChannel == musicPlayer.PlaybackVoiceChannel)
+                                musicPlayer.Stop();
                         }).ConfigureAwait(false);
                     });
 
@@ -88,7 +90,8 @@ namespace NadekoBot.Modules.Music
                         {
                             MusicPlayer musicPlayer;
                             if (!MusicPlayers.TryRemove(e.Server, out musicPlayer)) return;
-                            musicPlayer.Destroy();
+                            if (e.User.VoiceChannel == musicPlayer.PlaybackVoiceChannel)
+                                musicPlayer.Destroy();
                         }).ConfigureAwait(false);
                     });
 
@@ -99,6 +102,8 @@ namespace NadekoBot.Modules.Music
                     {
                         MusicPlayer musicPlayer;
                         if (!MusicPlayers.TryGetValue(e.Server, out musicPlayer)) return;
+                        if (e.User.VoiceChannel != musicPlayer.PlaybackVoiceChannel)
+                            return;
                         musicPlayer.TogglePause();
                         if (musicPlayer.Paused)
                             await e.Channel.SendMessage("🎵`Music Player paused.`").ConfigureAwait(false);
@@ -172,6 +177,8 @@ namespace NadekoBot.Modules.Music
                         MusicPlayer musicPlayer;
                         if (!MusicPlayers.TryGetValue(e.Server, out musicPlayer))
                             return;
+                        if (e.User.VoiceChannel != musicPlayer.PlaybackVoiceChannel)
+                            return;
                         var arg = e.GetArg("val");
                         int volume;
                         if (!int.TryParse(arg, out volume))
@@ -208,6 +215,8 @@ namespace NadekoBot.Modules.Music
                         MusicPlayer musicPlayer;
                         if (!MusicPlayers.TryGetValue(e.Server, out musicPlayer))
                             return;
+                        if (e.User.VoiceChannel != musicPlayer.PlaybackVoiceChannel)
+                            return;
                         musicPlayer.SetVolume(0);
                     });
 
@@ -218,6 +227,8 @@ namespace NadekoBot.Modules.Music
                         MusicPlayer musicPlayer;
                         if (!MusicPlayers.TryGetValue(e.Server, out musicPlayer))
                             return;
+                        if (e.User.VoiceChannel != musicPlayer.PlaybackVoiceChannel)
+                            return;
                         musicPlayer.SetVolume(100);
                     });
 
@@ -228,6 +239,8 @@ namespace NadekoBot.Modules.Music
                         MusicPlayer musicPlayer;
                         if (!MusicPlayers.TryGetValue(e.Server, out musicPlayer))
                             return;
+                        if (e.User.VoiceChannel != musicPlayer.PlaybackVoiceChannel)
+                            return;
                         musicPlayer.SetVolume(50);
                     });
 
@@ -238,6 +251,8 @@ namespace NadekoBot.Modules.Music
                         MusicPlayer musicPlayer;
                         if (!MusicPlayers.TryGetValue(e.Server, out musicPlayer))
                             return;
+                        if (e.User.VoiceChannel != musicPlayer.PlaybackVoiceChannel)
+                            return;
                         if (musicPlayer.Playlist.Count < 2)
                         {
                             await e.Channel.SendMessage("💢 Not enough songs in order to perform the shuffle.").ConfigureAwait(false);
@@ -352,6 +367,8 @@ namespace NadekoBot.Modules.Music
                         {
                             return;
                         }
+                        if (e.User.VoiceChannel != musicPlayer.PlaybackVoiceChannel)
+                            return;
                         if (arg?.ToLower() == "all")
                         {
                             musicPlayer.ClearQueue();
@@ -545,7 +562,8 @@ namespace NadekoBot.Modules.Music
                         MusicPlayer musicPlayer;
                         if (!MusicPlayers.TryGetValue(e.Server, out musicPlayer))
                             return;
-
+                        if (e.User.VoiceChannel != musicPlayer.PlaybackVoiceChannel)
+                            return;
                         int skipTo;
                         if (!int.TryParse(skipToStr, out skipTo) || skipTo < 0)
                             return;