Merge pull request #437 from Kwoth/dev

0.99.9a

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "discord.net"]
 	path = discord.net
-	url = git://github.com/rogueexception/discord.net.git
+	url = git://github.com/kwoth/discord.net.git

NadekoBot/Classes/Extensions.cs

@@ -46,10 +46,10 @@ namespace NadekoBot.Extensions
             if (num == 0)
                 return string.Empty;
             if (num <= 3)
-                return string.Join("", str.Select(c => '.'));
+                return string.Concat(str.Select(c => '.'));
             if (str.Length < num)
                 return str;
-            return string.Join("", str.Take(num - 3)) + (hideDots ? "" : "...");
+            return string.Concat(str.Take(num - 3)) + (hideDots ? "" : "...");
         }
         /// <summary>
         /// Removes trailing S or ES (if specified) on the given string if the num is 1
@@ -237,7 +237,7 @@ namespace NadekoBot.Extensions
 
         public static string Matrix(this string s)
             =>
-                string.Join("", s.Select(c => c.ToString() + " ̵̢̬̜͉̞̭̖̰͋̉̎ͬ̔̇̌̀".TrimTo(rng.Next(0, 12), true)));
+                string.Concat(s.Select(c => c.ToString() + " ̵̢̬̜͉̞̭̖̰͋̉̎ͬ̔̇̌̀".TrimTo(rng.Next(0, 12), true)));
         //.Replace("`", "");
 
         public static void ForEach<T>(this IEnumerable<T> source, Action<T> action)

NadekoBot/Classes/SearchHelper.cs

@@ -384,7 +384,7 @@ namespace NadekoBot.Classes
         {
             var i = 0;
             return "```xl\n" + string.Join("\n", items.GroupBy(item => (i++) / cols)
-                                      .Select(ig => string.Join("", ig.Select(el => howToPrint(el)))))
+                                      .Select(ig => string.Concat(ig.Select(el => howToPrint(el)))))
                                       + $"\n```";
         }
     }

NadekoBot/Modules/Administration/AdministrationModule.cs

@@ -738,7 +738,7 @@ namespace NadekoBot.Modules.Administration
                         if (string.IsNullOrWhiteSpace(msg))
                             return;
 
-                        var ids = e.GetArg("ids").Split('-');
+                        var ids = e.GetArg("ids").Split('|');
                         if (ids.Length != 2)
                             return;
                         var sid = ulong.Parse(ids[0]);

NadekoBot/Modules/Administration/Commands/SelfAssignedRolesCommand.cs

@@ -1,6 +1,8 @@
 using Discord.Commands;
+using Discord.Net;
 using NadekoBot.Classes;
 using NadekoBot.Modules.Permissions.Classes;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -144,7 +146,10 @@ namespace NadekoBot.Modules.Administration.Commands
                     {
                         await e.User.AddRoles(role).ConfigureAwait(false);
                     }
-                    catch
+                    catch(HttpException ex) when (ex.StatusCode == System.Net.HttpStatusCode.InternalServerError)
+                    {
+                    }
+                    catch (Exception)
                     {
                         await e.Channel.SendMessage($":anger:`I am unable to add that role to you. I can't add roles to owners or other roles higher than my role in the role hierarchy.`").ConfigureAwait(false);
                     }

NadekoBot/Modules/Conversations/Conversations.cs

