When the bot is in same audio channel as you, and you do the join com…

…mand again, it will tell you its is already in the audio channel with you.

src/Pootis-Bot/Modules/Audio/Music.cs

@@ -36,7 +36,7 @@ await Context.Channel.SendMessageAsync(
 				return;
 			}
 
-			await _service.JoinAudio(Context.Guild, ((IVoiceState) Context.User).VoiceChannel, Context.Channel);
+			await _service.JoinAudio(Context.Guild, ((IVoiceState) Context.User).VoiceChannel, Context.Channel, Context.User.Id);
 		}
 
 		[Command("leave", RunMode = RunMode.Async)]

src/Pootis-Bot/Services/Audio/AudioService.cs

@@ -23,11 +23,12 @@ public class AudioService
 		/// <summary>
 		/// Joins a guild voice channel, and sends messages to a text channel on error
 		/// </summary>
-		/// <param name="guild">What guild are we in</param>
-		/// <param name="target">The voice channel we are attempting to join</param>
-		/// <param name="channel">The message channel to log errors in</param>
+		/// <param name="guild"></param>
+		/// <param name="target"></param>
+		/// <param name="channel"></param>
+		/// <param name="userId"></param>
 		/// <returns></returns>
-		public async Task JoinAudio(IGuild guild, IVoiceChannel target, IMessageChannel channel)
+		public async Task JoinAudio(IGuild guild, IVoiceChannel target, IMessageChannel channel, ulong userId)
 		{
 			if (target == null)
 			{
@@ -38,6 +39,12 @@ public async Task JoinAudio(IGuild guild, IVoiceChannel target, IMessageChannel
 			ServerMusicItem serverMusic = GetMusicList(guild.Id);
 			if (serverMusic != null)
 			{
+				if (serverMusic.AudioChannel.GetUser(userId) != null)
+				{
+					await channel.SendMessageAsync(":musical_note: I am already in the same audio channel as you!");
+					return;
+				}
+
 				await channel.SendMessageAsync(
 					":musical_note: Sorry, but I am already playing in a different audio channel at the moment.");
 
@@ -147,7 +154,7 @@ public async Task SendAudio(SocketGuild guild, IMessageChannel channel, IVoiceCh
 
 			if (serverList == null)
 			{
-				await JoinAudio(guild, target, channel);
+				await JoinAudio(guild, target, channel, user.Id);
 
 				serverList = GetMusicList(guild.Id);
 			}