@@ -9,13 +9,14 @@ using System;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
+using System.Text;
 using System.Threading.Tasks;
 
 namespace NadekoBot.Modules.Conversations
 {
     internal class Conversations : DiscordModule
     {
-        private const string firestr = "🔥 ด้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็ด้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็ด้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็็็็้้้้ 🔥";
+        private const string firestr = "🔥 ด้้้้้็็็็็้้้้้็็็็็้้้้้้้้็ด้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็ด้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็็็็้้้้ 🔥";
         public Conversations()
         {
             commands.Add(new RipCommand(this));
@@ -153,22 +154,23 @@ namespace NadekoBot.Modules.Conversations
                     .Parameter("times", ParameterType.Optional)
                     .Do(async e =>
                     {
-                        var count = 1;
+                        int count;
-                        int.TryParse(e.Args[0], out count);
+                        if (string.IsNullOrWhiteSpace(e.Args[0]))
-                        if (count == 0)
                             count = 1;
+                        else
+                            int.TryParse(e.Args[0], out count);
                         if (count < 1 || count > 12)
                         {
-                            await e.Channel.SendMessage("Number must be between 0 and 12").ConfigureAwait(false);
+                            await e.Channel.SendMessage("Number must be between 1 and 12").ConfigureAwait(false);
                             return;
                         }
 
-                        var str = "";
+                        var str = new StringBuilder();
                         for (var i = 0; i < count; i++)
                         {
-                            str += firestr;
+                            str.Append(firestr);
                         }
-                        await e.Channel.SendMessage(str).ConfigureAwait(false);
+                        await e.Channel.SendMessage(str.ToString()).ConfigureAwait(false);
                     });
 
                 cgb.CreateCommand("dump")

NadekoBot/Modules/Gambling/Helpers/Cards.cs

@@ -146,7 +146,7 @@ namespace NadekoBot.Modules.Gambling.Helpers
             var orderedPool = cardPool.OrderBy(x => r.Next());
             cardPool = cardPool as List<Card> ?? orderedPool.ToList();
         }
-        public override string ToString() => string.Join("", cardPool.Select(c => c.ToString())) + Environment.NewLine;
+        public override string ToString() => string.Concat(cardPool.Select(c => c.ToString())) + Environment.NewLine;
 
         private static void InitHandValues()
         {
@@ -226,7 +226,7 @@ namespace NadekoBot.Modules.Gambling.Helpers
             {
                 return kvp.Key;
             }
-            return "High card " + cards.Max().GetName();
+            return "High card " + (cards.FirstOrDefault(c => c.Number == 1)?.GetName() ?? cards.Max().GetName());
         }
     }
 }

NadekoBot/Modules/Games/Commands/PlantPick.cs

@@ -102,7 +102,6 @@ namespace NadekoBot.Modules.Games.Commands
 
                         var file = GetRandomCurrencyImagePath();
                         Message msg;
-                        //todo send message after, not in lock
                         if (file == null)
                             msg = e.Channel.SendMessage(NadekoBot.Config.CurrencySign).GetAwaiter().GetResult();
                         else

NadekoBot/Modules/Games/Commands/SpeedTyping.cs

@@ -190,8 +190,6 @@ namespace NadekoBot.Modules.Games.Commands
 
                     await e.Channel.SendMessage("Added new article for typing game.").ConfigureAwait(false);
                 });
-
-            //todo add user submissions
         }
     }
 }

NadekoBot/Modules/Help/Commands/HelpCommand.cs

@@ -5,6 +5,7 @@ using NadekoBot.Modules.Permissions.Classes;
 using System;
 using System.IO;
 using System.Linq;
+using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 
 namespace NadekoBot.Classes.Help.Commands
@@ -24,8 +25,13 @@ namespace NadekoBot.Classes.Help.Commands
                 var com = NadekoBot.Client.GetService<CommandService>().AllCommands
                     .FirstOrDefault(c => c.Text.ToLowerInvariant().Equals(comToFind) ||
                                         c.Aliases.Select(a => a.ToLowerInvariant()).Contains(comToFind));
+
+                var str = "";
+                var alias = com.Aliases.FirstOrDefault();
+                if (alias != null)
+                    str = $" / `{ com.Aliases.FirstOrDefault()}`";
                 if (com != null)
-                    await e.Channel.SendMessage($"**__Help for `{com.Text}`__ / __`{("" + com.Aliases.FirstOrDefault() + "" ?? "")}`__**\n**Desc:** {com.Description.Replace("|", "\n**Usage:**")}").ConfigureAwait(false);
+                    await e.Channel.SendMessage($@"**__Help for:__ `{com.Text}`**" + str + $"\n**Desc:** {new Regex(@"\|").Replace(com.Description, "\n**Usage:**",1)}").ConfigureAwait(false);
             }).ConfigureAwait(false);
         };
         public static string HelpString {

NadekoBot/Modules/Music/Classes/MusicControls.cs

@@ -2,7 +2,9 @@
 using Discord.Audio;
 using NadekoBot.Extensions;
 using System;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
+using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 namespace NadekoBot.Modules.Music.Classes
@@ -20,22 +22,18 @@ namespace NadekoBot.Modules.Music.Classes
     {
         Resolving,
         Queued,
-        Buffering, //not using it atm
         Playing,
         Completed
     }
 
     public class MusicPlayer
     {
-        public static int MaximumPlaylistSize => 50;
-
         private IAudioClient audioClient { get; set; }
 
         private readonly List<Song> playlist = new List<Song>();
         public IReadOnlyCollection<Song> Playlist => playlist;
-        private readonly object playlistLock = new object();
 
-        public Song CurrentSong { get; set; } = default(Song);
+        public Song CurrentSong { get; private set; }
         private CancellationTokenSource SongCancelSource { get; set; }
         private CancellationToken cancelToken { get; set; }
 
@@ -54,6 +52,8 @@ namespace NadekoBot.Modules.Music.Classes
         public bool Autoplay { get; set; } = false;
         public uint MaxQueueSize { get; set; } = 0;
 
+        private ConcurrentQueue<Action> actionQueue { get; set; } = new ConcurrentQueue<Action>();
+
         public MusicPlayer(Channel startingVoiceChannel, float? defaultVolume)
         {
             if (startingVoiceChannel == null)
@@ -67,86 +67,111 @@ namespace NadekoBot.Modules.Music.Classes
             cancelToken = SongCancelSource.Token;
 
             Task.Run(async () =>
+            {
+                try
+                {
+                    while (!Destroyed)
+                    {
+                        try
+                        {
+                            Action action;
+                            if (actionQueue.TryDequeue(out action))
+                            {
+                                action();
+                            }
+                        }
+                        finally
+                        {
+                            await Task.Delay(100).ConfigureAwait(false);
+                        }
+                    }
+                }
+                catch (Exception ex)
+                {
+                    Console.WriteLine("Action queue crashed");
+                    Console.WriteLine(ex);
+                }
+            }).ConfigureAwait(false);
+
+            var t = new Thread(new ThreadStart(async () =>
+            {
+                try
                 {
                     while (!Destroyed)
                     {
                         try
                         {
                             if (audioClient?.State != ConnectionState.Connected)
-                            audioClient = await PlaybackVoiceChannel.JoinAudio().ConfigureAwait(false);
-                    }
-                    catch
                             {
-                        await Task.Delay(1000).ConfigureAwait(false);
+                                audioClient = await PlaybackVoiceChannel.JoinAudio();
                                 continue;
                             }
+
                             CurrentSong = GetNextSong();
-                    var curSong = CurrentSong;
+                            RemoveSongAt(0);
-                    if (curSong != null)
+
-                    {
+                            if (CurrentSong == null)
+                                continue;
+
                             try
                             {
-                            OnStarted(this, curSong);
+                                OnStarted(this, CurrentSong);
-                            await curSong.Play(audioClient, cancelToken).ConfigureAwait(false);
+                                await CurrentSong.Play(audioClient, cancelToken);
                             }
                             catch (OperationCanceledException)
                             {
                                 Console.WriteLine("Song canceled");
-                        }
-                        catch (Exception ex)
-                        {
-                            Console.WriteLine($"Exception in PlaySong: {ex}");
-                        }
-                        OnCompleted(this, curSong);
-                        curSong = CurrentSong; //to check if its null now
-                        if (curSong != null)
-                            if (RepeatSong)
-                                playlist.Insert(0, curSong);
-                            else if (RepeatPlaylist)
-                                playlist.Insert(playlist.Count, curSong);
                                 SongCancelSource = new CancellationTokenSource();
                                 cancelToken = SongCancelSource.Token;
                             }
-                    await Task.Delay(1000).ConfigureAwait(false);
+                            OnCompleted(this, CurrentSong);
+
+                            if (RepeatPlaylist)
+                                AddSong(CurrentSong, CurrentSong.QueuerName);
+
+                            if (RepeatSong)
+                                AddSong(CurrentSong, 0);
+                            
                         }
-            });
+                        finally
+                        {
+                            await Task.Delay(300).ConfigureAwait(false);
+                            CurrentSong = null;
+                        }
+                    }
+                }
+                catch (Exception ex) {
+                    Console.WriteLine("Music thread crashed.");
+                    Console.WriteLine(ex);
+                }
+            }));
+
+            t.Start();
         }
 
         public void Next()
         {
-            lock (playlistLock)
+            actionQueue.Enqueue(() =>
-            {
-                if (!SongCancelSource.IsCancellationRequested)
             {
                 Paused = false;
                 SongCancelSource.Cancel();
-                }
+            });
-            }
         }
 
         public void Stop()
         {
-            lock (playlistLock)
+            actionQueue.Enqueue(() =>
             {
-                playlist.Clear();
-                CurrentSong = null;
                 RepeatPlaylist = false;
                 RepeatSong = false;
+                playlist.Clear();
                 if (!SongCancelSource.IsCancellationRequested)
                     SongCancelSource.Cancel();
-            }
+            });
         }
 
         public void TogglePause() => Paused = !Paused;
 
-        public void Shuffle()
-        {
-            lock (playlistLock)
-            {
-                playlist.Shuffle();
-            }
-        }
-
         public int SetVolume(int volume)
         {
             if (volume < 0)
@@ -158,16 +183,15 @@ namespace NadekoBot.Modules.Music.Classes
             return volume;
         }
 
-        private Song GetNextSong()
+        private Song GetNextSong() =>
+            playlist.FirstOrDefault();
+
+        public void Shuffle()
         {
-            lock (playlistLock)
+            actionQueue.Enqueue(() =>
             {
-                if (playlist.Count == 0)
+                playlist.Shuffle();
-                    return null;
+            });
-                var toReturn = playlist[0];
-                playlist.RemoveAt(0);
-                return toReturn;
-            }
         }
 
         public void AddSong(Song s, string username)
@@ -175,42 +199,64 @@ namespace NadekoBot.Modules.Music.Classes
             if (s == null)
                 throw new ArgumentNullException(nameof(s));
             ThrowIfQueueFull();
-            lock (playlistLock)
+            actionQueue.Enqueue(() =>
             {
                 s.MusicPlayer = this;
                 s.QueuerName = username.TrimTo(10);
                 playlist.Add(s);
-            }
+            });
         }
 
         public void AddSong(Song s, int index)
         {
             if (s == null)
                 throw new ArgumentNullException(nameof(s));
-            lock (playlistLock)
+            actionQueue.Enqueue(() =>
             {
                 playlist.Insert(index, s);
-            }
+            });
         }
 
         public void RemoveSong(Song s)
         {
             if (s == null)
                 throw new ArgumentNullException(nameof(s));
-            lock (playlistLock)
+            actionQueue.Enqueue(() =>
             {
                 playlist.Remove(s);
-            }
+            });
         }
 
         public void RemoveSongAt(int index)
         {
-            lock (playlistLock)
+            actionQueue.Enqueue(() =>
             {
                 if (index < 0 || index >= playlist.Count)
-                    throw new ArgumentException("Invalid index");
+                    return;
                 playlist.RemoveAt(index);
+            });
         }
+
+        internal void ClearQueue()
+        {
+            actionQueue.Enqueue(() =>
+            {
+                playlist.Clear();
+            });
+        }
+
+        public void Destroy()
+        {
+            actionQueue.Enqueue(() =>
+            {
+                RepeatPlaylist = false;
+                RepeatSong = false;
+                Destroyed = true;
+                playlist.Clear();
+                if (!SongCancelSource.IsCancellationRequested)
+                    SongCancelSource.Cancel();
+                audioClient.Disconnect();
+            });
         }
 
         internal Task MoveToVoiceChannel(Channel voiceChannel)
@@ -221,27 +267,6 @@ namespace NadekoBot.Modules.Music.Classes
             return PlaybackVoiceChannel.JoinAudio();
         }
 
-        internal void ClearQueue()
-        {
-            lock (playlistLock)
-            {
-                playlist.Clear();
-            }
-        }
-
-        public void Destroy()
-        {
-            lock (playlistLock)
-            {
-                playlist.Clear();
-                Destroyed = true;
-                CurrentSong = null;
-                if (!SongCancelSource.IsCancellationRequested)
-                    SongCancelSource.Cancel();
-                audioClient.Disconnect();
-            }
-        }
-
         internal bool ToggleRepeatSong() => this.RepeatSong = !this.RepeatSong;
 
         internal bool ToggleRepeatPlaylist() => this.RepeatPlaylist = !this.RepeatPlaylist;

NadekoBot/Modules/Music/Classes/Song.cs

@@ -31,7 +31,7 @@ namespace NadekoBot.Modules.Music.Classes
         public SongInfo SongInfo { get; }
         public string QueuerName { get; set; }
 
-        private PoopyBuffer songBuffer { get; } = new PoopyBuffer(NadekoBot.Config.BufferSize);
+        private PoopyBuffer songBuffer { get; set; }
 
         private bool prebufferingComplete { get; set; } = false;
         public MusicPlayer MusicPlayer { get; set; }
@@ -137,6 +137,9 @@ namespace NadekoBot.Modules.Music.Classes
 
         internal async Task Play(IAudioClient voiceClient, CancellationToken cancelToken)
         {
+            // initialize the buffer here because if this song was playing before (requeued), we must delete old buffer data
+            songBuffer = new PoopyBuffer(NadekoBot.Config.BufferSize); 
+
             var bufferTask = BufferSong(cancelToken).ConfigureAwait(false);
             var bufferAttempts = 0;
             const int waitPerAttempt = 500;
@@ -145,7 +148,6 @@ namespace NadekoBot.Modules.Music.Classes
             {
                 await Task.Delay(waitPerAttempt, cancelToken).ConfigureAwait(false);
             }
-            cancelToken.ThrowIfCancellationRequested();
             Console.WriteLine($"Prebuffering done? in {waitPerAttempt * bufferAttempts}");
             const int blockSize = 3840;
             var attempt = 0;

NadekoBot/Modules/Music/MusicModule.cs

@@ -151,7 +151,7 @@ namespace NadekoBot.Modules.Music
                         else if (musicPlayer.RepeatPlaylist)
                             toSend += "🔁";
                         toSend += $" **{musicPlayer.Playlist.Count}** `tracks currently queued. Showing page {page}` ";
-                        if (musicPlayer.Playlist.Count >= MusicPlayer.MaximumPlaylistSize)
+                        if (musicPlayer.MaxQueueSize != 0 && musicPlayer.Playlist.Count >= musicPlayer.MaxQueueSize)
                             toSend += "**Song queue is full!**\n";
                         else
                             toSend += "\n";
@@ -300,7 +300,6 @@ namespace NadekoBot.Modules.Music
                             await e.Channel.SendMessage($"🎵 `Failed to find any songs.`").ConfigureAwait(false);
                             return;
                         }
-                        //todo TEMPORARY SOLUTION, USE RESOLVE QUEUE IN THE FUTURE
                         var idArray = ids as string[] ?? ids.ToArray();
                         var count = idArray.Length;
                         var msg =

NadekoBot/Modules/Permissions/Classes/PermissionChecker.cs

@@ -26,8 +26,8 @@ namespace NadekoBot.Modules.Permissions.Classes
             {
                 while (true)
                 {
-                    //blacklist is cleared every 1.75 seconds. That is the most time anyone will be blocked
+                    //blacklist is cleared every 1.00 seconds. That is the most time anyone will be blocked
-                    await Task.Delay(1750).ConfigureAwait(false);
+                    await Task.Delay(1000).ConfigureAwait(false);
                     timeBlackList.Clear();
                 }
             });

NadekoBot/Modules/Searches/Commands/MemegenCommands.cs

@@ -25,7 +25,7 @@ namespace NadekoBot.Modules.Searches.Commands
                                 string.Join("\n", JsonConvert.DeserializeObject<Dictionary<string, string>>(await SearchHelper.GetResponseStringAsync("http://memegen.link/templates/"))
                                       .Select(kvp => Path.GetFileName(kvp.Value))
                                       .GroupBy(item => (i++) / 4)
-                                      .Select(ig => string.Join("", ig.Select(el => $"{el,-17}"))))
+                                      .Select(ig => string.Concat(ig.Select(el => $"{el,-17}"))))
                                       + $"\n```").ConfigureAwait(false);
                 });
 

NadekoBot/Modules/Searches/SearchesModule.cs

@@ -226,10 +226,10 @@ $@"🌍 **Weather for** 【{obj["target"]}】
                     .Parameter("terms", ParameterType.Unparsed)
                     .Do(async e =>
                     {
-                        var terms = e.GetArg("terms")?.Trim().Replace(' ', '+');
+                        var terms = e.GetArg("terms")?.Trim();
                         if (string.IsNullOrWhiteSpace(terms))
                             return;
-                        await e.Channel.SendMessage($"https://google.com/search?q={ HttpUtility.UrlEncode(terms) }")
+                        await e.Channel.SendMessage($"https://google.com/search?q={ HttpUtility.UrlEncode(terms).Replace(' ', '+') }")
                                        .ConfigureAwait(false);
                     });
 

NadekoBot/Modules/Translator/Helpers/GoogleTranslator.cs

@@ -60,7 +60,7 @@ namespace NadekoBot.Modules.Translator.Helpers
                 text = await http.GetStringAsync(url).ConfigureAwait(false);
             }
 
-            return JArray.Parse(text)[0][0][0].ToString();
+            return (string.Concat(JArray.Parse(text)[0].Select(x => x[0])));
         }
 
         #endregion

NadekoBot/Modules/Utility/UtilityModule.cs

@@ -48,7 +48,7 @@ namespace NadekoBot.Modules.Utility
                         if (arr.Length == 0)
                             await e.Channel.SendMessage("Nobody. (not 100% sure)").ConfigureAwait(false);
                         else
-                            await e.Channel.SendMessage("```xl\n" + string.Join("\n", arr.GroupBy(item => (i++) / 3).Select(ig => string.Join("", ig.Select(el => $"<22> {el,-35}")))) + "\n```").ConfigureAwait(false);
+                            await e.Channel.SendMessage("```xl\n" + string.Join("\n", arr.GroupBy(item => (i++) / 3).Select(ig => string.Concat(ig.Select(el => $"<22> {el,-35}")))) + "\n```").ConfigureAwait(false);
                     });
 
                 cgb.CreateCommand(Prefix + "inrole")